Text/Icon fixes, cleanup

muse3/ChangeLog

@@ -1,3 +1,8 @@
+15.02.2021
+    - Fix: Consistent sorting and terminology of all Functions menus. (kybos)
+    - Fix: Dummy icon to work around Qt>5.12 menu styling bugs. (kybos)
+    - Fix: Script popup couldn't be cancelled. (kybos)
+    - Add: New vector icons for Quantize/Set range to selection. (kybos)
 14.02.2021
     - Rework: Removed LastEditedEvent from configuration and added it (rj)
       to the pianoroll specific edit menu instead + shortcut.

muse3/muse/icons.cpp

@@ -101,7 +101,6 @@
 #include "xpm/velo_per_note.xpm"
 
 #include "xpm/midi_transform.xpm"
-#include "xpm/select.xpm"
 #include "xpm/select_all.xpm"
 #include "xpm/select_all_parts_on_track.xpm"
 #include "xpm/select_deselect_all.xpm"
@@ -180,7 +179,6 @@ QIcon* ledGreenIcon;
 QIcon* ledDarkGreenIcon;
 
 QPixmap* midi_transformIcon;
-QPixmap* selectIcon;
 QPixmap* select_allIcon;
 QPixmap* select_all_parts_on_trackIcon;
 QPixmap* select_deselect_allIcon;
@@ -539,7 +537,6 @@ void initIcons(int cursorSize, const QString& gpath, const QString& upath)
     veloPerNote_OffIcon  = new QPixmap(velo_all_xpm);
 
     midi_transformIcon            = new QPixmap(midi_transform_xpm);
-    selectIcon                    = new QPixmap(select_xpm);
     select_allIcon                = new QPixmap(select_all_xpm);
     select_all_parts_on_trackIcon = new QPixmap(select_all_parts_on_track_xpm);
     select_deselect_allIcon       = new QPixmap(select_deselect_all);
@@ -878,7 +875,6 @@ void deleteIcons()
     delete veloPerNote_OffIcon;
 
     delete midi_transformIcon;
-    delete selectIcon;
     delete select_allIcon;
     delete select_all_parts_on_trackIcon;
     delete select_deselect_allIcon;

muse3/muse/icons.h

@@ -92,7 +92,6 @@ extern QPixmap* veloPerNote_OnIcon;
 extern QPixmap* veloPerNote_OffIcon;
 
 extern QPixmap* midi_transformIcon;
-extern QPixmap* selectIcon;
 extern QPixmap* select_allIcon;
 extern QPixmap* select_all_parts_on_trackIcon;
 extern QPixmap* select_deselect_allIcon;

muse3/muse/midiedit/drumedit.cpp

@@ -278,7 +278,7 @@ DrumEdit::DrumEdit(MusECore::PartList* pl, QWidget* parent, const char* name, un
       connect(deleteAction, &QAction::triggered, [this]() { cmd(DrumCanvas::CMD_DEL); } );
 
       menuEdit->addSeparator();
-      menuSelect = menuEdit->addMenu(QIcon(*selectIcon), tr("&Select"));
+      menuSelect = menuEdit->addMenu(tr("&Select"));
 
       sallAction = menuSelect->addAction(QIcon(*select_allIcon), tr("Select All"));
       snoneAction = menuSelect->addAction(QIcon(*select_deselect_allIcon), tr("Select None"));
@@ -373,7 +373,7 @@ DrumEdit::DrumEdit(MusECore::PartList* pl, QWidget* parent, const char* name, un
       QMenu* menuShowHide=settingsMenu->addMenu(tr("Show/Hide"));
       QAction* ignoreHideAction = menuShowHide->addAction(tr("Also Show Hidden Instruments"));
       menuShowHide->addSeparator();
-      QAction* showAllAction = menuShowHide->addAction(tr("Show All Instruments"));
+      QAction* showAllAction = menuShowHide->addAction(*dummySVGIcon, tr("Show All Instruments"));
       QAction* hideAllAction = menuShowHide->addAction(tr("Hide All Instruments"));
       QAction* hideUnusedAction = menuShowHide->addAction(tr("Only Show Used Instruments"));
       QAction* hideEmptyAction = menuShowHide->addAction(tr("Only Show Instruments With Non-empty Name or Used Instruments"));

muse3/muse/midiedit/pianoroll.cpp

@@ -188,7 +188,7 @@ PianoRoll::PianoRoll(MusECore::PartList* pl, QWidget* parent, const char* name,
 
       menuEdit->addSeparator();
 
-      menuSelect = menuEdit->addMenu(QIcon(*selectIcon), tr("&Select"));
+      menuSelect = menuEdit->addMenu(tr("&Select"));
 
       selectAllAction = menuSelect->addAction(QIcon(*select_allIcon), tr("Select &All"));
       connect(selectAllAction, &QAction::triggered, [this]() { cmd(PianoCanvas::CMD_SELECT_ALL); } );

muse3/muse/midiedit/scoreedit.cpp

@@ -415,7 +415,7 @@ ScoreEdit::ScoreEdit(QWidget* parent, const char* name, unsigned initPos)
 
         edit_menu->addSeparator();
 
-        QMenu* select_menu = edit_menu->addMenu(QIcon(*selectIcon), tr("&Select"));
+        QMenu* select_menu = edit_menu->addMenu(tr("&Select"));
 
             select_all_action = select_menu->addAction(QIcon(*select_allIcon), tr("Select &All"));
             connect(select_all_action, &QAction::triggered, [this]() { menu_command(CMD_SELECT_ALL); } );

muse3/muse/waveedit/waveedit.cpp

@@ -163,7 +163,7 @@ WaveEdit::WaveEdit(MusECore::PartList* pl, QWidget* parent, const char* name)
       selectAllAction = menuEdit->addAction(QIcon(*select_allIcon), tr("Select &All"));
       connect(selectAllAction, &QAction::triggered, [this]() { cmd(WaveCanvas::CMD_SELECT_ALL); } );
 
-      selectNoneAction = menuEdit->addAction(QIcon(*select_allIcon), tr("&Deselect All"));
+      selectNoneAction = menuEdit->addAction(QIcon(*select_deselect_allIcon), tr("&Deselect All"));
       connect(selectNoneAction, &QAction::triggered, [this]() { cmd(WaveCanvas::CMD_SELECT_NONE); } );
 
       menuEdit->addSeparator();