[Freeciv-Dev] Re: (PR#11230) Pressing return doesn't end turn in gui-gtk-2.0

["Christian Knoke" <chrisk@xxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=11230 >

On Sun, Nov 28, 2004 at 09:07:56AM -0800, Christian Knoke wrote:
> On Sat, Nov 27, 2004 at 02:57:48PM -0800, Tero Kuusela wrote:
> > 
> > I haven't found any key that would end turn. The only alternative seems 
> > to be left-clicking the "Turn Done" button with the mouse. Savegames 
> > available.
> 
> The help text for controls still says 'Return'.
> 
> Shift-<Return> is correct.
> 
> Make a tooltip for the turn done button?

This patch does both, for me. Please check it carefully.

Christian

-- 
Christian Knoke            * * *            http://cknoke.de
* * * * * * * * *  Ceterum censeo Microsoft esse dividendum.

diff -Nur ../s20/freeciv/client/gui-gtk-2.0/gui_main.c 
./client/gui-gtk-2.0/gui_main.c
--- ../s20/freeciv/client/gui-gtk-2.0/gui_main.c        2004-11-24 
11:58:22.000000000 +0100
+++ ./client/gui-gtk-2.0/gui_main.c     2004-11-28 18:37:45.000000000 +0100
@@ -643,6 +643,7 @@
   GtkWidget *frame, *table, *table2, *paned, *sw, *text;
   GtkStyle *style;
   int i;
+  char buf[256];
   struct Sprite *sprite;
 
   GtkWidget *notebook, *statusbar;
@@ -846,7 +847,10 @@
 
   g_signal_connect(turn_done_button, "clicked",
                    G_CALLBACK(end_turn_callback), NULL);
- 
+
+  my_snprintf(buf, sizeof(buf), _("Turn Done:\n%s"), _("Shift+Return"));
+  gtk_tooltips_set_tip(main_tips, turn_done_button, buf, "");
+
   /* Selected unit status */
 
   unit_info_frame = gtk_frame_new("");
diff -Nur ../s20/freeciv/data/helpdata.txt ./data/helpdata.txt
--- ../s20/freeciv/data/helpdata.txt    2004-11-22 18:30:44.000000000 +0100
+++ ./data/helpdata.txt 2004-11-28 18:27:28.000000000 +0100
@@ -509,7 +509,7 @@
     home: center on capital\n\
   arrows: scroll map           Control-g: grid lines on/off\n\
    space: unit stay put        Control-n: city names on/off\n\
-  return: turn done            Control-p: city production on/off\n\
+  Shift-Return: turn done      Control-p: city production on/off\n\
 ")
 
 [help_chatline]