Trim trailing white spaces.

[geeqie.git] / src / options.h

diff --git a/src/options.h b/src/options.h
index 4ac6572..63141a1 100644 (file)
--- a/src/options.h
+++ b/src/options.h
@@ -1,6 +1,6 @@
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Authors: Vladimir Nadvornik, Laurent Monin
  *
@@ -21,7 +21,6 @@ struct _ConfOptions
        gboolean place_dialogs_under_mouse;
        gboolean mousewheel_scrolls;
        gboolean show_icon_names;
-       gboolean show_copy_path;
 
        /* various */
        gboolean tree_descend_subdirs;
@@ -34,13 +33,8 @@ struct _ConfOptions
        gint open_recent_list_maxsize;
        gint dnd_icon_size;
 
-
-       /* start up */
-       struct {
-               gboolean restore_path;
-               gboolean use_last_path;
-               gchar *path;
-       } startup;
+       gboolean save_window_positions;
+       gboolean tools_restore_state;
 
        /* file ops */
        struct {
@@ -56,6 +50,7 @@ struct _ConfOptions
        /* image */
        struct {
                gboolean exif_rotate_enable;
+               gboolean exif_proof_rotate_enable;
                guint scroll_reset_method;
                gboolean fit_window_to_image;
                gboolean limit_window_size;
@@ -65,7 +60,6 @@ struct _ConfOptions
 
                gint tile_cache_max;    /* in megabytes */
                gint image_cache_max;   /* in megabytes */
-               guint dither_quality;
                gboolean enable_read_ahead;
 
                ZoomMode zoom_mode;
@@ -73,12 +67,11 @@ struct _ConfOptions
                gboolean zoom_to_fit_allow_expand;
                guint zoom_quality;
                gint zoom_increment;    /* 10 is 1.0, 5 is 0.05, 20 is 2.0, etc. */
+               gboolean use_clutter_renderer;
 
-               gint use_custom_border_color;
+               gboolean use_custom_border_color_in_fullscreen;
+               gboolean use_custom_border_color;
                GdkColor border_color;
-
-               gint read_buffer_size; /* bytes to read from file per read() */
-               gint idle_read_loop_count; /* the number of bytes to read per idle call (define x image.read_buffer_size) */
        } image;
 
        /* thumbnails */
@@ -87,7 +80,6 @@ struct _ConfOptions
                gint max_height;
                gboolean enable_caching;
                gboolean cache_into_dirs;
-               gboolean fast;
                gboolean use_xvpics;
                gboolean spec_standard;
                guint quality;
@@ -138,30 +130,13 @@ struct _ConfOptions
                gboolean above;
        } fullscreen;
 
-       /* histogram */
-       struct {
-               guint last_channel_mode;
-               guint last_log_mode;
-       } histogram;
-       
        /* image overlay */
        struct {
-               struct {
-                       guint state;
-                       gboolean show_at_startup;
-                       gchar *template_string;
-                       gint x;
-                       gint y;
-               } common;
+               gchar *template_string;
+               gint x;
+               gint y;
        } image_overlay;
 
-       /* layout */
-       /* FIXME: this is here for 2 reasons:
-          - I don't want to break preferences dialog now
-          - it might be useful as defaults for new windows (I am not sure about this)
-       */
-       LayoutOptions layout;
-
        /* properties dialog */
        struct {
                gchar *tabs_order;
@@ -173,9 +148,9 @@ struct _ConfOptions
                gint input_type;
                gchar *input_file[COLOR_PROFILE_INPUTS];
                gchar *input_name[COLOR_PROFILE_INPUTS];
-               gint screen_type;
                gchar *screen_file;
                gboolean use_image;
+               gboolean use_x11_screen_profile;
 
        } color_profile;
 
@@ -204,8 +179,33 @@ struct _ConfOptions
                gboolean confirm_after_timeout;
                gboolean confirm_on_image_change;
                gboolean confirm_on_dir_change;
+               gboolean keywords_case_sensitive;
+               gboolean write_orientation;
        } metadata;
-
+       
+       /* Stereo */
+       struct {
+               gint mode;;
+               gint fsmode;
+               gboolean enable_fsmode;
+               gint fixed_w, fixed_h;
+               gint fixed_x1, fixed_y1;
+               gint fixed_x2, fixed_y2;
+               struct { /* options in this struct are packed to mode and fsmode entries */
+                       gboolean mirror_right;
+                       gboolean mirror_left;
+                       gboolean flip_right;
+                       gboolean flip_left;
+                       gboolean swap;
+                       gboolean temp_disable;
+                       gboolean fs_mirror_right;
+                       gboolean fs_mirror_left;
+                       gboolean fs_flip_right;
+                       gboolean fs_flip_left;
+                       gboolean fs_swap;
+                       gboolean fs_temp_disable;
+               } tmp;
+       } stereo;
 };
 
 ConfOptions *options;
@@ -218,7 +218,7 @@ gboolean load_options(ConfOptions *options);
 
 void copy_layout_options(LayoutOptions *dest, const LayoutOptions *src);
 void free_layout_options_content(LayoutOptions *dest);
-
+LayoutOptions *init_layout_options(LayoutOptions *options);
 
 #endif /* OPTIONS_H */
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */