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
1=== modified file 'src/editor/ui_menus/editor_main_menu_new_map.cc'
2--- src/editor/ui_menus/editor_main_menu_new_map.cc 2012-02-15 21:25:34 +0000
3+++ src/editor/ui_menus/editor_main_menu_new_map.cc 2012-03-29 18:11:53 +0000
4@@ -67,14 +67,14 @@
5
6 UI::Button * widthupbtn = new UI::Button
7 (this, "width_up",
8- posx, posy, 20, 20,
9+ get_inner_w() - spacing - 20, posy, 20, 20,
10 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
11 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
12 widthupbtn->sigclicked.connect(boost::bind(&Main_Menu_New_Map::button_clicked, this, 0));
13
14 UI::Button * widthdownbtn = new UI::Button
15 (this, "width_down",
16- get_inner_w() - spacing - 20, posy, 20, 20,
17+ posx, posy, 20, 20,
18 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
19 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
20 widthdownbtn->sigclicked.connect(boost::bind(&Main_Menu_New_Map::button_clicked, this, 1));
21@@ -88,14 +88,14 @@
22
23 UI::Button * heightupbtn = new UI::Button
24 (this, "height_up",
25- posx, posy, 20, 20,
26+ get_inner_w() - spacing - 20, posy, 20, 20,
27 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
28 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
29 heightupbtn->sigclicked.connect(boost::bind(&Main_Menu_New_Map::button_clicked, this, 2));
30
31 UI::Button * heightdownbtn = new UI::Button
32 (this, "height_down",
33- get_inner_w() - spacing - 20, posy, 20, 20,
34+ posx, posy, 20, 20,
35 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
36 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
37 heightdownbtn->sigclicked.connect(boost::bind(&Main_Menu_New_Map::button_clicked, this, 3));
38
39=== modified file 'src/editor/ui_menus/editor_main_menu_random_map.cc'
40--- src/editor/ui_menus/editor_main_menu_random_map.cc 2012-02-15 21:25:34 +0000
41+++ src/editor/ui_menus/editor_main_menu_random_map.cc 2012-03-29 18:11:53 +0000
42@@ -100,7 +100,7 @@
43
44 UI::Button * widthupbtn = new UI::Button
45 (this, "width_up",
46- posx, posy, 20, 20,
47+ get_inner_w() - spacing - 20, posy, 20, 20,
48 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
49 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
50 widthupbtn->sigclicked.connect
51@@ -108,7 +108,7 @@
52
53 UI::Button * widthdownbtn = new UI::Button
54 (this, "width_down",
55- get_inner_w() - spacing - 20, posy, 20, 20,
56+ posx, posy, 20, 20,
57 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
58 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
59 widthdownbtn->sigclicked.connect
60@@ -130,7 +130,7 @@
61
62 UI::Button * heightupbtn = new UI::Button
63 (this, "height_up",
64- posx, posy, 20, 20,
65+ get_inner_w() - spacing - 20, posy, 20, 20,
66 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
67 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
68 heightupbtn->sigclicked.connect
69@@ -138,7 +138,7 @@
70
71 UI::Button * heightdownbtn = new UI::Button
72 (this, "height_down",
73- get_inner_w() - spacing - 20, posy, 20, 20,
74+ posx, posy, 20, 20,
75 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
76 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
77 heightdownbtn->sigclicked.connect
78@@ -151,7 +151,7 @@
79
80 UI::Button * waterupbtn = new UI::Button
81 (this, "water_up",
82- posx, posy, 20, 20,
83+ get_inner_w() - spacing - 20, posy, 20, 20,
84 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
85 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
86 waterupbtn->sigclicked.connect
87@@ -159,7 +159,7 @@
88
89 UI::Button * waterdownbtn = new UI::Button
90 (this, "water_down",
91- get_inner_w() - spacing - 20, posy, 20, 20,
92+ posx, posy, 20, 20,
93 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
94 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
95 waterdownbtn->sigclicked.connect
96@@ -176,7 +176,7 @@
97
98 UI::Button * landupbtn = new UI::Button
99 (this, "land_up",
100- posx, posy, 20, 20,
101+ get_inner_w() - spacing - 20, posy, 20, 20,
102 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
103 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
104 landupbtn->sigclicked.connect
105@@ -184,7 +184,7 @@
106
107 UI::Button * landdownbtn = new UI::Button
108 (this, "land_down",
109- get_inner_w() - spacing - 20, posy, 20, 20,
110+ posx, posy, 20, 20,
111 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
112 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
113 landdownbtn->sigclicked.connect
114@@ -202,7 +202,7 @@
115
116 UI::Button * wastelandupbtn = new UI::Button
117 (this, "wasteland_up",
118- posx, posy, 20, 20,
119+ get_inner_w() - spacing - 20, posy, 20, 20,
120 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
121 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
122 wastelandupbtn->sigclicked.connect
123@@ -210,7 +210,7 @@
124
125 UI::Button * wastelanddownbtn = new UI::Button
126 (this, "wasteland_down",
127- get_inner_w() - spacing - 20, posy, 20, 20,
128+ posx, posy, 20, 20,
129 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
130 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
131 wastelanddownbtn->sigclicked.connect
132@@ -312,7 +312,7 @@
133
134 UI::Button * playerupbtn = new UI::Button
135 (this, "player_up",
136- posx, posy, 20, 20,
137+ get_inner_w() - spacing - 20, posy, 20, 20,
138 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
139 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
140 playerupbtn->sigclicked.connect
141@@ -320,7 +320,7 @@
142
143 UI::Button * playerdownbtn = new UI::Button
144 (this, "player_down",
145- get_inner_w() - spacing - 20, posy, 20, 20,
146+ posx, posy, 20, 20,
147 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
148 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
149 playerdownbtn->sigclicked.connect

Subscribers

People subscribed via source and target branches

to status/vote changes: