Remove commented out code.

[geeqie.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index 687e570..b800477 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -1,7 +1,7 @@
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Author: John Ellis
  *
@@ -26,6 +26,7 @@
 
 #include "intl.h"
 
+
 /*
  *-------------------------------------
  * Standard library includes
@@ -56,6 +57,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk-pixbuf/gdk-pixbuf-loader.h>
 
+#include "compat.h"
 
 /*
  *----------------------------------------------------------------------------
@@ -63,22 +65,22 @@
  *----------------------------------------------------------------------------
  */
 
+#define USE_XDG 1
+
 #define GQ_APPNAME "Geeqie"
 #define GQ_APPNAME_LC "geeqie"
 #define GQ_WEBSITE "geeqie.sourceforge.net"
 #define GQ_EMAIL_ADDRESS "geeqie-devel@lists.sourceforge.net"
 
-#define GQ_WMCLASS GQ_APPNAME_LC
+#define GQ_RC_DIR              "." GQ_APPNAME_LC
+#define GQ_COLLECTIONS_DIR     "collections"
+#define GQ_TRASH_DIR           "trash"
 
-#define GQ_RC_DIR             "." GQ_APPNAME_LC
-#define GQ_RC_DIR_COLLECTIONS GQ_RC_DIR"/collections"
-#define GQ_RC_DIR_TRASH       GQ_RC_DIR"/trash"
+#define GQ_SYSTEM_WIDE_DIR    "/etc/" GQ_APPNAME_LC
 
-#define RC_FILE_NAME GQ_APPNAME_LC "rc"
+#define RC_FILE_NAME GQ_APPNAME_LC "rc.xml"
 
-#define ZOOM_RESET_ORIGINAL 0
-#define ZOOM_RESET_FIT_WINDOW 1
-#define ZOOM_RESET_NONE 2
+#define GQ_COLLECTION_EXT ".gqv"
 
 #define SCROLL_RESET_TOPLEFT 0
 #define SCROLL_RESET_CENTER 1
@@ -86,55 +88,33 @@
 
 #define MOUSEWHEEL_SCROLL_SIZE 20
 
-#define GQ_EDITOR_GENERIC_SLOTS 10
+
+#define GQ_DEFAULT_SHELL_PATH "/bin/sh"
+#define GQ_DEFAULT_SHELL_OPTIONS "-c"
 
 #define COLOR_PROFILE_INPUTS 4
 
 #define DEFAULT_THUMB_WIDTH    96
 #define DEFAULT_THUMB_HEIGHT   72
 
-#define IMAGE_LOADER_READ_BUFFER_SIZE_DEFAULT  4096
-#define IMAGE_LOADER_READ_BUFFER_SIZE_MIN      512
-#define IMAGE_LOADER_READ_BUFFER_SIZE_MAX      16*1024*1024
+#define DEFAULT_MINIMAL_WINDOW_SIZE 100
 
-#define IMAGE_LOADER_IDLE_READ_LOOP_COUNT_DEFAULT      1
-#define IMAGE_LOADER_IDLE_READ_LOOP_COUNT_MIN          1
-#define IMAGE_LOADER_IDLE_READ_LOOP_COUNT_MAX          16
+#define IMAGE_MIN_WIDTH 100
+#define SIDEBAR_DEFAULT_WIDTH 250
 
 
-#define DEFAULT_OVERLAY_INFO   "%collection%(%number%/%total%) [%zoom%] <b>%name%</b>\n" \
+#define DEFAULT_OVERLAY_INFO   "%collection:<i>*</i>\\n%" \
+                               "(%number%/%total%) [%zoom%] <b>%name%</b>\n" \
                                "%res%|%date%|%size%\n" \
-                               "%fAperture%|%fShutterSpeed%|%fISOSpeedRating%|%fFocalLength%|%fExposureBias%\n" \
-                               "%fCamera%|%fFlash%" \
-
-#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
+                               "%formatted.Aperture%|%formatted.ShutterSpeed%|%formatted.ISOSpeedRating:ISO *%|%formatted.FocalLength%|%formatted.ExposureBias:* Ev%\n" \
+                               "%formatted.Camera:40%|%formatted.Flash%"
 
+#define GQ_LINK_STR "↗"
 #include "typedefs.h"
+#include "debug.h"
+#include "options.h"
 
-/*
- *----------------------------------------------------------------------------
- * globals
- *----------------------------------------------------------------------------
- */
-ConfOptions *init_options(ConfOptions *options); /* TODO: move to globals.h */
-
-ConfOptions *options;
-
-
-
-#ifdef DEBUG
-extern gint debug;
-#endif
-
-
-
+#define DESKTOP_FILE_TEMPLATE GQ_APP_DIR "/template.desktop"
 /*
  *----------------------------------------------------------------------------
  * main.c
@@ -145,22 +125,15 @@ extern gint debug;
  * 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);
-
-const gchar *get_exec_time();
-
-void help_window_show(const gchar *key);
+extern gboolean thumb_format_changed;
 
 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)) )
 
 
 #endif
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */