diff options
| -rw-r--r-- | gui/themes/default.inc | 34 | ||||
| -rw-r--r-- | gui/themes/scummclassic.zip | bin | 45221 -> 46309 bytes | |||
| -rw-r--r-- | gui/themes/scummclassic/classic_layout.stx | 146 | ||||
| -rw-r--r-- | gui/themes/scummclassic/classic_layout_lowres.stx | 13 | ||||
| -rw-r--r-- | gui/themes/scummmodern.zip | bin | 148602 -> 149505 bytes | |||
| -rw-r--r-- | gui/themes/scummmodern/scummmodern_layout.stx | 151 | ||||
| -rw-r--r-- | gui/themes/scummmodern/scummmodern_layout_lowres.stx | 13 |
7 files changed, 220 insertions, 137 deletions
diff --git a/gui/themes/default.inc b/gui/themes/default.inc index ddb8127d77..297371463e 100644 --- a/gui/themes/default.inc +++ b/gui/themes/default.inc @@ -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,6 +1198,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> " "<dialog name='GlobalOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> " @@ -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' " diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip Binary files differindex 7dcf3402ed..2d8034af00 100644 --- a/gui/themes/scummclassic.zip +++ b/gui/themes/scummclassic.zip diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx index bb7fdc20a2..c9ba986fc8 100644 --- a/gui/themes/scummclassic/classic_layout.stx +++ b/gui/themes/scummclassic/classic_layout.stx @@ -216,38 +216,45 @@ </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' - /> - </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 type = 'vertical' padding = '24, 0, 24, 0' center = 'true'> + <widget name = 'vcMuteCheckbox' + type = 'Checkbox' /> </layout> </layout> @@ -556,39 +563,50 @@ </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> - <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 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 = 'subToggleDesc' diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx index c144f0bad3..184f49689a 100644 --- a/gui/themes/scummclassic/classic_layout_lowres.stx +++ b/gui/themes/scummclassic/classic_layout_lowres.stx @@ -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' diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip Binary files differindex 9838b8b2f4..d4edb9f8be 100644 --- a/gui/themes/scummmodern.zip +++ b/gui/themes/scummmodern.zip diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx index 6246b6c965..c9cad774f9 100644 --- a/gui/themes/scummmodern/scummmodern_layout.stx +++ b/gui/themes/scummmodern/scummmodern_layout.stx @@ -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,43 +578,50 @@ </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> - <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 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 = 'subToggleDesc' diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx index bf19b48485..c59000e099 100644 --- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx +++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx @@ -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' |