annotate src/rcfile.c @ 768:ff51413f098d

Use functions to set editors name and command and ensure they are utf8-encoded. Previously, non-utf8 strings from rc file caused some issues.
author zas_
date Fri, 30 May 2008 08:39:52 +0000
parents ae618ebec3e9
children df541dc41707
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1 /*
196
f6e307c7bad6 rename GQview -> Geeqie over the code
nadvornik
parents: 170
diff changeset
2 * Geeqie
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
3 * (C) 2006 John Ellis
475
48c8e49b571c updated copyright in source files
nadvornik
parents: 472
diff changeset
4 * Copyright (C) 2008 The Geeqie Team
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
5 *
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
6 * Author: John Ellis
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
7 *
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
8 * This software is released under the GNU General Public License (GNU GPL).
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
9 * Please read the included file COPYING for more information.
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
10 * This software comes with no warranty of any kind, use at your own risk!
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
11 */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
12
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
13 #include <glib/gstdio.h>
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
14 #include <errno.h>
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
15
281
9995c5fb202a gqview.h -> main.h
zas_
parents: 276
diff changeset
16 #include "main.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
17 #include "rcfile.h"
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
18
307
667e49f52168 Move secure save code to its own files: secure_save.{c,h}.
zas_
parents: 288
diff changeset
19 #include "bar_exif.h"
768
ff51413f098d Use functions to set editors name and command and ensure they are
zas_
parents: 764
diff changeset
20 #include "editors.h"
586
905688aa2317 split filelist.c to filefilter.c and filedata.c
nadvornik
parents: 556
diff changeset
21 #include "filefilter.h"
307
667e49f52168 Move secure save code to its own files: secure_save.{c,h}.
zas_
parents: 288
diff changeset
22 #include "secure_save.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
23 #include "slideshow.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
24 #include "ui_fileops.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
25
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
26
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
27 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
28 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
29 * line write/parse routines (private)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
30 *-----------------------------------------------------------------------------
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
31 */
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
32
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
33 /*
217
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
34 returns text without quotes or NULL for empty or broken string
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
35 any text up to first '"' is skipped
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
36 tail is set to point at the char after the second '"'
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
37 or at the ending \0
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
38
217
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
39 */
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
40
217
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
41 gchar *quoted_value(const gchar *text, const gchar **tail)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
42 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
43 const gchar *ptr;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
44 gint c = 0;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
45 gint l = strlen(text);
210
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
46 gchar *retval = NULL;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
47
217
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
48 if (tail) *tail = text;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
49
210
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
50 if (l == 0) return retval;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
51
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
52 while (c < l && text[c] !='"') c++;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
53 if (text[c] == '"')
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
54 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
55 gint e;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
56 c++;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
57 ptr = text + c;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
58 e = c;
210
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
59 while (e < l)
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
60 {
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
61 if (text[e-1] != '\\' && text[e] == '"') break;
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
62 e++;
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
63 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
64 if (text[e] == '"')
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
65 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
66 if (e - c > 0)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
67 {
210
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
68 gchar *substring = g_strndup(ptr, e - c);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
69
210
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
70 if (substring)
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
71 {
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
72 retval = g_strcompress(substring);
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
73 g_free(substring);
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
74 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
75 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
76 }
217
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
77 if (tail) *tail = text + e + 1;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
78 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
79 else
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
80 /* for compatibility with older formats (<0.3.7)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
81 * read a line without quotes too */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
82 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
83 c = 0;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
84 while (c < l && text[c] !=' ' && text[c] !=8 && text[c] != '\n') c++;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
85 if (c != 0)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
86 {
210
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
87 retval = g_strndup(text, c);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
88 }
217
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
89 if (tail) *tail = text + c;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
90 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
91
210
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
92 return retval;
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
93 }
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
94
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
95 gchar *escquote_value(const gchar *text)
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
96 {
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
97 gchar *e;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
98
217
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
99 if (!text) return g_strdup("\"\"");
210
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
100
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
101 e = g_strescape(text, "");
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
102 if (e)
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
103 {
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
104 gchar *retval = g_strdup_printf("\"%s\"", e);
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
105 g_free(e);
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
106 return retval;
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
107 }
217
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
108 return g_strdup("\"\"");
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
109 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
110
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
111 static void write_char_option(SecureSaveInfo *ssi, gchar *label, gchar *text)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
112 {
210
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
113 gchar *escval = escquote_value(text);
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
114
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
115 secure_fprintf(ssi, "%s: %s\n", label, escval);
217
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
116 g_free(escval);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
117 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
118
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
119 static gboolean read_char_option(FILE *f, gchar *option, gchar *label, gchar *value, gchar **text)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
120 {
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
121 if (g_ascii_strcasecmp(option, label) != 0) return FALSE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
122 if (!text) return FALSE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
123
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
124 g_free(*text);
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
125 *text = quoted_value(value, NULL);
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
126 return TRUE;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
127 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
128
267
a9adf9e1a746 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
zas_
parents: 250
diff changeset
129 /* Since gdk_color_to_string() is only available since gtk 2.12
a9adf9e1a746 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
zas_
parents: 250
diff changeset
130 * here is an equivalent stub function. */
a9adf9e1a746 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
zas_
parents: 250
diff changeset
131 static gchar *color_to_string(GdkColor *color)
a9adf9e1a746 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
zas_
parents: 250
diff changeset
132 {
a9adf9e1a746 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
zas_
parents: 250
diff changeset
133 return g_strdup_printf("#%04X%04X%04X", color->red, color->green, color->blue);
a9adf9e1a746 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
zas_
parents: 250
diff changeset
134 }
a9adf9e1a746 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
zas_
parents: 250
diff changeset
135
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
136 static void write_color_option(SecureSaveInfo *ssi, gchar *label, GdkColor *color)
208
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
137 {
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
138 if (color)
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
139 {
267
a9adf9e1a746 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
zas_
parents: 250
diff changeset
140 gchar *colorstring = color_to_string(color);
208
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
141
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
142 write_char_option(ssi, label, colorstring);
208
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
143 g_free(colorstring);
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
144 }
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
145 else
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
146 secure_fprintf(ssi, "%s: \n", label);
208
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
147 }
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
148
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
149 static gboolean read_color_option(FILE *f, gchar *option, gchar *label, gchar *value, GdkColor *color)
208
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
150 {
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
151 gchar *colorstr;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
152
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
153 if (g_ascii_strcasecmp(option, label) != 0) return FALSE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
154 if (!color) return FALSE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
155
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
156 colorstr = quoted_value(value, NULL);
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
157 if (!colorstr) return FALSE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
158 gdk_color_parse(colorstr, color);
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
159 g_free(colorstr);
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
160 return TRUE;
208
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
161 }
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
162
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
163 static void write_int_option(SecureSaveInfo *ssi, gchar *label, gint n)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
164 {
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
165 secure_fprintf(ssi, "%s: %d\n", label, n);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
166 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
167
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
168 static gboolean read_int_option(FILE *f, gchar *option, gchar *label, gchar *value, gint *n)
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
169 {
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
170 if (g_ascii_strcasecmp(option, label) != 0) return FALSE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
171 if (!n) return FALSE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
172
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
173 if (g_ascii_isdigit(value[0]) || (value[0] == '-' && g_ascii_isdigit(value[1])))
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
174 {
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
175 *n = strtol(value, NULL, 10);
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
176 }
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
177 else
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
178 {
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
179 if (g_ascii_strcasecmp(value, "true") == 0)
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
180 *n = 1;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
181 else
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
182 *n = 0;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
183 }
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
184
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
185 return TRUE;
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
186 }
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
187
380
5afe77bb563a Introduce a new struct ViewDir to handle directory views common
zas_
parents: 377
diff changeset
188 static void write_uint_option(SecureSaveInfo *ssi, gchar *label, guint n)
5afe77bb563a Introduce a new struct ViewDir to handle directory views common
zas_
parents: 377
diff changeset
189 {
5afe77bb563a Introduce a new struct ViewDir to handle directory views common
zas_
parents: 377
diff changeset
190 secure_fprintf(ssi, "%s: %u\n", label, n);
5afe77bb563a Introduce a new struct ViewDir to handle directory views common
zas_
parents: 377
diff changeset
191 }
5afe77bb563a Introduce a new struct ViewDir to handle directory views common
zas_
parents: 377
diff changeset
192
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
193 static gboolean read_uint_option(FILE *f, gchar *option, gchar *label, gchar *value, guint *n)
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
194 {
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
195 if (g_ascii_strcasecmp(option, label) != 0) return FALSE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
196 if (!n) return FALSE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
197
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
198 if (g_ascii_isdigit(value[0]))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
199 {
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
200 *n = strtoul(value, NULL, 10);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
201 }
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
202 else
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
203 {
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
204 if (g_ascii_strcasecmp(value, "true") == 0)
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
205 *n = 1;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
206 else
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
207 *n = 0;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
208 }
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
209
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
210 return TRUE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
211 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
212
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
213 static gboolean read_int_option_clamp(FILE *f, gchar *option, gchar *label, gchar *value, gint *n, gint min, gint max)
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
214 {
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
215 gboolean ret;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
216
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
217 ret = read_int_option(f, option, label, value, n);
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
218 if (ret) *n = CLAMP(*n, min, max);
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
219
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
220 return ret;
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
221 }
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
222
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
223 static void write_int_unit_option(SecureSaveInfo *ssi, gchar *label, gint n, gint subunits)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
224 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
225 gint l, r;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
226
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
227 if (subunits > 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
228 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
229 l = n / subunits;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
230 r = n % subunits;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
231 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
232 else
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
233 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
234 l = n;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
235 r = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
236 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
237
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
238 secure_fprintf(ssi, "%s: %d.%d\n", label, l, r);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
239 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
240
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
241 static gboolean read_int_unit_option(FILE *f, gchar *option, gchar *label, gchar *value, gint *n, gint subunits)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
242 {
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
243 gint l, r;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
244 gchar *ptr;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
245
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
246 if (g_ascii_strcasecmp(option, label) != 0) return FALSE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
247 if (!n) return FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
248
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
249 ptr = value;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
250 while (*ptr != '\0' && *ptr != '.') ptr++;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
251 if (*ptr == '.')
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
252 {
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
253 *ptr = '\0';
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
254 l = strtol(value, NULL, 10);
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
255 *ptr = '.';
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
256 ptr++;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
257 r = strtol(ptr, NULL, 10);
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
258 }
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
259 else
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
260 {
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
261 l = strtol(value, NULL, 10);
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
262 r = 0;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
263 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
264
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
265 *n = l * subunits + r;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
266
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
267 return TRUE;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
268 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
269
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
270 static void write_bool_option(SecureSaveInfo *ssi, gchar *label, gint n)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
271 {
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
272 secure_fprintf(ssi, "%s: ", label);
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
273 if (n) secure_fprintf(ssi, "true\n"); else secure_fprintf(ssi, "false\n");
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
274 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
275
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
276 static gboolean read_bool_option(FILE *f, gchar *option, gchar *label, gchar *value, gint *n)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
277 {
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
278 if (g_ascii_strcasecmp(option, label) != 0) return FALSE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
279 if (!n) return FALSE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
280
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
281 if (g_ascii_strcasecmp(value, "true") == 0 || atoi(value) != 0)
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
282 *n = TRUE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
283 else
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
284 *n = FALSE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
285
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
286 return TRUE;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
287 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
288
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
289
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
290 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
291 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
292 * save configuration (public)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
293 *-----------------------------------------------------------------------------
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
294 */
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
295
742
a336b5545af6 Pass ConfOptions * to save_options() and load_options().
zas_
parents: 741
diff changeset
296 static gboolean save_options_to(const gchar *utf8_path, ConfOptions *options)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
297 {
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
298 SecureSaveInfo *ssi;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
299 gchar *rc_pathl;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
300 gint i;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
301
741
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
302 rc_pathl = path_from_utf8(utf8_path);
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
303 ssi = secure_open(rc_pathl);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
304 g_free(rc_pathl);
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
305 if (!ssi)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
306 {
741
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
307 log_printf(_("error saving config file: %s\n"), utf8_path);
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
308 return FALSE;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
309 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
310
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
311 #define WRITE_BOOL(_name_) write_bool_option(ssi, #_name_, options->_name_)
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
312 #define WRITE_INT(_name_) write_int_option(ssi, #_name_, options->_name_)
380
5afe77bb563a Introduce a new struct ViewDir to handle directory views common
zas_
parents: 377
diff changeset
313 #define WRITE_UINT(_name_) write_uint_option(ssi, #_name_, options->_name_)
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
314 #define WRITE_INT_UNIT(_name_, _unit_) write_int_unit_option(ssi, #_name_, options->_name_, _unit_)
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
315 #define WRITE_CHAR(_name_) write_char_option(ssi, #_name_, options->_name_)
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
316 #define WRITE_COLOR(_name_) write_color_option(ssi, #_name_, &options->_name_)
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
317
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
318 #define WRITE_SEPARATOR() secure_fputc(ssi, '\n')
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
319 #define WRITE_SUBTITLE(_title_) secure_fprintf(ssi, "\n\n##### "_title_" #####\n\n")
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
320
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
321 secure_fprintf(ssi, "######################################################################\n");
640
fd26409e3a6a Minor formatting fix in rc file header.
zas_
parents: 639
diff changeset
322 secure_fprintf(ssi, "# %30s config file version %-10s #\n", GQ_APPNAME, VERSION);
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
323 secure_fprintf(ssi, "######################################################################\n");
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
324 WRITE_SEPARATOR();
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
325
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
326 secure_fprintf(ssi, "# Note: This file is autogenerated. Options can be changed here,\n");
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
327 secure_fprintf(ssi, "# but user comments and formatting will be lost.\n");
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
328 WRITE_SEPARATOR();
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
329
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
330 WRITE_SUBTITLE("General Options");
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
331
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
332 WRITE_BOOL(show_icon_names);
497
a33badd85f16 Allow the copy of file paths to clipboard.
zas_
parents: 491
diff changeset
333 WRITE_BOOL(show_copy_path);
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
334 WRITE_SEPARATOR();
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
335
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
336 WRITE_BOOL(tree_descend_subdirs);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
337 WRITE_BOOL(lazy_image_sync);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
338 WRITE_BOOL(update_on_time_change);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
339 WRITE_SEPARATOR();
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
340
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
341 WRITE_BOOL(progressive_key_scrolling);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
342 WRITE_BOOL(enable_metadata_dirs);
594
4cfce4ed35e0 Use a dedicated option to enable keywords and comment saving as XMP tags
zas_
parents: 586
diff changeset
343 WRITE_BOOL(save_metadata_in_image_file);
335
0cb7f0ac5c20 Beautify rc file, adding sub-sections titles.
zas_
parents: 334
diff changeset
344
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
345 WRITE_INT(duplicates_similarity_threshold);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
346 WRITE_SEPARATOR();
335
0cb7f0ac5c20 Beautify rc file, adding sub-sections titles.
zas_
parents: 334
diff changeset
347
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
348 WRITE_BOOL(mousewheel_scrolls);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
349 WRITE_INT(open_recent_list_maxsize);
458
7a69309b91c8 Allow the user to set the drag'n drop icon size through
zas_
parents: 446
diff changeset
350 WRITE_INT(dnd_icon_size);
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
351 WRITE_BOOL(place_dialogs_under_mouse);
341
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
352
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
353
629
1fa2cb6d9d65 Rename options:
zas_
parents: 618
diff changeset
354 WRITE_SUBTITLE("Startup Options");
1fa2cb6d9d65 Rename options:
zas_
parents: 618
diff changeset
355
1fa2cb6d9d65 Rename options:
zas_
parents: 618
diff changeset
356 WRITE_BOOL(startup.restore_path);
630
83d3ded39e49 An option to save and restore the last path used was added.
zas_
parents: 629
diff changeset
357 WRITE_BOOL(startup.use_last_path);
629
1fa2cb6d9d65 Rename options:
zas_
parents: 618
diff changeset
358 WRITE_CHAR(startup.path);
1fa2cb6d9d65 Rename options:
zas_
parents: 618
diff changeset
359
1fa2cb6d9d65 Rename options:
zas_
parents: 618
diff changeset
360
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
361 WRITE_SUBTITLE("File operations Options");
341
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
362
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
363 WRITE_BOOL(file_ops.enable_in_place_rename);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
364 WRITE_BOOL(file_ops.confirm_delete);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
365 WRITE_BOOL(file_ops.enable_delete_key);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
366 WRITE_BOOL(file_ops.safe_delete_enable);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
367 WRITE_CHAR(file_ops.safe_delete_path);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
368 WRITE_INT(file_ops.safe_delete_folder_maxsize);
341
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
369
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
370
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
371 WRITE_SUBTITLE("Layout Options");
335
0cb7f0ac5c20 Beautify rc file, adding sub-sections titles.
zas_
parents: 334
diff changeset
372
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
373 WRITE_INT(layout.style);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
374 WRITE_CHAR(layout.order);
380
5afe77bb563a Introduce a new struct ViewDir to handle directory views common
zas_
parents: 377
diff changeset
375 WRITE_UINT(layout.dir_view_type);
556
fe675761d091 Replace Layout icon_view field by more generic file_view_type.
zas_
parents: 537
diff changeset
376 WRITE_UINT(layout.file_view_type);
433
5ddcf93278c7 Save Show Marks state to rc file and display current state in menu.
zas_
parents: 413
diff changeset
377 WRITE_BOOL(layout.show_marks);
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
378 WRITE_BOOL(layout.show_thumbnails);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
379 WRITE_SEPARATOR();
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
380
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
381 WRITE_BOOL(layout.save_window_positions);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
382 WRITE_SEPARATOR();
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
383
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
384 WRITE_INT(layout.main_window.x);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
385 WRITE_INT(layout.main_window.y);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
386 WRITE_INT(layout.main_window.w);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
387 WRITE_INT(layout.main_window.h);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
388 WRITE_BOOL(layout.main_window.maximized);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
389 WRITE_INT(layout.main_window.hdivider_pos);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
390 WRITE_INT(layout.main_window.vdivider_pos);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
391 WRITE_SEPARATOR();
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
392
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
393 WRITE_INT(layout.float_window.x);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
394 WRITE_INT(layout.float_window.y);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
395 WRITE_INT(layout.float_window.w);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
396 WRITE_INT(layout.float_window.h);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
397 WRITE_INT(layout.float_window.vdivider_pos);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
398 WRITE_SEPARATOR();
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
399
764
ae618ebec3e9 Save properties window width and height to rc file and restore
zas_
parents: 743
diff changeset
400 WRITE_INT(layout.properties_window.w);
ae618ebec3e9 Save properties window width and height to rc file and restore
zas_
parents: 743
diff changeset
401 WRITE_INT(layout.properties_window.h);
ae618ebec3e9 Save properties window width and height to rc file and restore
zas_
parents: 743
diff changeset
402 WRITE_SEPARATOR();
ae618ebec3e9 Save properties window width and height to rc file and restore
zas_
parents: 743
diff changeset
403
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
404 WRITE_BOOL(layout.tools_float);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
405 WRITE_BOOL(layout.tools_hidden);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
406 WRITE_BOOL(layout.tools_restore_state);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
407 WRITE_SEPARATOR();
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
408
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
409 WRITE_BOOL(layout.toolbar_hidden);
335
0cb7f0ac5c20 Beautify rc file, adding sub-sections titles.
zas_
parents: 334
diff changeset
410
489
3809ffa3567b Save state and width of exif, info and sort panels to rc file.
zas_
parents: 475
diff changeset
411 WRITE_SUBTITLE("Panels Options");
3809ffa3567b Save state and width of exif, info and sort panels to rc file.
zas_
parents: 475
diff changeset
412
3809ffa3567b Save state and width of exif, info and sort panels to rc file.
zas_
parents: 475
diff changeset
413 WRITE_BOOL(panels.exif.enabled);
3809ffa3567b Save state and width of exif, info and sort panels to rc file.
zas_
parents: 475
diff changeset
414 WRITE_INT(panels.exif.width);
3809ffa3567b Save state and width of exif, info and sort panels to rc file.
zas_
parents: 475
diff changeset
415 WRITE_BOOL(panels.info.enabled);
3809ffa3567b Save state and width of exif, info and sort panels to rc file.
zas_
parents: 475
diff changeset
416 WRITE_INT(panels.info.width);
3809ffa3567b Save state and width of exif, info and sort panels to rc file.
zas_
parents: 475
diff changeset
417 WRITE_BOOL(panels.sort.enabled);
491
4a9570cd06f8 Save sort manager state to rc file.
zas_
parents: 489
diff changeset
418 WRITE_INT(panels.sort.action_state);
4a9570cd06f8 Save sort manager state to rc file.
zas_
parents: 489
diff changeset
419 WRITE_INT(panels.sort.mode_state);
4a9570cd06f8 Save sort manager state to rc file.
zas_
parents: 489
diff changeset
420 WRITE_INT(panels.sort.selection_state);
335
0cb7f0ac5c20 Beautify rc file, adding sub-sections titles.
zas_
parents: 334
diff changeset
421
684
9f00d0d874fa Save order of Properties dialog tabs to rc file.
zas_
parents: 641
diff changeset
422 WRITE_SUBTITLE("Properties dialog Options");
9f00d0d874fa Save order of Properties dialog tabs to rc file.
zas_
parents: 641
diff changeset
423 WRITE_CHAR(properties.tabs_order);
9f00d0d874fa Save order of Properties dialog tabs to rc file.
zas_
parents: 641
diff changeset
424
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
425 WRITE_SUBTITLE("Image Options");
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
426
377
9efefd85684a Cleanup read/write of image.zoom_mode option.
zas_
parents: 376
diff changeset
427 secure_fprintf(ssi, "# image.zoom_mode possible values are:\n"
9efefd85684a Cleanup read/write of image.zoom_mode option.
zas_
parents: 376
diff changeset
428 "# original\n"
9efefd85684a Cleanup read/write of image.zoom_mode option.
zas_
parents: 376
diff changeset
429 "# fit\n"
9efefd85684a Cleanup read/write of image.zoom_mode option.
zas_
parents: 376
diff changeset
430 "# dont_change\n");
334
df868b947aa0 Rename image-related options.
zas_
parents: 333
diff changeset
431 secure_fprintf(ssi, "image.zoom_mode: ");
377
9efefd85684a Cleanup read/write of image.zoom_mode option.
zas_
parents: 376
diff changeset
432 if (options->image.zoom_mode == ZOOM_RESET_ORIGINAL)
9efefd85684a Cleanup read/write of image.zoom_mode option.
zas_
parents: 376
diff changeset
433 secure_fprintf(ssi, "original\n");
9efefd85684a Cleanup read/write of image.zoom_mode option.
zas_
parents: 376
diff changeset
434 else if (options->image.zoom_mode == ZOOM_RESET_FIT_WINDOW)
9efefd85684a Cleanup read/write of image.zoom_mode option.
zas_
parents: 376
diff changeset
435 secure_fprintf(ssi, "fit\n");
9efefd85684a Cleanup read/write of image.zoom_mode option.
zas_
parents: 376
diff changeset
436 else if (options->image.zoom_mode == ZOOM_RESET_NONE)
9efefd85684a Cleanup read/write of image.zoom_mode option.
zas_
parents: 376
diff changeset
437 secure_fprintf(ssi, "dont_change\n");
9efefd85684a Cleanup read/write of image.zoom_mode option.
zas_
parents: 376
diff changeset
438 WRITE_SEPARATOR();
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
439 WRITE_BOOL(image.zoom_2pass);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
440 WRITE_BOOL(image.zoom_to_fit_allow_expand);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
441 WRITE_INT(image.zoom_quality);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
442 WRITE_INT(image.zoom_increment);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
443 WRITE_BOOL(image.fit_window_to_image);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
444 WRITE_BOOL(image.limit_window_size);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
445 WRITE_INT(image.max_window_size);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
446 WRITE_BOOL(image.limit_autofit_size);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
447 WRITE_INT(image.max_autofit_size);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
448 WRITE_INT(image.scroll_reset_method);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
449 WRITE_INT(image.tile_cache_max);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
450 WRITE_INT(image.dither_quality);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
451 WRITE_BOOL(image.enable_read_ahead);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
452 WRITE_BOOL(image.exif_rotate_enable);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
453 WRITE_BOOL(image.use_custom_border_color);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
454 WRITE_COLOR(image.border_color);
413
9e521adbf312 Add two new options to control image read buffer at runtime.
zas_
parents: 403
diff changeset
455 WRITE_INT(image.read_buffer_size);
9e521adbf312 Add two new options to control image read buffer at runtime.
zas_
parents: 403
diff changeset
456 WRITE_INT(image.idle_read_loop_count);
335
0cb7f0ac5c20 Beautify rc file, adding sub-sections titles.
zas_
parents: 334
diff changeset
457
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
458 WRITE_SUBTITLE("Thumbnails Options");
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
459
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
460 WRITE_INT(thumbnails.max_width);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
461 WRITE_INT(thumbnails.max_height);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
462 WRITE_BOOL(thumbnails.enable_caching);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
463 WRITE_BOOL(thumbnails.cache_into_dirs);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
464 WRITE_BOOL(thumbnails.fast);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
465 WRITE_BOOL(thumbnails.use_xvpics);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
466 WRITE_BOOL(thumbnails.spec_standard);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
467 WRITE_INT(thumbnails.quality);
335
0cb7f0ac5c20 Beautify rc file, adding sub-sections titles.
zas_
parents: 334
diff changeset
468
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
469
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
470 WRITE_SUBTITLE("File sorting Options");
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
471
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
472 WRITE_INT(file_sort.method);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
473 WRITE_BOOL(file_sort.ascending);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
474 WRITE_BOOL(file_sort.case_sensitive);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
475
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
476
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
477 WRITE_SUBTITLE("Fullscreen Options");
4
e149abcda4eb Syncing to 0.8.1
gqview
parents: 3
diff changeset
478
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
479 WRITE_INT(fullscreen.screen);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
480 WRITE_BOOL(fullscreen.clean_flip);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
481 WRITE_BOOL(fullscreen.disable_saver);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
482 WRITE_BOOL(fullscreen.above);
468
2df505c60459 Replace fullscreen.info and fullscreen.show_info options by:
zas_
parents: 458
diff changeset
483
612
21864cc96369 Preserve last histogram modes.
zas_
parents: 605
diff changeset
484
21864cc96369 Preserve last histogram modes.
zas_
parents: 605
diff changeset
485 WRITE_SUBTITLE("Histogram Options");
21864cc96369 Preserve last histogram modes.
zas_
parents: 605
diff changeset
486 WRITE_UINT(histogram.last_channel_mode);
21864cc96369 Preserve last histogram modes.
zas_
parents: 605
diff changeset
487 WRITE_UINT(histogram.last_log_mode);
21864cc96369 Preserve last histogram modes.
zas_
parents: 605
diff changeset
488
21864cc96369 Preserve last histogram modes.
zas_
parents: 605
diff changeset
489
468
2df505c60459 Replace fullscreen.info and fullscreen.show_info options by:
zas_
parents: 458
diff changeset
490 WRITE_SUBTITLE("Image Overlay Options");
638
8cc9f349c670 Rename option image_overlay.common.enabled to image_overlay.common.state
zas_
parents: 630
diff changeset
491 WRITE_UINT(image_overlay.common.state);
468
2df505c60459 Replace fullscreen.info and fullscreen.show_info options by:
zas_
parents: 458
diff changeset
492 WRITE_BOOL(image_overlay.common.show_at_startup);
2df505c60459 Replace fullscreen.info and fullscreen.show_info options by:
zas_
parents: 458
diff changeset
493 WRITE_CHAR(image_overlay.common.template_string);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
494
612
21864cc96369 Preserve last histogram modes.
zas_
parents: 605
diff changeset
495
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
496 WRITE_SUBTITLE("Slideshow Options");
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
497
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
498 WRITE_INT_UNIT(slideshow.delay, SLIDESHOW_SUBSECOND_PRECISION);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
499 WRITE_BOOL(slideshow.random);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
500 WRITE_BOOL(slideshow.repeat);
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
501
335
0cb7f0ac5c20 Beautify rc file, adding sub-sections titles.
zas_
parents: 334
diff changeset
502
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
503 WRITE_SUBTITLE("Collection Options");
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
504
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
505 WRITE_BOOL(collections.rectangular_selection);
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
506
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
507
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
508 WRITE_SUBTITLE("Filtering Options");
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
509
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
510 WRITE_BOOL(file_filter.show_hidden_files);
373
61a3c8b05b24 Add a new option in Preferences > Filtering to allow the
zas_
parents: 372
diff changeset
511 WRITE_BOOL(file_filter.show_dot_directory);
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
512 WRITE_BOOL(file_filter.disable);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
513 WRITE_SEPARATOR();
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
514
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
515 filter_write_list(ssi);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
516
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
517
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
518 WRITE_SUBTITLE("Sidecars Options");
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
519
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
520 sidecar_ext_write(ssi);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
521
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
522
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
523 WRITE_SUBTITLE("Color Profiles");
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
524
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
525 #ifndef HAVE_LCMS
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
526 secure_fprintf(ssi, "# NOTICE: %s was not built with support for color profiles,\n"
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
527 "# color profile options will have no effect.\n\n", GQ_APPNAME);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
528 #endif
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
529
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
530 WRITE_BOOL(color_profile.enabled);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
531 WRITE_BOOL(color_profile.use_image);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
532 WRITE_INT(color_profile.input_type);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
533 WRITE_SEPARATOR();
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
534
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
535 for (i = 0; i < COLOR_PROFILE_INPUTS; i++)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
536 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
537 gchar *buf;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
538
327
049d6b00cc14 Rename color profile options.
zas_
parents: 326
diff changeset
539 buf = g_strdup_printf("color_profile.input_file_%d", i + 1);
049d6b00cc14 Rename color profile options.
zas_
parents: 326
diff changeset
540 write_char_option(ssi, buf, options->color_profile.input_file[i]);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
541 g_free(buf);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
542
327
049d6b00cc14 Rename color profile options.
zas_
parents: 326
diff changeset
543 buf = g_strdup_printf("color_profile.input_name_%d", i + 1);
049d6b00cc14 Rename color profile options.
zas_
parents: 326
diff changeset
544 write_char_option(ssi, buf, options->color_profile.input_name[i]);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
545 g_free(buf);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
546 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
547
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
548 WRITE_SEPARATOR();
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
549 WRITE_INT(color_profile.screen_type);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
550 WRITE_CHAR(color_profile.screen_file);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
551
737
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 730
diff changeset
552
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 730
diff changeset
553 WRITE_SUBTITLE("Shell command");
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 730
diff changeset
554 WRITE_CHAR(shell.path);
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 730
diff changeset
555 WRITE_CHAR(shell.options);
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 730
diff changeset
556
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 730
diff changeset
557
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
558 WRITE_SUBTITLE("External Programs");
348
3514f4d49447 Add a note in the rc file about special editor slots.
zas_
parents: 347
diff changeset
559 secure_fprintf(ssi, "# Maximum of %d programs (external_1 through external_%d)\n", GQ_EDITOR_GENERIC_SLOTS, GQ_EDITOR_GENERIC_SLOTS);
3514f4d49447 Add a note in the rc file about special editor slots.
zas_
parents: 347
diff changeset
560 secure_fprintf(ssi, "# external_%d through external_%d are used for file ops\n", GQ_EDITOR_GENERIC_SLOTS + 1, GQ_EDITOR_SLOTS);
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
561 secure_fprintf(ssi, "# format: external_n: \"menu name\" \"command line\"\n\n");
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
562
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
563 for (i = 0; i < GQ_EDITOR_SLOTS; i++)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
564 {
348
3514f4d49447 Add a note in the rc file about special editor slots.
zas_
parents: 347
diff changeset
565 if (i == GQ_EDITOR_GENERIC_SLOTS) secure_fputc(ssi, '\n');
730
2d8a8e892b5e Use a struct to handle editor's properties.
zas_
parents: 729
diff changeset
566 gchar *qname = escquote_value(options->editor[i].name);
2d8a8e892b5e Use a struct to handle editor's properties.
zas_
parents: 729
diff changeset
567 gchar *qcommand = escquote_value(options->editor[i].command);
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
568 secure_fprintf(ssi, "external_%d: %s %s\n", i+1, qname, qcommand);
217
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
569 g_free(qname);
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
570 g_free(qcommand);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
571 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
572
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
573
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
574 WRITE_SUBTITLE("Exif Options");
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
575 secure_fprintf(ssi, "# Display: 0: never\n"
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
576 "# 1: if set\n"
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
577 "# 2: always\n\n");
222
77f1bcc6c161 various exif improvements based on patch by Uwe Ohse
nadvornik
parents: 218
diff changeset
578 for (i = 0; ExifUIList[i].key; i++)
77f1bcc6c161 various exif improvements based on patch by Uwe Ohse
nadvornik
parents: 218
diff changeset
579 {
349
452a4c25da22 exif_* -> exif.display.*
zas_
parents: 348
diff changeset
580 secure_fprintf(ssi, "exif.display.");
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
581 write_int_option(ssi, (gchar *)ExifUIList[i].key, ExifUIList[i].current);
222
77f1bcc6c161 various exif improvements based on patch by Uwe Ohse
nadvornik
parents: 218
diff changeset
582 }
77f1bcc6c161 various exif improvements based on patch by Uwe Ohse
nadvornik
parents: 218
diff changeset
583
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
584 WRITE_SEPARATOR();
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
585 WRITE_SEPARATOR();
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
586
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
587 secure_fprintf(ssi, "######################################################################\n");
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
588 secure_fprintf(ssi, "# end of config file #\n");
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
589 secure_fprintf(ssi, "######################################################################\n");
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
590
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
591
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
592 if (secure_close(ssi))
741
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
593 {
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
594 log_printf(_("error saving config file: %s\nerror: %s\n"), utf8_path,
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
595 secsave_strerror(secsave_errno));
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
596 return FALSE;
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
597 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
598
741
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
599 return TRUE;
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
600 }
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
601
742
a336b5545af6 Pass ConfOptions * to save_options() and load_options().
zas_
parents: 741
diff changeset
602 void save_options(ConfOptions *options)
741
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
603 {
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
604 gchar *rc_path;
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
605
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
606 rc_path = g_build_filename(homedir(), GQ_RC_DIR, RC_FILE_NAME, NULL);
742
a336b5545af6 Pass ConfOptions * to save_options() and load_options().
zas_
parents: 741
diff changeset
607 save_options_to(rc_path, options);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
608 g_free(rc_path);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
609 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
610
741
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
611
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
612
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
613 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
614 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
615 * load configuration (public)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
616 *-----------------------------------------------------------------------------
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
617 */
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
618
729
9a6a7e95467a Make stricter match for option's names consisting of a prefix and a number.
zas_
parents: 715
diff changeset
619 static gboolean is_numbered_option(const gchar *option, const gchar *prefix, gint *number)
9a6a7e95467a Make stricter match for option's names consisting of a prefix and a number.
zas_
parents: 715
diff changeset
620 {
9a6a7e95467a Make stricter match for option's names consisting of a prefix and a number.
zas_
parents: 715
diff changeset
621 gsize n;
9a6a7e95467a Make stricter match for option's names consisting of a prefix and a number.
zas_
parents: 715
diff changeset
622 gsize option_len = strlen(option);
9a6a7e95467a Make stricter match for option's names consisting of a prefix and a number.
zas_
parents: 715
diff changeset
623 gsize prefix_len = strlen(prefix);
9a6a7e95467a Make stricter match for option's names consisting of a prefix and a number.
zas_
parents: 715
diff changeset
624
9a6a7e95467a Make stricter match for option's names consisting of a prefix and a number.
zas_
parents: 715
diff changeset
625 if (option_len <= prefix_len) return FALSE;
9a6a7e95467a Make stricter match for option's names consisting of a prefix and a number.
zas_
parents: 715
diff changeset
626 if (g_ascii_strncasecmp(option, prefix, prefix_len) != 0) return FALSE;
9a6a7e95467a Make stricter match for option's names consisting of a prefix and a number.
zas_
parents: 715
diff changeset
627
9a6a7e95467a Make stricter match for option's names consisting of a prefix and a number.
zas_
parents: 715
diff changeset
628 n = prefix_len;
9a6a7e95467a Make stricter match for option's names consisting of a prefix and a number.
zas_
parents: 715
diff changeset
629 while (g_ascii_isdigit(option[n])) n++;
9a6a7e95467a Make stricter match for option's names consisting of a prefix and a number.
zas_
parents: 715
diff changeset
630 if (n < option_len) return FALSE;
9a6a7e95467a Make stricter match for option's names consisting of a prefix and a number.
zas_
parents: 715
diff changeset
631
9a6a7e95467a Make stricter match for option's names consisting of a prefix and a number.
zas_
parents: 715
diff changeset
632 if (number) *number = atoi(option + prefix_len);
9a6a7e95467a Make stricter match for option's names consisting of a prefix and a number.
zas_
parents: 715
diff changeset
633 return TRUE;
9a6a7e95467a Make stricter match for option's names consisting of a prefix and a number.
zas_
parents: 715
diff changeset
634 }
9a6a7e95467a Make stricter match for option's names consisting of a prefix and a number.
zas_
parents: 715
diff changeset
635
738
ff8b802eac58 Separate path building code from options loading code.
zas_
parents: 737
diff changeset
636
ff8b802eac58 Separate path building code from options loading code.
zas_
parents: 737
diff changeset
637
742
a336b5545af6 Pass ConfOptions * to save_options() and load_options().
zas_
parents: 741
diff changeset
638 static gboolean load_options_from(const gchar *utf8_path, ConfOptions *options)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
639 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
640 FILE *f;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
641 gchar *rc_pathl;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
642 gchar s_buf[1024];
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
643 gchar option[1024];
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
644 gchar value[1024];
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
645 gchar value_all[1024];
350
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
646 gint i;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
647
738
ff8b802eac58 Separate path building code from options loading code.
zas_
parents: 737
diff changeset
648 rc_pathl = path_from_utf8(utf8_path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
649 f = fopen(rc_pathl,"r");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
650 g_free(rc_pathl);
738
ff8b802eac58 Separate path building code from options loading code.
zas_
parents: 737
diff changeset
651 if (!f) return FALSE;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
652
350
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
653 while (fgets(s_buf, sizeof(s_buf), f))
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
654 {
350
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
655 gchar *option_start, *value_start;
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
656 gchar *p = s_buf;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
657
516
b7e99bfeadc9 Convert the minority of while() to while ().
zas_
parents: 497
diff changeset
658 while (g_ascii_isspace(*p)) p++;
350
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
659 if (!*p || *p == '\n' || *p == '#') continue;
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
660 option_start = p;
516
b7e99bfeadc9 Convert the minority of while() to while ().
zas_
parents: 497
diff changeset
661 while (*p && *p != ':') p++;
350
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
662 if (!*p) continue;
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
663 *p = '\0';
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
664 p++;
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
665 strncpy(option, option_start, sizeof(option));
516
b7e99bfeadc9 Convert the minority of while() to while ().
zas_
parents: 497
diff changeset
666 while (g_ascii_isspace(*p)) p++;
350
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
667 value_start = p;
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
668 strncpy(value_all, value_start, sizeof(value_all));
516
b7e99bfeadc9 Convert the minority of while() to while ().
zas_
parents: 497
diff changeset
669 while (*p && !g_ascii_isspace(*p) && *p != '\n') p++;
350
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
670 *p = '\0';
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
671 strncpy(value, value_start, sizeof(value));
341
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
672
641
81441380d3be When an option was successfully read, just continue to next line.
zas_
parents: 640
diff changeset
673 #define READ_BOOL(_name_) if (read_bool_option(f, option, #_name_, value, &options->_name_)) continue;
81441380d3be When an option was successfully read, just continue to next line.
zas_
parents: 640
diff changeset
674 #define READ_INT(_name_) if (read_int_option(f, option, #_name_, value, &options->_name_)) continue;
81441380d3be When an option was successfully read, just continue to next line.
zas_
parents: 640
diff changeset
675 #define READ_UINT(_name_) if (read_uint_option(f, option, #_name_, value, &options->_name_)) continue;
81441380d3be When an option was successfully read, just continue to next line.
zas_
parents: 640
diff changeset
676 #define READ_INT_CLAMP(_name_, _min_, _max_) if (read_int_option_clamp(f, option, #_name_, value, &options->_name_, _min_, _max_)) continue;
81441380d3be When an option was successfully read, just continue to next line.
zas_
parents: 640
diff changeset
677 #define READ_INT_UNIT(_name_, _unit_) if (read_int_unit_option(f, option, #_name_, value, &options->_name_, _unit_)) continue;
81441380d3be When an option was successfully read, just continue to next line.
zas_
parents: 640
diff changeset
678 #define READ_CHAR(_name_) if (read_char_option(f, option, #_name_, value_all, &options->_name_)) continue;
81441380d3be When an option was successfully read, just continue to next line.
zas_
parents: 640
diff changeset
679 #define READ_COLOR(_name_) if (read_color_option(f, option, #_name_, value, &options->_name_)) continue;
341
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
680
641
81441380d3be When an option was successfully read, just continue to next line.
zas_
parents: 640
diff changeset
681 #define COMPAT_READ_BOOL(_oldname_, _name_) if (read_bool_option(f, option, #_oldname_, value, &options->_name_)) continue;
81441380d3be When an option was successfully read, just continue to next line.
zas_
parents: 640
diff changeset
682 #define COMPAT_READ_INT(_oldname_, _name_) if (read_int_option(f, option, #_oldname_, value, &options->_name_)) continue;
81441380d3be When an option was successfully read, just continue to next line.
zas_
parents: 640
diff changeset
683 #define COMPAT_READ_UINT(_oldname_, _name_) if (read_uint_option(f, option, #_oldname_, value, &options->_name_)) continue;
81441380d3be When an option was successfully read, just continue to next line.
zas_
parents: 640
diff changeset
684 #define COMPAT_READ_INT_CLAMP(_oldname_, _name_, _min_, _max_) if (read_int_option_clamp(f, option, #_oldname_, value, &options->_name_, _min_, _max_)) continue;
81441380d3be When an option was successfully read, just continue to next line.
zas_
parents: 640
diff changeset
685 #define COMPAT_READ_INT_UNIT(_oldname_, _name_, _unit_) if (read_int_unit_option(f, option, #_oldname_, value, &options->_name_, _unit_)) continue;
81441380d3be When an option was successfully read, just continue to next line.
zas_
parents: 640
diff changeset
686 #define COMPAT_READ_CHAR(_oldname_, _name_) if (read_char_option(f, option, #_oldname_, value_all, &options->_name_)) continue;
81441380d3be When an option was successfully read, just continue to next line.
zas_
parents: 640
diff changeset
687 #define COMPAT_READ_COLOR(_oldname_, _name_) if (read_color_option(f, option, #_oldname_, value, &options->_name_)) continue;
472
3ad502287ff4 Add some macros to handle rc file compatibility issues related to
zas_
parents: 468
diff changeset
688
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
689 /* general options */
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
690 READ_BOOL(show_icon_names);
497
a33badd85f16 Allow the copy of file paths to clipboard.
zas_
parents: 491
diff changeset
691 READ_BOOL(show_copy_path);
341
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
692
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
693 READ_BOOL(tree_descend_subdirs);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
694 READ_BOOL(lazy_image_sync);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
695 READ_BOOL(update_on_time_change);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
696
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
697 READ_INT(duplicates_similarity_threshold);
341
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
698
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
699 READ_BOOL(progressive_key_scrolling);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
700
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
701 READ_BOOL(enable_metadata_dirs);
594
4cfce4ed35e0 Use a dedicated option to enable keywords and comment saving as XMP tags
zas_
parents: 586
diff changeset
702 READ_BOOL(save_metadata_in_image_file);
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
703
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
704 READ_BOOL(mousewheel_scrolls);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
705
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
706 READ_INT(open_recent_list_maxsize);
458
7a69309b91c8 Allow the user to set the drag'n drop icon size through
zas_
parents: 446
diff changeset
707 READ_INT(dnd_icon_size);
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
708 READ_BOOL(place_dialogs_under_mouse);
341
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
709
629
1fa2cb6d9d65 Rename options:
zas_
parents: 618
diff changeset
710 /* startup options */
1fa2cb6d9d65 Rename options:
zas_
parents: 618
diff changeset
711
1fa2cb6d9d65 Rename options:
zas_
parents: 618
diff changeset
712 COMPAT_READ_BOOL(startup_path_enable, startup.restore_path); /* 2008/05/11 */
1fa2cb6d9d65 Rename options:
zas_
parents: 618
diff changeset
713 READ_BOOL(startup.restore_path);
341
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
714
630
83d3ded39e49 An option to save and restore the last path used was added.
zas_
parents: 629
diff changeset
715 READ_BOOL(startup.use_last_path);
83d3ded39e49 An option to save and restore the last path used was added.
zas_
parents: 629
diff changeset
716
629
1fa2cb6d9d65 Rename options:
zas_
parents: 618
diff changeset
717 COMPAT_READ_CHAR(startup_path, startup.path); /* 2008/05/11 */
1fa2cb6d9d65 Rename options:
zas_
parents: 618
diff changeset
718 READ_CHAR(startup.path);
1fa2cb6d9d65 Rename options:
zas_
parents: 618
diff changeset
719
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
720 /* layout options */
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
721
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
722 READ_INT(layout.style);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
723 READ_CHAR(layout.order);
556
fe675761d091 Replace Layout icon_view field by more generic file_view_type.
zas_
parents: 537
diff changeset
724
fe675761d091 Replace Layout icon_view field by more generic file_view_type.
zas_
parents: 537
diff changeset
725 COMPAT_READ_UINT(layout.view_as_icons, layout.file_view_type); /* 2008/05/03 */
fe675761d091 Replace Layout icon_view field by more generic file_view_type.
zas_
parents: 537
diff changeset
726
380
5afe77bb563a Introduce a new struct ViewDir to handle directory views common
zas_
parents: 377
diff changeset
727 READ_UINT(layout.dir_view_type);
556
fe675761d091 Replace Layout icon_view field by more generic file_view_type.
zas_
parents: 537
diff changeset
728 READ_UINT(layout.file_view_type);
433
5ddcf93278c7 Save Show Marks state to rc file and display current state in menu.
zas_
parents: 413
diff changeset
729 READ_BOOL(layout.show_marks);
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
730 READ_BOOL(layout.show_thumbnails);
340
77103f3f2cb1 Rename option thumbnails.enabled to layout.show_thumbnails as it makes
zas_
parents: 339
diff changeset
731
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
732 /* window positions */
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
733
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
734 READ_BOOL(layout.save_window_positions);
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
735
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
736 READ_INT(layout.main_window.x);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
737 READ_INT(layout.main_window.y);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
738 READ_INT(layout.main_window.w);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
739 READ_INT(layout.main_window.h);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
740 READ_BOOL(layout.main_window.maximized);
764
ae618ebec3e9 Save properties window width and height to rc file and restore
zas_
parents: 743
diff changeset
741 READ_INT(layout.main_window.hdivider_pos);
ae618ebec3e9 Save properties window width and height to rc file and restore
zas_
parents: 743
diff changeset
742 READ_INT(layout.main_window.vdivider_pos);
ae618ebec3e9 Save properties window width and height to rc file and restore
zas_
parents: 743
diff changeset
743
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
744 READ_INT(layout.float_window.x);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
745 READ_INT(layout.float_window.y);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
746 READ_INT(layout.float_window.w);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
747 READ_INT(layout.float_window.h);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
748 READ_INT(layout.float_window.vdivider_pos);
764
ae618ebec3e9 Save properties window width and height to rc file and restore
zas_
parents: 743
diff changeset
749
ae618ebec3e9 Save properties window width and height to rc file and restore
zas_
parents: 743
diff changeset
750 READ_INT(layout.properties_window.w);
ae618ebec3e9 Save properties window width and height to rc file and restore
zas_
parents: 743
diff changeset
751 READ_INT(layout.properties_window.h);
ae618ebec3e9 Save properties window width and height to rc file and restore
zas_
parents: 743
diff changeset
752
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
753 READ_BOOL(layout.tools_float);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
754 READ_BOOL(layout.tools_hidden);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
755 READ_BOOL(layout.tools_restore_state);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
756 READ_BOOL(layout.toolbar_hidden);
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
757
489
3809ffa3567b Save state and width of exif, info and sort panels to rc file.
zas_
parents: 475
diff changeset
758 /* panels */
3809ffa3567b Save state and width of exif, info and sort panels to rc file.
zas_
parents: 475
diff changeset
759 READ_BOOL(panels.exif.enabled);
3809ffa3567b Save state and width of exif, info and sort panels to rc file.
zas_
parents: 475
diff changeset
760 READ_INT_CLAMP(panels.exif.width, PANEL_MIN_WIDTH, PANEL_MAX_WIDTH);
3809ffa3567b Save state and width of exif, info and sort panels to rc file.
zas_
parents: 475
diff changeset
761 READ_BOOL(panels.info.enabled);
3809ffa3567b Save state and width of exif, info and sort panels to rc file.
zas_
parents: 475
diff changeset
762 READ_INT_CLAMP(panels.info.width, PANEL_MIN_WIDTH, PANEL_MAX_WIDTH);
3809ffa3567b Save state and width of exif, info and sort panels to rc file.
zas_
parents: 475
diff changeset
763 READ_BOOL(panels.sort.enabled);
491
4a9570cd06f8 Save sort manager state to rc file.
zas_
parents: 489
diff changeset
764 READ_INT(panels.sort.action_state);
4a9570cd06f8 Save sort manager state to rc file.
zas_
parents: 489
diff changeset
765 READ_INT(panels.sort.mode_state);
4a9570cd06f8 Save sort manager state to rc file.
zas_
parents: 489
diff changeset
766 READ_INT(panels.sort.selection_state);
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
767
684
9f00d0d874fa Save order of Properties dialog tabs to rc file.
zas_
parents: 641
diff changeset
768 /* properties dialog options */
9f00d0d874fa Save order of Properties dialog tabs to rc file.
zas_
parents: 641
diff changeset
769 READ_CHAR(properties.tabs_order);
9f00d0d874fa Save order of Properties dialog tabs to rc file.
zas_
parents: 641
diff changeset
770
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
771 /* image options */
604
0b203af63dbf Use g_ascii_strcasecmp() instead of strcasecmp() where ascii-only strings
zas_
parents: 594
diff changeset
772 if (g_ascii_strcasecmp(option, "image.zoom_mode") == 0)
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
773 {
604
0b203af63dbf Use g_ascii_strcasecmp() instead of strcasecmp() where ascii-only strings
zas_
parents: 594
diff changeset
774 if (g_ascii_strcasecmp(value, "original") == 0)
377
9efefd85684a Cleanup read/write of image.zoom_mode option.
zas_
parents: 376
diff changeset
775 options->image.zoom_mode = ZOOM_RESET_ORIGINAL;
604
0b203af63dbf Use g_ascii_strcasecmp() instead of strcasecmp() where ascii-only strings
zas_
parents: 594
diff changeset
776 else if (g_ascii_strcasecmp(value, "fit") == 0)
377
9efefd85684a Cleanup read/write of image.zoom_mode option.
zas_
parents: 376
diff changeset
777 options->image.zoom_mode = ZOOM_RESET_FIT_WINDOW;
604
0b203af63dbf Use g_ascii_strcasecmp() instead of strcasecmp() where ascii-only strings
zas_
parents: 594
diff changeset
778 else if (g_ascii_strcasecmp(value, "dont_change") == 0)
377
9efefd85684a Cleanup read/write of image.zoom_mode option.
zas_
parents: 376
diff changeset
779 options->image.zoom_mode = ZOOM_RESET_NONE;
641
81441380d3be When an option was successfully read, just continue to next line.
zas_
parents: 640
diff changeset
780 continue;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
781 }
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
782 READ_BOOL(image.zoom_2pass);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
783 READ_BOOL(image.zoom_to_fit_allow_expand);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
784 READ_BOOL(image.fit_window_to_image);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
785 READ_BOOL(image.limit_window_size);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
786 READ_INT(image.max_window_size);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
787 READ_BOOL(image.limit_autofit_size);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
788 READ_INT(image.max_autofit_size);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
789 READ_INT(image.scroll_reset_method);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
790 READ_INT(image.tile_cache_max);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
791 READ_INT_CLAMP(image.zoom_quality, GDK_INTERP_NEAREST, GDK_INTERP_HYPER);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
792 READ_INT_CLAMP(image.dither_quality, GDK_RGB_DITHER_NONE, GDK_RGB_DITHER_MAX);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
793 READ_INT(image.zoom_increment);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
794 READ_BOOL(image.enable_read_ahead);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
795 READ_BOOL(image.exif_rotate_enable);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
796 READ_BOOL(image.use_custom_border_color);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
797 READ_COLOR(image.border_color);
413
9e521adbf312 Add two new options to control image read buffer at runtime.
zas_
parents: 403
diff changeset
798 READ_INT_CLAMP(image.read_buffer_size, IMAGE_LOADER_READ_BUFFER_SIZE_MIN, IMAGE_LOADER_READ_BUFFER_SIZE_MAX);
9e521adbf312 Add two new options to control image read buffer at runtime.
zas_
parents: 403
diff changeset
799 READ_INT_CLAMP(image.idle_read_loop_count, IMAGE_LOADER_IDLE_READ_LOOP_COUNT_MIN, IMAGE_LOADER_IDLE_READ_LOOP_COUNT_MAX);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
800
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
801
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
802 /* thumbnails options */
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
803 READ_INT_CLAMP(thumbnails.max_width, 16, 512);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
804 READ_INT_CLAMP(thumbnails.max_height, 16, 512);
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
805
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
806 READ_BOOL(thumbnails.enable_caching);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
807 READ_BOOL(thumbnails.cache_into_dirs);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
808 READ_BOOL(thumbnails.fast);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
809 READ_BOOL(thumbnails.use_xvpics);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
810 READ_BOOL(thumbnails.spec_standard);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
811 READ_INT_CLAMP(thumbnails.quality, GDK_INTERP_NEAREST, GDK_INTERP_HYPER);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
812
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
813 /* file sorting options */
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
814 READ_UINT(file_sort.method);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
815 READ_BOOL(file_sort.ascending);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
816 READ_BOOL(file_sort.case_sensitive);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
817
341
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
818 /* file operations options */
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
819 READ_BOOL(file_ops.enable_in_place_rename);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
820 READ_BOOL(file_ops.confirm_delete);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
821 READ_BOOL(file_ops.enable_delete_key);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
822 READ_BOOL(file_ops.safe_delete_enable);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
823 READ_CHAR(file_ops.safe_delete_path);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
824 READ_INT(file_ops.safe_delete_folder_maxsize);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
825
341
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
826 /* fullscreen options */
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
827 READ_INT(fullscreen.screen);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
828 READ_BOOL(fullscreen.clean_flip);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
829 READ_BOOL(fullscreen.disable_saver);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
830 READ_BOOL(fullscreen.above);
468
2df505c60459 Replace fullscreen.info and fullscreen.show_info options by:
zas_
parents: 458
diff changeset
831
612
21864cc96369 Preserve last histogram modes.
zas_
parents: 605
diff changeset
832 /* histogram */
21864cc96369 Preserve last histogram modes.
zas_
parents: 605
diff changeset
833 READ_UINT(histogram.last_channel_mode);
21864cc96369 Preserve last histogram modes.
zas_
parents: 605
diff changeset
834 READ_UINT(histogram.last_log_mode);
21864cc96369 Preserve last histogram modes.
zas_
parents: 605
diff changeset
835
468
2df505c60459 Replace fullscreen.info and fullscreen.show_info options by:
zas_
parents: 458
diff changeset
836 /* image overlay */
638
8cc9f349c670 Rename option image_overlay.common.enabled to image_overlay.common.state
zas_
parents: 630
diff changeset
837 COMPAT_READ_UINT(image_overlay.common.enabled, image_overlay.common.state); /* 2008-05-12 */
8cc9f349c670 Rename option image_overlay.common.enabled to image_overlay.common.state
zas_
parents: 630
diff changeset
838 READ_UINT(image_overlay.common.state);
8cc9f349c670 Rename option image_overlay.common.enabled to image_overlay.common.state
zas_
parents: 630
diff changeset
839 COMPAT_READ_BOOL(fullscreen.show_info, image_overlay.common.show_at_startup); /* 2008-04-21 */
468
2df505c60459 Replace fullscreen.info and fullscreen.show_info options by:
zas_
parents: 458
diff changeset
840 READ_BOOL(image_overlay.common.show_at_startup);
638
8cc9f349c670 Rename option image_overlay.common.enabled to image_overlay.common.state
zas_
parents: 630
diff changeset
841 COMPAT_READ_CHAR(fullscreen.info, image_overlay.common.template_string); /* 2008-04-21 */
468
2df505c60459 Replace fullscreen.info and fullscreen.show_info options by:
zas_
parents: 458
diff changeset
842 READ_CHAR(image_overlay.common.template_string);
638
8cc9f349c670 Rename option image_overlay.common.enabled to image_overlay.common.state
zas_
parents: 630
diff changeset
843
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
844 /* slideshow options */
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
845 READ_INT_UNIT(slideshow.delay, SLIDESHOW_SUBSECOND_PRECISION);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
846 READ_BOOL(slideshow.random);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
847 READ_BOOL(slideshow.repeat);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
848
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
849 /* collection options */
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
850
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
851 READ_BOOL(collections.rectangular_selection);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
852
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
853 /* filtering options */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
854
356
673d1eb5af73 Rename show_dot_files to show_hidden_files.
zas_
parents: 353
diff changeset
855 READ_BOOL(file_filter.show_hidden_files);
373
61a3c8b05b24 Add a new option in Preferences > Filtering to allow the
zas_
parents: 372
diff changeset
856 READ_BOOL(file_filter.show_dot_directory);
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
857 READ_BOOL(file_filter.disable);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
858
604
0b203af63dbf Use g_ascii_strcasecmp() instead of strcasecmp() where ascii-only strings
zas_
parents: 594
diff changeset
859 if (g_ascii_strcasecmp(option, "file_filter.ext") == 0)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
860 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
861 filter_parse(value_all);
641
81441380d3be When an option was successfully read, just continue to next line.
zas_
parents: 640
diff changeset
862 continue;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
863 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
864
604
0b203af63dbf Use g_ascii_strcasecmp() instead of strcasecmp() where ascii-only strings
zas_
parents: 594
diff changeset
865 if (g_ascii_strcasecmp(option, "sidecar.ext") == 0)
145
8be2cc687304 fixed grouping sidecar files and made it configurable via config file
nadvornik
parents: 113
diff changeset
866 {
170
9a56e3d13e67 basic sidecar files configuration via preferences dialog
nadvornik
parents: 145
diff changeset
867 sidecar_ext_parse(value_all, TRUE);
641
81441380d3be When an option was successfully read, just continue to next line.
zas_
parents: 640
diff changeset
868 continue;
145
8be2cc687304 fixed grouping sidecar files and made it configurable via config file
nadvornik
parents: 113
diff changeset
869 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
870
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
871 /* Color Profiles */
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
872
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
873 READ_BOOL(color_profile.enabled);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
874 READ_BOOL(color_profile.use_image);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
875 READ_INT(color_profile.input_type);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
876
729
9a6a7e95467a Make stricter match for option's names consisting of a prefix and a number.
zas_
parents: 715
diff changeset
877 if (is_numbered_option(option, "color_profile.input_file_", &i))
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
878 {
729
9a6a7e95467a Make stricter match for option's names consisting of a prefix and a number.
zas_
parents: 715
diff changeset
879 if (i > 0 && i <= COLOR_PROFILE_INPUTS)
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
880 {
729
9a6a7e95467a Make stricter match for option's names consisting of a prefix and a number.
zas_
parents: 715
diff changeset
881 i--;
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
882 read_char_option(f, option, option, value, &options->color_profile.input_file[i]);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
883 }
641
81441380d3be When an option was successfully read, just continue to next line.
zas_
parents: 640
diff changeset
884 continue;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
885 }
729
9a6a7e95467a Make stricter match for option's names consisting of a prefix and a number.
zas_
parents: 715
diff changeset
886
9a6a7e95467a Make stricter match for option's names consisting of a prefix and a number.
zas_
parents: 715
diff changeset
887 if (is_numbered_option(option, "color_profile.input_name_", &i))
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
888 {
729
9a6a7e95467a Make stricter match for option's names consisting of a prefix and a number.
zas_
parents: 715
diff changeset
889 if (i > 0 && i <= COLOR_PROFILE_INPUTS)
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
890 {
729
9a6a7e95467a Make stricter match for option's names consisting of a prefix and a number.
zas_
parents: 715
diff changeset
891 i--;
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
892 read_char_option(f, option, option, value, &options->color_profile.input_name[i]);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
893 }
641
81441380d3be When an option was successfully read, just continue to next line.
zas_
parents: 640
diff changeset
894 continue;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
895 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
896
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
897 READ_INT(color_profile.screen_type);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
898 READ_CHAR(color_profile.screen_file);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
899
737
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 730
diff changeset
900 /* Shell command */
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 730
diff changeset
901 READ_CHAR(shell.path);
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 730
diff changeset
902 READ_CHAR(shell.options);
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 730
diff changeset
903
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
904 /* External Programs */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
905
729
9a6a7e95467a Make stricter match for option's names consisting of a prefix and a number.
zas_
parents: 715
diff changeset
906 if (is_numbered_option(option, "external_", &i))
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
907 {
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
908 if (i > 0 && i <= GQ_EDITOR_SLOTS)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
909 {
217
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
910 const gchar *ptr;
768
ff51413f098d Use functions to set editors name and command and ensure they are
zas_
parents: 764
diff changeset
911
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
912 i--;
768
ff51413f098d Use functions to set editors name and command and ensure they are
zas_
parents: 764
diff changeset
913 editor_set_name(i, quoted_value(value_all, &ptr));
ff51413f098d Use functions to set editors name and command and ensure they are
zas_
parents: 764
diff changeset
914 editor_set_command(i, quoted_value(ptr, NULL));
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
915 }
641
81441380d3be When an option was successfully read, just continue to next line.
zas_
parents: 640
diff changeset
916 continue;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
917 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
918
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
919 /* Exif */
605
651ae2be1031 Use g_ascii_strncasecmp() instead of strncasecmp() where applicable.
zas_
parents: 604
diff changeset
920 if (0 == g_ascii_strncasecmp(option, "exif.display.", 13))
222
77f1bcc6c161 various exif improvements based on patch by Uwe Ohse
nadvornik
parents: 218
diff changeset
921 {
77f1bcc6c161 various exif improvements based on patch by Uwe Ohse
nadvornik
parents: 218
diff changeset
922 for (i = 0; ExifUIList[i].key; i++)
604
0b203af63dbf Use g_ascii_strcasecmp() instead of strcasecmp() where ascii-only strings
zas_
parents: 594
diff changeset
923 if (0 == g_ascii_strcasecmp(option + 13, ExifUIList[i].key))
222
77f1bcc6c161 various exif improvements based on patch by Uwe Ohse
nadvornik
parents: 218
diff changeset
924 ExifUIList[i].current = strtol(value, NULL, 10);
641
81441380d3be When an option was successfully read, just continue to next line.
zas_
parents: 640
diff changeset
925 continue;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
926 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
927 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
928
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
929 fclose(f);
738
ff8b802eac58 Separate path building code from options loading code.
zas_
parents: 737
diff changeset
930 return TRUE;
ff8b802eac58 Separate path building code from options loading code.
zas_
parents: 737
diff changeset
931 }
ff8b802eac58 Separate path building code from options loading code.
zas_
parents: 737
diff changeset
932
742
a336b5545af6 Pass ConfOptions * to save_options() and load_options().
zas_
parents: 741
diff changeset
933 void load_options(ConfOptions *options)
738
ff8b802eac58 Separate path building code from options loading code.
zas_
parents: 737
diff changeset
934 {
743
77ff94c0490a Try to load a system-wide rc file if any, before per-user rc file.
zas_
parents: 742
diff changeset
935 gboolean success;
738
ff8b802eac58 Separate path building code from options loading code.
zas_
parents: 737
diff changeset
936 gchar *rc_path;
ff8b802eac58 Separate path building code from options loading code.
zas_
parents: 737
diff changeset
937
743
77ff94c0490a Try to load a system-wide rc file if any, before per-user rc file.
zas_
parents: 742
diff changeset
938 if (isdir(GQ_SYSTEM_WIDE_DIR))
77ff94c0490a Try to load a system-wide rc file if any, before per-user rc file.
zas_
parents: 742
diff changeset
939 {
77ff94c0490a Try to load a system-wide rc file if any, before per-user rc file.
zas_
parents: 742
diff changeset
940 rc_path = g_build_filename(GQ_SYSTEM_WIDE_DIR, RC_FILE_NAME, NULL);
77ff94c0490a Try to load a system-wide rc file if any, before per-user rc file.
zas_
parents: 742
diff changeset
941 success = load_options_from(rc_path, options);
77ff94c0490a Try to load a system-wide rc file if any, before per-user rc file.
zas_
parents: 742
diff changeset
942 DEBUG_1("Loading options from %s ... %s", rc_path, success ? "done" : "failed");
77ff94c0490a Try to load a system-wide rc file if any, before per-user rc file.
zas_
parents: 742
diff changeset
943 g_free(rc_path);
77ff94c0490a Try to load a system-wide rc file if any, before per-user rc file.
zas_
parents: 742
diff changeset
944 }
77ff94c0490a Try to load a system-wide rc file if any, before per-user rc file.
zas_
parents: 742
diff changeset
945
738
ff8b802eac58 Separate path building code from options loading code.
zas_
parents: 737
diff changeset
946 rc_path = g_build_filename(homedir(), GQ_RC_DIR, RC_FILE_NAME, NULL);
743
77ff94c0490a Try to load a system-wide rc file if any, before per-user rc file.
zas_
parents: 742
diff changeset
947 success = load_options_from(rc_path, options);
77ff94c0490a Try to load a system-wide rc file if any, before per-user rc file.
zas_
parents: 742
diff changeset
948 DEBUG_1("Loading options from %s ... %s", rc_path, success ? "done" : "failed");
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
949 g_free(rc_path);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
950 }