theme update for modern and rename themes

include new definitions and updated versions of existing definitions
"default/classic" and "modern" has been renamed to "Parchment" and "Celes" to avoid confusion
This commit is contained in:
Subhraman Sarkar 2024-12-14 16:29:05 +05:30
parent 7d7716edff
commit 6b8c2e15e7
211 changed files with 2292 additions and 244 deletions

View File

@ -12,6 +12,8 @@
* Updated translations: Bengali, British English, Hungarian
### Units
### User interface
* The Modern theme has been renamed to Celes and received design updates to the titlescreen and common UI controls. The Default theme has been renamed to Parchment.
* A preference to show/hide the tips panel on titlescreen has been added under Display preferences (id `show_tips`). In the Celes theme, it can also be hidden by clicking the cross button located at the top-right of the panel.
### WML Engine
* [variables] in [side] no longer sets variables of the implicit leader unit (it now only sets the sides variables), to create a leader unit with variables, [leader] must be used instead. (issue #3742)
### Miscellaneous and Bug Fixes

View File

@ -4,5 +4,5 @@
# Default Theme, Wesnoth Classic
{./themes/default/default.cfg}
# Wesnoth Modern
{./themes/modern/modern.cfg}
# Wesnoth Blue Sky Theme
{./themes/celes/celes.cfg}

View File

@ -3,11 +3,11 @@
### Defines a gui, all widgets and windows used in a certain 'theme'.
###
### Definition of the modern theme
### Definition of the Celes theme
[gui]
id = "modern"
description = "Modern"
description = "Celes"
[settings]
popup_show_delay = 200
@ -27,8 +27,6 @@
{tips.cfg}
# {gui/macros/}
{gui/themes/modern/widgets}
{gui/themes/modern/dialogs}
{gui/themes/celes/widgets}
{gui/themes/celes/dialogs}
[/gui]

View File

@ -98,66 +98,81 @@ where
definition = "title"
[grid]
[row]
[column]
border = "all"
border_size = 10
[grid]
[row]
[multi_page]
id = "tips"
definition = "default"
[column]
border = "all"
border_size = 5
[page_definition]
[multi_page]
id = "tips"
definition = "default"
[row]
grow_factor = 1
[page_definition]
[column]
border = "all"
border_size = 5
horizontal_grow = true
vertical_grow = true
[row]
grow_factor = 1
[label]
id = "tip"
definition = "title_screen_tip"
[column]
border = "all"
border_size = 5
horizontal_grow = true
vertical_grow = true
wrap = true
[/label]
[label]
id = "tip"
definition = "title_screen_tip"
[/column]
wrap = true
[/label]
[/row]
[/column]
[row]
[/row]
[column]
border = "all"
border_size = 5
horizontal_grow = true
[row]
[label]
id = "source"
definition = "title_screen_tip"
[column]
border = "all"
border_size = 5
horizontal_grow = true
text_alignment = "right"
wrap = true
[/label]
[label]
id = "source"
definition = "title_screen_tip"
[/column]
text_alignment = "right"
wrap = true
[/label]
[/row]
[/column]
[/page_definition]
[/row]
[/multi_page]
[/page_definition]
[/multi_page]
[/column]
[column]
border_size = 0
horizontal_alignment = "right"
vertical_alignment = "top"
[button]
id = "close"
definition = "close"
[/button]
[/column]
[/row]
[/grid]
[/column]
[/row]
[row]
[column]
@ -169,20 +184,6 @@ where
[row]
[column]
border = "all"
border_size = 5
horizontal_alignment = "left"
[button]
id = "help"
definition = "titlescreen_button_noicon"
label = _ "Help"
tooltip = _"Show Battle for Wesnoth help"
[/button]
[/column]
[column]
border = "all"
border_size = 5
@ -228,46 +229,68 @@ where
#define _GUI_BUTTON ID CAPTION TOOLTIP
#arg DEFINITION
"large_title"
#endarg
#arg DEF
"title_small" #endarg
[row]
grow_factor = 0
[column]
border = "all"
border_size = 5
horizontal_grow = true
grow_factor = 0
horizontal_alignment = "center"
vertical_alignment = "center"
[button]
id = {ID}
definition = {DEFINITION}
definition = {DEF}
label = {CAPTION}
tooltip = {TOOLTIP}
[/button]
[/column]
[/row]
#enddef
#define _GUI_MENU_SECTION
[panel]
definition = title
[grid]
{_GUI_BUTTON "campaign" _"Campaigns" _"Start a new single player campaign"}
{_GUI_BUTTON "multiplayer" _"Multiplayer" _"Play multiplayer (hotseat, LAN, or Internet), or a single scenario against the AI"}
{_GUI_BUTTON "load" _"Load" _"Load a saved game"}
{_GUI_BUTTON "addons" _"Add-ons" _"Download usermade campaigns, eras, or map packs" DEFINITION="small_title"}
{_GUI_BUTTON "achievements" _"Achievements" _"View achievements" DEFINITION="small_title"}
{_GUI_BUTTON "editor" _"Map Editor" _"Start the map editor" DEFINITION="small_title"}
{_GUI_BUTTON "community" _"Community" _"Places to talk about Wesnoth" DEFINITION="small_title"}
{_GUI_BUTTON "preferences" _"Preferences" _"Configure the games settings" DEFINITION="small_title"}
{_GUI_BUTTON "quit" _"Quit" _"Quit the game" DEFINITION="small_title"}
# This debug feature doesn't need to be translated, so put it in the test textdomain.
#textdomain wesnoth-test
{_GUI_BUTTON "clock" _"Clock" _"Show debug clock" DEFINITION="small_title"}
{_GUI_BUTTON "test_dialog" _"Test Dialog" _"Show GUI Test Dialog" DEFINITION="small_title"}
#textdomain wesnoth-lib
[row]
[column]
horizontal_alignment = "center"
vertical_alignment = "center"
[grid]
[row]
grow_factor = 0
[column]
[image]
id = "panel_icon"
definition = "default"
[/image]
[/column]
[/row]
[row]
grow_factor = 0
{_GUI_V_SPACER 20}
[/row]
{_GUI_BUTTON "campaign" _"Campaigns" _"Start a new single player campaign" DEF="title_normal"}
{_GUI_BUTTON "multiplayer" _"Multiplayer" _"Play multiplayer (hotseat, LAN, or Internet), or a single scenario against the AI" DEF="title_normal"}
{_GUI_BUTTON "load" _"Load" _"Load a saved game" DEF="title_normal"}
{_GUI_BUTTON "addons" _"Add-ons" _"Download usermade campaigns, eras, or map packs"}
{_GUI_BUTTON "achievements" _"Achievements" _"View achievements"}
{_GUI_BUTTON "editor" _"Map Editor" _"Start the map editor"}
{_GUI_BUTTON "community" _"Community" _"Places to talk about Wesnoth"}
{_GUI_BUTTON "preferences" _"Preferences" _"Configure the games settings"}
{_GUI_BUTTON "help" _"Help" _"Visit the in-game help"}
{_GUI_BUTTON "quit" _"Quit" _"Quit the game"}
# This debug feature doesn't need to be translated, so put it in the test textdomain.
#textdomain wesnoth-test
{_GUI_BUTTON "clock" _"Clock" _"Show debug clock"}
{_GUI_BUTTON "test_dialog" _"Test Dialog" _"Show GUI Test Dialog"}
#textdomain wesnoth-lib
[/grid]
[/column]
[/row]
[/grid]
[/panel]
#enddef
[window]
@ -309,8 +332,8 @@ where
[/row]
[row]
grow_factor = 1
grow_factor = 1
[column]
vertical_alignment = "top"
@ -367,8 +390,6 @@ where
grow_factor = 0
horizontal_alignment = "left"
[spacer]
# Should be as large as the about button on the
# foreground layer.
width = 25
height = 25
[/spacer]
@ -391,19 +412,76 @@ where
[row]
[column]
border = all
border_size = 10
horizontal_alignment = "center"
vertical_alignment = "center"
border = "left"
border_size = 50
horizontal_alignment = "left"
vertical_grow = true
{_GUI_MENU_SECTION}
[/column]
[column]
border = "left,bottom"
border_size = 10
vertical_alignment = "bottom"
horizontal_alignment = "right"
{_GUI_TIP_SECTION}
[grid]
[row]
[column]
{_GUI_TIP_SECTION}
[/column]
[/row]
[row]
[column]
border = "all"
border_size = 10
vertical_alignment = "bottom"
horizontal_alignment = "right"
[grid]
[row]
[column]
grow_factor = 1
horizontal_alignment = "left"
border = "right"
border_size = 5
[label]
id = "revision_number"
definition = "default_outline"
[/label]
[/column]
[column]
grow_factor = 0
horizontal_alignment = "left"
border = "left,right"
border_size = 5
[button]
id = "about"
definition = "titlescreen_about"
label = _ "About"
tooltip = _ "General information about Battle for Wesnoth"
[/button]
[/column]
[column]
grow_factor = 0
horizontal_alignment = "right"
border = "right"
border_size = 5
[button]
id = "language"
definition = "titlescreen_language"
label = _ "Language"
tooltip = _ "Change the language"
[/button]
[/column]
[/row]
[/grid]
[/column]
[/row]
[/grid]
[/column]
[/row]
@ -416,59 +494,6 @@ where
[/row]
[row]
[column]
horizontal_grow = true
vertical_alignment = "bottom"
border = "bottom,left,right"
border_size = 10
[grid]
[row]
[column]
grow_factor = 0
horizontal_alignment = "left"
[button]
id = "about"
definition = "titlescreen_about"
label = _ "About"
tooltip = _ "General information about Battle for Wesnoth"
[/button]
[/column]
[column]
grow_factor = 1
horizontal_alignment = "left"
border = "left"
border_size = 5
[label]
id = "revision_number"
definition = "default_outline"
[/label]
[/column]
[column]
grow_factor = 0
horizontal_alignment = "right"
[button]
id = "language"
definition = "titlescreen_language"
label = _ "Language"
tooltip = _ "Change the language"
[/button]
[/column]
[/row]
[/grid]
[/column]
[/row]
[/grid]

View File

@ -0,0 +1,23 @@
# This white color is used for most texts.
#define GUI__FONT_COLOR_ENABLED__WHITE
#arg ALPHA
255 #endarg
"255, 255, 255, {ALPHA}" #enddef
# This gray color is used for most text when the widget is disabled.
#define GUI__FONT_COLOR_DISABLED__WHITE
#arg ALPHA
255 #endarg
"128, 128, 128, {ALPHA}" #enddef
# This golden yellow color is used for titles.
#define GUI__FONT_COLOR_ENABLED__BRIGHT
#arg ALPHA
255 #endarg
"255, 225, 104, {ALPHA}" #enddef
# This gray color is used for most text when the widget is disabled.
#define GUI__FONT_COLOR_DISABLED__BRIGHT
#arg ALPHA
255 #endarg
"255, 225, 104, {ALPHA}" #enddef

View File

@ -5,15 +5,14 @@
#define _GUI_BUTTON_TEXT FONT_SIZE FONT_STYLE FONT_COLOR
#arg X
0
#endarg
0 #endarg
[text]
x = "({X} + max((width - text_width) / 2, 0))"
y = "(max((height - text_height - 2) / 2, 0))"
w = "(text_width)" # 10 px padding right
w = "(text_width)"
h = "(text_height)"
maximum_width = "(text_width)" # 10 px padding right
maximum_width = "(text_width)"
font_size = {FONT_SIZE}
font_style = {FONT_STYLE}
color = {FONT_COLOR}
@ -37,8 +36,7 @@
#define _GUI_RESOLUTION RESOLUTION MIN_WIDTH DEFAULT_WIDTH HEIGHT EXTRA_WIDTH EXTRA_HEIGHT FONT_SIZE ICON IPF ALPHA
#arg X
0
#endarg
0 #endarg
[resolution]
@ -66,12 +64,12 @@
y = 0
w = "(width)"
h = "(height)"
name = "buttons/button_normal/modern/background.png{IPF}"
name = "buttons/modern/normal/background.png{IPF}"
[/image]
{_GUI_BUTTON_ICON {ICON} {IPF}}
{_GUI_BUTTON_TEXT ({FONT_SIZE}) ("bold") ("255, 255, 255, 255") X={X}}
{_GUI_BUTTON_TEXT ({FONT_SIZE}) ("bold") ({GUI__FONT_COLOR_ENABLED__WHITE}) X={X}}
[/draw]
@ -86,12 +84,12 @@
y = 0
w = "(width)"
h = "(height)"
name = "buttons/button_normal/modern/background.png~GS(){IPF}"
name = "buttons/modern/normal/background.png~GS(){IPF}"
[/image]
{_GUI_BUTTON_ICON {ICON} "~GS(){IPF}"}
{_GUI_BUTTON_TEXT ({FONT_SIZE}) ("bold") ("255, 255, 255, 255") X={X}}
{_GUI_BUTTON_TEXT ({FONT_SIZE}) ("bold") ({GUI__FONT_COLOR_DISABLED__WHITE}) X={X}}
[/draw]
@ -106,12 +104,12 @@
y = 0
w = "(width)"
h = "(height)"
name = "buttons/button_normal/modern/background-pressed.png{IPF}"
name = "buttons/modern/normal/background-pressed.png{IPF}"
[/image]
{_GUI_BUTTON_ICON {ICON} {IPF}}
{_GUI_BUTTON_TEXT ({FONT_SIZE}) ("bold") ("180, 140, 0, 255") X={X}}
{_GUI_BUTTON_TEXT ({FONT_SIZE}) ("bold") ({GUI__FONT_COLOR_ENABLED__WHITE}) X={X}}
[/draw]
@ -126,12 +124,12 @@
y = 0
w = "(width)"
h = "(height)"
name = "buttons/button_normal/modern/background-active.png{IPF}"
name = "buttons/modern/normal/background-active.png{IPF}"
[/image]
{_GUI_BUTTON_ICON {ICON}-active {IPF}}
{_GUI_BUTTON_TEXT ({FONT_SIZE}) ("bold") ("255, 200, 0, 255") X={X}}
{_GUI_BUTTON_TEXT ({FONT_SIZE}) ("bold") ({GUI__FONT_COLOR_ENABLED__WHITE}) X={X}}
[/draw]
@ -168,7 +166,7 @@
y = 0
w = "(width)"
h = "(height)"
name = "buttons/button_normal/modern/background.png{IPF}"
name = "buttons/modern/normal/background.png{IPF}"
[/image]
{_GUI_BUTTON_TEXT ({FONT_SIZE}) ("bold") ("255, 255, 255, 255")}
@ -186,7 +184,7 @@
y = 0
w = "(width)"
h = "(height)"
name = "buttons/button_normal/modern/background.png~GS(){IPF}"
name = "buttons/modern/normal/background.png~GS(){IPF}"
[/image]
{_GUI_BUTTON_TEXT ({FONT_SIZE}) ("bold") ("255, 255, 255, 255")}
@ -204,7 +202,7 @@
y = 0
w = "(width)"
h = "(height)"
name = "buttons/button_normal/modern/background-pressed.png{IPF}"
name = "buttons/modern/normal/background-pressed.png{IPF}"
[/image]
{_GUI_BUTTON_TEXT ({FONT_SIZE}) ("bold") ("180, 140, 0, 255")}
@ -222,7 +220,7 @@
y = 0
w = "(width)"
h = "(height)"
name = "buttons/button_normal/modern/background-active.png{IPF}"
name = "buttons/modern/normal/background-active.png{IPF}"
[/image]
{_GUI_BUTTON_TEXT ({FONT_SIZE}) ("bold") ("255, 200, 0, 255")}
@ -234,12 +232,50 @@
[/resolution]
#enddef
[button_definition]
id = "default"
description = "Default buttons with no icon."
{_GUI_RESOLUTION_NOICON () 40 90 30 20 5 ({_GUI_BUTTON_FONT_SIZE}) () 255}
{_GUI_RESOLUTION_NOICON ({GUI_BIG_RESOLUTION})
60 110 40 46 16
({GUI_SCALE_RESOLUTION {_GUI_BUTTON_FONT_SIZE}}) () 255}
[/button_definition]
[button_definition]
id = "large"
description = "Large button"
{_GUI_RESOLUTION_NOICON () 40 130 35 20 5 ({_GUI_BUTTON_FONT_SIZE}) () 255}
{_GUI_RESOLUTION_NOICON ({GUI_BIG_RESOLUTION})
60 150 32 16 6
({GUI_SCALE_RESOLUTION {_GUI_BUTTON_FONT_SIZE}})
() 255}
[/button_definition]
[button_definition]
id = "really_large"
description = "Large button"
{_GUI_RESOLUTION_NOICON () 40 172 40 25 10 ({GUI_FONT_SIZE_LARGE}) () 255}
{_GUI_RESOLUTION_NOICON ({GUI_BIG_RESOLUTION})
60 192 44 16 6
({GUI_SCALE_RESOLUTION {GUI_FONT_SIZE_LARGE}})
() 255}
[/button_definition]
[button_definition]
id = "titlescreen_language"
description = "Language button used on the main menu."
{_GUI_RESOLUTION () 50 80 35 43 16 ({_GUI_BUTTON_FONT_SIZE}) icons/action/modern/language_25 () 255 X=15}
{_GUI_RESOLUTION () 50 80 35 43 14 ({_GUI_BUTTON_FONT_SIZE}) icons/action/modern/language_25 () 255 X=15}
{_GUI_RESOLUTION ({GUI_BIG_RESOLUTION})
60 100 40 46 18
({GUI_SCALE_RESOLUTION {_GUI_BUTTON_FONT_SIZE}})

View File

@ -0,0 +1,494 @@
#textdomain wesnoth-lib
###
### Definition of non-standard buttons of varying sizes
###
#define _GUI_RESOLUTION RESOLUTION SIZE IMAGE IMAGE_OVERLAY IPF
[resolution]
{RESOLUTION}
min_width = {SIZE}
min_height = {SIZE}
default_width = {SIZE}
default_height = {SIZE}
max_width = {SIZE}
max_height = {SIZE}
[state_enabled]
[draw]
[image]
w = "(width)"
h = "(height)"
name = {IMAGE} + ".png{IPF}"
[/image]
[image]
{GUI_CENTERED_IMAGE}
name = {IMAGE_OVERLAY} + "-active.png{IPF}"
[/image]
[/draw]
[/state_enabled]
[state_disabled]
[draw]
[image]
w = "(width)"
h = "(height)"
name = {IMAGE} + ".png~GS(){IPF}"
[/image]
[image]
{GUI_CENTERED_IMAGE}
name = {IMAGE_OVERLAY} + ".png~GS(){IPF}"
[/image]
[/draw]
[/state_disabled]
[state_pressed]
[draw]
[image]
w = {SIZE}
h = {SIZE}
name = {IMAGE} + "-pressed.png{IPF}"
[/image]
[image]
{GUI_CENTERED_IMAGE}
name = {IMAGE_OVERLAY} + "-active.png{IPF}"
[/image]
[/draw]
[/state_pressed]
[state_focused]
[draw]
[image]
w = "(width)"
h = "(height)"
name = {IMAGE} + "-active.png{IPF}"
[/image]
[image]
{GUI_CENTERED_IMAGE}
name = {IMAGE_OVERLAY} + "-pressed.png{IPF}"
[/image]
[/draw]
[/state_focused]
[/resolution]
#enddef
#define _GUI_DEFINITION ID DESCRIPTION IMAGE IMAGE_OVERLAY IPF
[button_definition]
id = {ID}
description = {DESCRIPTION}
{_GUI_RESOLUTION () 25 ({IMAGE}) ({IMAGE_OVERLAY}) ({IPF})}
[/button_definition]
#enddef
# Scrollbar buttons
{_GUI_DEFINITION
"down_arrow"
"Down arrow button for a scrollbar."
"buttons/modern/normal/background"
"icons/arrows/arrows_ornate_down_25"
"~CROP(0,0,25,25)"
}
{_GUI_DEFINITION
"up_arrow"
"Up arrow button for a scrollbar."
"buttons/modern/normal/background"
"icons/arrows/arrows_ornate_up_25"
"~CROP(0,0,25,25)"
}
{_GUI_DEFINITION
"left_arrow"
"Left arrow button for a scrollbar."
"buttons/modern/normal/background"
"icons/arrows/arrows_ornate_left_25"
"~CROP(0,0,25,25)"
}
{_GUI_DEFINITION
"right_arrow"
"Right arrow button for a scrollbar."
"buttons/modern/normal/background"
"icons/arrows/arrows_ornate_right_25"
"~CROP(0,0,25,25)"
}
{_GUI_DEFINITION
"add"
"Addition button."
"buttons/modern/normal/background"
"icons/action/ornate_add_25"
"~CROP(0,0,25,25)"
}
{_GUI_DEFINITION
"delete"
"Deletion button."
"buttons/modern/normal/background"
"icons/action/ornate_delete_25"
"~CROP(0,0,25,25)"
}
{_GUI_DEFINITION
"help"
"Help button."
"buttons/modern/normal/background"
"icons/action/help_25"
"~CROP(0,0,25,25)"
}
[button_definition]
id = "settings_mp_staging"
description = "MP Staging faction select button."
{_GUI_RESOLUTION () 60 ("buttons/modern/normal/background") ("icons/action/editor-tool-unit_60") ("~CROP(0,0,25,25)")}
[/button_definition]
[button_definition]
id = "big_trash"
description = "Big trash button"
{_GUI_RESOLUTION () 60 ("buttons/modern/normal/background") ("icons/action/trash_25") ("~CROP(0,0,25,25)~SCALE_SHARP(200%,200%)")}
[/button_definition]
# Transparent scrollbar buttons
{_GUI_DEFINITION
"down_arrow_transparent"
"Down arrow button for a transparent scrollbar."
"buttons/modern/normal/background"
"icons/arrows/arrows_ornate_down_25"
"~CROP(0,0,25,25)~O(65%)"
}
{_GUI_DEFINITION
"up_arrow_transparent"
"Up arrow button for a transparent scrollbar."
"buttons/modern/normal/background"
"icons/arrows/arrows_ornate_up_25"
"~CROP(0,0,25,25)~O(65%)"
}
{_GUI_DEFINITION
"left_arrow_transparent"
"Left arrow button for a transparent scrollbar."
"buttons/modern/normal/background"
"icons/arrows/arrows_ornate_left_25"
"~CROP(0,0,25,25)~O(65%)"
}
{_GUI_DEFINITION
"right_arrow_transparent"
"Right arrow button for a transparent scrollbar."
"buttons/modern/normal/background"
"icons/arrows/arrows_ornate_right_25"
"~CROP(0,0,25,25)~O(65%)"
}
{_GUI_DEFINITION
"add_transparent"
"Transparent addition button."
"buttons/modern/normal/background"
"icons/action/ornate_add_25"
"~CROP(0,0,25,25)~O(65%)"
}
{_GUI_DEFINITION
"delete_transparent"
"Transparent deletion button."
"buttons/modern/normal/background"
"icons/action/ornate_delete_25"
"~CROP(0,0,25,25)~O(65%)"
}
# Action icon buttons
{_GUI_DEFINITION
"action_go"
"Right arrow button for go/browse actions."
"buttons/modern/normal/background"
"icons/arrows/arrows_right_25"
"~CROP(0,0,25,25)"
}
{_GUI_DEFINITION
"action_browse"
"Button for go/browse actions."
"buttons/modern/normal/background"
"icons/action/browse_25"
"~CROP(0,0,25,25)"
}
{_GUI_DEFINITION
"action_browse_experimental"
"Button for go/browse actions."
"buttons/modern/normal/background"
"icons/action/browse_25"
"~CROP(0,0,25,25)"
}
{_GUI_DEFINITION
"action_about"
"Button for displaying the game version info."
"buttons/modern/normal/background"
"icons/action/about_25"
"~CROP(0,0,25,25)"
}
{_GUI_DEFINITION
"action_language"
"Button for displaying the language menu."
"buttons/modern/normal/background"
"icons/action/language_25"
"~CROP(0,0,25,25)"
}
{_GUI_DEFINITION
"left_arrow_short_ornate"
"Left arrow action button."
"buttons/modern/normal/background"
"icons/arrows/short_arrow_ornate_left_25"
"~CROP(0,0,25,25)"
}
{_GUI_DEFINITION
"right_arrow_short_ornate"
"Right arrow action button."
"buttons/modern/normal/background"
"icons/arrows/short_arrow_ornate_right_25"
"~CROP(0,0,25,25)"
}
#
# Minimal-style buttons
# These buttons don't have a background, only the overlay
#
#define _GUI_RESOLUTION_MINIMAL RESOLUTION SIZE IMAGE
[resolution]
{RESOLUTION}
min_width = {SIZE}
min_height = {SIZE}
default_width = {SIZE}
default_height = {SIZE}
max_width = {SIZE}
max_height = {SIZE}
[state_enabled]
[draw]
[image]
w = {SIZE}
h = {SIZE}
name = {IMAGE} + ".png"
[/image]
[/draw]
[/state_enabled]
[state_disabled]
[draw]
[image]
w = {SIZE}
h = {SIZE}
name = {IMAGE} + ".png~GS()"
[/image]
[/draw]
[/state_disabled]
[state_pressed]
[draw]
[image]
w = {SIZE}
h = {SIZE}
name = {IMAGE} + "-pressed.png"
[/image]
[/draw]
[/state_pressed]
[state_focused]
[draw]
[image]
w = {SIZE}
h = {SIZE}
name = {IMAGE} + "-active.png"
[/image]
[/draw]
[/state_focused]
[/resolution]
#enddef
#define _GUI_DEFINITION_MINIMAL SIZE ID DESCRIPTION IMAGE
[button_definition]
id = {ID}
description = {DESCRIPTION}
{_GUI_RESOLUTION_MINIMAL () ({SIZE}) ({IMAGE})}
[/button_definition]
#enddef
{_GUI_DEFINITION_MINIMAL 25
"close"
"Minimal-style close button."
"icons/action/close_25"
}
{_GUI_DEFINITION_MINIMAL 25
"trash"
"Minimal-style trash button."
"icons/action/trash_25"
}
{_GUI_DEFINITION_MINIMAL 30
"settings"
"Settings button"
"icons/action/settings"
}
{_GUI_DEFINITION_MINIMAL 64
"addon_install_large"
"Minimal install button"
"icons/addons_manager/install-large"
}
{_GUI_DEFINITION_MINIMAL 64
"addon_uninstall_large"
"Minimal uninstall button"
"icons/addons_manager/uninstall-large"
}
{_GUI_DEFINITION_MINIMAL 64
"addon_upgrade_large"
"Minimal upgrade button"
"icons/addons_manager/update-large"
}
{_GUI_DEFINITION_MINIMAL 64
"addon_publish_large"
"Minimal publish button"
"icons/addons_manager/publish-large"
}
{_GUI_DEFINITION_MINIMAL 64
"addon_delete_large"
"Minimal delete button"
"icons/addons_manager/delete-large"
}
{_GUI_DEFINITION_MINIMAL 30
"addon_install_small"
"Minimal install button"
"icons/addons_manager/install-small"
}
{_GUI_DEFINITION_MINIMAL 30
"addon_uninstall_small"
"Minimal install button"
"icons/addons_manager/uninstall-small"
}
{_GUI_DEFINITION_MINIMAL 30
"addon_update_small"
"Minimal install button"
"icons/addons_manager/update-small"
}
{_GUI_DEFINITION_MINIMAL 30
"addon_publish_small"
"Minimal install button"
"icons/addons_manager/publish-small"
}
{_GUI_DEFINITION_MINIMAL 30
"help_30"
"Minimal install button"
"icons/action/help_30"
}
{_GUI_DEFINITION_MINIMAL 30
"minimal_arrow"
"Minimal arrow button"
"icons/arrows/double_arrow_right_30"
}
{_GUI_DEFINITION
"download_arrow"
"Minimal download arrow button"
"buttons/modern/normal/background"
"icons/arrows/arrows_down_30"
"~CROP(0,0,30,30)"
}
{_GUI_DEFINITION
"preview"
"Preview button"
"buttons/modern/normal/background"
"icons/action/preview_25"
()
}
{_GUI_DEFINITION
"play"
"Play button"
"buttons/modern/normal/background"
"icons/action/play_25"
()
}
#undef _GUI_DEFINITION
#undef _GUI_DEFINITION_MINIMAL
#undef _GUI_RESOLUTION
#undef _GUI_RESOLUTION_MINIMAL

View File

@ -0,0 +1,288 @@
#textdomain wesnoth-lib
###
### buttons with success indication
###
#define _GUI_STATE BACKGROUND_IMAGE BORDER_COLOR BORDER_COLOR_DARK HIGHLIGHT_LINE_COLOR IPF
{GUI__BUTTON_NORMAL_FRAME buttons/modern/normal/{BACKGROUND_IMAGE}
({BORDER_COLOR})
({BORDER_COLOR_DARK})
({HIGHLIGHT_LINE_COLOR})
({IPF})
}
#enddef
#define _GUI_RESOLUTION RESOLUTION SIZE IMAGE IMAGE_OVERLAY IPF
[resolution]
{RESOLUTION}
min_width = {SIZE}
min_height = {SIZE}
default_width = {SIZE}
default_height = {SIZE}
max_width = {SIZE}
max_height = {SIZE}
[state_enabled]
[draw]
[image]
w = "(width)"
h = "(height)"
name = {IMAGE} + ".png{IPF}"
[/image]
[image]
{GUI_CENTERED_IMAGE}
name = {IMAGE_OVERLAY} + ".png{IPF}"
[/image]
[/draw]
[/state_enabled]
[state_disabled]
[draw]
[image]
w = "(width)"
h = "(height)"
name = {IMAGE} + ".png~GS(){IPF}"
[/image]
[image]
{GUI_CENTERED_IMAGE}
name = {IMAGE_OVERLAY} + ".png~GS(){IPF}"
[/image]
[/draw]
[/state_disabled]
[state_pressed]
[draw]
[image]
w = {SIZE}
h = {SIZE}
name = {IMAGE} + "-pressed.png{IPF}"
[/image]
[image]
{GUI_CENTERED_IMAGE}
name = {IMAGE_OVERLAY} + "-pressed.png{IPF}"
[/image]
[/draw]
[/state_pressed]
[state_focused]
[draw]
[image]
w = "(width)"
h = "(height)"
name = {IMAGE} + "-active.png{IPF}"
[/image]
[image]
{GUI_CENTERED_IMAGE}
name = {IMAGE_OVERLAY} + "-active.png{IPF}"
[/image]
[/draw]
[/state_focused]
[state_success]
[draw]
[image]
w = "(width)"
h = "(height)"
name = {IMAGE} + ".png{IPF}"
[/image]
[image]
{GUI_CENTERED_IMAGE}
name = {IMAGE_OVERLAY} + "-success.png{IPF}"
[/image]
[/draw]
[/state_success]
[/resolution]
#enddef
#define _GUI_DEFINITION ID DESCRIPTION IMAGE IMAGE_OVERLAY IPF
[button_definition]
id = {ID}
description = {DESCRIPTION}
{_GUI_RESOLUTION () 25 ({IMAGE}) ({IMAGE_OVERLAY}) ({IPF})}
[/button_definition]
#enddef
{_GUI_DEFINITION
"action_copy"
"Right arrow button for copy-to-clipboard."
"buttons/modern/normal/background"
"icons/action/copy_25"
"~CROP(0,0,25,25)"
}
# Text only copy button with success indication
#define _GUI_BUTTON_TEXT TEXT FONT_SIZE FONT_STYLE FONT_COLOR
[text]
x = {GUI__TEXT_HORIZONTALLY_CENTRED}
y = "(max((height - text_height - 2) / 2, 0))"
w = "(text_width)"
h = "(text_height)"
font_size = {FONT_SIZE}
font_style = {FONT_STYLE}
color = {FONT_COLOR}
text = {TEXT}
text_markup = true
[/text]
#enddef
#define _GUI_RESOLUTION_COPY RESOLUTION MIN_WIDTH DEFAULT_WIDTH HEIGHT EXTRA_WIDTH EXTRA_HEIGHT FONT_SIZE IPF ALPHA
[resolution]
{RESOLUTION}
min_width = {MIN_WIDTH}
min_height = {HEIGHT}
default_width = {DEFAULT_WIDTH}
default_height = {HEIGHT}
max_width = 0
max_height = {HEIGHT}
text_extra_width = {EXTRA_WIDTH}
text_extra_height = {EXTRA_HEIGHT}
text_font_size = {FONT_SIZE}
[state_enabled]
[draw]
[image]
x = 0
y = 0
w = "(width)"
h = "(height)"
name = "buttons/modern/normal/background.png{IPF}"
[/image]
{_GUI_BUTTON_TEXT (_"page^Copy") ({FONT_SIZE}) ("bold") ({GUI__FONT_COLOR_ENABLED__WHITE})}
[/draw]
[/state_enabled]
[state_disabled]
[draw]
[image]
x = 0
y = 0
w = "(width)"
h = "(height)"
name = "buttons/modern/normal/background.png~GS(){IPF}"
[/image]
{_GUI_BUTTON_TEXT (_"page^Copy") ({FONT_SIZE}) ("bold") ({GUI__FONT_COLOR_DISABLED__WHITE})}
[/draw]
[/state_disabled]
[state_pressed]
[draw]
[image]
x = 0
y = 0
w = "(width)"
h = "(height)"
name = "buttons/modern/normal/background-pressed.png{IPF}"
[/image]
{_GUI_BUTTON_TEXT (_"page^Copy") ({FONT_SIZE}) ("bold") ({GUI__FONT_COLOR_ENABLED__WHITE})}
[/draw]
[/state_pressed]
[state_focused]
[draw]
[image]
x = 0
y = 0
w = "(width)"
h = "(height)"
name = "buttons/modern/normal/background-active.png{IPF}"
[/image]
{_GUI_BUTTON_TEXT (_"page^Copy") ({FONT_SIZE}) ("bold") ({GUI__FONT_COLOR_ENABLED__WHITE})}
[/draw]
[/state_focused]
[state_success]
[draw]
[image]
x = 0
y = 0
w = "(width)"
h = "(height)"
name = "buttons/modern/normal/background.png{IPF}"
[/image]
#po: The heavy checkmark character is available in the DejaVu Sans font, but not in the default Lato font
{_GUI_BUTTON_TEXT (_"page^<b><span font_family='DejaVu Sans'>✔</span> Copied</b>") ({FONT_SIZE}) () ("0, 255, 0, 255")}
[/draw]
[/state_success]
[/resolution]
#enddef
[button_definition]
id = "copy"
description = "Text only copy button with success indication"
{_GUI_RESOLUTION_COPY () 40 90 30 20 5 {GUI_FONT_SIZE_SMALL} () 255}
[/button_definition]
#undef _GUI_STATE
#undef _GUI_BUTTON_TEXT
#undef _GUI_RESOLUTION
#undef _GUI_RESOLUTION_COPY
#undef _GUI_DEFINITION

View File

@ -19,33 +19,6 @@
[state_enabled]
[draw]
[image]
x = "((width-image_width)/2)"
y = 0
w = {DEFAULT_WIDTH}
h = "(height)"
name = "{BACKGROUND}.png"
[/image]
[line]
x1 = "((width-{DEFAULT_WIDTH})/2)"
y1 = 0
x2 = "((width+{DEFAULT_WIDTH})/2)"
y2 = 0
color = "153,122,0,255"
thickness = 5
[/line]
[line]
x1 = "((width-{DEFAULT_WIDTH})/2)"
y1 = "(height-1)"
x2 = "((width+{DEFAULT_WIDTH})/2)"
y2 = "(height-1)"
color = "153,122,0,255"
thickness = 5
[/line]
{_GUI_BUTTON_TEXT_TITLE ({FONT_SIZE}) () ("255,255,255,255")}
@ -57,34 +30,6 @@
[draw]
[image]
x = "((width-image_width)/2)"
y = 0
w = {DEFAULT_WIDTH}
h = "(height)"
name = "{BACKGROUND}.png~GS()"
[/image]
[line]
x1 = "((width-{DEFAULT_WIDTH})/2)"
y1 = 0
x2 = "((width+{DEFAULT_WIDTH})/2)"
y2 = 0
color = "153,122,0,255"
thickness = 5
[/line]
[line]
x1 = "((width-{DEFAULT_WIDTH})/2)"
y1 = "(height-1)"
x2 = "((width+{DEFAULT_WIDTH})/2)"
y2 = "(height-1)"
color = "153,122,0,255"
thickness = 5
[/line]
{_GUI_BUTTON_TEXT_TITLE ({FONT_SIZE}) () ("255,255,255,255")}
[/draw]
@ -94,14 +39,6 @@
[state_pressed]
[draw]
[image]
x = "((width-image_width)/2)"
y = 0
w = {DEFAULT_WIDTH}
h = "(height)"
name = "{BACKGROUND}-pressed.png"
[/image]
[line]
x1 = "((width-{DEFAULT_WIDTH})/2)"
@ -129,8 +66,8 @@
[/state_pressed]
[state_focused]
[state_focused]
[draw]
[image]
@ -172,26 +109,26 @@
[button_definition]
id = "small_title"
description = "Small button for titlescreen"
id = "title_normal"
description = "button for titlescreen"
{_GUI_RESOLUTION_TITLE () 50 240 25 13 4 20 () 0 "buttons/button_normal/modern/background_title_small"}
{_GUI_RESOLUTION_TITLE () 50 240 25 13 4 27 () 0 "buttons/modern/normal/background_title"}
{_GUI_RESOLUTION_TITLE ({GUI_BIG_RESOLUTION})
60 220 30 16 6
({GUI_SCALE_RESOLUTION 20})
() 0 "buttons/button_normal/modern/background_title_small"}
({GUI_SCALE_RESOLUTION 27})
() 0 "buttons/modern/normal/background_title"}
[/button_definition]
[button_definition]
id = "large_title"
description = "Large button for titlescreen"
id = "title_small"
description = "small button for titlescreen"
{_GUI_RESOLUTION_TITLE () 100 360 40 13 4 26 () 0 "buttons/button_normal/modern/background_title_big"}
{_GUI_RESOLUTION_TITLE () 50 240 25 13 4 23 () 0 "buttons/modern/normal/background_title"}
{_GUI_RESOLUTION_TITLE ({GUI_BIG_RESOLUTION})
90 330 50 16 6
({GUI_SCALE_RESOLUTION 26})
() 0 "buttons/button_normal/modern/background_title_big"}
60 220 30 16 6
({GUI_SCALE_RESOLUTION 23})
() 0 "buttons/modern/normal/background_title"}
[/button_definition]

