Author: sveinung Date: Thu Aug 27 12:37:53 2015 New Revision: 29695 URL: http://svn.gna.org/viewcvs/freeciv?rev=29695&view=rev Log: Rename the "Diplomat/Spy actions" menu item
It started as a way to perform spy actions against the allied city the Diplomat/Spy was inside. It brings up the action selection dialog for acting against the tile the unit is located at. It currenlty works for all action enabler controlled actions. It should therefore be renamed to reflect that it isn't limited to spy actions. Rename it to "Do...". "Do action" will make the player wonder why other possible actions doesn't appear in it. See patch #6287 Modified: branches/S2_6/client/gui-gtk-2.0/menu.c branches/S2_6/client/gui-gtk-3.0/menu.c branches/S2_6/client/gui-qt/menu.cpp branches/S2_6/client/gui-sdl/menu.c branches/S2_6/client/gui-sdl2/menu.c Modified: branches/S2_6/client/gui-gtk-2.0/menu.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/menu.c?rev=29695&r1=29694&r2=29695&view=diff ============================================================================== --- branches/S2_6/client/gui-gtk-2.0/menu.c (original) +++ branches/S2_6/client/gui-gtk-2.0/menu.c Thu Aug 27 12:37:53 2015 @@ -1716,7 +1716,7 @@ {"DO_PILLAGE", NULL, _("_Pillage"), "<Shift>p", NULL, G_CALLBACK(do_pillage_callback)}, - {"DIPLOMAT_ACTION", NULL, _("_Diplomat/Spy Actions"), + {"DIPLOMAT_ACTION", NULL, _("_Do..."), "d", NULL, G_CALLBACK(diplomat_action_callback)}, {"EXPLODE_NUKE", NULL, _("Explode _Nuclear"), "<Shift>n", NULL, G_CALLBACK(explode_nuke_callback)}, Modified: branches/S2_6/client/gui-gtk-3.0/menu.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/menu.c?rev=29695&r1=29694&r2=29695&view=diff ============================================================================== --- branches/S2_6/client/gui-gtk-3.0/menu.c (original) +++ branches/S2_6/client/gui-gtk-3.0/menu.c Thu Aug 27 12:37:53 2015 @@ -1717,7 +1717,7 @@ {"DO_PILLAGE", NULL, _("_Pillage"), "<Shift>p", NULL, G_CALLBACK(do_pillage_callback)}, - {"DIPLOMAT_ACTION", NULL, _("_Diplomat/Spy Actions"), + {"DIPLOMAT_ACTION", NULL, _("_Do..."), "d", NULL, G_CALLBACK(diplomat_action_callback)}, {"EXPLODE_NUKE", NULL, _("Explode _Nuclear"), "<Shift>n", NULL, G_CALLBACK(explode_nuke_callback)}, 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=29695&r1=29694&r2=29695&view=diff ============================================================================== --- branches/S2_6/client/gui-qt/menu.cpp (original) +++ branches/S2_6/client/gui-qt/menu.cpp Thu Aug 27 12:37:53 2015 @@ -685,7 +685,7 @@ menu_list.insertMulti(PILLAGE, act); act->setShortcut(QKeySequence(tr("shift+p"))); connect(act, SIGNAL(triggered()), this, SLOT(slot_pillage())); - act = menu->addAction(_("Diplomat/Spy actions")); + act = menu->addAction(_("Do...")); menu_list.insertMulti(ORDER_DIPLOMAT_DLG, act); act->setShortcut(QKeySequence(tr("d"))); connect(act, SIGNAL(triggered()), this, SLOT(slot_action())); Modified: branches/S2_6/client/gui-sdl/menu.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/menu.c?rev=29695&r1=29694&r2=29695&view=diff ============================================================================== --- branches/S2_6/client/gui-sdl/menu.c (original) +++ branches/S2_6/client/gui-sdl/menu.c Thu Aug 27 12:37:53 2015 @@ -443,7 +443,7 @@ /* --------- */ /* Diplomat|Spy Actions */ - fc_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Diplomat/Spy Actions"), "D"); + fc_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Do..."), "D"); pBuf = create_themeicon(current_theme->OSpy_Icon, Main.gui, WF_HIDDEN | WF_RESTORE_BACKGROUND | WF_WIDGET_HAS_INFO_LABEL); Modified: branches/S2_6/client/gui-sdl2/menu.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/menu.c?rev=29695&r1=29694&r2=29695&view=diff ============================================================================== --- branches/S2_6/client/gui-sdl2/menu.c (original) +++ branches/S2_6/client/gui-sdl2/menu.c Thu Aug 27 12:37:53 2015 @@ -435,7 +435,7 @@ /* --------- */ /* Diplomat|Spy Actions */ - fc_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Diplomat/Spy Actions"), "D"); + fc_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Do..."), "D"); pBuf = create_themeicon(current_theme->OSpy_Icon, Main.gui, WF_HIDDEN | WF_RESTORE_BACKGROUND | WF_WIDGET_HAS_INFO_LABEL); _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits