From 1fc47d517a779906ee16eb3996331fa447ab0395 Mon Sep 17 00:00:00 2001
From: manongjohn <manongjohn@users.noreply.github.com>
Date: Sat, 29 Jan 2022 06:59:12 -0500
Subject: [PATCH] Fix icons showing in menus

---
 toonz/sources/toonz/mainwindow.cpp        |  6 ++--
 toonz/sources/toonzqt/paletteviewer.cpp   | 37 +++++++----------------
 toonz/sources/toonzqt/schematicviewer.cpp |  4 ---
 3 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp
index 10eb8171..dc6e67cf 100644
--- a/toonz/sources/toonz/mainwindow.cpp
+++ b/toonz/sources/toonz/mainwindow.cpp
@@ -2005,7 +2005,7 @@ void MainWindow::defineActions() {
   createMenuXsheetAction(MI_MergeColumns, QT_TR_NOOP("&Merge Levels"), "",
                          "merge_levels");
   createMenuXsheetAction(MI_InsertFx, QT_TR_NOOP("&New FX..."), "Ctrl+F",
-                         "fx_new");
+                         "fx_logo");
   createMenuXsheetAction(MI_NewOutputFx, QT_TR_NOOP("&New Output"), "Alt+O",
                          "output");
   createMenuXsheetAction(MI_InsertSceneFrame, QT_TR_NOOP("Insert Frame"), "",
@@ -2313,10 +2313,10 @@ void MainWindow::defineActions() {
   // Right Click
 
   createRightClickMenuAction(MI_SavePaletteAs,
-                             QT_TR_NOOP("&Save Palette As..."), "", "",
+                             QT_TR_NOOP("&Save Palette As..."), "", "saveas",
                              tr("Save the current style palette as a separate file with a new name."));
   createRightClickMenuAction(MI_OverwritePalette, QT_TR_NOOP("&Save Palette"),
-                             "", "", tr("Save the current style palette as a separate file."));
+                             "", "save", tr("Save the current style palette as a separate file."));
   createRightClickMenuAction(MI_RegeneratePreview,
                              QT_TR_NOOP("&Regenerate Preview"), "", "",
                              tr("Recreates a set of preview images."));
diff --git a/toonz/sources/toonzqt/paletteviewer.cpp b/toonz/sources/toonzqt/paletteviewer.cpp
index 29555796..d79d2378 100644
--- a/toonz/sources/toonzqt/paletteviewer.cpp
+++ b/toonz/sources/toonzqt/paletteviewer.cpp
@@ -506,23 +506,12 @@ void PaletteViewer::createSavePaletteToolBar() {
   });
   m_viewMode->addAction(m_showStyleIndex);
 
-  // QIcon saveAsPaletteIcon = createQIconOnOff("savepaletteas", false);
-  QIcon saveAsPaletteIcon = createQIcon("saveas");
-  QAction *saveAsPalette  = new QAction(
-      saveAsPaletteIcon, tr("&Save Palette As"), m_savePaletteToolBar);
-  saveAsPalette->setToolTip(tr("Save palette with a different name."));
-  // overwrite palette
-  QIcon savePaletteIcon = createQIcon("save");
-  QAction *savePalette =
-      new QAction(savePaletteIcon, tr("&Save Palette"), m_savePaletteToolBar);
-  savePalette->setToolTip(tr("Save the palette."));
-  QAction *saveDefaultPalette =
-      new QAction(tr("&Save As Default Palette"), m_savePaletteToolBar);
-  saveDefaultPalette->setToolTip(
-      tr("Save the palette as the default for new levels of the current level "
-         "type."));
-
   if (m_viewType == STUDIO_PALETTE) {
+    QIcon savePaletteIcon = createQIcon("save");
+    QAction *savePalette =
+        new QAction(savePaletteIcon, tr("&Save Palette"), m_savePaletteToolBar);
+    savePalette->setToolTip(tr("Save the palette."));
+
     connect(savePalette, SIGNAL(triggered()), this, SLOT(saveStudioPalette()));
     // m_viewMode->addSeparator();
     // m_viewMode->addAction(savePalette);
@@ -532,21 +521,18 @@ void PaletteViewer::createSavePaletteToolBar() {
     m_viewMode->addSeparator();
 
     // overwrite palette
-    connect(savePalette, SIGNAL(triggered()),
-            CommandManager::instance()->getAction("MI_OverwritePalette"),
-            SIGNAL(triggered()));
+    QAction *savePalette =
+        CommandManager::instance()->getAction("MI_OverwritePalette");
     m_viewMode->addAction(savePalette);
 
     // save palette as
-    connect(saveAsPalette, SIGNAL(triggered()),
-            CommandManager::instance()->getAction("MI_SavePaletteAs"),
-            SIGNAL(triggered()));
+    QAction *saveAsPalette =
+        CommandManager::instance()->getAction("MI_SavePaletteAs");
     m_viewMode->addAction(saveAsPalette);
 
     // save as default palette
-    connect(saveDefaultPalette, SIGNAL(triggered()),
-            CommandManager::instance()->getAction("MI_SaveAsDefaultPalette"),
-            SIGNAL(triggered()));
+    QAction *saveDefaultPalette =
+        CommandManager::instance()->getAction("MI_SaveAsDefaultPalette");
     m_viewMode->addAction(saveDefaultPalette);
   }
 
@@ -736,7 +722,6 @@ void PaletteViewer::setSaveDefaultText(QAction *action, int levelType) {
     action->setText(tr("&Save As Default Palette"));
     break;
   }
-  action->setIcon(createQIcon("save"));
 }
 
 void PaletteViewer::contextMenuEvent(QContextMenuEvent *event) {
diff --git a/toonz/sources/toonzqt/schematicviewer.cpp b/toonz/sources/toonzqt/schematicviewer.cpp
index 8d639747..a0cad409 100644
--- a/toonz/sources/toonzqt/schematicviewer.cpp
+++ b/toonz/sources/toonzqt/schematicviewer.cpp
@@ -1047,10 +1047,6 @@ void SchematicViewer::createActions() {
 
       // InsertFx
       insertFx = CommandManager::instance()->getAction("MI_InsertFx");
-      if (insertFx) {
-        QIcon insertFxIcon = createQIcon("fx_logo");
-        insertFx->setIcon(insertFxIcon);
-      }
 
       // AddOutputFx
       addOutputFx = CommandManager::instance()->getAction("MI_NewOutputFx");