Author: mir3x
Date: Sun Oct 18 21:32:11 2015
New Revision: 30131

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

See bug #23384


Modified:
    trunk/client/gui-qt/menu.cpp
    trunk/client/gui-qt/menu.h

Modified: trunk/client/gui-qt/menu.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/menu.cpp?rev=30131&r1=30130&r2=30131&view=diff
==============================================================================
--- trunk/client/gui-qt/menu.cpp        (original)
+++ trunk/client/gui-qt/menu.cpp        Sun Oct 18 21:32:11 2015
@@ -865,7 +865,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(_("Go And Join City"));
@@ -1267,7 +1267,6 @@
           } else {
             i.value()->setText(QString(_("Build Irrigation")));
           }
-          
         }
         break;
 
@@ -1312,12 +1311,6 @@
         }
         break;
 
-      case SETTLER:
-        if (units_contain_cityfounder(punits)) {
-          i.value()->setEnabled(true);
-        }
-        break;
-
       case MIGRANT:
         if (units_can_do_action(punits, ACTION_JOIN_CITY, true)) {
           i.value()->setEnabled(true);

Modified: trunk/client/gui-qt/menu.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/menu.h?rev=30131&r1=30130&r2=30131&view=diff
==============================================================================
--- trunk/client/gui-qt/menu.h  (original)
+++ trunk/client/gui-qt/menu.h  Sun Oct 18 21:32:11 2015
@@ -69,7 +69,6 @@
   ORDER_DIPLOMAT_DLG,
   NUKE,
   UPGRADE,
-  SETTLER,
   MIGRANT,
   SAVE
 };


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

Reply via email to