View File

@ -0,0 +1,141 @@
#textdomain wesnoth-lib
###
### Definition of a label.
###
### Defines the following labels
### - default, the one for general usage.
### - title, for titles in dialogs.
#define _GUI_RESOLUTION RESOLUTION FONT_FAMILY FONT_SIZE FONT_STYLE FONT_COLOR_ENABLED FONT_COLOR_DISABLED
#arg OUTLINE
false
#endarg
[resolution]
{RESOLUTION}
min_width = 0
min_height = 0
default_width = 0
default_height = 0
max_width = 0
max_height = 0
text_font_family = {FONT_FAMILY}
text_font_size = {FONT_SIZE}
text_font_style = {FONT_STYLE}
link_color = "255, 225, 0"
[state_enabled]
[draw]
[text]
x = 0
y = 0
w = "(width)"
h = "(text_height)"
maximum_width = "(width)"
font_family = {FONT_FAMILY}
font_size = {FONT_SIZE}
font_style = {FONT_STYLE}
color = "([{FONT_COLOR_ENABLED} text_alpha])"
text = "(text)"
text_markup = "(text_markup)"
text_alignment = "(text_alignment)"
text_link_aware = "(text_link_aware)"
text_link_color = "(text_link_color)"
outline = {OUTLINE}
[/text]
[/draw]
[/state_enabled]
[state_disabled]
[draw]
[text]
x = 0
y = 0
w = "(width)"
h = "(text_height)"
maximum_width = "(width)"
font_family = {FONT_FAMILY}
font_size = {FONT_SIZE}
font_style = {FONT_STYLE}
color = "([{FONT_COLOR_DISABLED} text_alpha])"
text = "(text)"
text_markup = "(text_markup)"
text_alignment = "(text_alignment)"
text_link_aware = "(text_link_aware)"
text_link_color = "(text_link_color)"
outline = {OUTLINE}
[/text]
[/draw]
[/state_disabled]
[/resolution]
#enddef
#define _GUI_DEFINITION ID DESCRIPTION FONT_FAMILY FONT_SIZE FONT_STYLE FONT_COLOR
#arg OUTLINE
false
#endarg
[label_definition]
id = {ID}
description = {DESCRIPTION}
{_GUI_RESOLUTION
()
({FONT_FAMILY})
({GUI_FONT_SIZE_{FONT_SIZE}})
({FONT_STYLE})
({GUI__FONT_COLOR_ENABLED__{FONT_COLOR} ALPHA=""})
({GUI__FONT_COLOR_DISABLED__{FONT_COLOR} ALPHA=""})
OUTLINE={OUTLINE}
}
{_GUI_RESOLUTION
({GUI_BIG_RESOLUTION})
({FONT_FAMILY})
({GUI_SCALE_RESOLUTION {GUI_FONT_SIZE_{FONT_SIZE}}})
({FONT_STYLE})
({GUI__FONT_COLOR_ENABLED__{FONT_COLOR} ALPHA=""})
({GUI__FONT_COLOR_DISABLED__{FONT_COLOR} ALPHA=""})
OUTLINE={OUTLINE}
}
[/label_definition]
#enddef
{_GUI_DEFINITION "default" "default label" () DEFAULT () DEFAULT }
{_GUI_DEFINITION "default_bold" "default label, bold font" () DEFAULT "bold" DEFAULT }
{_GUI_DEFINITION "default_italic" "default label, italic font" () DEFAULT "italic" DEFAULT }
{_GUI_DEFINITION "title" "label used for titles" "script" VERY_LARGE () BRIGHT }
{_GUI_DEFINITION "default_large" "default, large font size" () LARGE () DEFAULT }
{_GUI_DEFINITION "default_huge" "default, huge font size" () HUGE () DEFAULT }
{_GUI_DEFINITION "default_small" "default, small font size" () SMALL () DEFAULT }
{_GUI_DEFINITION "default_tiny" "default, small font size" () TINY () DEFAULT }
{_GUI_DEFINITION "bad" "regular red label" () DEFAULT () BAD }
{_GUI_DEFINITION "bad_small" "small red label" () SMALL () BAD }
{_GUI_DEFINITION "default_outline" "default label with outline" () SMALL () DEFAULT OUTLINE=true}
{_GUI_DEFINITION "title_script" "label used for titles, script font" "script" LARGER () TITLE }
{_GUI_DEFINITION "default_large_script" "default, large font size, script font" "script" EXTRA_LARGE () DEFAULT }
{_GUI_DEFINITION "monospace" "fixed width scroll label" monospace DEFAULT () DEFAULT }
#undef _GUI_SCALE_RES SIZE
#undef _GUI_BIG_RES
#undef _GUI_DEFINITION
#undef _GUI_RESOLUTION

