diff options
Diffstat (limited to 'gui/themes/scummmodern')
16 files changed, 324 insertions, 29 deletions
diff --git a/gui/themes/scummmodern/FreeMonoBold.ttf b/gui/themes/scummmodern/FreeMonoBold.ttf Binary files differnew file mode 100644 index 0000000000..3bce6129ae --- /dev/null +++ b/gui/themes/scummmodern/FreeMonoBold.ttf diff --git a/gui/themes/scummmodern/FreeSans.ttf b/gui/themes/scummmodern/FreeSans.ttf Binary files differnew file mode 100644 index 0000000000..9db958532c --- /dev/null +++ b/gui/themes/scummmodern/FreeSans.ttf diff --git a/gui/themes/scummmodern/FreeSansBold.ttf b/gui/themes/scummmodern/FreeSansBold.ttf Binary files differnew file mode 100644 index 0000000000..63644e7437 --- /dev/null +++ b/gui/themes/scummmodern/FreeSansBold.ttf diff --git a/gui/themes/scummmodern/THEMERC b/gui/themes/scummmodern/THEMERC index f947a5685a..32bd36241e 100644 --- a/gui/themes/scummmodern/THEMERC +++ b/gui/themes/scummmodern/THEMERC @@ -1 +1 @@ -[SCUMMVM_STX0.8.3:ScummVM Modern Theme:No Author] +[SCUMMVM_STX0.8.8:ScummVM Modern Theme:No Author] diff --git a/gui/themes/scummmodern/clR6x12-iso-8859-2.fcc b/gui/themes/scummmodern/clR6x12-iso-8859-2.fcc Binary files differindex 042bc5b24d..4d225ddc23 100644 --- a/gui/themes/scummmodern/clR6x12-iso-8859-2.fcc +++ b/gui/themes/scummmodern/clR6x12-iso-8859-2.fcc diff --git a/gui/themes/scummmodern/clR6x12-iso-8859-5.fcc b/gui/themes/scummmodern/clR6x12-iso-8859-5.fcc Binary files differindex d8e614211d..37d4615ea0 100644 --- a/gui/themes/scummmodern/clR6x12-iso-8859-5.fcc +++ b/gui/themes/scummmodern/clR6x12-iso-8859-5.fcc diff --git a/gui/themes/scummmodern/eraser.bmp b/gui/themes/scummmodern/eraser.bmp Binary files differnew file mode 100644 index 0000000000..b927a6384f --- /dev/null +++ b/gui/themes/scummmodern/eraser.bmp diff --git a/gui/themes/scummmodern/fixed5x8-iso-8859-2.fcc b/gui/themes/scummmodern/fixed5x8-iso-8859-2.fcc Binary files differindex 73bb5fff2d..37da61be00 100644 --- a/gui/themes/scummmodern/fixed5x8-iso-8859-2.fcc +++ b/gui/themes/scummmodern/fixed5x8-iso-8859-2.fcc diff --git a/gui/themes/scummmodern/fixed5x8-iso-8859-5.fcc b/gui/themes/scummmodern/fixed5x8-iso-8859-5.fcc Binary files differindex e70388dd93..ee32a2041b 100644 --- a/gui/themes/scummmodern/fixed5x8-iso-8859-5.fcc +++ b/gui/themes/scummmodern/fixed5x8-iso-8859-5.fcc diff --git a/gui/themes/scummmodern/helvb12-iso-8859-1.fcc b/gui/themes/scummmodern/helvb12-iso-8859-1.fcc Binary files differindex 651a25934a..18af0bf870 100644 --- a/gui/themes/scummmodern/helvb12-iso-8859-1.fcc +++ b/gui/themes/scummmodern/helvb12-iso-8859-1.fcc diff --git a/gui/themes/scummmodern/helvb12-iso-8859-2.fcc b/gui/themes/scummmodern/helvb12-iso-8859-2.fcc Binary files differindex 2117b6b9e6..540d8c4f4c 100644 --- a/gui/themes/scummmodern/helvb12-iso-8859-2.fcc +++ b/gui/themes/scummmodern/helvb12-iso-8859-2.fcc diff --git a/gui/themes/scummmodern/helvb12-iso-8859-5.fcc b/gui/themes/scummmodern/helvb12-iso-8859-5.fcc Binary files differindex 8ad8f0eb22..90df2b0df4 100644 --- a/gui/themes/scummmodern/helvb12-iso-8859-5.fcc +++ b/gui/themes/scummmodern/helvb12-iso-8859-5.fcc diff --git a/gui/themes/scummmodern/scummmodern_gfx.stx b/gui/themes/scummmodern/scummmodern_gfx.stx index 80177054f4..5f7cc69acd 100644 --- a/gui/themes/scummmodern/scummmodern_gfx.stx +++ b/gui/themes/scummmodern/scummmodern_gfx.stx @@ -99,32 +99,44 @@ <bitmap filename = 'radiobutton_empty.bmp'/> <bitmap filename = 'logo_small.bmp'/> <bitmap filename = 'search.bmp'/> + <bitmap filename = 'eraser.bmp'/> </bitmaps> <fonts> <font id = 'text_default' file = 'helvb12.bdf' + scalable_file = 'FreeSansBold.ttf' /> <font resolution = 'y<400' id = 'text_default' file = 'clR6x12.bdf' + scalable_file = 'FreeSans.ttf' + point_size = '11' /> <font id = 'text_button' file = 'helvb12.bdf' + scalable_file = 'FreeSansBold.ttf' /> <font resolution = 'y<400' id = 'text_button' file = 'clR6x12.bdf' + scalable_file = 'FreeSans.ttf' + point_size = '11' /> <font id = 'text_normal' file = 'helvb12.bdf' + scalable_file = 'FreeSans.ttf' /> <font resolution = 'y<400' id = 'text_normal' file = 'clR6x12.bdf' + scalable_file = 'FreeSans.ttf' + point_size = '11' /> <font id = 'tooltip_normal' file = 'fixed5x8.bdf' + scalable_file = 'FreeMonoBold.ttf' + point_size = '8' /> <text_color id = 'color_normal' @@ -259,7 +271,7 @@ </drawdata> <!-- Buttons at the top and bottom of the scrollbar --> - <drawdata id = 'scrollbar_button_idle' cache = 'false'> + <drawdata id = 'scrollbar_button_idle' cache = 'false' resolution = 'y>399'> <drawstep func = 'roundedsq' radius = '10' fill = 'none' @@ -269,15 +281,35 @@ <drawstep func = 'triangle' fg_color = 'shadowcolor' fill = 'foreground' - width = 'auto' - height = 'auto' - xpos = 'center' + width = '10' + height = '10' + xpos = 'right' ypos = 'center' + padding = '0,0,2,0' orientation = 'top' /> </drawdata> - <drawdata id = 'scrollbar_button_hover' cache = 'false'> + <drawdata id = 'scrollbar_button_idle' cache = 'false' resolution = 'y<400'> + <drawstep func = 'roundedsq' + radius = '10' + fill = 'none' + fg_color = 'darkgray' + stroke = '1' + /> + <drawstep func = 'triangle' + fg_color = 'shadowcolor' + fill = 'foreground' + width = '5' + height = '5' + xpos = 'right' + ypos = 'center' + padding = '0,0,1,0' + orientation = 'top' + /> + </drawdata> + + <drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y>399'> <drawstep func = 'roundedsq' radius = '10' fill = 'gradient' @@ -291,10 +323,30 @@ <drawstep func = 'triangle' fg_color = 'shadowcolor' fill = 'foreground' - width = 'auto' - height = 'auto' - xpos = 'center' + width = '10' + height = '10' + xpos = 'right' + ypos = 'center' + padding = '0,0,2,0' + orientation = 'top' + /> + </drawdata> + + <drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y<400'> + <drawstep func = 'roundedsq' + radius = '10' + fill = 'none' + fg_color = 'darkgray' + stroke = '1' + /> + <drawstep func = 'triangle' + fg_color = 'shadowcolor' + fill = 'foreground' + width = '5' + height = '5' + xpos = 'right' ypos = 'center' + padding = '0,0,2,0' orientation = 'top' /> </drawdata> @@ -346,7 +398,7 @@ <!-- Background of the slider widget --> <drawdata id = 'widget_slider' cache = 'false'> <drawstep func = 'roundedsq' - stroke = '0' + stroke = '1' radius = '5' fill = 'foreground' fg_color = 'paleyellow' @@ -392,7 +444,7 @@ </drawdata> <!-- Idle popup --> - <drawdata id = 'popup_idle' cache = 'false'> + <drawdata id = 'popup_idle' cache = 'false' resolution = 'y>399'> <drawstep func = 'roundedsq' radius = '5' stroke = '1' @@ -401,15 +453,68 @@ bg_color = 'xtrabrightred' shadow = '2' /> + <drawstep func = 'triangle' bg_color = 'shadowcolor' fill = 'background' - width = 'height' - height = 'auto' + width = '10' + height = '5' xpos = 'right' - ypos = 'center' + ypos = '10' + padding = '0, 0, 6, 0' orientation = 'bottom' /> + + <drawstep func = 'triangle' + bg_color = 'shadowcolor' + fill = 'background' + width = '10' + height = '5' + xpos = 'right' + ypos = '4' + padding = '0, 0, 6, 0' + orientation = 'top' + /> + + <text font = 'text_default' + text_color = 'color_normal' + vertical_align = 'center' + horizontal_align = 'left' + /> + </drawdata> + + <drawdata id = 'popup_idle' cache = 'false' resolution ='y<400'> + <drawstep func = 'roundedsq' + radius = '5' + stroke = '1' + fg_color = 'lightgray2' + fill = 'background' + bg_color = 'xtrabrightred' + shadow = '2' + /> + + <drawstep func = 'triangle' + bg_color = 'shadowcolor' + fill = 'background' + width = '7' + height = '4' + xpos = 'right' + ypos = '9' + padding = '0, 0, 3, 0' + orientation = 'bottom' + /> + + <drawstep func = 'triangle' + bg_color = 'shadowcolor' + fill = 'background' + width = '7' + height = '4' + xpos = 'right' + ypos = '4' + padding = '0, 0, 3, 0' + orientation = 'top' + /> + <text font = 'text_default' text_color = 'color_normal' vertical_align = 'center' @@ -418,31 +523,86 @@ </drawdata> <!-- Disabled popup --> - <drawdata id = 'popup_disabled' cache = 'false'> + <drawdata id = 'popup_disabled' cache = 'false' resolution = 'y>399'> <drawstep func = 'roundedsq' + stroke = '1' + fg_color = 'lightgray' radius = '5' - fill = 'foreground' - fg_color = 'darkgray' + fill = 'gradient' + gradient_start = 'blandyellow' + gradient_end = 'xtrabrightred' + shadow = '0' + /> + <drawstep func = 'triangle' + bg_color = 'shadowcolor' + fill = 'background' + width = '10' + height = '5' + xpos = 'right' + ypos = '10' + padding = '0, 0, 6, 0' + orientation = 'bottom' + /> + + <drawstep func = 'triangle' + bg_color = 'shadowcolor' + fill = 'background' + width = '10' + height = '5' + xpos = 'right' + ypos = '4' + padding = '0, 0, 6, 0' + orientation = 'top' + /> + + <text font = 'text_default' + text_color = 'color_normal_hover' + vertical_align = 'center' + horizontal_align = 'left' + /> + </drawdata> + + <drawdata id = 'popup_disabled' cache = 'false' resolution = 'y<400'> + <drawstep func = 'roundedsq' + radius = '5' + stroke = '1' + fg_color = 'lightgray2' + fill = 'background' + bg_color = 'xtrabrightred' shadow = '2' /> + <drawstep func = 'triangle' - fg_color = 'shadowcolor' - fill = 'foreground' - width = 'height' - height = 'auto' + bg_color = 'shadowcolor' + fill = 'background' + width = '7' + height = '4' xpos = 'right' - ypos = 'center' + ypos = '9' + padding = '0, 0, 3, 0' orientation = 'bottom' /> + + <drawstep func = 'triangle' + bg_color = 'shadowcolor' + fill = 'background' + width = '7' + height = '4' + xpos = 'right' + ypos = '4' + padding = '0, 0, 3, 0' + orientation = 'top' + /> + <text font = 'text_default' - text_color = 'color_normal_disabled' + text_color = 'color_normal' vertical_align = 'center' horizontal_align = 'left' /> </drawdata> <!-- Hovered popup --> - <drawdata id = 'popup_hover' cache = 'false'> + <drawdata id = 'popup_hover' cache = 'false' resolution = 'y>399'> <drawstep func = 'roundedsq' stroke = '1' fg_color = 'lightgray' @@ -453,20 +613,72 @@ shadow = '0' /> <drawstep func = 'triangle' - fg_color = 'shadowcolor' - fill = 'foreground' - width = 'height' - height = 'auto' + bg_color = 'shadowcolor' + fill = 'background' + width = '10' + height = '5' xpos = 'right' - ypos = 'center' + ypos = '10' + padding = '0, 0, 6, 0' orientation = 'bottom' /> + + <drawstep func = 'triangle' + bg_color = 'shadowcolor' + fill = 'background' + width = '10' + height = '5' + xpos = 'right' + ypos = '4' + padding = '0, 0, 6, 0' + orientation = 'top' + /> + <text font = 'text_default' text_color = 'color_normal_hover' vertical_align = 'center' horizontal_align = 'left' /> </drawdata> + + <drawdata id = 'popup_hover' cache = 'false' resolution = 'y<400'> + <drawstep func = 'roundedsq' + radius = '5' + stroke = '1' + fg_color = 'lightgray2' + fill = 'background' + bg_color = 'xtrabrightred' + shadow = '2' + /> + + <drawstep func = 'triangle' + bg_color = 'shadowcolor' + fill = 'background' + width = '7' + height = '4' + xpos = 'right' + ypos = '9' + padding = '0, 0, 3, 0' + orientation = 'bottom' + /> + + <drawstep func = 'triangle' + bg_color = 'shadowcolor' + fill = 'background' + width = '7' + height = '4' + xpos = 'right' + ypos = '4' + padding = '0, 0, 3, 0' + orientation = 'top' + /> + + <text font = 'text_default' + text_color = 'color_normal' + vertical_align = 'center' + horizontal_align = 'left' + /> + </drawdata> <!-- Background of the textedit widget --> <drawdata id = 'widget_textedit' cache = 'false'> @@ -475,6 +687,7 @@ radius = '5' fg_color = 'paleyellow' shadow = '0' + stroke = '1' bevel = '1' bevel_color = 'shadowcolor' /> diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx index e77284e5ac..69ad9c79fa 100644 --- a/gui/themes/scummmodern/scummmodern_layout.stx +++ b/gui/themes/scummmodern/scummmodern_layout.stx @@ -403,6 +403,10 @@ <widget name = 'SavePath' height = 'Globals.Line.Height' /> + <widget name = 'SavePathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'ThemeButton' @@ -411,6 +415,10 @@ <widget name = 'ThemePath' height = 'Globals.Line.Height' /> + <widget name = 'ThemePathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'ExtraButton' @@ -419,6 +427,10 @@ <widget name = 'ExtraPath' height = 'Globals.Line.Height' /> + <widget name = 'ExtraPathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'PluginsButton' @@ -602,6 +614,10 @@ <widget name = 'SavepathText' height = 'Globals.Line.Height' /> + <widget name = 'SavePathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> <widget name = 'Extrapath' @@ -610,6 +626,10 @@ <widget name = 'ExtrapathText' height = 'Globals.Line.Height' /> + <widget name = 'ExtraPathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> <widget name = 'Gamepath' @@ -813,6 +833,27 @@ </layout> </dialog> + <dialog name = 'LoomTownsDifficultyDialog' overlays = 'screen_center'> + <layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'> + <widget name = 'Description1' + width = '320' + height = 'Globals.Line.Height' + /> + <widget name = 'Description2' + height = 'Globals.Line.Height' + /> + <widget name = 'Standard' + type = 'Button' + /> + <widget name = 'Practice' + type = 'Button' + /> + <widget name = 'Expert' + type = 'Button' + /> + </layout> + </dialog> + <dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'> <layout type = 'vertical' padding = '8, 8, 32, 8' center = 'true'> <widget name = 'DirProgressText' diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx index e95fa2d584..0bfd16c1d9 100644 --- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx +++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx @@ -383,6 +383,10 @@ <widget name = 'SavePath' height = 'Globals.Line.Height' /> + <widget name = 'SavePathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> <widget name = 'ThemeButton' @@ -391,6 +395,10 @@ <widget name = 'ThemePath' height = 'Globals.Line.Height' /> + <widget name = 'ThemePathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> <widget name = 'ExtraButton' @@ -399,6 +407,10 @@ <widget name = 'ExtraPath' height = 'Globals.Line.Height' /> + <widget name = 'ExtraPathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> <widget name = 'PluginsButton' @@ -597,6 +609,10 @@ <widget name = 'SavepathText' height = 'Globals.Line.Height' /> + <widget name = 'SavePathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> <widget name = 'Extrapath' @@ -605,6 +621,10 @@ <widget name = 'ExtrapathText' height = 'Globals.Line.Height' /> + <widget name = 'ExtraPathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> <widget name = 'Gamepath' @@ -799,6 +819,27 @@ </layout> </dialog> + <dialog name = 'LoomTownsDifficultyDialog' overlays = 'screen_center'> + <layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'> + <widget name = 'Description1' + width = '280' + height = 'Globals.Line.Height' + /> + <widget name = 'Description2' + height = 'Globals.Line.Height' + /> + <widget name = 'Standard' + type = 'Button' + /> + <widget name = 'Practice' + type = 'Button' + /> + <widget name = 'Expert' + type = 'Button' + /> + </layout> + </dialog> + <dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'> <layout type = 'vertical' padding = '4, 4, 16, 4' center = 'true'> <widget name = 'DirProgressText' diff --git a/gui/themes/scummmodern/search.bmp b/gui/themes/scummmodern/search.bmp Binary files differindex fa963f8f16..0d2b098445 100644 --- a/gui/themes/scummmodern/search.bmp +++ b/gui/themes/scummmodern/search.bmp |
