[Freeciv-commits] r28976 - /trunk/client/gui-qt/menu.cpp

[sveinung84]

Author: sveinung
Date: Sun May  3 18:36:46 2015
New Revision: 28976

URL: http://svn.gna.org/viewcvs/freeciv?rev=28976&view=rev
Log:
Qt client: Use ruleset defined action ui names in menu items.

See patch #6061

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

Modified: trunk/client/gui-qt/menu.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/menu.cpp?rev=28976&r1=28975&r2=28976&view=diff
==============================================================================
--- trunk/client/gui-qt/menu.cpp        (original)
+++ trunk/client/gui-qt/menu.cpp        Sun May  3 18:36:46 2015
@@ -1130,9 +1130,9 @@
         }
         if (city_on_tile
             && units_can_do_action(punits, ACTION_JOIN_CITY, true)) {
-          i.value()->setText(_("Add to City"));
+          i.value()->setText(action_get_ui_name(ACTION_JOIN_CITY));
         } else {
-          i.value()->setText(_("Build City"));
+          i.value()->setText(action_get_ui_name(ACTION_FOUND_CITY));
         }
         break;
 
@@ -1271,12 +1271,14 @@
         break;
 
       case BUILD_WONDER:
+        i.value()->setText(action_get_ui_name(ACTION_HELP_WONDER));
         if (can_units_do(punits, unit_can_help_build_wonder_here)) {
           i.value()->setEnabled(true);
         }
         break;
 
       case ORDER_TRADEROUTE:
+        i.value()->setText(action_get_ui_name(ACTION_TRADE_ROUTE));
         if (can_units_do(punits, unit_can_est_trade_route_here)) {
           i.value()->setEnabled(true);
         }


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