Author: mir3x
Date: Sun Oct 18 21:31:20 2015
New Revision: 30129

URL: http://svn.gna.org/viewcvs/freeciv?rev=30129&view=rev
Log:
Fixed 'goto and build city' command for qt-client

See bug #23384


Modified:
    branches/S2_5/client/gui-qt/menu.cpp
    branches/S2_5/client/gui-qt/menu.h

Modified: branches/S2_5/client/gui-qt/menu.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/menu.cpp?rev=30129&r1=30128&r2=30129&view=diff
==============================================================================
--- branches/S2_5/client/gui-qt/menu.cpp        (original)
+++ branches/S2_5/client/gui-qt/menu.cpp        Sun Oct 18 21:31:20 2015
@@ -696,7 +696,7 @@
   menu_list.insertMulti(BUILD, act);
   connect(act, SIGNAL(triggered()), this, SLOT(slot_build_city()));
   act = menu->addAction(_("Go And Build City"));
-  menu_list.insertMulti(SETTLER, act);
+  menu_list.insertMulti(AUTOSETTLER, act);
   act->setShortcut(QKeySequence(tr("shift+b")));
   connect(act, SIGNAL(triggered()), this, SLOT(slot_go_build_city()));
   act = menu->addAction(_("Auto Settler"));
@@ -1100,12 +1100,6 @@
         }
         break;
 
-      case SETTLER:
-        if (can_units_do(punits, unit_can_add_or_build_city)) {
-          i.value()->setEnabled(true);
-        }
-        break;
-
       case FORTRESS:
         if (can_units_do_base_gui(punits, BASE_GUI_FORTRESS)
             || can_units_do_activity(punits, ACTIVITY_FORTIFYING)) {

Modified: branches/S2_5/client/gui-qt/menu.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/menu.h?rev=30129&r1=30128&r2=30129&view=diff
==============================================================================
--- branches/S2_5/client/gui-qt/menu.h  (original)
+++ branches/S2_5/client/gui-qt/menu.h  Sun Oct 18 21:31:20 2015
@@ -68,7 +68,6 @@
   ORDER_DIPLOMAT_DLG,
   NUKE,
   UPGRADE,
-  SETTLER,
   SAVE
 };
 


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

Reply via email to