Initial implementation of the top bar

client/gui-qt/CMakeLists.txt

@@ -43,12 +43,12 @@ add_library(
   qtg_cxxside.cpp
   ratesdlg.cpp
   shortcuts.cpp
-  sidebar.cpp
   sciencedlg.cpp
   spaceshipdlg.cpp
   sprite.cpp
   themes.cpp
   tileset_debugger.cpp
+  top_bar.cpp
   tradecalculation.cpp
   tooltips.cpp
   unitreport.cpp

client/gui-qt/citydlg.cpp

@@ -55,8 +55,8 @@
 #include "mapview.h"
 #include "page_game.h"
 #include "qtg_cxxside.h"
-#include "sidebar.h"
 #include "tooltips.h"
+#include "top_bar.h"
 
 extern QString split_text(const QString &text, bool cut);
 extern QString cut_helptext(const QString &text);
@@ -2848,7 +2848,7 @@ void qtg_real_city_dialog_popup(struct city *pcity)
 {
   auto *widget = queen()->city_overlay;
   if (!queen()->city_overlay->isVisible()) {
-    sidebarShowMap(true);
+    top_bar_show_map();
     queen()->mapview_wdg->hide_all_fcwidgets();
   }
   center_tile_mapcanvas(pcity->tile);

client/gui-qt/cityrep.cpp

@@ -1243,9 +1243,8 @@ void city_report::update_city(struct city *pcity)
 /**
    Display the city report dialog.  Optionally raise it.
  */
-void city_report_dialog_popup(bool raise)
+void city_report_dialog_popup()
 {
-  Q_UNUSED(raise)
   int i;
   city_report *cr;
   QWidget *w;

client/gui-qt/diplodlg.cpp

@@ -37,8 +37,8 @@
 #include "fc_client.h"
 #include "icons.h"
 #include "page_game.h"
-#include "sidebar.h"
 #include "sprite.h"
+#include "top_bar.h"
 
 typedef advance *p_advance;
 typedef city *p_city;
@@ -675,8 +675,8 @@ void diplo_wdg::update_wdg()
  */
 void diplo_wdg::restore_pixmap()
 {
-  queen()->sw_diplo->setPixmap(
-      fcIcons::instance()->getPixmap(QStringLiteral("nations")));
+  queen()->sw_diplo->setIcon(
+      fcIcons::instance()->getIcon(QStringLiteral("nations")));
   queen()->sw_diplo->setCustomLabels(QString());
   queen()->sw_diplo->update();
 }
@@ -884,11 +884,12 @@ void handle_diplomacy_init_meeting(int counterpart, int initiated_from)
   hmid = qMax(1, hmid);
   p.drawPixmap(1, hmid, *pix2);
   p.end();
-  queen()->sw_diplo->setPixmap(pix3);
+  queen()->sw_diplo->setIcon(QIcon(*pix3));
   queen()->sw_diplo->setCustomLabels(
       QString(nation_plural_for_player(player_by_number(counterpart))));
   queen()->sw_diplo->update();
   delete pix2;
+  delete pix3;
   if (!queen()->isRepoDlgOpen(QStringLiteral("DDI"))) {
     dd = new diplo_dlg(counterpart, initiated_from);
 

client/gui-qt/economyreport.cpp

@@ -354,10 +354,9 @@ void real_economy_report_dialog_update(void *unused)
 }
 
 /**
-   Display the economy report.  Optionally raise it.
-   Typically triggered by F5.
+ * Display the economy report. Typically triggered by F5.
  */
-void economy_report_dialog_popup(bool raise)
+void economy_report_dialog_popup()
 {
   int i;
   eco_report *eco_rep;

client/gui-qt/fc_client.cpp

@@ -48,9 +48,9 @@
 #include "page_network.h"
 #include "page_pregame.h"
 #include "page_scenario.h"
-#include "sidebar.h"
 #include "sprite.h"
 #include "tileset_debugger.h"
+#include "top_bar.h"
 #include "voteinfo_bar.h"
 
 fcFont *fcFont::m_instance = 0;

client/gui-qt/gui_main.cpp

@@ -51,7 +51,6 @@ static fc_client *freeciv_qt;
 void reset_unit_table();
 static void apply_help_font(struct option *poption);
 static void apply_notify_font(struct option *poption);
-static void apply_sidebar(struct option *poption);
 static void apply_titlebar(struct option *poption);
 
 /**
@@ -134,7 +133,6 @@ void qtg_options_extra_init()
   option_var_set_callback(gui_qt_font_chatline, gui_qt_apply_font);
   option_var_set_callback(gui_qt_font_notify_label, apply_notify_font);
   option_var_set_callback(gui_qt_show_titlebar, apply_titlebar);
-  option_var_set_callback(gui_qt_sidebar_left, apply_sidebar);
 #undef option_var_set_callback
 }
 
@@ -264,14 +262,6 @@ void apply_titlebar(struct option *poption)
   king()->show();
 }
 
-/**
-   Change sidebar position
- */
-void apply_sidebar(struct option *poption)
-{
-  queen()->updateSidebarPosition();
-}
-
 /**
    Change the given font.
  */

client/gui-qt/mapctrl.cpp

@@ -36,7 +36,7 @@
 #include "shortcuts.h"
 #include "unitselect.h"
 
-extern void sidebarDisableEndturn(bool do_restore);
+extern void top_bar_disable_end_turn(bool do_restore);
 extern void qload_lua_script();
 extern void qreload_lua_script();
 
@@ -69,7 +69,10 @@ void popup_newcity_dialog(struct unit *punit, const char *suggestname)
    A turn done button should be provided for the player.  This function
    is called to toggle it between active/inactive.
  */
-void set_turn_done_button_state(bool state) { sidebarDisableEndturn(state); }
+void set_turn_done_button_state(bool state)
+{
+  top_bar_disable_end_turn(state);
+}
 
 /**
    Draw a goto or patrol line at the current mouse position.

client/gui-qt/mapview.cpp

@@ -45,7 +45,7 @@
 #include "page_game.h"
 #include "qtg_cxxside.h"
 #include "sciencedlg.h"
-#include "sidebar.h"
+#include "top_bar.h"
 #include "widgetdecorations.h"
 
 static int mapview_frozen_level = 0;
@@ -261,7 +261,7 @@ void map_view::hide_debugger()
 void map_view::timer_event()
 {
   if (queen()->minimapview_wdg->underMouse()
-      || queen()->sidebar_wdg->underMouse()) {
+      || queen()->top_bar_wdg->underMouse()) {
     update_cursor(CURSOR_DEFAULT);
     return;
   }
@@ -484,7 +484,7 @@ void update_turn_done_button(bool do_restore)
   if (!get_turn_done_button_state()) {
     return;
   }
-  sidebarBlinkEndturn(do_restore);
+  top_bar_blink_end_turn(do_restore);
 }
 
 /**

client/gui-qt/menu.cpp

@@ -69,7 +69,7 @@
 #include "sprite.h"
 
 extern void popup_endgame_report();
-extern void toggle_units_report(bool);
+extern void toggle_units_report();
 static void enable_interface(bool enable);
 static QKeySequence shortcut2key(enum shortcut_id s);
 
@@ -1103,20 +1103,20 @@ void mr_menu::setup_menus()
 
   act = menu->addAction(_("Units"));
   act->setShortcut(QKeySequence(tr("F2")));
-  connect(act, &QAction::triggered, this, &mr_menu::slot_show_units_report);
+  connect(act, &QAction::triggered, this, &toggle_units_report);
 
   // TRANS: Also menu item, but 'headers' should be good enough.
   act = menu->addAction(Q_("?header:Players"));
   act->setShortcut(QKeySequence(tr("F3")));
-  connect(act, &QAction::triggered, this, &mr_menu::slot_show_nations);
+  connect(act, &QAction::triggered, this, &popup_players_dialog);
 
   act = menu->addAction(_("Cities"));
   act->setShortcut(QKeySequence(tr("F4")));
-  connect(act, &QAction::triggered, this, &mr_menu::slot_show_cities);
+  connect(act, &QAction::triggered, this, &city_report_dialog_popup);
 
   act = menu->addAction(_("Economy"));
   act->setShortcut(QKeySequence(tr("F5")));
-  connect(act, &QAction::triggered, this, &mr_menu::slot_show_eco_report);
+  connect(act, &QAction::triggered, this, &economy_report_dialog_popup);
 
   act = menu->addAction(_("Research"));
   act->setShortcut(QKeySequence(tr("F6")));
@@ -1968,11 +1968,6 @@ void mr_menu::slot_spaceship()
   }
 }
 
-/**
-   Slot for showing economy tab
- */
-void mr_menu::slot_show_eco_report() { economy_report_dialog_popup(false); }
-
 /**
    Changes tab to mapview
  */
@@ -1981,21 +1976,6 @@ void mr_menu::slot_show_map()
   ::queen()->game_tab_widget->setCurrentIndex(0);
 }
 
-/**
-   Slot for showing units tab
- */
-void mr_menu::slot_show_units_report() { toggle_units_report(true); }
-
-/**
-   Slot for showing nations report
- */
-void mr_menu::slot_show_nations() { popup_players_dialog(false); }
-
-/**
-   Slot for showing cities report
- */
-void mr_menu::slot_show_cities() { city_report_dialog_popup(false); }
-
 /**
    Action "BUILD_CITY"
  */

client/gui-qt/menu.h

@@ -318,10 +318,6 @@ private slots:
   void calc_trade_routes();
   void slot_popup_tax_rates();
   void slot_popup_mult_rates();
-  void slot_show_eco_report();
-  void slot_show_units_report();
-  void slot_show_nations();
-  void slot_show_cities();
   void slot_show_research_tab();
   void slot_spaceship();
   void slot_demographics();