Lgtm. > Am 17.03.2014 um 15:25 schrieb Tino <[email protected]>: > > 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-03-09 > 10:28:39 +0000 +++ src/ui_fsmenu/mapselect.cc 2014-03-17 14:24:48 > +0000 @@ -147,9 +147,9 @@ #define NR_PLAYERS_WIDTH 35 /** TRANSLATORS: Column > title for number of players in map list */ - > m_table.add_column(NR_PLAYERS_WIDTH, _("#"), UI::Align_HCenter); + > m_table.add_column(NR_PLAYERS_WIDTH, _("#"), "", UI::Align_HCenter); > m_table.add_column - (m_table.get_w() - NR_PLAYERS_WIDTH, _("Map Name"), > UI::Align_Left); + (m_table.get_w() - NR_PLAYERS_WIDTH, _("Map Name"), "", > UI::Align_Left); m_table.set_column_compare (1, boost::bind === 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 @@ { // building list > m_table.add_column(310, _("Name")); - m_table.add_column (70, _("Size"), > UI::Align_HCenter); - m_table.add_column (70, _("Prod"), > UI::Align_Right); - m_table.add_column (70, _("Owned"), UI::Align_Right); - > m_table.add_column (70, _("Build"), UI::Align_Right); + > m_table.add_column (70, _("Size"), "", UI::Align_HCenter); + > m_table.add_column (70, _("Prod"), "", UI::Align_Right); + > m_table.add_column (70, _("Owned"), "", UI::Align_Right); + > m_table.add_column (70, _("Build"), "", UI::Align_Right); > m_table.selected.connect(boost::bind(&Building_Statistics_Menu::table_changed, > this, _1)); m_table.set_column_compare (Columns::Size, === 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 @@ list = new UI::Table(this, 5, 35, 570, 110); > list->selected.connect(boost::bind(&GameMessageMenu::selected, this, _1)); > list->double_clicked.connect(boost::bind(&GameMessageMenu::double_clicked, > this, _1)); - list->add_column (60, _("Select"), UI::Align_HCenter, true); > - list->add_column (60, _("Status"), UI::Align_HCenter); + > list->add_column (60, _("Select"), "", UI::Align_HCenter, true); + > list->add_column (60, _("Status"), "", UI::Align_HCenter); > list->add_column(330, _("Title")); list->add_column(120, _("Time sent")); === > 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 @@ // Prepare table m_players_table->add_column(150, > _("Player")); - m_players_table->add_column(50, _("Team"), > UI::Align_HCenter); - m_players_table->add_column(100, _("Status"), > UI::Align_HCenter); + m_players_table->add_column(50, _("Team"), "", > UI::Align_HCenter); + m_players_table->add_column(100, _("Status"), "", > UI::Align_HCenter); m_players_table->add_column(100, _("Time")); // Prepare > Elements > _______________________________________________ > Mailing list: https://launchpad.net/~widelands-dev > Post to : [email protected] > Unsubscribe : https://launchpad.net/~widelands-dev > More help : https://help.launchpad.net/ListHelp
-- 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. _______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
