new settings toolbar

pedrolcl · Jan 4, 2025 · 20ac0b3 · 20ac0b3
1 parent 37a4c2a
commit 20ac0b3
Show file tree

Hide file tree

Showing 4 changed files with 178 additions and 71 deletions.
diff --git a/data/midicfg.png b/data/midicfg.png
diff --git a/data/vmpk.qrc b/data/vmpk.qrc
@@ -6,6 +6,7 @@
         <file>led_grey.png</file>
         <file>list-add.png</file>
         <file>list-remove.png</file>
+        <file>midicfg.png</file>
         <file>gmgsxg.ins</file>
         <file>wrench.png</file>
     </qresource>

diff --git a/src/vpiano.cpp b/src/vpiano.cpp
@@ -49,16 +49,17 @@
 #include <drumstick/settingsfactory.h>
 #include <drumstick/configurationdialogs.h>
 
-#include "vpiano.h"
-#include "instrument.h"
-#include "mididefs.h"
+#include "about.h"
+#include "colordialog.h"
 #include "constants.h"
-#include "riffimportdlg.h"
 #include "extracontrols.h"
-#include "about.h"
-#include "preferences.h"
+#include "iconutils.h"
+#include "instrument.h"
+#include "mididefs.h"
 #include "midisetup.h"
-#include "colordialog.h"
+#include "preferences.h"
+#include "riffimportdlg.h"
+#include "vpiano.h"
 #include "vpianosettings.h"
 
 #if !defined(SMALL_SCREEN)
@@ -116,6 +117,9 @@ VPiano::VPiano( QWidget * parent, Qt::WindowFlags flags )
     orientationGroup->addAction(ui.actionAutomatic);
     connect(orientationGroup, &QActionGroup::triggered, this, &VPiano::slotNameOrientation);
 
+    ui.actionConnections->setIcon(IconUtils::GetIcon("midicfg"));
+    ui.actionPreferences->setIcon(IconUtils::GetIcon("wrench"));
+
     connect(ui.pianokeybd, &PianoKeybd::signalName, this, &VPiano::slotNoteName);
     connect(ui.actionAbout, &QAction::triggered, this, &VPiano::slotAbout);
     connect(ui.actionAboutQt, &QAction::triggered, this, &VPiano::slotAboutQt);
@@ -141,6 +145,10 @@ VPiano::VPiano( QWidget * parent, Qt::WindowFlags flags )
     connect(ui.actionLoad_Configuration, &QAction::triggered, this, &VPiano::slotLoadConfiguration);
     connect(ui.actionSave_Configuration, &QAction::triggered, this, &VPiano::slotSaveConfiguration);
     // Toolbars actions: toggle view
+    connect(ui.toolBarSettings->toggleViewAction(),
+            &QAction::toggled,
+            ui.actionSettings,
+            &QAction::setChecked);
     connect(ui.toolBarNotes->toggleViewAction(),
             &QAction::toggled,
             ui.actionNotes,