[Scummvm-git-logs] scummvm master -> 3a577c38566fff2ad1eb3badefb108db00573168
sev-
noreply at scummvm.org
Mon Jan 2 14:10:17 UTC 2023
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
3a577c3856 GUI: Split out GUI-related settings into a separate tab
Commit: 3a577c38566fff2ad1eb3badefb108db00573168
https://github.com/scummvm/scummvm/commit/3a577c38566fff2ad1eb3badefb108db00573168
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-01-02T15:09:37+01:00
Commit Message:
GUI: Split out GUI-related settings into a separate tab
Also, bump the theme version and add widgets for the random seed.
Changed paths:
gui/ThemeEngine.h
gui/options.cpp
gui/options.h
gui/themes/common/highres_layout.stx
gui/themes/common/lowres_layout.stx
gui/themes/default.inc
gui/themes/residualvm.zip
gui/themes/residualvm/THEMERC
gui/themes/scummclassic.zip
gui/themes/scummclassic/THEMERC
gui/themes/scummclassic/classic_layout.stx
gui/themes/scummclassic/classic_layout_lowres.stx
gui/themes/scummmodern.zip
gui/themes/scummmodern/THEMERC
gui/themes/scummremastered.zip
gui/themes/scummremastered/THEMERC
diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index 1c9182feda5..9fd32ced76c 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -36,7 +36,7 @@
#include "graphics/pixelformat.h"
-#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.9.6"
+#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.9.7"
class OSystem;
diff --git a/gui/options.cpp b/gui/options.cpp
index dd93afe968a..7e72a66dbf6 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -2205,12 +2205,18 @@ void GlobalOptionsDialog::build() {
addPathsControls(tab, "GlobalOptions_Paths.", g_system->getOverlayWidth() <= 320);
//
- // 6) The miscellaneous tab
+ // 6) The GUI tab
//
- if (g_system->getOverlayWidth() > 320)
- tab->addTab(_("Misc"), "GlobalOptions_Misc", false);
- else
- tab->addTab(_c("Misc", "lowres"), "GlobalOptions_Misc", false);
+ tab->addTab(_("GUI"), "GlobalOptions_GUI", false);
+ ScrollContainerWidget *guiContainer = new ScrollContainerWidget(tab, "GlobalOptions_GUI.Container", "GlobalOptions_GUI_Container");
+ guiContainer->setTarget(this);
+ guiContainer->setBackgroundType(ThemeEngine::kWidgetBackgroundNo);
+ addGUIControls(guiContainer, "GlobalOptions_GUI_Container.", g_system->getOverlayWidth() <= 320);
+
+ //
+ // 7) The miscellaneous tab
+ //
+ tab->addTab(_("Misc"), "GlobalOptions_Misc", false);
ScrollContainerWidget *miscContainer = new ScrollContainerWidget(tab, "GlobalOptions_Misc.Container", "GlobalOptions_Misc_Container");
miscContainer->setTarget(this);
miscContainer->setBackgroundType(ThemeEngine::kWidgetBackgroundNo);
@@ -2219,7 +2225,7 @@ void GlobalOptionsDialog::build() {
#ifdef USE_CLOUD
#ifdef USE_LIBCURL
//
- // 7) The Cloud tab (remote storages)
+ // 8) The Cloud tab (remote storages)
//
if (g_system->getOverlayWidth() > 320)
tab->addTab(_("Cloud"), "GlobalOptions_Cloud", false);
@@ -2235,7 +2241,7 @@ void GlobalOptionsDialog::build() {
#endif // USE_LIBCURL
#ifdef USE_SDL_NET
//
- // 8) The LAN tab (local "cloud" webserver)
+ // 9) The LAN tab (local "cloud" webserver)
//
if (g_system->getOverlayWidth() > 320)
tab->addTab(_("LAN"), "GlobalOptions_Network");
@@ -2245,7 +2251,9 @@ void GlobalOptionsDialog::build() {
#endif // USE_SDL_NET
#endif // USE_CLOUD
- //Accessibility
+ //
+ // 10) Accessibility
+ //
#ifdef USE_TTS
if (g_system->getOverlayWidth() > 320)
tab->addTab(_("Accessibility"), "GlobalOptions_Accessibility");
@@ -2413,7 +2421,7 @@ void GlobalOptionsDialog::addPathsControls(GuiObject *boss, const Common::String
_browserPathClearButton = addClearButton(boss, prefix + "BrowserPathClearButton", kBrowserPathClearCmd);
}
-void GlobalOptionsDialog::addMiscControls(GuiObject *boss, const Common::String &prefix, bool lowres) {
+void GlobalOptionsDialog::addGUIControls(GuiObject *boss, const Common::String &prefix, bool lowres) {
new ButtonWidget(boss, prefix + "ThemeButton", _("Theme:"), Common::U32String(), kChooseThemeCmd);
_curTheme = new StaticTextWidget(boss, prefix + "CurTheme", g_gui.theme()->getThemeName());
if (ConfMan.isKeyTemporary("gui_theme"))
@@ -2437,16 +2445,6 @@ void GlobalOptionsDialog::addMiscControls(GuiObject *boss, const Common::String
_rendererPopUp->appendEntry(_(GUI::ThemeEngine::_rendererModes[i].shortname), GUI::ThemeEngine::_rendererModes[i].mode);
}
- if (!lowres)
- _autosavePeriodPopUpDesc = new StaticTextWidget(boss, prefix + "AutosavePeriodPopupDesc", _("Autosave:"));
- else
- _autosavePeriodPopUpDesc = new StaticTextWidget(boss, prefix + "AutosavePeriodPopupDesc", _c("Autosave:", "lowres"));
- _autosavePeriodPopUp = new PopUpWidget(boss, prefix + "AutosavePeriodPopup");
-
- for (int i = 0; savePeriodLabels[i]; i++) {
- _autosavePeriodPopUp->appendEntry(_(savePeriodLabels[i]), savePeriodValues[i]);
- }
-
if (!g_system->hasFeature(OSystem::kFeatureNoQuit)) {
_guiReturnToLauncherAtExit = new CheckboxWidget(boss, prefix + "ReturnToLauncherAtExit",
_("Return to the launcher when leaving a game"),
@@ -2463,17 +2461,6 @@ void GlobalOptionsDialog::addMiscControls(GuiObject *boss, const Common::String
_guiConfirmExit->setState(ConfMan.getBool("confirm_exit", _domain));
-#ifdef USE_DISCORD
- _discordRpcCheckbox = new CheckboxWidget(boss, prefix + "DiscordRpc",
- _("Enable Discord integration"),
- _("Show information about the games you are playing on Discord if the Discord client is running.")
- );
-
- _discordRpcCheckbox->setState(ConfMan.getBool("discord_rpc", _domain));
-#endif
-
- // TODO: joystick setting
-
#ifdef USE_TRANSLATION
_guiLanguagePopUpDesc = new StaticTextWidget(boss, prefix + "GuiLanguagePopupDesc", _("GUI language:"), _("Language of ScummVM GUI"));
_guiLanguagePopUp = new PopUpWidget(boss, prefix + "GuiLanguagePopup");
@@ -2521,6 +2508,35 @@ void GlobalOptionsDialog::addMiscControls(GuiObject *boss, const Common::String
_useSystemDialogsCheckbox->setState(ConfMan.getBool("gui_browser_native", _domain));
}
+#ifdef USE_CLOUD
+#ifdef USE_LIBCURL
+ new ButtonWidget(boss, prefix + "UpdateIconsButton", _("Update Icons"), Common::U32String(), kUpdateIconsCmd);
+#endif
+#endif
+}
+
+void GlobalOptionsDialog::addMiscControls(GuiObject *boss, const Common::String &prefix, bool lowres) {
+ if (!lowres)
+ _autosavePeriodPopUpDesc = new StaticTextWidget(boss, prefix + "AutosavePeriodPopupDesc", _("Autosave:"));
+ else
+ _autosavePeriodPopUpDesc = new StaticTextWidget(boss, prefix + "AutosavePeriodPopupDesc", _c("Autosave:", "lowres"));
+ _autosavePeriodPopUp = new PopUpWidget(boss, prefix + "AutosavePeriodPopup");
+
+ for (int i = 0; savePeriodLabels[i]; i++) {
+ _autosavePeriodPopUp->appendEntry(_(savePeriodLabels[i]), savePeriodValues[i]);
+ }
+
+#ifdef USE_DISCORD
+ _discordRpcCheckbox = new CheckboxWidget(boss, prefix + "DiscordRpc",
+ _("Enable Discord integration"),
+ _("Show information about the games you are playing on Discord if the Discord client is running.")
+ );
+
+ _discordRpcCheckbox->setState(ConfMan.getBool("discord_rpc", _domain));
+#endif
+
+ // TODO: joystick setting
+
#ifdef USE_UPDATES
if (g_system->getUpdateManager()) {
_updatesPopUpDesc = new StaticTextWidget(boss, prefix + "UpdatesPopupDesc", _("Update check:"), _("How often to check ScummVM updates"));
@@ -2537,12 +2553,6 @@ void GlobalOptionsDialog::addMiscControls(GuiObject *boss, const Common::String
new ButtonWidget(boss, prefix + "UpdatesCheckManuallyButton", _("Check now"), Common::U32String(), kUpdatesCheckCmd);
}
#endif // USE_UPDATES
-
-#ifdef USE_CLOUD
-#ifdef USE_LIBCURL
- new ButtonWidget(boss, prefix + "UpdateIconsButton", _("Update Icons"), Common::U32String(), kUpdateIconsCmd);
-#endif
-#endif
}
#ifdef USE_CLOUD
diff --git a/gui/options.h b/gui/options.h
index 7c3e139a407..5fa7838122f 100644
--- a/gui/options.h
+++ b/gui/options.h
@@ -290,15 +290,13 @@ protected:
void addPathsControls(GuiObject *boss, const Common::String &prefix, bool lowres);
//
- // Misc controls
+ // GUI controls
//
StaticTextWidget *_curTheme;
StaticTextWidget *_guiBasePopUpDesc;
PopUpWidget *_guiBasePopUp;
StaticTextWidget *_rendererPopUpDesc;
PopUpWidget *_rendererPopUp;
- StaticTextWidget *_autosavePeriodPopUpDesc;
- PopUpWidget *_autosavePeriodPopUp;
StaticTextWidget *_guiLanguagePopUpDesc;
PopUpWidget *_guiLanguagePopUp;
CheckboxWidget *_guiLanguageUseGameLanguageCheckbox;
@@ -306,6 +304,13 @@ protected:
CheckboxWidget *_guiReturnToLauncherAtExit;
CheckboxWidget *_guiConfirmExit;
+ void addGUIControls(GuiObject *boss, const Common::String &prefix, bool lowres);
+
+ //
+ // Misc controls
+ //
+ StaticTextWidget *_autosavePeriodPopUpDesc;
+ PopUpWidget *_autosavePeriodPopUp;
#ifdef USE_UPDATES
StaticTextWidget *_updatesPopUpDesc;
diff --git a/gui/themes/common/highres_layout.stx b/gui/themes/common/highres_layout.stx
index 3b1e60ac145..85b3d8aab6b 100644
--- a/gui/themes/common/highres_layout.stx
+++ b/gui/themes/common/highres_layout.stx
@@ -776,13 +776,13 @@
</layout>
</dialog>
- <dialog name = 'GlobalOptions_Misc' overlays = 'Dialog.GlobalOptions.TabWidget'>
+ <dialog name = 'GlobalOptions_GUI' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<widget name = 'Container'/>
</layout>
</dialog>
- <dialog name = 'GlobalOptions_Misc_Container' overlays = 'GlobalOptions_Misc.Container'>
+ <dialog name = 'GlobalOptions_GUI_Container' overlays = 'GlobalOptions_GUI.Container'>
<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
<widget name = 'ThemeButton'
@@ -808,14 +808,6 @@
type = 'PopUp'
/>
</layout>
- <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
- <widget name = 'AutosavePeriodPopupDesc'
- type = 'OptionsLabel'
- />
- <widget name = 'AutosavePeriodPopup'
- type = 'PopUp'
- />
- </layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
<widget name = 'GuiLanguagePopupDesc'
type = 'OptionsLabel'
@@ -844,6 +836,41 @@
type = 'Checkbox'
/>
</layout>
+ <widget name = 'UpdateIconsButton'
+ type = 'Button'
+ />
+ </layout>
+ </dialog>
+
+ <dialog name = 'GlobalOptions_Misc' overlays = 'Dialog.GlobalOptions.TabWidget'>
+ <layout type = 'vertical' padding = '0, 0, 0, 0'>
+ <widget name = 'Container'/>
+ </layout>
+ </dialog>
+
+ <dialog name = 'GlobalOptions_Misc_Container' overlays = 'GlobalOptions_Misc.Container'>
+ <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
+ <widget name = 'AutosavePeriodPopupDesc'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'AutosavePeriodPopup'
+ type = 'PopUp'
+ />
+ </layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
+ <widget name = 'RandomSeedDesc'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'RandomSeedEditText'
+ width = '70'
+ height = 'Globals.Line.Height'
+ />
+ <widget name = 'RandomSeedClearButton'
+ height = 'Globals.Line.Height'
+ width = 'Globals.Line.Height'
+ />
+ </layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
<widget name = 'DiscordRpc'
type = 'Checkbox'
@@ -860,9 +887,6 @@
type = 'Button'
/>
</layout>
- <widget name = 'UpdateIconsButton'
- type = 'Button'
- />
</layout>
</dialog>
diff --git a/gui/themes/common/lowres_layout.stx b/gui/themes/common/lowres_layout.stx
index 972c2ccf85e..7f36735e4a9 100644
--- a/gui/themes/common/lowres_layout.stx
+++ b/gui/themes/common/lowres_layout.stx
@@ -714,13 +714,13 @@
</layout>
</dialog>
- <dialog name = 'GlobalOptions_Misc' overlays = 'Dialog.GlobalOptions.TabWidget'>
+ <dialog name = 'GlobalOptions_GUI' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<widget name = 'Container'/>
</layout>
</dialog>
- <dialog name = 'GlobalOptions_Misc_Container' overlays = 'GlobalOptions_Misc.Container'>
+ <dialog name = 'GlobalOptions_GUI_Container' overlays = 'GlobalOptions_GUI.Container'>
<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' align = 'center'>
<widget name = 'ThemeButton'
@@ -750,16 +750,6 @@
type = 'PopUp'
/>
</layout>
- <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' align = 'center'>
- <widget name = 'AutosavePeriodPopupDesc'
- width = '80'
- height = 'Globals.Line.Height'
- textalign = 'end'
- />
- <widget name = 'AutosavePeriodPopup'
- type = 'PopUp'
- />
- </layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' align = 'center'>
<widget name = 'GuiLanguagePopupDesc'
width = '80'
@@ -790,6 +780,45 @@
type = 'Checkbox'
/>
</layout>
+ <widget name = 'UpdateIconsButton'
+ type = 'Button'
+ />
+ </layout>
+ </dialog>
+
+ <dialog name = 'GlobalOptions_Misc' overlays = 'Dialog.GlobalOptions.TabWidget'>
+ <layout type = 'vertical' padding = '0, 0, 0, 0'>
+ <widget name = 'Container'/>
+ </layout>
+ </dialog>
+
+ <dialog name = 'GlobalOptions_Misc_Container' overlays = 'GlobalOptions_Misc.Container'>
+ <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' align = 'center'>
+ <widget name = 'AutosavePeriodPopupDesc'
+ width = '80'
+ height = 'Globals.Line.Height'
+ textalign = 'end'
+ />
+ <widget name = 'AutosavePeriodPopup'
+ type = 'PopUp'
+ />
+ </layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' align = 'center'>
+ <widget name = 'RandomSeedDesc'
+ width = '80'
+ height = 'Globals.Line.Height'
+ textalign = 'end'
+ />
+ <widget name = 'RandomSeedEditText'
+ width = '60'
+ height = '16'
+ />
+ <widget name = 'RandomSeedClearButton'
+ height = 'Globals.Line.Height'
+ width = 'Globals.Line.Height'
+ />
+ </layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
<widget name = 'DiscordRpc'
type = 'Checkbox'
@@ -804,13 +833,10 @@
<widget name = 'UpdatesPopup'
type = 'PopUp'
/>
- <widget name = 'UpdatesCheckManuallyButton'
+ <widget name = 'UpdatesCheckManuallyButton'
type = 'Button'
/>
</layout>
- <widget name = 'UpdateIconsButton'
- type = 'Button'
- />
</layout>
</dialog>
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index f1f651f4ebb..aee84ab15f1 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -2020,12 +2020,12 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</layout>"
"</layout>"
"</dialog>"
-"<dialog name='GlobalOptions_Misc' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<dialog name='GlobalOptions_GUI' overlays='Dialog.GlobalOptions.TabWidget'>"
"<layout type='vertical' padding='0,0,0,0'>"
"<widget name='Container'/>"
"</layout>"
"</dialog>"
-"<dialog name='GlobalOptions_Misc_Container' overlays='GlobalOptions_Misc.Container'>"
+"<dialog name='GlobalOptions_GUI_Container' overlays='GlobalOptions_GUI.Container'>"
"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
"<layout type='horizontal' padding='0,0,0,0' spacing='10' align='center'>"
"<widget name='ThemeButton' "
@@ -2052,14 +2052,6 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"/>"
"</layout>"
"<layout type='horizontal' padding='0,0,0,0' spacing='10' align='center'>"
-"<widget name='AutosavePeriodPopupDesc' "
-"type='OptionsLabel' "
-"/>"
-"<widget name='AutosavePeriodPopup' "
-"type='PopUp' "
-"/>"
-"</layout>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' align='center'>"
"<widget name='GuiLanguagePopupDesc' "
"type='OptionsLabel' "
"/>"
@@ -2087,6 +2079,39 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"type='Checkbox' "
"/>"
"</layout>"
+"<widget name='UpdateIconsButton' "
+"type='Button' "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions_Misc' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='0,0,0,0'>"
+"<widget name='Container'/>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions_Misc_Container' overlays='GlobalOptions_Misc.Container'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' align='center'>"
+"<widget name='AutosavePeriodPopupDesc' "
+"type='OptionsLabel' "
+"/>"
+"<widget name='AutosavePeriodPopup' "
+"type='PopUp' "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' align='center'>"
+"<widget name='RandomSeedDesc' "
+"type='OptionsLabel' "
+"/>"
+"<widget name='RandomSeedEditText' "
+"width='70' "
+"height='Globals.Line.Height' "
+"/>"
+"<widget name='RandomSeedClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
+"/>"
+"</layout>"
"<layout type='horizontal' padding='0,0,0,0' spacing='10' align='center'>"
"<widget name='DiscordRpc' "
"type='Checkbox' "
@@ -2103,9 +2128,6 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"type='Button' "
"/>"
"</layout>"
-"<widget name='UpdateIconsButton' "
-"type='Button' "
-"/>"
"</layout>"
"</dialog>"
"<dialog name='GlobalOptions_Cloud' overlays='Dialog.GlobalOptions.TabWidget'>"
@@ -3933,12 +3955,12 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</layout>"
"</layout>"
"</dialog>"
-"<dialog name='GlobalOptions_Misc' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<dialog name='GlobalOptions_GUI' overlays='Dialog.GlobalOptions.TabWidget'>"
"<layout type='vertical' padding='0,0,0,0'>"
"<widget name='Container'/>"
"</layout>"
"</dialog>"
-"<dialog name='GlobalOptions_Misc_Container' overlays='GlobalOptions_Misc.Container'>"
+"<dialog name='GlobalOptions_GUI_Container' overlays='GlobalOptions_GUI.Container'>"
"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
"<layout type='horizontal' padding='0,0,0,0' spacing='16'>"
"<widget name='ThemeButton' "
@@ -3969,16 +3991,6 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"/>"
"</layout>"
"<layout type='horizontal' padding='0,0,0,0' spacing='6' align='center'>"
-"<widget name='AutosavePeriodPopupDesc' "
-"width='80' "
-"height='Globals.Line.Height' "
-"textalign='end' "
-"/>"
-"<widget name='AutosavePeriodPopup' "
-"type='PopUp' "
-"/>"
-"</layout>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' align='center'>"
"<widget name='GuiLanguagePopupDesc' "
"width='80' "
"height='Globals.Line.Height' "
@@ -4008,6 +4020,43 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"type='Checkbox' "
"/>"
"</layout>"
+"<widget name='UpdateIconsButton' "
+"type='Button' "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions_Misc' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='0,0,0,0'>"
+"<widget name='Container'/>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions_Misc_Container' overlays='GlobalOptions_Misc.Container'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' align='center'>"
+"<widget name='AutosavePeriodPopupDesc' "
+"width='80' "
+"height='Globals.Line.Height' "
+"textalign='end' "
+"/>"
+"<widget name='AutosavePeriodPopup' "
+"type='PopUp' "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' align='center'>"
+"<widget name='RandomSeedDesc' "
+"width='80' "
+"height='Globals.Line.Height' "
+"textalign='end' "
+"/>"
+"<widget name='RandomSeedEditText' "
+"width='60' "
+"height='16' "
+"/>"
+"<widget name='RandomSeedClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
+"/>"
+"</layout>"
"<layout type='horizontal' padding='0,0,0,0' spacing='10' align='center'>"
"<widget name='DiscordRpc' "
"type='Checkbox' "
@@ -4026,9 +4075,6 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"type='Button' "
"/>"
"</layout>"
-"<widget name='UpdateIconsButton' "
-"type='Button' "
-"/>"
"</layout>"
"</dialog>"
"<dialog name='GlobalOptions_Cloud' overlays='Dialog.GlobalOptions.TabWidget'>"
diff --git a/gui/themes/residualvm.zip b/gui/themes/residualvm.zip
index bc706b8be97..95581e90c1f 100644
Binary files a/gui/themes/residualvm.zip and b/gui/themes/residualvm.zip differ
diff --git a/gui/themes/residualvm/THEMERC b/gui/themes/residualvm/THEMERC
index 24e8c2ce3b8..ff48516c834 100644
--- a/gui/themes/residualvm/THEMERC
+++ b/gui/themes/residualvm/THEMERC
@@ -1,3 +1,3 @@
-[SCUMMVM_STX0.9.6:ResidualVM Modern Theme Remastered:No Author]
+[SCUMMVM_STX0.9.7:ResidualVM Modern Theme Remastered:No Author]
%using ../common
%using ../common-svg
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 2bdbf1953be..f2caf9e72da 100644
Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ
diff --git a/gui/themes/scummclassic/THEMERC b/gui/themes/scummclassic/THEMERC
index b76d038ff54..b246d9d991b 100644
--- a/gui/themes/scummclassic/THEMERC
+++ b/gui/themes/scummclassic/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.9.6:ScummVM Classic Theme:No Author]
+[SCUMMVM_STX0.9.7:ScummVM Classic Theme:No Author]
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index d16bd2a9cea..fb51079a41a 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -628,13 +628,13 @@
</layout>
</dialog>
- <dialog name = 'GlobalOptions_Misc' overlays = 'Dialog.GlobalOptions.TabWidget'>
+ <dialog name = 'GlobalOptions_GUI' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<widget name = 'Container'/>
</layout>
</dialog>
- <dialog name = 'GlobalOptions_Misc_Container' overlays = 'GlobalOptions_Misc.Container'>
+ <dialog name = 'GlobalOptions_GUI_Container' overlays = 'GlobalOptions_GUI.Container'>
<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
<widget name = 'ThemeButton'
@@ -660,14 +660,6 @@
type = 'PopUp'
/>
</layout>
- <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
- <widget name = 'AutosavePeriodPopupDesc'
- type = 'OptionsLabel'
- />
- <widget name = 'AutosavePeriodPopup'
- type = 'PopUp'
- />
- </layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
<widget name = 'GuiLanguagePopupDesc'
type = 'OptionsLabel'
@@ -696,6 +688,41 @@
type = 'Checkbox'
/>
</layout>
+ <widget name = 'UpdateIconsButton'
+ type = 'Button'
+ />
+ </layout>
+ </dialog>
+
+ <dialog name = 'GlobalOptions_Misc' overlays = 'Dialog.GlobalOptions.TabWidget'>
+ <layout type = 'vertical' padding = '0, 0, 0, 0'>
+ <widget name = 'Container'/>
+ </layout>
+ </dialog>
+
+ <dialog name = 'GlobalOptions_Misc_Container' overlays = 'GlobalOptions_Misc.Container'>
+ <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
+ <widget name = 'AutosavePeriodPopupDesc'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'AutosavePeriodPopup'
+ type = 'PopUp'
+ />
+ </layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
+ <widget name = 'RandomSeedDesc'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'RandomSeedEditText'
+ width = '70'
+ height = 'Globals.Line.Height'
+ />
+ <widget name = 'RandomSeedClearButton'
+ height = 'Globals.Line.Height'
+ width = 'Globals.Line.Height'
+ />
+ </layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
<widget name = 'DiscordRpc'
type = 'Checkbox'
@@ -708,13 +735,10 @@
<widget name = 'UpdatesPopup'
type = 'PopUp'
/>
- <widget name = 'UpdatesCheckManuallyButton'
+ <widget name = 'UpdatesCheckManuallyButton'
type = 'Button'
/>
</layout>
- <widget name = 'UpdateIconsButton'
- type = 'Button'
- />
</layout>
</dialog>
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 5bd8d2ea5bb..38fc007f7cd 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -636,13 +636,13 @@
</layout>
</dialog>
- <dialog name = 'GlobalOptions_Misc' overlays = 'Dialog.GlobalOptions.TabWidget'>
+ <dialog name = 'GlobalOptions_GUI' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<widget name = 'Container'/>
</layout>
</dialog>
- <dialog name = 'GlobalOptions_Misc_Container' overlays = 'GlobalOptions_Misc.Container'>
+ <dialog name = 'GlobalOptions_GUI_Container' overlays = 'GlobalOptions_GUI.Container'>
<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
<widget name = 'ThemeButton'
@@ -672,16 +672,6 @@
type = 'PopUp'
/>
</layout>
- <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' align = 'center'>
- <widget name = 'AutosavePeriodPopupDesc'
- width = '80'
- height = 'Globals.Line.Height'
- textalign = 'end'
- />
- <widget name = 'AutosavePeriodPopup'
- type = 'PopUp'
- />
- </layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' align = 'center'>
<widget name = 'GuiLanguagePopupDesc'
width = '80'
@@ -712,6 +702,45 @@
type = 'Checkbox'
/>
</layout>
+ <widget name = 'UpdateIconsButton'
+ type = 'Button'
+ />
+ </layout>
+ </dialog>
+
+ <dialog name = 'GlobalOptions_Misc' overlays = 'Dialog.GlobalOptions.TabWidget'>
+ <layout type = 'vertical' padding = '0, 0, 0, 0'>
+ <widget name = 'Container'/>
+ </layout>
+ </dialog>
+
+ <dialog name = 'GlobalOptions_Misc_Container' overlays = 'GlobalOptions_Misc.Container'>
+ <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' align = 'center'>
+ <widget name = 'AutosavePeriodPopupDesc'
+ width = '80'
+ height = 'Globals.Line.Height'
+ textalign = 'end'
+ />
+ <widget name = 'AutosavePeriodPopup'
+ type = 'PopUp'
+ />
+ </layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' align = 'center'>
+ <widget name = 'RandomSeedDesc'
+ width = '80'
+ height = 'Globals.Line.Height'
+ textalign = 'end'
+ />
+ <widget name = 'RandomSeedEditText'
+ width = '60'
+ height = '16'
+ />
+ <widget name = 'RandomSeedClearButton'
+ height = 'Globals.Line.Height'
+ width = 'Globals.Line.Height'
+ />
+ </layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
<widget name = 'DiscordRpc'
type = 'Checkbox'
@@ -726,13 +755,10 @@
<widget name = 'UpdatesPopup'
type = 'PopUp'
/>
- <widget name = 'UpdatesCheckManuallyButton'
+ <widget name = 'UpdatesCheckManuallyButton'
type = 'Button'
/>
</layout>
- <widget name = 'UpdateIconsButton'
- type = 'Button'
- />
</layout>
</dialog>
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 75a54b7f422..563925e6d44 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummmodern/THEMERC b/gui/themes/scummmodern/THEMERC
index 682f3f1a930..91ad5858107 100644
--- a/gui/themes/scummmodern/THEMERC
+++ b/gui/themes/scummmodern/THEMERC
@@ -1,2 +1,2 @@
-[SCUMMVM_STX0.9.6:ScummVM Modern Theme:No Author]
+[SCUMMVM_STX0.9.7:ScummVM Modern Theme:No Author]
%using ../common
diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip
index 409364392e6..d820aae1b12 100644
Binary files a/gui/themes/scummremastered.zip and b/gui/themes/scummremastered.zip differ
diff --git a/gui/themes/scummremastered/THEMERC b/gui/themes/scummremastered/THEMERC
index 37a9c81c933..3cdb93d5d87 100644
--- a/gui/themes/scummremastered/THEMERC
+++ b/gui/themes/scummremastered/THEMERC
@@ -1,3 +1,3 @@
-[SCUMMVM_STX0.9.6:ScummVM Modern Theme Remastered:No Author]
+[SCUMMVM_STX0.9.7:ScummVM Modern Theme Remastered:No Author]
%using ../common
%using ../common-svg
More information about the Scummvm-git-logs
mailing list