diff options
Diffstat (limited to 'gui')
-rw-r--r-- | gui/ThemeEngine.h | 2 | ||||
-rw-r--r-- | gui/themes/default.inc | 70 | ||||
-rw-r--r-- | gui/themes/scummclassic.zip | bin | 42002 -> 43805 bytes | |||
-rw-r--r-- | gui/themes/scummclassic/classic_layout.stx | 36 | ||||
-rw-r--r-- | gui/themes/scummclassic/classic_layout_320.stx | 36 | ||||
-rw-r--r-- | gui/themes/scummodern.zip | bin | 125107 -> 144239 bytes | |||
-rw-r--r-- | gui/themes/scummodern/scummodern_gfx.stx | 2 | ||||
-rw-r--r-- | gui/themes/scummodern/scummodern_layout.stx | 42 | ||||
-rw-r--r-- | gui/themes/scummodern/scummodern_layout_320.stx | 36 |
9 files changed, 221 insertions, 3 deletions
diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h index 2d99076fc3..8f8b06def4 100644 --- a/gui/ThemeEngine.h +++ b/gui/ThemeEngine.h @@ -503,6 +503,8 @@ public: const Graphics::Surface *getImageSurface(const kThemeImages n) const { if (n == kImageLogo) return _bitmaps.contains("logo.bmp") ? _bitmaps["logo.bmp"] : 0; + else if (n == kImageLogoSmall) + return _bitmaps.contains("logo_small.bmp") ? _bitmaps["logo_small.bmp"] : 0; return 0; } diff --git a/gui/themes/default.inc b/gui/themes/default.inc index c0ea4a9228..f2ef86d241 100644 --- a/gui/themes/default.inc +++ b/gui/themes/default.inc @@ -314,6 +314,7 @@ "<def var = 'PopUpWidget.labelSpacing' value = '10' /> " "<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' " @@ -705,6 +706,40 @@ "</layout> " "</layout> " "</dialog> " +"<dialog name = 'GlobalMenu' overlays = 'screen_center'> " +"<layout type = 'vertical' padding = '16, 16, 16, 16' center = 'true'> " +"<widget name = 'Title' " +"width = '210' " +"height = 'Globals.Line.Height' " +"/> " +"<widget name = 'Version' " +"width = '210' " +"height = 'Globals.Line.Height' " +"/> " +"<widget name = 'Resume' " +"width = '150' " +"height = 'Globals.Button.Height' " +"/> " +"<space size = '10'/> " +"<widget name = 'Options' " +"width = '150' " +"height = 'Globals.Button.Height' " +"/> " +"<widget name = 'About' " +"width = '150' " +"height = 'Globals.Button.Height' " +"/> " +"<space size = '10'/> " +"<widget name = 'RTL' " +"width = '150' " +"height = 'Globals.Button.Height' " +"/> " +"<widget name = 'Quit' " +"width = '150' " +"height = 'Globals.Button.Height' " +"/> " +"</layout> " +"</dialog> " "<dialog name = 'ScummMain' overlays = 'screen_center'> " "<layout type = 'vertical' padding = '8, 8, 8, 8'> " "<widget name = 'Resume' " @@ -861,6 +896,7 @@ "<def var = 'PopUpWidget.labelSpacing' value = '6' /> " "<def var = 'Layout.Spacing' value = '8'/> " "<def var = 'ShowLauncherLogo' value = '0'/> " +"<def var = 'ShowGlobalMenuLogo' value = '0'/> " "<def var = 'ScummSaveLoad.ExtInfo.Visible' value = '0'/> " "<widget name = 'Button' " "size = 'kButtonWidth, kButtonHeight' " @@ -1252,6 +1288,40 @@ "</layout> " "</layout> " "</dialog> " +"<dialog name = 'GlobalMenu' overlays = 'screen_center'> " +"<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'> " +"<widget name = 'Title' " +"width = '120' " +"height = 'Globals.Line.Height' " +"/> " +"<widget name = 'Version' " +"width = '120' " +"height = 'Globals.Line.Height' " +"/> " +"<widget name = 'Resume' " +"width = '70' " +"height = 'Globals.Button.Height' " +"/> " +"<space size = '4'/> " +"<widget name = 'Options' " +"width = '70' " +"height = 'Globals.Button.Height' " +"/> " +"<widget name = 'About' " +"width = '70' " +"height = 'Globals.Button.Height' " +"/> " +"<space size = '4'/> " +"<widget name = 'RTL' " +"width = '70' " +"height = 'Globals.Button.Height' " +"/> " +"<widget name = 'Quit' " +"width = '70' " +"height = 'Globals.Button.Height' " +"/> " +"</layout> " +"</dialog> " "<dialog name = 'ScummMain' overlays = 'screen_center'> " "<layout type = 'vertical' padding = '8, 8, 8, 8'> " "<widget name = 'Resume' " diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip Binary files differindex 5f04792330..e285958029 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 9416a5a4a0..0704c8e91d 100644 --- a/gui/themes/scummclassic/classic_layout.stx +++ b/gui/themes/scummclassic/classic_layout.stx @@ -35,6 +35,7 @@ <def var = 'Layout.Spacing' value = '8' /> <def var = 'ShowLauncherLogo' value = '0'/> + <def var = 'ShowGlobalMenuLogo' value = '0'/> <def var = 'ScummSaveLoad.ExtInfo.Visible' value = '1'/> @@ -448,6 +449,41 @@ </layout> </dialog> + <dialog name = 'GlobalMenu' overlays = 'screen_center'> + <layout type = 'vertical' padding = '16, 16, 16, 16' center = 'true'> + <widget name = 'Title' + width = '210' + height = 'Globals.Line.Height' + /> + <widget name = 'Version' + width = '210' + height = 'Globals.Line.Height' + /> + <widget name = 'Resume' + width = '150' + height = 'Globals.Button.Height' + /> + <space size = '10'/> + <widget name = 'Options' + width = '150' + height = 'Globals.Button.Height' + /> + <widget name = 'About' + width = '150' + height = 'Globals.Button.Height' + /> + <space size = '10'/> + <widget name = 'RTL' + width = '150' + height = 'Globals.Button.Height' + /> + <widget name = 'Quit' + width = '150' + height = 'Globals.Button.Height' + /> + </layout> + </dialog> + <dialog name = 'ScummMain' overlays = 'screen_center'> <layout type = 'vertical' padding = '8, 8, 8, 8'> <widget name = 'Resume' diff --git a/gui/themes/scummclassic/classic_layout_320.stx b/gui/themes/scummclassic/classic_layout_320.stx index 89ed033bd5..9c03d51e13 100644 --- a/gui/themes/scummclassic/classic_layout_320.stx +++ b/gui/themes/scummclassic/classic_layout_320.stx @@ -36,6 +36,7 @@ <def var = 'Layout.Spacing' value = '8'/> <def var = 'ShowLauncherLogo' value = '0'/> + <def var = 'ShowGlobalMenuLogo' value = '0'/> <def var = 'ScummSaveLoad.ExtInfo.Visible' value = '0'/> <widget name = 'Button' @@ -448,6 +449,41 @@ </layout> </layout> </dialog> + + <dialog name = 'GlobalMenu' overlays = 'screen_center'> + <layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'> + <widget name = 'Title' + width = '120' + height = 'Globals.Line.Height' + /> + <widget name = 'Version' + width = '120' + height = 'Globals.Line.Height' + /> + <widget name = 'Resume' + width = '70' + height = 'Globals.Button.Height' + /> + <space size = '4'/> + <widget name = 'Options' + width = '70' + height = 'Globals.Button.Height' + /> + <widget name = 'About' + width = '70' + height = 'Globals.Button.Height' + /> + <space size = '4'/> + <widget name = 'RTL' + width = '70' + height = 'Globals.Button.Height' + /> + <widget name = 'Quit' + width = '70' + height = 'Globals.Button.Height' + /> + </layout> + </dialog> <dialog name = 'ScummMain' overlays = 'screen_center'> <layout type = 'vertical' padding = '8, 8, 8, 8'> diff --git a/gui/themes/scummodern.zip b/gui/themes/scummodern.zip Binary files differindex 93977a3cc7..70141bfce9 100644 --- a/gui/themes/scummodern.zip +++ b/gui/themes/scummodern.zip diff --git a/gui/themes/scummodern/scummodern_gfx.stx b/gui/themes/scummodern/scummodern_gfx.stx index c9f4c35985..b8eff77aa1 100644 --- a/gui/themes/scummodern/scummodern_gfx.stx +++ b/gui/themes/scummodern/scummodern_gfx.stx @@ -56,6 +56,7 @@ <bitmap filename = 'cursor.bmp'/> <bitmap filename = 'cursor_small.bmp'/> <bitmap filename = 'checkbox.bmp'/> + <bitmap filename = 'logo_small.bmp'/> </bitmaps> <fonts> @@ -117,6 +118,7 @@ gradient_start = '208, 112, 8' gradient_end = '232, 192, 16' shadow = '3' + gradient_factor = '3' /> </drawdata> diff --git a/gui/themes/scummodern/scummodern_layout.stx b/gui/themes/scummodern/scummodern_layout.stx index c1029088af..03d920ac05 100644 --- a/gui/themes/scummodern/scummodern_layout.stx +++ b/gui/themes/scummodern/scummodern_layout.stx @@ -43,6 +43,7 @@ <def var = 'PopUpWidget.labelSpacing' value = '10' /> <def var = 'ShowLauncherLogo' value = '1'/> + <def var = 'ShowGlobalMenuLogo' value = '1'/> <def var = 'ScummSaveLoad.ExtInfo.Visible' value = '1'/> @@ -108,7 +109,7 @@ <widget name = 'LoadGameButton' type = 'Button' /> - <space size = '16' /> + <space size = '10' /> <widget name = 'AddGameButton' type = 'Button' /> @@ -118,14 +119,14 @@ <widget name = 'RemoveGameButton' type = 'Button' /> - <space size = '16' /> + <space size = '10' /> <widget name = 'OptionsButton' type = 'Button' /> <widget name = 'AboutButton' type = 'Button' /> - <space size = '16' /> + <space size = '10' /> <widget name = 'QuitButton' type = 'Button' /> @@ -460,6 +461,41 @@ </layout> </dialog> + <dialog name = 'GlobalMenu' overlays = 'screen_center'> + <layout type = 'vertical' padding = '16, 16, 16, 16' center = 'true'> + <widget name = 'Logo' + width = '210' + height = '40' + /> + <widget name = 'Version' + width = '210' + height = 'Globals.Line.Height' + /> + <widget name = 'Resume' + width = '150' + height = 'Globals.Button.Height' + /> + <space size = '10'/> + <widget name = 'Options' + width = '150' + height = 'Globals.Button.Height' + /> + <widget name = 'About' + width = '150' + height = 'Globals.Button.Height' + /> + <space size = '10'/> + <widget name = 'RTL' + width = '150' + height = 'Globals.Button.Height' + /> + <widget name = 'Quit' + width = '150' + height = 'Globals.Button.Height' + /> + </layout> + </dialog> + <dialog name = 'ScummMain' overlays = 'screen_center'> <layout type = 'vertical' padding = '8, 8, 8, 8'> <widget name = 'Resume' diff --git a/gui/themes/scummodern/scummodern_layout_320.stx b/gui/themes/scummodern/scummodern_layout_320.stx index e154ffdb9a..b92ded6097 100644 --- a/gui/themes/scummodern/scummodern_layout_320.stx +++ b/gui/themes/scummodern/scummodern_layout_320.stx @@ -34,6 +34,7 @@ <def var = 'PopUpWidget.labelSpacing' value = '6' /> <def var = 'ShowLauncherLogo' value = '0'/> + <def var = 'ShowGlobalMenuLogo' value = '0'/> <def var = 'ScummSaveLoad.ExtInfo.Visible' value = '0'/> <widget name = 'Button' @@ -445,6 +446,41 @@ </layout> </layout> </dialog> + + <dialog name = 'GlobalMenu' overlays = 'screen_center'> + <layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'> + <widget name = 'Title' + width = '120' + height = 'Globals.Line.Height' + /> + <widget name = 'Version' + width = '120' + height = 'Globals.Line.Height' + /> + <widget name = 'Resume' + width = '70' + height = 'Globals.Button.Height' + /> + <space size = '4'/> + <widget name = 'Options' + width = '70' + height = 'Globals.Button.Height' + /> + <widget name = 'About' + width = '70' + height = 'Globals.Button.Height' + /> + <space size = '4'/> + <widget name = 'RTL' + width = '70' + height = 'Globals.Button.Height' + /> + <widget name = 'Quit' + width = '70' + height = 'Globals.Button.Height' + /> + </layout> + </dialog> <dialog name = 'ScummMain' overlays = 'screen_center'> <layout type = 'vertical' padding = '4, 4, 4, 4'> |