Mercurial > geeqie
diff src/main.c @ 648:e34c1002e553
Move some functions from main.[ch] to new window.[ch].
author | zas_ |
---|---|
date | Tue, 13 May 2008 08:02:46 +0000 |
parents | b50deb0f9968 |
children | 3097880d7d95 |
line wrap: on
line diff
--- a/src/main.c Tue May 13 07:34:37 2008 +0000 +++ b/src/main.c Tue May 13 08:02:46 2008 +0000 @@ -39,6 +39,7 @@ #include "ui_fileops.h" #include "ui_tabcomp.h" #include "ui_utildlg.h" +#include "window.h" #include <gdk/gdkkeysyms.h> /* for keyboard values */ @@ -56,64 +57,6 @@ *----------------------------------------------------------------------------- */ -GtkWidget *window_new(GtkWindowType type, const gchar *name, const gchar *icon, - const gchar *icon_file, const gchar *subtitle) -{ - gchar *title; - GtkWidget *window; - - window = gtk_window_new(type); - if (!window) return NULL; - - if (subtitle) - { - title = g_strdup_printf("%s - %s", subtitle, GQ_APPNAME); - } - else - { - title = g_strdup_printf("%s", GQ_APPNAME); - } - - gtk_window_set_title(GTK_WINDOW(window), title); - g_free(title); - - window_set_icon(window, icon, icon_file); - gtk_window_set_role(GTK_WINDOW(window), name); - gtk_window_set_wmclass(GTK_WINDOW(window), name, GQ_WMCLASS); - - return window; -} - -void window_set_icon(GtkWidget *window, const gchar *icon, const gchar *file) -{ - if (!icon && !file) icon = PIXBUF_INLINE_ICON; - - if (icon) - { - GdkPixbuf *pixbuf; - - pixbuf = pixbuf_inline(icon); - if (pixbuf) - { - gtk_window_set_icon(GTK_WINDOW(window), pixbuf); - g_object_unref(pixbuf); - } - } - else - { - gtk_window_set_icon_from_file(GTK_WINDOW(window), file, NULL); - } -} - -gint window_maximized(GtkWidget *window) -{ - GdkWindowState state; - - if (!window || !window->window) return FALSE; - - state = gdk_window_get_state(window->window); - return (state & GDK_WINDOW_STATE_MAXIMIZED); -} gdouble get_zoom_increment(void) { @@ -139,162 +82,6 @@ return text; } - -/* - *----------------------------------------------------------------------------- - * Open browser with the help Documentation - *----------------------------------------------------------------------------- - */ - -static gchar *command_result(const gchar *binary, const gchar *command) -{ - gchar *result = NULL; - FILE *f; - char buf[2048]; - int l; - - if (!binary) return NULL; - if (!file_in_path(binary)) return NULL; - - if (!command) return g_strdup(binary); - if (command[0] == '!') return g_strdup(command + 1); - - f = popen(command, "r"); - if (!f) return NULL; - - while ((l = fread(buf, sizeof(char), sizeof(buf), f)) > 0) - { - if (!result) - { - int n = 0; - - while (n < l && buf[n] != '\n' && buf[n] != '\r') n++; - if (n > 0) result = g_strndup(buf, n); - } - } - - pclose(f); - - return result; -} - -static void help_browser_command(const gchar *command, const gchar *path) -{ - gchar *result; - gchar *buf; - gchar *begin; - gchar *end; - - if (!command || !path) return; - - DEBUG_1("Help command pre \"%s\", \"%s\"", command, path); - - buf = g_strdup(command); - begin = strstr(buf, "%s"); - if (begin) - { - *begin = '\0'; - end = begin + 2; - begin = buf; - - result = g_strdup_printf("%s%s%s &", begin, path, end); - } - else - { - result = g_strdup_printf("%s \"%s\" &", command, path); - } - g_free(buf); - - DEBUG_1("Help command post [%s]", result); - - system(result); - - g_free(result); -} - -/* - * each set of 2 strings is one browser: - * the 1st is the binary to look for in the path - * the 2nd has 3 capabilities: - * NULL exec binary with html file path as command line - * string exec string and use results for command line - * !string use text following ! as command line, replacing optional %s with html file path -*/ -static gchar *html_browsers[] = -{ - /* Redhat has a nifty htmlview script to start the user's preferred browser */ - "htmlview", NULL, - /* GNOME 2 */ - "gconftool-2", "gconftool-2 -g /desktop/gnome/url-handlers/http/command", - /* KDE */ - "kfmclient", "!kfmclient exec \"%s\"", - /* use fallbacks */ - "firefox", NULL, - "mozilla", NULL, - "konqueror", NULL, - "netscape", NULL, - NULL, NULL -}; - -static void help_browser_run(void) -{ - gchar *result = NULL; - gint i; - - i = 0; - while (!result && html_browsers[i]) - { - result = command_result(html_browsers[i], html_browsers[i+1]); - i += 2; - } - - if (!result) - { - printf("Unable to detect an installed browser.\n"); - return; - } - - help_browser_command(result, GQ_HTMLDIR "/index.html"); - - g_free(result); -} - -/* - *----------------------------------------------------------------------------- - * help window - *----------------------------------------------------------------------------- - */ - -static GtkWidget *help_window = NULL; - -static void help_window_destroy_cb(GtkWidget *window, gpointer data) -{ - help_window = NULL; -} - -void help_window_show(const gchar *key) -{ - if (key && strcmp(key, "html_contents") == 0) - { - help_browser_run(); - return; - } - - if (help_window) - { - gtk_window_present(GTK_WINDOW(help_window)); - if (key) help_window_set_key(help_window, key); - return; - } - - help_window = help_window_new(_("Help"), GQ_WMCLASS, "help", - GQ_HELPDIR "/README", key); - - g_signal_connect(G_OBJECT(help_window), "destroy", - G_CALLBACK(help_window_destroy_cb), NULL); -} - - /* *----------------------------------------------------------------------------- * keyboard functions