Skip to content

Commit

Permalink
Merge pull request #4568 from nemaara/language_icon
Browse files Browse the repository at this point in the history
Title screen: move language button to icon
  • Loading branch information
nemaara committed Nov 18, 2019
2 parents ec3e0d5 + acc96b1 commit 5c9077d
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 2 deletions.
8 changes: 8 additions & 0 deletions data/gui/widget/button_25x25.cfg
Expand Up @@ -260,6 +260,14 @@
()
}

{_GUI_DEFINITION
"action_language"
"Button for displaying the language menu."
"buttons/button_square/button_square_25"
"icons/action/language_25"
()
}

{_GUI_DEFINITION
"left_arrow_short_ornate"
"Left arrow action button."
Expand Down
15 changes: 13 additions & 2 deletions data/gui/window/title_screen.cfg
Expand Up @@ -253,7 +253,6 @@ where
{_GUI_BUTTON "load" _"Load" _"Load a saved game"}
{_GUI_BUTTON "addons" _"Add-ons" _"Download usermade campaigns, eras, or map packs"}
{_GUI_BUTTON "editor" _"Map Editor" _"Start the map editor"}
{_GUI_BUTTON "language" _"Language" _"Change the language"}
{_GUI_BUTTON "preferences" _"Preferences" _"Configure the game’s settings"}
{_GUI_BUTTON "credits" _"Credits" _"View the credits"}
{_GUI_BUTTON "quit" _"Quit" _"Quit the game"}
Expand Down Expand Up @@ -446,7 +445,7 @@ where
[row]

[column]
horizontal_alignment = "left"
horizontal_grow = true
vertical_alignment = "bottom"

[grid]
Expand All @@ -455,6 +454,7 @@ where

[column]
grow_factor = 0
horizontal_alignment = "left"
[button]
id = "about"
definition = "action_about"
Expand All @@ -464,6 +464,7 @@ where

[column]
grow_factor = 1
horizontal_alignment = "left"
border = "left"
border_size = 5
[label]
Expand All @@ -472,6 +473,16 @@ where
[/label]
[/column]

[column]
grow_factor = 0
horizontal_alignment = "right"
[button]
id = "language"
definition = "action_language"
tooltip = _ "Change the language"
[/button]
[/column]

[/row]

[/grid]
Expand Down
Binary file added images/icons/action/language_25-active.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/icons/action/language_25-pressed.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/icons/action/language_25.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 5c9077d

Please sign in to comment.