diff options
Diffstat (limited to 'gui/themes/scummclassic')
-rw-r--r-- | gui/themes/scummclassic/classic_layout.stx | 142 | ||||
-rw-r--r-- | gui/themes/scummclassic/classic_layout_lowres.stx | 148 |
2 files changed, 188 insertions, 102 deletions
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' |