[Scummvm-cvs-logs] SF.net SVN: scummvm:[41235] scummvm/trunk/gui/themes
sev at users.sourceforge.net
sev at users.sourceforge.net
Sat Jun 6 19:36:58 CEST 2009
Revision: 41235
http://scummvm.svn.sourceforge.net/scummvm/?rev=41235&view=rev
Author: sev
Date: 2009-06-06 17:36:58 +0000 (Sat, 06 Jun 2009)
Log Message:
-----------
Add Mute control to all themes
Modified Paths:
--------------
scummvm/trunk/gui/themes/default.inc
scummvm/trunk/gui/themes/scummclassic/classic_layout.stx
scummvm/trunk/gui/themes/scummclassic/classic_layout_lowres.stx
scummvm/trunk/gui/themes/scummclassic.zip
scummvm/trunk/gui/themes/scummmodern/scummmodern_layout.stx
scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_lowres.stx
scummvm/trunk/gui/themes/scummmodern.zip
Modified: scummvm/trunk/gui/themes/default.inc
===================================================================
--- scummvm/trunk/gui/themes/default.inc 2009-06-06 17:36:21 UTC (rev 41234)
+++ scummvm/trunk/gui/themes/default.inc 2009-06-06 17:36:58 UTC (rev 41235)
@@ -504,7 +504,8 @@
"</layout> "
"</dialog> "
"<dialog name='GlobalOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<layout type='horizontal' padding='16,16,16,16' spacing='8'> "
+"<layout type='vertical' padding='0,0,0,0' spacing='8'> "
"<layout type='horizontal' padding='0,0,0,0'> "
"<widget name='vcMusicText' "
"type='OptionsLabel' "
@@ -539,6 +540,12 @@
"/> "
"</layout> "
"</layout> "
+"<layout type='vertical' padding='24,0,24,0' center='true'> "
+"<widget name='vcMuteCheckbox' "
+"type='Checkbox' "
+"/> "
+"</layout> "
+"</layout> "
"</dialog> "
"<dialog name='GlobalOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> "
"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
@@ -830,7 +837,9 @@
"</layout> "
"</dialog> "
"<dialog name='ScummConfig' overlays='screen_center'> "
-"<layout type='vertical' padding='8,8,8,8' center='true'> "
+"<layout type='vertical' padding='8,8,8,8'> "
+"<layout type='horizontal' padding='0,0,0,0'> "
+"<layout type='vertical' padding='0,0,0,0' center='true'> "
"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
"<widget name='vcMusicText' "
"type='OptionsLabel' "
@@ -864,6 +873,14 @@
"type='SmallLabel' "
"/> "
"</layout> "
+"</layout> "
+"<layout type='vertical' padding='24,24,24,24' center='true'> "
+"<widget name='vcMuteCheckbox' "
+"type='Checkbox' "
+"width='80' "
+"/> "
+"</layout> "
+"</layout> "
"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
"<widget name='subToggleDesc' "
"type='OptionsLabel' "
@@ -1181,7 +1198,13 @@
"type='SmallLabel' "
"/> "
"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='8' center='true'> "
+"<space size='110' /> "
+"<widget name='vcMuteCheckbox' "
+"type='Checkbox' "
+"/> "
"</layout> "
+"</layout> "
"</dialog> "
"<dialog name='GlobalOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> "
"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
@@ -1517,6 +1540,13 @@
"type='SmallLabel' "
"/> "
"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='8' center='true'> "
+"<space size='110' /> "
+"<widget name='vcMuteCheckbox' "
+"type='Checkbox' "
+"width='80' "
+"/> "
+"</layout> "
"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
"<widget name='subToggleDesc' "
"type='OptionsLabel' "
Modified: scummvm/trunk/gui/themes/scummclassic/classic_layout.stx
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/classic_layout.stx 2009-06-06 17:36:21 UTC (rev 41234)
+++ scummvm/trunk/gui/themes/scummclassic/classic_layout.stx 2009-06-06 17:36:58 UTC (rev 41235)
@@ -216,40 +216,47 @@
</dialog>
<dialog name = 'GlobalOptions_Volume' overlays = 'Dialog.GlobalOptions.TabWidget'>
- <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
- <layout type = 'horizontal' padding = '0, 0, 0, 0'>
- <widget name = 'vcMusicText'
- type = 'OptionsLabel'
- />
- <widget name = 'vcMusicSlider'
- type = 'Slider'
- />
- <widget name = 'vcMusicLabel'
- type = 'SmallLabel'
- />
+ <layout type = 'horizontal' padding = '16, 16, 16, 16' spacing = '8'>
+ <layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '8'>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0'>
+ <widget name = 'vcMusicText'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'vcMusicSlider'
+ type = 'Slider'
+ />
+ <widget name = 'vcMusicLabel'
+ type = 'SmallLabel'
+ />
+ </layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0'>
+ <widget name = 'vcSfxText'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'vcSfxSlider'
+ type = 'Slider'
+ />
+ <widget name = 'vcSfxLabel'
+ type = 'SmallLabel'
+ />
+ </layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0'>
+ <widget name = 'vcSpeechText'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'vcSpeechSlider'
+ type = 'Slider'
+ />
+ <widget name = 'vcSpeechLabel'
+ type = 'SmallLabel'
+ />
+ </layout>
</layout>
- <layout type = 'horizontal' padding = '0, 0, 0, 0'>
- <widget name = 'vcSfxText'
- type = 'OptionsLabel'
+ <layout type = 'vertical' padding = '24, 0, 24, 0' center = 'true'>
+ <widget name = 'vcMuteCheckbox'
+ type = 'Checkbox'
/>
- <widget name = 'vcSfxSlider'
- type = 'Slider'
- />
- <widget name = 'vcSfxLabel'
- type = 'SmallLabel'
- />
</layout>
- <layout type = 'horizontal' padding = '0, 0, 0, 0'>
- <widget name = 'vcSpeechText'
- type = 'OptionsLabel'
- />
- <widget name = 'vcSpeechSlider'
- type = 'Slider'
- />
- <widget name = 'vcSpeechLabel'
- type = 'SmallLabel'
- />
- </layout>
</layout>
</dialog>
@@ -556,41 +563,52 @@
</dialog>
<dialog name = 'ScummConfig' overlays = 'screen_center'>
- <layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'>
- <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
- <widget name = 'vcMusicText'
- type = 'OptionsLabel'
- />
- <widget name = 'vcMusicSlider'
- type = 'Slider'
- />
- <widget name = 'vcMusicLabel'
- type = 'SmallLabel'
- />
+ <layout type = 'vertical' padding = '8, 8, 8, 8'>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0'>
+ <layout type = 'vertical' padding = '0, 0, 0, 0' center = 'true'>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+ <widget name = 'vcMusicText'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'vcMusicSlider'
+ type = 'Slider'
+ />
+ <widget name = 'vcMusicLabel'
+ type = 'SmallLabel'
+ />
+ </layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+ <widget name = 'vcSfxText'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'vcSfxSlider'
+ type = 'Slider'
+ />
+ <widget name = 'vcSfxLabel'
+ type = 'SmallLabel'
+ />
+ </layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+ <widget name = 'vcSpeechText'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'vcSpeechSlider'
+ type = 'Slider'
+ />
+ <widget name = 'vcSpeechLabel'
+ type = 'SmallLabel'
+ />
+ </layout>
+ </layout>
+
+ <layout type = 'vertical' padding = '24, 24, 24, 24' center = 'true'>
+ <widget name = 'vcMuteCheckbox'
+ type = 'Checkbox'
+ width = '80' <!-- FIXME: Why this is needed? -->
+ />
+ </layout>
</layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
- <widget name = 'vcSfxText'
- type = 'OptionsLabel'
- />
- <widget name = 'vcSfxSlider'
- type = 'Slider'
- />
- <widget name = 'vcSfxLabel'
- type = 'SmallLabel'
- />
- </layout>
- <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
- <widget name = 'vcSpeechText'
- type = 'OptionsLabel'
- />
- <widget name = 'vcSpeechSlider'
- type = 'Slider'
- />
- <widget name = 'vcSpeechLabel'
- type = 'SmallLabel'
- />
- </layout>
- <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
<widget name = 'subToggleDesc'
type = 'OptionsLabel'
/>
Modified: scummvm/trunk/gui/themes/scummclassic/classic_layout_lowres.stx
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/classic_layout_lowres.stx 2009-06-06 17:36:21 UTC (rev 41234)
+++ scummvm/trunk/gui/themes/scummclassic/classic_layout_lowres.stx 2009-06-06 17:36:58 UTC (rev 41235)
@@ -247,6 +247,12 @@
type = 'SmallLabel'
/>
</layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8' center = 'true'>
+ <space size = '110' />
+ <widget name = 'vcMuteCheckbox'
+ type = 'Checkbox'
+ />
+ </layout>
</layout>
</dialog>
@@ -597,6 +603,13 @@
type = 'SmallLabel'
/>
</layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8' center = 'true'>
+ <space size = '110' />
+ <widget name = 'vcMuteCheckbox'
+ type = 'Checkbox'
+ width = '80'
+ />
+ </layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
<widget name = 'subToggleDesc'
type = 'OptionsLabel'
Modified: scummvm/trunk/gui/themes/scummclassic.zip
===================================================================
(Binary files differ)
Modified: scummvm/trunk/gui/themes/scummmodern/scummmodern_layout.stx
===================================================================
--- scummvm/trunk/gui/themes/scummmodern/scummmodern_layout.stx 2009-06-06 17:36:21 UTC (rev 41234)
+++ scummvm/trunk/gui/themes/scummmodern/scummmodern_layout.stx 2009-06-06 17:36:58 UTC (rev 41235)
@@ -231,45 +231,47 @@
</dialog>
<dialog name = 'GlobalOptions_Volume' overlays = 'Dialog.GlobalOptions.TabWidget'>
- <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
- <layout type = 'horizontal' padding = '0, 0, 0, 0'>
- <widget name = 'vcMusicText'
- type = 'OptionsLabel'
- />
- <widget name = 'vcMusicSlider'
- type = 'Slider'
- />
- <widget name = 'vcMusicLabel'
- type = 'SmallLabel'
- />
+ <layout type = 'horizontal' padding = '16, 16, 16, 16' spacing = '8'>
+ <layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '8'>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0'>
+ <widget name = 'vcMusicText'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'vcMusicSlider'
+ type = 'Slider'
+ />
+ <widget name = 'vcMusicLabel'
+ type = 'SmallLabel'
+ />
+ </layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0'>
+ <widget name = 'vcSfxText'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'vcSfxSlider'
+ type = 'Slider'
+ />
+ <widget name = 'vcSfxLabel'
+ type = 'SmallLabel'
+ />
+ </layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0'>
+ <widget name = 'vcSpeechText'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'vcSpeechSlider'
+ type = 'Slider'
+ />
+ <widget name = 'vcSpeechLabel'
+ type = 'SmallLabel'
+ />
+ </layout>
</layout>
- <layout type = 'horizontal' padding = '0, 0, 0, 0'>
- <widget name = 'vcSfxText'
- type = 'OptionsLabel'
- />
- <widget name = 'vcSfxSlider'
- type = 'Slider'
- />
- <widget name = 'vcSfxLabel'
- type = 'SmallLabel'
- width = "40"
- />
- <space/>
+ <layout type = 'vertical' padding = '24, 0, 24, 0' center = 'true'>
<widget name = 'vcMuteCheckbox'
type = 'Checkbox'
/>
</layout>
- <layout type = 'horizontal' padding = '0, 0, 0, 0'>
- <widget name = 'vcSpeechText'
- type = 'OptionsLabel'
- />
- <widget name = 'vcSpeechSlider'
- type = 'Slider'
- />
- <widget name = 'vcSpeechLabel'
- type = 'SmallLabel'
- />
- </layout>
</layout>
</dialog>
@@ -576,45 +578,52 @@
</dialog>
<dialog name = 'ScummConfig' overlays = 'screen_center'>
- <layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'>
- <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
- <widget name = 'vcMusicText'
- type = 'OptionsLabel'
- />
- <widget name = 'vcMusicSlider'
- type = 'Slider'
- />
- <widget name = 'vcMusicLabel'
- type = 'SmallLabel'
- />
+ <layout type = 'vertical' padding = '8, 8, 8, 8'>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0'>
+ <layout type = 'vertical' padding = '0, 0, 0, 0' center = 'true'>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+ <widget name = 'vcMusicText'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'vcMusicSlider'
+ type = 'Slider'
+ />
+ <widget name = 'vcMusicLabel'
+ type = 'SmallLabel'
+ />
+ </layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+ <widget name = 'vcSfxText'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'vcSfxSlider'
+ type = 'Slider'
+ />
+ <widget name = 'vcSfxLabel'
+ type = 'SmallLabel'
+ />
+ </layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+ <widget name = 'vcSpeechText'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'vcSpeechSlider'
+ type = 'Slider'
+ />
+ <widget name = 'vcSpeechLabel'
+ type = 'SmallLabel'
+ />
+ </layout>
+ </layout>
+
+ <layout type = 'vertical' padding = '24, 24, 24, 24' center = 'true'>
+ <widget name = 'vcMuteCheckbox'
+ type = 'Checkbox'
+ width = '80' <!-- FIXME: Why this is needed? -->
+ />
+ </layout>
</layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
- <widget name = 'vcSfxText'
- type = 'OptionsLabel'
- />
- <widget name = 'vcSfxSlider'
- type = 'Slider'
- />
- <widget name = 'vcSfxLabel'
- type = 'SmallLabel'
- width = "40"
- />
- </layout>
- <widget name = 'vcMuteCheckbox'
- type = 'Checkbox'
- />
- <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
- <widget name = 'vcSpeechText'
- type = 'OptionsLabel'
- />
- <widget name = 'vcSpeechSlider'
- type = 'Slider'
- />
- <widget name = 'vcSpeechLabel'
- type = 'SmallLabel'
- />
- </layout>
- <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
<widget name = 'subToggleDesc'
type = 'OptionsLabel'
/>
Modified: scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_lowres.stx
===================================================================
--- scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_lowres.stx 2009-06-06 17:36:21 UTC (rev 41234)
+++ scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_lowres.stx 2009-06-06 17:36:58 UTC (rev 41235)
@@ -245,6 +245,12 @@
type = 'SmallLabel'
/>
</layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8' center = 'true'>
+ <space size = '105' />
+ <widget name = 'vcMuteCheckbox'
+ type = 'Checkbox'
+ />
+ </layout>
</layout>
</dialog>
@@ -588,6 +594,13 @@
type = 'SmallLabel'
/>
</layout>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8' center = 'true'>
+ <space size = '110' />
+ <widget name = 'vcMuteCheckbox'
+ type = 'Checkbox'
+ width = '80'
+ />
+ </layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
<widget name = 'subToggleDesc'
type = 'OptionsLabel'
Modified: scummvm/trunk/gui/themes/scummmodern.zip
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list