diff options
Diffstat (limited to 'gui/themes')
| -rw-r--r-- | gui/themes/default.inc | 734 | ||||
| -rw-r--r-- | gui/themes/scummclassic.zip | bin | 28494 -> 40155 bytes | |||
| -rw-r--r-- | gui/themes/scummclassic/classic_layout.stx | 284 | ||||
| -rw-r--r-- | gui/themes/scummodern.zip | bin | 123017 -> 122543 bytes | |||
| -rw-r--r-- | gui/themes/scummodern/scummodern_layout.stx | 157 | ||||
| -rw-r--r-- | gui/themes/scummodern/scummodern_layout_320.stx | 145 |
6 files changed, 803 insertions, 517 deletions
diff --git a/gui/themes/default.inc b/gui/themes/default.inc index 55d1211e24..3462b928c8 100644 --- a/gui/themes/default.inc +++ b/gui/themes/default.inc @@ -299,24 +299,17 @@ "/> " "</drawdata> " "</render_info> " -"<layout_info> " +"<layout_info resolution = '-320xY, -256x240'> " "<globals> " "<def var = 'Line.Height' value = '16' /> " "<def var = 'Font.Height' value = '16' /> " "<def var = 'TabLabelWidth' value = '110' /> " -"<def resolution = '320xY, 256x240' var = 'Line.Height' value = '12' /> " -"<def resolution = '320xY, 256x240' var = 'Font.Height' value = '10' /> " -"<def resolution = '320xY, 256x240' var = 'TabLabelWidth' value = '100' /> " "<def var = 'WidgetSize' value = 'kBigWidgetSize' /> " "<def var = 'About.OuterBorder' value = '80'/> " "<def var = 'PopUpWidget.labelSpacing' value = '10' /> " -"<def resolution = '320xY, 256x240' var = 'WidgetSize' value = 'kNormalWidgetSize' /> " -"<def resolution = '320xY, 256x240' var = 'About.OuterBorder' value = '10'/> " -"<def resolution = '320xY, 256x240' var = 'PopUpWidget.labelSpacing' value = '6' /> " "<def var = 'Layout.Spacing' value = '8' /> " "<def var = 'ShowLauncherLogo' value = '0'/> " "<def var = 'ScummSaveLoad.ExtInfo.Visible' value = '1'/> " -"<def resolution = '320xY, 256x240' var = 'ScummSaveLoad.ExtInfo.Visible' value = '0'/> " "<widget name = 'OptionsLabel' " "size = '110, Globals.Line.Height' " "/> " @@ -326,33 +319,18 @@ "<widget name = 'ShortOptionsLabel' " "size = '60, Globals.Line.Height' " "/> " -"<widget resolution = '320xY, 256x240' name = 'ShortOptionsLabel' " -"size = '40, Globals.Line.Height' " -"/> " "<widget name = 'Button' " "size = 'kBigButtonWidth, kBigButtonHeight' " "/> " "<widget name = 'Slider' " "size = 'kBigSliderWidth, kBigSliderHeight' " "/> " -"<widget resolution = '320xY, 256x240' name = 'Button' " -"size = 'kButtonWidth, kButtonHeight' " -"/> " -"<widget resolution = '320xY, 256x240' name = 'Slider' " -"size = 'kSliderWidth, kSliderHeight' " -"/> " "<widget name = 'PopUp' " "size = '-1, 19' " "/> " -"<widget name = 'PopUp' resolution = '320xY, 256x240' " -"size = '-1, 15' " -"/> " "<widget name = 'Checkbox' " "size = '-1, 14' " "/> " -"<widget name = 'Checkbox' resolution = '320xY, 256x240' " -"size = '-1, 10' " -"/> " "<widget name = 'ListWidget' " "padding = '5, 0, 8, 0' " "/> " @@ -373,14 +351,6 @@ "size = '15, 18' " "padding = '0, 3, 4, 0' " "/> " -"<widget name = 'TabWidget.Tab' resolution = '320xY, 256x240' " -"size = '45, 16' " -"padding = '0, 0, 0, 0' " -"/> " -"<widget name = 'TabWidget.NavButton' resolution = '320xY, 256x240' " -"size = '32, 18' " -"padding = '0, 3, 4, 0' " -"/> " "</globals> " "<dialog name = 'Launcher' overlays = 'screen'> " "<layout type = 'vertical' center = 'true' padding = '16, 16, 8, 8'> " @@ -423,7 +393,510 @@ "</layout> " "</layout> " "</dialog> " -"<dialog name = 'Launcher' overlays = 'screen' resolution = '320xY, 256x240'> " +"<dialog name = 'Browser' overlays = 'Dialog.Launcher.GameList' shading = 'dim'> " +"<layout type = 'vertical' padding = '8, 8, 8, 8'> " +"<widget name = 'Headline' " +"height = 'Globals.Line.Height' " +"/> " +"<widget name = 'Path' " +"height = 'Globals.Line.Height' " +"/> " +"<widget name = 'List'/> " +"<layout type = 'horizontal' padding = '0, 0, 16, 0'> " +"<widget name = 'Up' " +"type = 'Button' " +"/> " +"<space/> " +"<widget name = 'Cancel' " +"type = 'Button' " +"/> " +"<widget name = 'Choose' " +"type = 'Button' " +"/> " +"</layout> " +"</layout> " +"</dialog> " +"<dialog name = 'GlobalOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'> " +"<layout type = 'vertical' padding = '0, 0, 0, 0'> " +"<widget name = 'TabWidget'/> " +"<layout type = 'horizontal' padding = '16, 16, 16, 16'> " +"<space/> " +"<widget name = 'Cancel' " +"type = 'Button' " +"/> " +"<widget name = 'Ok' " +"type = 'Button' " +"/> " +"</layout> " +"</layout> " +"</dialog> " +"<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' " +"/> " +"<widget name = 'grAspectCheckbox' " +"type = 'Checkbox' " +"/> " +"<widget name = 'grFullscreenCheckbox' " +"type = 'Checkbox' " +"/> " +"</layout> " +"</dialog> " +"<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 = 'auSampleRatePopup' " +"type = 'PopUp' " +"/> " +"<layout type = 'horizontal' padding = '0, 0, 0, 0'> " +"<widget name = 'subToggleDesc' " +"type = 'OptionsLabel' " +"/> " +"<widget name = 'subToggleButton' " +"width = '150' " +"height = 'Globals.Slider.Height' " +"/> " +"</layout> " +"<layout type = 'horizontal' padding = '0, 0, 0, 0'> " +"<widget name = 'subSubtitleSpeedDesc' " +"type = 'OptionsLabel' " +"/> " +"<widget name = 'subSubtitleSpeedSlider' " +"type = 'Slider' " +"/> " +"<widget name = 'subSubtitleSpeedLabel' " +"type = 'SmallLabel' " +"/> " +"</layout> " +"</layout> " +"</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> " +"<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> " +"</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'> " +"<widget name = 'mcFontButton' " +"type = 'Button' " +"/> " +"<widget name = 'mcFontClearButton' " +"height = 'Globals.Line.Height' " +"width = 'Globals.Line.Height' " +"/> " +"<widget name = 'mcFontPath' " +"height = 'Globals.Line.Height' " +"/> " +"</layout> " +"<widget name = 'mcMixedCheckbox' " +"type = 'Checkbox' " +"/> " +"<widget name = 'mcMt32Checkbox' " +"type = 'Checkbox' " +"/> " +"<widget name = 'mcGSCheckbox' " +"type = 'Checkbox' " +"/> " +"<layout type = 'horizontal' padding = '0, 0, 0, 0'> " +"<widget name = 'mcMidiGainText' " +"type = 'OptionsLabel' " +"/> " +"<widget name = 'mcMidiGainSlider' " +"type = 'Slider' " +"/> " +"<widget name = 'mcMidiGainLabel' " +"width = '32' " +"height = 'Globals.Line.Height' " +"/> " +"</layout> " +"</layout> " +"</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'> " +"<widget name = 'SaveButton' " +"type = 'Button' " +"/> " +"<widget name = 'SavePath' " +"height = 'Globals.Line.Height' " +"/> " +"</layout> " +"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> " +"<widget name = 'ThemeButton' " +"type = 'Button' " +"/> " +"<widget name = 'ThemePath' " +"height = 'Globals.Line.Height' " +"/> " +"</layout> " +"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> " +"<widget name = 'ExtraButton' " +"type = 'Button' " +"/> " +"<widget name = 'ExtraPath' " +"height = 'Globals.Line.Height' " +"/> " +"</layout> " +"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> " +"<widget name = 'PluginsButton' " +"type = 'Button' " +"/> " +"<widget name = 'PluginsPath' " +"height = 'Globals.Line.Height' " +"/> " +"</layout> " +"</layout> " +"</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'> " +"<widget name = 'ThemeButton' " +"type = 'Button' " +"/> " +"<widget name = 'CurTheme' " +"height = 'Globals.Line.Height' " +"/> " +"</layout> " +"<widget name = 'Renderer' " +"type = 'PopUp' " +"/> " +"<widget name = 'AutosavePeriod' " +"type = 'PopUp' " +"/> " +"</layout> " +"</dialog> " +"<dialog name = 'GameOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'> " +"<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '16'> " +"<widget name = 'TabWidget'/> " +"<layout type = 'horizontal' padding = '16, 16, 16, 4'> " +"<space/> " +"<widget name = 'Cancel' " +"type = 'Button' " +"/> " +"<widget name = 'Ok' " +"type = 'Button' " +"/> " +"</layout> " +"</layout> " +"</dialog> " +"<dialog name = 'GameOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'> " +"<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> " +"<widget name = 'EnableTabCheckbox' " +"type = 'Checkbox' " +"/> " +"<import layout = 'Dialog.GlobalOptions_Graphics' /> " +"</layout> " +"</dialog> " +"<dialog name = 'GameOptions_Audio' overlays = 'Dialog.GlobalOptions.TabWidget'> " +"<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> " +"<widget name = 'EnableTabCheckbox' " +"type = 'Checkbox' " +"/> " +"<import layout = 'Dialog.GlobalOptions_Audio' /> " +"</layout> " +"</dialog> " +"<dialog name = 'GameOptions_MIDI' overlays = 'Dialog.GlobalOptions.TabWidget'> " +"<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> " +"<widget name = 'EnableTabCheckbox' " +"type = 'Checkbox' " +"/> " +"<import layout = 'Dialog.GlobalOptions_MIDI' /> " +"</layout> " +"</dialog> " +"<dialog name = 'GameOptions_Volume' overlays = 'Dialog.GlobalOptions.TabWidget'> " +"<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> " +"<widget name = 'EnableTabCheckbox' " +"type = 'Checkbox' " +"/> " +"<import layout = 'Dialog.GlobalOptions_Volume' /> " +"</layout> " +"</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'> " +"<widget name = 'Id' " +"type = 'OptionsLabel' " +"/> " +"<widget name = 'Domain' " +"type = 'PopUp' " +"/> " +"</layout> " +"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> " +"<widget name = 'Name' " +"type = 'OptionsLabel' " +"/> " +"<widget name = 'Desc' " +"type = 'PopUp' " +"/> " +"</layout> " +"<widget name = 'Lang' " +"type = 'PopUp' " +"/> " +"<widget name = 'Platform' " +"type = 'PopUp' " +"/> " +"</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'> " +"<widget name = 'Savepath' " +"type = 'Button' " +"/> " +"<widget name = 'SavepathText' " +"height = 'Globals.Line.Height' " +"/> " +"</layout> " +"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> " +"<widget name = 'Extrapath' " +"type = 'Button' " +"/> " +"<widget name = 'ExtrapathText' " +"height = 'Globals.Line.Height' " +"/> " +"</layout> " +"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> " +"<widget name = 'Gamepath' " +"type = 'Button' " +"/> " +"<widget name = 'GamepathText' " +"height = 'Globals.Line.Height' " +"/> " +"</layout> " +"</layout> " +"</dialog> " +"<dialog name = 'ScummMain' overlays = 'screen_center'> " +"<layout type = 'vertical' padding = '8, 8, 8, 8'> " +"<widget name = 'Resume' " +"type = 'Button' " +"/> " +"<space size = '15'/> " +"<widget name = 'Load' " +"type = 'Button' " +"/> " +"<widget name = 'Save' " +"type = 'Button' " +"/> " +"<space size = '15'/> " +"<widget name = 'Options' " +"type = 'Button' " +"/> " +"<widget name = 'Help' " +"type = 'Button' " +"/> " +"<widget name = 'About' " +"type = 'Button' " +"/> " +"<space size = '15'/> " +"<widget name = 'Quit' " +"type = 'Button' " +"/> " +"</layout> " +"</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> " +"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> " +"<widget name = 'subToggleDesc' " +"type = 'OptionsLabel' " +"/> " +"<widget name = 'subToggleButton' " +"width = '158' " +"height = 'Globals.Slider.Height' " +"/> " +"</layout> " +"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> " +"<widget name = 'subSubtitleSpeedDesc' " +"type = 'OptionsLabel' " +"/> " +"<widget name = 'subSubtitleSpeedSlider' " +"type = 'Slider' " +"/> " +"<widget name = 'subSubtitleSpeedLabel' " +"type = 'SmallLabel' " +"/> " +"</layout> " +"<space size = '60'/> " +"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> " +"<space size = 'Globals.Button.Width' /> " +"<widget name = 'Cancel' " +"type = 'Button' " +"/> " +"<widget name = 'Ok' " +"type = 'Button' " +"/> " +"</layout> " +"</layout> " +"</dialog> " +"<dialog name = 'ScummSaveLoad' overlays = 'screen' inset = '16'> " +"<layout type = 'vertical' padding = '8, 8, 8, 32' center = 'true'> " +"<widget name = 'Title' " +"height = 'Globals.Line.Height' " +"/> " +"<layout type = 'horizontal' padding = '0, 0, 0, 16' spacing = '16'> " +"<widget name = 'List' /> " +"<widget name = 'Thumbnail' " +"width = '180' " +"height = '200' " +"/> " +"</layout> " +"<layout type = 'horizontal' padding = '0, 0, 0, 0'> " +"<space/> " +"<widget name = 'Cancel' " +"type = 'Button' " +"/> " +"<widget name = 'Choose' " +"type = 'Button' " +"/> " +"</layout> " +"</layout> " +"</dialog> " +"<dialog name = 'ScummHelp' overlays = 'screen_center'> " +"<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'> " +"<widget name = 'Title' " +"width = '320' " +"height = 'Globals.Line.Height' " +"/> " +"<widget name = 'HelpText' " +"height = '220' " +"/> " +"<layout type = 'horizontal' padding = '0, 0, 16, 0'> " +"<widget name = 'Prev' " +"type = 'Button' " +"/> " +"<widget name = 'Next' " +"type = 'Button' " +"/> " +"<space size = '32'/> " +"<widget name = 'Close' " +"type = 'Button' " +"/> " +"</layout> " +"</layout> " +"</dialog> " +"</layout_info> " +"<layout_info resolution = '320xY, 256x240'> " +"<globals> " +"<def var = 'Line.Height' value = '12' /> " +"<def var = 'Font.Height' value = '10' /> " +"<def var = 'TabLabelWidth' value = '100' /> " +"<def var = 'WidgetSize' value = 'kNormalWidgetSize' /> " +"<def var = 'About.OuterBorder' value = '10'/> " +"<def var = 'PopUpWidget.labelSpacing' value = '6' /> " +"<def var = 'Layout.Spacing' value = '8'/> " +"<def var = 'ShowLauncherLogo' value = '0'/> " +"<def var = 'ScummSaveLoad.ExtInfo.Visible' value = '0'/> " +"<widget name = 'Button' " +"size = 'kButtonWidth, kButtonHeight' " +"/> " +"<widget name = 'Slider' " +"size = 'kSliderWidth, kSliderHeight' " +"/> " +"<widget name = 'OptionsLabel' " +"size = '110, Globals.Line.Height' " +"/> " +"<widget name = 'SmallLabel' " +"size = '18, Globals.Line.Height' " +"/> " +"<widget name = 'PopUp' " +"size = '-1, 15' " +"/> " +"<widget name = 'Checkbox' " +"size = '-1, Globals.Line.Height' " +"/> " +"<widget name = 'ListWidget' " +"padding = '5, 0, 8, 0' " +"/> " +"<widget name = 'PopUpWidget' " +"padding = '7, 5, 0, 0' " +"/> " +"<widget name = 'EditTextWidget' " +"padding = '5, 5, 0, 0' " +"/> " +"<widget name = 'Console' " +"padding = '7, 5, 5, 5' " +"/> " +"<widget name = 'TabWidget.Tab' " +"size = '45, 16' " +"padding = '0, 0, 2, 0' " +"/> " +"<widget name = 'TabWidget.NavButton' " +"size = '32, 18' " +"padding = '0, 3, 4, 0' " +"/> " +"</globals> " +"<dialog name = 'Launcher' overlays = 'screen'> " "<layout type = 'vertical' center = 'true' padding = '8, 8, 4, 4'> " "<widget name = 'Version' " "height = 'Globals.Line.Height' " @@ -464,78 +937,41 @@ "</layout> " "</layout> " "</dialog> " -"<dialog name = 'Browser' overlays = 'Dialog.Launcher.GameList' shading = 'dim'> " -"<layout type = 'vertical' padding = '8, 8, 8, 8' direction = 'bottom2top'> " -"<layout type = 'horizontal' padding = '0, 0, 16, 0' direction = 'right2left'> " -"<widget name = 'Choose' " -"type = 'Button' " -"/> " -"<widget name = 'Cancel' " -"type = 'Button' " -"/> " -"<space/> " -"<widget name = 'Up' " -"type = 'Button' " -"/> " -"</layout> " -"<widget name = 'List'/> " -"<widget name = 'Path' " -"height = 'Globals.Line.Height' " -"/> " +"<dialog name = 'Browser' overlays = 'screen' inset = '16' shading = 'dim'> " +"<layout type = 'vertical' padding = '8, 8, 8, 8'> " "<widget name = 'Headline' " "height = 'Globals.Line.Height' " "/> " -"</layout> " -"</dialog> " -"<dialog name = 'GlobalOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'> " -"<layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top'> " -"<layout type = 'horizontal' direction = 'right2left' padding = '16, 16, 16, 16'> " -"<widget name = 'Ok' " -"type = 'Button' " +"<widget name = 'Path' " +"height = 'Globals.Line.Height' " "/> " -"<widget name = 'Cancel' " +"<widget name = 'List'/> " +"<layout type = 'horizontal' padding = '0, 0, 16, 0'> " +"<widget name = 'Up' " "type = 'Button' " "/> " "<space/> " -"</layout> " -"<widget name = 'TabWidget'/> " -"</layout> " -"</dialog> " -"<dialog name = 'Browser' overlays = 'screen' inset = '16' shading = 'dim' resolution = '320xY, 256x240'> " -"<layout type = 'vertical' padding = '8, 8, 8, 8' direction = 'bottom2top'> " -"<layout type = 'horizontal' padding = '0, 0, 16, 0' direction = 'right2left'> " -"<widget name = 'Choose' " -"type = 'Button' " -"/> " "<widget name = 'Cancel' " "type = 'Button' " "/> " -"<space/> " -"<widget name = 'Up' " +"<widget name = 'Choose' " "type = 'Button' " "/> " "</layout> " -"<widget name = 'List'/> " -"<widget name = 'Path' " -"height = 'Globals.Line.Height' " -"/> " -"<widget name = 'Headline' " -"height = 'Globals.Line.Height' " -"/> " "</layout> " "</dialog> " -"<dialog name = 'GlobalOptions' overlays = 'screen' inset = '16' shading = 'dim' resolution = '320xY, 256x240'> " -"<layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top'> " -"<layout type = 'horizontal' direction = 'right2left' padding = '8, 8, 8, 2'> " -"<widget name = 'Ok' " +"<dialog name = 'GlobalOptions' overlays = 'screen' inset = '16' shading = 'dim'> " +"<layout type = 'vertical' padding = '0, 0, 0, 0'> " +"<widget name = 'TabWidget'/> " +"<layout type = 'horizontal' padding = '8, 8, 8, 2'> " +"<space/> " +"<widget name = 'Cancel' " "type = 'Button' " "/> " -"<widget name = 'Cancel' " +"<widget name = 'Ok' " "type = 'Button' " "/> " -"<space/> " "</layout> " -"<widget name = 'TabWidget'/> " "</layout> " "</dialog> " "<dialog name = 'GlobalOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'> " @@ -712,32 +1148,18 @@ "/> " "</layout> " "</dialog> " -"<dialog name = 'GameOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'> " -"<layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top' spacing = '16'> " -"<layout type = 'horizontal' direction = 'right2left' padding = '16, 16, 16, 16'> " -"<widget name = 'Ok' " -"type = 'Button' " -"/> " +"<dialog name = 'GameOptions' overlays = 'screen' inset = '16' shading = 'dim'> " +"<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '16'> " +"<widget name = 'TabWidget'/> " +"<layout type = 'horizontal' padding = '8, 8, 8, 2'> " +"<space/> " "<widget name = 'Cancel' " "type = 'Button' " "/> " -"<space/> " -"</layout> " -"<widget name = 'TabWidget'/> " -"</layout> " -"</dialog> " -"<dialog name = 'GameOptions' overlays = 'screen' inset = '16' shading = 'dim' resolution = '320xY, 256x240'> " -"<layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top' spacing = '16'> " -"<layout type = 'horizontal' direction = 'right2left' padding = '8, 8, 8, 2'> " "<widget name = 'Ok' " "type = 'Button' " "/> " -"<widget name = 'Cancel' " -"type = 'Button' " -"/> " -"<space/> " "</layout> " -"<widget name = 'TabWidget'/> " "</layout> " "</dialog> " "<dialog name = 'GameOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'> " @@ -776,7 +1198,8 @@ "<layout type = 'vertical' padding = '16, 16, 16, 16'> " "<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> " "<widget name = 'Id' " -"type = 'ShortOptionsLabel' " +"width = '35' " +"height = 'Globals.Line.Height' " "/> " "<widget name = 'Domain' " "type = 'PopUp' " @@ -784,12 +1207,14 @@ "</layout> " "<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> " "<widget name = 'Name' " -"type = 'ShortOptionsLabel' " +"width = '35' " +"height = 'Globals.Line.Height' " "/> " "<widget name = 'Desc' " "type = 'PopUp' " "/> " "</layout> " +"<space size = '8'/> " "<widget name = 'Lang' " "type = 'PopUp' " "/> " @@ -831,14 +1256,14 @@ "<widget name = 'Resume' " "type = 'Button' " "/> " -"<space size = '15'/> " +"<space size = '4'/> " "<widget name = 'Load' " "type = 'Button' " "/> " "<widget name = 'Save' " "type = 'Button' " "/> " -"<space size = '15'/> " +"<space size = '4'/> " "<widget name = 'Options' " "type = 'Button' " "/> " @@ -848,42 +1273,34 @@ "<widget name = 'About' " "type = 'Button' " "/> " -"<space size = '15'/> " +"<space size = '4'/> " "<widget name = 'Quit' " "type = 'Button' " "/> " "</layout> " "</dialog> " "<dialog name = 'ScummConfig' overlays = 'screen_center'> " -"<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true' direction = 'bottom2top'> " -"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> " -"<space size = 'Globals.Button.Width' /> " -"<widget name = 'Cancel' " -"type = 'Button' " -"/> " -"<widget name = 'Ok' " -"type = 'Button' " -"/> " -"</layout> " -"<space size = '100'/> " +"<layout type = 'vertical' padding = '8, 8, 8, 8'> " "<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> " -"<widget name = 'subSubtitleSpeedDesc' " +"<widget name = 'vcMusicText' " "type = 'OptionsLabel' " "/> " -"<widget name = 'subSubtitleSpeedSlider' " +"<widget name = 'vcMusicSlider' " "type = 'Slider' " "/> " -"<widget name = 'subSubtitleSpeedLabel' " +"<widget name = 'vcMusicLabel' " "type = 'SmallLabel' " "/> " "</layout> " "<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> " -"<widget name = 'subToggleDesc' " +"<widget name = 'vcSfxText' " "type = 'OptionsLabel' " "/> " -"<widget name = 'subToggleButton' " -"width = '158' " -"height = 'Globals.Slider.Height' " +"<widget name = 'vcSfxSlider' " +"type = 'Slider' " +"/> " +"<widget name = 'vcSfxLabel' " +"type = 'SmallLabel' " "/> " "</layout> " "<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> " @@ -898,55 +1315,62 @@ "/> " "</layout> " "<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> " -"<widget name = 'vcSfxText' " +"<widget name = 'subToggleDesc' " "type = 'OptionsLabel' " "/> " -"<widget name = 'vcSfxSlider' " -"type = 'Slider' " -"/> " -"<widget name = 'vcSfxLabel' " -"type = 'SmallLabel' " +"<widget name = 'subToggleButton' " +"width = '92' " +"height = 'Globals.Slider.Height' " "/> " "</layout> " "<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> " -"<widget name = 'vcMusicText' " +"<widget name = 'subSubtitleSpeedDesc' " "type = 'OptionsLabel' " "/> " -"<widget name = 'vcMusicSlider' " +"<widget name = 'subSubtitleSpeedSlider' " "type = 'Slider' " "/> " -"<widget name = 'vcMusicLabel' " +"<widget name = 'subSubtitleSpeedLabel' " "type = 'SmallLabel' " "/> " "</layout> " -"</layout> " -"</dialog> " -"<dialog name = 'ScummSaveLoad' overlays = 'screen'> " -"<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true' direction = 'bottom2top'> " -"<layout type = 'horizontal' padding = '0, 0, 16, 0' direction = 'right2left'> " -"<widget name = 'Choose' " +"<space size = '20'/> " +"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> " +"<space size = 'Globals.Button.Width' /> " +"<widget name = 'Cancel' " "type = 'Button' " "/> " -"<widget name = 'Cancel' " +"<widget name = 'Ok' " "type = 'Button' " "/> " -"<space/> " "</layout> " -"<layout type = 'horizontal' padding = '0, 0, 0, 0' direction = 'right2left' spacing = '16'> " -"<layout type = 'vertical' padding = '0, 0, 0, 0'> " -"<widget name = 'Thumbnail' " -"width = '180' " -"height = '200' " -"/> " -"<space/> " "</layout> " +"</dialog> " +"<dialog name = 'ScummSaveLoad' overlays = 'screen' inset = '16'> " +"<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'> " +"<widget name = 'Title' height = 'Globals.Line.Height'/> " "<widget name = 'List' /> " +"<layout type = 'horizontal' padding = '0, 0, 16, 0'> " +"<space/> " +"<widget name = 'Cancel' " +"type = 'Button' " +"/> " +"<widget name = 'Choose' " +"type = 'Button' " +"/> " "</layout> " "</layout> " "</dialog> " "<dialog name = 'ScummHelp' overlays = 'screen_center'> " -"<layout type = 'vertical' padding = '8, 8, 8, 8' direction = 'bottom2top'> " -"<layout type = 'horizontal' padding = '0, 0, 16, 0'> " +"<layout type = 'vertical' padding = '8, 8, 8, 8'> " +"<widget name = 'Title' " +"width = '180' " +"height = 'Globals.Line.Height' " +"/> " +"<widget name = 'HelpText' " +"height = '170' " +"/> " +"<layout type = 'horizontal' padding = '0, 0, 4, 0'> " "<widget name = 'Prev' " "type = 'Button' " "/> " @@ -958,12 +1382,6 @@ "type = 'Button' " "/> " "</layout> " -"<widget name = 'HelpText' " -"height = '220' " -"/> " -"<widget name = 'Title' " -"height = 'Globals.Line.Height' " -"/> " "</layout> " "</dialog> " "</layout_info> " diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip Binary files differindex 334d2a2274..a8d9bf90e6 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 e404aa37da..48c8c181ee 100644 --- a/gui/themes/scummclassic/classic_layout.stx +++ b/gui/themes/scummclassic/classic_layout.stx @@ -23,29 +23,20 @@ * */ -<layout_info> +<layout_info resolution = '-320xY, -256x240'> <globals> <def var = 'Line.Height' value = '16' /> <def var = 'Font.Height' value = '16' /> <def var = 'TabLabelWidth' value = '110' /> - <def resolution = "320xY, 256x240" var = 'Line.Height' value = '12' /> - <def resolution = "320xY, 256x240" var = 'Font.Height' value = '10' /> - <def resolution = "320xY, 256x240" var = 'TabLabelWidth' value = '100' /> - <def var = 'WidgetSize' value = 'kBigWidgetSize' /> <def var = 'About.OuterBorder' value = '80'/> <def var = 'PopUpWidget.labelSpacing' value = '10' /> - <def resolution = "320xY, 256x240" var = 'WidgetSize' value = 'kNormalWidgetSize' /> - <def resolution = "320xY, 256x240" var = 'About.OuterBorder' value = '10'/> - <def resolution = "320xY, 256x240" var = 'PopUpWidget.labelSpacing' value = '6' /> - <def var = 'Layout.Spacing' value = '8' /> <def var = 'ShowLauncherLogo' value = '0'/> <def var = 'ScummSaveLoad.ExtInfo.Visible' value = '1'/> - <def resolution = "320xY, 256x240" var = 'ScummSaveLoad.ExtInfo.Visible' value = '0'/> <widget name = 'OptionsLabel' size = '110, Globals.Line.Height' @@ -57,10 +48,6 @@ <widget name = 'ShortOptionsLabel' size = '60, Globals.Line.Height' /> - <widget resolution = "320xY, 256x240" name = 'ShortOptionsLabel' - size = '40, Globals.Line.Height' - /> - <widget name = 'Button' size = 'kBigButtonWidth, kBigButtonHeight' @@ -69,27 +56,12 @@ size = 'kBigSliderWidth, kBigSliderHeight' /> - <widget resolution = "320xY, 256x240" name = 'Button' - size = 'kButtonWidth, kButtonHeight' - /> - <widget resolution = "320xY, 256x240" name = 'Slider' - size = 'kSliderWidth, kSliderHeight' - /> - <widget name = 'PopUp' size = '-1, 19' /> - <widget name = 'PopUp' resolution = "320xY, 256x240" - size = '-1, 15' - /> - <widget name = 'Checkbox' size = '-1, 14' /> - <widget name = 'Checkbox' resolution = "320xY, 256x240" - size = '-1, 10' - /> - <widget name = 'ListWidget' padding = '5, 0, 8, 0' /> @@ -110,15 +82,6 @@ size = '15, 18' padding = '0, 3, 4, 0' /> - - <widget name = 'TabWidget.Tab' resolution = "320xY, 256x240" - size = '45, 16' - padding = '0, 0, 0, 0' - /> - <widget name = 'TabWidget.NavButton' resolution = "320xY, 256x240" - size = '32, 18' - padding = '0, 3, 4, 0' - /> </globals> <dialog name = 'Launcher' overlays = 'screen'> @@ -163,128 +126,45 @@ </layout> </dialog> - <dialog name = 'Launcher' overlays = 'screen' resolution = "320xY, 256x240"> - <layout type = 'vertical' center = 'true' padding = '8, 8, 4, 4'> - <widget name = 'Version' + <dialog name = 'Browser' overlays = 'Dialog.Launcher.GameList' shading = 'dim'> + <layout type = 'vertical' padding = '8, 8, 8, 8'> + <widget name = 'Headline' height = 'Globals.Line.Height' /> - <widget name = 'GameList'/> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'> - <widget name = 'AddGameButton' - width = '90' - height = '12' - /> - <widget name = 'EditGameButton' - width = '90' - height = '12' - /> - <widget name = 'RemoveGameButton' - width = '90' - height = '12' - /> - </layout> - <space size = '4'/> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'> - <widget name = 'QuitButton' - width = '65' - height = '12' - /> - <widget name = 'AboutButton' - width = '65' - height = '12' - /> - <widget name = 'OptionsButton' - width = '65' - height = '12' - /> - <widget name = 'StartButton' - width = '65' - height = '12' - /> - </layout> - </layout> - </dialog> - - <dialog name = 'Browser' overlays = 'Dialog.Launcher.GameList' shading = 'dim'> - <layout type = 'vertical' padding = '8, 8, 8, 8' direction = 'bottom2top'> - <layout type = 'horizontal' padding = '0, 0, 16, 0' direction = 'right2left'> - <widget name = 'Choose' + <widget name = 'Path' + height = 'Globals.Line.Height' + /> + <widget name = 'List'/> + <layout type = 'horizontal' padding = '0, 0, 16, 0'> + <widget name = 'Up' type = 'Button' /> + <space/> <widget name = 'Cancel' type = 'Button' /> - <space/> - <widget name = 'Up' + <widget name = 'Choose' type = 'Button' - /> + /> </layout> - <widget name = 'List'/> - <widget name = 'Path' - height = 'Globals.Line.Height' - /> - <widget name = 'Headline' - height = 'Globals.Line.Height' - /> </layout> </dialog> <dialog name = 'GlobalOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'> - <layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top'> - <layout type = 'horizontal' direction = 'right2left' padding = '16, 16, 16, 16'> - <widget name = 'Ok' - type = 'Button' - /> - <widget name = 'Cancel' - type = 'Button' - /> - <space/> - </layout> + <layout type = 'vertical' padding = '0, 0, 0, 0'> <widget name = 'TabWidget'/> - </layout> - </dialog> - - <dialog name = 'Browser' overlays = 'screen' inset = '16' shading = 'dim' resolution = "320xY, 256x240"> - <layout type = 'vertical' padding = '8, 8, 8, 8' direction = 'bottom2top'> - <layout type = 'horizontal' padding = '0, 0, 16, 0' direction = 'right2left'> - <widget name = 'Choose' - type = 'Button' - /> - <widget name = 'Cancel' - type = 'Button' - /> + <layout type = 'horizontal' padding = '16, 16, 16, 16'> <space/> - <widget name = 'Up' + <widget name = 'Cancel' type = 'Button' /> - </layout> - <widget name = 'List'/> - <widget name = 'Path' - height = 'Globals.Line.Height' - /> - <widget name = 'Headline' - height = 'Globals.Line.Height' - /> - </layout> - </dialog> - - <dialog name = 'GlobalOptions' overlays = 'screen' inset = '16' shading = 'dim' resolution = "320xY, 256x240"> - <layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top'> - <layout type = 'horizontal' direction = 'right2left' padding = '8, 8, 8, 2'> <widget name = 'Ok' type = 'Button' /> - <widget name = 'Cancel' - type = 'Button' - /> - <space/> </layout> - <widget name = 'TabWidget'/> </layout> </dialog> - - <dialog name = 'GlobalOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> <widget name = 'grModePopup' @@ -315,7 +195,7 @@ type = 'OptionsLabel' /> <widget name = 'subToggleButton' - width = 'Globals.Slider.Width' + width = '150' height = 'Globals.Slider.Height' /> </layout> @@ -466,32 +346,17 @@ </dialog> <dialog name = 'GameOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'> - <layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top' spacing = '16'> - <layout type = 'horizontal' direction = 'right2left' padding = '16, 16, 16, 16'> - <widget name = 'Ok' - type = 'Button' - /> + <layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '16'> + <widget name = 'TabWidget'/> + <layout type = 'horizontal' padding = '16, 16, 16, 4'> + <space/> <widget name = 'Cancel' type = 'Button' /> - <space/> - </layout> - <widget name = 'TabWidget'/> - </layout> - </dialog> - - <dialog name = 'GameOptions' overlays = 'screen' inset = '16' shading = 'dim' resolution = "320xY, 256x240"> - <layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top' spacing = '16'> - <layout type = 'horizontal' direction = 'right2left' padding = '8, 8, 8, 2'> <widget name = 'Ok' type = 'Button' /> - <widget name = 'Cancel' - type = 'Button' - /> - <space/> </layout> - <widget name = 'TabWidget'/> </layout> </dialog> @@ -535,7 +400,7 @@ <layout type = 'vertical' padding = '16, 16, 16, 16'> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> <widget name = 'Id' - type = 'ShortOptionsLabel' + type = 'OptionsLabel' /> <widget name = 'Domain' type = 'PopUp' @@ -543,7 +408,7 @@ </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> <widget name = 'Name' - type = 'ShortOptionsLabel' + type = 'OptionsLabel' /> <widget name = 'Desc' type = 'PopUp' @@ -617,35 +482,27 @@ </dialog> <dialog name = 'ScummConfig' overlays = 'screen_center'> - <layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true' direction = 'bottom2top'> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> - <space size = 'Globals.Button.Width' /> - <widget name = 'Cancel' - type = 'Button' - /> - <widget name = 'Ok' - type = 'Button' - /> - </layout> - <space size = '100'/> + <layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> - <widget name = 'subSubtitleSpeedDesc' + <widget name = 'vcMusicText' type = 'OptionsLabel' /> - <widget name = 'subSubtitleSpeedSlider' + <widget name = 'vcMusicSlider' type = 'Slider' /> - <widget name = 'subSubtitleSpeedLabel' + <widget name = 'vcMusicLabel' type = 'SmallLabel' /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> - <widget name = 'subToggleDesc' + <widget name = 'vcSfxText' type = 'OptionsLabel' /> - <widget name = 'subToggleButton' - width = '158' - height = 'Globals.Slider.Height' + <widget name = 'vcSfxSlider' + type = 'Slider' + /> + <widget name = 'vcSfxLabel' + type = 'SmallLabel' /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> @@ -660,56 +517,71 @@ /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> - <widget name = 'vcSfxText' + <widget name = 'subToggleDesc' type = 'OptionsLabel' /> - <widget name = 'vcSfxSlider' - type = 'Slider' - /> - <widget name = 'vcSfxLabel' - type = 'SmallLabel' + <widget name = 'subToggleButton' + width = '158' + height = 'Globals.Slider.Height' /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> - <widget name = 'vcMusicText' + <widget name = 'subSubtitleSpeedDesc' type = 'OptionsLabel' /> - <widget name = 'vcMusicSlider' + <widget name = 'subSubtitleSpeedSlider' type = 'Slider' /> - <widget name = 'vcMusicLabel' + <widget name = 'subSubtitleSpeedLabel' type = 'SmallLabel' /> - </layout> + </layout> + <space size = '60'/> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> + <space size = 'Globals.Button.Width' /> + <widget name = 'Cancel' + type = 'Button' + /> + <widget name = 'Ok' + type = 'Button' + /> + </layout> </layout> </dialog> - <dialog name = 'ScummSaveLoad' overlays = 'screen'> - <layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true' direction = 'bottom2top'> - <layout type = 'horizontal' padding = '0, 0, 16, 0' direction = 'right2left'> - <widget name = 'Choose' - type = 'Button' + <dialog name = 'ScummSaveLoad' overlays = 'screen' inset = '16'> + <layout type = 'vertical' padding = '8, 8, 8, 32' center = 'true'> + <widget name = 'Title' + height = 'Globals.Line.Height' + /> + <layout type = 'horizontal' padding = '0, 0, 0, 16' spacing = '16'> + <widget name = 'List' /> + <widget name = 'Thumbnail' + width = '180' + height = '200' /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <space/> <widget name = 'Cancel' type = 'Button' /> - <space/> - </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' direction = 'right2left' spacing = '16'> - <layout type = 'vertical' padding = '0, 0, 0, 0'> - <widget name = 'Thumbnail' - width = '180' - height = '200' - /> - <space/> - </layout> - <widget name = 'List' /> + <widget name = 'Choose' + type = 'Button' + /> </layout> </layout> </dialog> <dialog name = 'ScummHelp' overlays = 'screen_center'> - <layout type = 'vertical' padding = '8, 8, 8, 8' direction = 'bottom2top'> + <layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'> + <widget name = 'Title' + width = '320' + height = 'Globals.Line.Height' + /> + <widget name = 'HelpText' + height = '220' + /> <layout type = 'horizontal' padding = '0, 0, 16, 0'> <widget name = 'Prev' type = 'Button' @@ -722,12 +594,6 @@ type = 'Button' /> </layout> - <widget name = 'HelpText' - height = '220' - /> - <widget name = 'Title' - height = 'Globals.Line.Height' - /> </layout> </dialog> </layout_info>
\ No newline at end of file diff --git a/gui/themes/scummodern.zip b/gui/themes/scummodern.zip Binary files differindex 3c68cc7df3..09fd31b8ab 100644 --- a/gui/themes/scummodern.zip +++ b/gui/themes/scummodern.zip diff --git a/gui/themes/scummodern/scummodern_layout.stx b/gui/themes/scummodern/scummodern_layout.stx index 4d7d07c51b..61545d0ffa 100644 --- a/gui/themes/scummodern/scummodern_layout.stx +++ b/gui/themes/scummodern/scummodern_layout.stx @@ -23,7 +23,7 @@ * */ -<layout_info resolution = '-320xY'> +<layout_info resolution = '-320xY, -256x240'> <globals> <def var = 'Line.Height' value = '16' /> <def var = 'Font.Height' value = '16' /> @@ -132,46 +132,44 @@ </dialog> <dialog name = 'Browser' overlays = 'Dialog.Launcher.GameList' shading = 'dim'> - <layout type = 'vertical' padding = '8, 8, 8, 8' direction = 'bottom2top'> - <layout type = 'horizontal' padding = '0, 0, 16, 0' direction = 'right2left'> - <widget name = 'Choose' + <layout type = 'vertical' padding = '8, 8, 8, 8'> + <widget name = 'Headline' + height = 'Globals.Line.Height' + /> + <widget name = 'Path' + height = 'Globals.Line.Height' + /> + <widget name = 'List'/> + <layout type = 'horizontal' padding = '0, 0, 16, 0'> + <widget name = 'Up' type = 'Button' /> + <space/> <widget name = 'Cancel' type = 'Button' /> - <space/> - <widget name = 'Up' + <widget name = 'Choose' type = 'Button' - /> + /> </layout> - <widget name = 'List'/> - <widget name = 'Path' - height = 'Globals.Line.Height' - /> - <widget name = 'Headline' - height = 'Globals.Line.Height' - /> </layout> </dialog> <dialog name = 'GlobalOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'> - <layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top'> - <layout type = 'horizontal' direction = 'right2left' padding = '16, 16, 16, 16'> - <widget name = 'Ok' + <layout type = 'vertical' padding = '0, 0, 0, 0'> + <widget name = 'TabWidget'/> + <layout type = 'horizontal' padding = '16, 16, 16, 16'> + <space/> + <widget name = 'Cancel' type = 'Button' /> - <widget name = 'Cancel' + <widget name = 'Ok' type = 'Button' /> - <space/> </layout> - <widget name = 'TabWidget'/> </layout> </dialog> - - <dialog name = 'GlobalOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> <widget name = 'grModePopup' @@ -353,17 +351,17 @@ </dialog> <dialog name = 'GameOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'> - <layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top' spacing = '16'> - <layout type = 'horizontal' direction = 'right2left' padding = '16, 16, 16, 16'> - <widget name = 'Ok' + <layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '16'> + <widget name = 'TabWidget'/> + <layout type = 'horizontal' padding = '16, 16, 16, 4'> + <space/> + <widget name = 'Cancel' type = 'Button' /> - <widget name = 'Cancel' + <widget name = 'Ok' type = 'Button' /> - <space/> </layout> - <widget name = 'TabWidget'/> </layout> </dialog> @@ -489,35 +487,27 @@ </dialog> <dialog name = 'ScummConfig' overlays = 'screen_center'> - <layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true' direction = 'bottom2top'> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> - <space size = 'Globals.Button.Width' /> - <widget name = 'Cancel' - type = 'Button' - /> - <widget name = 'Ok' - type = 'Button' - /> - </layout> - <space size = '100'/> + <layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> - <widget name = 'subSubtitleSpeedDesc' + <widget name = 'vcMusicText' type = 'OptionsLabel' /> - <widget name = 'subSubtitleSpeedSlider' + <widget name = 'vcMusicSlider' type = 'Slider' /> - <widget name = 'subSubtitleSpeedLabel' + <widget name = 'vcMusicLabel' type = 'SmallLabel' /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> - <widget name = 'subToggleDesc' + <widget name = 'vcSfxText' type = 'OptionsLabel' /> - <widget name = 'subToggleButton' - width = '158' - height = 'Globals.Slider.Height' + <widget name = 'vcSfxSlider' + type = 'Slider' + /> + <widget name = 'vcSfxLabel' + type = 'SmallLabel' /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> @@ -532,56 +522,71 @@ /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> - <widget name = 'vcSfxText' + <widget name = 'subToggleDesc' type = 'OptionsLabel' /> - <widget name = 'vcSfxSlider' - type = 'Slider' - /> - <widget name = 'vcSfxLabel' - type = 'SmallLabel' + <widget name = 'subToggleButton' + width = '158' + height = 'Globals.Slider.Height' /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> - <widget name = 'vcMusicText' + <widget name = 'subSubtitleSpeedDesc' type = 'OptionsLabel' /> - <widget name = 'vcMusicSlider' + <widget name = 'subSubtitleSpeedSlider' type = 'Slider' /> - <widget name = 'vcMusicLabel' + <widget name = 'subSubtitleSpeedLabel' type = 'SmallLabel' /> - </layout> + </layout> + <space size = '60'/> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> + <space size = 'Globals.Button.Width' /> + <widget name = 'Cancel' + type = 'Button' + /> + <widget name = 'Ok' + type = 'Button' + /> + </layout> </layout> </dialog> - <dialog name = 'ScummSaveLoad' overlays = 'screen'> - <layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true' direction = 'bottom2top'> - <layout type = 'horizontal' padding = '0, 0, 16, 0' direction = 'right2left'> - <widget name = 'Choose' - type = 'Button' + <dialog name = 'ScummSaveLoad' overlays = 'screen' inset = '16'> + <layout type = 'vertical' padding = '8, 8, 8, 32' center = 'true'> + <widget name = 'Title' + height = 'Globals.Line.Height' + /> + <layout type = 'horizontal' padding = '0, 0, 0, 16' spacing = '16'> + <widget name = 'List' /> + <widget name = 'Thumbnail' + width = '180' + height = '200' /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <space/> <widget name = 'Cancel' type = 'Button' /> - <space/> - </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' direction = 'right2left' spacing = '16'> - <layout type = 'vertical' padding = '0, 0, 0, 0'> - <widget name = 'Thumbnail' - width = '180' - height = '200' - /> - <space/> - </layout> - <widget name = 'List' /> + <widget name = 'Choose' + type = 'Button' + /> </layout> </layout> </dialog> <dialog name = 'ScummHelp' overlays = 'screen_center'> - <layout type = 'vertical' padding = '8, 8, 8, 8' direction = 'bottom2top'> + <layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'> + <widget name = 'Title' + width = '320' + height = 'Globals.Line.Height' + /> + <widget name = 'HelpText' + height = '220' + /> <layout type = 'horizontal' padding = '0, 0, 16, 0'> <widget name = 'Prev' type = 'Button' @@ -594,12 +599,6 @@ type = 'Button' /> </layout> - <widget name = 'HelpText' - height = '220' - /> - <widget name = 'Title' - height = 'Globals.Line.Height' - /> </layout> </dialog> </layout_info>
\ No newline at end of file diff --git a/gui/themes/scummodern/scummodern_layout_320.stx b/gui/themes/scummodern/scummodern_layout_320.stx index a84fa97cd7..75dd08a753 100644 --- a/gui/themes/scummodern/scummodern_layout_320.stx +++ b/gui/themes/scummodern/scummodern_layout_320.stx @@ -116,41 +116,43 @@ </dialog> <dialog name = 'Browser' overlays = 'screen' inset = '16' shading = 'dim'> - <layout type = 'vertical' padding = '8, 8, 8, 8' direction = 'bottom2top'> - <layout type = 'horizontal' padding = '0, 0, 16, 0' direction = 'right2left'> - <widget name = 'Choose' + <layout type = 'vertical' padding = '8, 8, 8, 8'> + <widget name = 'Headline' + height = 'Globals.Line.Height' + /> + <widget name = 'Path' + height = 'Globals.Line.Height' + /> + <widget name = 'List'/> + <layout type = 'horizontal' padding = '0, 0, 16, 0'> + <widget name = 'Up' type = 'Button' /> + <space/> <widget name = 'Cancel' type = 'Button' /> - <space/> - <widget name = 'Up' + + <widget name = 'Choose' type = 'Button' - /> - </layout> - <widget name = 'List'/> - <widget name = 'Path' - height = 'Globals.Line.Height' - /> - <widget name = 'Headline' - height = 'Globals.Line.Height' - /> + /> + </layout> </layout> </dialog> <dialog name = 'GlobalOptions' overlays = 'screen' inset = '16' shading = 'dim'> - <layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top'> - <layout type = 'horizontal' direction = 'right2left' padding = '8, 8, 8, 2'> - <widget name = 'Ok' + <layout type = 'vertical' padding = '0, 0, 0, 0'> + <widget name = 'TabWidget'/> + <layout type = 'horizontal' padding = '8, 8, 8, 2'> + <space/> + <widget name = 'Cancel' type = 'Button' /> - <widget name = 'Cancel' + + <widget name = 'Ok' type = 'Button' /> - <space/> </layout> - <widget name = 'TabWidget'/> </layout> </dialog> @@ -335,17 +337,17 @@ </dialog> <dialog name = 'GameOptions' overlays = 'screen' inset = '16' shading = 'dim'> - <layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top' spacing = '16'> - <layout type = 'horizontal' direction = 'right2left' padding = '8, 8, 8, 2'> - <widget name = 'Ok' + <layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '16'> + <widget name = 'TabWidget'/> + <layout type = 'horizontal' padding = '8, 8, 8, 2'> + <space/> + <widget name = 'Cancel' type = 'Button' /> - <widget name = 'Cancel' + <widget name = 'Ok' type = 'Button' /> - <space/> </layout> - <widget name = 'TabWidget'/> </layout> </dialog> @@ -474,35 +476,27 @@ </dialog> <dialog name = 'ScummConfig' overlays = 'screen_center'> - <layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true' direction = 'bottom2top'> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> - <space size = 'Globals.Button.Width' /> - <widget name = 'Cancel' - type = 'Button' - /> - <widget name = 'Ok' - type = 'Button' - /> - </layout> - <space size = '100'/> + <layout type = 'vertical' padding = '8, 8, 8, 8'> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> - <widget name = 'subSubtitleSpeedDesc' + <widget name = 'vcMusicText' type = 'OptionsLabel' /> - <widget name = 'subSubtitleSpeedSlider' + <widget name = 'vcMusicSlider' type = 'Slider' /> - <widget name = 'subSubtitleSpeedLabel' + <widget name = 'vcMusicLabel' type = 'SmallLabel' /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> - <widget name = 'subToggleDesc' + <widget name = 'vcSfxText' type = 'OptionsLabel' /> - <widget name = 'subToggleButton' - width = 'Globals.Slider.Width' - height = 'Globals.Slider.Height' + <widget name = 'vcSfxSlider' + type = 'Slider' + /> + <widget name = 'vcSfxLabel' + type = 'SmallLabel' /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> @@ -517,48 +511,63 @@ /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> - <widget name = 'vcSfxText' + <widget name = 'subToggleDesc' type = 'OptionsLabel' /> - <widget name = 'vcSfxSlider' - type = 'Slider' - /> - <widget name = 'vcSfxLabel' - type = 'SmallLabel' + <widget name = 'subToggleButton' + width = '92' + height = 'Globals.Slider.Height' /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> - <widget name = 'vcMusicText' + <widget name = 'subSubtitleSpeedDesc' type = 'OptionsLabel' /> - <widget name = 'vcMusicSlider' + <widget name = 'subSubtitleSpeedSlider' type = 'Slider' /> - <widget name = 'vcMusicLabel' + <widget name = 'subSubtitleSpeedLabel' type = 'SmallLabel' /> - </layout> + </layout> + <space size = '20'/> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> + <space size = 'Globals.Button.Width' /> + <widget name = 'Cancel' + type = 'Button' + /> + <widget name = 'Ok' + type = 'Button' + /> + </layout> </layout> </dialog> - <dialog name = 'ScummSaveLoad' overlays = 'screen'> - <layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true' direction = 'bottom2top'> - <layout type = 'horizontal' padding = '0, 0, 16, 0' direction = 'right2left'> - <widget name = 'Choose' - type = 'Button' - /> + <dialog name = 'ScummSaveLoad' overlays = 'screen' inset = '16'> + <layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'> + <widget name = 'Title' height = 'Globals.Line.Height'/> + <widget name = 'List' /> + <layout type = 'horizontal' padding = '0, 0, 16, 0'> + <space/> <widget name = 'Cancel' type = 'Button' /> - <space/> - </layout> - <widget name = 'List' /> - <widget name = 'Title' height = 'Globals.Line.Height'/> + <widget name = 'Choose' + type = 'Button' + /> + </layout> </layout> </dialog> <dialog name = 'ScummHelp' overlays = 'screen_center'> - <layout type = 'vertical' padding = '8, 8, 8, 8' direction = 'bottom2top'> + <layout type = 'vertical' padding = '8, 8, 8, 8'> + <widget name = 'Title' + width = '180' + height = 'Globals.Line.Height' + /> + <widget name = 'HelpText' + height = '170' + /> <layout type = 'horizontal' padding = '0, 0, 4, 0'> <widget name = 'Prev' type = 'Button' @@ -571,12 +580,6 @@ type = 'Button' /> </layout> - <widget name = 'HelpText' - height = '170' - /> - <widget name = 'Title' - height = 'Globals.Line.Height' - /> </layout> </dialog> </layout_info> |