Mercurial > geeqie
comparison src/options.h @ 870:3dd2cb78d0f9
Make better matching between options types in options.h and the rest of the code.
Most changes are from gint to gboolean pseudo type and between gint / guint.
author | zas_ |
---|---|
date | Sun, 29 Jun 2008 10:11:43 +0000 |
parents | 171dd6e53656 |
children | ff16ed0d2c8a |
comparison
equal
deleted
inserted
replaced
869:371a1c3d4504 | 870:3dd2cb78d0f9 |
---|---|
14 | 14 |
15 typedef struct _ConfOptions ConfOptions; | 15 typedef struct _ConfOptions ConfOptions; |
16 | 16 |
17 struct _ConfOptions | 17 struct _ConfOptions |
18 { | 18 { |
19 | |
20 /* ui */ | 19 /* ui */ |
21 gint progressive_key_scrolling; | 20 gboolean progressive_key_scrolling; |
22 gint place_dialogs_under_mouse; | 21 gboolean place_dialogs_under_mouse; |
23 gboolean mousewheel_scrolls; | 22 gboolean mousewheel_scrolls; |
24 gint show_icon_names; | 23 gboolean show_icon_names; |
25 gint show_copy_path; | 24 gboolean show_copy_path; |
26 | 25 |
27 /* various */ | 26 /* various */ |
28 gint enable_metadata_dirs; | 27 gboolean enable_metadata_dirs; |
29 | 28 |
30 gint tree_descend_subdirs; | 29 gboolean tree_descend_subdirs; |
31 | 30 |
32 gint lazy_image_sync; | 31 gboolean lazy_image_sync; |
33 gint update_on_time_change; | 32 gboolean update_on_time_change; |
34 | 33 |
35 gint duplicates_similarity_threshold; | 34 guint duplicates_similarity_threshold; |
36 | 35 |
37 gint open_recent_list_maxsize; | 36 gint open_recent_list_maxsize; |
38 gint dnd_icon_size; | 37 gint dnd_icon_size; |
39 | 38 |
40 gint save_metadata_in_image_file; | 39 gboolean save_metadata_in_image_file; |
41 | 40 |
42 struct { | 41 struct { |
43 gboolean restore_path; | 42 gboolean restore_path; |
44 gboolean use_last_path; | 43 gboolean use_last_path; |
45 gchar *path; | 44 gchar *path; |
46 } startup; | 45 } startup; |
47 | 46 |
48 /* file ops */ | 47 /* file ops */ |
49 struct { | 48 struct { |
50 gint enable_in_place_rename; | 49 gboolean enable_in_place_rename; |
51 | 50 |
52 gint confirm_delete; | 51 gboolean confirm_delete; |
53 gint enable_delete_key; | 52 gboolean enable_delete_key; |
54 gint safe_delete_enable; | 53 gboolean safe_delete_enable; |
55 gchar *safe_delete_path; | 54 gchar *safe_delete_path; |
56 gint safe_delete_folder_maxsize; | 55 gint safe_delete_folder_maxsize; |
57 } file_ops; | 56 } file_ops; |
58 | 57 |
59 /* image */ | 58 /* image */ |
66 gboolean limit_autofit_size; | 65 gboolean limit_autofit_size; |
67 gint max_autofit_size; | 66 gint max_autofit_size; |
68 | 67 |
69 gint tile_cache_max; /* in megabytes */ | 68 gint tile_cache_max; /* in megabytes */ |
70 gint image_cache_max; /* in megabytes */ | 69 gint image_cache_max; /* in megabytes */ |
71 gint dither_quality; | 70 guint dither_quality; |
72 gboolean enable_read_ahead; | 71 gboolean enable_read_ahead; |
73 | 72 |
74 gint zoom_mode; | 73 gint zoom_mode; |
75 gboolean zoom_2pass; | 74 gboolean zoom_2pass; |
76 gboolean zoom_to_fit_allow_expand; | 75 gboolean zoom_to_fit_allow_expand; |
77 gint zoom_quality; | 76 guint zoom_quality; |
78 gint zoom_increment; /* 10 is 1.0, 5 is 0.05, 20 is 2.0, etc. */ | 77 gint zoom_increment; /* 10 is 1.0, 5 is 0.05, 20 is 2.0, etc. */ |
79 | 78 |
80 gint use_custom_border_color; | 79 gint use_custom_border_color; |
81 GdkColor border_color; | 80 GdkColor border_color; |
82 | 81 |
86 | 85 |
87 /* thumbnails */ | 86 /* thumbnails */ |
88 struct { | 87 struct { |
89 gint max_width; | 88 gint max_width; |
90 gint max_height; | 89 gint max_height; |
91 gint enable_caching; | 90 gboolean enable_caching; |
92 gint cache_into_dirs; | 91 gboolean cache_into_dirs; |
93 gint fast; | 92 gboolean fast; |
94 gint use_xvpics; | 93 gboolean use_xvpics; |
95 gint spec_standard; | 94 gboolean spec_standard; |
96 gint quality; | 95 guint quality; |
97 } thumbnails; | 96 } thumbnails; |
98 | 97 |
99 /* file filtering */ | 98 /* file filtering */ |
100 struct { | 99 struct { |
101 gint show_hidden_files; | 100 gboolean show_hidden_files; |
102 gint show_dot_directory; | 101 gboolean show_dot_directory; |
103 gint disable; | 102 gboolean disable; |
104 } file_filter; | 103 } file_filter; |
105 | 104 |
106 /* collections */ | 105 /* collections */ |
107 struct { | 106 struct { |
108 gint rectangular_selection; | 107 gboolean rectangular_selection; |
109 } collections; | 108 } collections; |
110 | 109 |
111 /* editors */ | 110 /* editors */ |
112 Editor editor[GQ_EDITOR_SLOTS]; | 111 Editor editor[GQ_EDITOR_SLOTS]; |
113 | 112 |
118 } shell; | 117 } shell; |
119 | 118 |
120 /* file sorting */ | 119 /* file sorting */ |
121 struct { | 120 struct { |
122 SortType method; | 121 SortType method; |
123 gint ascending; | 122 gboolean ascending; |
124 gint case_sensitive; /* file sorting method (case) */ | 123 gboolean case_sensitive; /* file sorting method (case) */ |
125 } file_sort; | 124 } file_sort; |
126 | 125 |
127 /* slideshow */ | 126 /* slideshow */ |
128 struct { | 127 struct { |
129 gint delay; /* in tenths of a second */ | 128 gint delay; /* in tenths of a second */ |
130 gint random; | 129 gboolean random; |
131 gint repeat; | 130 gboolean repeat; |
132 } slideshow; | 131 } slideshow; |
133 | 132 |
134 /* fullscreen */ | 133 /* fullscreen */ |
135 struct { | 134 struct { |
136 gint screen; | 135 gint screen; |
137 gint clean_flip; | 136 gboolean clean_flip; |
138 gint disable_saver; | 137 gboolean disable_saver; |
139 gint above; | 138 gboolean above; |
140 } fullscreen; | 139 } fullscreen; |
141 | 140 |
142 /* histogram */ | 141 /* histogram */ |
143 struct { | 142 struct { |
144 guint last_channel_mode; | 143 guint last_channel_mode; |
147 | 146 |
148 /* image overlay */ | 147 /* image overlay */ |
149 struct { | 148 struct { |
150 struct { | 149 struct { |
151 guint state; | 150 guint state; |
152 gint show_at_startup; | 151 gboolean show_at_startup; |
153 gchar *template_string; | 152 gchar *template_string; |
154 gint x; | 153 gint x; |
155 gint y; | 154 gint y; |
156 } common; | 155 } common; |
157 } image_overlay; | 156 } image_overlay; |
162 gint style; | 161 gint style; |
163 | 162 |
164 DirViewType dir_view_type; | 163 DirViewType dir_view_type; |
165 FileViewType file_view_type; | 164 FileViewType file_view_type; |
166 | 165 |
167 gint show_thumbnails; | 166 gboolean show_thumbnails; |
168 gint show_marks; | 167 gboolean show_marks; |
169 gboolean show_directory_date; | 168 gboolean show_directory_date; |
170 | 169 |
171 struct { | 170 struct { |
172 gint w; | 171 gint w; |
173 gint h; | 172 gint h; |
174 gint x; | 173 gint x; |
175 gint y; | 174 gint y; |
176 gint maximized; | 175 gboolean maximized; |
177 gint hdivider_pos; | 176 gint hdivider_pos; |
178 gint vdivider_pos; | 177 gint vdivider_pos; |
179 } main_window; | 178 } main_window; |
180 | 179 |
181 struct { | 180 struct { |
189 struct { | 188 struct { |
190 gint w; | 189 gint w; |
191 gint h; | 190 gint h; |
192 } properties_window; | 191 } properties_window; |
193 | 192 |
194 gint save_window_positions; | 193 gboolean save_window_positions; |
195 | 194 |
196 gint tools_float; | 195 gboolean tools_float; |
197 gint tools_hidden; | 196 gboolean tools_hidden; |
198 gint tools_restore_state; | 197 gboolean tools_restore_state; |
199 | 198 |
200 gint toolbar_hidden; | 199 gboolean toolbar_hidden; |
201 | 200 |
202 } layout; | 201 } layout; |
203 | 202 |
204 /* panels */ | 203 /* panels */ |
205 struct { | 204 struct { |
206 struct { | 205 struct { |
207 gint enabled; | 206 gboolean enabled; |
208 gint width; | 207 gint width; |
209 } info; | 208 } info; |
210 | 209 |
211 struct { | 210 struct { |
212 gint enabled; | 211 gboolean enabled; |
213 gint width; | 212 gint width; |
214 } exif; | 213 } exif; |
215 | 214 |
216 struct { | 215 struct { |
217 gint enabled; | 216 gboolean enabled; |
218 gint mode_state; | 217 gint mode_state; |
219 gint action_state; | 218 gint action_state; |
220 gint selection_state; | 219 gint selection_state; |
221 } sort; | 220 } sort; |
222 } panels; | 221 } panels; |
226 gchar *tabs_order; | 225 gchar *tabs_order; |
227 } properties; | 226 } properties; |
228 | 227 |
229 /* color profiles */ | 228 /* color profiles */ |
230 struct { | 229 struct { |
231 gint enabled; | 230 gboolean enabled; |
232 gint input_type; | 231 gint input_type; |
233 gchar *input_file[COLOR_PROFILE_INPUTS]; | 232 gchar *input_file[COLOR_PROFILE_INPUTS]; |
234 gchar *input_name[COLOR_PROFILE_INPUTS]; | 233 gchar *input_name[COLOR_PROFILE_INPUTS]; |
235 gint screen_type; | 234 gint screen_type; |
236 gchar *screen_file; | 235 gchar *screen_file; |
237 gint use_image; | 236 gboolean use_image; |
238 | 237 |
239 } color_profile; | 238 } color_profile; |
240 | 239 |
241 }; | 240 }; |
242 | 241 |