aboutsummaryrefslogtreecommitdiff
path: root/gui/themes
diff options
context:
space:
mode:
authorThierry Crozat2018-07-01 23:57:00 +0100
committerThierry Crozat2018-07-08 16:54:51 +0100
commit89f1b1c96eaa8cbb4f4938bd6524cab6c15227c1 (patch)
treed3fb95fd998ec656b4493fc2d685045881a5f979 /gui/themes
parentadacb4fcfd743aa3980b3e08c62578f32de2d0b3 (diff)
downloadscummvm-rg350-89f1b1c96eaa8cbb4f4938bd6524cab6c15227c1.tar.gz
scummvm-rg350-89f1b1c96eaa8cbb4f4938bd6524cab6c15227c1.tar.bz2
scummvm-rg350-89f1b1c96eaa8cbb4f4938bd6524cab6c15227c1.zip
GUI: Add Stretch Mode selection in Options dialog
Diffstat (limited to 'gui/themes')
-rw-r--r--gui/themes/default.inc16
-rw-r--r--gui/themes/scummclassic.zipbin129144 -> 129635 bytes
-rw-r--r--gui/themes/scummclassic/classic_layout.stx8
-rw-r--r--gui/themes/scummclassic/classic_layout_lowres.stx8
-rw-r--r--gui/themes/scummmodern.zipbin1648684 -> 1649175 bytes
-rw-r--r--gui/themes/scummmodern/scummmodern_layout.stx8
-rw-r--r--gui/themes/scummmodern/scummmodern_layout_lowres.stx8
7 files changed, 48 insertions, 0 deletions
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index fe48acd1a0..098c8734cc 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -866,6 +866,14 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"type='PopUp' "
"/>"
"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
+"<widget name='grStretchModePopupDesc' "
+"type='OptionsLabel' "
+"/>"
+"<widget name='grStretchModePopup' "
+"type='PopUp' "
+"/>"
+"</layout>"
"<widget name='grAspectCheckbox' "
"type='Checkbox' "
"/>"
@@ -2447,6 +2455,14 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"type='PopUp' "
"/>"
"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
+"<widget name='grStretchModePopupDesc' "
+"type='OptionsLabel' "
+"/>"
+"<widget name='grStretchModePopup' "
+"type='PopUp' "
+"/>"
+"</layout>"
"<widget name='grAspectCheckbox' "
"type='Checkbox' "
"/>"
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 4f7e3ce68d..8b5b52fbfb 100644
--- a/gui/themes/scummclassic.zip
+++ b/gui/themes/scummclassic.zip
Binary files differ
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index e3411dcb3e..23f8acaa26 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -292,6 +292,14 @@
type = 'PopUp'
/>
</layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+ <widget name = 'grStretchModePopupDesc'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'grStretchModePopup'
+ type = 'PopUp'
+ />
+ </layout>
<widget name = 'grAspectCheckbox'
type = 'Checkbox'
/>
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 4b710b8999..ae3a6eefe3 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -289,6 +289,14 @@
type = 'PopUp'
/>
</layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
+ <widget name = 'grStretchModePopupDesc'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'grStretchModePopup'
+ type = 'PopUp'
+ />
+ </layout>
<widget name = 'grAspectCheckbox'
type = 'Checkbox'
/>
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index fae746b72c..de7c587e6a 100644
--- a/gui/themes/scummmodern.zip
+++ b/gui/themes/scummmodern.zip
Binary files differ
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index 34b66e2274..5cf22f90b4 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -306,6 +306,14 @@
type = 'PopUp'
/>
</layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+ <widget name = 'grStretchModePopupDesc'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'grStretchModePopup'
+ type = 'PopUp'
+ />
+ </layout>
<widget name = 'grAspectCheckbox'
type = 'Checkbox'
/>
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index 506a97520e..651efb4a48 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -287,6 +287,14 @@
type = 'PopUp'
/>
</layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
+ <widget name = 'grStretchModePopupDesc'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'grStretchModePopup'
+ type = 'PopUp'
+ />
+ </layout>
<widget name = 'grAspectCheckbox'
type = 'Checkbox'
/>