Merge pull request #22050 from cbjeukendrup/mixer_toolbar

For horizontal panels, show tab bar instead of title bar
musescore · Jan 6, 2025 · 2048dd1 · 2048dd1
2 parents 0b07b33 + a5024fd
commit 2048dd1
Show file tree

Hide file tree

Showing 36 changed files with 567 additions and 328 deletions.
diff --git a/src/appshell/qml/NotationPage/NotationPage.qml b/src/appshell/qml/NotationPage/NotationPage.qml
@@ -45,7 +45,6 @@ DockPage {
     property NotationPageModel pageModel: NotationPageModel {}
 
     property NavigationSection noteInputKeyNavSec: NavigationSection {
-        id: keynavSec
         name: "NoteInputSection"
         order: 2
     }
@@ -124,8 +123,10 @@ DockPage {
             alignment: DockToolBarAlignment.Center
             contentBottomPadding: 2
 
+            navigationSection: root.topToolbarKeyNavSec
+
             NotationToolBar {
-                navigationPanel.section: root.topToolbarKeyNavSec
+                navigationPanel.section: notationToolBar.navigationSection
                 navigationPanel.order: 2
             }
         },
@@ -146,8 +147,10 @@ DockPage {
                 { "dock": notationToolBar, "dropLocation": Location.Right }
             ]
 
+            navigationSection: root.topToolbarKeyNavSec
+
             PlaybackToolBar {
-                navigationPanelSection: root.topToolbarKeyNavSec
+                navigationPanelSection: playbackToolBar.navigationSection
                 navigationPanelOrder: 3
 
                 floating: playbackToolBar.floating
@@ -172,9 +175,13 @@ DockPage {
                 { "dock": playbackToolBar, "dropLocation": Location.Right }
             ]
 
+            navigationSection: root.topToolbarKeyNavSec
+
             ExtensionsToolBar {
                 id: extToolBar
 
+                navigationPanel.section: extDockToolBar.navigationSection
+                navigationPanel.order: 4
 
                 function updateVisible() {
                     if (!extDockToolBar.inited) {
@@ -207,6 +214,8 @@ DockPage {
         },
 
         DockToolBar {
+            id: undoRedoToolBar
+
             objectName: root.pageModel.undoRedoToolBarName()
             title: qsTrc("appshell", "Undo/redo")
 
@@ -218,15 +227,16 @@ DockPage {
             alignment: DockToolBarAlignment.Right
             contentBottomPadding: 2
 
+            navigationSection: root.topToolbarKeyNavSec
+
             UndoRedoToolBar {
-                navigationPanel.section: root.topToolbarKeyNavSec
-                navigationPanel.order: 4
+                navigationPanel.section: undoRedoToolBar.navigationSection
+                navigationPanel.order: 5
             }
         }
     ]
 
     toolBars: [
-
         DockToolBar {
             id: noteInputBar
 
@@ -242,14 +252,16 @@ DockPage {
 
             thickness: orientation === Qt.Horizontal ? 40 : 76
 
+            navigationSection: root.noteInputKeyNavSec
+
             NoteInputBar {
                 orientation: noteInputBar.orientation
                 floating: noteInputBar.floating
 
                 maximumWidth: noteInputBar.width
                 maximumHeight: noteInputBar.height
 
-                navigationPanel.section: root.noteInputKeyNavSec
+                navigationPanel.section: noteInputBar.navigationSection
                 navigationPanel.order: 1
             }
         }
@@ -274,6 +286,7 @@ DockPage {
 
             PalettesPanel {
                 navigationSection: palettesPanel.navigationSection
+                navigationOrderStart: palettesPanel.contentNavigationPanelOrderStart
 
                 Component.onCompleted: {
                     palettesPanel.contextMenuModel = contextMenuModel
@@ -299,6 +312,7 @@ DockPage {
 
             InstrumentsPanel {
                 navigationSection: instrumentsPanel.navigationSection
+                navigationOrderStart: instrumentsPanel.contentNavigationPanelOrderStart
 
                 Component.onCompleted: {
                     instrumentsPanel.contextMenuModel = contextMenuModel
@@ -324,6 +338,7 @@ DockPage {
 
             InspectorForm {
                 navigationSection: inspectorPanel.navigationSection
+                navigationOrderStart: inspectorPanel.contentNavigationPanelOrderStart
                 notationView: root.notationView
             }
         },
@@ -349,6 +364,7 @@ DockPage {
 
             SelectionFilterPanel {
                 navigationSection: selectionFilterPanel.navigationSection
+                navigationOrderStart: selectionFilterPanel.contentNavigationPanelOrderStart
             }
         },
 
@@ -373,6 +389,7 @@ DockPage {
 
             UndoHistoryPanel {
                 navigationSection: undoHistoryPanel.navigationSection
+                navigationOrderStart: undoHistoryPanel.contentNavigationPanelOrderStart
             }
         },
 
@@ -403,9 +420,16 @@ DockPage {
 
             MixerPanel {
                 navigationSection: mixerPanel.navigationSection
+                contentNavigationPanelOrderStart: mixerPanel.contentNavigationPanelOrderStart
 
                 Component.onCompleted: {
                     mixerPanel.contextMenuModel = contextMenuModel
+                    mixerPanel.toolbarComponent = toolbarComponent
+                }
+
+                Component.onDestruction: {
+                    mixerPanel.contextMenuModel = null
+                    mixerPanel.toolbarComponent = null
                 }
 
                 onResizeRequested: function(newWidth, newHeight) {
@@ -437,6 +461,7 @@ DockPage {
 
             PianoKeyboardPanel {
                 navigationSection: pianoKeyboardPanel.navigationSection
+                contentNavigationPanelOrderStart: pianoKeyboardPanel.contentNavigationPanelOrderStart
 
                 Component.onCompleted: {
                     pianoKeyboardPanel.contextMenuModel = contextMenuModel
@@ -467,6 +492,7 @@ DockPage {
 
             Timeline {
                 navigationSection: timelinePanel.navigationSection
+                contentNavigationPanelOrderStart: timelinePanel.contentNavigationPanelOrderStart
             }
         },
 
@@ -491,7 +517,8 @@ DockPage {
             navigationSection: root.navigationPanelSec(drumsetPanel.location)
 
             DrumsetPanel {
-                navigationSection: timelinePanel.navigationSection
+                navigationSection: drumsetPanel.navigationSection
+                contentNavigationPanelOrderStart: drumsetPanel.contentNavigationPanelOrderStart
             }
         },
 
@@ -518,10 +545,10 @@ DockPage {
 
             PercussionPanel {
                 navigationSection: percussionPanel.navigationSection
+                contentNavigationPanelOrderStart: percussionPanel.contentNavigationPanelOrderStart
 
                 // TODO: #22050 needed for this
                 /*
-                // contentNavigationPanelOrderStart: percussionPanel.contentNavigationPanelOrderStart
 
                 Component.onCompleted: {
                     percussionPanel.contextMenuModel = contextMenuModel
@@ -559,7 +586,7 @@ DockPage {
     statusBar: DockStatusBar {
         objectName: root.pageModel.statusBarName()
 
-        contentNavigationPanel: content.navigationPanel
+        navigationSection: content.navigationSection
 
         NotationStatusBar {
             id: content

diff --git a/src/appshell/qml/NotationPage/NotationStatusBar.qml b/src/appshell/qml/NotationPage/NotationStatusBar.qml
@@ -36,14 +36,15 @@ Item {
         id: model
     }
 
-    NavigationSection {
+    property NavigationSection navigationSection: NavigationSection {
         id: navSec
         name: "NotationStatusBar"
         enabled: root.enabled && root.visible
         order: 8
     }
 
-    property NavigationPanel navigationPanel: NavigationPanel {
+    NavigationPanel {
+        id: navPanel
         name: "NotationStatusBar"
         enabled: root.enabled && root.visible
         order: 0
@@ -112,7 +113,7 @@ Item {
             transparent: true
             visible: statusBarRow.remainingSpace > width + concertPitchControl.width
 
-            navigation.panel: root.navigationPanel
+            navigation.panel: navPanel
             navigation.order: 1
 
             onClicked: {
@@ -133,7 +134,7 @@ Item {
             enabled: model.concertPitchItem.enabled
             visible: statusBarRow.remainingSpace > width
 
-            navigation.panel: root.navigationPanel
+            navigation.panel: navPanel
             navigation.order: 2
 
             onToggleConcertPitchRequested: {
@@ -151,7 +152,7 @@ Item {
             currentViewMode: model.currentViewMode
             availableViewModeList: model.availableViewModeList
 
-            navigation.panel: root.navigationPanel
+            navigation.panel: navPanel
             navigation.order: 3
 
             onChangeCurrentViewModeRequested: function(newViewMode) {
@@ -170,7 +171,7 @@ Item {
             maxZoomPercentage: model.maxZoomPercentage()
             availableZoomList: model.availableZoomList
 
-            navigationPanel: root.navigationPanel
+            navigationPanel: navPanel
             navigationOrderMin: 4
 
             onChangeZoomPercentageRequested: function(newZoomPercentage) {
@@ -200,7 +201,7 @@ Item {
             visible: !concertPitchControl.visible ||
                      !workspaceControl.visible
 
-            navigation.panel: root.navigationPanel
+            navigation.panel: navPanel
             navigation.order: zoomControl.navigationOrderMax + 1
 
             menuModel: {

diff --git a/src/appshell/qml/PublishPage/PublishPage.qml b/src/appshell/qml/PublishPage/PublishPage.qml
@@ -62,8 +62,10 @@ DockPage {
             alignment: DockToolBarAlignment.Center
             contentBottomPadding: 2
 
+            navigationSection: root.topToolbarKeyNavSec
+
             NotationToolBar {
-                navigationPanel.section: root.topToolbarKeyNavSec
+                navigationPanel.section: notationToolBar.navigationSection
                 navigationPanel.order: 2
             }
         },
@@ -78,8 +80,10 @@ DockPage {
             alignment: DockToolBarAlignment.Right
             contentBottomPadding: 2
 
+            navigationSection: root.topToolbarKeyNavSec
+
             PlaybackToolBar {
-                navigationPanelSection: root.topToolbarKeyNavSec
+                navigationPanelSection: playbackToolBar.navigationSection
                 navigationPanelOrder: 3
 
                 floating: playbackToolBar.floating
@@ -100,21 +104,28 @@ DockPage {
             alignment: DockToolBarAlignment.Right
             contentBottomPadding: 2
 
+            navigationSection: root.topToolbarKeyNavSec
+
             UndoRedoToolBar {
-                navigationPanel.section: root.topToolbarKeyNavSec
+                navigationPanel.section: undoRedoToolBar.navigationSection
                 navigationPanel.order: 4
             }
         }
     ]
 
     toolBars: [
         DockToolBar {
+            id: publishToolBar
+
             objectName: "publishToolBar"
+            title: qsTrc("appshell", "Publish toolbar")
 
             floatable: false
 
+            navigationSection: root.publishToolBarKeyNavSec
+
             PublishToolBar {
-                navigationPanel.section: root.publishToolBarKeyNavSec
+                navigationPanel.section: publishToolBar.navigationSection
                 navigationPanel.order: 1
             }
         }
@@ -128,6 +139,10 @@ DockPage {
     statusBar: DockStatusBar {
         objectName: "publishStatusBar"
 
-        NotationStatusBar {}
+        navigationSection: content.navigationSection
+
+        NotationStatusBar {
+            id: content
+        }
     }
 }
diff --git a/src/appshell/qml/WindowContent.qml b/src/appshell/qml/WindowContent.qml
@@ -66,9 +66,11 @@ DockWindow {
             floatable: false
             closable: false
 
+            navigationSection: topToolbarKeyNavSec
+
             MainToolBar {
                 id: toolBar
-                navigation.section: topToolbarKeyNavSec
+                navigation.section: mainToolBar.navigationSection
                 navigation.order: 1
 
                 currentUri: root.currentPageUri

diff --git a/src/framework/dockwindow/dock.qrc b/src/framework/dockwindow/dock.qrc
@@ -7,7 +7,9 @@
         <file>qml/Muse/Dock/DockPanel.qml</file>
         <file>qml/Muse/Dock/DockPanelTab.qml</file>
         <file>qml/Muse/Dock/DockSeparator.qml</file>
+        <file>qml/Muse/Dock/DockTabBar.qml</file>
         <file>qml/Muse/Dock/DockTitleBar.qml</file>
+        <file>qml/Muse/Dock/DockTitleBarMouseArea.qml</file>
         <file>qml/Muse/Dock/DockToolBar.qml</file>
         <file>qml/Muse/Dock/DockWidget.qml</file>
         <file>qml/Muse/Dock/qmldir</file>

diff --git a/src/framework/dockwindow/docktypes.h b/src/framework/dockwindow/docktypes.h
@@ -31,6 +31,7 @@ namespace muse::dock {
 inline const char* CONTEXT_MENU_MODEL_PROPERTY("contextMenuModel");
 inline const char* DOCK_PANEL_PROPERTY("dockPanel");
 inline const char* TITLEBAR_PROPERTY("titleBar");
+inline const char* TOOLBAR_COMPONENT_PROPERTY("toolbarComponent");
 
 //! NOTE: need to be synchronized with Window shadow(see DockFloatingWindow margins)
 inline constexpr int DOCK_WINDOW_SHADOW(8);