diff options
author | Vicent Marti | 2008-08-08 18:30:16 +0000 |
---|---|---|
committer | Vicent Marti | 2008-08-08 18:30:16 +0000 |
commit | dab1fa0942cffa82c1944170774b659b8bcfb6b2 (patch) | |
tree | 443690e96619facaa839d57c45e7f094d8d356fd /gui/themes | |
parent | 3ca6f76f7be2ef8c982c83ed0c1a1da633033c35 (diff) | |
download | scummvm-rg350-dab1fa0942cffa82c1944170774b659b8bcfb6b2.tar.gz scummvm-rg350-dab1fa0942cffa82c1944170774b659b8bcfb6b2.tar.bz2 scummvm-rg350-dab1fa0942cffa82c1944170774b659b8bcfb6b2.zip |
Resolution-dependence in XML files.
G1X scaler GUI now loads. Added layout for the launcher menu.
MILESTONE: All core GUI dialogs/widgets working on G2x/G3x
MILESTONE: Completely removed old Evaluator/Parser.
Improved layout expanding again.
Improved XML parser.
Several bugfixes.
svn-id: r33704
Diffstat (limited to 'gui/themes')
-rw-r--r-- | gui/themes/default.inc | 47 | ||||
-rw-r--r-- | gui/themes/modern.stx | 59 |
2 files changed, 102 insertions, 4 deletions
diff --git a/gui/themes/default.inc b/gui/themes/default.inc index 41de1be85f..97b7d6a260 100644 --- a/gui/themes/default.inc +++ b/gui/themes/default.inc @@ -397,6 +397,9 @@ "<def var = 'Widget.Size' value = '32' /> " "<def var = 'Line.Height' value = '16' /> " "<def var = 'Font.Height' value = '16' /> " +"<def var = 'TabLabelWidth' value = '110' /> " +"<def var = 'WidgetSize' value = 'kBigWidgetSize' /> " +"<def resolution = '320xY' var = 'WidgetSize' value = 'kNormalWidgetSize' /> " "<def var = 'Padding.Bottom' value = '16' /> " "<def var = 'Padding.Left' value = '16' /> " "<def var = 'Padding.Right' value = '16' /> " @@ -404,6 +407,8 @@ "<def var = 'ListWidget.hlLeftPadding' value = '0'/> " "<def var = 'ListWidget.hlRightPadding' value = '16'/> " "<def var = 'PopUpWidget.labelSpacing' value = '10' /> " +"<def var = 'ShowLauncherLogo' value = '1'/> " +"<def resolution = '320xY' var = 'ShowLauncherLogo' value = '0'/> " "<widget name = 'OptionsLabel' " "size = '110, Globals.Line.Height' " "/> " @@ -411,7 +416,11 @@ "size = '24, Globals.Line.Height' " "/> " "<widget name = 'Button' " -"size = '108, 24' " +"size = 'kBigButtonWidth, kBigButtonHeight' " +"/> " +"<widget resolution = '320xY' " +"name = 'Button' " +"size = 'kButtonWidth, kButtonHeight' " "/> " "<widget name = 'Slider' " "size = '128, 18' " @@ -487,6 +496,42 @@ "</layout> " "</layout> " "</dialog> " +"<dialog resolution = '320xY' name = 'Launcher' overlays = 'screen'> " +"<layout type = 'vertical' center = 'true' padding = '8, 8, 8, 8'> " +"<widget name = 'Version' " +"height = 'Globals.Line.Height' " +"/> " +"<widget name = 'GameList' width = '304' height = '120'/> " +"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6'> " +"<widget name = 'AddGameButton' " +"width = '95' " +"height = 'Globals.Button.Height' " +"/> " +"<widget name = 'EditGameButton' " +"width = '95' " +"height = 'Globals.Button.Height' " +"/> " +"<widget name = 'RemoveGameButton' " +"width = '95' " +"height = 'Globals.Button.Height' " +"/> " +"</layout> " +"<layout type = 'horizontal' padding = '0, 0, 0, 0'> " +"<widget name = 'QuitButton' " +"type = 'Button' " +"/> " +"<widget name = 'AboutButton' " +"type = 'Button' " +"/> " +"<widget name = 'OptionsButton' " +"type = 'Button' " +"/> " +"<widget name = 'StartButton' " +"type = 'Button' " +"/> " +"</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'> " diff --git a/gui/themes/modern.stx b/gui/themes/modern.stx index 3551b637df..cf022960bb 100644 --- a/gui/themes/modern.stx +++ b/gui/themes/modern.stx @@ -456,6 +456,11 @@ <def var = 'Widget.Size' value = '32' /> <def var = 'Line.Height' value = '16' /> <def var = 'Font.Height' value = '16' /> + <def var = 'TabLabelWidth' value = '110' /> + + <def var = 'WidgetSize' value = 'kBigWidgetSize' /> + + <def resolution = '320xY' var = 'WidgetSize' value = 'kNormalWidgetSize' /> <def var = 'Padding.Bottom' value = '16' /> <def var = 'Padding.Left' value = '16' /> @@ -465,6 +470,9 @@ <def var = 'ListWidget.hlLeftPadding' value = '0'/> <def var = 'ListWidget.hlRightPadding' value = '16'/> <def var = 'PopUpWidget.labelSpacing' value = '10' /> + + <def var = 'ShowLauncherLogo' value = '1'/> + <def resolution = '320xY' var = 'ShowLauncherLogo' value = '0'/> <widget name = 'OptionsLabel' size = '110, Globals.Line.Height' @@ -472,9 +480,16 @@ <widget name = 'SmallLabel' size = '24, Globals.Line.Height' /> + <widget name = 'Button' - size = '108, 24' + size = 'kBigButtonWidth, kBigButtonHeight' /> + <widget resolution = '320xY' + name = 'Button' + size = 'kButtonWidth, kButtonHeight' + /> + + <widget name = 'Slider' size = '128, 18' /> @@ -552,6 +567,43 @@ </layout> </dialog> + <dialog resolution = '320xY' name = 'Launcher' overlays = 'screen'> + <layout type = 'vertical' center = 'true' padding = '8, 8, 8, 8'> + <widget name = 'Version' + height = 'Globals.Line.Height' + /> + <widget name = 'GameList' width = '304' height = '120'/> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6'> + <widget name = 'AddGameButton' + width = '95' + height = 'Globals.Button.Height' + /> + <widget name = 'EditGameButton' + width = '95' + height = 'Globals.Button.Height' + /> + <widget name = 'RemoveGameButton' + width = '95' + height = 'Globals.Button.Height' + /> + </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <widget name = 'QuitButton' + type = 'Button' + /> + <widget name = 'AboutButton' + type = 'Button' + /> + <widget name = 'OptionsButton' + type = 'Button' + /> + <widget name = 'StartButton' + type = 'Button' + /> + </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'> @@ -574,8 +626,7 @@ height = 'Globals.Line.Height' /> </layout> - </dialog> - + </dialog> <dialog name = 'GlobalOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'> <layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top'> @@ -592,6 +643,8 @@ </layout> </dialog> + + <dialog name = 'GlobalOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> <widget name = 'grModePopup' |