widelands

Merge lp:~alocritani/widelands/missing_tooltips into lp:widelands

  1. missing_tooltips
  2. Merge into trunk
Proposed by Angelo Locritani
Status: Merged
Merged at revision: 6235
Proposed branch: lp:~alocritani/widelands/missing_tooltips
Merge into: lp:widelands
Diff against target: 61 lines (+8/-8)
4 files modified
src/wui/buildingwindow.cc (+1/-1)
src/wui/constructionsitewindow.cc (+1/-1)
src/wui/dismantlesitewindow.cc (+1/-1)
src/wui/soldiercapacitycontrol.cc (+5/-5)
To merge this branch: bzr merge lp:~alocritani/widelands/missing_tooltips
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+93732@code.launchpad.net

Description of the change

Added missing tooltips. A catalog update is needed

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/wui/buildingwindow.cc'
2--- src/wui/buildingwindow.cc 2012-01-11 19:40:19 +0000
3+++ src/wui/buildingwindow.cc 2012-02-19 14:51:19 +0000
4@@ -268,7 +268,7 @@
5 new UI::Button
6 (capsbuttons, "goto", 0, 0, 34, 34,
7 g_gr->get_picture(PicMod_UI, "pics/but4.png"),
8- g_gr->get_picture(PicMod_Game, "pics/menu_goto.png"));
9+ g_gr->get_picture(PicMod_Game, "pics/menu_goto.png"), _("Center view on this"));
10 gotobtn->sigclicked.connect(boost::bind(&Building_Window::clicked_goto, boost::ref(*this)));
11 capsbuttons->add
12 (gotobtn,
13
14=== modified file 'src/wui/constructionsitewindow.cc'
15--- src/wui/constructionsitewindow.cc 2011-11-30 21:38:37 +0000
16+++ src/wui/constructionsitewindow.cc 2012-02-19 14:51:19 +0000
17@@ -71,7 +71,7 @@
18 UI::Box::AlignLeft);
19
20
21- get_tabs()->add("wares", g_gr->get_picture(PicMod_UI, pic_tab_wares), &box);
22+ get_tabs()->add("wares", g_gr->get_picture(PicMod_UI, pic_tab_wares), &box, _("Building materials"));
23 }
24
25
26
27=== modified file 'src/wui/dismantlesitewindow.cc'
28--- src/wui/dismantlesitewindow.cc 2011-11-30 21:38:37 +0000
29+++ src/wui/dismantlesitewindow.cc 2012-02-19 14:51:19 +0000
30@@ -65,7 +65,7 @@
31 for (uint32_t i = 0; i < cs.get_nrwaresqueues(); ++i)
32 Building_Window::create_ware_queue_panel(&box, cs, cs.get_waresqueue(i), true);
33
34- get_tabs()->add("wares", g_gr->get_picture(PicMod_UI, pic_tab_wares), &box);
35+ get_tabs()->add("wares", g_gr->get_picture(PicMod_UI, pic_tab_wares), &box, _("Building materials"));
36 }
37
38
39
40=== modified file 'src/wui/soldiercapacitycontrol.cc'
41--- src/wui/soldiercapacitycontrol.cc 2011-11-30 21:38:37 +0000
42+++ src/wui/soldiercapacitycontrol.cc 2012-02-19 14:51:19 +0000
43@@ -62,13 +62,13 @@
44 m_igb(igb),
45 m_building(building),
46 m_decrease
47+ (this, "decrease", 0, 0, 24, 24,
48+ g_gr->get_picture(PicMod_UI, "pics/but4.png"),
49+ g_gr->get_picture(PicMod_Game, pic_down_train), _("Decrease capacity")),
50+m_increase
51 (this, "increase", 0, 0, 24, 24,
52 g_gr->get_picture(PicMod_UI, "pics/but4.png"),
53- g_gr->get_picture(PicMod_Game, pic_down_train)),
54-m_increase
55- (this, "decrease", 0, 0, 24, 24,
56- g_gr->get_picture(PicMod_UI, "pics/but4.png"),
57- g_gr->get_picture(PicMod_Game, pic_up_train)),
58+ g_gr->get_picture(PicMod_Game, pic_up_train), _("Increase capacity")),
59 m_value(this, "", UI::Align_Center)
60 {
61 m_decrease.sigclicked.connect(boost::bind(&SoldierCapacityControl::click_decrease, boost::ref(*this)));

Subscribers

People subscribed via source and target branches

to status/vote changes: