[Scummvm-git-logs] scummvm master -> e7ba15fa32b80655f2068e818072a32257582f96
criezy
criezy at scummvm.org
Sun Dec 16 17:04:17 CET 2018
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d320c36e58 JANITORIAL: Fix typo in comment
319b90fb21 BACKENDS: Add kFeatureNativeFileBowserDialog
e7ba15fa32 GUI: Add option to enable/disable using the system file browser
Commit: d320c36e588cdefac9c24a0d9743d79539f6d198
https://github.com/scummvm/scummvm/commit/d320c36e588cdefac9c24a0d9743d79539f6d198
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2018-12-16T15:58:43Z
Commit Message:
JANITORIAL: Fix typo in comment
Changed paths:
common/system.h
diff --git a/common/system.h b/common/system.h
index 01d436e..c33dfbb 100644
--- a/common/system.h
+++ b/common/system.h
@@ -299,7 +299,7 @@ public:
kFeatureStretchMode,
/**
- * Determine whether a virtual keyboard is too be shown or not.
+ * Determine whether a virtual keyboard is to be shown or not.
* This would mostly be implemented by backends for hand held devices,
* like PocketPC, Palms, Symbian phones like the P800, Zaurus, etc.
*/
@@ -373,7 +373,7 @@ public:
*
* This feature has no associated state.
*/
- kFeatureOpenUrl ,
+ kFeatureOpenUrl,
/**
* show on-screen control
Commit: 319b90fb21f5c1e4ca9d9196b65aadb6e2529c09
https://github.com/scummvm/scummvm/commit/319b90fb21f5c1e4ca9d9196b65aadb6e2529c09
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2018-12-16T15:58:43Z
Commit Message:
BACKENDS: Add kFeatureNativeFileBowserDialog
Changed paths:
backends/platform/sdl/macosx/macosx.cpp
backends/platform/sdl/win32/win32.cpp
common/system.h
diff --git a/backends/platform/sdl/macosx/macosx.cpp b/backends/platform/sdl/macosx/macosx.cpp
index fcfd93a..b58255c 100644
--- a/backends/platform/sdl/macosx/macosx.cpp
+++ b/backends/platform/sdl/macosx/macosx.cpp
@@ -110,6 +110,12 @@ void OSystem_MacOSX::addSysArchivesToSearchSet(Common::SearchSet &s, int priorit
bool OSystem_MacOSX::hasFeature(Feature f) {
if (f == kFeatureDisplayLogFile || f == kFeatureClipboardSupport || f == kFeatureOpenUrl)
return true;
+
+#ifdef USE_SYSDIALOGS
+ if (f == kFeatureNativeFileBowserDialog)
+ return true;
+#endif
+
return OSystem_POSIX::hasFeature(f);
}
diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp
index 2a80508..264a064 100644
--- a/backends/platform/sdl/win32/win32.cpp
+++ b/backends/platform/sdl/win32/win32.cpp
@@ -109,6 +109,11 @@ bool OSystem_Win32::hasFeature(Feature f) {
if (f == kFeatureDisplayLogFile || f == kFeatureOpenUrl)
return true;
+#ifdef USE_SYSDIALOGS
+ if (f == kFeatureNativeFileBowserDialog)
+ return true;
+#endif
+
return OSystem_SDL::hasFeature(f);
}
diff --git a/common/system.h b/common/system.h
index c33dfbb..73a4ad6 100644
--- a/common/system.h
+++ b/common/system.h
@@ -403,7 +403,13 @@ public:
/**
* shaders
*/
- kFeatureShader
+ kFeatureShader,
+
+ /**
+ * Supports for using the native system file browser dialog
+ through the DialogManager.
+ */
+ kFeatureNativeFileBowserDialog
};
Commit: e7ba15fa32b80655f2068e818072a32257582f96
https://github.com/scummvm/scummvm/commit/e7ba15fa32b80655f2068e818072a32257582f96
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2018-12-16T15:58:44Z
Commit Message:
GUI: Add option to enable/disable using the system file browser
Changed paths:
gui/ThemeEngine.h
gui/options.cpp
gui/options.h
gui/themes/default.inc
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/scummmodern/scummmodern_layout.stx
gui/themes/scummmodern/scummmodern_layout_lowres.stx
diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index ab77cfc..7f13f3b 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -37,7 +37,7 @@
#include "graphics/pixelformat.h"
-#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.25"
+#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.26"
class OSystem;
diff --git a/gui/options.cpp b/gui/options.cpp
index 5c5c9ec..7032d10 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -1468,6 +1468,7 @@ GlobalOptionsDialog::GlobalOptionsDialog(LauncherDialog *launcher)
_guiLanguagePopUpDesc = 0;
_guiLanguagePopUp = 0;
_guiLanguageUseGameLanguageCheckbox = nullptr;
+ _useSystemDialogsCheckbox = 0;
#ifdef USE_UPDATES
_updatesPopUpDesc = 0;
_updatesPopUp = 0;
@@ -1704,6 +1705,17 @@ void GlobalOptionsDialog::build() {
#endif // USE_TRANSLATION
+ if (g_system->hasFeature(OSystem::kFeatureNativeFileBowserDialog)) {
+ _useSystemDialogsCheckbox = new CheckboxWidget(tab, "GlobalOptions_Misc.UseSystemDialogs",
+ _("Use native system file browser"),
+ _("Use the native system file browser instead of the ScummVM one to select a file or directory.")
+ );
+
+ if (ConfMan.hasKey("gui_browser_native")) {
+ _useSystemDialogsCheckbox->setState(ConfMan.getBool("gui_browser_native", _domain));
+ }
+ }
+
#ifdef USE_UPDATES
_updatesPopUpDesc = new StaticTextWidget(tab, "GlobalOptions_Misc.UpdatesPopupDesc", _("Update check:"), _("How often to check ScummVM updates"));
_updatesPopUp = new PopUpWidget(tab, "GlobalOptions_Misc.UpdatesPopup");
@@ -1977,6 +1989,10 @@ void GlobalOptionsDialog::apply() {
ConfMan.setBool("gui_use_game_language", guiUseGameLanguage, _domain);
#endif
+ if (_useSystemDialogsCheckbox) {
+ ConfMan.setBool("gui_browser_native", _useSystemDialogsCheckbox->getState(), _domain);
+ }
+
GUI::ThemeEngine::GraphicsMode gfxMode = (GUI::ThemeEngine::GraphicsMode)_rendererPopUp->getSelectedTag();
Common::String oldGfxConfig = ConfMan.get("gui_renderer");
Common::String newGfxConfig = GUI::ThemeEngine::findModeConfigName(gfxMode);
diff --git a/gui/options.h b/gui/options.h
index 12b42bd..ad9cb2a 100644
--- a/gui/options.h
+++ b/gui/options.h
@@ -282,6 +282,8 @@ protected:
StaticTextWidget *_guiLanguagePopUpDesc;
PopUpWidget *_guiLanguagePopUp;
CheckboxWidget *_guiLanguageUseGameLanguageCheckbox;
+ CheckboxWidget *_useSystemDialogsCheckbox;
+
#ifdef USE_UPDATES
StaticTextWidget *_updatesPopUpDesc;
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 499ae7b..312f410 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1140,6 +1140,11 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"/>"
"</layout>"
"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
+"<widget name='UseSystemDialogs' "
+"type='Checkbox' "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
"<widget name='UpdatesPopupDesc' "
"type='OptionsLabel' "
"/>"
@@ -2749,6 +2754,11 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"/>"
"</layout>"
"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
+"<widget name='UseSystemDialogs' "
+"type='Checkbox' "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
"<widget name='UpdatesPopupDesc' "
"width='80' "
"height='Globals.Line.Height' "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 2e283e3..a71e815 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 dfbec63..2523c45 100644
--- a/gui/themes/scummclassic/THEMERC
+++ b/gui/themes/scummclassic/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.25:ScummVM Classic Theme:No Author]
+[SCUMMVM_STX0.8.26:ScummVM Classic Theme:No Author]
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 1ac6390..c92c4d1 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -573,6 +573,11 @@
/>
</layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+ <widget name = 'UseSystemDialogs'
+ type = 'Checkbox'
+ />
+ </layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
<widget name = 'UpdatesPopupDesc'
type = 'OptionsLabel'
/>
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 71c8da3..67e82f9 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -575,6 +575,11 @@
/>
</layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
+ <widget name = 'UseSystemDialogs'
+ type = 'Checkbox'
+ />
+ </layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
<widget name = 'UpdatesPopupDesc'
width = '80'
height = 'Globals.Line.Height'
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 197c5fe..7ed30de 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 61c5cfe..458e668 100644
--- a/gui/themes/scummmodern/THEMERC
+++ b/gui/themes/scummmodern/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.25:ScummVM Modern Theme:No Author]
+[SCUMMVM_STX0.8.26:ScummVM Modern Theme:No Author]
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index 48244c7..d6c927c 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -587,6 +587,11 @@
/>
</layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+ <widget name = 'UseSystemDialogs'
+ type = 'Checkbox'
+ />
+ </layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
<widget name = 'UpdatesPopupDesc'
type = 'OptionsLabel'
/>
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index 685082e..464450c 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -573,6 +573,11 @@
/>
</layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
+ <widget name = 'UseSystemDialogs'
+ type = 'Checkbox'
+ />
+ </layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
<widget name = 'UpdatesPopupDesc'
width = '80'
height = 'Globals.Line.Height'
More information about the Scummvm-git-logs
mailing list