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

Disable Show Icons in Menu preference

Browse source
This commit is contained in:
manongjohn 2021-09-06 09:51:20 -04:00
parent 97bcb4becc
commit ec7024154b
4 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1415,7 +1415,7 @@ QAction *MainWindow::createAction(const char *id, const char *name,
QAction *action = new DVAction(tr(name), this); QAction *action = new DVAction(tr(name), this);
#if !defined(_WIN32) #if !defined(_WIN32)
bool visible = Preferences::instance()->getBoolValue(showIconsInMenu); bool visible = false; //Preferences::instance()->getBoolValue(showIconsInMenu);
action->setIconVisibleInMenu(visible); action->setIconVisibleInMenu(visible);
#endif #endif
@ -1435,7 +1435,6 @@ QAction *MainWindow::createAction(const char *id, const char *name,
// do nothing for other platforms // do nothing for other platforms
} else } else
action->setIcon(createQIcon(iconSVGName, false, true)); action->setIcon(createQIcon(iconSVGName, false, true));
action->setIconVisibleInMenu(false);
addAction(action); addAction(action);
#ifdef MACOSX #ifdef MACOSX
// To prevent the wrong menu items (due to MacOS menu naming conventions), // To prevent the wrong menu items (due to MacOS menu naming conventions),
@ -1681,7 +1680,7 @@ QAction *MainWindow::createToggle(const char *id, const char *name,
if (!iconSVGName || !*iconSVGName) action->setIcon(QIcon()); if (!iconSVGName || !*iconSVGName) action->setIcon(QIcon());
#if defined(_WIN32) #if defined(_WIN32)
else { else {
bool visible = Preferences::instance()->getBoolValue(showIconsInMenu); bool visible = false; //Preferences::instance()->getBoolValue(showIconsInMenu);
action->setIconVisibleInMenu(visible); action->setIconVisibleInMenu(visible);
} }
#endif #endif

2
toonz/sources/toonz/preferencespopup.cpp
View file

@ -1477,7 +1477,7 @@ QWidget* PreferencesPopup::createInterfacePage() {
// insertUI(interfaceFontStyle, lay, buildFontStyleList()); // insertUI(interfaceFontStyle, lay, buildFontStyleList());
QGridLayout* colorCalibLay = insertGroupBoxUI(colorCalibrationEnabled, lay); QGridLayout* colorCalibLay = insertGroupBoxUI(colorCalibrationEnabled, lay);
{ insertUI(colorCalibrationLutPaths, colorCalibLay); } { insertUI(colorCalibrationLutPaths, colorCalibLay); }
insertUI(showIconsInMenu, lay); // insertUI(showIconsInMenu, lay);
lay->setRowStretch(lay->rowCount(), 1); lay->setRowStretch(lay->rowCount(), 1);
insertFootNote(lay); insertFootNote(lay);

8
toonz/sources/toonzlib/preferences.cpp
View file

@ -439,11 +439,11 @@ void Preferences::definePreferenceItems() {
// hide menu icons by default in macOS since the icon color may not match with // hide menu icons by default in macOS since the icon color may not match with
// the system color theme // the system color theme
#ifdef Q_OS_MACOS //#ifdef Q_OS_MACOS
bool defIconsVisible = false; bool defIconsVisible = false;
#else //#else
bool defIconsVisible = true; // bool defIconsVisible = true;
#endif //#endif
define(showIconsInMenu, "showIconsInMenu", QMetaType::Bool, defIconsVisible); define(showIconsInMenu, "showIconsInMenu", QMetaType::Bool, defIconsVisible);
setCallBack(pixelsOnly, &Preferences::setPixelsOnly); setCallBack(pixelsOnly, &Preferences::setPixelsOnly);

2
toonz/sources/toonzqt/gutil.cpp
View file

@ -320,7 +320,7 @@ QIcon createQIcon(const char *iconSVGName, bool useFullOpacity,
QIcon icon; QIcon icon;
#ifdef _WIN32 #ifdef _WIN32
bool showIconInMenu = Preferences::instance()->getBoolValue(showIconsInMenu); bool showIconInMenu = false; //Preferences::instance()->getBoolValue(showIconsInMenu);
// set transparent icon // set transparent icon
if (isForMenuItem && if (isForMenuItem &&
themeIconPixmap.size() == QSize(16 * devPixRatio, 16 * devPixRatio) && themeIconPixmap.size() == QSize(16 * devPixRatio, 16 * devPixRatio) &&