From ddbc1c2517182fd427eca7812884d875b06bbd54 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Sat, 30 Jan 2016 21:01:46 +0100 Subject: [PATCH 01/10] Set layoutSpacing to 0 --- src/library/autodj/dlgautodj.ui | 6 ++++++ src/library/dlganalysis.ui | 6 ++++++ src/library/dlghidden.ui | 6 ++++++ src/library/dlgmissing.ui | 6 ++++++ src/library/recording/dlgrecording.ui | 6 ++++++ 5 files changed, 30 insertions(+) diff --git a/src/library/autodj/dlgautodj.ui b/src/library/autodj/dlgautodj.ui index ea2b8c164f7..89619f760ec 100644 --- a/src/library/autodj/dlgautodj.ui +++ b/src/library/autodj/dlgautodj.ui @@ -17,6 +17,9 @@ + + 0 + 0 @@ -28,6 +31,9 @@ + + 0 + QLayout::SetMinimumSize diff --git a/src/library/dlganalysis.ui b/src/library/dlganalysis.ui index 156bef73fc7..6d14279daf7 100644 --- a/src/library/dlganalysis.ui +++ b/src/library/dlganalysis.ui @@ -14,6 +14,9 @@ Analyze + + 0 + 0 @@ -25,6 +28,9 @@ + + 0 + diff --git a/src/library/dlghidden.ui b/src/library/dlghidden.ui index 6cdf2af1d6b..bf353040550 100644 --- a/src/library/dlghidden.ui +++ b/src/library/dlghidden.ui @@ -17,6 +17,9 @@ + + 0 + 0 @@ -28,6 +31,9 @@ + + 0 + QLayout::SetMinimumSize diff --git a/src/library/dlgmissing.ui b/src/library/dlgmissing.ui index 2e7294c87f3..9f5447439a4 100644 --- a/src/library/dlgmissing.ui +++ b/src/library/dlgmissing.ui @@ -17,6 +17,9 @@ + + 0 + 0 @@ -28,6 +31,9 @@ + + 0 + QLayout::SetMinimumSize diff --git a/src/library/recording/dlgrecording.ui b/src/library/recording/dlgrecording.ui index 517a3df5896..448fcee0dd7 100644 --- a/src/library/recording/dlgrecording.ui +++ b/src/library/recording/dlgrecording.ui @@ -14,6 +14,9 @@ Recordings + + 0 + 0 @@ -25,6 +28,9 @@ + + 0 + From 89179d840403358b7b05b638715ef2470b1cf6e1 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Sat, 30 Jan 2016 21:07:13 +0100 Subject: [PATCH 02/10] Set margins to 0 --- src/library/autodj/dlgautodj.ui | 10 ++++++++-- src/library/dlganalysis.ui | 15 +++++++++++++++ src/library/dlghidden.ui | 10 ++++++++-- src/library/dlgmissing.ui | 10 ++++++++-- src/library/recording/dlgrecording.ui | 15 +++++++++++++++ 5 files changed, 54 insertions(+), 6 deletions(-) diff --git a/src/library/autodj/dlgautodj.ui b/src/library/autodj/dlgautodj.ui index 89619f760ec..da8a70a5af0 100644 --- a/src/library/autodj/dlgautodj.ui +++ b/src/library/autodj/dlgautodj.ui @@ -23,6 +23,9 @@ 0 + + 0 + 0 @@ -38,10 +41,13 @@ QLayout::SetMinimumSize - 12 + 0 + + + 0 - 12 + 0 0 diff --git a/src/library/dlganalysis.ui b/src/library/dlganalysis.ui index 6d14279daf7..c8c3ab64da5 100644 --- a/src/library/dlganalysis.ui +++ b/src/library/dlganalysis.ui @@ -20,6 +20,9 @@ 0 + + 0 + 0 @@ -31,6 +34,18 @@ 0 + + 0 + + + 0 + + + 0 + + + 0 + diff --git a/src/library/dlghidden.ui b/src/library/dlghidden.ui index bf353040550..e38e4565e4d 100644 --- a/src/library/dlghidden.ui +++ b/src/library/dlghidden.ui @@ -23,6 +23,9 @@ 0 + + 0 + 0 @@ -38,10 +41,13 @@ QLayout::SetMinimumSize - 12 + 0 + + + 0 - 12 + 0 0 diff --git a/src/library/dlgmissing.ui b/src/library/dlgmissing.ui index 9f5447439a4..c0641cc99e5 100644 --- a/src/library/dlgmissing.ui +++ b/src/library/dlgmissing.ui @@ -23,6 +23,9 @@ 0 + + 0 + 0 @@ -38,10 +41,13 @@ QLayout::SetMinimumSize - 12 + 0 + + + 0 - 12 + 0 0 diff --git a/src/library/recording/dlgrecording.ui b/src/library/recording/dlgrecording.ui index 448fcee0dd7..305880f09a4 100644 --- a/src/library/recording/dlgrecording.ui +++ b/src/library/recording/dlgrecording.ui @@ -20,6 +20,9 @@ 0 + + 0 + 0 @@ -31,6 +34,18 @@ 0 + + 0 + + + 0 + + + 0 + + + 0 + From b26d310857a017efb54b8e1641a66dce0fe0ac29 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Sat, 30 Jan 2016 21:15:12 +0100 Subject: [PATCH 03/10] Spacer between buttons and edges removed --- src/library/dlganalysis.ui | 32 --------------------------- src/library/recording/dlgrecording.ui | 16 -------------- 2 files changed, 48 deletions(-) diff --git a/src/library/dlganalysis.ui b/src/library/dlganalysis.ui index c8c3ab64da5..de46af0a67d 100644 --- a/src/library/dlganalysis.ui +++ b/src/library/dlganalysis.ui @@ -46,22 +46,6 @@ 0 - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 12 - 20 - - - - @@ -122,22 +106,6 @@ - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 12 - 20 - - - - diff --git a/src/library/recording/dlgrecording.ui b/src/library/recording/dlgrecording.ui index 305880f09a4..b9420593637 100644 --- a/src/library/recording/dlgrecording.ui +++ b/src/library/recording/dlgrecording.ui @@ -76,22 +76,6 @@ - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 12 - 20 - - - - From 9b07e98be56631c2d2628b2169bddaa2a6e372dd Mon Sep 17 00:00:00 2001 From: Hendrik Date: Sat, 30 Jan 2016 21:30:23 +0100 Subject: [PATCH 04/10] Some insignificant properties removed --- src/library/autodj/dlgautodj.ui | 12 ------------ src/library/dlghidden.ui | 12 ------------ src/library/dlgmissing.ui | 12 ------------ 3 files changed, 36 deletions(-) diff --git a/src/library/autodj/dlgautodj.ui b/src/library/autodj/dlgautodj.ui index da8a70a5af0..f71a2a1cbd6 100644 --- a/src/library/autodj/dlgautodj.ui +++ b/src/library/autodj/dlgautodj.ui @@ -13,9 +13,6 @@ Auto DJ - - - 0 @@ -37,9 +34,6 @@ 0 - - QLayout::SetMinimumSize - 0 @@ -167,12 +161,6 @@ - - - 0 - 0 - - true diff --git a/src/library/dlghidden.ui b/src/library/dlghidden.ui index e38e4565e4d..d80de64e421 100644 --- a/src/library/dlghidden.ui +++ b/src/library/dlghidden.ui @@ -13,9 +13,6 @@ Hidden Tracks - - - 0 @@ -37,9 +34,6 @@ 0 - - QLayout::SetMinimumSize - 0 @@ -108,12 +102,6 @@ - - - 0 - 0 - - true diff --git a/src/library/dlgmissing.ui b/src/library/dlgmissing.ui index c0641cc99e5..8db680a895c 100644 --- a/src/library/dlgmissing.ui +++ b/src/library/dlgmissing.ui @@ -13,9 +13,6 @@ Missing Tracks - - - 0 @@ -37,9 +34,6 @@ 0 - - QLayout::SetMinimumSize - 0 @@ -92,12 +86,6 @@ - - - 0 - 0 - - true From 20cbade7a8e7b69611173ab2ae383a61d9f84c0e Mon Sep 17 00:00:00 2001 From: Hendrik Date: Sat, 30 Jan 2016 22:12:11 +0100 Subject: [PATCH 05/10] Enabled/disabled states for library labels added, e.g. when label has a css background. Misleading and only on first start translated label text removed. Now it looks like the analyse and autodj pane. --- src/library/autodj/dlgautodj.cpp | 7 +++++-- src/library/dlganalysis.cpp | 2 ++ src/library/recording/dlgrecording.cpp | 7 +++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/library/autodj/dlgautodj.cpp b/src/library/autodj/dlgautodj.cpp index 939f71088b5..62a699357c3 100644 --- a/src/library/autodj/dlgautodj.cpp +++ b/src/library/autodj/dlgautodj.cpp @@ -221,7 +221,10 @@ void DlgAutoDJ::updateSelectionInfo() { if (!indices.isEmpty()) { label.append(Time::formatSeconds(duration)); label.append(QString(" (%1)").arg(indices.size())); + labelSelectionInfo->setText(label); + labelSelectionInfo->setEnabled(true); + } else { + labelSelectionInfo->setText(""); + labelSelectionInfo->setEnabled(false); } - - labelSelectionInfo->setText(label); } diff --git a/src/library/dlganalysis.cpp b/src/library/dlganalysis.cpp index 1459665a85b..50bfccc7e1a 100644 --- a/src/library/dlganalysis.cpp +++ b/src/library/dlganalysis.cpp @@ -134,9 +134,11 @@ void DlgAnalysis::analysisActive(bool bActive) { if (bActive) { pushButtonAnalyze->setEnabled(true); pushButtonAnalyze->setText(tr("Stop Analysis")); + labelProgress->setEnabled(true); } else { pushButtonAnalyze->setText(tr("Analyze")); labelProgress->setText(""); + labelProgress->setEnabled(false); } } diff --git a/src/library/recording/dlgrecording.cpp b/src/library/recording/dlgrecording.cpp index 8a8e77e30ac..eb843dc2084 100644 --- a/src/library/recording/dlgrecording.cpp +++ b/src/library/recording/dlgrecording.cpp @@ -57,7 +57,8 @@ DlgRecording::DlgRecording(QWidget* parent, UserSettingsPointer pConfig, connect(pushButtonRecording, SIGNAL(toggled(bool)), this, SLOT(toggleRecording(bool))); - label->setText(tr("Start recording here ...")); + label->setText(""); + label->setEnabled(false); } DlgRecording::~DlgRecording() { @@ -117,9 +118,11 @@ void DlgRecording::toggleRecording(bool toggle) { void DlgRecording::slotRecordingEnabled(bool isRecording) { if (isRecording) { pushButtonRecording->setText((tr("Stop Recording"))); + label->setEnabled(true); } else { pushButtonRecording->setText((tr("Start Recording"))); - label->setText("Start recording here ..."); + label->setText(""); + label->setEnabled(false); } //This will update the recorded track table view m_browseModel.setPath(m_recordingDir); From b7b009cdb699ff9d8466e62d265c8b9b160df104 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Wed, 3 Feb 2016 18:27:12 +0100 Subject: [PATCH 06/10] Additional space around the QPushButtons in Deere. --- res/skins/Deere/style.qss | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss index 405d7bd76c7..ae479183a6f 100644 --- a/res/skins/Deere/style.qss +++ b/res/skins/Deere/style.qss @@ -338,7 +338,7 @@ WLibrary QSpinBox:editable { WLibrary QLabel, WLibrary QRadioButton { /* same as QTreeview */ color: #d2d2d2; - margin: 0px 10px 0px 0px; + margin: 9px 10px 6px 0px; } WLibrary QRadioButton::indicator { @@ -347,6 +347,11 @@ WLibrary QRadioButton::indicator { height: 18px; } +/* Additional space for the first QRadionButton in the row */ +WLibrary QRadioButton#radioButtonRecentlyAdded { + margin: 9px 10px 6px 14px; +} + WLibrary QRadioButton::indicator:checked { background: url(skin:/icon/ic_radio_button_on_18px.svg); } @@ -361,6 +366,7 @@ WLibrary QRadioButton::indicator:unchecked { #DlgAutoDJ > QPushButton, #DlgRecording > QPushButton, #DlgAnalysis > QPushButton { + margin: 9px 3px 6px 3px; padding: 4px; color: #D2D2D2; background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0, @@ -377,6 +383,7 @@ WLibrary QRadioButton::indicator:unchecked { #DlgAnalysis > QPushButton:!enabled { /* buttons in "disabled" (not click-able) state. They are nearly invisible by default QT palette, so style accordingly */ + margin: 9px 3px 6px 3px; padding: 4px; color: #808080; /* Default #A3A3A3 -90L HSL*/ background-color: qlineargradient(spread:pad, @@ -394,6 +401,7 @@ WLibrary QRadioButton::indicator:unchecked { #DlgAutoDJ > QPushButton:hover, #DlgRecording > QPushButton:hover, #DlgAnalysis > QPushButton:hover { + margin: 9px 3px 6px 3px; padding: 4px; color: #D2D2D2; background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0, @@ -408,6 +416,7 @@ WLibrary QRadioButton::indicator:unchecked { #DlgRecording > QPushButton:checked, #DlgAnalysis > QPushButton:checked { /* checkbuttons in active state */ + margin: 9px 3px 6px 3px; padding: 4px; color: #FDFDFD; background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0, @@ -422,6 +431,7 @@ WLibrary QRadioButton::indicator:unchecked { #DlgRecording > QPushButton:checked:hover, #DlgAnalysis > QPushButton:checked:hover { /* checkbuttons hovered over in "active" state */ + margin: 9px 3px 6px 3px; padding: 4px; color: #FDFDFD; background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0, @@ -437,6 +447,7 @@ WLibrary QRadioButton::indicator:unchecked { #DlgAutoDJ > QPushButton:pressed, #DlgAnalysis > QPushButton:pressed { /* pushbuttons in "down" state */ + margin: 9px 3px 6px 3px; padding: 4px; color: #FDFDFD; background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0, @@ -447,6 +458,19 @@ WLibrary QRadioButton::indicator:unchecked { outline: none; } +/* Additional space for the first and the last QPushButton in the row */ +#DlgMissing > QPushButton#btnPurge, +#DlgHidden > QPushButton#btnUnhide, +#DlgAutoDJ > QPushButton#pushButtonAutoDJ, +#DlgRecording > QPushButton#pushButtonRecording, +#DlgAnalysis > QPushButton#pushButtonAnalyze { + margin: 9px 12px 6px 3px; +} + +#DlgAutoDJ > QPushButton#pushButtonShuffle { + margin: 9px 3px 6px 12px; +} + /* Scroll bars */ QScrollBar:horizontal { From 43290794bdf7275218c21286ec9208efedc4470f Mon Sep 17 00:00:00 2001 From: Hendrik Date: Wed, 3 Feb 2016 19:32:49 +0100 Subject: [PATCH 07/10] Additional space around the QPushButtons in LateNight. --- res/skins/LateNight/style.qss | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss index 0806701a011..caf6350612b 100644 --- a/res/skins/LateNight/style.qss +++ b/res/skins/LateNight/style.qss @@ -1277,7 +1277,37 @@ QSplitter::handle:horizontal { width: 10px; background-color: #0e0e0e;} QSplitter::handle:vertical { height: 10px; background-color: #0e0e0e;} /* Extra declaration for QRadioButton otherwise it shows up with wrong colors in Linux with Gnome */ -QLabel, QRadioButton { background: transparent; color: #cfb32c;} +QLabel, QRadioButton { background: transparent; color: #cfb32c; } + +/* Additional space for QRadionButtons and QLabels */ +WLibrary QRadioButton, WLibrary QLabel { margin: 6px 3px; } + +/* Additional space for the first QRadionButton in the row */ +WLibrary QRadioButton#radioButtonRecentlyAdded { margin: 6px 3px 6px 12px; } + +/* Additional space for the QPushButtons */ +#DlgMissing > QPushButton, +#DlgHidden > QPushButton, +#DlgAutoDJ > QPushButton, +#DlgRecording > QPushButton, +#DlgAnalysis > QPushButton { + margin: 6px 3px; + padding: 3px 8px; +} + +/* Additional space for the first QPushButton in the row */ +#DlgMissing > QPushButton#btnPurge, +#DlgHidden > QPushButton#btnUnhide, +#DlgAutoDJ > QPushButton#pushButtonAutoDJ, +#DlgRecording > QPushButton#pushButtonRecording, +#DlgAnalysis > QPushButton#pushButtonAnalyze { + margin: 6px 12px 6px 3px; +} + +/* Additional space for the last QPushButton in the row */ +#DlgAutoDJ > QPushButton#pushButtonShuffle { + margin: 6px 3px 6px 12px; +} /* Spacing between treeview and searchbar */ QTreeView { margin: 10px 0px 0px 0px; } From c093a8df3eb2265da94c3d3daeba6261f2414ba7 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Wed, 3 Feb 2016 19:33:21 +0100 Subject: [PATCH 08/10] Additional space around the QPushButtons in Shade. --- res/skins/Shade/skin.xml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/res/skins/Shade/skin.xml b/res/skins/Shade/skin.xml index 4a9ef552dce..aefa57a90fb 100644 --- a/res/skins/Shade/skin.xml +++ b/res/skins/Shade/skin.xml @@ -460,6 +460,32 @@ background: transparent; color: #C1C1C1;} + + WLibrary QRadioButton, WLibrary QLabel { margin: 6px 3px; } + + + WLibrary QRadioButton#radioButtonRecentlyAdded { margin: 6px 3px 6px 12px; } + + + #DlgMissing > QPushButton, + #DlgHidden > QPushButton, + #DlgAutoDJ > QPushButton, + #DlgRecording > QPushButton, + #DlgAnalysis > QPushButton { + margin: 6px 3px; + padding: 3px 8px; + } + + + #DlgMissing > QPushButton#btnPurge, + #DlgHidden > QPushButton#btnUnhide, + #DlgAutoDJ > QPushButton#pushButtonAutoDJ, + #DlgRecording > QPushButton#pushButtonRecording, + #DlgAnalysis > QPushButton#pushButtonAnalyze { margin: 6px 12px 6px 3px; } + + + #DlgAutoDJ > QPushButton#pushButtonShuffle { margin: 6px 3px 6px 12px; } + QTreeView { margin: 0px 0px 0px 5px; } From 3da900a969cc4e1e586e0bf55530fb0dd80735d6 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 4 Feb 2016 18:46:22 +0100 Subject: [PATCH 09/10] 3px more top-margin and min-width for QPushButtons added in Shade. --- res/skins/Shade/skin.xml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/res/skins/Shade/skin.xml b/res/skins/Shade/skin.xml index aefa57a90fb..6e68160e380 100644 --- a/res/skins/Shade/skin.xml +++ b/res/skins/Shade/skin.xml @@ -461,10 +461,10 @@ color: #C1C1C1;} - WLibrary QRadioButton, WLibrary QLabel { margin: 6px 3px; } + WLibrary QRadioButton, WLibrary QLabel { margin: 9px 3px 6px 3px; } - WLibrary QRadioButton#radioButtonRecentlyAdded { margin: 6px 3px 6px 12px; } + WLibrary QRadioButton#radioButtonRecentlyAdded { margin: 9px 3px 6px 12px; } #DlgMissing > QPushButton, @@ -472,8 +472,9 @@ #DlgAutoDJ > QPushButton, #DlgRecording > QPushButton, #DlgAnalysis > QPushButton { - margin: 6px 3px; + margin: 9px 3px 6px 3px; padding: 3px 8px; + min-width: 65px; } @@ -481,10 +482,10 @@ #DlgHidden > QPushButton#btnUnhide, #DlgAutoDJ > QPushButton#pushButtonAutoDJ, #DlgRecording > QPushButton#pushButtonRecording, - #DlgAnalysis > QPushButton#pushButtonAnalyze { margin: 6px 12px 6px 3px; } + #DlgAnalysis > QPushButton#pushButtonAnalyze { margin: 9px 12px 6px 3px; } - #DlgAutoDJ > QPushButton#pushButtonShuffle { margin: 6px 3px 6px 12px; } + #DlgAutoDJ > QPushButton#pushButtonShuffle { margin: 9px 3px 6px 12px; } QTreeView { margin: 0px 0px 0px 5px; } From 56ac0378641ec7fd2ce6151fb9edc7e3fab40e85 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 4 Feb 2016 19:03:17 +0100 Subject: [PATCH 10/10] 3px more top-margin and min-width for QPushButton added in LateNight. Code style respected. --- res/skins/LateNight/style.qss | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss index caf6350612b..e004a7c46a1 100644 --- a/res/skins/LateNight/style.qss +++ b/res/skins/LateNight/style.qss @@ -1280,34 +1280,27 @@ QSplitter::handle:vertical { height: 10px; background-color: #0e0e0e;} QLabel, QRadioButton { background: transparent; color: #cfb32c; } /* Additional space for QRadionButtons and QLabels */ -WLibrary QRadioButton, WLibrary QLabel { margin: 6px 3px; } +WLibrary QRadioButton, WLibrary QLabel { margin: 9px 3px 6px 3px; } /* Additional space for the first QRadionButton in the row */ -WLibrary QRadioButton#radioButtonRecentlyAdded { margin: 6px 3px 6px 12px; } +WLibrary QRadioButton#radioButtonRecentlyAdded { margin: 9px 3px 6px 12px; } /* Additional space for the QPushButtons */ #DlgMissing > QPushButton, #DlgHidden > QPushButton, #DlgAutoDJ > QPushButton, #DlgRecording > QPushButton, -#DlgAnalysis > QPushButton { - margin: 6px 3px; - padding: 3px 8px; -} +#DlgAnalysis > QPushButton { margin: 9px 3px 6px 3px; padding: 3px 8px; min-width: 65px; } /* Additional space for the first QPushButton in the row */ #DlgMissing > QPushButton#btnPurge, #DlgHidden > QPushButton#btnUnhide, #DlgAutoDJ > QPushButton#pushButtonAutoDJ, #DlgRecording > QPushButton#pushButtonRecording, -#DlgAnalysis > QPushButton#pushButtonAnalyze { - margin: 6px 12px 6px 3px; -} +#DlgAnalysis > QPushButton#pushButtonAnalyze { margin: 9px 12px 6px 3px; } /* Additional space for the last QPushButton in the row */ -#DlgAutoDJ > QPushButton#pushButtonShuffle { - margin: 6px 3px 6px 12px; -} +#DlgAutoDJ > QPushButton#pushButtonShuffle { margin: 9px 3px 6px 12px; } /* Spacing between treeview and searchbar */ QTreeView { margin: 10px 0px 0px 0px; }