View File

@ -0,0 +1,132 @@
#textdomain wesnoth-lib
###
### Definition of the default button.
###
#define _GUI_TEXT FONT_SIZE FONT_COLOR
[text]
x = 8 # 3px border + 5px padding inside
y = {GUI__TEXT_VERTICALLY_CENTRED}
w = "(text_width)"
h = "(text_height)"
maximum_width = "(width - 33)" # substract 25px arrow and text x offset
font_size = {FONT_SIZE}
color = {FONT_COLOR}
text = "(text)"
text_markup = "(text_markup)"
[/text]
#enddef
#define _GUI_BUTTON_FRAME BACKGROUND_IMAGE BORDER_COLOR BORDER_COLOR_DARK HIGHLIGHT_LINE_COLOR IPF
{GUI__BUTTON_NORMAL_FRAME buttons/modern/normal/background{BACKGROUND_IMAGE}
({BORDER_COLOR})
({BORDER_COLOR_DARK})
({HIGHLIGHT_LINE_COLOR})
({IPF})
}
#enddef
#define _GUI_RESOLUTION RESOLUTION MIN_WIDTH DEFAULT_WIDTH HEIGHT EXTRA_WIDTH EXTRA_HEIGHT FONT_SIZE BASE_NAME IPF
[resolution]
{RESOLUTION}
min_width = {MIN_WIDTH}
min_height = {HEIGHT}
default_width = {DEFAULT_WIDTH}
default_height = {HEIGHT}
max_width = 0
max_height = {HEIGHT}
text_extra_width = {EXTRA_WIDTH}
text_extra_height = {EXTRA_HEIGHT}
text_font_size = {FONT_SIZE}
[state_enabled]
[draw]
{_GUI_BUTTON_FRAME () ("0, 0, 0, 0") ("0, 0, 0, 0") ("21, 79, 109, 255") {IPF}}
{_GUI_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__WHITE})}
[image]
x = "(width - 25)"
y = 2
name = "icons/arrows/short_arrow_ornate_left_25.png~ROTATE(-90)"
[/image]
[/draw]
[/state_enabled]
[state_disabled]
[draw]
{_GUI_BUTTON_FRAME () ("0, 0, 0, 0") ("0, 0, 0, 0") ("60, 60, 60, 255") "~GS(){IPF}"}
{_GUI_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_DISABLED__WHITE})}
[image]
x = "(width - 25)"
y = 2
name = "icons/arrows/short_arrow_ornate_left_25.png~ROTATE(-90)~GS()"
[/image]
[/draw]
[/state_disabled]
[state_pressed]
[draw]
{_GUI_BUTTON_FRAME () ("0, 0, 0, 0") ("0, 0, 0, 0") ("1, 10, 16, 255") {IPF}}
{_GUI_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__WHITE})}
[image]
x = "(width - 25)"
y = 2
name = "icons/arrows/short_arrow_ornate_left_25-pressed.png~ROTATE(-90)"
[/image]
[/draw]
[/state_pressed]
[state_focused]
[draw]
# Doesn't have its own 'active' variation image
{_GUI_BUTTON_FRAME -pressed ("0, 0, 0, 0") ("0, 0, 0, 0") ("12, 108, 157, 255") {IPF}}
{_GUI_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__WHITE})}
[image]
x = "(width - 25)"
y = 2
name = "icons/arrows/short_arrow_ornate_left_25-active.png~ROTATE(-90)"
[/image]
[/draw]
[/state_focused]
[/resolution]
#enddef
[menu_button_definition]
id = "default"
description = "Default button"
{_GUI_RESOLUTION (window_width,window_height=680,480) 40 80 30 13 13 ({GUI_FONT_SIZE_SMALL}) "button_dropdown/button_dropdown" ()}
{_GUI_RESOLUTION (window_width,window_height=801,601) 40 120 30 13 13 ({GUI_FONT_SIZE_SMALL}) "button_dropdown/button_dropdown" ()}
{_GUI_RESOLUTION (window_width,window_height=1025,765) 40 180 30 13 13 ({GUI_FONT_SIZE_SMALL}) "button_dropdown/button_dropdown" ()}
[/menu_button_definition]
#undef _GUI_BUTTON_FRAME
#undef _GUI_RESOLUTION
#undef _GUI_TEXT

