diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | help/Makefile.am | 13 | ||||
| -rw-r--r-- | src/gl-application.c | 3 |
6 files changed, 22 insertions, 6 deletions
@@ -1,6 +1,6 @@ Makefile +Makefile.in /INSTALL -/Makefile.in /autom4te.cache/ /build-aux/ /data/.dstamp diff --git a/Makefile.am b/Makefile.am index c96af90..334d979 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ DISTCHECK_CONFIGURE_FLAGS = \ --enable-appdata-validate \ --enable-tests -SUBDIRS = po +SUBDIRS = help po bin_PROGRAMS = gnome-logs @@ -2,5 +2,5 @@ GNOME Logs is a log viewer for the systemd journal https://wiki.gnome.org/Apps/Logs -It depends on GTK+ 3.10 or above and libsystemd-journal at build time, and -gsettings-desktop-schemas at runtime. +It depends on GTK+ 3.10 or above, itstool and libsystemd-journal at build time, +and gsettings-desktop-schemas at runtime. diff --git a/configure.ac b/configure.ac index a6f2268..c9d40ef 100644 --- a/configure.ac +++ b/configure.ac @@ -64,6 +64,9 @@ AM_CONDITIONAL([ENABLE_MAN], [test "x$have_manutils" = "xyes"]) dnl AppData XML APPDATA_XML +dnl Mallard Help +YELP_HELP_INIT + dnl Testing utilities. AC_ARG_ENABLE([tests], [AS_HELP_STRING([--disable-tests], [Disable support for tests run during make check])]) @@ -91,6 +94,7 @@ PKG_CHECK_MODULES([LOGS], [$GIO_REQUIRED $GTK_REQUIRED $SYSTEMD_JOURNAL_REQUIRED AC_CONFIG_FILES([ data/version.xml +help/Makefile Makefile po/Makefile.in ]) diff --git a/help/Makefile.am b/help/Makefile.am new file mode 100644 index 0000000..800ebc6 --- /dev/null +++ b/help/Makefile.am @@ -0,0 +1,13 @@ +@YELP_HELP_RULES@ + +HELP_ID = gnome-logs + +HELP_FILES = \ + index.page \ + introduction.page \ + legal.xml \ + permissions.page + +HELP_MEDIA = \ + media/gnome-logs.png \ + media/gnome-logs-3-12.png diff --git a/src/gl-application.c b/src/gl-application.c index 404fcb3..5c15cfd 100644 --- a/src/gl-application.c +++ b/src/gl-application.c @@ -64,8 +64,7 @@ on_help (GSimpleAction *action, application = GTK_APPLICATION (user_data); parent = gtk_application_get_active_window (application); - /* TODO: Add link to application help instead. */ - gtk_show_uri (gtk_window_get_screen (parent), PACKAGE_URL, + gtk_show_uri (gtk_window_get_screen (parent), "help:gnome-logs", GDK_CURRENT_TIME, &error); if (error) |