/*
- * Geeqie
- * Copyright (C) 2008 - 2012 The Geeqie Team
+ * Copyright (C) 2008 - 2016 The Geeqie Team
*
- * Authors: Vladimir Nadvornik / Laurent Monin
+ * Authors: Vladimir Nadvornik, Laurent Monin
*
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "main.h"
NULL, NULL
};
-static void help_browser_run(void)
+static void help_browser_run(const gchar *section)
{
gchar *name = options->helpers.html_browser.command_name;
gchar *cmd = options->helpers.html_browser.command_line;
- gchar *path = g_build_filename(GQ_HTMLDIR, "index.html", NULL);
+ gchar *path = g_build_filename("file://", GQ_HTMLDIR, section, NULL);
gchar *result = NULL;
gint i;
- i = 0;
+ i = 0;
while (!result)
{
if ((name && *name) || (cmd && *cmd)) {
if (result)
{
int ret = help_browser_command(result, path);
-
+
if (ret == 0) break;
g_free(result);
result = NULL;
{
gchar *path;
- if (key && strcmp(key, "html_contents") == 0)
+ if (key && strstr(key, ".html") != 0)
{
- help_browser_run();
+ help_browser_run(key);
return;
}
return;
}
- path = g_build_filename(GQ_HELPDIR, "README", NULL);
+ path = g_build_filename(GQ_HELPDIR, "README.md", NULL);
help_window = help_window_new(_("Help"), "help", path, key);
g_free(path);