[Scummvm-git-logs] scummvm master -> 4b51ee1f98d222fb13092bab50a90a311dadce43
sev-
noreply at scummvm.org
Sun Apr 21 20:32:21 UTC 2024
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:
4b51ee1f98 GUI: Remplace [?] with "Help"
Commit: 4b51ee1f98d222fb13092bab50a90a311dadce43
https://github.com/scummvm/scummvm/commit/4b51ee1f98d222fb13092bab50a90a311dadce43
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-04-21T22:31:07+02:00
Commit Message:
GUI: Remplace [?] with "Help"
It looks like the users do not even pay attention or have no understanding
what does "?" mean, thus, putting it into words.
Next step is to make the button jumping with animation.
Changed paths:
gui/launcher.cpp
gui/themes/common/highres_layout.stx
gui/themes/common/lowres_layout.stx
gui/themes/default.inc
gui/themes/residualvm.zip
gui/themes/scummclassic.zip
gui/themes/scummclassic/classic_layout.stx
gui/themes/scummclassic/classic_layout_lowres.stx
gui/themes/scummmodern.zip
gui/themes/scummremastered.zip
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 7bd95f9d0de..24a036551fa 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -259,7 +259,7 @@ void LauncherDialog::build() {
#endif
new StaticTextWidget(this, _title + ".Version", Common::U32String(gScummVMFullVersion));
- new ButtonWidget(this, _title + ".HelpButton", Common::U32String("?"), _("Help"), kHelpCmd);
+ new ButtonWidget(this, _title + ".HelpButton", Common::U32String("Help"), _("Click here to see Help"), kHelpCmd);
if (!g_system->hasFeature(OSystem::kFeatureNoQuit)) {
// I18N: Button Quit ScummVM program. Q is the shortcut, Ctrl+Q, put it in parens for non-latin (~Q~)
diff --git a/gui/themes/common/highres_layout.stx b/gui/themes/common/highres_layout.stx
index 92e4a1938b4..ba86bee9e5c 100644
--- a/gui/themes/common/highres_layout.stx
+++ b/gui/themes/common/highres_layout.stx
@@ -47,6 +47,8 @@
<def var = 'ShowChooserPics' value = '1'/>
<def var = 'ShowChooserPageDisplay' value = '1'/>
+ <def var = 'Launcher.HelpButton.Width' value = '72' scalable = 'yes'/> <!-- Button.Width * 3 -->
+
<def var = 'SaveLoadChooser.ExtInfo.Visible' value = '1'/>
<def var = 'RecorderDialog.ExtInfo.Visible' value = '1'/>
<def var = 'ImageAlbum.ImageInset' value = '16' scalable = 'yes' />
@@ -158,7 +160,7 @@
<layout type = 'horizontal' spacing = '5' padding = '0, 0, 0, 0'>
<widget name = 'HelpButton'
height = 'Globals.Button.Height'
- width = 'Globals.Button.Height'
+ width = 'Globals.Launcher.HelpButton.Width'
rtl = 'yes'
/>
<space />
@@ -259,7 +261,7 @@
<layout type = 'horizontal' spacing = '5' padding = '0, 0, 0, 0'>
<widget name = 'HelpButton'
height = 'Globals.Button.Height'
- width = 'Globals.Button.Height'
+ width = 'Globals.Launcher.HelpButton.Width'
rtl = 'yes'
/>
<space />
@@ -356,7 +358,7 @@
<layout type = 'horizontal' spacing = '5' padding = '0, 0, 0, 0'>
<widget name = 'HelpButton'
height = 'Globals.Button.Height'
- width = 'Globals.Button.Height'
+ width = 'Globals.Launcher.HelpButton.Width'
rtl = 'yes'
/>
<space />
diff --git a/gui/themes/common/lowres_layout.stx b/gui/themes/common/lowres_layout.stx
index a5d8f9c4ee3..5d6d6f29090 100644
--- a/gui/themes/common/lowres_layout.stx
+++ b/gui/themes/common/lowres_layout.stx
@@ -39,6 +39,8 @@
<def var = 'ShowChooserPics' value = '0'/>
<def var = 'ShowChooserPageDisplay' value = '0'/>
+ <def var = 'Launcher.HelpButton.Width' value = '48' scalable = 'yes'/> <!-- Button.Width * 3 -->
+
<def var = 'SaveLoadChooser.ExtInfo.Visible' value = '0'/>
<def var = 'RecorderDialog.ExtInfo.Visible' value = '0'/>
<def var = 'ImageAlbum.ImageInset' value = '16' scalable = 'yes' />
@@ -146,7 +148,7 @@
<layout type = 'horizontal' spacing = '5' padding = '0, 0, 0, 0'>
<widget name = 'HelpButton'
height = 'Globals.Button.Height'
- width = 'Globals.Button.Height'
+ width = 'Globals.Launcher.HelpButton.Width'
rtl = 'yes'
/>
<space />
@@ -229,7 +231,7 @@
<layout type = 'horizontal' spacing = '5' padding = '0, 0, 0, 0'>
<widget name = 'HelpButton'
height = 'Globals.Button.Height'
- width = 'Globals.Button.Height'
+ width = 'Globals.Launcher.HelpButton.Width'
rtl = 'yes'
/>
<space />
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index dca70e64a8b..2dcc27c0fb8 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1446,13 +1446,14 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"<def var='Font.Height' value='12' scalable='yes'/>"
"<def var='About.OuterBorder' value='80' scalable='yes'/>"
"<def var='TabWidget.TitleSpacing' value='10' scalable='yes'/>"
-"<def var = 'RichTextWidget.InnerMargin' value = '10' scalable = 'yes'/>"
+"<def var='RichTextWidget.InnerMargin' value='10' scalable='yes'/>"
"<def var='Layout.Spacing' value='8' scalable='yes'/>"
"<def var='ShowLauncherLogo' value='0'/>"
"<def var='ShowGlobalMenuLogo' value='0'/>"
"<def var='ShowSearchPic' value='0'/>"
"<def var='ShowChooserPics' value='0'/>"
"<def var='ShowChooserPageDisplay' value='1'/>"
+"<def var='Launcher.HelpButton.Width' value='72' scalable='yes'/> "
"<def var='SaveLoadChooser.ExtInfo.Visible' value='1'/>"
"<def var='RecorderDialog.ExtInfo.Visible' value='1'/>"
"<def var='ImageAlbum.ImageInset' value='16' scalable='yes' />"
@@ -1542,7 +1543,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"<layout type='horizontal' spacing='5' padding='0,0,0,0'>"
"<widget name='HelpButton' "
"height='Globals.Button.Height' "
-"width='Globals.Button.Height' "
+"width='Globals.Launcher.HelpButton.Width' "
"rtl='yes' "
"/>"
"<space />"
@@ -1623,9 +1624,9 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</layout>"
"</layout>"
"</dialog>"
-"<dialog name = 'HelpContentDialog' overlays = 'Dialog.HelpDialog.TabWidget'>"
-"<layout type = 'vertical' padding = '0, 0, 0, 0'>"
-"<widget name = 'RichTextWidget'/>"
+"<dialog name='HelpContentDialog' overlays='Dialog.HelpDialog.TabWidget'>"
+"<layout type='vertical' padding='0,0,0,0'>"
+"<widget name='RichTextWidget'/>"
"</layout>"
"</dialog>"
"<dialog name='Browser' overlays='Dialog.Launcher.GameList' shading='dim'>"
@@ -1769,11 +1770,20 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</dialog>"
"<dialog name='GlobalOptions_KeyMapper' overlays='Dialog.GlobalOptions.TabWidget'>"
"<layout type='vertical' padding='0,0,0,0'>"
-"<widget name='Container'/>"
+"<widget name='Container' "
+"type='ScrollContainerWidget' "
+"/>"
"</layout>"
"</dialog>"
"<dialog name='GlobalOptions_Backend' overlays='Dialog.GlobalOptions.TabWidget'>"
-"<layout type='vertical' padding='16,16,16,16'>"
+"<layout type='vertical' padding='0,0,0,0'>"
+"<widget name='Container' "
+"type='ScrollContainerWidget' "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions_Backend_Container' overlays='GlobalOptions_Backend.Container'>"
+"<layout type='vertical' padding='0,0,0,0'>"
"<widget name='Container'/>"
"</layout>"
"</dialog>"
@@ -2628,15 +2638,26 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</dialog>"
"<dialog name='GameOptions_KeyMapper' overlays='Dialog.GameOptions.TabWidget'>"
"<layout type='vertical' padding='0,0,0,0'>"
-"<widget name='Container'/>"
+"<widget name='Container' "
+"type='ScrollContainerWidget' "
+"/>"
"</layout>"
"</dialog>"
"<dialog name='GameOptions_Backend' overlays='Dialog.GameOptions.TabWidget'>"
-"<layout type='vertical' padding='16,16,16,16'>"
+"<layout type='vertical' padding='0,0,0,0'>"
+"<widget name='Container' "
+"type='ScrollContainerWidget' "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='GameOptions_Backend_Container' overlays='GameOptions_Backend.Container'>"
+"<layout type='vertical' padding='0,0,0,0'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
"<widget name='EnableTabCheckbox' "
"type='Checkbox' "
"/>"
-"<widget name='Container'/>"
+"</layout>"
+"<import layout='Dialog.GlobalOptions_Backend_Container' />"
"</layout>"
"</dialog>"
"<dialog name='GameOptions_Achievements' overlays='Dialog.GameOptions.TabWidget'>"
@@ -2917,12 +2938,21 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</dialog>"
"<dialog name='GlobalConfig_KeyMapper' overlays='Dialog.GlobalConfig.TabWidget'>"
"<layout type='vertical' padding='0,0,0,0'>"
-"<widget name='Container'/>"
+"<widget name='Container' "
+"type='ScrollContainerWidget' "
+"/>"
"</layout>"
"</dialog>"
"<dialog name='GlobalConfig_Backend' overlays='Dialog.GlobalConfig.TabWidget'>"
-"<layout type='vertical' padding='16,16,16,16'>"
-"<widget name='Container'/>"
+"<layout type='vertical' padding='0,0,0,0'>"
+"<widget name='Container' "
+"type='ScrollContainerWidget' "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalConfig_Backend_Container' overlays='GlobalConfig_Backend.Container'>"
+"<layout type='vertical' padding='0,0,0,0'>"
+"<import layout='Dialog.GlobalOptions_Backend_Container' />"
"</layout>"
"</dialog>"
"<dialog name='GlobalConfig_Achievements' overlays='Dialog.GlobalConfig.TabWidget'>"
@@ -3578,13 +3608,14 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"<def var='Font.Height' value='10' scalable='yes'/>"
"<def var='About.OuterBorder' value='10' scalable='yes'/>"
"<def var='TabWidget.TitleSpacing' value='10' scalable='yes'/>"
-"<def var = 'RichTextWidget.InnerMargin' value = '10' scalable = 'yes'/>"
+"<def var='RichTextWidget.InnerMargin' value='10' scalable='yes'/>"
"<def var='Layout.Spacing' value='8' scalable='yes'/>"
"<def var='ShowLauncherLogo' value='0'/>"
"<def var='ShowGlobalMenuLogo' value='0'/>"
"<def var='ShowSearchPic' value='0'/>"
"<def var='ShowChooserPics' value='0'/>"
"<def var='ShowChooserPageDisplay' value='0'/>"
+"<def var='Launcher.HelpButton.Width' value='48' scalable='yes'/> "
"<def var='SaveLoadChooser.ExtInfo.Visible' value='0'/>"
"<def var='RecorderDialog.ExtInfo.Visible' value='0'/>"
"<def var='ImageAlbum.ImageInset' value='16' scalable='yes' />"
@@ -3674,7 +3705,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"<layout type='horizontal' spacing='5' padding='0,0,0,0'>"
"<widget name='HelpButton' "
"height='Globals.Button.Height' "
-"width='Globals.Button.Height' "
+"width='Globals.Launcher.HelpButton.Width' "
"rtl='yes' "
"/>"
"<space />"
@@ -3763,9 +3794,9 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</layout>"
"</layout>"
"</dialog>"
-"<dialog name = 'HelpContentDialog' overlays = 'Dialog.HelpDialog.TabWidget'>"
-"<layout type = 'vertical' padding = '0, 0, 0, 0'>"
-"<widget name = 'RichTextWidget'/>"
+"<dialog name='HelpContentDialog' overlays='Dialog.HelpDialog.TabWidget'>"
+"<layout type='vertical' padding='0,0,0,0'>"
+"<widget name='RichTextWidget'/>"
"</layout>"
"</dialog>"
"<dialog name='Browser' overlays='screen' inset='8' shading='dim'>"
@@ -3908,11 +3939,20 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</dialog>"
"<dialog name='GlobalOptions_KeyMapper' overlays='Dialog.GlobalOptions.TabWidget'>"
"<layout type='vertical' padding='0,0,0,0'>"
-"<widget name='Container'/>"
+"<widget name='Container' "
+"type='ScrollContainerWidget' "
+"/>"
"</layout>"
"</dialog>"
"<dialog name='GlobalOptions_Backend' overlays='Dialog.GlobalOptions.TabWidget'>"
-"<layout type='vertical' padding='16,16,16,16'>"
+"<layout type='vertical' padding='0,0,0,0'>"
+"<widget name='Container' "
+"type='ScrollContainerWidget' "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions_Backend_Container' overlays='GlobalOptions_Backend.Container'>"
+"<layout type='vertical' padding='0,0,0,0'>"
"<widget name='Container'/>"
"</layout>"
"</dialog>"
@@ -4773,15 +4813,26 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</dialog>"
"<dialog name='GameOptions_KeyMapper' overlays='Dialog.GameOptions.TabWidget'>"
"<layout type='vertical' padding='0,0,0,0'>"
-"<widget name='Container'/>"
+"<widget name='Container' "
+"type='ScrollContainerWidget' "
+"/>"
"</layout>"
"</dialog>"
"<dialog name='GameOptions_Backend' overlays='Dialog.GameOptions.TabWidget'>"
-"<layout type='vertical' padding='8,8,8,8'>"
+"<layout type='vertical' padding='0,0,0,0'>"
+"<widget name='Container' "
+"type='ScrollContainerWidget' "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='GameOptions_Backend_Container' overlays='GameOptions_Backend.Container'>"
+"<layout type='vertical' padding='0,0,0,0'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
"<widget name='EnableTabCheckbox' "
"type='Checkbox' "
"/>"
-"<widget name='Container'/>"
+"</layout>"
+"<import layout='Dialog.GlobalOptions_Backend_Container' />"
"</layout>"
"</dialog>"
"<dialog name='GameOptions_Achievements' overlays='Dialog.GameOptions.TabWidget'>"
@@ -5068,12 +5119,21 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</dialog>"
"<dialog name='GlobalConfig_KeyMapper' overlays='Dialog.GlobalConfig.TabWidget'>"
"<layout type='vertical' padding='0,0,0,0'>"
-"<widget name='Container'/>"
+"<widget name='Container' "
+"type='ScrollContainerWidget' "
+"/>"
"</layout>"
"</dialog>"
"<dialog name='GlobalConfig_Backend' overlays='Dialog.GlobalConfig.TabWidget'>"
-"<layout type='vertical' padding='8,8,8,8'>"
-"<widget name='Container'/>"
+"<layout type='vertical' padding='0,0,0,0'>"
+"<widget name='Container' "
+"type='ScrollContainerWidget' "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalConfig_Backend_Container' overlays='GlobalConfig_Backend.Container'>"
+"<layout type='vertical' padding='0,0,0,0'>"
+"<import layout='Dialog.GlobalOptions_Backend_Container' />"
"</layout>"
"</dialog>"
"<dialog name='GlobalConfig_Achievements' overlays='Dialog.GlobalConfig.TabWidget'>"
diff --git a/gui/themes/residualvm.zip b/gui/themes/residualvm.zip
index d46df99748e..356919cda76 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 954583dc85a..93c6e330144 100644
Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 6de846c447b..21f56690975 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -39,6 +39,8 @@
<def var = 'ShowChooserPics' value = '0'/>
<def var = 'ShowChooserPageDisplay' value = '1'/>
+ <def var = 'Launcher.HelpButton.Width' value = '72' scalable = 'yes'/> <!-- Button.Width * 3 -->
+
<def var = 'SaveLoadChooser.ExtInfo.Visible' value = '1'/>
<def var = 'RecorderDialog.ExtInfo.Visible' value = '1'/>
<def var = 'ImageAlbum.ImageInset' value = '16' scalable = 'yes' />
@@ -138,7 +140,7 @@
<layout type = 'horizontal' spacing = '5' padding = '0, 0, 0, 0'>
<widget name = 'HelpButton'
height = 'Globals.Button.Height'
- width = 'Globals.Button.Height'
+ width = 'Globals.Launcher.HelpButton.Width'
rtl = 'yes'
/>
<space />
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 1b591688485..6fee29b269d 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -39,6 +39,8 @@
<def var = 'ShowChooserPics' value = '0'/>
<def var = 'ShowChooserPageDisplay' value = '0'/>
+ <def var = 'Launcher.HelpButton.Width' value = '48' scalable = 'yes'/> <!-- Button.Width * 3 -->
+
<def var = 'SaveLoadChooser.ExtInfo.Visible' value = '0'/>
<def var = 'RecorderDialog.ExtInfo.Visible' value = '0'/>
<def var = 'ImageAlbum.ImageInset' value = '16' scalable = 'yes' />
@@ -138,7 +140,7 @@
<layout type = 'horizontal' spacing = '5' padding = '0, 0, 0, 0'>
<widget name = 'HelpButton'
height = 'Globals.Button.Height'
- width = 'Globals.Button.Height'
+ width = 'Globals.Launcher.HelpButton.Width'
rtl = 'yes'
/>
<space />
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index d7bf04332d3..0ffee7668ec 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip
index 4328ad5bdb1..e07defb1436 100644
Binary files a/gui/themes/scummremastered.zip and b/gui/themes/scummremastered.zip differ
More information about the Scummvm-git-logs
mailing list