Fix icons showing in menus
This commit is contained in:
parent
0f36cd1b8f
commit
1fc47d517a
3 changed files with 14 additions and 33 deletions
|
@ -2005,7 +2005,7 @@ void MainWindow::defineActions() {
|
||||||
createMenuXsheetAction(MI_MergeColumns, QT_TR_NOOP("&Merge Levels"), "",
|
createMenuXsheetAction(MI_MergeColumns, QT_TR_NOOP("&Merge Levels"), "",
|
||||||
"merge_levels");
|
"merge_levels");
|
||||||
createMenuXsheetAction(MI_InsertFx, QT_TR_NOOP("&New FX..."), "Ctrl+F",
|
createMenuXsheetAction(MI_InsertFx, QT_TR_NOOP("&New FX..."), "Ctrl+F",
|
||||||
"fx_new");
|
"fx_logo");
|
||||||
createMenuXsheetAction(MI_NewOutputFx, QT_TR_NOOP("&New Output"), "Alt+O",
|
createMenuXsheetAction(MI_NewOutputFx, QT_TR_NOOP("&New Output"), "Alt+O",
|
||||||
"output");
|
"output");
|
||||||
createMenuXsheetAction(MI_InsertSceneFrame, QT_TR_NOOP("Insert Frame"), "",
|
createMenuXsheetAction(MI_InsertSceneFrame, QT_TR_NOOP("Insert Frame"), "",
|
||||||
|
@ -2313,10 +2313,10 @@ void MainWindow::defineActions() {
|
||||||
// Right Click
|
// Right Click
|
||||||
|
|
||||||
createRightClickMenuAction(MI_SavePaletteAs,
|
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."));
|
tr("Save the current style palette as a separate file with a new name."));
|
||||||
createRightClickMenuAction(MI_OverwritePalette, QT_TR_NOOP("&Save Palette"),
|
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,
|
createRightClickMenuAction(MI_RegeneratePreview,
|
||||||
QT_TR_NOOP("&Regenerate Preview"), "", "",
|
QT_TR_NOOP("&Regenerate Preview"), "", "",
|
||||||
tr("Recreates a set of preview images."));
|
tr("Recreates a set of preview images."));
|
||||||
|
|
|
@ -506,23 +506,12 @@ void PaletteViewer::createSavePaletteToolBar() {
|
||||||
});
|
});
|
||||||
m_viewMode->addAction(m_showStyleIndex);
|
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) {
|
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()));
|
connect(savePalette, SIGNAL(triggered()), this, SLOT(saveStudioPalette()));
|
||||||
// m_viewMode->addSeparator();
|
// m_viewMode->addSeparator();
|
||||||
// m_viewMode->addAction(savePalette);
|
// m_viewMode->addAction(savePalette);
|
||||||
|
@ -532,21 +521,18 @@ void PaletteViewer::createSavePaletteToolBar() {
|
||||||
m_viewMode->addSeparator();
|
m_viewMode->addSeparator();
|
||||||
|
|
||||||
// overwrite palette
|
// overwrite palette
|
||||||
connect(savePalette, SIGNAL(triggered()),
|
QAction *savePalette =
|
||||||
CommandManager::instance()->getAction("MI_OverwritePalette"),
|
CommandManager::instance()->getAction("MI_OverwritePalette");
|
||||||
SIGNAL(triggered()));
|
|
||||||
m_viewMode->addAction(savePalette);
|
m_viewMode->addAction(savePalette);
|
||||||
|
|
||||||
// save palette as
|
// save palette as
|
||||||
connect(saveAsPalette, SIGNAL(triggered()),
|
QAction *saveAsPalette =
|
||||||
CommandManager::instance()->getAction("MI_SavePaletteAs"),
|
CommandManager::instance()->getAction("MI_SavePaletteAs");
|
||||||
SIGNAL(triggered()));
|
|
||||||
m_viewMode->addAction(saveAsPalette);
|
m_viewMode->addAction(saveAsPalette);
|
||||||
|
|
||||||
// save as default palette
|
// save as default palette
|
||||||
connect(saveDefaultPalette, SIGNAL(triggered()),
|
QAction *saveDefaultPalette =
|
||||||
CommandManager::instance()->getAction("MI_SaveAsDefaultPalette"),
|
CommandManager::instance()->getAction("MI_SaveAsDefaultPalette");
|
||||||
SIGNAL(triggered()));
|
|
||||||
m_viewMode->addAction(saveDefaultPalette);
|
m_viewMode->addAction(saveDefaultPalette);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -736,7 +722,6 @@ void PaletteViewer::setSaveDefaultText(QAction *action, int levelType) {
|
||||||
action->setText(tr("&Save As Default Palette"));
|
action->setText(tr("&Save As Default Palette"));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
action->setIcon(createQIcon("save"));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void PaletteViewer::contextMenuEvent(QContextMenuEvent *event) {
|
void PaletteViewer::contextMenuEvent(QContextMenuEvent *event) {
|
||||||
|
|
|
@ -1047,10 +1047,6 @@ void SchematicViewer::createActions() {
|
||||||
|
|
||||||
// InsertFx
|
// InsertFx
|
||||||
insertFx = CommandManager::instance()->getAction("MI_InsertFx");
|
insertFx = CommandManager::instance()->getAction("MI_InsertFx");
|
||||||
if (insertFx) {
|
|
||||||
QIcon insertFxIcon = createQIcon("fx_logo");
|
|
||||||
insertFx->setIcon(insertFxIcon);
|
|
||||||
}
|
|
||||||
|
|
||||||
// AddOutputFx
|
// AddOutputFx
|
||||||
addOutputFx = CommandManager::instance()->getAction("MI_NewOutputFx");
|
addOutputFx = CommandManager::instance()->getAction("MI_NewOutputFx");
|
||||||
|
|
Loading…
Reference in a new issue