gtranslator r3749 - in trunk: data src src/dialogs

[icq svn gnome org]

Author: icq
Date: Mon Sep 22 09:46:35 2008
New Revision: 3749
URL: http://svn.gnome.org/viewvc/gtranslator?rev=3749&view=rev

Log:
Squashed commit of the following:

commit c27408f690819128c1af1fd8c7e87893fbdcc596
Author: Ignacio Casal Quinteiro <nacho resa gmail com>
Date:   Tue Sep 2 11:13:12 2008 +0200

    2008-09-02  Ignacio Casal Quinteiro  <nacho resa gmail com>

    	* actions-go.c (gtranslator_message_jump):
    	* actions.h:
    	* dialogs/Makefile.am:
    	* po.c (gtranslator_po_get_msg_from_number):
    	* po.h:
    	* tab.c (gtranslator_tab_go_to_number),
    	(gtranslator_tab_set_message_area):
    	* tab.h:
    	* window.c:
    	Added jump dialog/menuitem.

    	* gtr-toolbar.xml:
    	* gtranslator-ui.xml:
    	Added Jump menuitem.

Modified:
   trunk/data/ChangeLog
   trunk/data/gtr-toolbar.xml
   trunk/data/gtranslator-ui.xml
   trunk/src/ChangeLog
   trunk/src/actions-go.c
   trunk/src/actions.h
   trunk/src/dialogs/Makefile.am
   trunk/src/po.c
   trunk/src/po.h
   trunk/src/tab.c
   trunk/src/tab.h
   trunk/src/window.c

Modified: trunk/data/gtr-toolbar.xml
==============================================================================
--- trunk/data/gtr-toolbar.xml	(original)
+++ trunk/data/gtr-toolbar.xml	Mon Sep 22 09:46:35 2008
@@ -22,6 +22,7 @@
     <toolitem name="GoPreviousUntranslated"/>
     <toolitem name="GoNextFuzzyUntranslated"/>
     <toolitem name="GoPreviousFuzzyUntranslated"/>
+    <toolitem name="GoJump"/>
     <toolitem name="SearchFind"/>
     <toolitem name="SearchReplace"/>
 

Modified: trunk/data/gtranslator-ui.xml
==============================================================================
--- trunk/data/gtranslator-ui.xml	(original)
+++ trunk/data/gtranslator-ui.xml	Mon Sep 22 09:46:35 2008
@@ -75,6 +75,8 @@
       <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/actions-go.c
==============================================================================
--- trunk/src/actions-go.c	(original)
+++ trunk/src/actions-go.c	Mon Sep 22 09:46:35 2008
@@ -25,6 +25,7 @@
 #include <glib/gi18n.h>
 
 #include "actions.h"
+#include "jump-dialog.h"
 #include "po.h"
 #include "tab.h"
 #include "window.h"
@@ -162,4 +163,11 @@
 	po = gtranslator_tab_get_po (current);
 	if (gtranslator_tab_go_to_prev_fuzzy_or_untrans (current))
 		set_sensitive_according_to_message (window, po);
+}
+
+void
+gtranslator_message_jump (GtkAction *action,
+			  GtranslatorWindow *window)
+{
+	gtranslator_show_jump_dialog (window);
 }
\ No newline at end of file

Modified: trunk/src/actions.h
==============================================================================
--- trunk/src/actions.h	(original)
+++ trunk/src/actions.h	Mon Sep 22 09:46:35 2008
@@ -130,6 +130,9 @@
 						(GtkAction *action,
 						 GtranslatorWindow *window);
 
+void       gtranslator_message_jump             (GtkAction *action,
+						 GtranslatorWindow *window);
+
 /*Search*/
 void       _gtranslator_actions_search_find     (GtkAction   *action,
 						 GtranslatorWindow *window);

Modified: trunk/src/dialogs/Makefile.am
==============================================================================
--- trunk/src/dialogs/Makefile.am	(original)
+++ trunk/src/dialogs/Makefile.am	Mon Sep 22 09:46:35 2008
@@ -29,7 +29,9 @@
 	profile-dialog.c \
 	profile-dialog.h \
 	assistant.c \
-	assistant.h
+	assistant.h \
+	jump-dialog.c \
+	jump-dialog.h
 
 gladedir = $(pkgdatadir)
 
@@ -38,7 +40,8 @@
 		search-dialog.glade \
 		header-dialog.glade \
 		comment-dialog.glade \
-		profile-dialog.glade
+		profile-dialog.glade \
+		jump-dialog.glade
 
 EXTRA_DIST = \
 		$(glade_DATA)

Modified: trunk/src/po.c
==============================================================================
--- trunk/src/po.c	(original)
+++ trunk/src/po.c	Mon Sep 22 09:46:35 2008
@@ -1114,6 +1114,22 @@
 }
 
 /**
+ * gtranslator_po_get_msg_from_number:
+ * @po: a #GtranslatorPo
+ * @number: the message to jump
+ *
+ * Gets the message at the given position.
+ */
+GList *
+gtranslator_po_get_msg_from_number (GtranslatorPo *po,
+				    gint number)
+{
+	g_return_val_if_fail (GTR_IS_PO (po), NULL);
+	
+	return g_list_nth (po->priv->messages, number);
+}
+
+/**
  * gtranslator_po_get_header:
  * @po: a #GtranslatorPo
  *

Modified: trunk/src/po.h
==============================================================================
--- trunk/src/po.h	(original)
+++ trunk/src/po.h	Mon Sep 22 09:46:35 2008
@@ -137,6 +137,9 @@
 
 GList           *gtranslator_po_get_prev_fuzzy_or_untrans (GtranslatorPo *po);
 
+GList           *gtranslator_po_get_msg_from_number     (GtranslatorPo *po,
+							 gint number);
+
 GtranslatorHeader  
 		*gtranslator_po_get_header		(GtranslatorPo *po);
 

Modified: trunk/src/tab.c
==============================================================================
--- trunk/src/tab.c	(original)
+++ trunk/src/tab.c	Mon Sep 22 09:46:35 2008
@@ -1677,6 +1677,31 @@
 }
 
 /**
+ * gtranslator_tab_go_to_number:
+ * @tab: a #GtranslatorTab
+ * @number: the message number you want to jump
+ *
+ * Jumps to the message with the @number in the list, if the message does not
+ * exists it does not jump.
+ */
+void
+gtranslator_tab_go_to_number (GtranslatorTab *tab,
+			      gint number)
+{
+	GtranslatorPo *po;
+	GList *msg;
+	
+	po = gtranslator_tab_get_po (tab);
+	
+	msg = gtranslator_po_get_msg_from_number (po, number);
+	if(msg != NULL)
+	{
+		gtranslator_tab_message_go_to (tab, msg, FALSE,
+					       GTR_TAB_MOVE_NONE);
+	}
+}
+
+/**
  * gtranslator_tab_set_message_area:
  * @tab: a #GtranslatorTab
  * @message_area: a #GtranslatorMessageArea
@@ -1688,7 +1713,6 @@
 				  GtkWidget *message_area)
 {
 	g_return_if_fail (GTR_IS_TAB (tab));
-	g_return_if_fail (GTR_IS_MESSAGE_AREA (message_area));
 	
         if (tab->priv->message_area == message_area)
                 return;

Modified: trunk/src/tab.h
==============================================================================
--- trunk/src/tab.h	(original)
+++ trunk/src/tab.h	Mon Sep 22 09:46:35 2008
@@ -160,6 +160,9 @@
 
 gboolean               gtranslator_tab_go_to_prev_fuzzy_or_untrans (GtranslatorTab *tab);
 
+void                   gtranslator_tab_go_to_number        (GtranslatorTab *tab,
+							    gint number);
+
 void                   gtranslator_tab_set_message_area    (GtranslatorTab  *tab,
 							    GtkWidget *message_area);
 							    

Modified: trunk/src/window.c
==============================================================================
--- trunk/src/window.c	(original)
+++ trunk/src/window.c	Mon Sep 22 09:46:35 2008
@@ -247,6 +247,9 @@
 	{ "GoPreviousFuzzyUntranslated", GTK_STOCK_GO_BACK, 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",