libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-26 20:59:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GUI: Expose Debug Level int the GUI (Misc tab), bump theme version

Browse Source
This commit is contained in:
Eugene Sandulenko 2023-03-25 17:09:19 +01:00
parent 42c68234bb
commit cf578e832b
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
12 changed files with 85 additions and 6 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.9"
#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.9.10"
class OSystem;

18
gui/options.cpp
View File

@ -2400,6 +2400,8 @@ void GlobalOptionsDialog::build() {
_autosavePeriodPopUp->setSelected(i);
}
_debugLevelPopUp->setSelected(gDebugLevel + 1);
ThemeEngine::GraphicsMode mode = ThemeEngine::findMode(ConfMan.get("gui_renderer"));
if (mode == ThemeEngine::kGfxDisabled)
mode = ThemeEngine::_defaultRendererMode;
@ -2620,6 +2622,16 @@ void GlobalOptionsDialog::addMiscControls(GuiObject *boss, const Common::String
_randomSeed = new EditTextWidget(boss, prefix + "RandomSeedEditText", seed, Common::U32String());
_randomSeedClearButton = addClearButton(boss, prefix + "RandomSeedClearButton", kRandomSeedClearCmd);
new StaticTextWidget(boss, prefix + "DebugLevelPopupDesc", _("Debug level:"));
_debugLevelPopUp = new PopUpWidget(boss, prefix + "DebugLevelPopup");
_debugLevelPopUp->appendEntry(_("None"), -1); // I18N: Debug level -1, no messages
for (int i = 0; i < 11; i++)
_debugLevelPopUp->appendEntry(Common::U32String::format("%d", i), i);
_debugLevelPopUp->appendEntry(_("11 (all)"), 11); // I18N: Debug level 11, all messages
#ifdef USE_DISCORD
_discordRpcCheckbox = new CheckboxWidget(boss, prefix + "DiscordRpc",
_("Enable Discord integration"),
@ -2914,6 +2926,12 @@ void GlobalOptionsDialog::apply() {
else
_autosavePeriodPopUp->setSelected(0);
if (gDebugLevel != _debugLevelPopUp->getSelectedTag()) {
gDebugLevel = _debugLevelPopUp->getSelectedTag();
warning("Debug level set to %d", gDebugLevel);
}
#ifdef USE_UPDATES
if (g_system->getUpdateManager()) {
ConfMan.setInt("updates_check", _updatesPopUp->getSelectedTag());

3
gui/options.h
View File

@ -310,10 +310,11 @@ protected:
// Misc controls
//
StaticTextWidget *_autosavePeriodPopUpDesc;
PopUpWidget *_autosavePeriodPopUp;
PopUpWidget *_autosavePeriodPopUp;
StaticTextWidget *_randomSeedDesc;
EditTextWidget *_randomSeed;
ButtonWidget *_randomSeedClearButton;
PopUpWidget *_debugLevelPopUp;
#ifdef USE_UPDATES
StaticTextWidget *_updatesPopUpDesc;

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

@ -1006,6 +1006,14 @@
width = 'Globals.Line.Height'
/>
</layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
<widget name = 'DebugLevelPopupDesc'
type = 'OptionsLabel'
/>
<widget name = 'DebugLevelPopup'
type = 'PopUp'
/>
</layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
<widget name = 'DiscordRpc'
type = 'Checkbox'

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

@ -869,6 +869,14 @@
width = 'Globals.Line.Height'
/>
</layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
<widget name = 'DebugLevelPopupDesc'
type = 'OptionsLabel'
/>
<widget name = 'DebugLevelPopup'
type = 'PopUp'
/>
</layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
<widget name = 'DiscordRpc'
type = 'Checkbox'

28
gui/themes/default.inc
View File

@ -2054,6 +2054,12 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</layout>"
"<widget name='ConfigPath' height='Globals.Line.Height' />"
"<layout type='horizontal' padding='0,0,0,0' spacing='10' align='center'>"
"<widget name='LogPath' height='Globals.Line.Height' />"
"<widget name='ViewButton' "
"type='Button' "
"/>"
"</layout>"
"<layout type='horizontal' padding='0,0,0,0' spacing='10' align='center'>"
"<widget name='BrowserPath' "
"height='Globals.Line.Height' "
"/>"
@ -2157,6 +2163,14 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"/>"
"</layout>"
"<layout type='horizontal' padding='0,0,0,0' spacing='10' align='center'>"
"<widget name='DebugLevelPopupDesc' "
"type='OptionsLabel' "
"/>"
"<widget name='DebugLevelPopup' "
"type='PopUp' "
"/>"
"</layout>"
"<layout type='horizontal' padding='0,0,0,0' spacing='10' align='center'>"
"<widget name='DiscordRpc' "
"type='Checkbox' "
"/>"
@ -4026,6 +4040,12 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</layout>"
"<widget name='ConfigPath' height='Globals.Line.Height' />"
"<layout type='horizontal' padding='0,0,0,0' spacing='16'>"
"<widget name='LogPath' height='Globals.Line.Height' />"
"<widget name='ViewButton' "
"type='Button' "
"/>"
"</layout>"
"<layout type='horizontal' padding='0,0,0,0' spacing='16'>"
"<widget name='BrowserPath' "
"height='Globals.Line.Height' "
"/>"
@ -4139,6 +4159,14 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"/>"
"</layout>"
"<layout type='horizontal' padding='0,0,0,0' spacing='10' align='center'>"
"<widget name='DebugLevelPopupDesc' "
"type='OptionsLabel' "
"/>"
"<widget name='DebugLevelPopup' "
"type='PopUp' "
"/>"
"</layout>"
"<layout type='horizontal' padding='0,0,0,0' spacing='10' align='center'>"
"<widget name='DiscordRpc' "
"type='Checkbox' "
"/>"

2
gui/themes/residualvm/THEMERC
View File

@ -1,3 +1,3 @@
[SCUMMVM_STX0.9.9:ResidualVM Modern Theme Remastered:No Author]
[SCUMMVM_STX0.9.10:ResidualVM Modern Theme Remastered:No Author]
%using ../common
%using ../common-svg

2
gui/themes/scummclassic/THEMERC
View File

@ -1 +1 @@
[SCUMMVM_STX0.9.9:ScummVM Classic Theme:No Author]
[SCUMMVM_STX0.9.10:ScummVM Classic Theme:No Author]

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

@ -774,6 +774,14 @@
width = 'Globals.Line.Height'
/>
</layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
<widget name = 'DebugLevelPopupDesc'
type = 'OptionsLabel'
/>
<widget name = 'DebugLevelPopup'
type = 'PopUp'
/>
</layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
<widget name = 'DiscordRpc'
type = 'Checkbox'

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

@ -791,6 +791,14 @@
width = 'Globals.Line.Height'
/>
</layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
<widget name = 'DebugLevelPopupDesc'
type = 'OptionsLabel'
/>
<widget name = 'DebugLevelPopup'
type = 'PopUp'
/>
</layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' align = 'center'>
<widget name = 'DiscordRpc'
type = 'Checkbox'

2
gui/themes/scummmodern/THEMERC
View File

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

2
gui/themes/scummremastered/THEMERC
View File

@ -1,3 +1,3 @@
[SCUMMVM_STX0.9.9:ScummVM Modern Theme Remastered:No Author]
[SCUMMVM_STX0.9.10:ScummVM Modern Theme Remastered:No Author]
%using ../common
%using ../common-svg