View File

@ -0,0 +1,131 @@
#textdomain wesnoth-lib
###
### Definition of the default button.
###
#define _GUI_TEXT FONT_SIZE FONT_COLOR
[text]
x = 8 # 3px border + 5px padding inside
y = {GUI__TEXT_VERTICALLY_CENTRED}
w = "(text_width)"
h = "(text_height)"
maximum_width = "(width - 33)" # substract 25px arrow and text x offset
font_size = {FONT_SIZE}
color = {FONT_COLOR}
text = "(text)"
text_markup = "(text_markup)"
[/text]
#enddef
#define _GUI_BUTTON_FRAME BACKGROUND_IMAGE BORDER_COLOR BORDER_COLOR_DARK HIGHLIGHT_LINE_COLOR IPF
{GUI__BUTTON_NORMAL_FRAME buttons/modern/normal/background{BACKGROUND_IMAGE}
({BORDER_COLOR})
({BORDER_COLOR_DARK})
({HIGHLIGHT_LINE_COLOR})
({IPF})
}
#enddef
#define _GUI_RESOLUTION RESOLUTION MIN_WIDTH DEFAULT_WIDTH HEIGHT EXTRA_WIDTH EXTRA_HEIGHT FONT_SIZE BASE_NAME IPF
[resolution]
{RESOLUTION}
min_width = {MIN_WIDTH}
min_height = {HEIGHT}
default_width = {DEFAULT_WIDTH}
default_height = {HEIGHT}
max_width = 0
max_height = {HEIGHT}
text_extra_width = {EXTRA_WIDTH}
text_extra_height = {EXTRA_HEIGHT}
text_font_size = {FONT_SIZE}
[state_enabled]
[draw]
{_GUI_BUTTON_FRAME () ("0, 0, 0, 0") ("0, 0, 0, 0") ("21, 79, 109, 255") {IPF}}
{_GUI_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__TITLE})}
[image]
x = "(width - 25)"
y = 2
name = "icons/arrows/short_arrow_ornate_left_25.png~ROTATE(-90)"
[/image]
[/draw]
[/state_enabled]
[state_disabled]
[draw]
{_GUI_BUTTON_FRAME () ("0, 0, 0, 0") ("0, 0, 0, 0") ("60, 60, 60, 255") "~GS(){IPF}"}
{_GUI_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_DISABLED__TITLE})}
[image]
x = "(width - 25)"
y = 2
name = "icons/arrows/short_arrow_ornate_left_25.png~ROTATE(-90)~GS()"
[/image]
[/draw]
[/state_disabled]
[state_pressed]
[draw]
{_GUI_BUTTON_FRAME () ("0, 0, 0, 0") ("0, 0, 0, 0") ("1, 10, 16, 255") {IPF}}
{_GUI_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__TITLE})}
[image]
x = "(width - 25)"
y = 2
name = "icons/arrows/short_arrow_ornate_left_25-pressed.png~ROTATE(-90)"
[/image]
[/draw]
[/state_pressed]
[state_focused]
[draw]
# Doesn't have its own 'active' variation image
{_GUI_BUTTON_FRAME -pressed ("0, 0, 0, 0") ("0, 0, 0, 0") ("12, 108, 157, 255") {IPF}}
{_GUI_TEXT ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__TITLE})}
[image]
x = "(width - 25)"
y = 2
name = "icons/arrows/short_arrow_ornate_left_25-active.png~ROTATE(-90)"
[/image]
[/draw]
[/state_focused]
[/resolution]
#enddef
[multimenu_button_definition]
id = "default"
description = "Default button"
{_GUI_RESOLUTION (window_width,window_height=800,600) 40 80 30 13 4 ({GUI_FONT_SIZE_SMALL}) "button_dropdown/button_dropdown" ()}
{_GUI_RESOLUTION (window_width,window_height=801,601) 40 120 30 13 4 ({GUI_FONT_SIZE_SMALL}) "button_dropdown/button_dropdown" ()}
{_GUI_RESOLUTION (window_width,window_height=1025,769) 40 180 30 13 4 ({GUI_FONT_SIZE_SMALL}) "button_dropdown/button_dropdown" ()}
[/multimenu_button_definition]
#undef _GUI_RESOLUTION
#undef _GUI_TEXT

