Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Icon update followup #1190

Merged
merged 2 commits into from
Jul 19, 2023
Merged

Icon update followup #1190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e46c14
Switch parameter order on createToolOptionsAction()
manongjohn Jul 12, 2023
25ed8fc
Fixed some Fx Schematic/Palette viewer icons showing when turned off …
manongjohn Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions toonz/sources/toonz/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1696,8 +1696,8 @@ QAction *MainWindow::createMiscAction(const char *id, const char *name,

QAction *MainWindow::createToolOptionsAction(const char *id, const char *name,
const QString &defaultShortcut,
QString newStatusTip,
const char *iconSVGName) {
const char *iconSVGName,
QString newStatusTip) {
QAction *action = new DVAction(tr(name), this);
if (iconSVGName && *iconSVGName)
action->setIcon(createQIcon(iconSVGName, false, true));
Expand Down Expand Up @@ -3016,13 +3016,13 @@ void MainWindow::defineActions() {
createToolOptionsAction("A_ToolOption_Mode", QT_TR_NOOP("Mode"), "");
menuAct =
createToolOptionsAction("A_ToolOption_Mode:Areas",
QT_TR_NOOP("Mode - Areas"), "", "", "mode_areas");
QT_TR_NOOP("Mode - Areas"), "", "mode_areas", "");
menuAct =
createToolOptionsAction("A_ToolOption_Mode:Lines",
QT_TR_NOOP("Mode - Lines"), "", "", "mode_lines");
QT_TR_NOOP("Mode - Lines"), "", "mode_lines", "");
menuAct = createToolOptionsAction("A_ToolOption_Mode:Lines & Areas",
QT_TR_NOOP("Mode - Lines && Areas"), "", "",
"mode_areas_lines");
QT_TR_NOOP("Mode - Lines && Areas"), "",
"mode_areas_lines", "");
createToolOptionsAction("A_ToolOption_Mode:Endpoint to Endpoint",
QT_TR_NOOP("Mode - Endpoint to Endpoint"), "");
createToolOptionsAction("A_ToolOption_Mode:Endpoint to Line",
Expand All @@ -3032,28 +3032,28 @@ void MainWindow::defineActions() {
createToolOptionsAction("A_ToolOption_Type", QT_TR_NOOP("Type"), "");

menuAct = createToolOptionsAction("A_ToolOption_Type:Normal",
QT_TR_NOOP("Type - Normal"), "", "",
"type_normal");
QT_TR_NOOP("Type - Normal"), "",
"type_normal", "");

menuAct = createToolOptionsAction("A_ToolOption_Type:Rectangular",
QT_TR_NOOP("Type - Rectangular"), "F5", "",
"type_rectangular");
QT_TR_NOOP("Type - Rectangular"), "F5",
"type_rectangular", "");

menuAct = createToolOptionsAction("A_ToolOption_Type:Freehand",
QT_TR_NOOP("Type - Freehand"), "", "",
"type_lasso");
QT_TR_NOOP("Type - Freehand"), "",
"type_lasso", "");

menuAct = createToolOptionsAction("A_ToolOption_Type:Polyline",
QT_TR_NOOP("Type - Polyline"), "", "",
"type_polyline");
QT_TR_NOOP("Type - Polyline"), "",
"type_polyline", "");

menuAct = createToolOptionsAction("A_ToolOption_Type:Freepick",
QT_TR_NOOP("Type - Pick+Freehand"), "", "",
"type_pickerlasso");
QT_TR_NOOP("Type - Pick+Freehand"), "",
"type_pickerlasso", "");

menuAct = createToolOptionsAction("A_ToolOption_Type:Segment",
QT_TR_NOOP("Type - Segment"), "", "",
"type_erase_segment");
QT_TR_NOOP("Type - Segment"), "",
"type_erase_segment", "");

createToolOptionsAction("A_ToolOption_TypeFont", QT_TR_NOOP("TypeTool Font"),
"");
Expand Down
4 changes: 2 additions & 2 deletions toonz/sources/toonz/mainwindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ class MainWindow final : public QMainWindow {
QString newStatusTip = "");
QAction *createToolOptionsAction(const char *id, const char *name,
const QString &defaultShortcut,
QString newStatusTip = "",
const char *iconSVGName = "");
const char *iconSVGName = "",
QString newStatusTip = "");
QAction *createStopMotionAction(const char *id, const char *name,
const QString &defaultShortcut,
const char *iconSVGName = "",
Expand Down
4 changes: 2 additions & 2 deletions toonz/sources/toonzqt/gutil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ QIcon createQIcon(const QString &iconSVGName, bool useFullOpacity,
// START_BUG_WORKAROUND: #20230627
// Set an empty pixmap for menu icons when hiding icons from menus is true,
// search bug ID for more info.
#ifdef _WIN32
//#ifdef _WIN32
bool showIconInMenu =
Preferences::instance()->isShowAdvancedOptionsEnabled() &&
Preferences::instance()->getBoolValue(showIconsInMenu);
Expand All @@ -559,7 +559,7 @@ QIcon createQIcon(const QString &iconSVGName, bool useFullOpacity,
emptyPm.fill(Qt::transparent);
addPixmapToAllModesAndStates(icon, emptyPm);
} else
#endif // END_BUG_WORKAROUND
//#endif // END_BUG_WORKAROUND
{
addImagesToIcon(icon, baseImg, overImg, onImg, useFullOpacity);
}
Expand Down