0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tcore_selection: removed image field under description

Browse source 
This also replaces the icon= key with the image= key
This commit is contained in:
Charles Dang 2015-04-25 19:33:36 +11:00
parent bce7c9c329
commit 8a7fe3a7db
3 changed files with 7 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
data/cores.cfg
View file

@ -2,8 +2,7 @@
id=default
name= _ "Wesnoth (Default)"
rank=5
icon=icons/icon-game.png
image="wesnoth-icon.png"
image=icons/icon-game.png
description= _ "Wesnoth has many different sagas waiting to be played. Fight to regain the throne of Wesnoth, of which you are the legitimate heir... step into the boots of a young officer sent to guard a not-so-sleepy frontier outpost... lead a brutal quest to unite the orcish tribes... vanquish a horde of undead warriors unleashed by a foul necromancer, who also happens to have taken your brother hostage... guide a band of elvish survivors in an epic quest to find a new home... get revenge on the orcs by using the foul art of necromancy...
There are at least two hundred unit types, sixteen races, seven major factions, and hundreds of years of history.
@ -19,8 +18,7 @@ One Multiplayer Campaign with 14 Scenarios,
id=default_
name= _ "Wesnoth (Failsafe)"
rank=10
icon=icons/icon-game.png
image="wesnoth-icon.png"
image=icons/icon-game.png
description= _ "Loads only mainline Wesnoth data without any add-ons."
path="/"
[/core]
@ -30,8 +28,7 @@ One Multiplayer Campaign with 14 Scenarios,
id=broken
name= _ "The Broken One"
rank=15
icon=icons/icon-game.png
#image="wesnoth-icon.png"
image=icons/icon-game.png
description= _ "The Broken One
is a test core for the fallback solution.

22
data/gui/default/window/core_dialog.cfg
View file

@ -99,9 +99,9 @@
vertical_alignment = "top"
[image]
id = "icon"
id = "image"
definition = "default"
label = "wesnoth-icon.png"
label = "icons/icon-game.png"
[/image]
[/column]
@ -180,24 +180,6 @@
[/row]
[row]
grow_factor = 1
[column]
border = "all"
border_size = 5
horizontal_alignment = "center"
vertical_alignment = "top"
[image]
id = "image"
definition = "default"
[/image]
[/column]
[/row]
[/definition]
[/scrollbar_panel]

7
src/gui/dialogs/core_selection.cpp
View file

@ -110,8 +110,8 @@ void tcore_selection::pre_show(CVideo& /*video*/, twindow& window)
string_map list_item;
std::map<std::string, string_map> list_item_item;
list_item["label"] = core["icon"];
list_item_item.insert(std::make_pair("icon", list_item));
list_item["label"] = core["image"];
list_item_item.insert(std::make_pair("image", list_item));
list_item["label"] = core["name"];
list_item_item.insert(std::make_pair("name", list_item));
@ -129,9 +129,6 @@ void tcore_selection::pre_show(CVideo& /*video*/, twindow& window)
detail_item["use_markup"] = "true";
detail_page.insert(std::make_pair("description", detail_item));
detail_item["label"] = core["image"];
detail_page.insert(std::make_pair("image", detail_item));
multi_page.add_page(detail_page);
}
list.select_row(choice_, true);