View File

@ -0,0 +1,160 @@
#textdomain wesnoth-lib
###
### Definition of a slider.
###
#define _GUI_STATE IMAGE_SUFFIX GROOVE_SELECTED_COLOR GROOVE_UNSELECTED_COLOR TEXT_COLOR RIGHT_OFFSET FONT_SIZE
[draw]
#
# Groove
#
[line]
x1 = 0
y1 = "(height / 2)"
x2 = "(positioner_offset - 1)"
y2 = "(height / 2)"
color = {GROOVE_SELECTED_COLOR}
thickness = 1
[/line]
[line]
x1 = "(positioner_offset)"
y1 = "(height / 2)"
x2 = "(width - right_offset + 1 where right_offset = {RIGHT_OFFSET})"
y2 = "(height / 2)"
color = {GROOVE_UNSELECTED_COLOR}
thickness = 1
[/line]
#
# Text
#
[text]
x = "(width - right_offset + 7 where right_offset = {RIGHT_OFFSET})"
y = {GUI__TEXT_VERTICALLY_CENTRED}
w = "{RIGHT_OFFSET}"
h = "(height)"
font_size = {FONT_SIZE}
color = {TEXT_COLOR}
text = "(text)"
[/text]
#
# Slider
#
[image]
x = "(positioner_offset)"
#y = "(if (image_height < height, (height - image_height) / 2, 0))"
y = "((height - image_height) / 2)"
resize_mode = scale
h = 22
w = 16
name = "buttons/modern/slider{IMAGE_SUFFIX}"
[/image]
[/draw]
#enddef
#define _GUI_RESOLUTION RESOLUTION MIN_WIDTH DEFAULT_WIDTH HEIGHT POSITIONER_LENGTH RIGHT_OFFSET FONT_SIZE
[resolution]
{RESOLUTION}
min_width = {MIN_WIDTH}
min_height = {HEIGHT}
default_width = {DEFAULT_WIDTH}
default_height = {HEIGHT}
max_width = 0
max_height = {HEIGHT}
minimum_positioner_length = {POSITIONER_LENGTH}
maximum_positioner_length = {POSITIONER_LENGTH}
left_offset = 0
right_offset = {RIGHT_OFFSET}
text_font_size = {FONT_SIZE}
[state_enabled]
{_GUI_STATE
".png"
("255, 225, 104, 255")
("204, 163, 0, 255")
({GUI__FONT_COLOR_ENABLED__DEFAULT})
({RIGHT_OFFSET})
({FONT_SIZE})
}
[/state_enabled]
[state_disabled]
{_GUI_STATE
".png~GS()"
({GUI__FONT_COLOR_DISABLED__DEFAULT})
({GUI__FONT_COLOR_DISABLED_DARK__DEFAULT})
({GUI__FONT_COLOR_DISABLED__DEFAULT})
({RIGHT_OFFSET})
({FONT_SIZE})
}
[/state_disabled]
[state_pressed]
{_GUI_STATE
"-pressed.png"
("255, 225, 104, 255")
("204, 163, 0, 255")
({GUI__FONT_COLOR_ENABLED__DEFAULT})
({RIGHT_OFFSET})
({FONT_SIZE})
}
[/state_pressed]
[state_focused]
{_GUI_STATE
"-active.png"
("255, 225, 104, 255")
("204, 163, 0, 255")
({GUI__FONT_COLOR_ENABLED__DEFAULT})
({RIGHT_OFFSET})
({FONT_SIZE})
}
[/state_focused]
[/resolution]
#enddef
[slider_definition]
id = "default"
description = "A slider with its value on the right hand side."
{_GUI_RESOLUTION () 150 250 22 16 50 ({GUI_FONT_SIZE_DEFAULT}) }
[/slider_definition]
[slider_definition]
id = "minimal"
description = "A slider with its value on the right hand side."
{_GUI_RESOLUTION () 150 250 22 16 50 ({GUI_FONT_SIZE_DEFAULT}) }
[/slider_definition]
[slider_definition]
id = "short"
description = "A slider with its value on the right hand side."
{_GUI_RESOLUTION () 50 150 22 16 50 ({GUI_FONT_SIZE_SMALL}) }
[/slider_definition]
#undef _GUI_STATE
#undef _GUI_RESOLUTION

