Author: mir3x
Date: Sun Oct 18 21:31:36 2015
New Revision: 30130

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

See bug #23384


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

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=30130&r1=30129&r2=30130&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/menu.cpp        (original)
+++ branches/S2_6/client/gui-qt/menu.cpp        Sun Oct 18 21:31:36 2015
@@ -698,7 +698,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"));
@@ -1096,7 +1096,6 @@
           } else {
             i.value()->setText(QString(_("Build Irrigation")));
           }
-          
         }
         break;
 
@@ -1143,12 +1142,6 @@
         }
         break;
 
-      case SETTLER:
-        if (can_units_do(punits, unit_can_add_or_build_city)) {
-          i.value()->setEnabled(true);
-        }
-        break;
-
       case FORTIFY:
         if (can_units_do_activity(punits, ACTIVITY_FORTIFYING)) {
           i.value()->setEnabled(true);

Modified: branches/S2_6/client/gui-qt/menu.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/menu.h?rev=30130&r1=30129&r2=30130&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/menu.h  (original)
+++ branches/S2_6/client/gui-qt/menu.h  Sun Oct 18 21:31:36 2015
@@ -69,7 +69,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