[Scummvm-git-logs] scummvm master -> ab596d5467e58f3e4fc093099702932e3974bee7
sev-
noreply at scummvm.org
Mon Mar 6 13:42:07 UTC 2023
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:
cd289b74a9 TESTBED: Remove unused variable
5cc87cf81d GUI: THEMES: Remove TestbedOptions dialog from the themes
ab596d5467 GUI: THEMES: Bump theme version and regenerate all themes
Commit: cd289b74a9d902a23164a7a4f163f291a7821fab
https://github.com/scummvm/scummvm/commit/cd289b74a9d902a23164a7a4f163f291a7821fab
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-06T14:34:53+01:00
Commit Message:
TESTBED: Remove unused variable
Changed paths:
engines/testbed/config.cpp
diff --git a/engines/testbed/config.cpp b/engines/testbed/config.cpp
index 5496b716611..e6c3b1f36d9 100644
--- a/engines/testbed/config.cpp
+++ b/engines/testbed/config.cpp
@@ -78,7 +78,6 @@ void TestbedOptionsDialog::reflowLayout() {
uint16 lineHeight = g_gui.xmlEval()->getVar("Globals.Line.Height");
int16 overlayWidth = g_system->getOverlayWidth();
int16 overlayHeight = g_system->getOverlayHeight();
- uint16 yPos = lineHeight * 2;
uint16 xPos = lineHeight;
uint16 padding = 32;
Commit: 5cc87cf81dcd28215e2570f7b1fdef5752e38337
https://github.com/scummvm/scummvm/commit/5cc87cf81dcd28215e2570f7b1fdef5752e38337
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-06T14:38:15+01:00
Commit Message:
GUI: THEMES: Remove TestbedOptions dialog from the themes
It is now being generated on the fly
Changed paths:
gui/themes/common/highres_layout.stx
gui/themes/common/lowres_layout.stx
gui/themes/default.inc
gui/themes/scummclassic/classic_layout.stx
gui/themes/scummclassic/classic_layout_lowres.stx
diff --git a/gui/themes/common/highres_layout.stx b/gui/themes/common/highres_layout.stx
index 9df99895bfd..f9b32d9a69d 100644
--- a/gui/themes/common/highres_layout.stx
+++ b/gui/themes/common/highres_layout.stx
@@ -2206,33 +2206,6 @@
</layout>
</dialog>
- <dialog name = 'TestbedOptions' overlays = 'screen' inset = '32' >
- <layout type = 'vertical' padding = '8, 8, 8, 8'>
- <widget name = 'Headline'
- height = 'Globals.Line.Height'
- />
- <widget name = 'Info'
- height = 'Globals.Line.Height'
- />
- <widget name = 'List'
- />
- <layout type = 'vertical' padding = '0, 0, 16, 0'>
- <layout type = 'horizontal' padding = '0, 0, 0, 0'>
- <widget name = 'SelectAll'
- type = 'Button'
- />
- <space/>
- <widget name = 'RunTests'
- type = 'Button'
- />
- <widget name = 'Quit'
- type = 'Button'
- />
- </layout>
- </layout>
- </layout>
- </dialog>
-
<dialog name = 'SessionSelector' overlays = 'screen_center' shading = 'dim'>
<layout type = 'vertical' padding = '8, 8, 32, 8' align = 'center'>
<widget name = 'QueryProgressText'
diff --git a/gui/themes/common/lowres_layout.stx b/gui/themes/common/lowres_layout.stx
index 3090f6c1809..37b349094ab 100644
--- a/gui/themes/common/lowres_layout.stx
+++ b/gui/themes/common/lowres_layout.stx
@@ -2126,33 +2126,6 @@
</layout>
</dialog>
- <dialog name = 'TestbedOptions' overlays = 'screen' inset = '8' shading = 'dim'>
- <layout type = 'vertical' padding = '8, 8, 8, 8'>
- <widget name = 'Headline'
- height = 'Globals.Line.Height'
- />
- <widget name = 'Info'
- height = 'Globals.Line.Height'
- />
- <widget name = 'List'
- />
- <layout type = 'vertical' padding = '0, 0, 8, 0'>
- <layout type = 'horizontal' padding = '0, 0, 0, 0'>
- <widget name = 'SelectAll'
- type = 'Button'
- />
- <space/>
- <widget name = 'RunTests'
- type = 'Button'
- />
- <widget name = 'Quit'
- type = 'Button'
- />
- </layout>
- </layout>
- </layout>
- </dialog>
-
<dialog name = 'SessionSelector' overlays = 'screen_center' shading = 'dim'>
<layout type = 'vertical' padding = '4, 4, 16, 4' align = 'center'>
<widget name = 'QueryProgressText'
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 6839208f939..91127e4f194 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -3383,32 +3383,6 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</layout>"
"</layout>"
"</dialog>"
-"<dialog name='TestbedOptions' overlays='screen' inset='32' >"
-"<layout type='vertical' padding='8,8,8,8'>"
-"<widget name='Headline' "
-"height='Globals.Line.Height' "
-"/>"
-"<widget name='Info' "
-"height='Globals.Line.Height' "
-"/>"
-"<widget name='List' "
-"/>"
-"<layout type='vertical' padding='0,0,16,0'>"
-"<layout type='horizontal' padding='0,0,0,0'>"
-"<widget name='SelectAll' "
-"type='Button' "
-"/>"
-"<space/>"
-"<widget name='RunTests' "
-"type='Button' "
-"/>"
-"<widget name='Quit' "
-"type='Button' "
-"/>"
-"</layout>"
-"</layout>"
-"</layout>"
-"</dialog>"
"<dialog name='SessionSelector' overlays='screen_center' shading='dim'>"
"<layout type='vertical' padding='8,8,32,8' align='center'>"
"<widget name='QueryProgressText' "
@@ -5358,32 +5332,6 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</layout>"
"</layout>"
"</dialog>"
-"<dialog name='TestbedOptions' overlays='screen' inset='8' shading='dim'>"
-"<layout type='vertical' padding='8,8,8,8'>"
-"<widget name='Headline' "
-"height='Globals.Line.Height' "
-"/>"
-"<widget name='Info' "
-"height='Globals.Line.Height' "
-"/>"
-"<widget name='List' "
-"/>"
-"<layout type='vertical' padding='0,0,8,0'>"
-"<layout type='horizontal' padding='0,0,0,0'>"
-"<widget name='SelectAll' "
-"type='Button' "
-"/>"
-"<space/>"
-"<widget name='RunTests' "
-"type='Button' "
-"/>"
-"<widget name='Quit' "
-"type='Button' "
-"/>"
-"</layout>"
-"</layout>"
-"</layout>"
-"</dialog>"
"<dialog name='SessionSelector' overlays='screen_center' shading='dim'>"
"<layout type='vertical' padding='4,4,16,4' align='center'>"
"<widget name='QueryProgressText' "
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 3d2bc5aea2a..bb20aec53f0 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -2041,33 +2041,6 @@
</layout>
</dialog>
- <dialog name = 'TestbedOptions' overlays = 'screen' inset = '32' >
- <layout type = 'vertical' padding = '8, 8, 8, 8'>
- <widget name = 'Headline'
- height = 'Globals.Line.Height'
- />
- <widget name = 'Info'
- height = 'Globals.Line.Height'
- />
- <widget name = 'List'
- />
- <layout type = 'vertical' padding = '0, 0, 16, 0'>
- <layout type = 'horizontal' padding = '0, 0, 0, 0'>
- <widget name = 'SelectAll'
- type = 'Button'
- />
- <space/>
- <widget name = 'RunTests'
- type = 'Button'
- />
- <widget name = 'Quit'
- type = 'Button'
- />
- </layout>
- </layout>
- </layout>
- </dialog>
-
<dialog name = 'SessionSelector' overlays = 'screen_center' shading = 'dim'>
<layout type = 'vertical' padding = '8, 8, 32, 8' align = 'center'>
<widget name = 'QueryProgressText'
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index e63fe9f9ad5..48e0128c4ee 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -2025,33 +2025,6 @@
</layout>
</dialog>
- <dialog name = 'TestbedOptions' overlays = 'screen' inset = '8' shading = 'dim'>
- <layout type = 'vertical' padding = '8, 8, 8, 8'>
- <widget name = 'Headline'
- height = 'Globals.Line.Height'
- />
- <widget name = 'Info'
- height = 'Globals.Line.Height'
- />
- <widget name = 'List'
- />
- <layout type = 'vertical' padding = '0, 0, 8, 0'>
- <layout type = 'horizontal' padding = '0, 0, 0, 0'>
- <widget name = 'SelectAll'
- type = 'Button'
- />
- <space/>
- <widget name = 'RunTests'
- type = 'Button'
- />
- <widget name = 'Quit'
- type = 'Button'
- />
- </layout>
- </layout>
- </layout>
- </dialog>
-
<dialog name = 'SessionSelector' overlays = 'screen_center' shading = 'dim'>
<layout type = 'vertical' padding = '4, 4, 16, 4' align = 'center'>
<widget name = 'QueryProgressText'
Commit: ab596d5467e58f3e4fc093099702932e3974bee7
https://github.com/scummvm/scummvm/commit/ab596d5467e58f3e4fc093099702932e3974bee7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-06T14:40:34+01:00
Commit Message:
GUI: THEMES: Bump theme version and regenerate all themes
Now we have SessionSelector dialog which requires the new theme
Changed paths:
gui/ThemeEngine.h
gui/themes/residualvm.zip
gui/themes/residualvm/THEMERC
gui/themes/scummclassic.zip
gui/themes/scummclassic/THEMERC
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 dd4fbf5e92d..8ea7cab2eaa 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.8"
+#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.9.9"
class OSystem;
diff --git a/gui/themes/residualvm.zip b/gui/themes/residualvm.zip
index d31953d0150..5e84214de63 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 a654ab03677..c8fb27c4b37 100644
--- a/gui/themes/residualvm/THEMERC
+++ b/gui/themes/residualvm/THEMERC
@@ -1,3 +1,3 @@
-[SCUMMVM_STX0.9.8:ResidualVM Modern Theme Remastered:No Author]
+[SCUMMVM_STX0.9.9:ResidualVM Modern Theme Remastered:No Author]
%using ../common
%using ../common-svg
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 71513d1d777..9731e39a224 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 d676d6143ee..94cc39f1e2a 100644
--- a/gui/themes/scummclassic/THEMERC
+++ b/gui/themes/scummclassic/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.9.8:ScummVM Classic Theme:No Author]
+[SCUMMVM_STX0.9.9:ScummVM Classic Theme:No Author]
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 942ae123b55..1cf9e8e735f 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 033658a726e..4f0a38f214f 100644
--- a/gui/themes/scummmodern/THEMERC
+++ b/gui/themes/scummmodern/THEMERC
@@ -1,2 +1,2 @@
-[SCUMMVM_STX0.9.8:ScummVM Modern Theme:No Author]
+[SCUMMVM_STX0.9.9:ScummVM Modern Theme:No Author]
%using ../common
diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip
index 61f3b23b148..e2291c8ce3f 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 02def911816..a18f729b0cb 100644
--- a/gui/themes/scummremastered/THEMERC
+++ b/gui/themes/scummremastered/THEMERC
@@ -1,3 +1,3 @@
-[SCUMMVM_STX0.9.8:ScummVM Modern Theme Remastered:No Author]
+[SCUMMVM_STX0.9.9:ScummVM Modern Theme Remastered:No Author]
%using ../common
%using ../common-svg
More information about the Scummvm-git-logs
mailing list