Merge pull request #16699 from xARSENICx/agent/remove-qml-deck-track-menu

Remove qt wideget deck track menu from QML

Author: JoergAtGithub

src/qml/qmllibraryproxy.cpp

@@ -1,8 +1,6 @@
 #include "qml/qmllibraryproxy.h"
 
 #include <QAbstractItemModel>
-#include <QCursor>
-#include <QPoint>
 #include <QQmlEngine>
 #include <cmath>
 
@@ -16,9 +14,7 @@
 #include "qmltrackproxy.h"
 #include "track/cue.h"
 #include "track/track.h"
-#include "track/track_decl.h"
 #include "util/assert.h"
-#include "widget/wtrackmenu.h"
 
 namespace mixxx {
 namespace qml {
@@ -122,48 +118,6 @@ void QmlLibraryProxy::analyze(const QmlTrackProxy* track) const {
     emit s_pLibrary->analyzeTracks({track->internal()->getId()});
 }
 
-void QmlLibraryProxy::showDeckTrackMenu(
-        QmlTrackProxy* track,
-        const QString& group,
-        const QString& property,
-        int globalXPosition,
-        int globalYPosition) {
-    VERIFY_OR_DEBUG_ASSERT(track && track->internal()) {
-        return;
-    }
-
-    ensureDeckTrackMenu();
-    VERIFY_OR_DEBUG_ASSERT(m_pDeckTrackMenu) {
-        return;
-    }
-
-    m_pDeckTrackMenu->loadTrack(track->internal(), group);
-    m_pDeckTrackMenu->updateMenus();
-    m_pDeckTrackMenu->setTrackPropertyName(property);
-    const QPoint globalPosition = globalXPosition >= 0 && globalYPosition >= 0
-            ? QPoint(globalXPosition, globalYPosition)
-            : QCursor::pos();
-    m_pDeckTrackMenu->popup(globalPosition);
-}
-
-void QmlLibraryProxy::showDeckTrackProperties(
-        QmlTrackProxy* track,
-        const QString& group,
-        const QString& property) {
-    VERIFY_OR_DEBUG_ASSERT(track && track->internal()) {
-        return;
-    }
-
-    ensureDeckTrackMenu();
-    VERIFY_OR_DEBUG_ASSERT(m_pDeckTrackMenu) {
-        return;
-    }
-
-    m_pDeckTrackMenu->loadTrack(track->internal(), group);
-    m_pDeckTrackMenu->setTrackPropertyName(property);
-    m_pDeckTrackMenu->slotShowDlgTrackInfo();
-}
-
 QString QmlLibraryProxy::deckHotcueLabel(
         QmlTrackProxy* track,
         int hotcueNumber) const {
@@ -300,38 +254,6 @@ void QmlLibraryProxy::cleanupDeckHotcuePopup(
     }
 }
 
-void QmlLibraryProxy::ensureDeckTrackMenu() {
-    if (m_pDeckTrackMenu) {
-        return;
-    }
-
-    VERIFY_OR_DEBUG_ASSERT(s_pLibrary && QmlConfigProxy::get()) {
-        return;
-    }
-
-    m_pDeckTrackMenu = std::make_unique<WTrackMenu>(
-            nullptr,
-            QmlConfigProxy::get(),
-            s_pLibrary.get(),
-            WTrackMenu::kDeckTrackMenuFeatures);
-    connect(m_pDeckTrackMenu.get(),
-            &WTrackMenu::trackMenuVisible,
-            this,
-            [this](bool visible) {
-                ControlObject::set(
-                        ConfigKey(m_pDeckTrackMenu->getDeckGroup(), kShowTrackMenuKey),
-                        visible ? 1.0 : 0.0);
-            });
-    connect(m_pDeckTrackMenu.get(),
-            &WTrackMenu::saveCurrentViewState,
-            s_pLibrary.get(),
-            &Library::slotSaveCurrentViewState);
-    connect(m_pDeckTrackMenu.get(),
-            &WTrackMenu::restoreCurrentViewStateOrIndex,
-            s_pLibrary.get(),
-            &Library::slotRestoreCurrentViewState);
-}
-
 // static
 QmlLibraryProxy* QmlLibraryProxy::create(QQmlEngine* pQmlEngine, QJSEngine* pJsEngine) {
     // The implementation of this method is mostly taken from the code example

src/qml/qmllibraryproxy.h

@@ -10,7 +10,6 @@
 
 class Library;
 class KeyboardEventFilter;
-class WTrackMenu;
 
 namespace mixxx {
 namespace qml {
@@ -46,16 +45,6 @@ class QmlLibraryProxy : public QObject {
 
     QmlLibraryTrackListModel* model() const;
     Q_INVOKABLE void analyze(const mixxx::qml::QmlTrackProxy* track) const;
-    Q_INVOKABLE void showDeckTrackMenu(
-            mixxx::qml::QmlTrackProxy* track,
-            const QString& group,
-            const QString& property,
-            int globalXPosition,
-            int globalYPosition);
-    Q_INVOKABLE void showDeckTrackProperties(
-            mixxx::qml::QmlTrackProxy* track,
-            const QString& group,
-            const QString& property);
     Q_INVOKABLE QString deckHotcueLabel(
             mixxx::qml::QmlTrackProxy* track,
             int hotcueNumber) const;
@@ -73,12 +62,8 @@ class QmlLibraryProxy : public QObject {
             int hotcueNumber);
 
   private:
-    void ensureDeckTrackMenu();
-
     static inline std::shared_ptr<Library> s_pLibrary;
     static inline std::shared_ptr<KeyboardEventFilter> s_pKeyboard;
-
-    std::unique_ptr<WTrackMenu> m_pDeckTrackMenu;
 };
 
 } // namespace qml