mail[Wesnoth-commits] r36602 - in /trunk: data/gui/default/window/campaign_dialog.cfg src/gui/dialogs/campaign_selection.cpp


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by koraq on July 05, 2009 - 10:09:
Author: mordante
Date: Sun Jul  5 10:09:26 2009
New Revision: 36602

URL: http://svn.gna.org/viewcvs/wesnoth?rev=36602&view=rev
Log:
Campaign toggle button -> toggle pannel.

This change allows to change to the 'to be added' stacked widget later on, 
also
fixes the issue that the campaign text ended up in the border.

Modified:
    trunk/data/gui/default/window/campaign_dialog.cfg
    trunk/src/gui/dialogs/campaign_selection.cpp

Modified: trunk/data/gui/default/window/campaign_dialog.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/window/campaign_dialog.cfg?rev=36602&r1=36601&r2=36602&view=diff
==============================================================================
--- trunk/data/gui/default/window/campaign_dialog.cfg (original)
+++ trunk/data/gui/default/window/campaign_dialog.cfg Sun Jul  5 10:09:26 2009
@@ -73,14 +73,49 @@
                                                                              
                  grow_factor = 1
                                                                              
                  horizontal_grow = "true"
 
-                                                                             
                  [toggle_button]
-                                                                             
                          definition = "listbox_text_with_icon"
+                                                                             
                  [toggle_panel]
+                                                                             
                          definition = "default"
 
                                                                              
                          return_value_id = "ok"
-                                                                             
                  [/toggle_button]
+                                                                             
                          [grid]
+
+                                                                             
                                  [row]
+
+                                                                             
                                          [column]
+                                                                             
                                                  grow_factor = 1
+                                                                             
                                                  horizontal_grow = "true"
+
+                                                                             
                                                  border = "left"
+                                                                             
                                                  border_size = 3
+
+                                                                             
                                                  [image]
+                                                                             
                                                          id = "icon"
+                                                                             
                                                          definition = 
"default"
+                                                                             
                                                  [/image]
+
+                                                                             
                                          [/column]
+
+                                                                             
                                          [column]
+                                                                             
                                                  grow_factor = 1
+                                                                             
                                                  horizontal_grow = "true"
+
+                                                                             
                                                  border = "right"
+                                                                             
                                                  border_size = 8
+
+                                                                             
                                                  [label]
+                                                                             
                                                          id = "name"
+                                                                             
                                                          definition = 
"default"
+                                                                             
                                                  [/label]
+
+                                                                             
                                          [/column]
+
+                                                                             
                                  [/row]
+
+                                                                             
                          [/grid]
+
+                                                                             
                  [/toggle_panel]
 
                                                                              
          [/column]
-
 
                                                                              
  [/row]
 

Modified: trunk/src/gui/dialogs/campaign_selection.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/campaign_selection.cpp?rev=36602&r1=36601&r2=36602&view=diff
==============================================================================
--- trunk/src/gui/dialogs/campaign_selection.cpp (original)
+++ trunk/src/gui/dialogs/campaign_selection.cpp Sun Jul  5 10:09:26 2009
@@ -77,11 +77,15 @@
 
                /*** Add list item ***/
                string_map list_item;
+               std::map<std::string, string_map> list_item_item;
 
-               list_item.insert(std::make_pair("icon", c["icon"]));
-               list_item.insert(std::make_pair("label", c["name"]));
+               list_item["label"] = c["icon"];
+               list_item_item.insert(std::make_pair("icon", list_item));
 
-               list->add_row(list_item);
+               list_item["label"] = c["name"];
+               list_item_item.insert(std::make_pair("name", list_item));
+
+               list->add_row(list_item_item);
 
                /*** Add detail item ***/
                string_map detail_item;




Related Messages


Powered by MHonArc, Updated Sun Jul 05 11:20:09 2009