URL: http://bugs.freeciv.org/Ticket/Display.html?id=39927
Forgot to attach the final patches for posterity.
Here's the shorter S2_2:
Index: data/helpdata.txt
===
--- data/helpdata.txt (revision 14164)
+++ data/helpdata.txt (working copy)
@@ -495,7 +495,6 @@
Ctrl-N: show city names on/off\n\
Ctrl-R: show city growth on/off\n\
Ctrl-P: show city production on/off\n\
- t: show city workers (mouse over or near city)\n\
), _(\
Main Map (Mouse):\n\
=\n\
@@ -510,6 +509,7 @@
\n\
Shift-Control-Left-click:Adjust city workers\n\
Control-Center-click:Wake up sentried units\n\
+ Shift-Control-Right-click: Show city workers (mouse over or near city)\n\
\n\
Area Selection mode (GTK):\n\
==\n\
@@ -523,11 +523,12 @@
), _(\
Dialogs and Reports:\n\
\n\
- F1: open City Report\n\
+ F1: show Map View\n\
F2: open Unit Report\n\
- F3: open Players dialog\n\
+ F3: open Nations Report\n\
+ F4: open City Report\n\
F5: open Economy Report\n\
- F6: open Science Report\n\
+ F6: open Research Report\n\
F7: open World Wonders\n\
F8: open Top Five Cities\n\
F9: open Messages dialog\n\
Index: data/scenario/tutorial.sav
===
--- data/scenario/tutorial.sav (revision 14164)
+++ data/scenario/tutorial.sav (working copy)
@@ -95,7 +95,7 @@
notify.event(city.owner, city.tile, E.TUTORIAL,
_(As the number of cities in your empire grows, it becomes harder to\n\
manage individual cities. This is where the city report becomes\n\
-useful. Press F1 to bring it up. This report shows a list of cities\n\
+useful. Press F4 to bring it up. This report shows a list of cities\n\
with various statistics about each. Play around with it a bit if you\n\
like (return to the map view by clicking on the Map tab). With a bit\n\
of practice it is possible to control almost every aspect of the cities\n\
Index: client/gui-gtk-2.0/repodlgs.c
===
--- client/gui-gtk-2.0/repodlgs.c (revision 14164)
+++ client/gui-gtk-2.0/repodlgs.c (working copy)
@@ -293,7 +293,7 @@
GtkWidget *science_diagram;
gui_dialog_new(science_dialog_shell, GTK_NOTEBOOK(top_notebook), NULL);
- gui_dialog_set_title(science_dialog_shell, _(Science));
+ gui_dialog_set_title(science_dialog_shell, _(Research));
gui_dialog_add_button(science_dialog_shell,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
Index: client/gui-gtk-2.0/gui_main.c
===
--- client/gui-gtk-2.0/gui_main.c (revision 14164)
+++ client/gui-gtk-2.0/gui_main.c (working copy)
@@ -385,6 +385,17 @@
/**
...
**/
+gboolean map_canvas_focus(void)
+{
+ gtk_window_present(GTK_WINDOW(toplevel));
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(top_notebook), 0);
+ gtk_widget_grab_focus(map_canvas);
+ return TRUE;
+}
+
+/**
+...
+**/
gboolean inputline_handler(GtkWidget *w, GdkEventKey *ev)
{
void *data = NULL;
@@ -496,59 +507,55 @@
}
assert(MAX_NUM_BATTLEGROUPS == 4);
-#define BATTLEGROUP_SHIFT_CASE(num)\
- if (ev-state GDK_CONTROL_MASK) { \
-key_unit_assign_battlegroup((num), TRUE); \
- } else { \
-key_unit_select_battlegroup((num), FALSE); \
- }
if ((ev-state GDK_CONTROL_MASK)) {
switch (ev-keyval) {
-case GDK_1:
- key_unit_assign_battlegroup(0, FALSE);
+case GDK_F1:
+ key_unit_assign_battlegroup(0, (ev-state GDK_SHIFT_MASK));
return TRUE;
-case GDK_2:
- key_unit_assign_battlegroup(1, FALSE);
+case GDK_F2:
+ key_unit_assign_battlegroup(1, (ev-state GDK_SHIFT_MASK));
return TRUE;
-case GDK_3:
- key_unit_assign_battlegroup(2, FALSE);
+case GDK_F3:
+ key_unit_assign_battlegroup(2, (ev-state GDK_SHIFT_MASK));
return TRUE;
-case GDK_4:
- key_unit_assign_battlegroup(3, FALSE);
+case GDK_F4:
+ key_unit_assign_battlegroup(3, (ev-state GDK_SHIFT_MASK));
return TRUE;
default:
break;
};
- }
+ } else if ((ev-state GDK_SHIFT_MASK)) {
+switch (ev-keyval) {
- switch (ev-keyval) {
+case GDK_F1:
+ key_unit_select_battlegroup(0, FALSE);
+ return TRUE;
- case GDK_exclam:
-/* Shift + 1 */
-
