Use util_clip_triangle() in pan_item_tri_new()

[geeqie.git] / src / options.h

diff --git a/src/options.h b/src/options.h
index 67553d4..402347c 100644 (file)
--- a/src/options.h
+++ b/src/options.h
@@ -21,8 +21,16 @@
 #ifndef OPTIONS_H
 #define OPTIONS_H
 
+#include <cairo.h>
+#include <gdk/gdk.h>
+#include <glib.h>
+
+#include "typedefs.h"
+
 struct SecureSaveInfo;
 
+#define COLOR_PROFILE_INPUTS 4
+
 /**
  * @enum DnDAction
  * drag and drop default action
@@ -55,6 +63,7 @@ struct ConfOptions
        gboolean show_predefined_keyword_tree;
        gboolean overunderexposed;
        gboolean expand_menu_toolbar;
+       gboolean hamburger_menu;
 
        /* various */
        gboolean tree_descend_subdirs;
@@ -83,6 +92,7 @@ struct ConfOptions
        gboolean save_window_workspace;
        gboolean tools_restore_state;
        gboolean save_dialog_window_positions;
+       gboolean hide_window_decorations;
        gboolean show_window_ids;
 
        gint log_window_lines;
@@ -96,6 +106,7 @@ struct ConfOptions
        gboolean collections_duplicates;
        gboolean collections_on_top;
        gboolean hide_window_in_fullscreen;
+       gboolean hide_osd_in_fullscreen;
 
        gchar *help_search_engine;
 
@@ -156,7 +167,7 @@ struct ConfOptions
        /* image */
        struct {
                gboolean exif_rotate_enable;
-               guint scroll_reset_method;
+               ScrollReset scroll_reset_method;
                gboolean fit_window_to_image;
                gboolean limit_window_size;
                gint max_window_size;
@@ -177,9 +188,9 @@ struct ConfOptions
 
                gboolean use_custom_border_color_in_fullscreen;
                gboolean use_custom_border_color;
-               GdkColor border_color;
-               GdkColor alpha_color_1;
-               GdkColor alpha_color_2;
+               GdkRGBA border_color;
+               GdkRGBA alpha_color_1;
+               GdkRGBA alpha_color_2;
 
                gint tile_size;
        } image;
@@ -385,6 +396,19 @@ struct ConfOptions
                gint duplicates;
        } threads;
 
+       /* Selectable bars */
+       struct {
+               gboolean menu_bar;
+               gboolean tool_bar;
+               gboolean status_bar;
+       } selectable_bars;
+
+       /* Alternate similarity algorithm */
+       struct {
+               gboolean enabled;
+               gboolean grayscale; /**< convert fingerprint to greyscale */
+       } alternate_similarity_algorithm;
+
        gchar *mouse_button_8; /**< user-definable mouse buttons */
        gchar *mouse_button_9; /**< user-definable mouse buttons */
 
@@ -517,12 +541,7 @@ struct LayoutOptions
                gint histogram_mode;
        } image_overlay;
 
-       struct {
-               gint w;
-               gint h;
-               gint x;
-               gint y;
-       } log_window;
+       GdkRectangle log_window;
 
        struct {
                gint w;
@@ -555,7 +574,7 @@ struct LayoutOptions
 
        gboolean tools_float;
        gboolean tools_hidden;
-       gboolean toolbar_hidden;
+       gboolean selectable_toolbars_hidden;
 
        struct {
                gboolean info;