Merge pull request #2362 from Holzhaus/new-cue-menu

src/widget: Replace CueMenu implementation with a custom popup
mixxxdj · Dec 4, 2019 · 9b5f544 · 9b5f544
2 parents 4b38536 + 9cefcfb
commit 9b5f544
Show file tree

Hide file tree

Showing 21 changed files with 464 additions and 190 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -617,19 +617,19 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/waveform/widgets/rgbwaveformwidget.cpp
   src/waveform/widgets/softwarewaveformwidget.cpp
   src/waveform/widgets/waveformwidgetabstract.cpp
-  src/widget/colormenu.cpp
   src/widget/controlwidgetconnection.cpp
-  src/widget/cuemenu.cpp
   src/widget/hexspinbox.cpp
   src/widget/paintable.cpp
   src/widget/wanalysislibrarytableview.cpp
   src/widget/wbasewidget.cpp
   src/widget/wbattery.cpp
   src/widget/wbeatspinbox.cpp
+  src/widget/wcolorpicker.cpp
   src/widget/wcombobox.cpp
   src/widget/wcoverart.cpp
   src/widget/wcoverartlabel.cpp
   src/widget/wcoverartmenu.cpp
+  src/widget/wcuemenupopup.cpp
   src/widget/wdisplay.cpp
   src/widget/weffect.cpp
   src/widget/weffectbuttonparameter.cpp

diff --git a/build/depends.py b/build/depends.py
@@ -930,9 +930,7 @@ def sources(self, build):
                    "src/sources/soundsourceproviderregistry.cpp",
                    "src/sources/soundsourceproxy.cpp",
 
-                   "src/widget/colormenu.cpp",
                    "src/widget/controlwidgetconnection.cpp",
-                   "src/widget/cuemenu.cpp",
                    "src/widget/wbasewidget.cpp",
                    "src/widget/wwidget.cpp",
                    "src/widget/wwidgetgroup.cpp",
@@ -983,6 +981,8 @@ def sources(self, build):
                    "src/widget/wcoverart.cpp",
                    "src/widget/wcoverartlabel.cpp",
                    "src/widget/wcoverartmenu.cpp",
+                   "src/widget/wcolorpicker.cpp",
+                   "src/widget/wcuemenupopup.cpp",
                    "src/widget/wsingletoncontainer.cpp",
                    "src/widget/wmainmenubar.cpp",
 

diff --git a/res/images/ic_checkmark.svg b/res/images/ic_checkmark.svg
diff --git a/res/images/ic_delete.svg b/res/images/ic_delete.svg
diff --git a/res/mixxx.qrc b/res/mixxx.qrc
@@ -30,6 +30,8 @@
         <file>images/mixxx_icon.svg</file> <!-- icon in 'About' dialog -->
         <file>images/mixxx-icon-logo-symbolic.svg</file> <!-- default launch image -->
         <file>images/skin_preview_placeholder.png</file>
+        <file>images/ic_checkmark.svg</file>
+        <file>images/ic_delete.svg</file>
         <file>images/preferences/ic_preferences_autodj.svg</file>
         <file>images/preferences/ic_preferences_bpmdetect.svg</file>
         <file>images/preferences/ic_preferences_broadcast.svg</file>
@@ -55,6 +57,7 @@
         <file>shaders/filteredsignal.frag</file>
         <file>shaders/passthrough.vert</file>
         <file>shaders/rgbsignal.frag</file>
+        <file>skins/default.qss</file>
         <file>translations/mixxx_ar.qm</file>
         <file>translations/mixxx_ast.qm</file>
         <file>translations/mixxx_bg.qm</file>

diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
@@ -789,7 +789,7 @@ QAbstractScrollArea::corner {
   background-color: #222;
 }
 
