Author: mir3x
Date: Wed Nov  9 09:11:08 2016
New Revision: 34449

URL: http://svn.gna.org/viewcvs/freeciv?rev=34449&view=rev
Log:
Qt client - moved update unit label to real_menus_update

See bug #25273

Modified:
    branches/S2_6/client/gui-qt/fc_client.cpp
    branches/S2_6/client/gui-qt/mapview.cpp
    branches/S2_6/client/gui-qt/menu.cpp

Modified: branches/S2_6/client/gui-qt/fc_client.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/fc_client.cpp?rev=34449&r1=34448&r2=34449&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/fc_client.cpp   (original)
+++ branches/S2_6/client/gui-qt/fc_client.cpp   Wed Nov  9 09:11:08 2016
@@ -921,7 +921,7 @@
     gui()->update_sidebar_tooltips();
     side_disable_endturn(get_turn_done_button_state());
     gui()->mapview_wdg->resize(event->size().width(),size.height());
-    update_unit_info_label(nullptr);
+    gui()->unitinfo_wdg->update_actions(nullptr);
   }
   event->setAccepted(true);
 }

Modified: branches/S2_6/client/gui-qt/mapview.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/mapview.cpp?rev=34449&r1=34448&r2=34449&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/mapview.cpp     (original)
+++ branches/S2_6/client/gui-qt/mapview.cpp     Wed Nov  9 09:11:08 2016
@@ -995,10 +995,6 @@
 ****************************************************************************/
 void update_unit_info_label(struct unit_list *punitlist)
 {
-  if (gui()->unitinfo_wdg != nullptr && C_S_RUNNING == client_state()) {
-    gui()->menu_bar->menus_sensitive();
-    gui()->unitinfo_wdg->update_actions(punitlist);
-  }
 }
 
 

Modified: branches/S2_6/client/gui-qt/menu.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/menu.cpp?rev=34449&r1=34448&r2=34449&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/menu.cpp        (original)
+++ branches/S2_6/client/gui-qt/menu.cpp        Wed Nov  9 09:11:08 2016
@@ -534,9 +534,12 @@
 {
   if (C_S_RUNNING <= client_state()) {
     gui()->menuBar()->setVisible(true);
-    gui()->menu_bar->menus_sensitive();
-    gui()->menu_bar->update_airlift_menu();
-    gov_menu::update_all();
+    if (is_waiting_turn_change() == false) {
+      gui()->menu_bar->menus_sensitive();
+      gui()->menu_bar->update_airlift_menu();
+      gov_menu::update_all();
+      gui()->unitinfo_wdg->update_actions(nullptr);
+    }
   } else {
     gui()->menuBar()->setVisible(false);
   }


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to