gtranslator r3756 - in trunk: . help help/C src

[icq svn gnome org]

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

Log:
	* configure.ac:
	* Makefile.am:
	* /help/C/gtranslator.xml:
	* /help/gtranslator.om.in:
	* /help/Makefile.am:
	Changed to gnome-doc-utils.
	* /src/actions.h:
	* /src/actions-help.c:
	* /src/window.c:
	Now the help is shown with ghelp.

	Added support for gnome-doc-utils and show the
	user manual.

Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.ac
   trunk/help/C/gtranslator.xml
   trunk/help/Makefile.am
   trunk/src/actions-help.c
   trunk/src/actions.h
   trunk/src/window.c

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Mon Sep 22 09:47:01 2008
@@ -8,4 +8,10 @@
 		gtranslator.spec.in \
 		gtranslator.spec \
 		omf.make \
-		xmldocs.make
+		xmldocs.make \
+		gnome-doc-utils.make
+
+DISTCLEANFILES = 		\
+	gnome-doc-utils.make    
+
+DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc
\ No newline at end of file

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Sep 22 09:47:01 2008
@@ -10,6 +10,7 @@
 AC_CONFIG_SRCDIR(src/main.c)
 AC_CONFIG_MACRO_DIR([m4])
 AM_CONFIG_HEADER(config.h)
+AC_CONFIG_MACRO_DIR ([m4])
 
 GTR_API_VERSION=2.0
 AC_SUBST(GTR_API_VERSION)
@@ -37,6 +38,7 @@
 AC_ISC_POSIX
 AM_PROG_LIBTOOL
 AC_TYPE_SIGNAL
+GNOME_DOC_INIT
 GTK_DOC_CHECK([1.0])
 
 dnl -------------------------------------------------------------------

Modified: trunk/help/C/gtranslator.xml
==============================================================================
--- trunk/help/C/gtranslator.xml	(original)
+++ trunk/help/C/gtranslator.xml	Mon Sep 22 09:47:01 2008
@@ -25,7 +25,7 @@
     </copyright>
     -->
 
-    <publisher>
+    <publisher role="maintainer">
 	    <publishername>GNOME Documentation Project</publishername>
     </publisher>
 
@@ -76,6 +76,10 @@
 	    </revision>
     </revhistory>
 
+    <abstract role="description">
+      <para>&app; is an enhanced gettext po file editor for the GNOME desktop environment.</para>
+    </abstract>
+
   </articleinfo>
   
 <!-- ================ Document Body ================= -->
@@ -1356,91 +1360,91 @@
   </sect1>
 
 
-  <sect1 id="gtranslator-glossary">
-    <title>Glossary</title>
-    <para>
-      <variablelist>
-        <varlistentry>
-          <term>
-            <command>gettext</command>
-          </term>
-          <listitem>
-            <para></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>po file</term>
-          <listitem>
-            <para></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>internationalization</term>
-          <listitem>
-            <para></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>localization</term>
-          <listitem>
-            <para></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>l10n</term>
-          <listitem>
-            <para></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>i18n</term>
-          <listitem>
-            <para></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>translation memory</term>
-          <listitem>
-            <para></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>ISO 3166 coutry code</term>
-          <listitem>
-            <para></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>ISO 639-2 language code</term>
-          <listitem>
-            <para></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>default query domain</term>
-          <listitem>
-            <para></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>charset</term>
-          <listitem>
-            <para></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>encoding</term>
-          <listitem>
-            <para></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>URI</term>
-          <listitem>
-            <para></para>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-    </para>
-  </sect1>
+<!--   <sect1 id="gtranslator-glossary"> -->
+<!--     <title>Glossary</title> -->
+<!--     <para> -->
+<!--       <variablelist> -->
+<!--         <varlistentry> -->
+<!--           <term> -->
+<!--             <command>gettext</command> -->
+<!--           </term> -->
+<!--           <listitem> -->
+<!--             <para></para> -->
+<!--           </listitem> -->
+<!--         </varlistentry> -->
+<!--         <varlistentry> -->
+<!--           <term>po file</term> -->
+<!--           <listitem> -->
+<!--             <para></para> -->
+<!--           </listitem> -->
+<!--         </varlistentry> -->
+<!--         <varlistentry> -->
+<!--           <term>internationalization</term> -->
+<!--           <listitem> -->
+<!--             <para></para> -->
+<!--           </listitem> -->
+<!--         </varlistentry> -->
+<!--         <varlistentry> -->
+<!--           <term>localization</term> -->
+<!--           <listitem> -->
+<!--             <para></para> -->
+<!--           </listitem> -->
+<!--         </varlistentry> -->
+<!--         <varlistentry> -->
+<!--           <term>l10n</term> -->
+<!--           <listitem> -->
+<!--             <para></para> -->
+<!--           </listitem> -->
+<!--         </varlistentry> -->
+<!--         <varlistentry> -->
+<!--           <term>i18n</term> -->
+<!--           <listitem> -->
+<!--             <para></para> -->
+<!--           </listitem> -->
+<!--         </varlistentry> -->
+<!--         <varlistentry> -->
+<!--           <term>translation memory</term> -->
+<!--           <listitem> -->
+<!--             <para></para> -->
+<!--           </listitem> -->
+<!--         </varlistentry> -->
+<!--         <varlistentry> -->
+<!--           <term>ISO 3166 coutry code</term> -->
+<!--           <listitem> -->
+<!--             <para></para> -->
+<!--           </listitem> -->
+<!--         </varlistentry> -->
+<!--         <varlistentry> -->
+<!--           <term>ISO 639-2 language code</term> -->
+<!--           <listitem> -->
+<!--             <para></para> -->
+<!--           </listitem> -->
+<!--         </varlistentry> -->
+<!--         <varlistentry> -->
+<!--           <term>default query domain</term> -->
+<!--           <listitem> -->
+<!--             <para></para> -->
+<!--           </listitem> -->
+<!--         </varlistentry> -->
+<!--         <varlistentry> -->
+<!--           <term>charset</term> -->
+<!--           <listitem> -->
+<!--             <para></para> -->
+<!--           </listitem> -->
+<!--         </varlistentry> -->
+<!--         <varlistentry> -->
+<!--           <term>encoding</term> -->
+<!--           <listitem> -->
+<!--             <para></para> -->
+<!--           </listitem> -->
+<!--         </varlistentry> -->
+<!--         <varlistentry> -->
+<!--           <term>URI</term> -->
+<!--           <listitem> -->
+<!--             <para></para> -->
+<!--           </listitem> -->
+<!--         </varlistentry> -->
+<!--       </variablelist> -->
+<!--     </para> -->
+<!--   </sect1> -->
 </article>

