[Scummvm-git-logs] scummvm master -> 5a66eb2f918dfc8bbb6e1fcac4b29e4c0d05ea5d

Sat Feb 12 09:26:26 UTC 2022

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:
5a66eb2f91 GUI: Add ShortOptionsLabel widget to the remaining themes


Commit: 5a66eb2f918dfc8bbb6e1fcac4b29e4c0d05ea5d
    https://github.com/scummvm/scummvm/commit/5a66eb2f918dfc8bbb6e1fcac4b29e4c0d05ea5d
Author: TorbjÃ¶rn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-02-12T10:24:26+01:00

Commit Message:
GUI: Add ShortOptionsLabel widget to the remaining themes

It was already in the Classic theme. I could have removed it, but it
looks like it's going to be useful to me.

Changed paths:
    gui/ThemeEngine.h
    gui/themes/common/highres_layout.stx
    gui/themes/common/lowres_layout.stx
    gui/themes/default.inc
    gui/themes/residualvm.zip
    gui/themes/residualvm/THEMERC
    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/scummremastered.zip
    gui/themes/scummremastered/THEMERC

diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index a31242d2156..3e1f3fe6463 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -36,7 +36,7 @@
 #include "graphics/pixelformat.h"
 
 
-#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.9.2"
+#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.9.3"
 
 class OSystem;
 
diff --git a/gui/themes/common/highres_layout.stx b/gui/themes/common/highres_layout.stx
index f2a12c0d885..8514c6fc362 100644
--- a/gui/themes/common/highres_layout.stx
+++ b/gui/themes/common/highres_layout.stx
@@ -83,6 +83,9 @@
 				size = '115, Globals.Line.Height'
 				textalign = 'end'
 		/>
+		<widget name = 'ShortOptionsLabel'
+				size = '60, Globals.Line.Height'
+		/>
 		<widget name = 'SmallLabel'
 				size = '24, Globals.Line.Height'
 		/>
diff --git a/gui/themes/common/lowres_layout.stx b/gui/themes/common/lowres_layout.stx
index cd9a2466464..7d55459ad6a 100644
--- a/gui/themes/common/lowres_layout.stx
+++ b/gui/themes/common/lowres_layout.stx
@@ -76,6 +76,9 @@
 				size = '100, Globals.Line.Height'
 				textalign = 'end'
 		/>
+		<widget name = 'ShortOptionsLabel'
+				size = '50, Globals.Line.Height'
+		/>
 		<widget name = 'SmallLabel'
 				size = '20, Globals.Line.Height'
 		/>
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index f068c63e4ea..01a6705349e 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1459,6 +1459,9 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "size='120,Globals.Line.Height' "
 "textalign='end' "
 "/>"
+"<widget name='ShortOptionsLabel' "
+"size='60,Globals.Line.Height' "
+"/>"
 "<widget name='SmallLabel' "
 "size='24,Globals.Line.Height' "
 "/>"
@@ -1468,9 +1471,6 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "<widget name='CloudTabLabelValue' "
 "size='200,Globals.Line.Height' "
 "/>"
-"<widget name='ShortOptionsLabel' "
-"size='60,Globals.Line.Height' "
-"/>"
 "<widget name='Button' "
 "size='108,24' "
 "/>"
@@ -1480,6 +1480,9 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "<widget name='Slider' "
 "size='128,18' "
 "/>"
+"<widget name='WideSlider' "
+"size='-1,18' "
+"/>"
 "<widget name='PopUp' "
 "size='-1,19' "
 "/>"
@@ -3367,6 +3370,9 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "size='120,Globals.Line.Height' "
 "textalign='end' "
 "/>"
+"<widget name='ShortOptionsLabel' "
+"size='60,Globals.Line.Height' "
+"/>"
 "<widget name='SmallLabel' "
 "size='20,Globals.Line.Height' "
 "/>"
@@ -3385,6 +3391,9 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "<widget name='Slider' "
 "size='85,12' "
 "/>"
+"<widget name='WideSlider' "
+"size='-1,12' "
+"/>"
 "<widget name='PopUp' "
 "size='-1,15' "
 "/>"
diff --git a/gui/themes/residualvm.zip b/gui/themes/residualvm.zip
index e4ea070aab4..c713f6777a2 100644
Binary files a/gui/themes/residualvm.zip and b/gui/themes/residualvm.zip differ
diff --git a/gui/themes/residualvm/THEMERC b/gui/themes/residualvm/THEMERC
index 1f30724c367..5b8314b25bd 100644
--- a/gui/themes/residualvm/THEMERC
+++ b/gui/themes/residualvm/THEMERC
@@ -1,3 +1,3 @@
-[SCUMMVM_STX0.9.2:ResidualVM Modern Theme Remastered:No Author]
+[SCUMMVM_STX0.9.3:ResidualVM Modern Theme Remastered:No Author]
 %using ../common
 %using ../common-svg
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 798214670cb..d46672bd1d0 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 02be869634e..c94d294f082 100644
--- a/gui/themes/scummclassic/THEMERC
+++ b/gui/themes/scummclassic/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.9.2:ScummVM Classic Theme:No Author]
+[SCUMMVM_STX0.9.3:ScummVM Classic Theme:No Author]
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 4f4740d961f..46e48d1edd6 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -63,6 +63,9 @@
 				size = '120, Globals.Line.Height'
 				textalign = 'end'
 		/>
+		<widget name = 'ShortOptionsLabel'
+				size = '60, Globals.Line.Height'
+		/>
 		<widget name = 'SmallLabel'
 				size = '24, Globals.Line.Height'
 		/>
@@ -73,10 +76,6 @@
 				size = '200, Globals.Line.Height'
 		/>
 
-		<widget name = 'ShortOptionsLabel'
-				size = '60, Globals.Line.Height'
-		/>
-
 		<widget name = 'Button'
 				size = '108, 24'
 		/>
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index cbed3bd2f40..bfcac5e5bdc 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -64,6 +64,9 @@
 				size = '120, Globals.Line.Height'
 				textalign = 'end'
 		/>
+		<widget name = 'ShortOptionsLabel'
+				size = '60, Globals.Line.Height'
+		/>
 		<widget name = 'SmallLabel'
 				size = '20, Globals.Line.Height'
 		/>
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index cc3ee55323b..b5dee0a6ddd 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 1e3edcb3f05..16ee8a5a153 100644
--- a/gui/themes/scummmodern/THEMERC
+++ b/gui/themes/scummmodern/THEMERC
@@ -1,2 +1,2 @@
-[SCUMMVM_STX0.9.2:ScummVM Modern Theme:No Author]
+[SCUMMVM_STX0.9.3:ScummVM Modern Theme:No Author]
 %using ../common
diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip
index 3b00ebddde8..e4e09ab9ae3 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 cc0ce935f39..6fcdda70785 100644
--- a/gui/themes/scummremastered/THEMERC
+++ b/gui/themes/scummremastered/THEMERC
@@ -1,3 +1,3 @@
-[SCUMMVM_STX0.9.2:ScummVM Modern Theme Remastered:No Author]
+[SCUMMVM_STX0.9.3:ScummVM Modern Theme Remastered:No Author]
 %using ../common
 %using ../common-svg


