Mercurial > geeqie.yaz

changeset 648:e34c1002e553

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move some functions from main.[ch] to new window.[ch].
author zas_
date Tue, 13 May 2008 08:02:46 +0000
parents 42d36db921bc
children 3097880d7d95
files po/POTFILES.in src/Makefile.am src/collect.c src/dupe.c src/fullscreen.c src/img-view.c src/info.c src/layout.c src/layout_util.c src/main.c src/main.h src/pan-view.c src/preferences.c src/search.c src/ui_help.c src/ui_utildlg.c src/window.c src/window.h
diffstat 18 files changed, 277 insertions(+), 226 deletions(-) [+]
line wrap: on
line diff
--- a/po/POTFILES.in	Tue May 13 07:34:37 2008 +0000
+++ b/po/POTFILES.in	Tue May 13 08:02:46 2008 +0000
@@ -42,3 +42,4 @@
 ./src/view_dir.c
 ./src/view_file_icon.c
 ./src/view_file_list.c
+./src/window.c
--- a/src/Makefile.am	Tue May 13 07:34:37 2008 +0000
+++ b/src/Makefile.am	Tue May 13 08:02:46 2008 +0000
@@ -198,7 +198,9 @@
 	view_file_list.c	\
 	view_file_list.h	\
 	view_file_icon.c	\
-	view_file_icon.h
+	view_file_icon.h	\
+	window.c	\
+	window.h
 
 geeqie_LDADD = $(GTK_LIBS) $(INTLLIBS) $(LCMS_LIBS) $(EXIV2_LIBS)
 
--- a/src/collect.c	Tue May 13 07:34:37 2008 +0000
+++ b/src/collect.c	Tue May 13 08:02:46 2008 +0000
@@ -29,6 +29,7 @@
 #include "utilops.h"
 #include "ui_fileops.h"
 #include "ui_tree_edit.h"
+#include "window.h"
 
 #include <gdk/gdkkeysyms.h> /* for keyboard values */
 
--- a/src/dupe.c	Tue May 13 07:34:37 2008 +0000
+++ b/src/dupe.c	Tue May 13 08:02:46 2008 +0000
@@ -36,6 +36,7 @@
 #include "ui_menu.h"
 #include "ui_misc.h"
 #include "ui_tree_edit.h"
+#include "window.h"
 
 #include <gdk/gdkkeysyms.h> /* for keyboard values */
 
--- a/src/fullscreen.c	Tue May 13 07:34:37 2008 +0000
+++ b/src/fullscreen.c	Tue May 13 08:02:46 2008 +0000
@@ -19,7 +19,7 @@
 #include "ui_fileops.h"
 #include "ui_menu.h"
 #include "ui_misc.h"
-
+#include "window.h"
 
 enum {
 	FULLSCREEN_CURSOR_HIDDEN = 1 << 0,
--- a/src/img-view.c	Tue May 13 07:34:37 2008 +0000
+++ b/src/img-view.c	Tue May 13 08:02:46 2008 +0000
@@ -34,6 +34,7 @@
 #include "ui_bookmark.h"
 #include "ui_fileops.h"
 #include "ui_menu.h"
+#include "window.h"
 
 #include <gdk/gdkkeysyms.h> /* for keyboard values */
 
--- a/src/info.c	Tue May 13 07:34:37 2008 +0000
+++ b/src/info.c	Tue May 13 08:02:46 2008 +0000
@@ -24,6 +24,7 @@
 #include "ui_bookmark.h"
 #include "ui_fileops.h"
 #include "ui_misc.h"
+#include "window.h"
 
 #include <pwd.h>
 #include <grp.h>
--- a/src/layout.c	Tue May 13 07:34:37 2008 +0000
+++ b/src/layout.c	Tue May 13 08:02:46 2008 +0000
@@ -33,6 +33,8 @@
 #include "ui_menu.h"
 #include "ui_misc.h"
 #include "ui_tabcomp.h"
+#include "window.h"
+
 #ifdef HAVE_LIRC
 #include "lirc.h"
 #endif
--- a/src/layout_util.c	Tue May 13 07:34:37 2008 +0000
+++ b/src/layout_util.c	Tue May 13 08:02:46 2008 +0000
@@ -40,6 +40,7 @@
 #include "ui_misc.h"
 #include "ui_tabcomp.h"
 #include "view_dir.h"
+#include "window.h"
 
 #include <gdk/gdkkeysyms.h> /* for keyboard values */
 
--- 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
--- a/src/main.h	Tue May 13 07:34:37 2008 +0000
+++ b/src/main.h	Tue May 13 08:02:46 2008 +0000
@@ -124,18 +124,12 @@
  * This also doubles as the main.c header.
  */
 
-GtkWidget *window_new(GtkWindowType type, const gchar *name, const gchar *icon,
-		      const gchar *icon_file, const gchar *subtitle);
-void window_set_icon(GtkWidget *window, const gchar *icon, const gchar *file);
-gint window_maximized(GtkWidget *window);
-
 gdouble get_zoom_increment(void);
 gchar *utf8_validate_or_convert(gchar *text);
 
-void help_window_show(const gchar *key);
-
 void keyboard_scroll_calc(gint *x, gint *y, GdkEventKey *event);
 gint key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data);
