[Scummvm-git-logs] scummvm master -> 0634a45abd92d6487956226245def27dde400704

sev- sev at scummvm.org
Thu Apr 1 16:24:12 UTC 2021 

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:
0634a45abd GUI: Added scummvm.ini path to the Paths tab. Bump theme version


Commit: 0634a45abd92d6487956226245def27dde400704
    https://github.com/scummvm/scummvm/commit/0634a45abd92d6487956226245def27dde400704
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-04-01T18:19:50+02:00

Commit Message:
GUI: Added scummvm.ini path to the Paths tab. Bump theme version

Finally we could direct the users to the precise path where scummvm.ini
lives on their system. No more guessing.

Changed paths:
    gui/ThemeEngine.h
    gui/options.cpp
    gui/themes/default.inc
    gui/themes/residualvm.zip
    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
    gui/themes/scummremastered.zip
    gui/themes/scummremastered/THEMERC
    gui/themes/scummremastered/remastered_layout.stx
    gui/themes/scummremastered/remastered_layout_lowres.stx


diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index 50f47499e5..0e35372b6b 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -38,7 +38,7 @@
 #include "graphics/pixelformat.h"
 
 
-#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.43"
+#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.44"
 
 class OSystem;
 
diff --git a/gui/options.cpp b/gui/options.cpp
index f7078d5a6f..7c955373cd 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -528,12 +528,12 @@ void OptionsDialog::apply() {
 				graphicsModeChanged = true;
 			if (ConfMan.getBool("vsync", _domain) != _vsyncCheckbox->getState())
 				graphicsModeChanged = true;
-			
+
 			ConfMan.setBool("filtering", _filteringCheckbox->getState(), _domain);
 			ConfMan.setBool("fullscreen", _fullscreenCheckbox->getState(), _domain);
 			ConfMan.setBool("aspect_ratio", _aspectCheckbox->getState(), _domain);
 			ConfMan.setBool("vsync", _vsyncCheckbox->getState(), _domain);
-			
+
 			bool isSet = false;
 
 			if ((int32)_gfxPopUp->getSelectedTag() >= 0) {
@@ -577,7 +577,7 @@ void OptionsDialog::apply() {
 				ConfMan.removeKey("stretch_mode", _domain);
 				if (g_system->getStretchMode() != g_system->getDefaultStretchMode())
 					graphicsModeChanged = true;
-			}				
+			}
 
 			if (_rendererTypePopUp->getSelectedTag() > 0) {
 				Graphics::RendererType selected = (Graphics::RendererType) _rendererTypePopUp->getSelectedTag();
@@ -639,7 +639,7 @@ void OptionsDialog::apply() {
 		g_system->beginGFXTransaction();
 		g_system->setGraphicsMode(ConfMan.get("gfx_mode", _domain).c_str());
 		g_system->setStretchMode(ConfMan.get("stretch_mode", _domain).c_str());
-		
+
 		if (ConfMan.hasKey("aspect_ratio"))
 			g_system->setFeatureState(OSystem::kFeatureAspectRatioCorrection, ConfMan.getBool("aspect_ratio", _domain));
 		if (ConfMan.hasKey("fullscreen"))
@@ -2085,6 +2085,9 @@ void GlobalOptionsDialog::addPathsControls(GuiObject *boss, const Common::String
 	_pluginsPathClearButton = addClearButton(boss, "GlobalOptions_Paths.PluginsPathClearButton", kPluginsPathClearCmd);
 #endif // DYNAMIC_MODULES
 #endif // !defined(__DC__)
+
+	Common::U32String confPath = g_system->getDefaultConfigFileName();
+	new StaticTextWidget(boss, prefix + "ConfigPath", _("ScummVM config path: ") + confPath, confPath);
 }
 
 void GlobalOptionsDialog::addMiscControls(GuiObject *boss, const Common::String &prefix, bool lowres) {
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 308617fef9..5f10ce9393 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1949,6 +1949,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "width='Globals.Line.Height' "
 "/>"
 "</layout>"
+"<widget name='ConfigPath' height='Globals.Line.Height' />"
 "</layout>"
 "</dialog>"
 "<dialog name='GlobalOptions_Misc' overlays='Dialog.GlobalOptions.TabWidget'>"
@@ -3798,6 +3799,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "width='Globals.Line.Height' "
 "/>"
 "</layout>"
+"<widget name='ConfigPath' height='Globals.Line.Height' />"
 "</layout>"
 "</dialog>"
 "<dialog name='GlobalOptions_Misc' overlays='Dialog.GlobalOptions.TabWidget'>"
diff --git a/gui/themes/residualvm.zip b/gui/themes/residualvm.zip
index 6a8e64664a..22f768cd91 100644
Binary files a/gui/themes/residualvm.zip and b/gui/themes/residualvm.zip differ
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index c3b337d2b3..eccab89681 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 b5388530f8..6a9a2fbada 100644
--- a/gui/themes/scummclassic/THEMERC
+++ b/gui/themes/scummclassic/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.43:ScummVM Classic Theme:No Author]
+[SCUMMVM_STX0.8.44:ScummVM Classic Theme:No Author]
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index acfa45aa49..026bc63201 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -583,6 +583,7 @@
 						width = 'Globals.Line.Height'
 				/>
 			</layout>
+			<widget name = 'ConfigPath' height = 'Globals.Line.Height' />
 		</layout>
 	</dialog>
 
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 2341550296..07d49650db 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -579,6 +579,7 @@
 						width = 'Globals.Line.Height'
 				/>
 			</layout>
+			<widget name = 'ConfigPath' height = 'Globals.Line.Height' />
 		</layout>
 	</dialog>
 
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 07f60b978e..cfd75d1ab8 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 87051e17aa..79b8402c9c 100644
--- a/gui/themes/scummmodern/THEMERC
+++ b/gui/themes/scummmodern/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.43:ScummVM Modern Theme:No Author]
+[SCUMMVM_STX0.8.44:ScummVM Modern Theme:No Author]
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index 44dd69960d..408b095838 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -599,6 +599,7 @@
 						width = 'Globals.Line.Height'
 				/>
 			</layout>
+			<widget name = 'ConfigPath' height = 'Globals.Line.Height' />
 		</layout>
 	</dialog>
 
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index fc87b5fa24..939d9fc24e 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -577,6 +577,7 @@
 						width = 'Globals.Line.Height'
 				/>
 			</layout>
+			<widget name = 'ConfigPath' height = 'Globals.Line.Height' />
 		</layout>
 	</dialog>
 
diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip
index d5bf1ff5b3..6ab30c622a 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 734f164785..8642ee5a68 100644
--- a/gui/themes/scummremastered/THEMERC
+++ b/gui/themes/scummremastered/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.43:ScummVM Modern Theme Remastered:No Author]
+[SCUMMVM_STX0.8.44:ScummVM Modern Theme Remastered:No Author]
diff --git a/gui/themes/scummremastered/remastered_layout.stx b/gui/themes/scummremastered/remastered_layout.stx
index 44dd69960d..408b095838 100644
--- a/gui/themes/scummremastered/remastered_layout.stx
+++ b/gui/themes/scummremastered/remastered_layout.stx
@@ -599,6 +599,7 @@
 						width = 'Globals.Line.Height'
 				/>
 			</layout>
+			<widget name = 'ConfigPath' height = 'Globals.Line.Height' />
 		</layout>
 	</dialog>
 
diff --git a/gui/themes/scummremastered/remastered_layout_lowres.stx b/gui/themes/scummremastered/remastered_layout_lowres.stx
index fc87b5fa24..939d9fc24e 100644
--- a/gui/themes/scummremastered/remastered_layout_lowres.stx
+++ b/gui/themes/scummremastered/remastered_layout_lowres.stx
@@ -577,6 +577,7 @@
 						width = 'Globals.Line.Height'
 				/>
 			</layout>
+			<widget name = 'ConfigPath' height = 'Globals.Line.Height' />
 		</layout>
 	</dialog>

More information about the Scummvm-git-logs mailing list