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

Fix order of preferences saving page (#292)

Browse source
This commit is contained in:
Jeremy Bullock 2020-10-03 22:33:45 -06:00 committed by GitHub
parent 1c25b6a785
commit 3dc407d284
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 46 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -358,24 +358,25 @@ void PreferencesPopup::onStyleSheetTypeChanged() {
if (currentStyle.contains("Light") || currentStyle.contains("Neutral")) { if (currentStyle.contains("Light") || currentStyle.contains("Neutral")) {
m_pref->setValue(iconTheme, true); m_pref->setValue(iconTheme, true);
if (iconThemeName != "dark") { if (iconThemeName != "dark") {
//QIcon::setThemeName(Preferences::instance()->getIconTheme() ? "dark" // QIcon::setThemeName(Preferences::instance()->getIconTheme() ? "dark"
// : "light"); // : "light");
DVGui::MsgBoxInPopup(DVGui::MsgType(INFORMATION), tr("Please restart to reload the icons.")); DVGui::MsgBoxInPopup(DVGui::MsgType(INFORMATION),
tr("Please restart to reload the icons."));
} }
} } else {
else {
m_pref->setValue(iconTheme, false); m_pref->setValue(iconTheme, false);
if (iconThemeName != "light") { if (iconThemeName != "light") {
//QIcon::setThemeName(Preferences::instance()->getIconTheme() ? "dark" // QIcon::setThemeName(Preferences::instance()->getIconTheme() ? "dark"
// : "light"); // : "light");
DVGui::MsgBoxInPopup(DVGui::MsgType(INFORMATION), tr("Please restart to reload the icons.")); DVGui::MsgBoxInPopup(DVGui::MsgType(INFORMATION),
tr("Please restart to reload the icons."));
} }
} }
} }
////----------------------------------------------------------------------------- ////-----------------------------------------------------------------------------
// //
//void PreferencesPopup::onIconThemeChanged() { // void PreferencesPopup::onIconThemeChanged() {
// // Switch between dark or light icons // // Switch between dark or light icons
// QIcon::setThemeName(Preferences::instance()->getIconTheme() ? "dark" // QIcon::setThemeName(Preferences::instance()->getIconTheme() ? "dark"
// : "light"); // : "light");
@ -934,8 +935,8 @@ void PreferencesPopup::insertDualUIs(
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void PreferencesPopup::insertFootNote(QGridLayout* layout) { void PreferencesPopup::insertFootNote(QGridLayout* layout) {
QLabel* note = QLabel* note = new QLabel(
new QLabel(tr("* Changes will take effect the next time you run Tahoma2D")); tr("* Changes will take effect the next time you run Tahoma2D"));
note->setStyleSheet("font-size: 10px; font: italic;"); note->setStyleSheet("font-size: 10px; font: italic;");
layout->addWidget(note, layout->rowCount(), 0, 1, 2, layout->addWidget(note, layout->rowCount(), 0, 1, 2,
Qt::AlignLeft | Qt::AlignVCenter); Qt::AlignLeft | Qt::AlignVCenter);
@ -1410,9 +1411,9 @@ QWidget* PreferencesPopup::createInterfacePage() {
insertUI(CurrentStyleSheetName, lay, styleSheetItemList); insertUI(CurrentStyleSheetName, lay, styleSheetItemList);
//lay->addWidget(new QLabel(tr("Icon Theme*:"), this), 2, 0, // lay->addWidget(new QLabel(tr("Icon Theme*:"), this), 2, 0,
// Qt::AlignRight | Qt::AlignVCenter); // Qt::AlignRight | Qt::AlignVCenter);
//lay->addWidget(createUI(iconTheme), 2, 1); // lay->addWidget(createUI(iconTheme), 2, 1);
// insertUI(linearUnits, lay, getComboItemList(linearUnits)); // insertUI(linearUnits, lay, getComboItemList(linearUnits));
// insertUI(cameraUnits, lay, // insertUI(cameraUnits, lay,
@ -1501,7 +1502,7 @@ QWidget* PreferencesPopup::createLoadingPage() {
insertUI(autoExposeEnabled, lay); insertUI(autoExposeEnabled, lay);
insertUI(subsceneFolderEnabled, lay); insertUI(subsceneFolderEnabled, lay);
insertUI(removeSceneNumberFromLoadedLevelName, lay); insertUI(removeSceneNumberFromLoadedLevelName, lay);
//insertUI(IgnoreImageDpi, lay); // insertUI(IgnoreImageDpi, lay);
insertUI(initialLoadTlvCachingBehavior, lay, insertUI(initialLoadTlvCachingBehavior, lay,
getComboItemList(initialLoadTlvCachingBehavior)); getComboItemList(initialLoadTlvCachingBehavior));
insertUI(columnIconLoadingPolicy, lay, insertUI(columnIconLoadingPolicy, lay,
@ -1544,6 +1545,10 @@ QWidget* PreferencesPopup::createLoadingPage() {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
QWidget* PreferencesPopup::createSavingPage() { QWidget* PreferencesPopup::createSavingPage() {
auto putLabel = [&](const QString& labelStr, QGridLayout* lay) {
lay->addWidget(new QLabel(labelStr, this), lay->rowCount(), 0, 1, 3,
Qt::AlignLeft | Qt::AlignVCenter);
};
QWidget* widget = new QWidget(this); QWidget* widget = new QWidget(this);
QGridLayout* lay = new QGridLayout(); QGridLayout* lay = new QGridLayout();
setupLayout(lay); setupLayout(lay);
@ -1556,12 +1561,10 @@ QWidget* PreferencesPopup::createSavingPage() {
insertUI(replaceAfterSaveLevelAs, lay); insertUI(replaceAfterSaveLevelAs, lay);
QGridLayout* backupLay = insertGroupBoxUI(backupEnabled, lay); QGridLayout* backupLay = insertGroupBoxUI(backupEnabled, lay);
{ insertUI(backupKeepCount, backupLay); } { insertUI(backupKeepCount, backupLay); }
QLabel* matteColorLabel = putLabel(tr("Matte color is used for background when overwriting "
new QLabel(tr("Matte color is used for background when overwriting "
"raster levels with transparent pixels\nin non " "raster levels with transparent pixels\nin non "
"alpha-enabled image format."), "alpha-enabled image format."),
this); lay);
lay->addWidget(matteColorLabel, 0, 0, 1, 3, Qt::AlignLeft);
insertUI(rasterBackgroundColor, lay); insertUI(rasterBackgroundColor, lay);
insertUI(resetUndoOnSavingLevel, lay); insertUI(resetUndoOnSavingLevel, lay);
insertUI(doNotShowPopupSaveScene, lay); insertUI(doNotShowPopupSaveScene, lay);
@ -1583,7 +1586,8 @@ QWidget* PreferencesPopup::createImportExportPage() {
QGridLayout* lay = new QGridLayout(); QGridLayout* lay = new QGridLayout();
setupLayout(lay); setupLayout(lay);
putLabel(tr("Tahoma2D can use FFmpeg for additional file formats.\n") + putLabel(
tr("Tahoma2D can use FFmpeg for additional file formats.\n") +
tr("FFmpeg is bundled with Tahoma2D,\n") + tr("FFmpeg is bundled with Tahoma2D,\n") +
tr("but you can provide the path to a different ffmpeg location."), tr("but you can provide the path to a different ffmpeg location."),
lay); lay);
@ -1615,7 +1619,7 @@ QWidget* PreferencesPopup::createDrawingPage() {
QGridLayout* lay = new QGridLayout(); QGridLayout* lay = new QGridLayout();
setupLayout(lay); setupLayout(lay);
//insertUI(scanLevelType, lay, getComboItemList(scanLevelType)); // insertUI(scanLevelType, lay, getComboItemList(scanLevelType));
insertUI(DefLevelType, lay, getComboItemList(DefLevelType)); insertUI(DefLevelType, lay, getComboItemList(DefLevelType));
insertUI(newLevelSizeToCameraSizeEnabled, lay); insertUI(newLevelSizeToCameraSizeEnabled, lay);
insertDualUIs(DefLevelWidth, DefLevelHeight, lay); insertDualUIs(DefLevelWidth, DefLevelHeight, lay);
@ -1632,7 +1636,7 @@ QWidget* PreferencesPopup::createDrawingPage() {
insertUI(saveUnpaintedInCleanup, lay); insertUI(saveUnpaintedInCleanup, lay);
insertUI(minimizeSaveboxAfterEditing, lay); insertUI(minimizeSaveboxAfterEditing, lay);
insertUI(useNumpadForSwitchingStyles, lay); insertUI(useNumpadForSwitchingStyles, lay);
//insertUI(downArrowInLevelStripCreatesNewFrame, lay); // insertUI(downArrowInLevelStripCreatesNewFrame, lay);
QGridLayout* replaceVectorsLay = insertGroupBox( QGridLayout* replaceVectorsLay = insertGroupBox(
tr("Replace Vectors with Simplified Vectors Command"), lay); tr("Replace Vectors with Simplified Vectors Command"), lay);
{ {
@ -1679,7 +1683,7 @@ QWidget* PreferencesPopup::createToolsPage() {
} }
insertUI(levelBasedToolsDisplay, lay, insertUI(levelBasedToolsDisplay, lay,
getComboItemList(levelBasedToolsDisplay)); getComboItemList(levelBasedToolsDisplay));
//insertUI(useCtrlAltToResizeBrush, lay); // insertUI(useCtrlAltToResizeBrush, lay);
lay->setRowStretch(lay->rowCount(), 1); lay->setRowStretch(lay->rowCount(), 1);
widget->setLayout(lay); widget->setLayout(lay);
@ -1714,8 +1718,8 @@ QWidget* PreferencesPopup::createXsheetPage() {
QGridLayout* xshToolbarLay = insertGroupBoxUI(showXSheetToolbar, lay); QGridLayout* xshToolbarLay = insertGroupBoxUI(showXSheetToolbar, lay);
{ insertUI(expandFunctionHeader, xshToolbarLay); } { insertUI(expandFunctionHeader, xshToolbarLay); }
insertUI(showColumnNumbers, lay); insertUI(showColumnNumbers, lay);
//insertUI(syncLevelRenumberWithXsheet, lay); // insertUI(syncLevelRenumberWithXsheet, lay);
//insertUI(currentTimelineEnabled, lay); // insertUI(currentTimelineEnabled, lay);
insertUI(currentColumnColor, lay); insertUI(currentColumnColor, lay);
lay->setRowStretch(lay->rowCount(), 1); lay->setRowStretch(lay->rowCount(), 1);