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

MP Create: minor progress, mostly bringing the existing content to a semi-proper layout

Browse source
This commit is contained in:
Charles Dang 2016-08-11 05:48:31 +11:00
parent e04be90254
commit 89246cd473
2 changed files with 59 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
data/gui/window/mp_create_game.cfg
View file

@ -9,11 +9,9 @@
description = "MP create game dialog."
[resolution]
definition = "default"
definition = "borderless"
automatic_placement = "true"
vertical_placement = "center"
horizontal_placement = "center"
{GUI_WINDOW_FULLSCREEN}
[tooltip]
id = "tooltip"
@ -52,6 +50,7 @@
[column]
grow_factor = 1
horizontal_alignment = "left"
[grid]
@ -101,6 +100,7 @@
[column]
grow_factor = 1
horizontal_grow = "true"
[grid]
@ -110,6 +110,8 @@
# minimap
[column]
grow_factor = 0
horizontal_alignment = "left"
vertical_alignment = "top"
[grid]
@ -118,16 +120,19 @@
[column]
grow_factor = 0
# horizontal_grow = "true" FIXME enable
# vertical_grow = "true" FIXME enable
#horizontal_grow = "true" FIXME enable
#vertical_grow = "true" FIXME enable
border = "all"
border_size = 5
horizontal_alignment = "left"
[minimap]
id = "minimap"
definition = "default"
[/minimap]
{GUI_FORCE_WIDGET_MINIMUM_SIZE 250 250 (
[minimap]
id = "minimap"
definition = "no_size"
[/minimap]
)}
[/column]
@ -236,7 +241,8 @@
# map listbox
[column]
grow_factor = 1
grow_factor = 0
horizontal_grow = "true"
[grid]
@ -278,11 +284,32 @@
grow_factor = 1
horizontal_grow = "true"
[toggle_button]
definition = "listbox_text"
[toggle_panel]
definition = "default"
return_value_id = "ok"
[/toggle_button]
[grid]
[row]
[column]
grow_factor = 1
horizontal_grow = "true"
border = "all"
border_size = 5
[label]
id = "game_name"
definition = "default"
[/label]
[/column]
[/row]
[/grid]
[/toggle_panel]
[/column]
@ -302,7 +329,9 @@
# settings
[column]
grow_factor = 0
grow_factor = 1
vertical_alignment = "top"
horizontal_grow = "true"
[grid]
@ -569,12 +598,8 @@
[/row]
[/grid]
[/resolution]
[/window]

20
src/gui/dialogs/multiplayer/mp_create_game.cpp
View file

@ -92,10 +92,14 @@ void tmp_create_game::pre_show(twindow& window)
#endif
// Load option (might turn it into a button later).
std::map<std::string, string_map> data;
string_map item;
item.emplace("label", _("Load Game"));
item.emplace("tooltip", _("Load Game..."));
list.add_row(item);
item["label"] = _("Load Game");
item["tooltip"] = _("Load Game...");
data.emplace("game_name", item);
list.add_row(data);
// User maps
/* FIXME implement user maps
@ -115,10 +119,14 @@ void tmp_create_game::pre_show(twindow& window)
for(const auto & map : cfg_.child_range("multiplayer"))
{
if(map["allow_new_game"].to_bool(true)) {
std::map<std::string, string_map> data;
string_map item;
item.emplace("label", map["name"].str());
item.emplace("tooltip", map["name"].str());
list.add_row(item);
item["label"] = map["name"].str();
item["tooltip"] = map["name"].str();
data.emplace("game_name", item);
list.add_row(data);
// This hack is needed since the next item is too wide to fit.
// and the scrollbar can't truncate text yet.