X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foptions.h;h=ac996dda3eec1bbed50d249f1624420dbc02ebc3;hb=6eebdfd3f310e2823e45cda00b57b5e4f6839692;hp=cb789068dfe172203d7ed49a242c8c6d904cc8cf;hpb=b73335c511e8e299d37e43935173a9a089b2fc0c;p=geeqie.git

diff --git a/src/options.h b/src/options.h
index cb789068..ac996dda 100644
--- a/src/options.h
+++ b/src/options.h
@@ -1,12 +1,21 @@
 /*
- * Geeqie
- * Copyright (C) 2008 - 2012 The Geeqie Team
+ * Copyright (C) 2008 - 2016 The Geeqie Team
  *
  * Authors: Vladimir Nadvornik, Laurent Monin
  *
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef OPTIONS_H
@@ -18,24 +27,52 @@ struct _ConfOptions
 {
 	/* ui */
 	gboolean progressive_key_scrolling;
+	guint keyboard_scroll_step;
 	gboolean place_dialogs_under_mouse;
 	gboolean mousewheel_scrolls;
+	gboolean image_lm_click_nav;
 	gboolean show_icon_names;
 
 	/* various */
 	gboolean tree_descend_subdirs;
+	gboolean view_dir_list_single_click_enter;
 
 	gboolean lazy_image_sync;
 	gboolean update_on_time_change;
 
 	guint duplicates_similarity_threshold;
+	guint duplicates_match;
+	gboolean duplicates_thumbnails;
+	guint duplicates_select_type;
+	gboolean rot_invariant_sim;
+	gboolean sort_totals;
 
 	gint open_recent_list_maxsize;
 	gint dnd_icon_size;
 
 	gboolean save_window_positions;
+	gboolean use_saved_window_positions_for_new_windows;
 	gboolean tools_restore_state;
 
+	gint log_window_lines;
+
+	/* info sidebar component heights */
+	struct {
+		gint height;
+	} info_comment;
+
+	struct {
+		gint height;
+	} info_keywords;
+
+	struct {
+		gint height;
+	} info_title;
+
+	struct {
+		gint height;
+	} info_rating;
+
 	/* file ops */
 	struct {
 		gboolean enable_in_place_rename;
@@ -57,6 +94,7 @@ struct _ConfOptions
 		gint max_window_size;
 		gboolean limit_autofit_size;
 		gint max_autofit_size;
+		gint max_enlargement_size;
 
 		gint tile_cache_max;	/* in megabytes */
 		gint image_cache_max;   /* in megabytes */
@@ -66,11 +104,14 @@ struct _ConfOptions
 		gboolean zoom_2pass;
 		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. */
+		gint zoom_increment;	/* 100 is 1.0, 5 is 0.05, 200 is 2.0, etc. */
+		gboolean use_clutter_renderer;
 
 		gboolean use_custom_border_color_in_fullscreen;
 		gboolean use_custom_border_color;
 		GdkColor border_color;
+		GdkColor alpha_color_1;
+		GdkColor alpha_color_2;
 	} image;
 
 	/* thumbnails */
@@ -88,14 +129,16 @@ struct _ConfOptions
 	/* file filtering */
 	struct {
 		gboolean show_hidden_files;
+		gboolean show_parent_directory;
 		gboolean show_dot_directory;
+		gboolean disable_file_extension_checks;
 		gboolean disable;
 	} file_filter;
 
 	struct {
 		gchar *ext;
 	} sidecar;
-	
+
 	/* collections */
 	struct {
 		gboolean rectangular_selection;
@@ -106,12 +149,13 @@ struct _ConfOptions
 		gchar *path;
 		gchar *options;
 	} shell;
-	
+
 	/* file sorting */
 	struct {
 		SortType method;
 		gboolean ascending;
 		gboolean case_sensitive; /* file sorting method (case) */
+		gboolean natural;
 	} file_sort;
 
 	/* slideshow */
@@ -134,6 +178,15 @@ struct _ConfOptions
 		gchar *template_string;
 		gint x;
 		gint y;
+		guint16 text_red;
+		guint16 text_green;
+		guint16 text_blue;
+		guint16 text_alpha;
+		guint16 background_red;
+		guint16 background_green;
+		guint16 background_blue;
+		guint16 background_alpha;
+		gchar *font;
 	} image_overlay;
 
 	/* properties dialog */
@@ -150,7 +203,7 @@ struct _ConfOptions
 		gchar *screen_file;
 		gboolean use_image;
 		gboolean use_x11_screen_profile;
-
+		gint render_intent;
 	} color_profile;
 
 	/* Helpers programs */
@@ -170,9 +223,9 @@ struct _ConfOptions
 		gboolean warn_on_write_problems;
 
 		gboolean save_legacy_format;
-		
+
 		gboolean sync_grouped_files;
-		
+
 		gboolean confirm_write;
 		gint confirm_timeout;
 		gboolean confirm_after_timeout;
@@ -180,8 +233,9 @@ struct _ConfOptions
 		gboolean confirm_on_dir_change;
 		gboolean keywords_case_sensitive;
 		gboolean write_orientation;
+		gboolean sidecar_extended_name;
 	} metadata;
-	
+
 	/* Stereo */
 	struct {
 		gint mode;;
@@ -203,8 +257,22 @@ struct _ConfOptions
 			gboolean fs_flip_left;
 			gboolean fs_swap;
 			gboolean fs_temp_disable;
-		} tmp; 
+		} tmp;
 	} stereo;
+
+	/* copy move rename */
+	struct {
+		gint auto_start;
+		gchar *auto_end;
+		gint auto_padding;
+		gint formatted_start;
+	} cp_mv_rn;
+
+	/* log window */
+	struct {
+		gboolean paused;
+		gboolean line_wrap;
+	} log_window;
 };
 
 ConfOptions *options;