+
 void exit_program(void);
 
 #define CASE_SORT(a, b) ( (options->file_sort.case_sensitive) ? strcmp((a), (b)) : strcasecmp((a), (b)) )
--- a/src/pan-view.c	Tue May 13 07:34:37 2008 +0000
+++ b/src/pan-view.c	Tue May 13 08:02:46 2008 +0000
@@ -31,6 +31,7 @@
 #include "ui_menu.h"
 #include "ui_tabcomp.h"
 #include "ui_utildlg.h"
+#include "window.h"
 
 #include <gdk/gdkkeysyms.h> /* for keyboard values */
 
--- a/src/preferences.c	Tue May 13 07:34:37 2008 +0000
+++ b/src/preferences.c	Tue May 13 08:02:46 2008 +0000
@@ -14,9 +14,11 @@
 #include "main.h"
 #include "preferences.h"
 
+#include "bar_exif.h"
 #include "cache_maint.h"
 #include "debug.h"
 #include "editors.h"
+#include "exif.h"
 #include "filedata.h"
 #include "filefilter.h"
 #include "fullscreen.h"
@@ -34,8 +36,7 @@
 #include "ui_misc.h"
 #include "ui_tabcomp.h"
 #include "ui_utildlg.h"
-#include "bar_exif.h"
-#include "exif.h"
+#include "window.h"
 
 #include <math.h>
 
--- a/src/search.c	Tue May 13 07:34:37 2008 +0000
+++ b/src/search.c	Tue May 13 08:02:46 2008 +0000
@@ -37,6 +37,7 @@
 #include "ui_spinner.h"
 #include "ui_tabcomp.h"
 #include "ui_tree_edit.h"
+#include "window.h"
 
 #include <gdk/gdkkeysyms.h> /* for keyboard values */
 
--- a/src/ui_help.c	Tue May 13 07:34:37 2008 +0000
+++ b/src/ui_help.c	Tue May 13 08:02:46 2008 +0000
@@ -26,6 +26,7 @@
 
 #include "ui_fileops.h"
 #include "ui_misc.h"
+#include "window.h"
 
 
 #define HELP_WINDOW_WIDTH 650
--- a/src/ui_utildlg.c	Tue May 13 07:34:37 2008 +0000
+++ b/src/ui_utildlg.c	Tue May 13 08:02:46 2008 +0000
@@ -31,7 +31,7 @@
 #include "ui_misc.h"
 #include "ui_pathsel.h"
 #include "ui_tabcomp.h"
-
+#include "window.h"
 
 /*
  *-----------------------------------------------------------------------------
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/window.c	Tue May 13 08:02:46 2008 +0000
@@ -0,0 +1,232 @@
+/*
+ * Geeqie
+ * Copyright (C) 2008 The Geeqie Team
+ *
+ * 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!
+ */
+
+#include "main.h"
+#include "window.h"
+
+#include "debug.h"
+#include "pixbuf_util.h"
+#include "ui_fileops.h"
+#include "ui_help.h"
+
+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);
+}
+
+/*
+ *-----------------------------------------------------------------------------
+ * 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);
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/window.h	Tue May 13 08:02:46 2008 +0000
@@ -0,0 +1,24 @@
+/*
+ * Geeqie
+ * Copyright (C) 2008 The Geeqie Team
+ *
+ * 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!
+ */
+
+#ifndef WINDOW_H
+#define WINDOW_H
+
+GtkWidget *window_new(GtkWindowType type, const gchar *name, const gchar *icon,
+		      const gchar *icon_file, const gchar *subtitle);
+void window_set_icon(GtkWidget *window, const gchar *icon, const gchar *file);
+gint window_maximized(GtkWidget *window);
+
+void help_window_show(const gchar *key);
+
+
+#endif /* WINDOW_H */