razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Merge pull request #896 from manongjohn/fix_menu_icons_showing

Browse source 
Fix icons showing in menus
This commit is contained in:
manongjohn 2022-02-06 08:55:29 -05:00 committed by GitHub
commit 3f7e59556a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
toonz/sources/toonz/mainwindow.cpp
View file

@ -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."));

37
toonz/sources/toonzqt/paletteviewer.cpp
View file

@ -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);
}
@ -742,7 +728,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) {

4
toonz/sources/toonzqt/schematicviewer.cpp
View file

@ -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");