# HG changeset patch # User zas_ # Date 1207695753 0 # Node ID 9995c5fb202a0fc4d628cf32ae63e9ded36e8385 # Parent fc3a2ac664c1fc7427d0b7ebb5f061be5edde3e9 gqview.h -> main.h diff -r fc3a2ac664c1 -r 9995c5fb202a autogen.sh --- a/autogen.sh Tue Apr 08 22:31:42 2008 +0000 +++ b/autogen.sh Tue Apr 08 23:02:33 2008 +0000 @@ -8,7 +8,7 @@ (test -f $srcdir/configure.in \ && test -f $srcdir/src/main.c \ - && test -f $srcdir/src/gqview.h) || { + && test -f $srcdir/src/main.h) || { echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" echo " top-level geeqie directory" exit 1 diff -r fc3a2ac664c1 -r 9995c5fb202a src/Makefile.am --- a/src/Makefile.am Tue Apr 08 22:31:42 2008 +0000 +++ b/src/Makefile.am Tue Apr 08 23:02:33 2008 +0000 @@ -102,7 +102,6 @@ fullscreen.c \ fullscreen.h \ globals.c \ - gqview.h \ histogram.c \ histogram.h \ image.c \ @@ -124,6 +123,7 @@ layout_util.c \ layout_util.h \ main.c \ + main.h \ md5-util.c \ md5-util.h \ menu.c \ diff -r fc3a2ac664c1 -r 9995c5fb202a src/bar_exif.c --- a/src/bar_exif.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/bar_exif.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "bar_exif.h" #include "exif.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/bar_info.c --- a/src/bar_info.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/bar_info.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "exif.h" #include "bar_info.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/bar_sort.c --- a/src/bar_sort.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/bar_sort.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "bar_sort.h" #include "collect.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/cache-loader.c --- a/src/cache-loader.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/cache-loader.c Tue Apr 08 23:02:33 2008 +0000 @@ -9,7 +9,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "gqview.h" +#include "main.h" #include "cache-loader.h" #include "cache.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/cache.c --- a/src/cache.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/cache.c Tue Apr 08 23:02:33 2008 +0000 @@ -9,7 +9,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "gqview.h" +#include "main.h" #include "cache.h" #include "md5-util.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/cache_maint.c --- a/src/cache_maint.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/cache_maint.c Tue Apr 08 23:02:33 2008 +0000 @@ -9,7 +9,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "gqview.h" +#include "main.h" #include "cache_maint.h" #include "cache.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/collect-dlg.c --- a/src/collect-dlg.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/collect-dlg.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "collect.h" #include "collect-dlg.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/collect-io.c --- a/src/collect-io.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/collect-io.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "collect-io.h" #include "collect.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/collect-table.c --- a/src/collect-table.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/collect-table.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "collect-table.h" #include "cellrenderericon.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/collect.c --- a/src/collect.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/collect.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "collect.h" #include "collect-dlg.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/color-man.c --- a/src/color-man.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/color-man.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "color-man.h" #include "image.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/dnd.c --- a/src/dnd.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/dnd.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "dnd.h" #include "collect.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/dupe.c --- a/src/dupe.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/dupe.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "dupe.h" #include "cache.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/editors.c --- a/src/editors.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/editors.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "editors.h" #include "utilops.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/exif-common.c --- a/src/exif-common.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/exif-common.c Tue Apr 08 23:02:33 2008 +0000 @@ -21,7 +21,7 @@ #include "intl.h" -#include "gqview.h" +#include "main.h" #include "exif.h" #include "filelist.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/exif.c --- a/src/exif.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/exif.c Tue Apr 08 23:02:33 2008 +0000 @@ -69,7 +69,7 @@ #include "intl.h" -#include "gqview.h" +#include "main.h" #include "exif-int.h" #include "format_raw.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/exiv2.cc --- a/src/exiv2.cc Tue Apr 08 22:31:42 2008 +0000 +++ b/src/exiv2.cc Tue Apr 08 23:02:33 2008 +0000 @@ -40,7 +40,7 @@ extern "C" { #include -#include "gqview.h" +#include "main.h" #include "exif.h" #include "filelist.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/filelist.c --- a/src/filelist.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/filelist.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "filelist.h" #include "cache.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/format_canon.c --- a/src/format_canon.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/format_canon.c Tue Apr 08 23:02:33 2008 +0000 @@ -29,7 +29,7 @@ #include "intl.h" -#include "gqview.h" +#include "main.h" #include "format_canon.h" #include "format_raw.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/format_fuji.c --- a/src/format_fuji.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/format_fuji.c Tue Apr 08 23:02:33 2008 +0000 @@ -24,7 +24,7 @@ #include "intl.h" -#include "gqview.h" +#include "main.h" #include "format_fuji.h" #include "format_raw.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/format_nikon.c --- a/src/format_nikon.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/format_nikon.c Tue Apr 08 23:02:33 2008 +0000 @@ -25,7 +25,7 @@ #include "intl.h" -#include "gqview.h" +#include "main.h" #include "format_nikon.h" #include "exif.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/format_olympus.c --- a/src/format_olympus.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/format_olympus.c Tue Apr 08 23:02:33 2008 +0000 @@ -21,7 +21,7 @@ #include "intl.h" -#include "gqview.h" +#include "main.h" #include "format_olympus.h" #include "format_raw.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/format_raw.c --- a/src/format_raw.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/format_raw.c Tue Apr 08 23:02:33 2008 +0000 @@ -27,7 +27,7 @@ #include "intl.h" -#include "gqview.h" +#include "main.h" #include "format_raw.h" #include "format_canon.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/fullscreen.c --- a/src/fullscreen.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/fullscreen.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "fullscreen.h" #include "image.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/globals.c --- a/src/globals.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/globals.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" GList *filename_filter = NULL; diff -r fc3a2ac664c1 -r 9995c5fb202a src/gqview.h --- a/src/gqview.h Tue Apr 08 22:31:42 2008 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,256 +0,0 @@ -/* - * Geeqie - * (C) 2006 John Ellis - * - * Author: John Ellis - * - * 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 GQVIEW_H -#define GQVIEW_H - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#ifdef HAVE_STRVERSCMP -# ifndef _GNU_SOURCE -# define _GNU_SOURCE -# endif -#endif - -#include "intl.h" - -/* - *------------------------------------- - * Standard library includes - *------------------------------------- - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* - *------------------------------------- - * includes for glib / gtk / gdk-pixbuf - *------------------------------------- - */ - -#include -#include - -#include -#include - - -/* - *---------------------------------------------------------------------------- - * defines - *---------------------------------------------------------------------------- - */ - -#define GQ_WMCLASS "geeqie" - -#define GQVIEW_RC_DIR ".geeqie" -#define GQVIEW_RC_DIR_COLLECTIONS GQVIEW_RC_DIR"/collections" -#define GQVIEW_RC_DIR_TRASH GQVIEW_RC_DIR"/trash" - -#define RC_FILE_NAME "geeqierc" - -#define ZOOM_RESET_ORIGINAL 0 -#define ZOOM_RESET_FIT_WINDOW 1 -#define ZOOM_RESET_NONE 2 - -#define SCROLL_RESET_TOPLEFT 0 -#define SCROLL_RESET_CENTER 1 -#define SCROLL_RESET_NOCHANGE 2 - -#define MOUSEWHEEL_SCROLL_SIZE 20 - -#define GQVIEW_EDITOR_GENERIC_SLOTS 10 - -#define COLOR_PROFILE_INPUTS 4 - -#define DEFAULT_THUMB_WIDTH 96 -#define DEFAULT_THUMB_HEIGHT 72 - -#if 1 /* set to 0 to disable debugging code and related options */ -# ifndef DEBUG -# define DEBUG 1 -# endif -#endif -#ifndef DEBUG -# define debug 0 -#endif - -#include "typedefs.h" - -/* - *---------------------------------------------------------------------------- - * globals - *---------------------------------------------------------------------------- - */ - -/* - * Since globals are used everywhere, - * it is easier to define them here. - */ - -extern GList *filename_filter; - -/* -- options -- */ -extern gint main_window_w; -extern gint main_window_h; -extern gint main_window_x; -extern gint main_window_y; -extern gint main_window_maximized; - -extern gint float_window_w; -extern gint float_window_h; -extern gint float_window_x; -extern gint float_window_y; -extern gint float_window_divider; - -extern gint window_hdivider_pos; -extern gint window_vdivider_pos; - -extern gint save_window_positions; -extern gint tools_float; -extern gint tools_hidden; -extern gint toolbar_hidden; -extern gint progressive_key_scrolling; - -extern gint startup_path_enable; -extern gchar *startup_path; -extern gint confirm_delete; -extern gint enable_delete_key; -extern gint safe_delete_enable; -extern gchar *safe_delete_path; -extern gint safe_delete_size; -extern gint restore_tool; -extern gint zoom_mode; -extern gint two_pass_zoom; -extern gint scroll_reset_method; -extern gint fit_window; -extern gint limit_window_size; -extern gint zoom_to_fit_expands; -extern gint max_window_size; -extern gint limit_autofit_size; -extern gint max_autofit_size; -extern gint thumb_max_width; -extern gint thumb_max_height; -extern gint enable_thumb_caching; -extern gint enable_thumb_dirs; -extern gint thumbnail_fast; -extern gint use_xvpics_thumbnails; -extern gint thumbnail_spec_standard; -extern gint enable_metadata_dirs; -extern gint show_dot_files; -extern gint file_filter_disable; -extern gchar *editor_name[]; -extern gchar *editor_command[]; - -extern gint thumbnails_enabled; -extern SortType file_sort_method; -extern gint file_sort_ascending; - -extern gint slideshow_delay; /* in tenths of a second */ -extern gint slideshow_random; -extern gint slideshow_repeat; - -extern gint mousewheel_scrolls; -extern gint enable_in_place_rename; - -extern gint user_specified_window_background; -extern GdkColor window_background_color; - -extern gint fullscreen_screen; -extern gint fullscreen_clean_flip; -extern gint fullscreen_disable_saver; -extern gint fullscreen_above; -extern gint show_fullscreen_info; -extern gchar *fullscreen_info; - -extern gint dupe_custom_threshold; - -#ifdef DEBUG -extern gint debug; -#endif - -extern gint recent_list_max; - -extern gint collection_rectangular_selection; - -extern gint tile_cache_max; /* in megabytes */ -extern gint thumbnail_quality; -extern gint zoom_quality; -extern gint dither_quality; - -extern gint zoom_increment; /* 10 is 1.0, 5 is 0.05, 20 is 2.0, etc. */ - -extern gint enable_read_ahead; - -extern gint place_dialogs_under_mouse; - -/* layout */ -extern gchar *layout_order; -extern gint layout_style; - -extern gint layout_view_icons; -extern gint layout_view_tree; - -extern gint show_icon_names; - -extern gint tree_descend_subdirs; - -extern gint lazy_image_sync; -extern gint update_on_time_change; -extern gint exif_rotate_enable; - -extern gint color_profile_enabled; -extern gint color_profile_input_type; -extern gchar *color_profile_input_file[]; -extern gchar *color_profile_input_name[]; -extern gint color_profile_screen_type; -extern gchar *color_profile_screen_file; -extern gint color_profile_use_image; - -/* - *---------------------------------------------------------------------------- - * main.c - *---------------------------------------------------------------------------- - */ - -/* - * This also doubles as the main.c header. - */ - -void window_set_icon(GtkWidget *window, const gchar *icon, const gchar *file); -gint window_maximized(GtkWidget *window); - -gdouble get_zoom_increment(void); - -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); - - -#endif - - - diff -r fc3a2ac664c1 -r 9995c5fb202a src/histogram.c --- a/src/histogram.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/histogram.c Tue Apr 08 23:02:33 2008 +0000 @@ -9,7 +9,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "gqview.h" +#include "main.h" #include "histogram.h" #include diff -r fc3a2ac664c1 -r 9995c5fb202a src/image-load.c --- a/src/image-load.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/image-load.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "image-load.h" #include "filelist.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/image-overlay.c --- a/src/image-overlay.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/image-overlay.c Tue Apr 08 23:02:33 2008 +0000 @@ -9,7 +9,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "gqview.h" +#include "main.h" #include "image-overlay.h" #include "collect.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/image.c --- a/src/image.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/image.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "image.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/img-view.c --- a/src/img-view.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/img-view.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "img-view.h" #include "collect.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/info.c --- a/src/info.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/info.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "info.h" #include "bar_info.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/layout.c --- a/src/layout.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/layout.c Tue Apr 08 23:02:33 2008 +0000 @@ -9,7 +9,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "gqview.h" +#include "main.h" #include "layout.h" #include "image.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/layout_config.c --- a/src/layout_config.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/layout_config.c Tue Apr 08 23:02:33 2008 +0000 @@ -9,7 +9,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "gqview.h" +#include "main.h" #include "layout_config.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/layout_image.c --- a/src/layout_image.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/layout_image.c Tue Apr 08 23:02:33 2008 +0000 @@ -9,7 +9,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "gqview.h" +#include "main.h" #include "layout_image.h" #include "collect.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/layout_util.c --- a/src/layout_util.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/layout_util.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "layout_util.h" #include "bar_info.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/main.c --- a/src/main.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/main.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "cache.h" #include "collect.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/main.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main.h Tue Apr 08 23:02:33 2008 +0000 @@ -0,0 +1,256 @@ +/* + * Geeqie + * (C) 2006 John Ellis + * + * Author: John Ellis + * + * 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 GQVIEW_H +#define GQVIEW_H + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#ifdef HAVE_STRVERSCMP +# ifndef _GNU_SOURCE +# define _GNU_SOURCE +# endif +#endif + +#include "intl.h" + +/* + *------------------------------------- + * Standard library includes + *------------------------------------- + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* + *------------------------------------- + * includes for glib / gtk / gdk-pixbuf + *------------------------------------- + */ + +#include +#include + +#include +#include + + +/* + *---------------------------------------------------------------------------- + * defines + *---------------------------------------------------------------------------- + */ + +#define GQ_WMCLASS "geeqie" + +#define GQVIEW_RC_DIR ".geeqie" +#define GQVIEW_RC_DIR_COLLECTIONS GQVIEW_RC_DIR"/collections" +#define GQVIEW_RC_DIR_TRASH GQVIEW_RC_DIR"/trash" + +#define RC_FILE_NAME "geeqierc" + +#define ZOOM_RESET_ORIGINAL 0 +#define ZOOM_RESET_FIT_WINDOW 1 +#define ZOOM_RESET_NONE 2 + +#define SCROLL_RESET_TOPLEFT 0 +#define SCROLL_RESET_CENTER 1 +#define SCROLL_RESET_NOCHANGE 2 + +#define MOUSEWHEEL_SCROLL_SIZE 20 + +#define GQVIEW_EDITOR_GENERIC_SLOTS 10 + +#define COLOR_PROFILE_INPUTS 4 + +#define DEFAULT_THUMB_WIDTH 96 +#define DEFAULT_THUMB_HEIGHT 72 + +#if 1 /* set to 0 to disable debugging code and related options */ +# ifndef DEBUG +# define DEBUG 1 +# endif +#endif +#ifndef DEBUG +# define debug 0 +#endif + +#include "typedefs.h" + +/* + *---------------------------------------------------------------------------- + * globals + *---------------------------------------------------------------------------- + */ + +/* + * Since globals are used everywhere, + * it is easier to define them here. + */ + +extern GList *filename_filter; + +/* -- options -- */ +extern gint main_window_w; +extern gint main_window_h; +extern gint main_window_x; +extern gint main_window_y; +extern gint main_window_maximized; + +extern gint float_window_w; +extern gint float_window_h; +extern gint float_window_x; +extern gint float_window_y; +extern gint float_window_divider; + +extern gint window_hdivider_pos; +extern gint window_vdivider_pos; + +extern gint save_window_positions; +extern gint tools_float; +extern gint tools_hidden; +extern gint toolbar_hidden; +extern gint progressive_key_scrolling; + +extern gint startup_path_enable; +extern gchar *startup_path; +extern gint confirm_delete; +extern gint enable_delete_key; +extern gint safe_delete_enable; +extern gchar *safe_delete_path; +extern gint safe_delete_size; +extern gint restore_tool; +extern gint zoom_mode; +extern gint two_pass_zoom; +extern gint scroll_reset_method; +extern gint fit_window; +extern gint limit_window_size; +extern gint zoom_to_fit_expands; +extern gint max_window_size; +extern gint limit_autofit_size; +extern gint max_autofit_size; +extern gint thumb_max_width; +extern gint thumb_max_height; +extern gint enable_thumb_caching; +extern gint enable_thumb_dirs; +extern gint thumbnail_fast; +extern gint use_xvpics_thumbnails; +extern gint thumbnail_spec_standard; +extern gint enable_metadata_dirs; +extern gint show_dot_files; +extern gint file_filter_disable; +extern gchar *editor_name[]; +extern gchar *editor_command[]; + +extern gint thumbnails_enabled; +extern SortType file_sort_method; +extern gint file_sort_ascending; + +extern gint slideshow_delay; /* in tenths of a second */ +extern gint slideshow_random; +extern gint slideshow_repeat; + +extern gint mousewheel_scrolls; +extern gint enable_in_place_rename; + +extern gint user_specified_window_background; +extern GdkColor window_background_color; + +extern gint fullscreen_screen; +extern gint fullscreen_clean_flip; +extern gint fullscreen_disable_saver; +extern gint fullscreen_above; +extern gint show_fullscreen_info; +extern gchar *fullscreen_info; + +extern gint dupe_custom_threshold; + +#ifdef DEBUG +extern gint debug; +#endif + +extern gint recent_list_max; + +extern gint collection_rectangular_selection; + +extern gint tile_cache_max; /* in megabytes */ +extern gint thumbnail_quality; +extern gint zoom_quality; +extern gint dither_quality; + +extern gint zoom_increment; /* 10 is 1.0, 5 is 0.05, 20 is 2.0, etc. */ + +extern gint enable_read_ahead; + +extern gint place_dialogs_under_mouse; + +/* layout */ +extern gchar *layout_order; +extern gint layout_style; + +extern gint layout_view_icons; +extern gint layout_view_tree; + +extern gint show_icon_names; + +extern gint tree_descend_subdirs; + +extern gint lazy_image_sync; +extern gint update_on_time_change; +extern gint exif_rotate_enable; + +extern gint color_profile_enabled; +extern gint color_profile_input_type; +extern gchar *color_profile_input_file[]; +extern gchar *color_profile_input_name[]; +extern gint color_profile_screen_type; +extern gchar *color_profile_screen_file; +extern gint color_profile_use_image; + +/* + *---------------------------------------------------------------------------- + * main.c + *---------------------------------------------------------------------------- + */ + +/* + * This also doubles as the main.c header. + */ + +void window_set_icon(GtkWidget *window, const gchar *icon, const gchar *file); +gint window_maximized(GtkWidget *window); + +gdouble get_zoom_increment(void); + +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); + + +#endif + + + diff -r fc3a2ac664c1 -r 9995c5fb202a src/menu.c --- a/src/menu.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/menu.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "menu.h" #include "cache_maint.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/pan-calendar.c --- a/src/pan-calendar.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/pan-calendar.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "pan-types.h" #include diff -r fc3a2ac664c1 -r 9995c5fb202a src/pan-folder.c --- a/src/pan-folder.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/pan-folder.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "pan-types.h" #include diff -r fc3a2ac664c1 -r 9995c5fb202a src/pan-grid.c --- a/src/pan-grid.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/pan-grid.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "pan-types.h" #include diff -r fc3a2ac664c1 -r 9995c5fb202a src/pan-item.c --- a/src/pan-item.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/pan-item.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "pan-types.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/pan-timeline.c --- a/src/pan-timeline.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/pan-timeline.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "pan-types.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/pan-util.c --- a/src/pan-util.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/pan-util.c Tue Apr 08 23:02:33 2008 +0000 @@ -9,7 +9,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "gqview.h" +#include "main.h" #include "pan-types.h" #include "ui_fileops.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/pan-view.c --- a/src/pan-view.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/pan-view.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "pan-view.h" #include "pan-types.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/pixbuf_util.c --- a/src/pixbuf_util.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/pixbuf_util.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "pixbuf_util.h" #include "icons/icons_inline.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/preferences.c --- a/src/preferences.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/preferences.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "preferences.h" #include "cache_maint.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/print.c --- a/src/print.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/print.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "print.h" #include "filelist.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/rcfile.c --- a/src/rcfile.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/rcfile.c Tue Apr 08 23:02:33 2008 +0000 @@ -12,7 +12,7 @@ #include #include -#include "gqview.h" +#include "main.h" #include "rcfile.h" #include "filelist.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/remote.c --- a/src/remote.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/remote.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "remote.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/search.c --- a/src/search.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/search.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "search.h" #include "bar_info.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/similar.c --- a/src/similar.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/similar.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "similar.h" /* diff -r fc3a2ac664c1 -r 9995c5fb202a src/slideshow.c --- a/src/slideshow.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/slideshow.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "collect.h" #include "image.h" #include "slideshow.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/thumb.c --- a/src/thumb.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/thumb.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "thumb.h" #include "cache.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/thumb_standard.c --- a/src/thumb_standard.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/thumb_standard.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "thumb_standard.h" #include "cache.h" /* for cache_ensure_dir_exists */ diff -r fc3a2ac664c1 -r 9995c5fb202a src/ui_bookmark.c --- a/src/ui_bookmark.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/ui_bookmark.c Tue Apr 08 23:02:33 2008 +0000 @@ -22,7 +22,7 @@ #include /* for key values */ -#include "gqview.h" +#include "main.h" #include "filelist.h" #include "ui_bookmark.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/ui_fileops.c --- a/src/ui_fileops.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/ui_fileops.c Tue Apr 08 23:02:33 2008 +0000 @@ -25,7 +25,7 @@ #include #include /* for locale warning dialog */ -#include "gqview.h" +#include "main.h" #include "ui_fileops.h" #include "ui_utildlg.h" /* for locale warning dialog */ diff -r fc3a2ac664c1 -r 9995c5fb202a src/ui_pathsel.c --- a/src/ui_pathsel.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/ui_pathsel.c Tue Apr 08 23:02:33 2008 +0000 @@ -28,7 +28,7 @@ #include /* for key values */ -#include "gqview.h" +#include "main.h" #include "ui_pathsel.h" #include "ui_bookmark.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/ui_tabcomp.c --- a/src/ui_tabcomp.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/ui_tabcomp.c Tue Apr 08 23:02:33 2008 +0000 @@ -25,7 +25,7 @@ #include #include -#include "gqview.h" +#include "main.h" #include "ui_tabcomp.h" #include "ui_bookmark.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/ui_utildlg.c --- a/src/ui_utildlg.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/ui_utildlg.c Tue Apr 08 23:02:33 2008 +0000 @@ -22,7 +22,7 @@ #include /* for keyboard values */ -#include "gqview.h" +#include "main.h" #include "ui_utildlg.h" #include "filelist.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/utilops.c --- a/src/utilops.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/utilops.c Tue Apr 08 23:02:33 2008 +0000 @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "utilops.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/view_dir_list.c --- a/src/view_dir_list.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/view_dir_list.c Tue Apr 08 23:02:33 2008 +0000 @@ -9,7 +9,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "gqview.h" +#include "main.h" #include "view_dir_list.h" #include "dnd.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/view_dir_tree.c --- a/src/view_dir_tree.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/view_dir_tree.c Tue Apr 08 23:02:33 2008 +0000 @@ -9,7 +9,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "gqview.h" +#include "main.h" #include "view_dir_tree.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/view_file_icon.c --- a/src/view_file_icon.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/view_file_icon.c Tue Apr 08 23:02:33 2008 +0000 @@ -9,7 +9,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "gqview.h" +#include "main.h" #include "view_file_icon.h" #include "cellrenderericon.h" diff -r fc3a2ac664c1 -r 9995c5fb202a src/view_file_list.c --- a/src/view_file_list.c Tue Apr 08 22:31:42 2008 +0000 +++ b/src/view_file_list.c Tue Apr 08 23:02:33 2008 +0000 @@ -9,7 +9,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "gqview.h" +#include "main.h" #include "view_file_list.h" #include "cache_maint.h"