diff --git a/data/gui/default/macros/_initial.cfg b/data/gui/default/macros/_initial.cfg index c8e648097fc..4a9d2e52de1 100644 --- a/data/gui/default/macros/_initial.cfg +++ b/data/gui/default/macros/_initial.cfg @@ -34,7 +34,7 @@ "(if(text_height < height, (height - text_height + 1) / 2, 0))" #enddef -#define GUI__CENTERED_TEXT FONT_SIZE FONT_STYLE FONT_COLOUR +#define GUI__CENTERED_TEXT FONT_SIZE FONT_STYLE FONT_COLOR [text] x = {GUI__TEXT_HORIZONTALLY_CENTRED} y = {GUI__TEXT_VERTICALLY_CENTRED} @@ -42,41 +42,41 @@ h = "(text_height)" font_size = {FONT_SIZE} font_style = {FONT_STYLE} - colour = {FONT_COLOUR} + color = {FONT_COLOR} text = "(text)" [/text] #enddef -# This white colour is used for most texts. -#define GUI__FONT_COLOUR_ENABLED__DEFAULT +# This white color is used for most texts. +#define GUI__FONT_COLOR_ENABLED__DEFAULT "221, 221, 221, 255" #enddef -# This gray colour is used for most text when the widget is disabled. -#define GUI__FONT_COLOUR_DISABLED__DEFAULT +# This gray color is used for most text when the widget is disabled. +#define GUI__FONT_COLOR_DISABLED__DEFAULT "128, 128, 128, 255" #enddef -# This gold colour is used for the +# This gold color is used for the # - title labels # - button captions # - checkbox captions # - menu captions -#define GUI__FONT_COLOUR_ENABLED__TITLE +#define GUI__FONT_COLOR_ENABLED__TITLE "188, 176, 136, 255" #enddef -# This now uses the default disabled colour but should be tiny bit lighter. -#define GUI__FONT_COLOUR_DISABLED__TITLE - {GUI__FONT_COLOUR_DISABLED__DEFAULT} +# This now uses the default disabled color but should be tiny bit lighter. +#define GUI__FONT_COLOR_DISABLED__TITLE + {GUI__FONT_COLOR_DISABLED__DEFAULT} #enddef -# This colour is used as background in the listbox. -#define GUI__BACKGROUND_COLOUR_ENABLED +# This color is used as background in the listbox. +#define GUI__BACKGROUND_COLOR_ENABLED "21, 19, 19, 255" #enddef -#define GUI__BACKGROUND_COLOUR_DISABLED +#define GUI__BACKGROUND_COLOR_DISABLED "64, 64, 64, 255" #enddef diff --git a/data/gui/default/widget/button_default.cfg b/data/gui/default/widget/button_default.cfg index 6e44d9d685c..746203facf3 100644 --- a/data/gui/default/widget/button_default.cfg +++ b/data/gui/default/widget/button_default.cfg @@ -31,7 +31,7 @@ name = "buttons/{BASE_NAME}.png" [/image] - {GUI__CENTERED_TEXT ({FONT_SIZE}) () ({GUI__FONT_COLOUR_ENABLED__TITLE})} + {GUI__CENTERED_TEXT ({FONT_SIZE}) () ({GUI__FONT_COLOR_ENABLED__TITLE})} [/draw] @@ -47,7 +47,7 @@ name = "buttons/{BASE_NAME}-disabled.png" [/image] - {GUI__CENTERED_TEXT ({FONT_SIZE}) () ({GUI__FONT_COLOUR_DISABLED__TITLE})} + {GUI__CENTERED_TEXT ({FONT_SIZE}) () ({GUI__FONT_COLOR_DISABLED__TITLE})} [/draw] @@ -63,7 +63,7 @@ name = "buttons/{BASE_NAME}-pressed.png" [/image] - {GUI__CENTERED_TEXT ({FONT_SIZE}) () ({GUI__FONT_COLOUR_ENABLED__TITLE})} + {GUI__CENTERED_TEXT ({FONT_SIZE}) () ({GUI__FONT_COLOR_ENABLED__TITLE})} [/draw] @@ -79,7 +79,7 @@ name = "buttons/{BASE_NAME}-active.png" [/image] - {GUI__CENTERED_TEXT ({FONT_SIZE}) () ({GUI__FONT_COLOUR_ENABLED__TITLE})} + {GUI__CENTERED_TEXT ({FONT_SIZE}) () ({GUI__FONT_COLOR_ENABLED__TITLE})} [/draw] diff --git a/data/gui/default/widget/label_alignment.cfg b/data/gui/default/widget/label_alignment.cfg index e6315c424da..16bfebbe9d5 100644 --- a/data/gui/default/widget/label_alignment.cfg +++ b/data/gui/default/widget/label_alignment.cfg @@ -6,7 +6,7 @@ ### - alignment, the one for general usage, which lets pango handle the alignment ### - title_screen_tip, the one for the tips in the title screen, with a maximum width -#define _GUI_RESOLUTION RESOLUTION FONT_SIZE FONT_STYLE FONT_COLOUR_ENABLED FONT_COLOUR_DISABLED MAX_WIDTH +#define _GUI_RESOLUTION RESOLUTION FONT_SIZE FONT_STYLE FONT_COLOR_ENABLED FONT_COLOR_DISABLED MAX_WIDTH [resolution] {RESOLUTION} @@ -36,7 +36,7 @@ font_size = {FONT_SIZE} font_style = {FONT_STYLE} text_alignment = "(text_alignment)" - colour = {FONT_COLOUR_ENABLED} + color = {FONT_COLOR_ENABLED} text = "(text)" text_markup = "(text_markup)" [/text] @@ -58,7 +58,7 @@ font_size = {FONT_SIZE} font_style = {FONT_STYLE} text_alignment = "(text_alignment)" - colour = {FONT_COLOUR_DISABLED} + color = {FONT_COLOR_DISABLED} text = "(text)" text_markup = "(text_markup)" [/text] @@ -70,7 +70,7 @@ [/resolution] #enddef -#define _GUI_DEFINITION ID DESCRIPTION FONT_SIZE FONT_STYLE FONT_COLOUR MAX_WIDTH +#define _GUI_DEFINITION ID DESCRIPTION FONT_SIZE FONT_STYLE FONT_COLOR MAX_WIDTH [label_definition] id = {ID} description = {DESCRIPTION} @@ -79,8 +79,8 @@ ({GUI_TINY__RESOLUTION}) ({GUI_TINY__FONT_SIZE__{FONT_SIZE}}) ({FONT_STYLE}) - ({GUI__FONT_COLOUR_ENABLED__{FONT_COLOUR}}) - ({GUI__FONT_COLOUR_DISABLED__{FONT_COLOUR}}) + ({GUI__FONT_COLOR_ENABLED__{FONT_COLOR}}) + ({GUI__FONT_COLOR_DISABLED__{FONT_COLOR}}) ({MAX_WIDTH}) } @@ -89,8 +89,8 @@ ({GUI_NORMAL__RESOLUTION}) ({GUI_NORMAL__FONT_SIZE__{FONT_SIZE}}) ({FONT_STYLE}) - ({GUI__FONT_COLOUR_ENABLED__{FONT_COLOUR}}) - ({GUI__FONT_COLOUR_DISABLED__{FONT_COLOUR}}) + ({GUI__FONT_COLOR_ENABLED__{FONT_COLOR}}) + ({GUI__FONT_COLOR_DISABLED__{FONT_COLOR}}) ({MAX_WIDTH}) } diff --git a/data/gui/default/widget/label_default.cfg b/data/gui/default/widget/label_default.cfg index be7baf4385c..cf9ce2e696c 100644 --- a/data/gui/default/widget/label_default.cfg +++ b/data/gui/default/widget/label_default.cfg @@ -6,7 +6,7 @@ ### - default, the one for general usage. ### - title, for titles in dialogs. -#define _GUI_RESOLUTION RESOLUTION FONT_SIZE FONT_STYLE FONT_COLOUR_ENABLED FONT_COLOUR_DISABLED Y_POSITION +#define _GUI_RESOLUTION RESOLUTION FONT_SIZE FONT_STYLE FONT_COLOR_ENABLED FONT_COLOR_DISABLED Y_POSITION [resolution] {RESOLUTION} @@ -35,7 +35,7 @@ maximum_width = "(width)" font_size = {FONT_SIZE} font_style = {FONT_STYLE} - colour = {FONT_COLOUR_ENABLED} + color = {FONT_COLOR_ENABLED} text = "(text)" text_markup = "(text_markup)" [/text] @@ -56,7 +56,7 @@ maximum_width = "(width)" font_size = {FONT_SIZE} font_style = {FONT_STYLE} - colour = {FONT_COLOUR_DISABLED} + color = {FONT_COLOR_DISABLED} text = "(text)" text_markup = "(text_markup)" [/text] @@ -68,7 +68,7 @@ [/resolution] #enddef -#define _GUI_DEFINITION ID DESCRIPTION FONT_SIZE FONT_STYLE FONT_COLOUR Y_POSITION +#define _GUI_DEFINITION ID DESCRIPTION FONT_SIZE FONT_STYLE FONT_COLOR Y_POSITION [label_definition] id = {ID} description = {DESCRIPTION} @@ -77,8 +77,8 @@ ({GUI_TINY__RESOLUTION}) ({GUI_TINY__FONT_SIZE__{FONT_SIZE}}) ({FONT_STYLE}) - ({GUI__FONT_COLOUR_ENABLED__{FONT_COLOUR}}) - ({GUI__FONT_COLOUR_DISABLED__{FONT_COLOUR}}) + ({GUI__FONT_COLOR_ENABLED__{FONT_COLOR}}) + ({GUI__FONT_COLOR_DISABLED__{FONT_COLOR}}) ({Y_POSITION}) } @@ -87,8 +87,8 @@ ({GUI_NORMAL__RESOLUTION}) ({GUI_NORMAL__FONT_SIZE__{FONT_SIZE}}) ({FONT_STYLE}) - ({GUI__FONT_COLOUR_ENABLED__{FONT_COLOUR}}) - ({GUI__FONT_COLOUR_DISABLED__{FONT_COLOUR}}) + ({GUI__FONT_COLOR_ENABLED__{FONT_COLOR}}) + ({GUI__FONT_COLOR_DISABLED__{FONT_COLOR}}) ({Y_POSITION}) } diff --git a/data/gui/default/widget/label_title_screen_revision.cfg b/data/gui/default/widget/label_title_screen_revision.cfg index 90158b52e4c..ff404330700 100644 --- a/data/gui/default/widget/label_title_screen_revision.cfg +++ b/data/gui/default/widget/label_title_screen_revision.cfg @@ -4,7 +4,7 @@ ### ### Defines the following revision label for the title screen. -#define _GUI_RESOLUTION RESOLUTION FONT_SIZE FONT_COLOUR_ENABLED FONT_COLOUR_DISABLED Y_POSITION +#define _GUI_RESOLUTION RESOLUTION FONT_SIZE FONT_COLOR_ENABLED FONT_COLOR_DISABLED Y_POSITION [resolution] {RESOLUTION} @@ -41,7 +41,7 @@ maximum_width = "(width)" font_size = {FONT_SIZE} text_alignment = "(text_alignment)" - colour = {FONT_COLOUR_ENABLED} + color = {FONT_COLOR_ENABLED} text = "(text)" text_markup = "(text_markup)" [/text] @@ -71,7 +71,7 @@ maximum_width = "(width)" font_size = {FONT_SIZE} text_alignment = "(text_alignment)" - colour = {FONT_COLOUR_DISABLED} + color = {FONT_COLOR_DISABLED} text = "(text)" text_markup = "(text_markup)" [/text] @@ -83,7 +83,7 @@ [/resolution] #enddef -#define _GUI_DEFINITION ID DESCRIPTION FONT_SIZE FONT_COLOUR Y_POSITION +#define _GUI_DEFINITION ID DESCRIPTION FONT_SIZE FONT_COLOR Y_POSITION [label_definition] id = {ID} description = {DESCRIPTION} @@ -91,8 +91,8 @@ {_GUI_RESOLUTION ({GUI_TINY__RESOLUTION}) ({GUI_TINY__FONT_SIZE__{FONT_SIZE}}) - ({GUI__FONT_COLOUR_ENABLED__{FONT_COLOUR}}) - ({GUI__FONT_COLOUR_DISABLED__{FONT_COLOUR}}) + ({GUI__FONT_COLOR_ENABLED__{FONT_COLOR}}) + ({GUI__FONT_COLOR_DISABLED__{FONT_COLOR}}) ({Y_POSITION}) } @@ -100,8 +100,8 @@ {_GUI_RESOLUTION ({GUI_NORMAL__RESOLUTION}) ({GUI_NORMAL__FONT_SIZE__{FONT_SIZE}}) - ({GUI__FONT_COLOUR_ENABLED__{FONT_COLOUR}}) - ({GUI__FONT_COLOUR_DISABLED__{FONT_COLOUR}}) + ({GUI__FONT_COLOR_ENABLED__{FONT_COLOR}}) + ({GUI__FONT_COLOR_DISABLED__{FONT_COLOR}}) ({Y_POSITION}) } diff --git a/data/gui/default/widget/listbox_default.cfg b/data/gui/default/widget/listbox_default.cfg index ae9e5859ed4..261335e5a79 100644 --- a/data/gui/default/widget/listbox_default.cfg +++ b/data/gui/default/widget/listbox_default.cfg @@ -7,7 +7,7 @@ ### but to show them they are kept here commented out. ### -#define _GUI_RESOLUTION RESOLUTION FONT_SIZE FONT_STYLE FONT_COLOUR_ENABLED FONT_COLOUR_DISABLED +#define _GUI_RESOLUTION RESOLUTION FONT_SIZE FONT_STYLE FONT_COLOR_ENABLED FONT_COLOR_DISABLED [resolution] {RESOLUTION} @@ -138,8 +138,8 @@ ({GUI_TINY__RESOLUTION}) ({GUI_TINY__FONT_SIZE__DEFAULT}) () - ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) - ({GUI__FONT_COLOUR_DISABLED__DEFAULT}) + ({GUI__FONT_COLOR_ENABLED__DEFAULT}) + ({GUI__FONT_COLOR_DISABLED__DEFAULT}) } @@ -147,8 +147,8 @@ ({GUI_NORMAL__RESOLUTION}) ({GUI_NORMAL__FONT_SIZE__DEFAULT}) () - ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) - ({GUI__FONT_COLOUR_DISABLED__DEFAULT}) + ({GUI__FONT_COLOR_ENABLED__DEFAULT}) + ({GUI__FONT_COLOR_DISABLED__DEFAULT}) } [/listbox_definition] @@ -161,8 +161,8 @@ ({GUI_TINY__RESOLUTION}) ({GUI_TINY__FONT_SIZE__DEFAULT}) () - ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) - ({GUI__FONT_COLOUR_DISABLED__DEFAULT}) + ({GUI__FONT_COLOR_ENABLED__DEFAULT}) + ({GUI__FONT_COLOR_DISABLED__DEFAULT}) } @@ -170,8 +170,8 @@ ({GUI_NORMAL__RESOLUTION}) ({GUI_NORMAL__FONT_SIZE__DEFAULT}) () - ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) - ({GUI__FONT_COLOUR_DISABLED__DEFAULT}) + ({GUI__FONT_COLOR_ENABLED__DEFAULT}) + ({GUI__FONT_COLOR_DISABLED__DEFAULT}) } [/horizontal_listbox_definition] diff --git a/data/gui/default/widget/listbox_wml_message.cfg b/data/gui/default/widget/listbox_wml_message.cfg index 716ff6f7930..626eacf4b1e 100644 --- a/data/gui/default/widget/listbox_wml_message.cfg +++ b/data/gui/default/widget/listbox_wml_message.cfg @@ -3,7 +3,7 @@ ### Definition of a listbox for wml message ### -#define _GUI_RESOLUTION RESOLUTION FONT_SIZE FONT_STYLE FONT_COLOUR_ENABLED FONT_COLOUR_DISABLED +#define _GUI_RESOLUTION RESOLUTION FONT_SIZE FONT_STYLE FONT_COLOR_ENABLED FONT_COLOR_DISABLED [resolution] {RESOLUTION} @@ -134,8 +134,8 @@ ({GUI_TINY__RESOLUTION}) ({GUI_TINY__FONT_SIZE__DEFAULT}) () - ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) - ({GUI__FONT_COLOUR_DISABLED__DEFAULT}) + ({GUI__FONT_COLOR_ENABLED__DEFAULT}) + ({GUI__FONT_COLOR_DISABLED__DEFAULT}) } @@ -143,8 +143,8 @@ ({GUI_NORMAL__RESOLUTION}) ({GUI_NORMAL__FONT_SIZE__DEFAULT}) () - ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) - ({GUI__FONT_COLOUR_DISABLED__DEFAULT}) + ({GUI__FONT_COLOR_ENABLED__DEFAULT}) + ({GUI__FONT_COLOR_DISABLED__DEFAULT}) } [/listbox_definition] diff --git a/data/gui/default/widget/progress_bar_default.cfg b/data/gui/default/widget/progress_bar_default.cfg index 17d6ec87588..753af16d8f8 100644 --- a/data/gui/default/widget/progress_bar_default.cfg +++ b/data/gui/default/widget/progress_bar_default.cfg @@ -30,7 +30,7 @@ w = "(width)" h = "(height)" border_thickness = 1 - border_colour = "188, 176, 136, 255" + border_color = "188, 176, 136, 255" [/rectangle] # Inner black border, with gray filling. @@ -40,8 +40,8 @@ w = "(width - 2)" h = "(height - 2)" border_thickness = 1 - border_colour = "0, 0, 0, 255" - fill_colour = "21, 22, 24, 255" + border_color = "0, 0, 0, 255" + fill_color = "21, 22, 24, 255" [/rectangle] # 3D effect at upper side. @@ -51,7 +51,7 @@ w = "(((width - 4) * percentage) / 100)" h = 2 border_thickness = 0 - fill_colour = "79, 103, 123, 255" + fill_color = "79, 103, 123, 255" [/rectangle] # Main bar @@ -61,7 +61,7 @@ w = "(((width - 4) * percentage) / 100)" h = "(height - 8)" border_thickness = 0 - fill_colour = "21, 53, 80, 255" + fill_color = "21, 53, 80, 255" [/rectangle] # 3D effect at lower side. @@ -71,7 +71,7 @@ w = "(((width - 4) * percentage) / 100)" h = 2 border_thickness = 0 - fill_colour = "10, 26, 40, 255" + fill_color = "10, 26, 40, 255" [/rectangle] [/draw] diff --git a/data/gui/default/widget/scroll_label_default.cfg b/data/gui/default/widget/scroll_label_default.cfg index 24ac059aced..59a9991a754 100644 --- a/data/gui/default/widget/scroll_label_default.cfg +++ b/data/gui/default/widget/scroll_label_default.cfg @@ -3,7 +3,7 @@ ### Definition of a scroll label. ### -#define _GUI_RESOLUTION RESOLUTION FONT_SIZE FONT_STYLE FONT_COLOUR_ENABLED FONT_COLOUR_DISABLED +#define _GUI_RESOLUTION RESOLUTION FONT_SIZE FONT_STYLE FONT_COLOR_ENABLED FONT_COLOR_DISABLED [resolution] {RESOLUTION} @@ -104,8 +104,8 @@ ({GUI_TINY__RESOLUTION}) ({GUI_TINY__FONT_SIZE__DEFAULT}) () - ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) - ({GUI__FONT_COLOUR_DISABLED__DEFAULT}) + ({GUI__FONT_COLOR_ENABLED__DEFAULT}) + ({GUI__FONT_COLOR_DISABLED__DEFAULT}) } @@ -113,8 +113,8 @@ ({GUI_NORMAL__RESOLUTION}) ({GUI_NORMAL__FONT_SIZE__DEFAULT}) () - ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) - ({GUI__FONT_COLOUR_DISABLED__DEFAULT}) + ({GUI__FONT_COLOR_ENABLED__DEFAULT}) + ({GUI__FONT_COLOR_DISABLED__DEFAULT}) } [/scroll_label_definition] diff --git a/data/gui/default/widget/scroll_label_wml_message.cfg b/data/gui/default/widget/scroll_label_wml_message.cfg index 371c1134328..4255279632d 100644 --- a/data/gui/default/widget/scroll_label_wml_message.cfg +++ b/data/gui/default/widget/scroll_label_wml_message.cfg @@ -3,7 +3,7 @@ ### Definition of a scroll label for the wml_message. ### -#define _GUI_RESOLUTION RESOLUTION FONT_SIZE FONT_STYLE FONT_COLOUR_ENABLED FONT_COLOUR_DISABLED +#define _GUI_RESOLUTION RESOLUTION FONT_SIZE FONT_STYLE FONT_COLOR_ENABLED FONT_COLOR_DISABLED [resolution] {RESOLUTION} @@ -104,8 +104,8 @@ ({GUI_TINY__RESOLUTION}) ({GUI_TINY__FONT_SIZE__DEFAULT}) () - ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) - ({GUI__FONT_COLOUR_DISABLED__DEFAULT}) + ({GUI__FONT_COLOR_ENABLED__DEFAULT}) + ({GUI__FONT_COLOR_DISABLED__DEFAULT}) } @@ -113,8 +113,8 @@ ({GUI_NORMAL__RESOLUTION}) ({GUI_NORMAL__FONT_SIZE__DEFAULT}) () - ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) - ({GUI__FONT_COLOUR_DISABLED__DEFAULT}) + ({GUI__FONT_COLOR_ENABLED__DEFAULT}) + ({GUI__FONT_COLOR_DISABLED__DEFAULT}) } [/scroll_label_definition] diff --git a/data/gui/default/widget/slider_default.cfg b/data/gui/default/widget/slider_default.cfg index 2764bd62e73..f100f3afa26 100644 --- a/data/gui/default/widget/slider_default.cfg +++ b/data/gui/default/widget/slider_default.cfg @@ -3,7 +3,7 @@ ### Definition of a slider. ### -#define _GUI_STATE IMAGE_SUFFIX GROOVE_COLOUR TEXT_COLOUR RIGHT_OFFSET TEXT_OFFSET TEXT_WIDTH FONT_SIZE +#define _GUI_STATE IMAGE_SUFFIX GROOVE_COLOR TEXT_COLOR RIGHT_OFFSET TEXT_OFFSET TEXT_WIDTH FONT_SIZE [draw] # @@ -16,7 +16,7 @@ x2 = "(width - ({RIGHT_OFFSET} + 1))" y2 = "(height / 2)" - colour = {GROOVE_COLOUR} + color = {GROOVE_COLOR} thickness = 1 [/line] @@ -31,7 +31,7 @@ h = "(height)" font_size = {FONT_SIZE} - colour = {TEXT_COLOUR} + color = {TEXT_COLOR} text = "(text)" [/text] @@ -74,8 +74,8 @@ [state_enabled] {_GUI_STATE () - ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) - ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) + ({GUI__FONT_COLOR_ENABLED__DEFAULT}) + ({GUI__FONT_COLOR_ENABLED__DEFAULT}) ({RIGHT_OFFSET}) ({TEXT_OFFSET}) ({TEXT_WIDTH}) @@ -86,8 +86,8 @@ [state_disabled] {_GUI_STATE "-disabled" - ({GUI__FONT_COLOUR_DISABLED__DEFAULT}) - ({GUI__FONT_COLOUR_DISABLED__DEFAULT}) + ({GUI__FONT_COLOR_DISABLED__DEFAULT}) + ({GUI__FONT_COLOR_DISABLED__DEFAULT}) ({RIGHT_OFFSET}) ({TEXT_OFFSET}) ({TEXT_WIDTH}) @@ -98,8 +98,8 @@ [state_pressed] {_GUI_STATE "-selected" - ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) - ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) + ({GUI__FONT_COLOR_ENABLED__DEFAULT}) + ({GUI__FONT_COLOR_ENABLED__DEFAULT}) ({RIGHT_OFFSET}) ({TEXT_OFFSET}) ({TEXT_WIDTH}) @@ -110,8 +110,8 @@ [state_focussed] {_GUI_STATE "-active" - ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) - ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) + ({GUI__FONT_COLOR_ENABLED__DEFAULT}) + ({GUI__FONT_COLOR_ENABLED__DEFAULT}) ({RIGHT_OFFSET}) ({TEXT_OFFSET}) ({TEXT_WIDTH}) diff --git a/data/gui/default/widget/text_box_default.cfg b/data/gui/default/widget/text_box_default.cfg index c6f0cd0b9b8..a972cacc35e 100644 --- a/data/gui/default/widget/text_box_default.cfg +++ b/data/gui/default/widget/text_box_default.cfg @@ -3,7 +3,7 @@ ### Definition of a single line text box. ### -#define _GUI_DRAW_BORDER COLOUR +#define _GUI_DRAW_BORDER COLOR [rectangle] x = 0 y = 0 @@ -11,7 +11,7 @@ h = "(height)" border_thickness = 3 - border_colour = "55, 55, 55, 192" + border_color = "55, 55, 55, 192" [/rectangle] @@ -22,12 +22,12 @@ h = "(if(height < 2, 0, height - 2))" border_thickness = 1 - border_colour = {COLOUR} + border_color = {COLOR} [/rectangle] #enddef -#define _GUI_DRAW_TEXT SIZE COLOUR +#define _GUI_DRAW_TEXT SIZE COLOR [rectangle] x = "(text_x_offset + selection_offset)" y = "(text_y_offset)" @@ -35,7 +35,7 @@ h = "(text_font_height)" border_thickness = 0 - fill_colour = "21, 53, 80, 255" + fill_color = "21, 53, 80, 255" [/rectangle] @@ -46,7 +46,7 @@ h = "(text_height)" maximum_width = "(text_maximum_width)" font_size = {SIZE} - colour = {COLOUR} + color = {COLOR} text = "(text)" [/text] #enddef @@ -57,7 +57,7 @@ y1 = "(text_y_offset)" x2 = "(cursor_offset + {X_OFFSET})" y2 = "(text_y_offset + text_font_height)" - colour = "255, 255, 255, 255" + color = "255, 255, 255, 255" thickness = 1 [/line] #enddef @@ -85,9 +85,9 @@ [draw] - {_GUI_DRAW_BORDER ({GUI__FONT_COLOUR_ENABLED__TITLE}) } + {_GUI_DRAW_BORDER ({GUI__FONT_COLOR_ENABLED__TITLE}) } - {_GUI_DRAW_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) } + {_GUI_DRAW_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__DEFAULT}) } [/draw] @@ -97,9 +97,9 @@ [draw] - {_GUI_DRAW_BORDER ({GUI__FONT_COLOUR_DISABLED__TITLE}) } + {_GUI_DRAW_BORDER ({GUI__FONT_COLOR_DISABLED__TITLE}) } - {_GUI_DRAW_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOUR_DISABLED__DEFAULT}) } + {_GUI_DRAW_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_DISABLED__DEFAULT}) } [/draw] @@ -109,9 +109,9 @@ [draw] - {_GUI_DRAW_BORDER ({GUI__FONT_COLOUR_ENABLED__TITLE}) } + {_GUI_DRAW_BORDER ({GUI__FONT_COLOR_ENABLED__TITLE}) } - {_GUI_DRAW_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) } + {_GUI_DRAW_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__DEFAULT}) } {_GUI_DRAW_CURSOR ({X_OFFSET}) } diff --git a/data/gui/default/widget/toggle_button_default.cfg b/data/gui/default/widget/toggle_button_default.cfg index 3140ac1c13d..88971401957 100644 --- a/data/gui/default/widget/toggle_button_default.cfg +++ b/data/gui/default/widget/toggle_button_default.cfg @@ -4,14 +4,14 @@ ### Since for this class 'default' is a bit hard we now use the checkbox as default. ### -#define _GUI_TEXT X_OFFSET FONT_SIZE FONT_COLOUR +#define _GUI_TEXT X_OFFSET FONT_SIZE FONT_COLOR [text] x = {X_OFFSET} y = {GUI__TEXT_VERTICALLY_CENTRED} w = "(if(width < {X_OFFSET}, 0, width - {X_OFFSET}))" h = "(text_height)" font_size = {FONT_SIZE} - colour = {FONT_COLOUR} + color = {FONT_COLOR} text = "(text)" [/text] #enddef @@ -41,7 +41,7 @@ name = "buttons/checkbox.png" [/image] - {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOUR_ENABLED__TITLE}) } + {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__TITLE}) } [/draw] @@ -55,7 +55,7 @@ name = "buttons/checkbox.png" [/image] - {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOUR_DISABLED__TITLE}) } + {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_DISABLED__TITLE}) } [/draw] @@ -69,7 +69,7 @@ name = "buttons/checkbox-active.png" [/image] - {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOUR_ENABLED__TITLE}) } + {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__TITLE}) } [/draw] @@ -87,7 +87,7 @@ name = "buttons/checkbox-pressed.png" [/image] - {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOUR_ENABLED__TITLE}) } + {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__TITLE}) } [/draw] @@ -101,7 +101,7 @@ name = "buttons/checkbox-pressed.png" [/image] - {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOUR_DISABLED__TITLE}) } + {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_DISABLED__TITLE}) } [/draw] @@ -115,7 +115,7 @@ name = "buttons/checkbox-active-pressed.png" [/image] - {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOUR_ENABLED__TITLE}) } + {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__TITLE}) } [/draw] diff --git a/data/gui/default/widget/toggle_button_listbox_text.cfg b/data/gui/default/widget/toggle_button_listbox_text.cfg index 9b437b124ec..e6d082fecc0 100644 --- a/data/gui/default/widget/toggle_button_listbox_text.cfg +++ b/data/gui/default/widget/toggle_button_listbox_text.cfg @@ -5,17 +5,17 @@ ### version doesn't support icons. ### -#define _GUI_RECT FILL_COLOUR +#define _GUI_RECT FILL_COLOR [rectangle] x = 0 y = 0 w = "(width)" h = "(height)" - fill_colour = {FILL_COLOUR} + fill_color = {FILL_COLOR} [/rectangle] #enddef -#define _GUI_DRAW_TEXT FONT_SIZE FONT_COLOUR +#define _GUI_DRAW_TEXT FONT_SIZE FONT_COLOR [text] x = 3 y = {GUI__TEXT_VERTICALLY_CENTRED} @@ -23,7 +23,7 @@ h = "(text_height)" maximum_width = "(if(width < 6, 0, width - 6))" font_size = {FONT_SIZE} - colour = {FONT_COLOUR} + color = {FONT_COLOR} text = "(text)" [/text] #enddef @@ -50,8 +50,8 @@ [draw] - {_GUI_RECT ({GUI__BACKGROUND_COLOUR_ENABLED}) } - {_GUI_DRAW_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) } + {_GUI_RECT ({GUI__BACKGROUND_COLOR_ENABLED}) } + {_GUI_DRAW_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__DEFAULT}) } [/draw] @@ -61,8 +61,8 @@ [draw] - {_GUI_RECT ({GUI__BACKGROUND_COLOUR_DISABLED}) } - {_GUI_DRAW_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOUR_DISABLED__DEFAULT}) } + {_GUI_RECT ({GUI__BACKGROUND_COLOR_DISABLED}) } + {_GUI_DRAW_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_DISABLED__DEFAULT}) } [/draw] @@ -72,8 +72,8 @@ [draw] - {_GUI_RECT ({GUI__BACKGROUND_COLOUR_ENABLED}) } - {_GUI_DRAW_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) } + {_GUI_RECT ({GUI__BACKGROUND_COLOR_ENABLED}) } + {_GUI_DRAW_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__DEFAULT}) } [/draw] @@ -88,7 +88,7 @@ [draw] {GUI__LISTBOX_SELECTED_CELL} - {_GUI_DRAW_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) } + {_GUI_DRAW_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__DEFAULT}) } [/draw] @@ -99,7 +99,7 @@ [draw] {GUI__LISTBOX_SELECTED_CELL} - {_GUI_DRAW_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) } + {_GUI_DRAW_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__DEFAULT}) } [/draw] @@ -110,7 +110,7 @@ [draw] {GUI__LISTBOX_SELECTED_CELL} - {_GUI_DRAW_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) } + {_GUI_DRAW_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__DEFAULT}) } [/draw] diff --git a/data/gui/default/widget/toggle_button_listbox_text_with_icon.cfg b/data/gui/default/widget/toggle_button_listbox_text_with_icon.cfg index 21b56283a97..29294491ad7 100644 --- a/data/gui/default/widget/toggle_button_listbox_text_with_icon.cfg +++ b/data/gui/default/widget/toggle_button_listbox_text_with_icon.cfg @@ -5,13 +5,13 @@ ### version supports icons with size 72 x 72. ### -#define _GUI_RECT FILL_COLOUR +#define _GUI_RECT FILL_COLOR [rectangle] x = 0 y = 0 w = "(width)" h = "(height)" - fill_colour = {FILL_COLOUR} + fill_color = {FILL_COLOR} [/rectangle] #enddef @@ -23,14 +23,14 @@ [/image] #enddef -#define _GUI_TEXT OFFSET FONT_SIZE FONT_COLOUR +#define _GUI_TEXT OFFSET FONT_SIZE FONT_COLOR [text] x = {OFFSET} y = {GUI__TEXT_VERTICALLY_CENTRED} w = "(if(width < {OFFSET}, 0, width - {OFFSET}))" h = "(text_height)" font_size = {FONT_SIZE} - colour = {FONT_COLOUR} + color = {FONT_COLOR} text = "(text)" [/text] #enddef @@ -57,9 +57,9 @@ [draw] - {_GUI_RECT ({GUI__BACKGROUND_COLOUR_ENABLED}) } + {_GUI_RECT ({GUI__BACKGROUND_COLOR_ENABLED}) } {_GUI_ICON ({ICON_OFFSET}) } - {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) } + {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__DEFAULT}) } [/draw] @@ -69,9 +69,9 @@ [draw] - {_GUI_RECT ({GUI__BACKGROUND_COLOUR_DISABLED}) } + {_GUI_RECT ({GUI__BACKGROUND_COLOR_DISABLED}) } {_GUI_ICON ({ICON_OFFSET}) } - {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOUR_DISABLED__DEFAULT}) } + {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_DISABLED__DEFAULT}) } [/draw] @@ -81,9 +81,9 @@ [draw] - {_GUI_RECT ({GUI__BACKGROUND_COLOUR_ENABLED}) } + {_GUI_RECT ({GUI__BACKGROUND_COLOR_ENABLED}) } {_GUI_ICON ({ICON_OFFSET}) } - {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) } + {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__DEFAULT}) } [/draw] @@ -99,7 +99,7 @@ {GUI__LISTBOX_SELECTED_CELL} {_GUI_ICON ({ICON_OFFSET}) } - {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) } + {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__DEFAULT}) } [/draw] @@ -111,7 +111,7 @@ {GUI__LISTBOX_SELECTED_CELL} {_GUI_ICON ({ICON_OFFSET}) } - {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOUR_DISABLED__DEFAULT}) } + {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_DISABLED__DEFAULT}) } [/draw] @@ -123,7 +123,7 @@ {GUI__LISTBOX_SELECTED_CELL} {_GUI_ICON ({ICON_OFFSET}) } - {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) } + {_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__DEFAULT}) } [/draw] diff --git a/data/gui/default/widget/toggle_panel_default.cfg b/data/gui/default/widget/toggle_panel_default.cfg index ce9e09e3e08..87c66a1de54 100644 --- a/data/gui/default/widget/toggle_panel_default.cfg +++ b/data/gui/default/widget/toggle_panel_default.cfg @@ -3,13 +3,13 @@ ### Definition of the default toggle panel. ### -#define _GUI_RECT FILL_COLOUR +#define _GUI_RECT FILL_COLOR [rectangle] x = 0 y = 0 w = "(width)" h = "(height)" - fill_colour = {FILL_COLOUR} + fill_color = {FILL_COLOR} [/rectangle] #enddef @@ -32,7 +32,7 @@ [state_enabled] [draw] - {_GUI_RECT ({GUI__BACKGROUND_COLOUR_ENABLED}) } + {_GUI_RECT ({GUI__BACKGROUND_COLOR_ENABLED}) } [/draw] [/state_enabled] @@ -40,7 +40,7 @@ [state_disabled] [draw] - {_GUI_RECT ({GUI__BACKGROUND_COLOUR_DISABLED}) } + {_GUI_RECT ({GUI__BACKGROUND_COLOR_DISABLED}) } [/draw] [/state_disabled] @@ -48,7 +48,7 @@ [state_focussed] [draw] - {_GUI_RECT ({GUI__BACKGROUND_COLOUR_ENABLED}) } + {_GUI_RECT ({GUI__BACKGROUND_COLOR_ENABLED}) } [/draw] [/state_focussed] diff --git a/data/gui/default/widget/tooltip_default.cfg b/data/gui/default/widget/tooltip_default.cfg index 7e50fd2ac77..0c5c75b1109 100644 --- a/data/gui/default/widget/tooltip_default.cfg +++ b/data/gui/default/widget/tooltip_default.cfg @@ -29,7 +29,7 @@ w = "(width)" h = "(height)" border_thickness = 0 - fill_colour = "0, 0, 0, 187" + fill_color = "0, 0, 0, 187" [/rectangle] [text] @@ -38,7 +38,7 @@ w = "(text_width)" h = "(text_height)" font_size = {FONT_SIZE} - colour = {GUI__FONT_COLOUR_ENABLED__DEFAULT} + color = {GUI__FONT_COLOR_ENABLED__DEFAULT} text = "(text)" [/text] diff --git a/data/gui/default/widget/tree_view_default.cfg b/data/gui/default/widget/tree_view_default.cfg index df2c146d290..86ea07d7b76 100644 --- a/data/gui/default/widget/tree_view_default.cfg +++ b/data/gui/default/widget/tree_view_default.cfg @@ -3,7 +3,7 @@ ### Definition of a tree view ### -#define _GUI_RESOLUTION RESOLUTION FONT_SIZE FONT_STYLE FONT_COLOUR_ENABLED FONT_COLOUR_DISABLED +#define _GUI_RESOLUTION RESOLUTION FONT_SIZE FONT_STYLE FONT_COLOR_ENABLED FONT_COLOR_DISABLED [resolution] {RESOLUTION} @@ -90,8 +90,8 @@ ({GUI_TINY__RESOLUTION}) ({GUI_TINY__FONT_SIZE__DEFAULT}) () - ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) - ({GUI__FONT_COLOUR_DISABLED__DEFAULT}) + ({GUI__FONT_COLOR_ENABLED__DEFAULT}) + ({GUI__FONT_COLOR_DISABLED__DEFAULT}) } @@ -99,8 +99,8 @@ ({GUI_NORMAL__RESOLUTION}) ({GUI_NORMAL__FONT_SIZE__DEFAULT}) () - ({GUI__FONT_COLOUR_ENABLED__DEFAULT}) - ({GUI__FONT_COLOUR_DISABLED__DEFAULT}) + ({GUI__FONT_COLOR_ENABLED__DEFAULT}) + ({GUI__FONT_COLOR_DISABLED__DEFAULT}) } [/tree_view_definition] diff --git a/data/gui/default/window/debug_clock.cfg b/data/gui/default/window/debug_clock.cfg index d79cecf8443..666146069ee 100644 --- a/data/gui/default/window/debug_clock.cfg +++ b/data/gui/default/window/debug_clock.cfg @@ -12,7 +12,7 @@ h = 20 w = 30 font_size = 10 - colour = "255,255,255,255" + color = "255,255,255,255" text = "{TEXT}" [/text] #enddef @@ -222,7 +222,7 @@ y1 = 125 x2 = "(round(125 + (90.0 * sin(360.0 * second / 60.0))))" y2 = "(round(125 - (90.0 * cos(360.0 * second / 60.0))))" - colour = "255,255,255,255" + color = "255,255,255,255" [/line] [line] @@ -230,7 +230,7 @@ y1 = 125 x2 = "(round(125 + (70.0 * sin(360.0 * minute / (60.0 * 60.0)))))" y2 = "(round(125 - (70.0 * cos(360.0 * minute / (60.0 * 60.0)))))" - colour = "128,128,128,255" + color = "128,128,128,255" [/line] [line] @@ -238,7 +238,7 @@ y1 = 125 x2 = "(round(125 + (40.0 * sin(360.0 * hour / (60.0 * 60.0 * 24.0)))))" y2 = "(round(125 - (40.0 * cos(360.0 * hour / (60.0 * 60.0 * 24.0)))))" - colour = "64,64,64,255" + color = "64,64,64,255" [/line] # Show the time as string. @@ -251,7 +251,7 @@ font_size = 20 maximum_width = "(width)" text_alignment = "center" - colour = "128,128,128,255" + color = "128,128,128,255" text = "(concatenate( substring(concatenate(0, 0, (hour / (60 * 60))), -2) , ':' @@ -314,7 +314,7 @@ x2 = "(width - 1)" y2 = "(height / 2)" - colour = {GUI__FONT_COLOUR_ENABLED__DEFAULT} + color = {GUI__FONT_COLOR_ENABLED__DEFAULT} thickness = 1 [/line]