Modified: trunk/help/Makefile.am
==============================================================================
--- trunk/help/Makefile.am	(original)
+++ trunk/help/Makefile.am	Mon Sep 22 09:47:01 2008
@@ -1,7 +1,14 @@
-##
-## Add eventually existing other languages docs to here.
-##
+include $(top_srcdir)/gnome-doc-utils.make
+dist-hook: doc-dist-hook
+
+DOC_MODULE = gtranslator
+DOC_ENTITIES = legal.xml
+DOC_INCLUDES =
+DOC_FIGURES = figures/mainwindow.png \
+	      figures/prefs.png	\
+	      figures/toolbar.png
+DOC_LINGUAS =
 
 SUBDIRS = C
 # ja
-EXTRA_DIST = ChangeLog
+

Modified: trunk/src/actions-help.c
==============================================================================
--- trunk/src/actions-help.c	(original)
+++ trunk/src/actions-help.c	Mon Sep 22 09:47:01 2008
@@ -30,6 +30,31 @@
 
 #include <gtk/gtkaboutdialog.h>
 
+/*
+ * Show the user's guide for gtranslator
+ */
+void
+gtranslator_cmd_help_contents (GtkAction   *action,
+			       GtranslatorWindow *window)
+{
+  GError *error = NULL;
+  gboolean ret;
+  GtkWidget *dialog;
+
+  ret = g_app_info_launch_default_for_uri ("ghelp:gtranslator", NULL, &error);
+
+  if (ret == FALSE) 
+  {
+    dialog = gtk_message_dialog_new (GTK_WINDOW (window), 
+				     GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+				     GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, 
+				     _("Unable to open help file for gtranslator"));
+   
+    gtk_dialog_run (GTK_DIALOG (dialog));
+    gtk_widget_destroy (dialog);
+    g_error_free (error);
+  }
+}
 
 /*
  * Creates and shows the about box for gtranslator.

Modified: trunk/src/actions.h
==============================================================================
--- trunk/src/actions.h	(original)
+++ trunk/src/actions.h	Mon Sep 22 09:47:01 2008
@@ -144,6 +144,9 @@
 void       gtranslator_window_show_home_page    (GtkAction *action,
 						 gpointer useless);
 
+void       gtranslator_cmd_help_contents        (GtkAction *action,
+                                                 GtranslatorWindow *window);
+
 void       gtranslator_about_dialog             (GtkAction *action,
 						 GtranslatorWindow *window);
 

Modified: trunk/src/window.c
==============================================================================
--- trunk/src/window.c	(original)
+++ trunk/src/window.c	Mon Sep 22 09:47:01 2008
@@ -130,7 +130,7 @@
 		
 	/* Help menu */
 	{ "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", NULL,
-	  NULL },
+	  G_CALLBACK (gtranslator_cmd_help_contents) },
 	{ "HelpAbout", GTK_STOCK_ABOUT, NULL, NULL, NULL,
 	  G_CALLBACK (gtranslator_about_dialog) },
 };