widelands

Merge lp:~widelands-dev/widelands/tooltips_fixes into lp:widelands

  1. tooltips_fixes
  2. Merge into trunk
Proposed by Tino
Status: Merged
Merged at revision: 6882
Proposed branch: lp:~widelands-dev/widelands/tooltips_fixes
Merge into: lp:widelands
Diff against target: 147 lines (+32/-17)
7 files modified
src/ui_basic/table.cc (+3/-2)
src/ui_basic/table.h (+4/-2)
src/ui_fsmenu/internet_lobby.cc (+15/-3)
src/ui_fsmenu/mapselect.cc (+2/-2)
src/wui/building_statistics_menu.cc (+4/-4)
src/wui/game_message_menu.cc (+2/-2)
src/wui/game_summary.cc (+2/-2)
To merge this branch: bzr merge lp:~widelands-dev/widelands/tooltips_fixes
Reviewer Review Type Date Requested Status
Tino Approve
Review via email: mp+211326@code.launchpad.net

Description of the change

- Allow setting a tooltip for table column headers
- Implements a tooltip for the internet lobby user status column

To post a comment you must log in.
Revision history for this message
SirVer (sirver) wrote :
Download full text (6.0 KiB)

Lgtm.

> Am 17.03.2014 um 15:25 schrieb Tino <email address hidden>:
>
> Tino has proposed merging lp:~widelands-dev/widelands/tooltips_fixes into lp:widelands.
>
> Requested reviews:
> Widelands Developers (widelands-dev)
>
> For more details, see:
> https://code.launchpad.net/~widelands-dev/widelands/tooltips_fixes/+merge/211326
>
> - Allow setting a tooltip for table column headers
> - Implements a tooltip for the internet lobby user status column
> --
> https://code.launchpad.net/~widelands-dev/widelands/tooltips_fixes/+merge/211326
> Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/tooltips_fixes into lp:widelands.
> === modified file 'src/ui_basic/table.cc' --- src/ui_basic/table.cc 2014-02-22 18:04:02 +0000 +++ src/ui_basic/table.cc 2014-03-17 14:24:48 +0000 @@ -78,7 +78,8 @@ /// Add a new column to this table. void Table::add_column (uint32_t const width, - const std::string & title, + const std::string & title, + const std::string & tooltip, Align const alignment, bool const is_checkbox_column) { @@ -101,7 +102,7 @@ (this, title, complete_width, 0, width, m_headerheight, g_gr->images().get("pics/but3.png"), - title, "", true, false); + title, tooltip, true, false); c.btn->sigclicked.connect (boost::bind(&Table::header_button_clicked, boost::ref(*this), m_columns.size())); c.btn->set_font(Font::get(m_fontname, m_fontsize)); === modified file 'src/ui_basic/table.h' --- src/ui_basic/table.h 2014-02-22 18:04:02 +0000 +++ src/ui_basic/table.h 2014-03-17 14:24:48 +0000 @@ -60,7 +60,8 @@ /// A column that has a title is sortable (by clicking on the title). void add_column (uint32_t width, - const std::string & title = std::string(), + const std::string & title = std::string(), + const std::string & tooltip = std::string(), Align = Align_Left, bool is_checkbox_column = false); @@ -165,7 +166,8 @@ void add_column (uint32_t width, - const std::string & title = std::string(), + const std::string & title = std::string(), + const std::string & tooltip = std::string(), Align = Align_Left, bool is_checkbox_column = false); === modified file 'src/ui_fsmenu/internet_lobby.cc' --- src/ui_fsmenu/internet_lobby.cc 2014-03-03 20:50:30 +0000 +++ src/ui_fsmenu/internet_lobby.cc 2014-03-17 14:24:48 +0000 @@ -19,7 +19,8 @@ #include "ui_fsmenu/internet_lobby.h" -#include +#include +#include #include "compile_diagnostics.h" #include "constants.h" @@ -151,8 +152,19 @@ servername .set_font(m_fn, m_fs, UI_FONT_CLR_FG); // prepare the lists - clientsonline .set_font(m_fn, m_fs); - clientsonline .add_column(22, "°"); + clientsonline .set_font(m_fn, m_fs); + std::string t_tip = (boost::format("%s%s%s%s%s%s%s%s%s%s") + % "
> " + % _("User Status") + % "
> " + % " " + % _("Registered") + % "
> " + % _("Administrator") + % "
> " + % _("Unregistered") + % "
>
> ").str(); + clientsonline .add_column(22, "°", t_tip); clientsonline .add_column((m_lisw - 22) * 3 / 8, _("Name")); clientsonline .add_column((m_lisw - 22) * 2 / 8, _("Points")); clientsonline .add_column((m_lisw - 22) * 3 / 8, _("Game")); === modified file 'src/ui_fsmenu/mapselect.cc' --- src/ui_fsmenu/mapselect.cc 2014...

