Author: sveinung
Date: Sun Jan 10 13:10:51 2016
New Revision: 31432
URL: http://svn.gna.org/viewcvs/freeciv?rev=31432&view=rev
Log:
clients: use the ruleset's set home city ui name.
See patch #6809
Modified:
trunk/client/gui-gtk-2.0/citydlg.c
trunk/client/gui-gtk-2.0/menu.c
trunk/client/gui-gtk-3.0/citydlg.c
trunk/client/gui-gtk-3.0/menu.c
trunk/client/gui-gtk-3.x/citydlg.c
trunk/client/gui-gtk-3.x/menu.c
trunk/client/gui-qt/citydlg.cpp
trunk/client/gui-qt/menu.cpp
trunk/client/gui-sdl2/citydlg.c
trunk/client/gui-sdl2/menu.c
Modified: trunk/client/gui-gtk-2.0/citydlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/citydlg.c?rev=31432&r1=31431&r2=31432&view=diff
==============================================================================
--- trunk/client/gui-gtk-2.0/citydlg.c (original)
+++ trunk/client/gui-gtk-2.0/citydlg.c Sun Jan 10 13:10:51 2016
@@ -2278,7 +2278,8 @@
gtk_widget_set_sensitive(item, FALSE);
}
- item = gtk_menu_item_new_with_mnemonic(_("Set _Home City"));
+ item = gtk_menu_item_new_with_mnemonic(
+ action_prepare_ui_name(ACTION_HOME_CITY, "_", ACTPROB_NA, NULL));
g_signal_connect(item, "activate",
G_CALLBACK(unit_homecity_callback),
GINT_TO_POINTER(punit->id));
Modified: trunk/client/gui-gtk-2.0/menu.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/menu.c?rev=31432&r1=31431&r2=31432&view=diff
==============================================================================
--- trunk/client/gui-gtk-2.0/menu.c (original)
+++ trunk/client/gui-gtk-2.0/menu.c Sun Jan 10 13:10:51 2016
@@ -2500,6 +2500,9 @@
}
menus_rename(unit_group, "EXPLODE_NUKE", action_get_ui_name(ACTION_NUKE));
+ menus_rename(unit_group, "UNIT_HOMECITY",
+ action_prepare_ui_name(ACTION_HOME_CITY,
+ "_", ACTPROB_NA, NULL));
}
/**************************************************************************
Modified: trunk/client/gui-gtk-3.0/citydlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/citydlg.c?rev=31432&r1=31431&r2=31432&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/citydlg.c (original)
+++ trunk/client/gui-gtk-3.0/citydlg.c Sun Jan 10 13:10:51 2016
@@ -2483,7 +2483,7 @@
gtk_widget_set_sensitive(item, FALSE);
}
- item = gtk_menu_item_new_with_mnemonic(_("Set _Home City"));
+ item =
gtk_menu_item_new_with_mnemonic(action_get_ui_name(ACTION_HOME_CITY));
g_signal_connect(item, "activate",
G_CALLBACK(unit_homecity_callback),
GINT_TO_POINTER(punit->id));
Modified: trunk/client/gui-gtk-3.0/menu.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/menu.c?rev=31432&r1=31431&r2=31432&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/menu.c (original)
+++ trunk/client/gui-gtk-3.0/menu.c Sun Jan 10 13:10:51 2016
@@ -2497,6 +2497,7 @@
}
menus_rename("EXPLODE_NUKE", action_get_ui_name(ACTION_NUKE));
+ menus_rename("UNIT_HOMECITY", action_get_ui_name(ACTION_HOME_CITY));
}
/**************************************************************************
Modified: trunk/client/gui-gtk-3.x/citydlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/citydlg.c?rev=31432&r1=31431&r2=31432&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.x/citydlg.c (original)
+++ trunk/client/gui-gtk-3.x/citydlg.c Sun Jan 10 13:10:51 2016
@@ -2526,7 +2526,7 @@
gtk_widget_set_sensitive(item, FALSE);
}
- item = gtk_menu_item_new_with_mnemonic(_("Set _Home City"));
+ item =
gtk_menu_item_new_with_mnemonic(action_get_ui_name(ACTION_HOME_CITY));
g_signal_connect(item, "activate",
G_CALLBACK(unit_homecity_callback),
GINT_TO_POINTER(punit->id));
Modified: trunk/client/gui-gtk-3.x/menu.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/menu.c?rev=31432&r1=31431&r2=31432&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.x/menu.c (original)
+++ trunk/client/gui-gtk-3.x/menu.c Sun Jan 10 13:10:51 2016
@@ -2497,6 +2497,7 @@
}
menus_rename("EXPLODE_NUKE", action_get_ui_name(ACTION_NUKE));
+ menus_rename("UNIT_HOMECITY", action_get_ui_name(ACTION_HOME_CITY));
}
/**************************************************************************
Modified: trunk/client/gui-qt/citydlg.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/citydlg.cpp?rev=31432&r1=31431&r2=31432&view=diff
==============================================================================
--- trunk/client/gui-qt/citydlg.cpp (original)
+++ trunk/client/gui-qt/citydlg.cpp Sun Jan 10 13:10:51 2016
@@ -209,7 +209,7 @@
disband_action = NULL;
}
if (can_unit_change_homecity(qunit)) {
- change_home = new QAction(_("Change homecity"), this);
+ change_home = new QAction(action_get_ui_name(ACTION_HOME_CITY), this);
connect(change_home, SIGNAL(triggered()), this, SLOT(change_homecity()));
} else {
change_home = NULL;
Modified: trunk/client/gui-qt/menu.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/menu.cpp?rev=31432&r1=31431&r2=31432&view=diff
==============================================================================
--- trunk/client/gui-qt/menu.cpp (original)
+++ trunk/client/gui-qt/menu.cpp Sun Jan 10 13:10:51 2016
@@ -907,7 +907,7 @@
menu_list.insertMulti(TRANSPORTER, act);
connect(act, SIGNAL(triggered()), this, SLOT(slot_unload_all()));
menu->addSeparator();
- act = menu->addAction(_("Set Home City"));
+ act = menu->addAction(action_get_ui_name(ACTION_HOME_CITY));
menu_list.insertMulti(HOMECITY, act);
act->setShortcut(QKeySequence(tr("h")));
connect(act, SIGNAL(triggered()), this, SLOT(slot_set_home()));
Modified: trunk/client/gui-sdl2/citydlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/citydlg.c?rev=31432&r1=31431&r2=31432&view=diff
==============================================================================
--- trunk/client/gui-sdl2/citydlg.c (original)
+++ trunk/client/gui-sdl2/citydlg.c Sun Jan 10 13:10:51 2016
@@ -495,7 +495,7 @@
if (punit->homecity != pCityDlg->pCity->id) {
/* Make new Homecity */
pBuf = create_icon_button_from_chars(NULL, pWindow->dst,
- _("Set Home City"), adj_font(12),
0);
+
action_get_ui_name(ACTION_HOME_CITY), adj_font(12), 0);
i++;
area.w = MAX(area.w, pBuf->size.w);
hh = MAX(hh, pBuf->size.h);
Modified: trunk/client/gui-sdl2/menu.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/menu.c?rev=31432&r1=31431&r2=31432&view=diff
==============================================================================
--- trunk/client/gui-sdl2/menu.c (original)
+++ trunk/client/gui-sdl2/menu.c Sun Jan 10 13:10:51 2016
@@ -678,7 +678,7 @@
/* --------- */
/* Find Homecity */
- fc_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Find Home City"), "H");
+ fc_snprintf(cBuf, sizeof(cBuf),"%s (%s)",
action_get_ui_name(ACTION_HOME_CITY), "H");
pBuf = create_themeicon(current_theme->OHomeCity_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
