Remove commented out code.

[geeqie.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index 671d947..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
  *
@@ -57,6 +57,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk-pixbuf/gdk-pixbuf-loader.h>
 
+#include "compat.h"
 
 /*
  *----------------------------------------------------------------------------
@@ -64,20 +65,20 @@
  *----------------------------------------------------------------------------
  */
 
+#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_RC_DIR_COLLECTIONS GQ_RC_DIR G_DIR_SEPARATOR_S "collections"
-#define GQ_RC_DIR_TRASH       GQ_RC_DIR G_DIR_SEPARATOR_S "trash"
+#define GQ_RC_DIR              "." GQ_APPNAME_LC
+#define GQ_COLLECTIONS_DIR     "collections"
+#define GQ_TRASH_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 GQ_COLLECTION_EXT ".gqv"
 
@@ -87,7 +88,6 @@
 
 #define MOUSEWHEEL_SCROLL_SIZE 20
 
-#define GQ_EDITOR_GENERIC_SLOTS 10
 
 #define GQ_DEFAULT_SHELL_PATH "/bin/sh"
 #define GQ_DEFAULT_SHELL_OPTIONS "-c"
@@ -97,19 +97,11 @@
 #define DEFAULT_THUMB_WIDTH    96
 #define DEFAULT_THUMB_HEIGHT   72
 
-#define DEFAULT_MINIMAL_WINDOW_SIZE 32
+#define DEFAULT_MINIMAL_WINDOW_SIZE 100
 
-#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 IMAGE_MIN_WIDTH 100
+#define SIDEBAR_DEFAULT_WIDTH 250
 
-#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 PANEL_MIN_WIDTH        64
-#define PANEL_DEFAULT_WIDTH 288
-#define PANEL_MAX_WIDTH 1200
 
 #define DEFAULT_OVERLAY_INFO   "%collection:<i>*</i>\\n%" \
                                "(%number%/%total%) [%zoom%] <b>%name%</b>\n" \
@@ -117,10 +109,12 @@
                                "%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"
 
+#define DESKTOP_FILE_TEMPLATE GQ_APP_DIR "/template.desktop"
 /*
  *----------------------------------------------------------------------------
  * main.c
@@ -131,6 +125,8 @@
  * This also doubles as the main.c header.
  */
 
+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);