aboutsummaryrefslogtreecommitdiff
path: root/gui/themes
diff options
context:
space:
mode:
authorTorbjörn Andersson2013-01-25 05:30:42 +0100
committerJohannes Schickel2013-01-26 13:53:43 +0100
commite4a77aff06645a76b575aaf4b8253760e0cd3710 (patch)
tree73987b334bd4566a3eeaf90d864b59bee709cfc0 /gui/themes
parent10724365aa320092fa2f5b98d8f9b0ff6e219a0b (diff)
downloadscummvm-rg350-e4a77aff06645a76b575aaf4b8253760e0cd3710.tar.gz
scummvm-rg350-e4a77aff06645a76b575aaf4b8253760e0cd3710.tar.bz2
scummvm-rg350-e4a77aff06645a76b575aaf4b8253760e0cd3710.zip
GUI: Move the FluidSynth reset button from Misc tab to bottom
This should make it clearer that Reset applies to all of the FluidSynth settings, not just the Misc tab.
Diffstat (limited to 'gui/themes')
-rw-r--r--gui/themes/default.inc12
-rw-r--r--gui/themes/scummclassic.zipbin103728 -> 103734 bytes
-rw-r--r--gui/themes/scummclassic/THEMERC2
-rw-r--r--gui/themes/scummclassic/classic_layout.stx6
-rw-r--r--gui/themes/scummclassic/classic_layout_lowres.stx6
-rw-r--r--gui/themes/scummmodern.zipbin1462033 -> 1462039 bytes
-rw-r--r--gui/themes/scummmodern/THEMERC2
-rw-r--r--gui/themes/scummmodern/scummmodern_layout.stx6
-rw-r--r--gui/themes/scummmodern/scummmodern_layout_lowres.stx6
9 files changed, 20 insertions, 20 deletions
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 5298732154..78c04f14c6 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1368,6 +1368,9 @@
"<widget name='TabWidget'/> "
"<layout type='horizontal' padding='8,8,8,8'> "
"<space/> "
+"<widget name='ResetSettings' "
+"type='Button' "
+"/> "
"<widget name='Cancel' "
"type='Button' "
"/> "
@@ -1505,9 +1508,6 @@
"type='PopUp' "
"/> "
"</layout> "
-"<widget name='ResetSettings' "
-"type='Button' "
-"/> "
"</layout> "
"</dialog> "
"<dialog name='SaveLoadChooser' overlays='screen' inset='8' shading='dim'> "
@@ -2483,6 +2483,9 @@
"<widget name='TabWidget'/> "
"<layout type='horizontal' padding='16,16,16,16'> "
"<space/> "
+"<widget name='ResetSettings' "
+"type='Button' "
+"/> "
"<widget name='Cancel' "
"type='Button' "
"/> "
@@ -2620,9 +2623,6 @@
"type='PopUp' "
"/> "
"</layout> "
-"<widget name='ResetSettings' "
-"type='Button' "
-"/> "
"</layout> "
"</dialog> "
"<dialog name='SaveLoadChooser' overlays='screen' inset='8' shading='dim'> "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 6ff035b5b7..3183417db9 100644
--- a/gui/themes/scummclassic.zip
+++ b/gui/themes/scummclassic.zip
Binary files differ
diff --git a/gui/themes/scummclassic/THEMERC b/gui/themes/scummclassic/THEMERC
index e60278629d..36eaacd168 100644
--- a/gui/themes/scummclassic/THEMERC
+++ b/gui/themes/scummclassic/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.18:ScummVM Classic Theme:No Author]
+[SCUMMVM_STX0.8.19:ScummVM Classic Theme:No Author]
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 8e26096869..312a90e78f 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -803,6 +803,9 @@
<widget name = 'TabWidget'/>
<layout type = 'horizontal' padding = '16, 16, 16, 16'>
<space/>
+ <widget name = 'ResetSettings'
+ type = 'Button'
+ />
<widget name = 'Cancel'
type = 'Button'
/>
@@ -943,9 +946,6 @@
type = 'PopUp'
/>
</layout>
- <widget name = 'ResetSettings'
- type = 'Button'
- />
</layout>
</dialog>
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 325ac8896e..d42efb5aa4 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -814,6 +814,9 @@
<widget name = 'TabWidget'/>
<layout type = 'horizontal' padding = '8, 8, 8, 8'>
<space/>
+ <widget name = 'ResetSettings'
+ type = 'Button'
+ />
<widget name = 'Cancel'
type = 'Button'
/>
@@ -954,9 +957,6 @@
type = 'PopUp'
/>
</layout>
- <widget name = 'ResetSettings'
- type = 'Button'
- />
</layout>
</dialog>
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index aadd3eac18..412ed6a96f 100644
--- a/gui/themes/scummmodern.zip
+++ b/gui/themes/scummmodern.zip
Binary files differ
diff --git a/gui/themes/scummmodern/THEMERC b/gui/themes/scummmodern/THEMERC
index ce4e4ab0ff..9e8776263b 100644
--- a/gui/themes/scummmodern/THEMERC
+++ b/gui/themes/scummmodern/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.18:ScummVM Modern Theme:No Author]
+[SCUMMVM_STX0.8.19:ScummVM Modern Theme:No Author]
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index ba723aee40..fa57e62c54 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -817,6 +817,9 @@
<widget name = 'TabWidget'/>
<layout type = 'horizontal' padding = '16, 16, 16, 16'>
<space/>
+ <widget name = 'ResetSettings'
+ type = 'Button'
+ />
<widget name = 'Cancel'
type = 'Button'
/>
@@ -957,9 +960,6 @@
type = 'PopUp'
/>
</layout>
- <widget name = 'ResetSettings'
- type = 'Button'
- />
</layout>
</dialog>
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index ab96c14ad5..5c3cc8357e 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -813,6 +813,9 @@
<widget name = 'TabWidget'/>
<layout type = 'horizontal' padding = '8, 8, 8, 8'>
<space/>
+ <widget name = 'ResetSettings'
+ type = 'Button'
+ />
<widget name = 'Cancel'
type = 'Button'
/>
@@ -953,9 +956,6 @@
type = 'PopUp'
/>
</layout>
- <widget name = 'ResetSettings'
- type = 'Button'
- />
</layout>
</dialog>