diff --git a/assets/background.png b/assets/background.png index 2a7b24a..b30efdb 100644 Binary files a/assets/background.png and b/assets/background.png differ diff --git a/assets/balanceHandle.png b/assets/balanceHandle.png index c5338f7..5f6565f 100644 Binary files a/assets/balanceHandle.png and b/assets/balanceHandle.png differ diff --git a/assets/balanceHandle_p.png b/assets/balanceHandle_p.png index a0bc2fa..907b3f5 100644 Binary files a/assets/balanceHandle_p.png and b/assets/balanceHandle_p.png differ diff --git a/assets/eq_off.png b/assets/eq_off.png index 148b63b..5ba48a3 100644 Binary files a/assets/eq_off.png and b/assets/eq_off.png differ diff --git a/assets/eq_off_p.png b/assets/eq_off_p.png index c8f98fc..67837ea 100644 Binary files a/assets/eq_off_p.png and b/assets/eq_off_p.png differ diff --git a/assets/eq_on.png b/assets/eq_on.png index ec332a6..041326f 100644 Binary files a/assets/eq_on.png and b/assets/eq_on.png differ diff --git a/assets/eq_on_p.png b/assets/eq_on_p.png index 04a98ec..d40d4c3 100644 Binary files a/assets/eq_on_p.png and b/assets/eq_on_p.png differ diff --git a/assets/next.png b/assets/next.png index 8ca6b9b..8a94829 100644 Binary files a/assets/next.png and b/assets/next.png differ diff --git a/assets/next_p.png b/assets/next_p.png index 55fd2fd..e64eaf5 100644 Binary files a/assets/next_p.png and b/assets/next_p.png differ diff --git a/assets/open.png b/assets/open.png index aff4048..5ae2062 100644 Binary files a/assets/open.png and b/assets/open.png differ diff --git a/assets/open_p.png b/assets/open_p.png index e0579c4..2cc828b 100644 Binary files a/assets/open_p.png and b/assets/open_p.png differ diff --git a/assets/pause.png b/assets/pause.png index 664ede7..61afa21 100644 Binary files a/assets/pause.png and b/assets/pause.png differ diff --git a/assets/pause_p.png b/assets/pause_p.png index 42c0342..3457820 100644 Binary files a/assets/pause_p.png and b/assets/pause_p.png differ diff --git a/assets/pl_add.png b/assets/pl_add.png index 14e0f3a..b917ac1 100644 Binary files a/assets/pl_add.png and b/assets/pl_add.png differ diff --git a/assets/pl_add_p.png b/assets/pl_add_p.png index 3e2267c..9ab2fee 100644 Binary files a/assets/pl_add_p.png and b/assets/pl_add_p.png differ diff --git a/assets/pl_close.png b/assets/pl_close.png index 0b6a318..c78cf65 100644 Binary files a/assets/pl_close.png and b/assets/pl_close.png differ diff --git a/assets/pl_close_p.png b/assets/pl_close_p.png index 83e9b41..eca01d8 100644 Binary files a/assets/pl_close_p.png and b/assets/pl_close_p.png differ diff --git a/assets/pl_off.png b/assets/pl_off.png index 7d1c311..91ab296 100644 Binary files a/assets/pl_off.png and b/assets/pl_off.png differ diff --git a/assets/pl_off_p.png b/assets/pl_off_p.png index ecb265b..91dced6 100644 Binary files a/assets/pl_off_p.png and b/assets/pl_off_p.png differ diff --git a/assets/pl_on.png b/assets/pl_on.png index fb5383e..25bff37 100644 Binary files a/assets/pl_on.png and b/assets/pl_on.png differ diff --git a/assets/pl_on_p.png b/assets/pl_on_p.png index cd4f2ee..8d7a79f 100644 Binary files a/assets/pl_on_p.png and b/assets/pl_on_p.png differ diff --git a/assets/play.png b/assets/play.png index 5725278..fa3bdb4 100644 Binary files a/assets/play.png and b/assets/play.png differ diff --git a/assets/play_p.png b/assets/play_p.png index 3975e59..6430c73 100644 Binary files a/assets/play_p.png and b/assets/play_p.png differ diff --git a/assets/posHandle.png b/assets/posHandle.png index dd91cbf..8afaa7c 100644 Binary files a/assets/posHandle.png and b/assets/posHandle.png differ diff --git a/assets/posHandle_p.png b/assets/posHandle_p.png index b66eaa2..5dfca5a 100644 Binary files a/assets/posHandle_p.png and b/assets/posHandle_p.png differ diff --git a/assets/prev.png b/assets/prev.png index 0b621a5..3d8b70a 100644 Binary files a/assets/prev.png and b/assets/prev.png differ diff --git a/assets/prev_p.png b/assets/prev_p.png index 72f1a9a..12b5214 100644 Binary files a/assets/prev_p.png and b/assets/prev_p.png differ diff --git a/assets/repeat_off.png b/assets/repeat_off.png index 354c9ee..df3ed29 100644 Binary files a/assets/repeat_off.png and b/assets/repeat_off.png differ diff --git a/assets/repeat_off_p.png b/assets/repeat_off_p.png index dfc214a..8e98d2a 100644 Binary files a/assets/repeat_off_p.png and b/assets/repeat_off_p.png differ diff --git a/assets/repeat_on.png b/assets/repeat_on.png index 14cf25e..394bc72 100644 Binary files a/assets/repeat_on.png and b/assets/repeat_on.png differ diff --git a/assets/repeat_on_p.png b/assets/repeat_on_p.png index b741681..80a786d 100644 Binary files a/assets/repeat_on_p.png and b/assets/repeat_on_p.png differ diff --git a/assets/scroll_handle.png b/assets/scroll_handle.png index 359b104..ff33fa2 100644 Binary files a/assets/scroll_handle.png and b/assets/scroll_handle.png differ diff --git a/assets/scroll_handle_p.png b/assets/scroll_handle_p.png index 6005d3e..2db429b 100644 Binary files a/assets/scroll_handle_p.png and b/assets/scroll_handle_p.png differ diff --git a/assets/shuffle_off.png b/assets/shuffle_off.png index 3fe26fa..5aa4c27 100644 Binary files a/assets/shuffle_off.png and b/assets/shuffle_off.png differ diff --git a/assets/shuffle_off_p.png b/assets/shuffle_off_p.png index 5ea333d..ca5d94b 100644 Binary files a/assets/shuffle_off_p.png and b/assets/shuffle_off_p.png differ diff --git a/assets/shuffle_on.png b/assets/shuffle_on.png index de92dd7..4e7cc31 100644 Binary files a/assets/shuffle_on.png and b/assets/shuffle_on.png differ diff --git a/assets/shuffle_on_p.png b/assets/shuffle_on_p.png index f47a99d..100f0d4 100644 Binary files a/assets/shuffle_on_p.png and b/assets/shuffle_on_p.png differ diff --git a/assets/status_paused.png b/assets/status_paused.png index 036fba8..2084cc5 100644 Binary files a/assets/status_paused.png and b/assets/status_paused.png differ diff --git a/assets/status_playing.png b/assets/status_playing.png index f057d33..d840302 100644 Binary files a/assets/status_playing.png and b/assets/status_playing.png differ diff --git a/assets/status_stopped.png b/assets/status_stopped.png index 38415dc..831c956 100644 Binary files a/assets/status_stopped.png and b/assets/status_stopped.png differ diff --git a/assets/stop.png b/assets/stop.png index a83ceed..2714839 100644 Binary files a/assets/stop.png and b/assets/stop.png differ diff --git a/assets/stop_p.png b/assets/stop_p.png index 208597e..96628bd 100644 Binary files a/assets/stop_p.png and b/assets/stop_p.png differ diff --git a/assets/visualizationBackground.png b/assets/visualizationBackground.png index d532043..dfc5698 100644 Binary files a/assets/visualizationBackground.png and b/assets/visualizationBackground.png differ diff --git a/assets/volumeHandle.png b/assets/volumeHandle.png index fe61d35..9f13a48 100644 Binary files a/assets/volumeHandle.png and b/assets/volumeHandle.png differ diff --git a/assets/volumeHandle_p.png b/assets/volumeHandle_p.png index 7151e33..3fde3ef 100644 Binary files a/assets/volumeHandle_p.png and b/assets/volumeHandle_p.png differ diff --git a/controlbuttonswidget.cpp b/controlbuttonswidget.cpp index 9a2226c..eb3b122 100644 --- a/controlbuttonswidget.cpp +++ b/controlbuttonswidget.cpp @@ -1,11 +1,13 @@ #include "controlbuttonswidget.h" #include "ui_controlbuttonswidget.h" +#include "scale.h" ControlButtonsWidget::ControlButtonsWidget(QWidget *parent) : QWidget(parent), ui(new Ui::ControlButtonsWidget) { ui->setupUi(this); + scale(); connect(ui->playButton, &QPushButton::clicked, this, &ControlButtonsWidget::playClicked); connect(ui->pauseButton, &QPushButton::clicked, this, &ControlButtonsWidget::pauseClicked); @@ -21,3 +23,52 @@ ControlButtonsWidget::~ControlButtonsWidget() { delete ui; } + +void ControlButtonsWidget::scale() +{ + ui->backButton->setMaximumWidth(ui->backButton->maximumWidth() * UI_SCALE); + ui->backButton->setMinimumWidth(ui->backButton->minimumWidth() * UI_SCALE); + ui->backButton->setMaximumHeight(ui->backButton->maximumHeight() * UI_SCALE); + ui->backButton->setMinimumHeight(ui->backButton->minimumHeight() * UI_SCALE); + + ui->playButton->setMaximumWidth(ui->playButton->maximumWidth() * UI_SCALE); + ui->playButton->setMinimumWidth(ui->playButton->minimumWidth() * UI_SCALE); + ui->playButton->setMaximumHeight(ui->playButton->maximumHeight() * UI_SCALE); + ui->playButton->setMinimumHeight(ui->playButton->minimumHeight() * UI_SCALE); + + ui->pauseButton->setMaximumWidth(ui->pauseButton->maximumWidth() * UI_SCALE); + ui->pauseButton->setMinimumWidth(ui->pauseButton->minimumWidth() * UI_SCALE); + ui->pauseButton->setMaximumHeight(ui->pauseButton->maximumHeight() * UI_SCALE); + ui->pauseButton->setMinimumHeight(ui->pauseButton->minimumHeight() * UI_SCALE); + + ui->stopButton->setMaximumWidth(ui->stopButton->maximumWidth() * UI_SCALE); + ui->stopButton->setMinimumWidth(ui->stopButton->minimumWidth() * UI_SCALE); + ui->stopButton->setMaximumHeight(ui->stopButton->maximumHeight() * UI_SCALE); + ui->stopButton->setMinimumHeight(ui->stopButton->minimumHeight() * UI_SCALE); + + ui->nextButton->setMaximumWidth(ui->nextButton->maximumWidth() * UI_SCALE); + ui->nextButton->setMinimumWidth(ui->nextButton->minimumWidth() * UI_SCALE); + ui->nextButton->setMaximumHeight(ui->nextButton->maximumHeight() * UI_SCALE); + ui->nextButton->setMinimumHeight(ui->nextButton->minimumHeight() * UI_SCALE); + + ui->openButton->setMaximumWidth(ui->openButton->maximumWidth() * UI_SCALE); + ui->openButton->setMinimumWidth(ui->openButton->minimumWidth() * UI_SCALE); + ui->openButton->setMaximumHeight(ui->openButton->maximumHeight() * UI_SCALE); + ui->openButton->setMinimumHeight(ui->openButton->minimumHeight() * UI_SCALE); + + ui->shuffleButton->setMaximumWidth(ui->shuffleButton->maximumWidth() * UI_SCALE); + ui->shuffleButton->setMinimumWidth(ui->shuffleButton->minimumWidth() * UI_SCALE); + ui->shuffleButton->setMaximumHeight(ui->shuffleButton->maximumHeight() * UI_SCALE); + ui->shuffleButton->setMinimumHeight(ui->shuffleButton->minimumHeight() * UI_SCALE); + + ui->repeatButton->setMaximumWidth(ui->repeatButton->maximumWidth() * UI_SCALE); + ui->repeatButton->setMinimumWidth(ui->repeatButton->minimumWidth() * UI_SCALE); + ui->repeatButton->setMaximumHeight(ui->repeatButton->maximumHeight() * UI_SCALE); + ui->repeatButton->setMinimumHeight(ui->repeatButton->minimumHeight() * UI_SCALE); + // TODO Stylesheets + + this->setMaximumWidth(this->maximumWidth() * UI_SCALE); + this->setMinimumWidth(this->minimumWidth() * UI_SCALE); + this->setMaximumHeight(this->maximumHeight() * UI_SCALE); + this->setMinimumHeight(this->minimumHeight() * UI_SCALE); +} diff --git a/controlbuttonswidget.h b/controlbuttonswidget.h index c9ab706..2010ba9 100644 --- a/controlbuttonswidget.h +++ b/controlbuttonswidget.h @@ -17,6 +17,7 @@ class ControlButtonsWidget : public QWidget private: Ui::ControlButtonsWidget *ui; + void scale(); signals: void playClicked(); diff --git a/controlbuttonswidget.ui b/controlbuttonswidget.ui index 2b4628f..d406e15 100644 --- a/controlbuttonswidget.ui +++ b/controlbuttonswidget.ui @@ -6,20 +6,20 @@ 0 0 - 666 - 51 + 222 + 18 - 666 - 51 + 222 + 17 - 666 - 51 + 222 + 18 @@ -91,14 +91,14 @@ - 66 - 54 + 22 + 18 - 66 - 54 + 22 + 18 @@ -122,14 +122,14 @@ - 66 - 54 + 22 + 18 - 66 - 54 + 22 + 18 @@ -153,14 +153,14 @@ - 66 - 54 + 22 + 18 - 66 - 54 + 22 + 18 @@ -184,14 +184,14 @@ - 66 - 54 + 22 + 18 - 66 - 54 + 22 + 18 @@ -215,14 +215,14 @@ - 66 - 54 + 22 + 18 - 66 - 54 + 22 + 18 @@ -252,8 +252,8 @@ - 18 - 20 + 6 + 17 @@ -262,14 +262,14 @@ - 66 - 48 + 22 + 16 - 66 - 48 + 22 + 16 @@ -299,8 +299,8 @@ - 21 - 20 + 7 + 17 @@ -309,14 +309,14 @@ - 141 - 45 + 47 + 15 - 141 - 45 + 47 + 15 @@ -325,8 +325,8 @@ } QCheckBox::indicator { - width: 141px; - height: 45px; + width: 47px; + height: 15px; } QCheckBox::indicator:unchecked { @@ -370,14 +370,14 @@ QCheckBox::indicator:indeterminate:pressed { - 84 - 45 + 28 + 15 - 64 - 45 + 28 + 15 @@ -386,8 +386,8 @@ QCheckBox::indicator:indeterminate:pressed { } QCheckBox::indicator { - width: 85px; - height: 45px; + width: 28px; + height: 15px; } QCheckBox::indicator:unchecked { diff --git a/desktopbasewindow.cpp b/desktopbasewindow.cpp index 69e5c35..6362130 100644 --- a/desktopbasewindow.cpp +++ b/desktopbasewindow.cpp @@ -1,14 +1,30 @@ #include "desktopbasewindow.h" #include "ui_desktopbasewindow.h" +#include "scale.h" DesktopBaseWindow::DesktopBaseWindow(QWidget *parent) : QWidget(parent), ui(new Ui::DesktopBaseWindow) { ui->setupUi(this); + scale(); } DesktopBaseWindow::~DesktopBaseWindow() { delete ui; } + +void DesktopBaseWindow::scale() +{ + this->setBaseSize(this->baseSize() * UI_SCALE); + this->layout()->setContentsMargins(this->layout()->contentsMargins() * UI_SCALE); + + ui->bodyContainer->layout()->setContentsMargins(ui->bodyContainer->layout()->contentsMargins() * UI_SCALE); + ui->bodyOuterFrame->layout()->setContentsMargins(ui->bodyOuterFrame->layout()->contentsMargins() * UI_SCALE); + + ui->titlebarContainer->setMaximumHeight(ui->titlebarContainer->maximumHeight() * UI_SCALE); + ui->titlebarContainer->setMinimumHeight(ui->titlebarContainer->minimumHeight() * UI_SCALE); + + // TODO Stylesheets +} diff --git a/desktopbasewindow.h b/desktopbasewindow.h index 2725b10..09c2aef 100644 --- a/desktopbasewindow.h +++ b/desktopbasewindow.h @@ -15,6 +15,9 @@ class DesktopBaseWindow : public QWidget explicit DesktopBaseWindow(QWidget *parent = nullptr); ~DesktopBaseWindow(); Ui::DesktopBaseWindow *ui; + +private: + void scale(); }; #endif // DESKTOPBASEWINDOW_H diff --git a/desktopbasewindow.ui b/desktopbasewindow.ui index b5713ec..519b442 100644 --- a/desktopbasewindow.ui +++ b/desktopbasewindow.ui @@ -6,8 +6,8 @@ 0 0 - 831 - 351 + 277 + 117 @@ -115,16 +115,16 @@ 0 - 3 + 1 - 3 + 1 - 3 + 1 - 3 + 1 @@ -163,13 +163,13 @@ 0 - 24 + 8 16777215 - 24 + 8 @@ -187,16 +187,16 @@ 0 - 6 + 2 0 - 6 + 2 - 6 + 2 @@ -220,16 +220,16 @@ 0 - 3 + 1 - 3 + 1 - 3 + 1 - 3 + 1 diff --git a/desktopplayerwindow.cpp b/desktopplayerwindow.cpp index f2eb5a5..96a1108 100644 --- a/desktopplayerwindow.cpp +++ b/desktopplayerwindow.cpp @@ -1,14 +1,42 @@ #include "desktopplayerwindow.h" #include "ui_desktopplayerwindow.h" +#include "scale.h" DesktopPlayerWindow::DesktopPlayerWindow(QWidget *parent) : QWidget(parent), ui(new Ui::DesktopPlayerWindow) { ui->setupUi(this); + scale(); } DesktopPlayerWindow::~DesktopPlayerWindow() { delete ui; } + +void DesktopPlayerWindow::scale() +{ + this->setBaseSize(this->baseSize() * UI_SCALE); + this->setMinimumSize(this->minimumSize() * UI_SCALE); + this->setMaximumSize(this->maximumSize() * UI_SCALE); + this->layout()->setContentsMargins(this->layout()->contentsMargins() * UI_SCALE); + + ui->bodyContainer->layout()->setContentsMargins(ui->bodyContainer->layout()->contentsMargins() * UI_SCALE); + ui->bodyOuterFrame->layout()->setContentsMargins(ui->bodyOuterFrame->layout()->contentsMargins() * UI_SCALE); + ui->bodyInnerFrame->layout()->setContentsMargins(ui->bodyInnerFrame->layout()->contentsMargins() * UI_SCALE); + + QSize sh = ui->horizontalSpacer->sizeHint(); + QSizePolicy sp = ui->horizontalSpacer->sizePolicy(); + ui->horizontalSpacer->changeSize(sh.width()*UI_SCALE, sh.height(), sp.horizontalPolicy(), sp.verticalPolicy()); + + QSize vsh = ui->verticalSpacer_2->sizeHint(); + QSizePolicy vsp = ui->verticalSpacer_2->sizePolicy(); + ui->verticalSpacer_2->changeSize(vsh.width(), vsh.height()*UI_SCALE, vsp.horizontalPolicy(), vsp.verticalPolicy()); + + ui->titlebarContainer->setMaximumHeight(ui->titlebarContainer->maximumHeight() * UI_SCALE); + ui->titlebarContainer->setMinimumHeight(ui->titlebarContainer->minimumHeight() * UI_SCALE); + + // TODO Stylesheets + +} diff --git a/desktopplayerwindow.h b/desktopplayerwindow.h index fbde769..91f4ab8 100644 --- a/desktopplayerwindow.h +++ b/desktopplayerwindow.h @@ -15,6 +15,9 @@ class DesktopPlayerWindow : public QWidget explicit DesktopPlayerWindow(QWidget *parent = nullptr); ~DesktopPlayerWindow(); Ui::DesktopPlayerWindow *ui; + +private: + void scale(); }; #endif // DESKTOPPLAYERWINDOW_H diff --git a/desktopplayerwindow.ui b/desktopplayerwindow.ui index bd4ec73..2f90d26 100644 --- a/desktopplayerwindow.ui +++ b/desktopplayerwindow.ui @@ -6,20 +6,20 @@ 0 0 - 831 - 351 + 277 + 128 - 831 - 351 + 277 + 117 - 831 - 351 + 277 + 128 @@ -127,16 +127,16 @@ 0 - 3 + 1 - 3 + 1 - 3 + 1 - 3 + 1 @@ -175,13 +175,13 @@ 0 - 24 + 8 16777215 - 24 + 8 @@ -199,16 +199,16 @@ 0 - 6 + 2 0 - 6 + 2 - 6 + 2 @@ -232,16 +232,16 @@ 0 - 3 + 1 - 3 + 1 - 3 + 1 - 3 + 1 @@ -265,16 +265,16 @@ 0 - 9 + 4 - 21 + 7 - 6 + 2 - 15 + 5 @@ -285,7 +285,7 @@ Qt::Vertical - QSizePolicy::Expanding + QSizePolicy::Fixed @@ -310,8 +310,8 @@ - 18 - 20 + 6 + 1 diff --git a/playerview.cpp b/playerview.cpp index 3cdb9a8..a4d55d6 100644 --- a/playerview.cpp +++ b/playerview.cpp @@ -3,6 +3,7 @@ #include "playlistmodel.h" #include "qmediaplaylist.h" +#include "scale.h" #include #include @@ -25,6 +26,7 @@ PlayerView::PlayerView(QWidget *parent, PlaylistModel *playlistModel) : // Setup UI ui->setupUi(this); + scale(); //! [create-objs] m_player = new MediaPlayer(this); @@ -92,6 +94,92 @@ PlayerView::~PlayerView() delete ui; } +void PlayerView::scale() +{ + this->setMaximumSize(this->maximumSize() * UI_SCALE); + this->setMinimumSize(this->minimumSize() * UI_SCALE); + + ui->posBarContainer->layout()->setContentsMargins(ui->posBarContainer->layout()->contentsMargins() * UI_SCALE); + + ui->posBar->setMaximumHeight(ui->posBar->maximumHeight() * UI_SCALE); + ui->posBar->setMinimumHeight(ui->posBar->minimumHeight() * UI_SCALE); + // TODO stylesheet + + ui->infoContainer->setContentsMargins(ui->infoContainer->contentsMargins() * UI_SCALE); + ui->visualizationContainer->setContentsMargins(ui->visualizationContainer->contentsMargins() * UI_SCALE); + + ui->codecDetailsContainer->layout()->setContentsMargins(ui->codecDetailsContainer->layout()->contentsMargins() * UI_SCALE); + + ui->kHzLabel->setMaximumHeight(ui->kHzLabel->maximumHeight() * UI_SCALE); + ui->kHzLabel->setMinimumHeight(ui->kHzLabel->minimumHeight() * UI_SCALE); + // TODO font + + ui->kbpsLabel->setMaximumHeight(ui->kbpsLabel->maximumHeight() * UI_SCALE); + ui->kbpsLabel->setMinimumHeight(ui->kbpsLabel->minimumHeight() * UI_SCALE); + // TODO font + + ui->kbpsFrame->setMinimumSize(ui->kbpsFrame->minimumSize() * UI_SCALE); + ui->kbpsFrame->setMaximumHeight(ui->kbpsFrame->maximumHeight() * UI_SCALE); + ui->kbpsFrame->layout()->setContentsMargins(ui->kbpsFrame->layout()->contentsMargins() * UI_SCALE); + ui->kbpsFrame->layout()->setSpacing(ui->kbpsFrame->layout()->spacing() * UI_SCALE); + // TODO stylesheet + + ui->khzFrame->setMinimumSize(ui->khzFrame->minimumSize() * UI_SCALE); + ui->khzFrame->setMaximumHeight(ui->khzFrame->maximumHeight() * UI_SCALE); + ui->khzFrame->layout()->setContentsMargins(ui->khzFrame->layout()->contentsMargins() * UI_SCALE); + ui->khzFrame->layout()->setSpacing(ui->khzFrame->layout()->spacing() * UI_SCALE); + // TODO stylesheet + + + //ui->kbpsValueLabel; + //ui->khzValueLabel; + // TODO font + + // Volume and balance sliders and buttons container + ui->horizontalWidget_2->setMinimumHeight(ui->horizontalWidget_2->minimumHeight() * UI_SCALE); + ui->horizontalWidget_2->setMaximumHeight(ui->horizontalWidget_2->maximumHeight() * UI_SCALE); + ui->horizontalWidget_2->layout()->setContentsMargins(ui->horizontalWidget_2->layout()->contentsMargins() * UI_SCALE); + + ui->eqButton->setMinimumSize(ui->eqButton->minimumSize() * UI_SCALE); + ui->eqButton->setMaximumSize(ui->eqButton->maximumSize() * UI_SCALE); + // TODO stylesheet + + ui->playlistButton->setMinimumSize(ui->playlistButton->minimumSize() * UI_SCALE); + ui->playlistButton->setMaximumSize(ui->playlistButton->maximumSize() * UI_SCALE); + // TODO stylesheet + + ui->balanceSlider->setMinimumSize(ui->balanceSlider->minimumSize() * UI_SCALE); + // TODO stylesheet + + ui->volumeSlider->setMinimumSize(ui->volumeSlider->minimumSize() * UI_SCALE); + ui->volumeSlider->setMaximumSize(ui->volumeSlider->maximumSize() * UI_SCALE); + // TODO stylesheet + + ui->songInfoContainer->setMinimumHeight(ui->songInfoContainer->minimumHeight() * UI_SCALE); + ui->songInfoContainer->setMaximumHeight(ui->songInfoContainer->maximumHeight() * UI_SCALE); + ui->songInfoContainer->layout()->setContentsMargins(ui->songInfoContainer->layout()->contentsMargins() * UI_SCALE); + // TODO stylesheet + + //ui->songInfoLabel; + // TODO font + + ui->visualizationFrame->setMaximumSize(ui->visualizationFrame->maximumSize() * UI_SCALE); + ui->visualizationFrame->setMinimumSize(ui->visualizationFrame->minimumSize() * UI_SCALE); + // TODO stylesheet + + ui->playStatusIcon->setMaximumSize(ui->playStatusIcon->maximumSize() * UI_SCALE); + ui->playStatusIcon->setMinimumSize(ui->playStatusIcon->minimumSize() * UI_SCALE); + QRect psiGeo = ui->playStatusIcon->geometry(); + ui->playStatusIcon->setGeometry(psiGeo.x()*UI_SCALE, psiGeo.y()*UI_SCALE, psiGeo.width(), psiGeo.height()); + + QRect ptlGeo = ui->playStatusIcon->geometry(); + ui->progressTimeLabel->setGeometry(ptlGeo.x()*UI_SCALE, ptlGeo.y()*UI_SCALE, ptlGeo.width()*UI_SCALE, ptlGeo.height()*UI_SCALE); + // TODO fontsize + + QRect scGeo = ui->spectrumContainer->geometry(); + ui->spectrumContainer->setGeometry(scGeo.x()*UI_SCALE, scGeo.y()*UI_SCALE, scGeo.width()*UI_SCALE, scGeo.height()*UI_SCALE); +} + bool PlayerView::isPlayerAvailable() const { return true; //m_player->isAvailable(); diff --git a/playerview.h b/playerview.h index 6701da5..d467a96 100644 --- a/playerview.h +++ b/playerview.h @@ -68,6 +68,7 @@ private slots: private: Ui::PlayerView *ui; + void scale(); SpectrumWidget *spectrum = nullptr; void setTrackInfo(const QString &info); void setStatusInfo(const QString &info); diff --git a/playerview.ui b/playerview.ui index 61b6459..ba60610 100644 --- a/playerview.ui +++ b/playerview.ui @@ -6,8 +6,8 @@ 0 0 - 768 - 180 + 577 + 86 @@ -18,14 +18,14 @@ - 768 - 180 + 256 + 60 - 768 - 180 + 577 + 86 @@ -77,7 +77,7 @@ 0 - 8 + 2 0 @@ -86,14 +86,14 @@ - 279 - 129 + 93 + 43 - 279 - 129 + 93 + 43 @@ -134,10 +134,10 @@ - 118 - 9 - 150 - 61 + 39 + 3 + 50 + 20 @@ -288,22 +288,22 @@ - 36 - 15 - 33 - 27 + 12 + 5 + 11 + 9 - 33 - 27 + 11 + 9 - 33 - 27 + 11 + 9 @@ -412,10 +412,10 @@ - 33 - 57 - 231 - 51 + 11 + 19 + 77 + 17 @@ -451,7 +451,7 @@ 0 - 5 + 2 0 @@ -464,13 +464,13 @@ 0 - 41 + 14 16777215 - 22 + 14 @@ -483,14 +483,17 @@ } + + 2 + - 8 + 3 0 - 8 + 3 0 @@ -555,30 +558,33 @@ + + 2 + 0 - 18 + 6 - 15 + 5 - 8 + 3 - 58 - 34 + 19 + 11 16777215 - 34 + 11 @@ -591,14 +597,17 @@ } + + 2 + - 4 + 1 0 - 4 + 1 0 @@ -656,13 +665,13 @@ 0 - 34 + 11 16777215 - 34 + 11 @@ -727,14 +736,14 @@ - 45 - 34 + 15 + 11 16777215 - 34 + 11 @@ -747,14 +756,17 @@ } + + 2 + - 4 + 1 0 - 4 + 1 0 @@ -812,13 +824,13 @@ 0 - 34 + 11 16777215 - 34 + 11 @@ -1002,6 +1014,9 @@ 0 + + 3 + 0 @@ -1009,14 +1024,14 @@ - 180 - 33 + 60 + 11 - 180 - 33 + 60 + 11 @@ -1075,7 +1090,7 @@ QSlider::add-page:horizontal { 16 - 20 + 1 @@ -1084,8 +1099,8 @@ QSlider::add-page:horizontal { - 110 - 33 + 37 + 11 @@ -1144,7 +1159,7 @@ QSlider::add-page:horizontal { 14 - 20 + 1 @@ -1153,14 +1168,14 @@ QSlider::add-page:horizontal { - 69 - 36 + 23 + 12 - 69 - 36 + 23 + 12 @@ -1169,8 +1184,8 @@ QSlider::add-page:horizontal { } QCheckBox::indicator { - width: 69px; - height: 36px; + width: 23px; + height: 12px; } QCheckBox::indicator:unchecked { @@ -1214,14 +1229,14 @@ QCheckBox::indicator:indeterminate:pressed { - 69 - 36 + 23 + 12 - 69 - 36 + 23 + 12 @@ -1230,8 +1245,8 @@ QCheckBox::indicator:indeterminate:pressed { } QCheckBox::indicator { - width: 69px; - height: 36px; + width: 23px; + height: 12px; } QCheckBox::indicator:unchecked { @@ -1297,10 +1312,10 @@ QCheckBox::indicator:indeterminate:pressed { 0 - 15 + 5 - 6 + 2 0 @@ -1310,19 +1325,19 @@ QCheckBox::indicator:indeterminate:pressed { 0 - 27 + 9 16777215 - 27 + 9 QSlider::handle:horizontal { - width: 84px; - height: 27px; + width: 28px; + height: 9px; background-color: transparent; border-image: url(:assets/posHandle.png); background: none; @@ -1339,11 +1354,11 @@ QSlider::groove:horizontal { #posBar { background-color: #2c2b43; - border-top: 3px solid #26253c; - border-right: 3px solid #6d6d7f; - border-bottom: 3px solid #6d6d7f; - border-left: 3px solid #26253c; - padding: -3px; + border-top: 1px solid #26253c; + border-right: 1px solid #6d6d7f; + border-bottom: 1px solid #6d6d7f; + border-left: 1px solid #26253c; + padding: -1px; } diff --git a/scale-skin.sh b/scale-skin.sh index 331855d..6c45a20 100755 --- a/scale-skin.sh +++ b/scale-skin.sh @@ -7,7 +7,7 @@ for filePath in skin/*.png; do if [ -f "$filePath" ]; then fileName="${filePath##*/}" echo "$fileName" - convert -scale 300% "$filePath" "assets/$fileName" + convert -scale 400% "$filePath" "assets/$fileName" fi done