View File

@ -0,0 +1,147 @@
#textdomain wesnoth-lib
###
### Definition of the default toggle button.
### Default appearance is that of a checkbox.
###
#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) where x_offset = {X_OFFSET})"
h = "(text_height)"
font_size = {FONT_SIZE}
color = {FONT_COLOR}
text = "(text)"
[/text]
#enddef
#define _GUI_CHECKBOX_BG
[rectangle]
x = 0
y = 0
w = 20
h = 20
border_thickness = 2
border_color = "44, 78, 119, 255"
fill_color = "28, 45, 64, 255"
[/rectangle]
#enddef
#define _GUI_CHECKMARK IPF
[image]
name = "buttons/modern/check.png{IPF}"
[/image]
#enddef
#define _GUI_RESOLUTION RESOLUTION WIDTH HEIGHT EXTRA_WIDTH FONT_SIZE
[resolution]
{RESOLUTION}
min_width = {WIDTH}
min_height = {HEIGHT}
default_width = {WIDTH}
default_height = {HEIGHT}
max_width = 0
max_height = {HEIGHT}
text_extra_width = {EXTRA_WIDTH}
text_font_size = {FONT_SIZE}
[state]
[enabled]
[draw]
{_GUI_CHECKBOX_BG}
{_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__WHITE}) }
[/draw]
[/enabled]
[disabled]
[draw]
{_GUI_CHECKBOX_BG}
{_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_DISABLED__WHITE}) }
[/draw]
[/disabled]
[focused]
[draw]
{_GUI_CHECKBOX_BG}
{_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__WHITE}) }
[/draw]
[/focused]
[/state]
###
### Selected
###
[state]
[enabled]
[draw]
{_GUI_CHECKBOX_BG}
{_GUI_CHECKMARK ()}
{_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__WHITE}) }
[/draw]
[/enabled]
[disabled]
[draw]
{_GUI_CHECKBOX_BG}
{_GUI_CHECKMARK "~GS()"}
{_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_DISABLED__WHITE}) }
[/draw]
[/disabled]
[focused]
[draw]
{_GUI_CHECKBOX_BG}
{_GUI_CHECKMARK ()}
{_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__WHITE}) }
[/draw]
[/focused]
[/state]
[/resolution]
#enddef
[toggle_button_definition]
id = "default"
description = "Checkbox."
{_GUI_RESOLUTION () 34 22 25 ({GUI_FONT_SIZE_SMALL}) }
{_GUI_RESOLUTION ({GUI_BIG_RESOLUTION})
40 24 28
({GUI_SCALE_RESOLUTION {GUI_FONT_SIZE_SMALL}}) }
[/toggle_button_definition]
#undef _GUI_CHECKBOX_BG
#undef _GUI_CHECKMARK
#undef _GUI_TEXT
#undef _GUI_RESOLUTION

