Author: mordante
Date: Sat Aug 23 15:44:26 2008
New Revision: 28874
URL: http://svn.gna.org/viewcvs/wesnoth?rev=28874&view=rev
Log:
Add the new button in the addon dialog to the definition as well.
Modified:
trunk/data/gui/default/window/addon.cfg
trunk/src/addon_management.cpp
trunk/src/gui/dialogs/addon_connect.cpp
Modified: trunk/data/gui/default/window/addon.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/window/addon.cfg?rev=28874&r1=28873&r2=28874&view=diff
==============================================================================
--- trunk/data/gui/default/window/addon.cfg (original)
+++ trunk/data/gui/default/window/addon.cfg Sat Aug 23 15:44:26 2008
@@ -121,15 +121,29 @@
grow_factor = 0
[column]
+ border = "all"
+ border_size = 5
+
horizontal_alignment = "left"
+
+ [button]
+ # just
show how the default looks.
+
definition = "default"
+
+ tooltip
= "Update locally installed addons."
+
+
size_text = _ "Update add-ons"
+ label =
_ "Update add-ons"
+
+ # we
define the return value manually instead of being
+ #
linked to the id. Not sure whether that's the best
+ #
solution, but it's nice as proof-of-concept.
+
return_value = 3
+ [/button]
+
+ [/column]
+
+ [column]
grow_factor = 1
-
- [spacer]
-
definition = "default"
- [/spacer]
-
- [/column]
-
- [column]
[spacer]
definition = "default"
Modified: trunk/src/addon_management.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/addon_management.cpp?rev=28874&r1=28873&r2=28874&view=diff
==============================================================================
--- trunk/src/addon_management.cpp (original)
+++ trunk/src/addon_management.cpp Sat Aug 23 15:44:26 2008
@@ -1129,7 +1129,7 @@
const int addon_download = 0;
const int addon_uninstall = 2; // NOTE this value is also known by WML
so don't change it.
- const int addon_update = 3;
+ const int addon_update = 3; // NOTE this value is also known by WML
so don't change it.
} // end unnamed namespace 4
@@ -1149,8 +1149,8 @@
res = addon_dlg.get_retval();
if(res == gui2::twindow::OK) {
res = 0;
- remote_host = addon_dlg.host_name();
- }
+ }
+ remote_host = addon_dlg.host_name();
} else {
gui::dialog svr_dialog(disp,
_("Connect to add-ons server"),
Modified: trunk/src/gui/dialogs/addon_connect.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/addon_connect.cpp?rev=28874&r1=28873&r2=28874&view=diff
==============================================================================
--- trunk/src/gui/dialogs/addon_connect.cpp (original)
+++ trunk/src/gui/dialogs/addon_connect.cpp Sat Aug 23 15:44:26 2008
@@ -40,6 +40,8 @@
* @start_table = container
* [] (button) (2) This button closes the dialog and starts
* the addon manager.
+ * [] (button) (3) This button closes the dialog and starts
+ * the update routine.
* host_name (text_box) This text contains the name of the
server
* to connect to.
* @end_table
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits