gtranslator r3928 - in trunk: . data src src/dialogs

[psanxiao svn gnome org]

Author: psanxiao
Date: Sat Jan 31 12:40:19 2009
New Revision: 3928
URL: http://svn.gnome.org/viewvc/gtranslator?rev=3928&view=rev

Log:
    	Patch by Luca Ferretti.

    	* data/gtranslator-ui.xml:
    	* src/window.c:
    	* src/dialogs/jump-dialog.c:
    	Reorganized the go menu according to
    	Gnome HIG. (See bug #569073)

Modified:
   trunk/ChangeLog
   trunk/data/gtranslator-ui.xml
   trunk/src/dialogs/jump-dialog.c
   trunk/src/window.c

Modified: trunk/data/gtranslator-ui.xml
==============================================================================
--- trunk/data/gtranslator-ui.xml	(original)
+++ trunk/data/gtranslator-ui.xml	Sat Jan 31 12:40:19 2009
@@ -64,10 +64,11 @@
       <menuitem name="GoPrevFileMenu" action="GoPrevFile"/>
       <menuitem name="GoNextFileMenu" action="GoNextFile"/>
       <separator/>
-      <menuitem name="GoFirstMenu" action="GoFirst"/>
       <menuitem name="GoPreviousMenu" action="GoPrevious"/>
-      <separator/>
       <menuitem name="GoForwardMenu" action="GoForward"/>
+      <menuitem name="GoJumpMenu" action="GoJump"/>
+      <separator/>
+      <menuitem name="GoFirstMenu" action="GoFirst"/>
       <menuitem name="GoLastMenu" action="GoLast"/>
       <separator/>
       <menuitem name="GoNextFuzzyMenu" action="GoNextFuzzy"/>
@@ -78,8 +79,6 @@
       <separator/>
       <menuitem name="GoNextFuzzyUntranslatedMenu" action="GoNextFuzzyUntranslated"/>
       <menuitem name="GoPreviousFuzzyUntranslatedMenu" action="GoPreviousFuzzyUntranslated"/>
-      <separator/>
-      <menuitem name="GoJumpMenu" action="GoJump"/>
     </menu>
 
     <menu name="SearchMenu" action="Search">

Modified: trunk/src/dialogs/jump-dialog.c
==============================================================================
--- trunk/src/dialogs/jump-dialog.c	(original)
+++ trunk/src/dialogs/jump-dialog.c	Sat Jan 31 12:40:19 2009
@@ -84,7 +84,7 @@
 				GTK_RESPONSE_CANCEL,
 				NULL);
 	
-	gtk_window_set_title (GTK_WINDOW (dlg), _("Jump To"));
+	gtk_window_set_title (GTK_WINDOW (dlg), _("Go to Message"));
 	gtk_window_set_default_size(GTK_WINDOW(dlg), 300, 100);
 	gtk_window_set_resizable (GTK_WINDOW (dlg), TRUE);
 	gtk_dialog_set_has_separator (GTK_DIALOG (dlg), FALSE);

Modified: trunk/src/window.c
==============================================================================
--- trunk/src/window.c	(original)
+++ trunk/src/window.c	Sat Jan 31 12:40:19 2009
@@ -229,16 +229,19 @@
         { "GoNextFile", NULL, N_("Next Fi_le"), 
 	  "<control>Page_Down", N_("Go to the next file"),
 	  G_CALLBACK (gtranslator_file_go_to_next) },
-        { "GoFirst", GTK_STOCK_GOTO_FIRST, NULL, 
-	  "<alt>Home", N_("Go to the first message"),
-          G_CALLBACK (gtranslator_message_go_to_first) },
-	{ "GoPrevious", GTK_STOCK_GO_BACK, NULL, "<alt>Left",
-          N_("Move back one message"),
+	{ "GoPrevious", GTK_STOCK_GO_BACK, N_("_Previous Message"),
+	  "<alt>Left", N_("Move back one message"),
           G_CALLBACK (gtranslator_message_go_to_previous) },
-	{ "GoForward", GTK_STOCK_GO_FORWARD, NULL, "<alt>Right",
-          N_("Move forward one message"),
+	{ "GoForward", GTK_STOCK_GO_FORWARD, N_("_Next Message"),
+	  "<alt>Right", N_("Move forward one message"),
           G_CALLBACK (gtranslator_message_go_to_next) },
-	{ "GoLast", GTK_STOCK_GOTO_LAST, NULL, 
+	{ "GoJump", GTK_STOCK_JUMP_TO, N_("_Go to Message..."),
+	  "<control>G", N_("Jumps to a specific message"),
+          G_CALLBACK (gtranslator_message_jump) },
+        { "GoFirst", GTK_STOCK_GOTO_FIRST, N_("_First Message"), 
+	  "<alt>Home", N_("Go to the first message"),
+          G_CALLBACK (gtranslator_message_go_to_first) },
+	{ "GoLast", GTK_STOCK_GOTO_LAST, N_("_Last Message"), 
 	  "<alt>End", N_("Go to the last message"),
           G_CALLBACK (gtranslator_message_go_to_last) },
 	{ "GoNextFuzzy", GTR_STOCK_FUZZY_NEXT, N_("Next Fuz_zy"),
@@ -259,9 +262,6 @@
 	{ "GoPreviousFuzzyUntranslated", GTR_STOCK_FUZZY_UNTRANS_PREV, N_("Pre_vious Fuzzy or Untranslated"),
 	  "<control><shift>Page_Up", N_("Go to the previous fuzzy or untranslated message"),
           G_CALLBACK (gtranslator_message_go_to_prev_fuzzy_or_untranslated) },
-	{ "GoJump", GTK_STOCK_JUMP_TO, NULL,
-	  "<control>G", N_("Jumps to a specific message"),
-          G_CALLBACK (gtranslator_message_jump) },
 
 	/* Search menu*/
 	{ "SearchFind", GTK_STOCK_FIND, NULL, "<control>F",