<URL: http://bugs.freeciv.org/Ticket/Display.html?id=39913 >

Committed as part of S2_2 revision 14101.
Committed as part of trunk revision 14102.

Index: client/gui-gtk-2.0/gui_main.c
===================================================================
--- client/gui-gtk-2.0/gui_main.c       (revision 14100)
+++ client/gui-gtk-2.0/gui_main.c       (working copy)
@@ -457,7 +457,6 @@
     return FALSE;
   }
 
-
   if ((ev->state & GDK_SHIFT_MASK)) {
     switch (ev->keyval) {
     case GDK_Left:
@@ -498,7 +497,24 @@
     default:
       break;
     }
+  } else {
+    switch (ev->keyval) {
+
+    case GDK_apostrophe:
+      /* FIXME: should find the correct window, even when detached, from any
+       * other window; should scroll to the bottom automatically showing the
+       * latest text from other players; MUST NOT make spurious text windows
+       * at the bottom of other dialogs.
+       */
+      gtk_notebook_set_current_page(GTK_NOTEBOOK(bottom_notebook), 0);
+      gtk_widget_grab_focus(inputline);
+      return TRUE;
+
+    default:
+      break;
+    };
   }
+
   /* Return here if observer */
   if (client_is_observer()) {
     return FALSE;
@@ -1243,7 +1259,7 @@
   gtk_widget_set_size_request(sw, 600, 100);
   gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
 
-  label = gtk_label_new_with_mnemonic(_("_Chat"));
+  label = gtk_label_new(_("Chat"));
   gtk_notebook_append_page(GTK_NOTEBOOK(bottom_notebook), vbox, label);
 
   text = gtk_text_view_new_with_buffer(message_buffer);
Index: client/gui-gtk-2.0/messagewin.c
===================================================================
--- client/gui-gtk-2.0/messagewin.c     (revision 14100)
+++ client/gui-gtk-2.0/messagewin.c     (working copy)
@@ -187,7 +187,7 @@
   gtk_widget_set_sensitive(cmd, FALSE);
   
   cmd = gui_dialog_add_stockbutton(meswin_shell, GTK_STOCK_ZOOM_IN,
-      _("_Update City"), CMD_POPCITY);
+      _("Inspect _City"), CMD_POPCITY);
   gtk_widget_set_sensitive(cmd, FALSE);
 
   gui_dialog_add_button(meswin_shell, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
Index: client/gui-gtk-2.0/menu.c
===================================================================
--- client/gui-gtk-2.0/menu.c   (revision 14100)
+++ client/gui-gtk-2.0/menu.c   (working copy)
@@ -727,38 +727,44 @@
        NULL,                   0,                                      
"<Branch>"      },
   { "/" N_("Game") "/tearoff1",                                NULL,
        NULL,                   0,                                      
"<Tearoff>"     },
-  { "/" N_("Game") "/" N_("Local _Options"),           NULL,
+  { "/" N_("Game") "/" N_("_Chat"),                    NULL,
+       NULL,                   0,                                      
"<Branch>"      },
+  { "/" N_("Game") "/" N_("_Chat") "/" N_("_Clear Log"),               NULL,
+       game_menu_callback,     MENU_GAME_CLEAR_OUTPUT                          
        },
+  { "/" N_("Game") "/" N_("_Chat") "/" N_("_Write Log"),               NULL,
+       game_menu_callback,     MENU_GAME_OUTPUT_LOG                            
        },
+  { "/" N_("Game") "/" N_("_Government"),              NULL,
+       NULL,                   0,                                      
"<Branch>"      },
+  { "/" N_("Game") "/" N_("_Government") "/" N_("_Tax Rates"),         
"<shift>t",
+       government_menu_callback,       MENU_GOVERNMENT_TAX_RATE                
        },
+  { "/" N_("Game") "/" N_("_Government") "/" N_("_Revolution..."),     
"<shift>r",
+       government_menu_callback,       MENU_GOVERNMENT_REVOLUTION              
        },
+  { "/" N_("Game") "/" N_("_Government") "/sep1", NULL,
+       NULL,                   0,                                      
"<Separator>"   },
+  { "/" N_("Game") "/" N_("_Options"),                 NULL,
+       NULL,                   0,                                      
"<Branch>"      },
+  { "/" N_("Game") "/" N_("_Options") "/" N_("_Local Client"),         NULL,
        game_menu_callback,     MENU_GAME_OPTIONS                               
        },
-  { "/" N_("Game") "/" N_("_Message Options"),         NULL,
+  { "/" N_("Game") "/" N_("_Options") "/" N_("_Message"),      NULL,
        game_menu_callback,     MENU_GAME_MSG_OPTIONS                           
        },
-  { "/" N_("Game") "/sep1",                            NULL,
+  { "/" N_("Game") "/" N_("_Options") "/" N_("_Remote Server"),        NULL,
+       game_menu_callback,     MENU_GAME_SERVER_OPTIONS},
+  { "/" N_("Game") "/" N_("_Options") "/" N_("Save Options _Now"),             
NULL,
+       game_menu_callback,     MENU_GAME_SAVE_OPTIONS                          
        },
+  { "/" N_("Game") "/" N_("_Options") "/" N_("Save Options on _Exit"), NULL,
+       game_menu_callback,     MENU_GAME_SAVE_OPTIONS_ON_EXIT,         
"<CheckItem>"   },
+  { "/" N_("Game") "/sep4",                            NULL,
        NULL,                   0,                                      
"<Separator>"   },
 #ifdef DEBUG
   { "/" N_("Game") "/" N_("_Reload Tileset"), "<ctrl><alt>r",
     game_menu_callback, MENU_GAME_RELOAD_TILESET },
 #endif
-  { "/" N_("Game") "/" N_("Save Options on _Exit"),    NULL,
-       game_menu_callback,     MENU_GAME_SAVE_OPTIONS_ON_EXIT,         
"<CheckItem>"   },
-  { "/" N_("Game") "/" N_("Sa_ve Options"),            NULL,
-       game_menu_callback,     MENU_GAME_SAVE_OPTIONS                          
        },
-  { "/" N_("Game") "/sep2",                            NULL,
-       NULL,                   0,                                      
"<Separator>"   },
-  { "/" N_("Game") "/" N_("Server O_ptions"),  NULL,
-    game_menu_callback,        MENU_GAME_SERVER_OPTIONS},
-  { "/" N_("Game") "/sep3",                            NULL,
-       NULL,                   0,                                      
"<Separator>"   },
   { "/" N_("Game") "/" N_("_Save Game"),               NULL,
        game_menu_callback,     MENU_GAME_SAVE_QUICK,                   
"<StockItem>",
        GTK_STOCK_SAVE                                                          
        },
   { "/" N_("Game") "/" N_("Save Game _As..."),         NULL,
        game_menu_callback,     MENU_GAME_SAVE_GAME,                    
"<StockItem>",
        GTK_STOCK_SAVE_AS                                                       
        },
-  { "/" N_("Game") "/sep4",                            NULL,
-       NULL,                   0,                                      
"<Separator>"   },
-  { "/" N_("Game") "/" N_("E_xport Log"),              NULL,
-       game_menu_callback,     MENU_GAME_OUTPUT_LOG                            
        },
-  { "/" N_("Game") "/" N_("_Clear Log"),               NULL,
-       game_menu_callback,     MENU_GAME_CLEAR_OUTPUT                          
        },
   { "/" N_("Game") "/sep6",                            NULL,
        NULL,                   0,                                      
"<Separator>"   },
   { "/" N_("Game") "/" N_("_Leave"),                   NULL,
@@ -766,28 +772,27 @@
   { "/" N_("Game") "/" N_("_Quit"),                    NULL,
        game_menu_callback,     MENU_GAME_QUIT,                         
"<StockItem>",
        GTK_STOCK_QUIT                                                          
        },
-  /* Government menu ... */
-  { "/" N_("Gover_nment"),                                     NULL,
+  /* was Government menu ... */
+  { "/" N_("_Edit"),                                   NULL,
        NULL,                   0,                                      
"<Branch>"      },
-  { "/" N_("Government") "/tearoff1",                  NULL,
+  { "/" N_("_Edit") "/tearoff1",                       NULL,
        NULL,                   0,                                      
"<Tearoff>"     },
-  { "/" N_("Government") "/" N_("_Tax Rates"),         "<shift>t",
-       government_menu_callback,       MENU_GOVERNMENT_TAX_RATE                
        },
-  { "/" N_("Government") "/sep1",                              NULL,
-       NULL,                   0,                                      
"<Separator>"   },
-  { "/" N_("Government") "/" N_("_Find City"),         "<shift>f",
+  { "/" N_("_Edit") "/" N_("_Find City"),              "<shift>f",
        government_menu_callback,       MENU_GOVERNMENT_FIND_CITY               
        },
-  { "/" N_("Government") "/" N_("_Worklists"),         "<control>l",
+  { "/" N_("_Edit") "/" N_("_Worklists"),              "<control>l",
        government_menu_callback,       MENU_GOVERNMENT_WORKLISTS               
        },
-  { "/" N_("Government") "/sep2",                              NULL,
+  { "/" N_("_Edit") "/sep1",                           NULL,
        NULL,                   0,                                      
"<Separator>"   },
-  { "/" N_("Government") "/" N_("_Change Government"),           NULL,
-       NULL,                   0,                                      
"<Branch>"      },
-  { "/" N_("Government") "/" N_("_Change Government") "/" N_("_Revolution..."),
-                                                        "<shift>r",
-       government_menu_callback,       MENU_GOVERNMENT_REVOLUTION              
        },
-  { "/" N_("_Government") "/" N_("_Change Government") "/sep1", NULL,
-       NULL,                   0,                                      
"<Separator>"   },
+  /* was Editor menu */
+  { "/" N_("_Edit") "/" N_("Editing _Mode"), NULL,
+       editor_menu_callback, MENU_EDITOR_TOGGLE, "<CheckItem>" },
+  { "/" N_("_Edit") "/" N_("Editing _Tools"), NULL,
+       editor_menu_callback, MENU_EDITOR_TOOLS },
+  { "/" N_("_Edit") "/" N_("Recalculate _Borders"), NULL,
+       editor_menu_callback, MENU_EDITOR_RECALCULATE_BORDERS },
+  { "/" N_("_Edit") "/" N_("Regenerate _Water"), NULL,
+       editor_menu_callback, MENU_EDITOR_REGENERATE_WATER },
+
   /* View menu ... */
   { "/" N_("_View"),                                   NULL,
        NULL,                   0,                                      
"<Branch>"      },
@@ -955,18 +960,6 @@
   { "/" N_("Reports") "/" N_("S_paceship"),            "F12",
        reports_menu_callback,  MENU_REPORT_SPACESHIP                           
        },
 
-  /* Editor menu */
-  { "/" N_("_Editor"), NULL, NULL, 0, "<Branch>" },
-  { "/" N_("_Editor") "/tearoff1", NULL, NULL, 0, "<Tearoff>" },
-  { "/" N_("_Editor") "/" N_("_Editing Mode"), NULL,
-    editor_menu_callback, MENU_EDITOR_TOGGLE, "<CheckItem>" },
-  { "/" N_("_Editor") "/" N_("_Tools"), NULL,
-    editor_menu_callback, MENU_EDITOR_TOOLS },
-  { "/" N_("_Editor") "/" N_("Recalculate _Borders"), NULL,
-    editor_menu_callback, MENU_EDITOR_RECALCULATE_BORDERS },
-  { "/" N_("_Editor") "/" N_("Regenerate _Water"), NULL,
-    editor_menu_callback, MENU_EDITOR_REGENERATE_WATER },
-
   /* Help menu ... */
   { "/" N_("_Help"),                                   NULL,
        NULL,                   0,                                      
"<Branch>"      },
@@ -1256,26 +1249,28 @@
     return;
   }
 
-  menus_set_active("<main>/_Game/Save Options on _Exit", save_options_on_exit);
+  menus_set_active("<main>/_Game/_Options/Save Options on _Exit",
+                  save_options_on_exit);
+  menus_set_sensitive("<main>/_Game/_Options/_Remote Server", 
+                     aconnection.established);
 
   menus_set_sensitive("<main>/_Game/Save Game _As...",
                      can_client_access_hack()
                      && get_client_state() >= CLIENT_GAME_RUNNING_STATE);
-  menus_set_sensitive("<main>/_Game/_Save Game", can_client_access_hack()
+  menus_set_sensitive("<main>/_Game/_Save Game",
+                     can_client_access_hack()
                      && get_client_state() >= CLIENT_GAME_RUNNING_STATE);
-  menus_set_sensitive("<main>/_Game/Server O_ptions", 
+  menus_set_sensitive("<main>/_Game/_Leave",
                      aconnection.established);
-  menus_set_sensitive("<main>/_Game/L_eave", aconnection.established);
 
   if (!can_client_change_view()) {
-    menus_set_sensitive("<main>/_Reports", FALSE);
-    menus_set_sensitive("<main>/_Government", FALSE);
+    menus_set_sensitive("<main>/_Edit", FALSE);
     menus_set_sensitive("<main>/_View", FALSE);
     menus_set_sensitive("<main>/_Orders", FALSE);
-    menus_set_sensitive("<main>/_Editor", FALSE);
+    menus_set_sensitive("<main>/_Reports", FALSE);
   } else {
     const char *path =
-      menu_path_remove_uline("<main>/_Government/_Change Government");
+      menu_path_remove_uline("<main>/_Game/_Government");
     GtkWidget *parent = gtk_item_factory_get_widget(item_factory, path);
     bool attached_to_player = (game.player_ptr != NULL);
 
@@ -1320,18 +1315,32 @@
     }
 
     menus_set_sensitive("<main>/_Reports", TRUE);
-    menus_set_sensitive("<main>/_Government", TRUE);
+    menus_set_sensitive("<main>/_Edit", TRUE);
     menus_set_sensitive("<main>/_View", TRUE);
     menus_set_sensitive("<main>/_Orders", can_client_issue_orders());
 
-    menus_set_sensitive("<main>/_Government/_Tax Rates",
+    menus_set_sensitive("<main>/_Game/_Government",
+                       can_client_issue_orders());
+    menus_set_sensitive("<main>/_Game/_Government/Tax Rates",
                        game.info.changable_tax
                         && can_client_issue_orders());
-    menus_set_sensitive("<main>/_Government/_Worklists",
+
+    menus_set_sensitive("<main>/_Edit/Worklists",
                        can_client_issue_orders());
-    menus_set_sensitive("<main>/_Government/_Change Government",
-                       can_client_issue_orders());
 
+    menu_updating = TRUE;
+
+    menus_set_active("<main>/_Edit/Editing _Mode",
+                    can_conn_enable_editing(&aconnection));
+    menus_set_sensitive("<main>/_Edit/Editing _Tools",
+                       can_conn_edit(&aconnection));
+    menus_set_sensitive("<main>/_Edit/Recalculate _Borders",
+                       can_conn_edit(&aconnection));
+    menus_set_sensitive("<main>/_Edit/Regenerate _Water",
+                       can_conn_edit(&aconnection));
+
+    menu_updating = FALSE;
+
     /* If the client is not attached to a player these reports are
      * disabled. */
     menus_set_sensitive("<main>/_Reports/_Cities", attached_to_player);
@@ -1368,19 +1377,6 @@
 
     menus_set_active("<main>/_View/_Full Screen", fullscreen_mode);
 
-    menu_updating = TRUE;
-
-    menus_set_sensitive("<main>/_Editor",
-                       can_conn_enable_editing(&aconnection));
-    menus_set_sensitive("<main>/_Editor/_Tools",
-                       can_conn_edit(&aconnection));
-    menus_set_sensitive("<main>/_Editor/_Recalculate Borders",
-                       can_conn_edit(&aconnection));
-    menus_set_active("<main>/_Editor/Editing Mode",
-                    can_conn_edit(&aconnection));
-
-    menu_updating = FALSE;
-
     /* Remaining part of this function: Update Orders menu */
 
     if (!can_client_issue_orders()) {
Index: client/gui-gtk-2.0/cityrep.c
===================================================================
--- client/gui-gtk-2.0/cityrep.c        (revision 14100)
+++ client/gui-gtk-2.0/cityrep.c        (working copy)
@@ -809,7 +809,7 @@
   city_center_command = w;
 
   w = gui_dialog_add_stockbutton(city_dialog_shell, GTK_STOCK_ZOOM_IN,
-      _("_Update"), CITY_POPUP);
+      _("_Inspect"), CITY_POPUP);
   city_popup_command = w;
 
   w = gui_dialog_add_stockbutton(city_dialog_shell, GTK_STOCK_EXECUTE,
Index: client/gui-gtk-2.0/dialogs.c
===================================================================
--- client/gui-gtk-2.0/dialogs.c        (revision 14100)
+++ client/gui-gtk-2.0/dialogs.c        (working copy)
@@ -199,7 +199,7 @@
   gtk_widget_show(goto_command);
 
   popcity_command = gtk_stockbutton_new(GTK_STOCK_ZOOM_IN,
-       _("_Update City"));
+       _("Inspect _City"));
   gtk_dialog_add_action_widget(GTK_DIALOG(shell), popcity_command, 2);
   gtk_widget_show(popcity_command);
 
Index: client/gui-win32/menu.c
===================================================================
--- client/gui-win32/menu.c     (revision 14100)
+++ client/gui-win32/menu.c     (working copy)
@@ -310,21 +310,21 @@
   {N_("_Save Game"),                           IDM_GAME_SAVE_QUICK},
   {N_("Save Game _As..."),                     IDM_GAME_SAVE_GAME},
   {"", IDM_SEPARATOR},
-  {N_("E_xport Log"),                          IDM_GAME_EXPORT_LOG},
-  {N_("Clear _Log"),                           IDM_GAME_CLEAR_OUTPUT},
+  {N_("_Write Log"),                           IDM_GAME_EXPORT_LOG},
+  {N_("_Clear Log"),                           IDM_GAME_CLEAR_OUTPUT},
   {"", IDM_SEPARATOR},
   {N_("_Disconnect"),                          IDM_GAME_DISCONNECT},
   {N_("_Quit")                 "\tCtl+Q",      IDM_GAME_QUIT},
   {NULL, 0},
 
 
-  {N_("Gov_ernment"),                          IDM_SUBMENU},
-  {N_("Tax Rates")             "\tShift+T",    IDM_GOVERNMENT_TAX_RATE},
+  {N_("_Edit"),                                        IDM_SUBMENU},
+  {N_("_Tax Rates")            "\tShift+T",    IDM_GOVERNMENT_TAX_RATE},
   { "", IDM_SEPARATOR},
   {N_("_Find City")            "\tCtl+F",      IDM_GOVERNMENT_FIND_CITY},
-  {N_("Work_lists")            "\tCtl+W",      IDM_GOVERNMENT_WORKLISTS},
+  {N_("_Worklists")            "\tCtl+W",      IDM_GOVERNMENT_WORKLISTS},
   { "", IDM_SEPARATOR},
-  {N_("_Change Government"),                   IDM_SUBMENU},
+  {N_("_Government"),                          IDM_SUBMENU},
   {N_("_Revolution"),                          IDM_GOVERNMENT_REVOLUTION},
   {"", IDM_SEPARATOR},
   {NULL, 0},
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to