Addl fix #521: zoom increment is not multiplicative

[geeqie.git] / src / options.h

diff --git a/src/options.h b/src/options.h
index c303f45..668cf52 100644 (file)
--- a/src/options.h
+++ b/src/options.h
@@ -31,11 +31,11 @@ struct _ConfOptions
        gboolean place_dialogs_under_mouse;
        gboolean mousewheel_scrolls;
        gboolean image_lm_click_nav;
+       gboolean image_l_click_archive;
        gboolean image_l_click_video;
        gchar *image_l_click_video_editor;
        gboolean show_icon_names;
        gboolean show_star_rating;
-       gboolean show_guidelines;
        gboolean draw_rectangle;
        gboolean show_predefined_keyword_tree;
        gboolean overunderexposed;
@@ -81,7 +81,7 @@ struct _ConfOptions
        gchar *help_search_engine;
 
        /**
-        * \struct info_comment
+        * @struct info_comment
         * info sidebar component height
         */
        struct {
@@ -89,7 +89,7 @@ struct _ConfOptions
        } info_comment;
 
        /**
-        * \struct info_keywords
+        * @struct info_keywords
         * info sidebar component height
         */
        struct {
@@ -97,7 +97,7 @@ struct _ConfOptions
        } info_keywords;
 
        /**
-        * \struct info_title
+        * @struct info_title
         * info sidebar component height
         */
        struct {
@@ -105,13 +105,21 @@ struct _ConfOptions
        } info_title;
 
        /**
-        * \struct info_rating
+        * @struct info_rating
         * info sidebar component height
         */
        struct {
                gint height;
        } info_rating;
 
+       /**
+        * @struct info_headline
+        * info sidebar component height
+        */
+       struct {
+               gint height;
+       } info_headline;
+
        /* file ops */
        struct {
                gboolean enable_in_place_rename;
@@ -147,6 +155,7 @@ struct _ConfOptions
                gboolean zoom_to_fit_allow_expand;
                guint zoom_quality;
                gint zoom_increment;    /**< 100 is 1.0, 5 is 0.05, 200 is 2.0, etc. */
+               ZoomStyle zoom_style;
                gboolean use_clutter_renderer;
 
                gboolean use_custom_border_color_in_fullscreen;
@@ -154,6 +163,8 @@ struct _ConfOptions
                GdkColor border_color;
                GdkColor alpha_color_1;
                GdkColor alpha_color_2;
+
+               gint tile_size;
        } image;
 
        /* thumbnails */
@@ -291,7 +302,7 @@ struct _ConfOptions
                gint fixed_x1, fixed_y1;
                gint fixed_x2, fixed_y2;
                /**
-                * \struct tmp
+                * @struct tmp
                 * options in this struct are packed to mode and fsmode entries
                 */
                struct {
@@ -310,8 +321,15 @@ struct _ConfOptions
                } tmp;
        } stereo;
 
+       /* External preview extraction */
+       struct {
+               gboolean enable;
+               gchar *select; /**< path to executable */
+               gchar *extract; /**< path to executable */
+       } external_preview;
+
        /**
-        * \struct cp_mv_rn
+        * @struct cp_mv_rn
         * copy move rename
         */
        struct {
@@ -346,6 +364,11 @@ struct _ConfOptions
                gchar *template_string;
        } printer;
 
+       /* Threads */
+       struct {
+               gint duplicates;
+       } threads;
+
        gchar *mouse_button_8; /**< user-definable mouse buttons */
        gchar *mouse_button_9; /**< user-definable mouse buttons */