Re: [Freeciv-Dev] (PR#39913) consistent UI - Government should be Edit
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,
"" },
{ "/" N_("Game") "/tearoff1",NULL,
NULL, 0,
"" },
- { "/" N_("Game") "/" N_("Local _Options"), NULL,
+ { "/" N_("Game") "/" N_("_Chat"),NULL,
+ NULL, 0,
"" },
+ { "/" 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,
"" },
+ { "/" N_("Game") "/" N_("_Government") "/" N_("_Tax Rates"),
"t",
+ government_menu_callback, MENU_GOVERNMENT_TAX_RATE
},
+ { "/" N_("Game") "/" N_("_Government") "/" N_("_Revolution..."),
"r",
+ government_menu_callback, MENU_GOVERNMENT_REVOLUTION
},
+ { "/" N_("Game") "/" N_("_Government") "/sep1", NULL,
+ NULL, 0,
"" },
+ { "/" N_("Game") "/" N_("_Options"), NULL,
+ NULL, 0,
"" },
+ { "/" 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,
"" },
+ { "/" N_("Game") "/sep4",NULL,
NULL, 0,
"" },
#ifdef DEBUG
{ "/" N_("Game") "/" N_("_Reload Tileset"), "r",
game_menu_cal
Re: [Freeciv-Dev] (PR#39913) consistent UI - Government should be Edit
http://bugs.freeciv.org/Ticket/Display.html?id=39913 >
William Allen Simpson wrote:
> I will change Gover_nment to Gov_ernment, so gui-gtk2 matches gui-win32,
> to eliminate the conflict with other _n's. No po changes.
>
Committed S2_1 revision 14083.
Index: client/gui-gtk-2.0/menu.c
===
--- client/gui-gtk-2.0/menu.c (revision 14082)
+++ client/gui-gtk-2.0/menu.c (working copy)
@@ -726,17 +726,17 @@
game_menu_callback, MENU_GAME_QUIT,
"",
GTK_STOCK_QUIT
},
/* Government menu ... */
- { "/" N_("Gover_nment"), NULL,
+ { "/" N_("Gov_ernment"), NULL,
NULL, 0,
"" },
{ "/" N_("Government") "/tearoff1", NULL,
NULL, 0,
"" },
- { "/" N_("Government") "/" N_("_Tax Rates"), "t",
+ { "/" N_("Government") "/" N_("Tax Rates"), "t",
government_menu_callback, MENU_GOVERNMENT_TAX_RATE
},
{ "/" N_("Government") "/sep1", NULL,
NULL, 0,
"" },
- { "/" N_("Government") "/" N_("_Find City"), "f",
+ { "/" N_("Government") "/" N_("Find City"), "f",
government_menu_callback, MENU_GOVERNMENT_FIND_CITY
},
- { "/" N_("Government") "/" N_("_Worklists"), "l",
+ { "/" N_("Government") "/" N_("Worklists"), "l",
government_menu_callback, MENU_GOVERNMENT_WORKLISTS
},
{ "/" N_("Government") "/sep2", NULL,
NULL, 0,
"" },
Index: client/gui-win32/menu.c
===
--- client/gui-win32/menu.c (revision 14082)
+++ client/gui-win32/menu.c (working copy)
@@ -321,8 +321,8 @@
{N_("Gov_ernment"), 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_("Find City") "\tCtl+F", IDM_GOVERNMENT_FIND_CITY},
+ {N_("Worklists") "\tCtl+W", IDM_GOVERNMENT_WORKLISTS},
{ "", IDM_SEPARATOR},
{N_("_Change Government"), IDM_SUBMENU},
{N_("_Revolution"), IDM_GOVERNMENT_REVOLUTION},
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39913) consistent UI - Government should be Edit
http://bugs.freeciv.org/Ticket/Display.html?id=39913 > Daniel Markstedt wrote: > How about something like Council or Throne Room or Assembly etc. Please > give suggestions! > Civ2 used Kingdom. Anyway, it's a bad idea. Everything related to editing should be under the Edit menu. > Please don't change this in 2.1. OK. I've already written the patch for 2.1, but svn revert works I will change Gover_nment to Gov_ernment, so gui-gtk2 matches gui-win32, to eliminate the conflict with other _n's. No po changes. > Do you mean Revolution? >... > How about putting the Editor functions under Game? No, let's put Revolution under Game, instead. Of course, as I mentioned earlier, it really needs to be activated by clicking on the current government icon in the pane, just like changing tax rates. But they are supposed to have a parallel menu item, too. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39913) consistent UI - Government should be Edit
http://bugs.freeciv.org/Ticket/Display.html?id=39913 >
This also fixes the bug that the editor main menu was improperly disabled
sometimes. HIG [page 43] explicitly says:
Do not disable menu titles. Allow the user to explore the menu, even
though there might be no available items on it at that time.
With the Editing Mode under Edit, Editing Mode can be disabled instead.
The items below it are disabled until Editing Mode is enabled (as now).
Attempted to fix gui-win32 in passing (without testing), but no others.
Index: client/gui-gtk-2.0/menu.c
===
--- client/gui-gtk-2.0/menu.c (revision 14078)
+++ client/gui-gtk-2.0/menu.c (working copy)
@@ -766,28 +766,39 @@
{ "/" N_("Game") "/" N_("_Quit"),NULL,
game_menu_callback, MENU_GAME_QUIT,
"",
GTK_STOCK_QUIT
},
- /* Government menu ... */
- { "/" N_("Gover_nment"), NULL,
+ /* was Government menu ... */
+ { "/" N_("_Edit"), NULL,
NULL, 0,
"" },
- { "/" N_("Government") "/tearoff1", NULL,
+ { "/" N_("_Edit") "/tearoff1", NULL,
NULL, 0,
"" },
- { "/" N_("Government") "/" N_("_Tax Rates"), "t",
+ { "/" N_("_Edit") "/" N_("Tax Rates"), "t",
government_menu_callback, MENU_GOVERNMENT_TAX_RATE
},
- { "/" N_("Government") "/sep1", NULL,
+ { "/" N_("_Edit") "/sep1", NULL,
NULL, 0,
"" },
- { "/" N_("Government") "/" N_("_Find City"), "f",
+ { "/" N_("_Edit") "/" N_("Find City"), "f",
government_menu_callback, MENU_GOVERNMENT_FIND_CITY
},
- { "/" N_("Government") "/" N_("_Worklists"), "l",
+ { "/" N_("_Edit") "/" N_("Worklists"), "l",
government_menu_callback, MENU_GOVERNMENT_WORKLISTS
},
- { "/" N_("Government") "/sep2", NULL,
+ { "/" N_("_Edit") "/sep2", NULL,
NULL, 0,
"" },
- { "/" N_("Government") "/" N_("_Change Government"), NULL,
+ { "/" N_("_Edit") "/" N_("_Government"), NULL,
NULL, 0,
"" },
- { "/" N_("Government") "/" N_("_Change Government") "/" N_("_Revolution..."),
+ { "/" N_("_Edit") "/" N_("_Government") "/" N_("Revolution..."),
"r",
government_menu_callback, MENU_GOVERNMENT_REVOLUTION
},
- { "/" N_("_Government") "/" N_("_Change Government") "/sep1", NULL,
+ { "/" N_("_Edit") "/" N_("_Government") "/sep1", NULL,
NULL, 0,
"" },
+ /* was Editor menu */
+ { "/" N_("_Edit") "/tearoff2", NULL, NULL, 0, "" },
+ { "/" N_("_Edit") "/" N_("Editing _Mode"), NULL,
+editor_menu_callback, MENU_EDITOR_TOGGLE, "" },
+ { "/" 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,
"" },
@@ -955,18 +966,6 @@
{ "/" N_("Reports") "/" N_("S_paceship"),"F12",
reports_menu_callback, MENU_REPORT_SPACESHIP
},
- /* Editor menu */
- { "/" N_("_Editor"), NULL, NULL, 0, "" },
- { "/" N_("_Editor") "/tearoff1", NULL, NULL, 0, "" },
- { "/" N_("_Editor") "/" N_("_Editing Mode"), NULL,
-editor_menu_callback, MENU_EDITOR_TOGGLE, "" },
- { "/" 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,
"" },
@@ -1268,14 +1267,13 @@
menus_set_sensitive("/_Game/L_eave", aconnection.established);
if (!can_client_change_view()) {