View File

@ -0,0 +1,144 @@
#textdomain wesnoth-lib
###
### Definition of the radio toggle button.
###
#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) where x_offset = {X_OFFSET})"
h = "(text_height)"
font_size = {FONT_SIZE}
color = {FONT_COLOR}
text = "(text)"
[/text]
#enddef
#define _GUI_RADIO_BG
[circle]
x = 10
y = 10
radius = 10
border_thickness = 2
border_color = "44, 78, 119, 255"
fill_color = "28, 45, 64, 255"
[/circle]
#enddef
#define _GUI_RADIO_DOT IPF
[image]
x = 6
y = 6
name = "buttons/modern/dot.png{IPF}"
[/image]
#enddef
#define _GUI_RESOLUTION RESOLUTION WIDTH HEIGHT EXTRA_WIDTH FONT_SIZE
[resolution]
{RESOLUTION}
min_width = {WIDTH}
min_height = {HEIGHT}
default_width = {WIDTH}
default_height = {HEIGHT}
max_width = 0
max_height = {HEIGHT}
text_extra_width = {EXTRA_WIDTH}
text_font_size = {FONT_SIZE}
[state]
[enabled]
[draw]
{_GUI_RADIO_BG}
{_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__TITLE}) }
[/draw]
[/enabled]
[disabled]
[draw]
{_GUI_RADIO_BG}
{_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_DISABLED__TITLE}) }
[/draw]
[/disabled]
[focused]
[draw]
{_GUI_RADIO_BG}
{_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__TITLE}) }
[/draw]
[/focused]
[/state]
###
### Selected
###
[state]
[enabled]
[draw]
{_GUI_RADIO_BG}
{_GUI_RADIO_DOT ()}
{_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__TITLE}) }
[/draw]
[/enabled]
[disabled]
[draw]
{_GUI_RADIO_BG}
{_GUI_RADIO_DOT "~GS()"}
{_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_DISABLED__TITLE}) }
[/draw]
[/disabled]
[focused]
[draw]
{_GUI_RADIO_BG}
{_GUI_RADIO_DOT ()}
{_GUI_TEXT ({EXTRA_WIDTH}) ({FONT_SIZE}) ({GUI__FONT_COLOR_ENABLED__TITLE}) }
[/draw]
[/focused]
[/state]
[/resolution]
#enddef
[toggle_button_definition]
id = "radio"
description = "Radio button."
{_GUI_RESOLUTION () 32 24 25 ({GUI_FONT_SIZE_SMALL}) }
[/toggle_button_definition]
#undef _GUI_TEXT
#undef _GUI_RESOLUTION