-WWidget, QLabel {
+WWidget, WLibrary QLabel {
   font-family: "Open Sans";
   font-size: 12px;
   text-transform: uppercase;

diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
@@ -5,8 +5,8 @@
 }
 
 #Mixxx, WWidget,
-WLabel, QLabel,
-WPushButton, QPushButton,
+WLabel, WLibrary QLabel,
+WPushButton, WLibrary QPushButton,
 WEffect, WEffectSelector,
 WBeatSpinBox,
 QSpinBox {
@@ -26,16 +26,11 @@ WBeatSpinBox,
 QSpinBox,
 /* Hotcue labels in the overview */
 WOverview,
-/* Edit label and pushbuttons in the hotcue label edit dialog */
-WOverview QLabel,
-WOverview QPushButton {
+/* 'Edit' label in the hotcue label edit dialog */
+WOverview QLabel {
   font-family: "Open Sans";
   text-transform: none;
 }
-WOverview QLabel,
-WOverview QPushButton {
-  font-weight: normal;
-}
 
 QToolTip {
   font-family: Ubuntu;
@@ -47,7 +42,7 @@ QToolTip {
   border-radius: 2px;
 }
 
-WPushButton, QPushButton {
+WPushButton, WLibary QPushButton {
   font-size: 11px/12px;
 }
 
@@ -477,7 +472,7 @@ WOverview {
   color: #0bd9d1;
 }
 
-QLabel, QRadioButton,
+WLibary QLabel, WLibary QRadioButton,
 WSearchLineEdit,
 #LibraryBPMSpinBox,
 #LibraryBPMButton::item,
@@ -577,8 +572,6 @@ WTime {
     font-size: 10px/10px;
   }
 
-
-
 /********************** Decks **********************/
 #DeckRow_1_KeyVinylFx {
   qproperty-layoutAlignment: 'AlignLeft | AlignTop';

diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
@@ -433,10 +433,10 @@ QSplitter::handle:pressed { image: url(skin:/style/style_handle_checked.png); ba
 QSplitter::handle:horizontal { width: 6px; }
 QSplitter::handle:vertical { height: 6px;}
 
-QPushButton { font-size: 10pt;
+WLibrary QPushButton { font-size: 10pt;
   font-family: "Open Sans";}
 /* Extra declaration for QRadionButton otherwise it shows up with wrong colors in Linux with Gnome */
-QLabel, QRadioButton {
+WLibrary QLabel, WLibrary QRadioButton {
   font-size: 10pt;
   background: transparent;
   color: #C1C1C1;}

diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
@@ -94,7 +94,6 @@ WWidgetGroup {
       image: url(skin:/graphics/splitterVert_handle_pressed.svg);
     }
 
-
 /* ################################################################
 ####### Colors ##################################################
 ###############################################################*/

diff --git a/res/skins/default.qss b/res/skins/default.qss
@@ -0,0 +1,11 @@
+WCueMenuPopup #CueDeleteButton {
+  qproperty-icon: url(:/images/ic_delete.svg);
+}
+
+WColorPicker QPushButton[checked="false"] {
+  qproperty-icon: none;
+}
+
+WColorPicker QPushButton[checked="true"] {
+  qproperty-icon: url(:/images/ic_checkmark.svg);
+}
diff --git a/src/mixxx.cpp b/src/mixxx.cpp
@@ -468,6 +468,17 @@ void MixxxMainWindow::initialize(QApplication* pApp, const CmdlineArgs& args) {
 
     QWidget* oldWidget = m_pWidgetParent;
 
+    // Load default styles that can be overridden by skins
+    QFile file(":/skins/default.qss");
+    if (file.open(QIODevice::ReadOnly)) {
+        QByteArray fileBytes = file.readAll();
+        QString style = QString::fromLocal8Bit(fileBytes.constData(),
+                                               fileBytes.length());
+        setStyleSheet(style);
+    } else {
+        qWarning() << "Failed to load default skin styles!";
+    }
+
     // Load skin to a QWidget that we set as the central widget. Assignment
     // intentional in next line.
     if (!(m_pWidgetParent = m_pSkinLoader->loadConfiguredSkin(this, m_pKeyboard,

diff --git a/src/widget/colormenu.cpp b/src/widget/colormenu.cpp
diff --git a/src/widget/colormenu.h b/src/widget/colormenu.h
diff --git a/src/widget/cuemenu.cpp b/src/widget/cuemenu.cpp