From a6f821ff833171da62a25ad24fd85bc7834f1961 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Tue, 8 May 2012 05:13:53 +0200 Subject: support for opening the HTML manual from the experiment player help menu URI is configurable (--with-help-uri) --- configure.ac | 8 ++++++++ src/Makefile.am | 3 ++- src/default.ui | 14 ++++++++++++++ src/main.c | 7 +++++++ 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 943dfab..d330e1d 100644 --- a/configure.ac +++ b/configure.ac @@ -109,6 +109,14 @@ AC_ARG_WITH(default-ui, # must be expanded by the Makefiles AC_SUBST(DEFAULT_UI) +AC_ARG_WITH(help-uri, + AS_HELP_STRING([--with-help-uri=URI], + [Specify help (manual) URI [default=file://DOCDIR/experiment-player.html]]), + [HELP_URI=$withval], [HELP_URI=file://$docdir/experiment-player.html]) +# NOTE: cannot use AC_DEFINE_UNQUOTED since installation directories +# must be expanded by the Makefiles +AC_SUBST(HELP_URI) + AC_ARG_ENABLE(doxygen-doc, AS_HELP_STRING([--enable-doxygen-doc], [Generate Doxygen documentation [default=no]]), diff --git a/src/Makefile.am b/src/Makefile.am index f69a513..8915af2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,7 +4,8 @@ bin_PROGRAMS = experiment-player experiment_player_SOURCES = main.c experiment_player_CFLAGS = $(AM_CFLAGS) -experiment_player_CPPFLAGS = -DDEFAULT_UI='"@DEFAULT_UI@"' +experiment_player_CPPFLAGS = -DDEFAULT_UI='"@DEFAULT_UI@"' \ + -DHELP_URI='"@HELP_URI@"' experiment_player_LDFLAGS = experiment_player_LDADD = diff --git a/src/default.ui b/src/default.ui index 85f4be4..7f74228 100644 --- a/src/default.ui +++ b/src/default.ui @@ -111,6 +111,16 @@ True + + + Read _Manual... + True + True + image4 + False + + + gtk-about @@ -236,4 +246,8 @@ audio-volume-medium True gtk-directory + + True + gtk-help + diff --git a/src/main.c b/src/main.c index e71914b..af75dfb 100644 --- a/src/main.c +++ b/src/main.c @@ -136,6 +136,13 @@ quickopen_menu_refresh_item_activate_cb(GtkWidget *widget, refresh_quickopen_menu(GTK_MENU(widget)); } +void +help_menu_manual_item_activate_cb(GtkWidget *widget __attribute__((unused)), + gpointer data __attribute__((unused))) +{ + gtk_show_uri(NULL, HELP_URI, GDK_CURRENT_TIME, NULL); +} + void generic_quit_cb(GtkWidget *widget __attribute__((unused)), gpointer data __attribute__((unused))) -- cgit v1.2.3