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

Rename all xxx_defintion to the more generic definition...

Browse source 
fixes a bug where all widgets except the button will fall back to the
default definition.
This commit is contained in:
Mark de Wever 2008-04-11 18:53:24 +00:00
parent d6b89db102
commit b2332eb70a
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
data/gui/default/window/addon.cfg
View file

@ -14,7 +14,7 @@
width = 600 width = 600
height = 200 height = 200
window_definition = "default" definition = "default"
[grid] [grid]
@ -29,7 +29,7 @@
border_size = 5 border_size = 5
horizontal_alignment = "left" horizontal_alignment = "left"
[label] [label]
label_definition = "default" definition = "default"
label = _ "Connect to Server" label = _ "Connect to Server"
[/label] [/label]
@ -48,7 +48,7 @@
border_size = 5 border_size = 5
horizontal_alignment = "left" horizontal_alignment = "left"
[label] [label]
label_definition = "default" definition = "default"
label = _ "You will now connect to a server to download add-ons." label = _ "You will now connect to a server to download add-ons."
[/label] [/label]
@ -78,7 +78,7 @@
horizontal_alignment = "left" horizontal_alignment = "left"
[label] [label]
label_definition = "default" definition = "default"
label = _ "name :" label = _ "name :"
[/label] [/label]
@ -94,7 +94,7 @@
[text_box] [text_box]
id = "host_name" id = "host_name"
edit_box_definition = "default" definition = "default"
size_text = _ "very long text which might need to fit" size_text = _ "very long text which might need to fit"
label = "" label = ""
@ -126,7 +126,7 @@
[label] [label]
# Dummy; empty cells aren't allowed (yet). # Dummy; empty cells aren't allowed (yet).
label_definition = "default" definition = "default"
label = "" label = ""
[/label] [/label]
@ -140,7 +140,7 @@
[button] [button]
# just show how the default looks. # just show how the default looks.
button_definition = "default" definition = "default"
size_text = _ "manage addons" size_text = _ "manage addons"
label = _ "manage addons" label = _ "manage addons"
@ -165,7 +165,7 @@
[button] [button]
id = "ok" id = "ok"
button_definition = "default" definition = "default"
size_text = _ "connect" size_text = _ "connect"
label = _ "connect" label = _ "connect"
@ -180,7 +180,7 @@
[button] [button]
id = "cancel" id = "cancel"
button_definition = "default" definition = "default"
label = _ "cancel" label = _ "cancel"
[/button] [/button]

6
src/gui/widgets/window_builder.cpp
View file

@ -212,7 +212,7 @@ twindow_builder::tresolution::tresolution(const config& cfg) :
window_height(lexical_cast_default<unsigned>(cfg["window_height"])), window_height(lexical_cast_default<unsigned>(cfg["window_height"])),
width(lexical_cast_default<unsigned>(cfg["width"])), width(lexical_cast_default<unsigned>(cfg["width"])),
height(lexical_cast_default<unsigned>(cfg["height"])), height(lexical_cast_default<unsigned>(cfg["height"])),
definition(cfg["window_definition"]), definition(cfg["definition"]),
grid(0) //new tbuilder_grid(cfg.child("grid"))) grid(0) //new tbuilder_grid(cfg.child("grid")))
{ {
/*WIKI /*WIKI
@ -223,7 +223,7 @@ twindow_builder::tresolution::tresolution(const config& cfg) :
* width = (unsigned) Width of the window to show. * width = (unsigned) Width of the window to show.
* height = (unsigned) Height of the window to show. * height = (unsigned) Height of the window to show.
* *
* window_definition = (string = "default") * definition = (string = "default")
* Definition of the window which we want to show. * Definition of the window which we want to show.
* *
* [grid] The grid with the widgets to show. * [grid] The grid with the widgets to show.
@ -359,7 +359,7 @@ tbuilder_grid::tbuilder_grid(const config& cfg) :
tbuilder_control::tbuilder_control(const config& cfg) : tbuilder_control::tbuilder_control(const config& cfg) :
tbuilder_widget(cfg), tbuilder_widget(cfg),
id(cfg["id"]), id(cfg["id"]),
definition(cfg["button_definition"]), definition(cfg["definition"]),
label(cfg["label"]) label(cfg["label"])
{ {