[ghex] Port the documentation from gnome-doc-utils to yelp-tools



commit 8b0824b06553b33cb4157058a18ba4d420892fab
Author: Kalev Lember <kalevlember gmail com>
Date:   Wed May 16 09:21:48 2012 +0300

    Port the documentation from gnome-doc-utils to yelp-tools

 Makefile.am                        |    3 ---
 configure.ac                       |    3 +--
 help/C/{ghex.xml => index.docbook} |    0
 help/ChangeLog                     |   30 ------------------------------
 help/Makefile.am                   |   19 +++++++++----------
 help/ghex.omf.in                   |    9 ---------
 src/preferences.c                  |    2 +-
 src/ui.c                           |   11 +++++++----
 8 files changed, 18 insertions(+), 59 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 9edcfdb..4a3a954 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,12 +2,9 @@
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
-
 SUBDIRS = data po help src icons
 
 EXTRA_DIST =			\
-	gnome-doc-utils.make	\
 	COPYING-DOCS		\
 	HACKING
 
diff --git a/configure.ac b/configure.ac
index 8041af9..fe0af29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,8 +74,7 @@ GNOME_COMPILE_WARNINGS([maximum])
 AC_ARG_ENABLE(debug,
               [  --enable-debug      Enables extra debugging output], AC_DEFINE(ENABLE_DEBUG, 1, [Should verbose debugging output be enabled.]))
 
-GNOME_DOC_INIT([0.9.0],,
-  [AC_MSG_WARN([[gnome-doc-utils not found: documentation will not be built.]])])
+YELP_HELP_INIT
 
 AC_CONFIG_FILES([
 Makefile
diff --git a/help/C/ghex.xml b/help/C/index.docbook
similarity index 100%
rename from help/C/ghex.xml
rename to help/C/index.docbook
diff --git a/help/Makefile.am b/help/Makefile.am
index 56e370c..816c0ed 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,15 +1,14 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
-
-DOC_MODULE = ghex
-DOC_ENTITIES =
-DOC_INCLUDES = legal.xml
-DOC_H_FILE = ghex-docs.h
-DOC_H_DOCS = C/ghex.xml
-DOC_FIGURES =	\
+ YELP_HELP_RULES@
+HELP_ID = ghex
+
+HELP_FILES = \
+	index.docbook \
+	legal.xml
+
+HELP_MEDIA = \
 	figures/ghex_window_empty.png	\
 	figures/ghex_window_open.png
 
-DOC_LINGUAS = cs de es fr it ja ko oc sl sv th zh_CN zh_TW
+HELP_LINGUAS = cs de es fr it ja ko oc sl sv th zh_CN zh_TW
 
 -include $(top_srcdir)/git.mk
diff --git a/src/preferences.c b/src/preferences.c
index 3849ade..053bb43 100644
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -439,7 +439,7 @@ prefs_response_cb(GtkDialog *dlg, gint response, PropertyUI *pui)
 
 	switch(response) {
 	case GTK_RESPONSE_HELP:
-		gtk_show_uri (NULL, "ghelp:ghex?ghex-prefs",  gtk_get_current_event_time (), &error);
+		gtk_show_uri (NULL, "help:ghex/ghex-prefs",  gtk_get_current_event_time (), &error);
 		if(NULL != error) {
 			GtkWidget *dialog;
 			dialog = gtk_message_dialog_new
diff --git a/src/ui.c b/src/ui.c
index 41928ea..16f040d 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -143,8 +143,11 @@ about_cb (GtkAction  *action,
 		NULL
 	};
 
-	/* For documentation_credits */
-	#include "../help/ghex-docs.h"
+	const gchar *documenters[] = {
+		"Jaka Mocnik",
+		"Sun GNOME Documentation Team",
+		NULL
+	};
 
 	const gchar *license[] = {
 		N_("This program is free software; you can redistribute it and/or modify "
@@ -173,7 +176,7 @@ about_cb (GtkAction  *action,
 	                       "authors", authors,
 	                       "comments", _("A binary file editor"),
 	                       "copyright", copyright,
-	                       "documenters", documentation_credits,
+	                       "documenters", documenters,
 	                       "license", license_translated,
 	                       "logo-icon-name", PACKAGE,
 	                       "program-name", "GHex",
@@ -196,7 +199,7 @@ help_cb (GtkAction  *action,
 	GError *error = NULL;
 
 	gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (window)),
-	              "ghelp:ghex",
+	              "help:ghex",
 	              gtk_get_current_event_time (),
 	              &error);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]