View File

@ -0,0 +1,220 @@
#textdomain wesnoth-lib
###
### Defines all window styles used in the game.
### For now the definition for normal and tiny gui are the same, this might
### change later when tiny-gui will be tested.
###
#define _GUI_RESOLUTION RESOLUTION BASE_NAME PRE_COMMIT BORDER_SIDE_1 BORDER_SIDE_2 OFFSET_SIDE_1 OFFSET_SIDE_2 OFFSET_TOTAL
[resolution]
{RESOLUTION}
left_border = {BORDER_SIDE_1}
right_border = {BORDER_SIDE_2}
top_border = {BORDER_SIDE_1}
bottom_border = {BORDER_SIDE_2}
[background]
[draw]
{PRE_COMMIT}
[rectangle]
x = 0
y = 0
w = "(width)"
h = "(height)"
border_thickness = 3
border_color = "16, 22, 35, 255"
[/rectangle]
[rectangle]
x = 1
y = 1
w = "(width - 2)"
h = "(height - 2)"
border_thickness = 1
border_color = {GUI__BORDER_COLOR_DARK}
[/rectangle]
[image]
x = 2
y = 2
w = "(width - 4)"
h = "(height - 4)"
name = "panels/background-title-opaque.png"
resize_mode = "tile_highres"
[/image]
[/draw]
[/background]
[foreground]
[draw]
[/draw]
[/foreground]
[grid]
[row]
grow_factor = 1
[column]
horizontal_grow = true
vertical_grow = true
[scrollbar_panel]
vertical_scrollbar_mode = "initial_auto"
horizontal_scrollbar_mode = "initial_auto"
[definition]
[row]
[column]
horizontal_grow = true
vertical_grow = true
[grid]
id = "_window_content_grid"
[/grid]
[/column]
[/row]
[/definition]
[/scrollbar_panel]
[/column]
[/row]
[row]
[column]
[button]
id = "click_dismiss"
definition = "default"
label = _ "Close"
[/button]
[/column]
[/row]
[/grid]
[/resolution]
#enddef
#define _GUI_WINDOW ID DESCRIPTION BASE_NAME PRE_COMMIT
[window_definition]
id = {ID}
description = {DESCRIPTION}
{_GUI_RESOLUTION () ({BASE_NAME}) ({PRE_COMMIT}) 10 13 5 9 14 }
[/window_definition]
#enddef
{_GUI_WINDOW "default" "The default window" "opaque" ()}
{_GUI_WINDOW "message" "The style used as transparent to the user." "translucent65" ({DEFAULT_BLUR})}
# Special definition for a minimal-border style
[window_definition]
id = "menu"
description = "Window style used for menus"
[resolution]
left_border = 1
right_border = 1
top_border = 1
bottom_border = 1
[background]
[draw]
[image]
x = 0
y = 0
w = "(width)"
h = "(height)"
name = "dialogs/menu-background.png"
resize_mode = "tile_highres"
[/image]
[rectangle]
x = 0
y = 0
w = "(width)"
h = "(height)"
border_thickness = 1
border_color = {GUI__BORDER_COLOR_DARK}
[/rectangle]
[/draw]
[/background]
[foreground]
[draw]
[/draw]
[/foreground]
[grid]
[row]
grow_factor = 1
[column]
horizontal_grow = true
vertical_grow = true
[scrollbar_panel]
vertical_scrollbar_mode = "initial_auto"
horizontal_scrollbar_mode = "initial_auto"
[definition]
[row]
[column]
horizontal_grow = true
vertical_grow = true
[grid]
id = "_window_content_grid"
[/grid]
[/column]
[/row]
[/definition]
[/scrollbar_panel]
[/column]
[/row]
[/grid]
[/resolution]
[/window_definition]
#undef _BLUR
#undef _GUI_WINDOW
#undef _GUI_RESOLUTION

View File

@ -5,7 +5,7 @@
[gui]
id = "default"
description = "Default"
description = "Parchment"
[settings]
popup_show_delay = 200
@ -26,8 +26,8 @@
{tips.cfg}
{gui/macros/}
{gui/themes/default/widget/}
{gui/themes/default/window/}
{gui/themes/default/widgets/}
{gui/themes/default/dialogs/}
# For tab sheets we need two kinds
# - 1 where we're a filter eg every irc chan looks the same

View File

@ -212,6 +212,19 @@
horizontal_alignment = "left"
[grid]
[row]
[column]
border = "all"
border_size = 5
horizontal_alignment = "left"
[toggle_button]
id = "show_tips"
label = _ "Show Tips on Titlescreen"
tooltip = _ "Show/hide random tips on the titlescreen about the game"
[/toggle_button]
[/column]
[/row]
[row]
[column]
border = "all"

Some files were not shown because too many files have changed in this diff Show More