diff options
Diffstat (limited to 'gui/themes')
| -rw-r--r-- | gui/themes/default.inc | 200 | ||||
| -rw-r--r-- | gui/themes/scummclassic.zip | bin | 46878 -> 50347 bytes | |||
| -rw-r--r-- | gui/themes/scummclassic/classic_layout.stx | 142 | ||||
| -rw-r--r-- | gui/themes/scummclassic/classic_layout_lowres.stx | 148 | ||||
| -rw-r--r-- | gui/themes/scummmodern.zip | bin | 150954 -> 154633 bytes | |||
| -rw-r--r-- | gui/themes/scummmodern/scummmodern_layout.stx | 173 | ||||
| -rw-r--r-- | gui/themes/scummmodern/scummmodern_layout_lowres.stx | 154 |
7 files changed, 535 insertions, 282 deletions
diff --git a/gui/themes/default.inc b/gui/themes/default.inc index 99ac80adc5..e4df6b0509 100644 --- a/gui/themes/default.inc +++ b/gui/themes/default.inc @@ -329,14 +329,13 @@ "<def var='Line.Height' value='16' /> " "<def var='Font.Height' value='16' /> " "<def var='About.OuterBorder' value='80'/> " -"<def var='PopUpWidget.labelSpacing' value='10' /> " -"<def var='PopUpWidget.labelWidth' value='110' /> " "<def var='Layout.Spacing' value='8' /> " "<def var='ShowLauncherLogo' value='0'/> " "<def var='ShowGlobalMenuLogo' value='0'/> " "<def var='ScummSaveLoad.ExtInfo.Visible' value='1'/> " "<widget name='OptionsLabel' " "size='110,Globals.Line.Height' " +"textalign='right' " "/> " "<widget name='SmallLabel' " "size='24,Globals.Line.Height' " @@ -456,12 +455,22 @@ "</dialog> " "<dialog name='GlobalOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> " "<layout type='vertical' padding='16,16,16,16' spacing='8'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<widget name='grModePopupDesc' " +"type='OptionsLabel' " +"/> " "<widget name='grModePopup' " "type='PopUp' " "/> " +"</layout> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<widget name='grRenderPopupDesc' " +"type='OptionsLabel' " +"/> " "<widget name='grRenderPopup' " "type='PopUp' " "/> " +"</layout> " "<widget name='grAspectCheckbox' " "type='Checkbox' " "/> " @@ -472,29 +481,42 @@ "</dialog> " "<dialog name='GlobalOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> " "<layout type='vertical' padding='16,16,16,16' spacing='8'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<widget name='auMidiPopupDesc' " +"type='OptionsLabel' " +"/> " "<widget name='auMidiPopup' " "type='PopUp' " "/> " +"</layout> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<widget name='auOPLPopupDesc' " +"type='OptionsLabel' " +"/> " "<widget name='auOPLPopup' " "type='PopUp' " "/> " +"</layout> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<widget name='auSampleRatePopupDesc' " +"type='OptionsLabel' " +"/> " "<widget name='auSampleRatePopup' " "type='PopUp' " "/> " -"<layout type='horizontal' padding='0,0,0,0'> " +"</layout> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10'> " "<widget name='subToggleDesc' " "type='OptionsLabel' " -"textalign='right' " "/> " "<widget name='subToggleButton' " "width='150' " "height='Globals.Slider.Height' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10'> " "<widget name='subSubtitleSpeedDesc' " "type='OptionsLabel' " -"textalign='right' " "/> " "<widget name='subSubtitleSpeedSlider' " "type='Slider' " @@ -511,7 +533,6 @@ "<layout type='horizontal' padding='0,0,0,0'> " "<widget name='vcMusicText' " "type='OptionsLabel' " -"textalign='right' " "/> " "<widget name='vcMusicSlider' " "type='Slider' " @@ -523,7 +544,6 @@ "<layout type='horizontal' padding='0,0,0,0'> " "<widget name='vcSfxText' " "type='OptionsLabel' " -"textalign='right' " "/> " "<widget name='vcSfxSlider' " "type='Slider' " @@ -535,7 +555,6 @@ "<layout type='horizontal' padding='0,0,0,0'> " "<widget name='vcSpeechText' " "type='OptionsLabel' " -"textalign='right' " "/> " "<widget name='vcSpeechSlider' " "type='Slider' " @@ -554,7 +573,7 @@ "</dialog> " "<dialog name='GlobalOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> " "<layout type='vertical' padding='16,16,16,16' spacing='8'> " -"<layout type='horizontal' padding='0,0,0,0'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='mcFontButton' " "type='Button' " "/> " @@ -591,7 +610,7 @@ "</dialog> " "<dialog name='GlobalOptions_Paths' overlays='Dialog.GlobalOptions.TabWidget'> " "<layout type='vertical' padding='16,16,16,16' spacing='8'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='16'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='SaveButton' " "type='Button' " "/> " @@ -599,7 +618,7 @@ "height='Globals.Line.Height' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='16'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='ThemeButton' " "type='Button' " "/> " @@ -607,7 +626,7 @@ "height='Globals.Line.Height' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='16'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='ExtraButton' " "type='Button' " "/> " @@ -627,7 +646,7 @@ "</dialog> " "<dialog name='GlobalOptions_Misc' overlays='Dialog.GlobalOptions.TabWidget'> " "<layout type='vertical' padding='16,16,16,16' spacing='8'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='16'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='ThemeButton' " "type='Button' " "/> " @@ -635,12 +654,22 @@ "height='Globals.Line.Height' " "/> " "</layout> " -"<widget name='Renderer' " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<widget name='RendererPopupDesc' " +"type='OptionsLabel' " +"/> " +"<widget name='RendererPopup' " "type='PopUp' " "/> " -"<widget name='AutosavePeriod' " +"</layout> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<widget name='AutosavePeriodPopupDesc' " +"type='OptionsLabel' " +"/> " +"<widget name='AutosavePeriodPopup' " "type='PopUp' " "/> " +"</layout> " "<widget name='KeysButton' " "type='Button' " "/> " @@ -718,35 +747,43 @@ "</dialog> " "<dialog name='GameOptions_Game' overlays='Dialog.GameOptions.TabWidget' shading='dim'> " "<layout type='vertical' padding='16,16,16,16'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='16'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='Id' " "type='OptionsLabel' " -"textalign='right' " "/> " "<widget name='Domain' " "type='PopUp' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='16'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='Name' " "type='OptionsLabel' " -"textalign='right' " "/> " "<widget name='Desc' " "type='PopUp' " "/> " "</layout> " -"<widget name='Lang' " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<widget name='LangPopupDesc' " +"type='OptionsLabel' " +"/> " +"<widget name='LangPopup' " "type='PopUp' " "/> " -"<widget name='Platform' " +"</layout> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<widget name='PlatformPopupDesc' " +"type='OptionsLabel' " +"/> " +"<widget name='PlatformPopup' " "type='PopUp' " "/> " "</layout> " +"</layout> " "</dialog> " "<dialog name='GameOptions_Paths' overlays='Dialog.GameOptions.TabWidget' shading='dim'> " "<layout type='vertical' padding='16,16,16,16'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='Savepath' " "type='Button' " "/> " @@ -754,7 +791,7 @@ "height='Globals.Line.Height' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='Extrapath' " "type='Button' " "/> " @@ -762,7 +799,7 @@ "height='Globals.Line.Height' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='Gamepath' " "type='Button' " "/> " @@ -888,20 +925,19 @@ "/> " "</layout> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='8'> " +"<space size='8' /> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10'> " "<widget name='subToggleDesc' " "type='OptionsLabel' " -"textalign='right' " "/> " "<widget name='subToggleButton' " "width='158' " "height='Globals.Slider.Height' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='8'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10'> " "<widget name='subSubtitleSpeedDesc' " "type='OptionsLabel' " -"textalign='right' " "/> " "<widget name='subSubtitleSpeedSlider' " "type='Slider' " @@ -911,7 +947,7 @@ "/> " "</layout> " "<space size='60'/> " -"<layout type='horizontal' padding='0,0,0,0' spacing='8'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10'> " "<widget name='Keys' " "type='Button' " "/> " @@ -1005,8 +1041,6 @@ "<def var='Line.Height' value='12' /> " "<def var='Font.Height' value='10' /> " "<def var='About.OuterBorder' value='10'/> " -"<def var='PopUpWidget.labelSpacing' value='6' /> " -"<def var='PopUpWidget.labelWidth' value='100' /> " "<def var='Layout.Spacing' value='8'/> " "<def var='ShowLauncherLogo' value='0'/> " "<def var='ShowGlobalMenuLogo' value='0'/> " @@ -1019,6 +1053,7 @@ "/> " "<widget name='OptionsLabel' " "size='110,Globals.Line.Height' " +"textalign='right' " "/> " "<widget name='SmallLabel' " "size='18,Globals.Line.Height' " @@ -1128,12 +1163,22 @@ "</dialog> " "<dialog name='GlobalOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> " "<layout type='vertical' padding='16,16,16,16' spacing='8'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<widget name='grModePopupDesc' " +"type='OptionsLabel' " +"/> " "<widget name='grModePopup' " "type='PopUp' " "/> " +"</layout> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<widget name='grRenderPopupDesc' " +"type='OptionsLabel' " +"/> " "<widget name='grRenderPopup' " "type='PopUp' " "/> " +"</layout> " "<widget name='grAspectCheckbox' " "type='Checkbox' " "/> " @@ -1144,29 +1189,42 @@ "</dialog> " "<dialog name='GlobalOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> " "<layout type='vertical' padding='16,16,16,16' spacing='8'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<widget name='auMidiPopupDesc' " +"type='OptionsLabel' " +"/> " "<widget name='auMidiPopup' " "type='PopUp' " "/> " +"</layout> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<widget name='auOPLPopupDesc' " +"type='OptionsLabel' " +"/> " "<widget name='auOPLPopup' " "type='PopUp' " "/> " +"</layout> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<widget name='auSampleRatePopupDesc' " +"type='OptionsLabel' " +"/> " "<widget name='auSampleRatePopup' " "type='PopUp' " "/> " -"<layout type='horizontal' padding='0,0,0,0'> " +"</layout> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='subToggleDesc' " "type='OptionsLabel' " -"textalign='right' " "/> " "<widget name='subToggleButton' " "width='128' " "height='Globals.Slider.Height' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='subSubtitleSpeedDesc' " "type='OptionsLabel' " -"textalign='right' " "/> " "<widget name='subSubtitleSpeedSlider' " "type='Slider' " @@ -1179,10 +1237,9 @@ "</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'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='vcMusicText' " "type='OptionsLabel' " -"textalign='right' " "/> " "<widget name='vcMusicSlider' " "type='Slider' " @@ -1191,10 +1248,9 @@ "type='SmallLabel' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='vcSfxText' " "type='OptionsLabel' " -"textalign='right' " "/> " "<widget name='vcSfxSlider' " "type='Slider' " @@ -1203,10 +1259,9 @@ "type='SmallLabel' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='vcSpeechText' " "type='OptionsLabel' " -"textalign='right' " "/> " "<widget name='vcSpeechSlider' " "type='Slider' " @@ -1215,7 +1270,7 @@ "type='SmallLabel' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='8' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<space size='110' /> " "<widget name='vcMuteCheckbox' " "type='Checkbox' " @@ -1225,7 +1280,7 @@ "</dialog> " "<dialog name='GlobalOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> " "<layout type='vertical' padding='16,16,16,16' spacing='8'> " -"<layout type='horizontal' padding='0,0,0,0'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> " "<widget name='mcFontButton' " "type='Button' " "/> " @@ -1246,7 +1301,7 @@ "<widget name='mcGSCheckbox' " "type='Checkbox' " "/> " -"<layout type='horizontal' padding='0,0,0,0'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='mcMidiGainText' " "type='OptionsLabel' " "/> " @@ -1306,12 +1361,26 @@ "height='Globals.Line.Height' " "/> " "</layout> " -"<widget name='Renderer' " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<widget name='RendererPopupDesc' " +"width='80' " +"height='Globals.Line.Height' " +"textalign='right' " +"/> " +"<widget name='RendererPopup' " "type='PopUp' " "/> " -"<widget name='AutosavePeriod' " +"</layout> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<widget name='AutosavePeriodPopupDesc' " +"width='80' " +"height='Globals.Line.Height' " +"textalign='right' " +"/> " +"<widget name='AutosavePeriodPopup' " "type='PopUp' " "/> " +"</layout> " "<widget name='KeysButton' " "type='Button' " "/> " @@ -1389,7 +1458,7 @@ "</dialog> " "<dialog name='GameOptions_Game' overlays='Dialog.GameOptions.TabWidget' shading='dim'> " "<layout type='vertical' padding='16,16,16,16'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='16'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='Id' " "width='35' " "height='Globals.Line.Height' " @@ -1399,7 +1468,7 @@ "type='PopUp' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='16'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='Name' " "width='35' " "height='Globals.Line.Height' " @@ -1410,13 +1479,27 @@ "/> " "</layout> " "<space size='8'/> " -"<widget name='Lang' " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<widget name='LangPopupDesc' " +"width='60' " +"height='Globals.Line.Height' " +"textalign='right' " +"/> " +"<widget name='LangPopup' " "type='PopUp' " "/> " -"<widget name='Platform' " +"</layout> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<widget name='PlatformPopupDesc' " +"width='60' " +"height='Globals.Line.Height' " +"textalign='right' " +"/> " +"<widget name='PlatformPopup' " "type='PopUp' " "/> " "</layout> " +"</layout> " "</dialog> " "<dialog name='GameOptions_Paths' overlays='Dialog.GameOptions.TabWidget' shading='dim'> " "<layout type='vertical' padding='16,16,16,16'> " @@ -1526,7 +1609,7 @@ "</dialog> " "<dialog name='ScummConfig' overlays='screen_center'> " "<layout type='vertical' padding='8,8,8,8'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='8'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='vcMusicText' " "type='OptionsLabel' " "/> " @@ -1537,7 +1620,7 @@ "type='SmallLabel' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='8'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='vcSfxText' " "type='OptionsLabel' " "/> " @@ -1548,7 +1631,7 @@ "type='SmallLabel' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='8'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='vcSpeechText' " "type='OptionsLabel' " "/> " @@ -1559,27 +1642,26 @@ "type='SmallLabel' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='8' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<space size='110' /> " "<widget name='vcMuteCheckbox' " "type='Checkbox' " "width='80' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='8'> " +"<space size='4' /> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='subToggleDesc' " "type='OptionsLabel' " -"textalign='right' " "/> " "<widget name='subToggleButton' " "width='128' " "height='Globals.Slider.Height' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='8'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='subSubtitleSpeedDesc' " "type='OptionsLabel' " -"textalign='right' " "/> " "<widget name='subSubtitleSpeedSlider' " "type='Slider' " diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip Binary files differindex 15fed944f3..daefaa9d78 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 a50e17ad25..5569f68523 100644 --- a/gui/themes/scummclassic/classic_layout.stx +++ b/gui/themes/scummclassic/classic_layout.stx @@ -29,8 +29,10 @@ <def var = 'Font.Height' value = '16' /> <def var = 'About.OuterBorder' value = '80'/> +<!-- <def var = 'PopUpWidget.labelSpacing' value = '10' /> <def var = 'PopUpWidget.labelWidth' value = '110' /> +--> <def var = 'Layout.Spacing' value = '8' /> <def var = 'ShowLauncherLogo' value = '0'/> @@ -40,6 +42,7 @@ <widget name = 'OptionsLabel' size = '110, Globals.Line.Height' + textalign = 'right' /> <widget name = 'SmallLabel' size = '24, Globals.Line.Height' @@ -166,12 +169,22 @@ <dialog name = 'GlobalOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> - <widget name = 'grModePopup' - type = 'PopUp' - /> - <widget name = 'grRenderPopup' - type = 'PopUp' - /> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> + <widget name = 'grModePopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'grModePopup' + type = 'PopUp' + /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> + <widget name = 'grRenderPopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'grRenderPopup' + type = 'PopUp' + /> + </layout> <widget name = 'grAspectCheckbox' type = 'Checkbox' /> @@ -183,29 +196,42 @@ <dialog name = 'GlobalOptions_Audio' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> - <widget name = 'auMidiPopup' - type = 'PopUp' - /> - <widget name = 'auOPLPopup' - type = 'PopUp' - /> - <widget name = 'auSampleRatePopup' - type = 'PopUp' - /> - <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> + <widget name = 'auMidiPopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'auMidiPopup' + type = 'PopUp' + /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> + <widget name = 'auOPLPopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'auOPLPopup' + type = 'PopUp' + /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> + <widget name = 'auSampleRatePopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'auSampleRatePopup' + type = 'PopUp' + /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'> <widget name = 'subToggleDesc' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'subToggleButton' width = '150' height = 'Globals.Slider.Height' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'> <widget name = 'subSubtitleSpeedDesc' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'subSubtitleSpeedSlider' type = 'Slider' @@ -223,7 +249,6 @@ <layout type = 'horizontal' padding = '0, 0, 0, 0'> <widget name = 'vcMusicText' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'vcMusicSlider' type = 'Slider' @@ -235,7 +260,6 @@ <layout type = 'horizontal' padding = '0, 0, 0, 0'> <widget name = 'vcSfxText' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'vcSfxSlider' type = 'Slider' @@ -247,7 +271,6 @@ <layout type = 'horizontal' padding = '0, 0, 0, 0'> <widget name = 'vcSpeechText' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'vcSpeechSlider' type = 'Slider' @@ -267,7 +290,7 @@ <dialog name = 'GlobalOptions_MIDI' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> - <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'mcFontButton' type = 'Button' /> @@ -305,7 +328,7 @@ <dialog name = 'GlobalOptions_Paths' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'SaveButton' type = 'Button' /> @@ -313,7 +336,7 @@ height = 'Globals.Line.Height' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'ThemeButton' type = 'Button' /> @@ -321,7 +344,7 @@ height = 'Globals.Line.Height' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'ExtraButton' type = 'Button' /> @@ -342,7 +365,7 @@ <dialog name = 'GlobalOptions_Misc' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'ThemeButton' type = 'Button' /> @@ -350,12 +373,22 @@ height = 'Globals.Line.Height' /> </layout> - <widget name = 'Renderer' - type = 'PopUp' - /> - <widget name = 'AutosavePeriod' - type = 'PopUp' - /> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> + <widget name = 'RendererPopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'RendererPopup' + type = 'PopUp' + /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> + <widget name = 'AutosavePeriodPopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'AutosavePeriodPopup' + type = 'PopUp' + /> + </layout> <widget name='KeysButton' type='Button' /> @@ -440,36 +473,44 @@ <dialog name = 'GameOptions_Game' overlays = 'Dialog.GameOptions.TabWidget' shading = 'dim'> <layout type = 'vertical' padding = '16, 16, 16, 16'> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'Id' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'Domain' type = 'PopUp' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'Name' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'Desc' type = 'PopUp' /> </layout> - <widget name = 'Lang' - type = 'PopUp' - /> - <widget name = 'Platform' - type = 'PopUp' - /> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> + <widget name = 'LangPopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'LangPopup' + type = 'PopUp' + /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> + <widget name = 'PlatformPopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'PlatformPopup' + type = 'PopUp' + /> + </layout> </layout> </dialog> <dialog name = 'GameOptions_Paths' overlays = 'Dialog.GameOptions.TabWidget' shading = 'dim'> <layout type = 'vertical' padding = '16, 16, 16, 16'> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'Savepath' type = 'Button' /> @@ -477,7 +518,7 @@ height = 'Globals.Line.Height' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'Extrapath' type = 'Button' /> @@ -485,7 +526,7 @@ height = 'Globals.Line.Height' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'Gamepath' type = 'Button' /> @@ -615,20 +656,19 @@ /> </layout> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> + <space size = '8' /> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'> <widget name = 'subToggleDesc' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'subToggleButton' width = '158' height = 'Globals.Slider.Height' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'> <widget name = 'subSubtitleSpeedDesc' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'subSubtitleSpeedSlider' type = 'Slider' @@ -638,7 +678,7 @@ /> </layout> <space size = '60'/> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'> <widget name = 'Keys' type = 'Button' /> diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx index 89b894de84..a557b14f65 100644 --- a/gui/themes/scummclassic/classic_layout_lowres.stx +++ b/gui/themes/scummclassic/classic_layout_lowres.stx @@ -29,8 +29,6 @@ <def var = 'Font.Height' value = '10' /> <def var = 'About.OuterBorder' value = '10'/> - <def var = 'PopUpWidget.labelSpacing' value = '6' /> - <def var = 'PopUpWidget.labelWidth' value = '100' /> <def var = 'Layout.Spacing' value = '8'/> @@ -48,6 +46,7 @@ <widget name = 'OptionsLabel' size = '110, Globals.Line.Height' + textalign = 'right' /> <widget name = 'SmallLabel' size = '18, Globals.Line.Height' @@ -163,12 +162,22 @@ <dialog name = 'GlobalOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> - <widget name = 'grModePopup' - type = 'PopUp' - /> - <widget name = 'grRenderPopup' - type = 'PopUp' - /> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> + <widget name = 'grModePopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'grModePopup' + type = 'PopUp' + /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> + <widget name = 'grRenderPopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'grRenderPopup' + type = 'PopUp' + /> + </layout> <widget name = 'grAspectCheckbox' type = 'Checkbox' /> @@ -180,29 +189,42 @@ <dialog name = 'GlobalOptions_Audio' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> - <widget name = 'auMidiPopup' - type = 'PopUp' - /> - <widget name = 'auOPLPopup' - type = 'PopUp' - /> - <widget name = 'auSampleRatePopup' - type = 'PopUp' - /> - <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> + <widget name = 'auMidiPopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'auMidiPopup' + type = 'PopUp' + /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> + <widget name = 'auOPLPopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'auOPLPopup' + type = 'PopUp' + /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> + <widget name = 'auSampleRatePopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'auSampleRatePopup' + type = 'PopUp' + /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'subToggleDesc' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'subToggleButton' width = '128' height = 'Globals.Slider.Height' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'subSubtitleSpeedDesc' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'subSubtitleSpeedSlider' type = 'Slider' @@ -216,10 +238,9 @@ <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'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'vcMusicText' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'vcMusicSlider' type = 'Slider' @@ -228,10 +249,9 @@ type = 'SmallLabel' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'vcSfxText' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'vcSfxSlider' type = 'Slider' @@ -240,10 +260,9 @@ type = 'SmallLabel' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'vcSpeechText' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'vcSpeechSlider' type = 'Slider' @@ -252,7 +271,7 @@ type = 'SmallLabel' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8' center = 'true'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <space size = '110' /> <widget name = 'vcMuteCheckbox' type = 'Checkbox' @@ -263,7 +282,7 @@ <dialog name = 'GlobalOptions_MIDI' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> - <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> <widget name = 'mcFontButton' type = 'Button' /> @@ -284,7 +303,7 @@ <widget name = 'mcGSCheckbox' type = 'Checkbox' /> - <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'mcMidiGainText' type = 'OptionsLabel' /> @@ -346,12 +365,26 @@ height = 'Globals.Line.Height' /> </layout> - <widget name = 'Renderer' - type = 'PopUp' - /> - <widget name = 'AutosavePeriod' + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> + <widget name = 'RendererPopupDesc' + width = '80' + height = 'Globals.Line.Height' + textalign = 'right' + /> + <widget name = 'RendererPopup' type = 'PopUp' - /> + /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> + <widget name = 'AutosavePeriodPopupDesc' + width = '80' + height = 'Globals.Line.Height' + textalign = 'right' + /> + <widget name = 'AutosavePeriodPopup' + type = 'PopUp' + /> + </layout> <widget name='KeysButton' type='Button' /> @@ -436,7 +469,7 @@ <dialog name = 'GameOptions_Game' overlays = 'Dialog.GameOptions.TabWidget' shading = 'dim'> <layout type = 'vertical' padding = '16, 16, 16, 16'> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'Id' width = '35' height = 'Globals.Line.Height' @@ -446,7 +479,7 @@ type = 'PopUp' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'Name' width = '35' height = 'Globals.Line.Height' @@ -457,12 +490,26 @@ /> </layout> <space size = '8'/> - <widget name = 'Lang' - type = 'PopUp' - /> - <widget name = 'Platform' - type = 'PopUp' - /> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> + <widget name = 'LangPopupDesc' + width = '60' + height = 'Globals.Line.Height' + textalign = 'right' + /> + <widget name = 'LangPopup' + type = 'PopUp' + /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> + <widget name = 'PlatformPopupDesc' + width = '60' + height = 'Globals.Line.Height' + textalign = 'right' + /> + <widget name = 'PlatformPopup' + type = 'PopUp' + /> + </layout> </layout> </dialog> @@ -577,7 +624,7 @@ <dialog name = 'ScummConfig' overlays = 'screen_center'> <layout type = 'vertical' padding = '8, 8, 8, 8'> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'vcMusicText' type = 'OptionsLabel' /> @@ -588,7 +635,7 @@ type = 'SmallLabel' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'vcSfxText' type = 'OptionsLabel' /> @@ -599,7 +646,7 @@ type = 'SmallLabel' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'vcSpeechText' type = 'OptionsLabel' /> @@ -610,27 +657,26 @@ type = 'SmallLabel' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8' center = 'true'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <space size = '110' /> <widget name = 'vcMuteCheckbox' type = 'Checkbox' width = '80' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> + <space size = '4' /> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'subToggleDesc' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'subToggleButton' width = '128' height = 'Globals.Slider.Height' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'subSubtitleSpeedDesc' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'subSubtitleSpeedSlider' type = 'Slider' diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip Binary files differindex e70b79f02e..1870d5c224 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 527acccba2..3b948f0885 100644 --- a/gui/themes/scummmodern/scummmodern_layout.stx +++ b/gui/themes/scummmodern/scummmodern_layout.stx @@ -37,8 +37,6 @@ <def var = 'ListWidget.hlLeftPadding' value = '0'/> <def var = 'ListWidget.hlRightPadding' value = '0'/> - <def var = 'PopUpWidget.labelSpacing' value = '10' /> - <def var = 'PopUpWidget.labelWidth' value = '110' /> <def var = 'ShowLauncherLogo' value = '1'/> <def var = 'ShowGlobalMenuLogo' value = '1'/> @@ -51,6 +49,7 @@ <widget name = 'OptionsLabel' size = '110, Globals.Line.Height' + textalign = 'right' /> <widget name = 'SmallLabel' size = '24, Globals.Line.Height' @@ -181,12 +180,22 @@ <dialog name = 'GlobalOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> - <widget name = 'grModePopup' - type = 'PopUp' - /> - <widget name = 'grRenderPopup' - type = 'PopUp' - /> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> + <widget name = 'grModePopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'grModePopup' + type = 'PopUp' + /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> + <widget name = 'grRenderPopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'grRenderPopup' + type = 'PopUp' + /> + </layout> <widget name = 'grAspectCheckbox' type = 'Checkbox' /> @@ -198,29 +207,42 @@ <dialog name = 'GlobalOptions_Audio' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> - <widget name = 'auMidiPopup' - type = 'PopUp' - /> - <widget name = 'auOPLPopup' - type = 'PopUp' - /> - <widget name = 'auSampleRatePopup' - type = 'PopUp' - /> - <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> + <widget name = 'auMidiPopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'auMidiPopup' + type = 'PopUp' + /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> + <widget name = 'auOPLPopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'auOPLPopup' + type = 'PopUp' + /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> + <widget name = 'auSampleRatePopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'auSampleRatePopup' + type = 'PopUp' + /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'> <widget name = 'subToggleDesc' type = 'OptionsLabel' - textalign = 'right' - /> + /> <widget name = 'subToggleButton' width = '150' height = 'Globals.Slider.Height' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'> <widget name = 'subSubtitleSpeedDesc' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'subSubtitleSpeedSlider' type = 'Slider' @@ -235,10 +257,9 @@ <dialog name = 'GlobalOptions_Volume' overlays = 'Dialog.GlobalOptions.TabWidget'> <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'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'vcMusicText' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'vcMusicSlider' type = 'Slider' @@ -247,10 +268,9 @@ type = 'SmallLabel' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'vcSfxText' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'vcSfxSlider' type = 'Slider' @@ -259,10 +279,9 @@ type = 'SmallLabel' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'vcSpeechText' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'vcSpeechSlider' type = 'Slider' @@ -282,7 +301,7 @@ <dialog name = 'GlobalOptions_MIDI' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> - <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'mcFontButton' type = 'Button' /> @@ -303,7 +322,7 @@ <widget name = 'mcGSCheckbox' type = 'Checkbox' /> - <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'mcMidiGainText' type = 'OptionsLabel' /> @@ -320,7 +339,7 @@ <dialog name = 'GlobalOptions_Paths' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'SaveButton' type = 'Button' /> @@ -328,7 +347,7 @@ height = 'Globals.Line.Height' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'ThemeButton' type = 'Button' /> @@ -336,7 +355,7 @@ height = 'Globals.Line.Height' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'ExtraButton' type = 'Button' /> @@ -344,7 +363,7 @@ height = 'Globals.Line.Height' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'PluginsButton' type = 'Button' /> @@ -357,7 +376,7 @@ <dialog name = 'GlobalOptions_Misc' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'ThemeButton' type = 'Button' /> @@ -365,12 +384,22 @@ height = 'Globals.Line.Height' /> </layout> - <widget name = 'Renderer' - type = 'PopUp' - /> - <widget name = 'AutosavePeriod' - type = 'PopUp' - /> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> + <widget name = 'RendererPopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'RendererPopup' + type = 'PopUp' + /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> + <widget name = 'AutosavePeriodPopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'AutosavePeriodPopup' + type = 'PopUp' + /> + </layout> <widget name='KeysButton' type='Button' /> @@ -455,30 +484,38 @@ <dialog name = 'GameOptions_Game' overlays = 'Dialog.GameOptions.TabWidget' shading = 'dim'> <layout type = 'vertical' padding = '16, 16, 16, 16'> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'Id' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'Domain' type = 'PopUp' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'Name' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'Desc' type = 'PopUp' /> </layout> - <widget name = 'Lang' - type = 'PopUp' - /> - <widget name = 'Platform' - type = 'PopUp' - /> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> + <widget name = 'LangPopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'LangPopup' + type = 'PopUp' + /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> + <widget name = 'PlatformPopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'PlatformPopup' + type = 'PopUp' + /> + </layout> </layout> </dialog> @@ -585,10 +622,10 @@ </dialog> <dialog name = 'ScummConfig' overlays = 'screen_center'> - <layout type = 'vertical' padding = '8, 8, 8, 8'> + <layout type = 'vertical' padding = '8, 8, 8, 8' spacing = '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'> + <layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '8' center = 'true'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'vcMusicText' type = 'OptionsLabel' /> @@ -599,7 +636,7 @@ type = 'SmallLabel' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'vcSfxText' type = 'OptionsLabel' /> @@ -610,7 +647,7 @@ type = 'SmallLabel' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'vcSpeechText' type = 'OptionsLabel' /> @@ -630,20 +667,19 @@ /> </layout> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> + <space size = '8' /> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'> <widget name = 'subToggleDesc' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'subToggleButton' width = '158' height = 'Globals.Slider.Height' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'> <widget name = 'subSubtitleSpeedDesc' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'subSubtitleSpeedSlider' type = 'Slider' @@ -653,7 +689,7 @@ /> </layout> <space size = '60'/> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'> <widget name='Keys' type='Button' /> @@ -750,11 +786,16 @@ </dialog> <dialog name = 'KeyRemapper' overlays = 'screen_center' shading = 'dim'> - <layout type = 'vertical' padding = '8, 8, 32, 8' center = 'true'> - <widget name = 'Popup' - type = 'PopUp' - width = '600' - /> + <layout type = 'vertical' padding = '8, 8, 32, 8' spacing = '10' center = 'true'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> + <widget name = 'PopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'Popup' + type = 'PopUp' + width = '500' + /> + </layout> <widget name = 'KeymapArea' width = '600' height = '378' diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx index 52b23ea532..4fbce354ae 100644 --- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx +++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx @@ -29,8 +29,6 @@ <def var = 'Font.Height' value = '10' /> <def var = 'About.OuterBorder' value = '10'/> - <def var = 'PopUpWidget.labelSpacing' value = '6' /> - <def var = 'PopUpWidget.labelWidth' value = '100' /> <def var = 'ShowLauncherLogo' value = '0'/> <def var = 'ShowGlobalMenuLogo' value = '0'/> @@ -45,7 +43,8 @@ /> <widget name = 'OptionsLabel' - size = '110, Globals.Line.Height' + size = '100, Globals.Line.Height' + textalign = 'right' /> <widget name = 'SmallLabel' size = '18, Globals.Line.Height' @@ -161,12 +160,22 @@ <dialog name = 'GlobalOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> - <widget name = 'grModePopup' - type = 'PopUp' - /> - <widget name = 'grRenderPopup' - type = 'PopUp' - /> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> + <widget name = 'grModePopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'grModePopup' + type = 'PopUp' + /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> + <widget name = 'grRenderPopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'grRenderPopup' + type = 'PopUp' + /> + </layout> <widget name = 'grAspectCheckbox' type = 'Checkbox' /> @@ -178,29 +187,42 @@ <dialog name = 'GlobalOptions_Audio' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> - <widget name = 'auMidiPopup' - type = 'PopUp' - /> - <widget name = 'auOPLPopup' - type = 'PopUp' - /> - <widget name = 'auSampleRatePopup' - type = 'PopUp' - /> - <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> + <widget name = 'auMidiPopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'auMidiPopup' + type = 'PopUp' + /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> + <widget name = 'auOPLPopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'auOPLPopup' + type = 'PopUp' + /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> + <widget name = 'auSampleRatePopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'auSampleRatePopup' + type = 'PopUp' + /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'subToggleDesc' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'subToggleButton' width = '128' height = 'Globals.Slider.Height' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'subSubtitleSpeedDesc' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'subSubtitleSpeedSlider' type = 'Slider' @@ -217,7 +239,6 @@ <layout type = 'horizontal' padding = '0, 0, 0, 0'> <widget name = 'vcMusicText' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'vcMusicSlider' type = 'Slider' @@ -229,7 +250,6 @@ <layout type = 'horizontal' padding = '0, 0, 0, 0'> <widget name = 'vcSfxText' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'vcSfxSlider' type = 'Slider' @@ -241,7 +261,6 @@ <layout type = 'horizontal' padding = '0, 0, 0, 0'> <widget name = 'vcSpeechText' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'vcSpeechSlider' type = 'Slider' @@ -261,7 +280,7 @@ <dialog name = 'GlobalOptions_MIDI' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> - <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> <widget name = 'mcFontButton' type = 'Button' /> @@ -282,7 +301,7 @@ <widget name = 'mcGSCheckbox' type = 'Checkbox' /> - <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' center = 'true'> <widget name = 'mcMidiGainText' type = 'OptionsLabel' /> @@ -299,7 +318,7 @@ <dialog name = 'GlobalOptions_Paths' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> <widget name = 'SaveButton' type = 'Button' /> @@ -307,7 +326,7 @@ height = 'Globals.Line.Height' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> <widget name = 'ThemeButton' type = 'Button' /> @@ -315,7 +334,7 @@ height = 'Globals.Line.Height' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> <widget name = 'ExtraButton' type = 'Button' /> @@ -323,7 +342,7 @@ height = 'Globals.Line.Height' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> <widget name = 'PluginsButton' type = 'Button' /> @@ -336,7 +355,7 @@ <dialog name = 'GlobalOptions_Misc' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> <widget name = 'ThemeButton' type = 'Button' /> @@ -344,12 +363,24 @@ height = 'Globals.Line.Height' /> </layout> - <widget name = 'Renderer' - type = 'PopUp' - /> - <widget name = 'AutosavePeriod' - type = 'PopUp' - /> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> + <widget name = 'RendererPopupDesc' + width = '80' + height = 'Globals.Line.Height' + /> + <widget name = 'RendererPopup' + type = 'PopUp' + /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> + <widget name = 'AutosavePeriodPopupDesc' + width = '80' + height = 'Globals.Line.Height' + /> + <widget name = 'AutosavePeriodPopup' + type = 'PopUp' + /> + </layout> <widget name='KeysButton' type='Button' /> @@ -434,7 +465,7 @@ <dialog name = 'GameOptions_Game' overlays = 'Dialog.GameOptions.TabWidget' shading = 'dim'> <layout type = 'vertical' padding = '16, 16, 16, 16'> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'Id' width = '35' height = 'Globals.Line.Height' @@ -444,7 +475,7 @@ type = 'PopUp' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'Name' width = '35' height = 'Globals.Line.Height' @@ -455,12 +486,26 @@ /> </layout> <space size = '8'/> - <widget name = 'Lang' - type = 'PopUp' - /> - <widget name = 'Platform' - type = 'PopUp' - /> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> + <widget name = 'LangPopupDesc' + width = '60' + height = 'Globals.Line.Height' + textalign = 'right' + /> + <widget name = 'LangPopup' + type = 'PopUp' + /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> + <widget name = 'PlatformPopupDesc' + width = '60' + height = 'Globals.Line.Height' + textalign = 'right' + /> + <widget name = 'PlatformPopup' + type = 'PopUp' + /> + </layout> </layout> </dialog> @@ -568,7 +613,7 @@ <dialog name = 'ScummConfig' overlays = 'screen_center'> <layout type = 'vertical' padding = '8, 8, 8, 8'> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'vcMusicText' type = 'OptionsLabel' /> @@ -579,7 +624,7 @@ type = 'SmallLabel' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'vcSfxText' type = 'OptionsLabel' /> @@ -590,7 +635,7 @@ type = 'SmallLabel' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'vcSpeechText' type = 'OptionsLabel' /> @@ -601,27 +646,26 @@ type = 'SmallLabel' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8' center = 'true'> - <space size = '110' /> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> + <space size = '100' /> <widget name = 'vcMuteCheckbox' type = 'Checkbox' width = '80' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> + <space size = '4' /> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'subToggleDesc' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'subToggleButton' width = '128' height = 'Globals.Slider.Height' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'subSubtitleSpeedDesc' type = 'OptionsLabel' - textalign = 'right' /> <widget name = 'subSubtitleSpeedSlider' type = 'Slider' |