Read more...

Revision history for this message
Tino (tino79) wrote :

Ah, ok, I am just going to merge it ;). Trunk is is really evolving atm...

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/ui_basic/table.cc'
--- src/ui_basic/table.cc 2014-02-22 18:04:02 +0000
+++ src/ui_basic/table.cc 2014-03-17 14:24:48 +0000
@@ -78,7 +78,8 @@
78/// Add a new column to this table.78/// Add a new column to this table.
79void Table<void *>::add_column79void Table<void *>::add_column
80 (uint32_t const width,80 (uint32_t const width,
81 const std::string & title,81 const std::string & title,
82 const std::string & tooltip,
82 Align const alignment,83 Align const alignment,
83 bool const is_checkbox_column)84 bool const is_checkbox_column)
84{85{
@@ -101,7 +102,7 @@
101 (this, title,102 (this, title,
102 complete_width, 0, width, m_headerheight,103 complete_width, 0, width, m_headerheight,
103 g_gr->images().get("pics/but3.png"),104 g_gr->images().get("pics/but3.png"),
104 title, "", true, false);105 title, tooltip, true, false);
105 c.btn->sigclicked.connect106 c.btn->sigclicked.connect
106 (boost::bind(&Table::header_button_clicked, boost::ref(*this), m_columns.size()));107 (boost::bind(&Table::header_button_clicked, boost::ref(*this), m_columns.size()));
107 c.btn->set_font(Font::get(m_fontname, m_fontsize));108 c.btn->set_font(Font::get(m_fontname, m_fontsize));
108109
=== modified file 'src/ui_basic/table.h'
--- src/ui_basic/table.h 2014-02-22 18:04:02 +0000
+++ src/ui_basic/table.h 2014-03-17 14:24:48 +0000
@@ -60,7 +60,8 @@
60 /// A column that has a title is sortable (by clicking on the title).60 /// A column that has a title is sortable (by clicking on the title).
61 void add_column61 void add_column
62 (uint32_t width,62 (uint32_t width,
63 const std::string & title = std::string(),63 const std::string & title = std::string(),
64 const std::string & tooltip = std::string(),
64 Align = Align_Left,65 Align = Align_Left,
65 bool is_checkbox_column = false);66 bool is_checkbox_column = false);
6667
@@ -165,7 +166,8 @@
165166
166 void add_column167 void add_column
167 (uint32_t width,168 (uint32_t width,
168 const std::string & title = std::string(),169 const std::string & title = std::string(),
170 const std::string & tooltip = std::string(),
169 Align = Align_Left,171 Align = Align_Left,
170 bool is_checkbox_column = false);172 bool is_checkbox_column = false);
171173
172174
=== modified file 'src/ui_fsmenu/internet_lobby.cc'
--- src/ui_fsmenu/internet_lobby.cc 2014-03-03 20:50:30 +0000
+++ src/ui_fsmenu/internet_lobby.cc 2014-03-17 14:24:48 +0000
@@ -19,7 +19,8 @@
1919
20#include "ui_fsmenu/internet_lobby.h"20#include "ui_fsmenu/internet_lobby.h"
2121
22#include <boost/bind.hpp>22#include <boost/bind.hpp>
23#include <boost/format.hpp>
2324
24#include "compile_diagnostics.h"25#include "compile_diagnostics.h"
25#include "constants.h"26#include "constants.h"
@@ -151,8 +152,19 @@
151 servername .set_font(m_fn, m_fs, UI_FONT_CLR_FG);152 servername .set_font(m_fn, m_fs, UI_FONT_CLR_FG);
152153
153 // prepare the lists154 // prepare the lists
154 clientsonline .set_font(m_fn, m_fs);155 clientsonline .set_font(m_fn, m_fs);
155 clientsonline .add_column(22, "°");156 std::string t_tip = (boost::format("%s%s%s%s%s%s%s%s%s%s")
157 % "<rt><p><font underline=yes>"
158 % _("User Status")
159 % "</font><br>"
160 % "<img src=pics/roadb_yellow.png> "
161 % _("Registered")
162 % "<br><img src=pics/roadb_green.png> "
163 % _("Administrator")
164 % "<br><img src=pics/roadb_red.png> "
165 % _("Unregistered")
166 % "</p></rt>").str();
167 clientsonline .add_column(22, "°", t_tip);
156 clientsonline .add_column((m_lisw - 22) * 3 / 8, _("Name"));168 clientsonline .add_column((m_lisw - 22) * 3 / 8, _("Name"));
157 clientsonline .add_column((m_lisw - 22) * 2 / 8, _("Points"));169 clientsonline .add_column((m_lisw - 22) * 2 / 8, _("Points"));
158 clientsonline .add_column((m_lisw - 22) * 3 / 8, _("Game"));170 clientsonline .add_column((m_lisw - 22) * 3 / 8, _("Game"));
159171
=== modified file 'src/ui_fsmenu/mapselect.cc'
--- src/ui_fsmenu/mapselect.cc 2014-03-09 10:28:39 +0000
+++ src/ui_fsmenu/mapselect.cc 2014-03-17 14:24:48 +0000
@@ -147,9 +147,9 @@
147147
148#define NR_PLAYERS_WIDTH 35148#define NR_PLAYERS_WIDTH 35
149 /** TRANSLATORS: Column title for number of players in map list */149 /** TRANSLATORS: Column title for number of players in map list */
150 m_table.add_column(NR_PLAYERS_WIDTH, _("#"), UI::Align_HCenter);150 m_table.add_column(NR_PLAYERS_WIDTH, _("#"), "", UI::Align_HCenter);
151 m_table.add_column151 m_table.add_column
152 (m_table.get_w() - NR_PLAYERS_WIDTH, _("Map Name"), UI::Align_Left);152 (m_table.get_w() - NR_PLAYERS_WIDTH, _("Map Name"), "", UI::Align_Left);
153 m_table.set_column_compare153 m_table.set_column_compare
154 (1,154 (1,
155 boost::bind155 boost::bind
156156
=== modified file 'src/wui/building_statistics_menu.cc'
--- src/wui/building_statistics_menu.cc 2014-03-05 11:59:09 +0000
+++ src/wui/building_statistics_menu.cc 2014-03-17 14:24:48 +0000
@@ -108,10 +108,10 @@
108{108{
109 // building list109 // building list
110 m_table.add_column(310, _("Name"));110 m_table.add_column(310, _("Name"));
111 m_table.add_column (70, _("Size"), UI::Align_HCenter);111 m_table.add_column (70, _("Size"), "", UI::Align_HCenter);
112 m_table.add_column (70, _("Prod"), UI::Align_Right);112 m_table.add_column (70, _("Prod"), "", UI::Align_Right);
113 m_table.add_column (70, _("Owned"), UI::Align_Right);113 m_table.add_column (70, _("Owned"), "", UI::Align_Right);
114 m_table.add_column (70, _("Build"), UI::Align_Right);114 m_table.add_column (70, _("Build"), "", UI::Align_Right);
115 m_table.selected.connect(boost::bind(&Building_Statistics_Menu::table_changed, this, _1));115 m_table.selected.connect(boost::bind(&Building_Statistics_Menu::table_changed, this, _1));
116 m_table.set_column_compare116 m_table.set_column_compare
117 (Columns::Size,117 (Columns::Size,
118118
=== modified file 'src/wui/game_message_menu.cc'
--- src/wui/game_message_menu.cc 2014-03-10 19:27:00 +0000
+++ src/wui/game_message_menu.cc 2014-03-17 14:24:48 +0000
@@ -53,8 +53,8 @@
53 list = new UI::Table<uintptr_t>(this, 5, 35, 570, 110);53 list = new UI::Table<uintptr_t>(this, 5, 35, 570, 110);
54 list->selected.connect(boost::bind(&GameMessageMenu::selected, this, _1));54 list->selected.connect(boost::bind(&GameMessageMenu::selected, this, _1));
55 list->double_clicked.connect(boost::bind(&GameMessageMenu::double_clicked, this, _1));55 list->double_clicked.connect(boost::bind(&GameMessageMenu::double_clicked, this, _1));
56 list->add_column (60, _("Select"), UI::Align_HCenter, true);56 list->add_column (60, _("Select"), "", UI::Align_HCenter, true);
57 list->add_column (60, _("Status"), UI::Align_HCenter);57 list->add_column (60, _("Status"), "", UI::Align_HCenter);
58 list->add_column(330, _("Title"));58 list->add_column(330, _("Title"));
59 list->add_column(120, _("Time sent"));59 list->add_column(120, _("Time sent"));
6060
6161
=== modified file 'src/wui/game_summary.cc'
--- src/wui/game_summary.cc 2014-02-22 18:04:02 +0000
+++ src/wui/game_summary.cc 2014-03-17 14:24:48 +0000
@@ -88,8 +88,8 @@
8888
89 // Prepare table89 // Prepare table
90 m_players_table->add_column(150, _("Player"));90 m_players_table->add_column(150, _("Player"));
91 m_players_table->add_column(50, _("Team"), UI::Align_HCenter);91 m_players_table->add_column(50, _("Team"), "", UI::Align_HCenter);
92 m_players_table->add_column(100, _("Status"), UI::Align_HCenter);92 m_players_table->add_column(100, _("Status"), "", UI::Align_HCenter);
93 m_players_table->add_column(100, _("Time"));93 m_players_table->add_column(100, _("Time"));
9494
95 // Prepare Elements95 // Prepare Elements

Subscribers

People subscribed via source and target branches

to status/vote changes: