gtranslator r3679 - in trunk: . data src

[icq svn gnome org]

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

Log:
2008-08-07  Ignacio Casal Quinteiro  <nacho resa gmail com>

        * data/gtranslator-ui.xml:
        Added view menuitems.

	* src/
	* actions-view.c (gtranslator_actions_view_context),
	(gtranslator_actions_view_translation_memory):
	* actions.h:
	* tab.c (gtranslator_tab_edition_finished),
	(gtranslator_tab_get_translation_memory_ui),
	(gtranslator_tab_show_lateral_panel_widget):
	* tab.h:
	* window.c:
	Added menuitems to switch with shortcuts between the tabs of the lateral
	panel and added check when storin in the database.

Modified:
   trunk/ChangeLog
   trunk/data/gtranslator-ui.xml
   trunk/src/ChangeLog
   trunk/src/actions-view.c
   trunk/src/actions.h
   trunk/src/tab.c
   trunk/src/tab.h
   trunk/src/window.c

Modified: trunk/data/gtranslator-ui.xml
==============================================================================
--- trunk/data/gtranslator-ui.xml	(original)
+++ trunk/data/gtranslator-ui.xml	Mon Sep 22 09:42:35 2008
@@ -40,7 +40,10 @@
       <separator/>
       <placeholder name="ViewOps_1" />
       <separator/>
-      <menuitem name="ViewSidePaneMenu" action="ViewSidePane"/>
+      <menuitem name="ViewContextMenu" action="ViewContext"/>
+      <menuitem name="ViewTranslationMemoryMenu" action="ViewTranslationMemory"/>
+      <placeholder name="ViewOps_2" />
+      <separator/>
     </menu>
 
     <?--<menu name="BookmarksMenu" action="Bookmarks">

Modified: trunk/src/actions-view.c
==============================================================================
--- trunk/src/actions-view.c	(original)
+++ trunk/src/actions-view.c	Mon Sep 22 09:42:35 2008
@@ -16,3 +16,29 @@
  */
 
 #include "actions.h"
+
+void
+gtranslator_actions_view_context (GtkAction *action,
+				  GtranslatorWindow *window)
+{
+	GtranslatorTab *tab;
+	GtkWidget *context;
+	
+	tab = gtranslator_window_get_active_tab (window);
+	context = GTK_WIDGET (gtranslator_tab_get_context_panel (tab));
+	
+	gtranslator_tab_show_lateral_panel_widget (tab, context);
+}
+
+void
+gtranslator_actions_view_translation_memory (GtkAction *action,
+					     GtranslatorWindow *window)
+{
+	GtranslatorTab *tab;
+	GtkWidget *tm_ui;
+	
+	tab = gtranslator_window_get_active_tab (window);
+	tm_ui = GTK_WIDGET (gtranslator_tab_get_translation_memory_ui (tab));
+	
+	gtranslator_tab_show_lateral_panel_widget (tab, tm_ui);
+}
\ No newline at end of file

Modified: trunk/src/actions.h
==============================================================================
--- trunk/src/actions.h	(original)
+++ trunk/src/actions.h	Mon Sep 22 09:42:35 2008
@@ -87,6 +87,12 @@
 						 GtranslatorWindow *window);
 
 /* View */
+void       gtranslator_actions_view_context     (GtkAction *action,
+						 GtranslatorWindow *window);
+
+void       gtranslator_actions_view_translation_memory
+						(GtkAction *action,
+						 GtranslatorWindow *window);
 
 /*Go*/
 void       gtranslator_message_go_to_first      (GtkAction  * action,

Modified: trunk/src/tab.c
==============================================================================
--- trunk/src/tab.c	(original)
+++ trunk/src/tab.c	Mon Sep 22 09:42:35 2008
@@ -192,7 +192,7 @@
   
   tm = GTR_TRANSLATION_MEMORY (gtranslator_application_get_translation_memory (GTR_APP));
   
-  if (gtranslator_msg_is_translated (msg))
+  if (gtranslator_msg_is_translated (msg) && !gtranslator_msg_is_fuzzy (msg))
     gtranslator_translation_memory_store (tm,
 					  gtranslator_msg_get_msgid (msg),
 					  gtranslator_msg_get_msgstr (msg));
@@ -969,6 +969,20 @@
 }
 
 /**
+ * gtranslator_tab_get_translation_memory_ui:
+ * @tab: a #GtranslatorTab
+ *
+ * Returns: the #GtranslatorTranslationMemoryUi panel.
+ */
+GtkWidget *
+gtranslator_tab_get_translation_memory_ui (GtranslatorTab *tab)
+{
+	g_return_val_if_fail (GTR_IS_TAB (tab), NULL);
+	
+	return tab->priv->translation_memory;
+}
+
+/**
  * gtranslator_tab_get_active_view:
  * @tab: a #GtranslationTab
  *
@@ -1291,6 +1305,31 @@
 				  page);
 }
 
+/**
+ * gtranslator_tab_show_lateral_panel_widget:
+ * @tab: a #GtranslatorTab
+ * @widget: the widget to be showed
+ *
+ * Shows the notebook page of the @widget.
+ */
+void
+gtranslator_tab_show_lateral_panel_widget (GtranslatorTab *tab,
+					   GtkWidget *widget)
+{
+	gint page;
+	
+	page = gtk_notebook_page_num (GTK_NOTEBOOK (tab->priv->lateral_panel),
+				      widget);
+	gtk_notebook_set_current_page (GTK_NOTEBOOK (tab->priv->lateral_panel),
+				       page);
+}
+
+/**
+ * gtranslator_tab_clear_msgstr_views:
+ * @tab: a #GtranslatorTab
+ * 
+ * Clears all text from msgstr text views.
+ */
 void
 gtranslator_tab_clear_msgstr_views (GtranslatorTab *tab)
 {

Modified: trunk/src/tab.h
==============================================================================
--- trunk/src/tab.h	(original)
+++ trunk/src/tab.h	Mon Sep 22 09:42:35 2008
@@ -92,6 +92,8 @@
 
 GtranslatorContextPanel *gtranslator_tab_get_context_panel (GtranslatorTab *tab);
 
+GtkWidget             *gtranslator_tab_get_translation_memory_ui (GtranslatorTab *tab);
+
 GtranslatorView       *gtranslator_tab_get_active_view     (GtranslatorTab *tab);
 
 GList                 *gtranslator_tab_get_all_views       (GtranslatorTab *tab,
@@ -123,6 +125,9 @@
 void                   gtranslator_tab_remove_widget_from_lateral_panel (GtranslatorTab *tab,
 									 GtkWidget *widget);
 
+void                   gtranslator_tab_show_lateral_panel_widget (GtranslatorTab *tab,
+								  GtkWidget *widget);
+
 void                   gtranslator_tab_clear_msgstr_views  (GtranslatorTab *tab);
 							    
 gboolean              _gtranslator_tab_can_close           (GtranslatorTab *tab);

Modified: trunk/src/window.c
==============================================================================
--- trunk/src/window.c	(original)
+++ trunk/src/window.c	Mon Sep 22 09:42:35 2008
@@ -182,9 +182,15 @@
 
 
 	/* View menu */
-	{ "ViewSidePane", NULL, N_("Side _Pane"), "F9",
+	{ "ViewContext", NULL, N_("_Context"), "<control>J",
+	  N_("Show the Context panel"),
+	  G_CALLBACK (gtranslator_actions_view_context) },
+	{ "ViewTranslationMemory", NULL, N_("_Translation Memory"), "<control>K",
+	  N_("Show the Translation Memory panel"),
+	  G_CALLBACK (gtranslator_actions_view_translation_memory) },
+	/*{ "ViewSidePane", NULL, N_("Side _Pane"), "F9",
 	  N_("Show or hide the side pane in the current window"),
-	  NULL },
+	  NULL },*/
 	
 	/* Bookmarks menu */
 	/*{ "BookmarksAdd", GTK_STOCK_ADD, N_("_Add Bookmark"), "<control>D",