fix(qml): fix platform menu handling and deck-dependent actions

Author: xARSENICx

CMakeLists.txt

@@ -4573,6 +4573,9 @@ elseif(UNIX AND NOT APPLE AND NOT EMSCRIPTEN AND NOT ANDROID)
   endif()
   find_package(Qt${QT_VERSION_MAJOR} COMPONENTS DBus REQUIRED)
   target_link_libraries(mixxx-lib PUBLIC Qt${QT_VERSION_MAJOR}::DBus)
+  if(QML)
+    target_link_libraries(mixxx-qml-lib PRIVATE Qt${QT_VERSION_MAJOR}::DBus)
+  endif()
 elseif(WIN32)
   if(Qt_IS_STATIC)
     target_link_libraries(

res/qml/ApplicationMenuCommands.qml

@@ -39,7 +39,6 @@ Item {
     function showKeywheel() {
         keywheelDialog.open();
     }
-
     FileDialog {
         id: trackFileDialog
 
@@ -64,21 +63,10 @@ Item {
         text: qsTr("%1 %2").arg(Mixxx.Application.applicationName).arg(Mixxx.Application.version)
         title: qsTr("About %1").arg(Mixxx.Application.applicationName)
     }
-    Dialog {
+    KeywheelDialog {
         id: keywheelDialog
 
-        height: Math.min(620, root.applicationWindow.height - 80)
-        modal: false
-        standardButtons: Dialog.Close
-        title: qsTr("Keywheel")
-        width: height
-        x: Math.round((root.applicationWindow.width - width) / 2)
-        y: Math.round((root.applicationWindow.height - height) / 2)
-
-        contentItem: Image {
-            fillMode: Image.PreserveAspectFit
-            source: "../images/keywheel/keywheel.svg"
-        }
+        applicationWindow: root.applicationWindow
     }
     Mixxx.ControlProxy {
         id: deck1PlayControl

res/qml/KeywheelDialog.qml

@@ -0,0 +1,21 @@
+import QtQuick
+import QtQuick.Controls
+
+Dialog {
+    id: root
+
+    required property ApplicationWindow applicationWindow
+
+    height: Math.min(620, applicationWindow.height - 80)
+    modal: false
+    standardButtons: Dialog.Close
+    title: qsTr("Keywheel")
+    width: height
+    x: Math.round((applicationWindow.width - width) / 2)
+    y: Math.round((applicationWindow.height - height) / 2)
+
+    contentItem: Image {
+        fillMode: Image.PreserveAspectFit
+        source: "../images/keywheel/keywheel.svg"
+    }
+}

res/qml/MainMenuBar.qml

@@ -15,8 +15,6 @@ MenuBar {
 
     signal focusLibrarySearchRequested
 
-    visible: Qt.platform.os === "osx"
-
     Component.onCompleted: {
         if (Mixxx.Application.developerMode) {
             developerMenu = developerMenuComponent.createObject(root);
@@ -204,6 +202,7 @@ MenuBar {
             Action {
                 checkable: true
                 checked: vinylDeck3Control.value > 0
+                enabled: root.numberOfDecks >= 3
                 shortcut: Mixxx.Application.menuShortcut("OptionsMenu_EnableVinyl3", "Ctrl+U")
                 text: qsTr("Enable Vinyl Control 3")
 
@@ -212,6 +211,7 @@ MenuBar {
             Action {
                 checkable: true
                 checked: vinylDeck4Control.value > 0
+                enabled: root.numberOfDecks >= 4
                 shortcut: Mixxx.Application.menuShortcut("OptionsMenu_EnableVinyl4", "Ctrl+I")
                 text: qsTr("Enable Vinyl Control 4")
 

res/qml/main.qml

@@ -34,7 +34,7 @@ ApplicationWindow {
     Loader {
         id: nativeApplicationMenuLoader
 
-        active: Qt.platform.os === "osx"
+        active: Qt.platform.os === "osx" || (Mixxx.Application.supportsGlobalMenuBar && root.visibility !== Window.FullScreen)
 
         sourceComponent: Skin.MainMenuBar {
             applicationWindow: root

src/mixxxmainwindow.cpp

@@ -53,6 +53,7 @@
 #include "track/track.h"
 #include "util/debug.h"
 #include "util/desktophelper.h"
+#include "util/menubarhelper.h"
 #include "util/sandbox.h"
 #include "util/scopedoverridecursor.h"
 #include "util/timer.h"
@@ -69,25 +70,6 @@
 #endif
 
 namespace {
-#ifdef __LINUX__
-// Detect if the desktop supports a global menu to decide whether we need to rebuild
-// and reconnect the menu bar when switching to/from fullscreen mode.
-// Compared to QMenuBar::isNativeMenuBar() (requires a set menu bar) and
-// Qt::AA_DontUseNativeMenuBar, which may both change, this is way more reliable
-// since it's rather unlikely that the Appmenu.Registrar service is unloaded/stopped
-// while Mixxx is running.
-// This is a reimplementation of QGenericUnixTheme > checkDBusGlobalMenuAvailable()
-inline bool supportsGlobalMenu() {
-#ifndef QT_NO_DBUS
-    QDBusConnection conn = QDBusConnection::sessionBus();
-    if (const auto* pIface = conn.interface()) {
-        return pIface->isServiceRegistered("com.canonical.AppMenu.Registrar");
-    }
-#endif
-    return false;
-}
-#endif
-
 const ConfigKey kHideMenuBarConfigKey = ConfigKey("[Config]", "hide_menubar");
 const ConfigKey kMenuBarHintConfigKey = ConfigKey("[Config]", "show_menubar_hint");
 } // namespace
@@ -105,7 +87,7 @@ MixxxMainWindow::MixxxMainWindow(std::shared_ptr<mixxx::CoreServices> pCoreServi
           m_noAuxInputDialog(nullptr),
           m_pGuiTick(nullptr),
 #ifdef __LINUX__
-          m_supportsGlobalMenuBar(supportsGlobalMenu()),
+          m_supportsGlobalMenuBar(mixxx::desktopSupportsGlobalMenuBar()),
 #endif
           m_inRebootMixxxView(false),
           m_pDeveloperToolsDlg(nullptr),

src/qml/qmlapplicationproxy.cpp

@@ -5,6 +5,7 @@
 #include "preferences/configobject.h"
 #include "util/cmdlineargs.h"
 #include "util/experiment.h"
+#include "util/menubarhelper.h"
 #include "util/versionstore.h"
 
 namespace {
@@ -83,6 +84,10 @@ QString QmlApplicationProxy::platform() const {
     return VersionStore::platform();
 }
 
+bool QmlApplicationProxy::supportsGlobalMenuBar() const {
+    return desktopSupportsGlobalMenuBar();
+}
+
 void QmlApplicationProxy::setExperimentStatsEnabled(bool enabled) {
     if (enabled) {
         Experiment::setExperiment();

src/qml/qmlapplicationproxy.h

@@ -27,6 +27,7 @@ class QmlApplicationProxy : public QObject {
     Q_PROPERTY(QString applicationName READ applicationName CONSTANT)
     Q_PROPERTY(QString version READ version CONSTANT)
     Q_PROPERTY(QString platform READ platform CONSTANT)
+    Q_PROPERTY(bool supportsGlobalMenuBar READ supportsGlobalMenuBar CONSTANT)
     QML_NAMED_ELEMENT(Application)
     QML_SINGLETON
 
@@ -44,6 +45,7 @@ class QmlApplicationProxy : public QObject {
     QString applicationName() const;
     QString version() const;
     QString platform() const;
+    bool supportsGlobalMenuBar() const;
 
     Q_INVOKABLE void setExperimentStatsEnabled(bool enabled);
     Q_INVOKABLE void setBaseStatsEnabled(bool enabled);

src/qml/qmllibraryproxy.cpp

@@ -147,20 +147,18 @@ QmlLibraryScannerProxy::QmlLibraryScannerProxy(LibraryScanner* libraryScanner, Q
             });
 }
 
-QmlLibraryProxy::QmlLibraryProxy(
-        std::shared_ptr<Library> pLibrary, QObject* parent)
+QmlLibraryProxy::QmlLibraryProxy(QObject* parent)
         : QObject(parent),
-          m_pLibrary(pLibrary),
           m_pModelProperty(new QmlLibraryTrackListModel(
-                  QList<QmlLibraryTrackListColumn*>{}, m_pLibrary->trackTableModel(), this)),
+                  QList<QmlLibraryTrackListColumn*>{}, s_pLibrary->trackTableModel(), this)),
           m_pScanner(new QmlLibraryScannerProxy(
-                  m_pLibrary->trackCollectionManager()->scanner(), this)) {
+                  s_pLibrary->trackCollectionManager()->scanner(), this)) {
     connect(m_pScanner,
             &QmlLibraryScannerProxy::stateChanged,
             this,
             &QmlLibraryProxy::libraryScanActiveChanged);
     TrackCollectionManager* pTrackCollectionManager =
-            m_pLibrary->trackCollectionManager();
+            s_pLibrary->trackCollectionManager();
     VERIFY_OR_DEBUG_ASSERT(pTrackCollectionManager) {
         return;
     }
@@ -223,16 +221,16 @@ QmlLibraryProxy::QmlLibraryProxy(
                 emit libraryScanSummaryAvailable(title, text, details.join(QLatin1Char('\n')));
             });
 #ifdef __ENGINEPRIME__
-    m_pLibraryExporter = m_pLibrary->makeLibraryExporter(nullptr);
-    connect(m_pLibrary.get(),
+    m_pLibraryExporter = s_pLibrary->makeLibraryExporter(nullptr);
+    connect(s_pLibrary.get(),
             &Library::exportLibrary,
             m_pLibraryExporter.get(),
             &mixxx::LibraryExporter::slotRequestExport);
-    connect(m_pLibrary.get(),
+    connect(s_pLibrary.get(),
             &Library::exportCrate,
             m_pLibraryExporter.get(),
             &mixxx::LibraryExporter::slotRequestExportWithInitialCrate);
-    connect(m_pLibrary.get(),
+    connect(s_pLibrary.get(),
             &Library::exportPlaylist,
             m_pLibraryExporter.get(),
             &mixxx::LibraryExporter::slotRequestExportWithInitialPlaylist);
@@ -468,7 +466,7 @@ QmlLibraryProxy* QmlLibraryProxy::create(QQmlEngine* pQmlEngine, QJSEngine* pJsE
         qWarning() << "Library hasn't been registered yet";
         return nullptr;
     }
-    return new QmlLibraryProxy(s_pLibrary, pQmlEngine);
+    return new QmlLibraryProxy(pQmlEngine);
 }
 
 QmlLibraryProxy::AddResult QmlLibraryProxy::addSource(
@@ -529,11 +527,10 @@ QmlLibraryProxy::RelocateResult QmlLibraryProxy::relinkSource(
 
 // Static
 qsizetype QmlLibraryProxy::sources_count(QQmlListProperty<QmlLibrarySource>* pList) {
-    QmlLibraryProxy* pLibrary = static_cast<QmlLibraryProxy*>(pList->object);
-    VERIFY_OR_DEBUG_ASSERT(pLibrary) {
+    VERIFY_OR_DEBUG_ASSERT(pList && pList->object && s_pLibrary) {
         return 0;
     }
-    return pLibrary->m_pLibrary->trackCollectionManager()
+    return s_pLibrary->trackCollectionManager()
             ->internalCollection()
             ->getRootDirectories()
             .size();
@@ -545,12 +542,11 @@ QmlLibrarySource* QmlLibraryProxy::sources_at(
     VERIFY_OR_DEBUG_ASSERT(pList && pList->object) {
         return nullptr;
     }
-    QmlLibraryProxy* pLibrary = static_cast<QmlLibraryProxy*>(pList->object);
-    VERIFY_OR_DEBUG_ASSERT(pLibrary) {
+    VERIFY_OR_DEBUG_ASSERT(s_pLibrary) {
         return nullptr;
     }
     return make_qml_owned<QmlLibrarySource>(
-            pLibrary->m_pLibrary->trackCollectionManager()
+            s_pLibrary->trackCollectionManager()
                     ->internalCollection()
                     ->getRootDirectories()
                     .at(index));

src/qml/qmllibraryproxy.h

@@ -124,7 +124,7 @@ class QmlLibraryProxy : public QObject {
     };
     Q_ENUM(SourceRemovalType);
 
-    explicit QmlLibraryProxy(std::shared_ptr<Library> pLibrary, QObject* parent = nullptr);
+    explicit QmlLibraryProxy(QObject* parent = nullptr);
     ~QmlLibraryProxy() override;
 
     static QmlLibraryProxy* create(QQmlEngine* pQmlEngine, QJSEngine* pJsEngine);
@@ -200,8 +200,6 @@ class QmlLibraryProxy : public QObject {
   private:
     static inline std::shared_ptr<Library> s_pLibrary;
 
-    std::shared_ptr<Library> m_pLibrary;
-
     /// This needs to be a plain pointer because it's used as a `Q_PROPERTY` member variable.
     QmlLibraryTrackListModel* m_pModelProperty;
     QmlLibraryScannerProxy* m_pScanner;