libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 05:38:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GUI: Split out GUI-related settings into a separate tab

Browse Source 
Also, bump the theme version and add widgets for the random seed.
This commit is contained in:
Eugene Sandulenko 2023-01-02 15:09:37 +01:00
parent f3136020e2
commit 3a577c3856
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
16 changed files with 292 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/ThemeEngine.h
View File

@ -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;

82
gui/options.cpp
View File

@ -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

11
gui/options.h
View File

@ -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;

50
gui/themes/common/highres_layout.stx
View File

@ -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>

58
gui/themes/common/lowres_layout.stx
View File

@ -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>

102
gui/themes/default.inc
View File

@ -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'>"

BIN
gui/themes/residualvm.zip
View File

Binary file not shown.

2
gui/themes/residualvm/THEMERC
View File

@ -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

BIN
gui/themes/scummclassic.zip
View File

Binary file not shown.

2
gui/themes/scummclassic/THEMERC
View File

@ -1 +1 @@
[SCUMMVM_STX0.9.6:ScummVM Classic Theme:No Author]
[SCUMMVM_STX0.9.7:ScummVM Classic Theme:No Author]

52
gui/themes/scummclassic/classic_layout.stx
View File

@ -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>

58
gui/themes/scummclassic/classic_layout_lowres.stx
View File

@ -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>

BIN
gui/themes/scummmodern.zip
View File

Binary file not shown.

2
gui/themes/scummmodern/THEMERC
View File

@ -1,2 +1,2 @@
[SCUMMVM_STX0.9.6:ScummVM Modern Theme:No Author]
[SCUMMVM_STX0.9.7:ScummVM Modern Theme:No Author]
%using ../common

BIN
gui/themes/scummremastered.zip
View File

Binary file not shown.

2
gui/themes/scummremastered/THEMERC
View File

@ -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