widelands

Merge lp:~alocritani/widelands/switch_-+_position_editor into lp:widelands

  1. switch_-+_position_editor
  2. Merge into trunk
Proposed by Angelo Locritani
Status: Merged
Merged at revision: 6363
Proposed branch: lp:~alocritani/widelands/switch_-+_position_editor
Merge into: lp:widelands
Diff against target: 149 lines (+16/-16)
2 files modified
src/editor/ui_menus/editor_main_menu_new_map.cc (+4/-4)
src/editor/ui_menus/editor_main_menu_random_map.cc (+12/-12)
To merge this branch: bzr merge lp:~alocritani/widelands/switch_-+_position_editor
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+99991@code.launchpad.net

Description of the change

switched other +/- buttons in editor windows.

Of couse not for build17, 'cause of Feature Freeze

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/editor/ui_menus/editor_main_menu_new_map.cc'
--- src/editor/ui_menus/editor_main_menu_new_map.cc 2012-02-15 21:25:34 +0000
+++ src/editor/ui_menus/editor_main_menu_new_map.cc 2012-03-29 18:11:53 +0000
@@ -67,14 +67,14 @@
6767
68 UI::Button * widthupbtn = new UI::Button68 UI::Button * widthupbtn = new UI::Button
69 (this, "width_up",69 (this, "width_up",
70 posx, posy, 20, 20,70 get_inner_w() - spacing - 20, posy, 20, 20,
71 g_gr->get_picture(PicMod_UI, "pics/but1.png"),71 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
72 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));72 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
73 widthupbtn->sigclicked.connect(boost::bind(&Main_Menu_New_Map::button_clicked, this, 0));73 widthupbtn->sigclicked.connect(boost::bind(&Main_Menu_New_Map::button_clicked, this, 0));
7474
75 UI::Button * widthdownbtn = new UI::Button75 UI::Button * widthdownbtn = new UI::Button
76 (this, "width_down",76 (this, "width_down",
77 get_inner_w() - spacing - 20, posy, 20, 20,77 posx, posy, 20, 20,
78 g_gr->get_picture(PicMod_UI, "pics/but1.png"),78 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
79 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));79 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
80 widthdownbtn->sigclicked.connect(boost::bind(&Main_Menu_New_Map::button_clicked, this, 1));80 widthdownbtn->sigclicked.connect(boost::bind(&Main_Menu_New_Map::button_clicked, this, 1));
@@ -88,14 +88,14 @@
8888
89 UI::Button * heightupbtn = new UI::Button89 UI::Button * heightupbtn = new UI::Button
90 (this, "height_up",90 (this, "height_up",
91 posx, posy, 20, 20,91 get_inner_w() - spacing - 20, posy, 20, 20,
92 g_gr->get_picture(PicMod_UI, "pics/but1.png"),92 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
93 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));93 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
94 heightupbtn->sigclicked.connect(boost::bind(&Main_Menu_New_Map::button_clicked, this, 2));94 heightupbtn->sigclicked.connect(boost::bind(&Main_Menu_New_Map::button_clicked, this, 2));
9595
96 UI::Button * heightdownbtn = new UI::Button96 UI::Button * heightdownbtn = new UI::Button
97 (this, "height_down",97 (this, "height_down",
98 get_inner_w() - spacing - 20, posy, 20, 20,98 posx, posy, 20, 20,
99 g_gr->get_picture(PicMod_UI, "pics/but1.png"),99 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
100 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));100 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
101 heightdownbtn->sigclicked.connect(boost::bind(&Main_Menu_New_Map::button_clicked, this, 3));101 heightdownbtn->sigclicked.connect(boost::bind(&Main_Menu_New_Map::button_clicked, this, 3));
102102
=== modified file 'src/editor/ui_menus/editor_main_menu_random_map.cc'
--- src/editor/ui_menus/editor_main_menu_random_map.cc 2012-02-15 21:25:34 +0000
+++ src/editor/ui_menus/editor_main_menu_random_map.cc 2012-03-29 18:11:53 +0000
@@ -100,7 +100,7 @@
100100
101 UI::Button * widthupbtn = new UI::Button101 UI::Button * widthupbtn = new UI::Button
102 (this, "width_up",102 (this, "width_up",
103 posx, posy, 20, 20,103 get_inner_w() - spacing - 20, posy, 20, 20,
104 g_gr->get_picture(PicMod_UI, "pics/but1.png"),104 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
105 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));105 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
106 widthupbtn->sigclicked.connect106 widthupbtn->sigclicked.connect
@@ -108,7 +108,7 @@
108108
109 UI::Button * widthdownbtn = new UI::Button109 UI::Button * widthdownbtn = new UI::Button
110 (this, "width_down",110 (this, "width_down",
111 get_inner_w() - spacing - 20, posy, 20, 20,111 posx, posy, 20, 20,
112 g_gr->get_picture(PicMod_UI, "pics/but1.png"),112 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
113 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));113 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
114 widthdownbtn->sigclicked.connect114 widthdownbtn->sigclicked.connect
@@ -130,7 +130,7 @@
130130
131 UI::Button * heightupbtn = new UI::Button131 UI::Button * heightupbtn = new UI::Button
132 (this, "height_up",132 (this, "height_up",
133 posx, posy, 20, 20,133 get_inner_w() - spacing - 20, posy, 20, 20,
134 g_gr->get_picture(PicMod_UI, "pics/but1.png"),134 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
135 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));135 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
136 heightupbtn->sigclicked.connect136 heightupbtn->sigclicked.connect
@@ -138,7 +138,7 @@
138138
139 UI::Button * heightdownbtn = new UI::Button139 UI::Button * heightdownbtn = new UI::Button
140 (this, "height_down",140 (this, "height_down",
141 get_inner_w() - spacing - 20, posy, 20, 20,141 posx, posy, 20, 20,
142 g_gr->get_picture(PicMod_UI, "pics/but1.png"),142 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
143 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));143 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
144 heightdownbtn->sigclicked.connect144 heightdownbtn->sigclicked.connect
@@ -151,7 +151,7 @@
151151
152 UI::Button * waterupbtn = new UI::Button152 UI::Button * waterupbtn = new UI::Button
153 (this, "water_up",153 (this, "water_up",
154 posx, posy, 20, 20,154 get_inner_w() - spacing - 20, posy, 20, 20,
155 g_gr->get_picture(PicMod_UI, "pics/but1.png"),155 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
156 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));156 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
157 waterupbtn->sigclicked.connect157 waterupbtn->sigclicked.connect
@@ -159,7 +159,7 @@
159159
160 UI::Button * waterdownbtn = new UI::Button160 UI::Button * waterdownbtn = new UI::Button
161 (this, "water_down",161 (this, "water_down",
162 get_inner_w() - spacing - 20, posy, 20, 20,162 posx, posy, 20, 20,
163 g_gr->get_picture(PicMod_UI, "pics/but1.png"),163 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
164 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));164 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
165 waterdownbtn->sigclicked.connect165 waterdownbtn->sigclicked.connect
@@ -176,7 +176,7 @@
176176
177 UI::Button * landupbtn = new UI::Button177 UI::Button * landupbtn = new UI::Button
178 (this, "land_up",178 (this, "land_up",
179 posx, posy, 20, 20,179 get_inner_w() - spacing - 20, posy, 20, 20,
180 g_gr->get_picture(PicMod_UI, "pics/but1.png"),180 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
181 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));181 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
182 landupbtn->sigclicked.connect182 landupbtn->sigclicked.connect
@@ -184,7 +184,7 @@
184184
185 UI::Button * landdownbtn = new UI::Button185 UI::Button * landdownbtn = new UI::Button
186 (this, "land_down",186 (this, "land_down",
187 get_inner_w() - spacing - 20, posy, 20, 20,187 posx, posy, 20, 20,
188 g_gr->get_picture(PicMod_UI, "pics/but1.png"),188 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
189 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));189 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
190 landdownbtn->sigclicked.connect190 landdownbtn->sigclicked.connect
@@ -202,7 +202,7 @@
202202
203 UI::Button * wastelandupbtn = new UI::Button203 UI::Button * wastelandupbtn = new UI::Button
204 (this, "wasteland_up",204 (this, "wasteland_up",
205 posx, posy, 20, 20,205 get_inner_w() - spacing - 20, posy, 20, 20,
206 g_gr->get_picture(PicMod_UI, "pics/but1.png"),206 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
207 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));207 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
208 wastelandupbtn->sigclicked.connect208 wastelandupbtn->sigclicked.connect
@@ -210,7 +210,7 @@
210210
211 UI::Button * wastelanddownbtn = new UI::Button211 UI::Button * wastelanddownbtn = new UI::Button
212 (this, "wasteland_down",212 (this, "wasteland_down",
213 get_inner_w() - spacing - 20, posy, 20, 20,213 posx, posy, 20, 20,
214 g_gr->get_picture(PicMod_UI, "pics/but1.png"),214 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
215 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));215 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
216 wastelanddownbtn->sigclicked.connect216 wastelanddownbtn->sigclicked.connect
@@ -312,7 +312,7 @@
312312
313 UI::Button * playerupbtn = new UI::Button313 UI::Button * playerupbtn = new UI::Button
314 (this, "player_up",314 (this, "player_up",
315 posx, posy, 20, 20,315 get_inner_w() - spacing - 20, posy, 20, 20,
316 g_gr->get_picture(PicMod_UI, "pics/but1.png"),316 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
317 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));317 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
318 playerupbtn->sigclicked.connect318 playerupbtn->sigclicked.connect
@@ -320,7 +320,7 @@
320320
321 UI::Button * playerdownbtn = new UI::Button321 UI::Button * playerdownbtn = new UI::Button
322 (this, "player_down",322 (this, "player_down",
323 get_inner_w() - spacing - 20, posy, 20, 20,323 posx, posy, 20, 20,
324 g_gr->get_picture(PicMod_UI, "pics/but1.png"),324 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
325 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));325 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
326 playerdownbtn->sigclicked.connect326 playerdownbtn->sigclicked.connect

Subscribers

People subscribed via source and target branches

to status/vote changes: