annotate src/rcfile.c @ 1692:bb964a9d9bb8

fixed possible crash in exif_item_get_integer
author nadvornik
date Tue, 18 Aug 2009 20:19:23 +0000
parents ece97f3f2305
children
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
1284
8b89e3ff286b Add year 2009 to copyright info everywhere.
zas_
parents: 1272
diff changeset
4 * Copyright (C) 2008 - 2009 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
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
19 #include "bar.h"
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
20 #include "bar_comment.h"
307
667e49f52168 Move secure save code to its own files: secure_save.{c,h}.
zas_
parents: 288
diff changeset
21 #include "bar_exif.h"
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
22 #include "bar_histogram.h"
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
23 #include "bar_keywords.h"
1320
055ed09d5a03 improved bar_sort configuration
nadvornik
parents: 1317
diff changeset
24 #include "bar_sort.h"
768
ff51413f098d Use functions to set editors name and command and ensure they are
zas_
parents: 764
diff changeset
25 #include "editors.h"
586
905688aa2317 split filelist.c to filefilter.c and filedata.c
nadvornik
parents: 556
diff changeset
26 #include "filefilter.h"
1023
650c02c0c8ff Move quoted_value() and escquote_value() to misc.[ch].
zas_
parents: 1019
diff changeset
27 #include "misc.h"
858
171dd6e53656 Use stricter types for image options.
zas_
parents: 848
diff changeset
28 #include "pixbuf-renderer.h"
307
667e49f52168 Move secure save code to its own files: secure_save.{c,h}.
zas_
parents: 288
diff changeset
29 #include "secure_save.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
30 #include "slideshow.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
31 #include "ui_fileops.h"
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
32 #include "layout.h"
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
33 #include "layout_util.h"
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
34 #include "bar.h"
1404
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
35 #include "metadata.h"
1602
6bfe8fc7a403 added GPS map support - patch by Colin Clark
nadvornik
parents: 1592
diff changeset
36 #include "bar_gps.h"
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
37
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
38
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
39 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
40 *-----------------------------------------------------------------------------
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
41 * line write/parse routines (public)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
42 *-----------------------------------------------------------------------------
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
43 */
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
44
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
45 void write_indent(GString *str, gint indent)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
46 {
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
47 g_string_append_printf(str, "\n%*s", indent * 4, "");
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
48 }
210
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
49
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
50 void write_char_option(GString *str, gint indent, const gchar *label, const gchar *text)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
51 {
1325
b93b39fb30c9 correctly save and restore overlay string
nadvornik
parents: 1321
diff changeset
52 /* this is needed for overlay string, because g_markup_escape_text does not handle \n and such,
b93b39fb30c9 correctly save and restore overlay string
nadvornik
parents: 1321
diff changeset
53 ideas for improvement are welcome
b93b39fb30c9 correctly save and restore overlay string
nadvornik
parents: 1321
diff changeset
54 */
b93b39fb30c9 correctly save and restore overlay string
nadvornik
parents: 1321
diff changeset
55 static const unsigned char no_quote_utf[] = {
b93b39fb30c9 correctly save and restore overlay string
nadvornik
parents: 1321
diff changeset
56 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b,
b93b39fb30c9 correctly save and restore overlay string
nadvornik
parents: 1321
diff changeset
57 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
b93b39fb30c9 correctly save and restore overlay string
nadvornik
parents: 1321
diff changeset
58 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3,
b93b39fb30c9 correctly save and restore overlay string
nadvornik
parents: 1321
diff changeset
59 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
b93b39fb30c9 correctly save and restore overlay string
nadvornik
parents: 1321
diff changeset
60 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb,
b93b39fb30c9 correctly save and restore overlay string
nadvornik
parents: 1321
diff changeset
61 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
b93b39fb30c9 correctly save and restore overlay string
nadvornik
parents: 1321
diff changeset
62 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3,
b93b39fb30c9 correctly save and restore overlay string
nadvornik
parents: 1321
diff changeset
63 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
b93b39fb30c9 correctly save and restore overlay string
nadvornik
parents: 1321
diff changeset
64 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb,
b93b39fb30c9 correctly save and restore overlay string
nadvornik
parents: 1321
diff changeset
65 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
b93b39fb30c9 correctly save and restore overlay string
nadvornik
parents: 1321
diff changeset
66 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
b93b39fb30c9 correctly save and restore overlay string
nadvornik
parents: 1321
diff changeset
67 '"', 0 /* '"' is handled in g_markup_escape_text */
b93b39fb30c9 correctly save and restore overlay string
nadvornik
parents: 1321
diff changeset
68 };
b93b39fb30c9 correctly save and restore overlay string
nadvornik
parents: 1321
diff changeset
69
1326
2b78c7198fbf Silent a minor warning.
zas_
parents: 1325
diff changeset
70 gchar *escval1 = g_strescape(text ? text : "", (gchar *) no_quote_utf);
1325
b93b39fb30c9 correctly save and restore overlay string
nadvornik
parents: 1321
diff changeset
71 gchar *escval2 = g_markup_escape_text(escval1, -1);
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
72 g_string_append_printf(str, "%s = \"%s\" ", label, escval2);
1325
b93b39fb30c9 correctly save and restore overlay string
nadvornik
parents: 1321
diff changeset
73 g_free(escval2);
b93b39fb30c9 correctly save and restore overlay string
nadvornik
parents: 1321
diff changeset
74 g_free(escval1);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
75 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
76
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
77 gboolean read_char_option(const gchar *option, const gchar *label, const gchar *value, gchar **text)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
78 {
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
79 if (g_ascii_strcasecmp(option, label) != 0) return FALSE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
80 if (!text) return FALSE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
81
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
82 g_free(*text);
1325
b93b39fb30c9 correctly save and restore overlay string
nadvornik
parents: 1321
diff changeset
83 *text = g_strcompress(value);
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
84 return TRUE;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
85 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
86
267
a9adf9e1a746 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
zas_
parents: 250
diff changeset
87 /* 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
88 * here is an equivalent stub function. */
a9adf9e1a746 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
zas_
parents: 250
diff changeset
89 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
90 {
a9adf9e1a746 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
zas_
parents: 250
diff changeset
91 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
92 }
a9adf9e1a746 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
zas_
parents: 250
diff changeset
93
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
94 void write_color_option(GString *str, gint indent, gchar *label, GdkColor *color)
208
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
95 {
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
96 if (color)
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
97 {
267
a9adf9e1a746 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
zas_
parents: 250
diff changeset
98 gchar *colorstring = color_to_string(color);
208
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
99
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
100 write_char_option(str, indent, label, colorstring);
208
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
101 g_free(colorstring);
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
102 }
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
103 else
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
104 write_char_option(str, indent, label, "");
208
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
105 }
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
106
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
107 gboolean read_color_option(const gchar *option, const gchar *label, const gchar *value, GdkColor *color)
208
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
108 {
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
109 if (g_ascii_strcasecmp(option, label) != 0) return FALSE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
110 if (!color) return FALSE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
111
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
112 if (!*value) return FALSE;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
113 gdk_color_parse(value, color);
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
114 return TRUE;
208
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
115 }
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
116
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
117 void write_int_option(GString *str, gint indent, const gchar *label, gint n)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
118 {
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
119 g_string_append_printf(str, "%s = \"%d\" ", label, n);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
120 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
121
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
122 gboolean read_int_option(const gchar *option, const gchar *label, const gchar *value, gint *n)
995
6ca2c5fd7b13 Whitespaces cleanup.
zas_
parents: 980
diff changeset
123 {
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
124 if (g_ascii_strcasecmp(option, label) != 0) return FALSE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
125 if (!n) return FALSE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
126
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
127 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
128 {
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
129 *n = strtol(value, NULL, 10);
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
130 }
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
131 else
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
132 {
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
133 if (g_ascii_strcasecmp(value, "true") == 0)
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
134 *n = 1;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
135 else
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
136 *n = 0;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
137 }
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
138
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
139 return TRUE;
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
140 }
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
141
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
142 void write_uint_option(GString *str, gint indent, const gchar *label, guint n)
380
5afe77bb563a Introduce a new struct ViewDir to handle directory views common
zas_
parents: 377
diff changeset
143 {
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
144 g_string_append_printf(str, "%s = \"%u\" ", label, n);
380
5afe77bb563a Introduce a new struct ViewDir to handle directory views common
zas_
parents: 377
diff changeset
145 }
5afe77bb563a Introduce a new struct ViewDir to handle directory views common
zas_
parents: 377
diff changeset
146
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
147 gboolean read_uint_option(const gchar *option, const gchar *label, const gchar *value, guint *n)
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
148 {
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
149 if (g_ascii_strcasecmp(option, label) != 0) return FALSE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
150 if (!n) return FALSE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
151
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
152 if (g_ascii_isdigit(value[0]))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
153 {
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
154 *n = strtoul(value, NULL, 10);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
155 }
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
156 else
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
157 {
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
158 if (g_ascii_strcasecmp(value, "true") == 0)
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
159 *n = 1;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
160 else
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
161 *n = 0;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
162 }
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
163
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
164 return TRUE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
165 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
166
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
167 gboolean read_uint_option_clamp(const gchar *option, const gchar *label, const gchar *value, guint *n, guint min, guint max)
858
171dd6e53656 Use stricter types for image options.
zas_
parents: 848
diff changeset
168 {
171dd6e53656 Use stricter types for image options.
zas_
parents: 848
diff changeset
169 gboolean ret;
171dd6e53656 Use stricter types for image options.
zas_
parents: 848
diff changeset
170
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
171 ret = read_uint_option(option, label, value, n);
858
171dd6e53656 Use stricter types for image options.
zas_
parents: 848
diff changeset
172 if (ret) *n = CLAMP(*n, min, max);
171dd6e53656 Use stricter types for image options.
zas_
parents: 848
diff changeset
173
171dd6e53656 Use stricter types for image options.
zas_
parents: 848
diff changeset
174 return ret;
171dd6e53656 Use stricter types for image options.
zas_
parents: 848
diff changeset
175 }
171dd6e53656 Use stricter types for image options.
zas_
parents: 848
diff changeset
176
171dd6e53656 Use stricter types for image options.
zas_
parents: 848
diff changeset
177
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
178 gboolean read_int_option_clamp(const gchar *option, const gchar *label, const 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
179 {
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
180 gboolean ret;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
181
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
182 ret = read_int_option(option, label, value, n);
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
183 if (ret) *n = CLAMP(*n, min, max);
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
184
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
185 return ret;
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
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
188 void write_int_unit_option(GString *str, gint indent, gchar *label, gint n, gint subunits)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
189 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
190 gint l, r;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
191
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
192 if (subunits > 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
193 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
194 l = n / subunits;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
195 r = n % subunits;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
196 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
197 else
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
198 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
199 l = n;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
200 r = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
201 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
202
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
203 g_string_append_printf(str, "%s = \"%d.%d\" ", label, l, r);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
204 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
205
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
206 gboolean read_int_unit_option(const gchar *option, const gchar *label, const gchar *value, gint *n, gint subunits)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
207 {
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
208 gint l, r;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
209 gchar *ptr, *buf;
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
210
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
211 if (g_ascii_strcasecmp(option, label) != 0) return FALSE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
212 if (!n) return FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
213
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
214 buf = g_strdup(value);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
215 ptr = buf;
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
216 while (*ptr != '\0' && *ptr != '.') ptr++;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
217 if (*ptr == '.')
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
218 {
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
219 *ptr = '\0';
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
220 l = strtol(value, NULL, 10);
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
221 *ptr = '.';
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
222 ptr++;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
223 r = strtol(ptr, NULL, 10);
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
224 }
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
225 else
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
226 {
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
227 l = strtol(value, NULL, 10);
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
228 r = 0;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
229 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
230
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
231 *n = l * subunits + r;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
232 g_free(buf);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
233
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
234 return TRUE;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
235 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
236
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
237 void write_bool_option(GString *str, gint indent, gchar *label, gint n)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
238 {
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
239 g_string_append_printf(str, "%s = \"%s\" ", label, n ? "true" : "false");
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
240 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
241
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
242 gboolean read_bool_option(const gchar *option, const gchar *label, const gchar *value, gint *n)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
243 {
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
244 if (g_ascii_strcasecmp(option, label) != 0) return FALSE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
245 if (!n) return FALSE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
246
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
247 if (g_ascii_strcasecmp(value, "true") == 0 || atoi(value) != 0)
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
248 *n = TRUE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
249 else
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
250 *n = FALSE;
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
251
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
252 return TRUE;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
253 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
254
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
255 /*
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
256 *-----------------------------------------------------------------------------
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
257 * write fuctions for elements (private)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
258 *-----------------------------------------------------------------------------
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
259 */
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
260
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
261 static void write_global_attributes(GString *outstr, gint indent)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
262 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
263 // WRITE_SUBTITLE("General Options");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
264
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
265 WRITE_NL(); WRITE_BOOL(*options, show_icon_names);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
266 WRITE_SEPARATOR();
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
267
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
268 WRITE_NL(); WRITE_BOOL(*options, tree_descend_subdirs);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
269 WRITE_NL(); WRITE_BOOL(*options, lazy_image_sync);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
270 WRITE_NL(); WRITE_BOOL(*options, update_on_time_change);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
271 WRITE_SEPARATOR();
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
272
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
273 WRITE_NL(); WRITE_BOOL(*options, progressive_key_scrolling);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
274
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
275 WRITE_NL(); WRITE_UINT(*options, duplicates_similarity_threshold);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
276 WRITE_SEPARATOR();
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
277
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
278 WRITE_NL(); WRITE_BOOL(*options, mousewheel_scrolls);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
279 WRITE_NL(); WRITE_INT(*options, open_recent_list_maxsize);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
280 WRITE_NL(); WRITE_INT(*options, dnd_icon_size);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
281 WRITE_NL(); WRITE_BOOL(*options, place_dialogs_under_mouse);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
282
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
283 WRITE_NL(); WRITE_BOOL(*options, save_window_positions);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
284 WRITE_NL(); WRITE_BOOL(*options, tools_restore_state);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
285
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
286 // WRITE_SUBTITLE("File operations Options");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
287
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
288 WRITE_NL(); WRITE_BOOL(*options, file_ops.enable_in_place_rename);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
289 WRITE_NL(); WRITE_BOOL(*options, file_ops.confirm_delete);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
290 WRITE_NL(); WRITE_BOOL(*options, file_ops.enable_delete_key);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
291 WRITE_NL(); WRITE_BOOL(*options, file_ops.safe_delete_enable);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
292 WRITE_NL(); WRITE_CHAR(*options, file_ops.safe_delete_path);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
293 WRITE_NL(); WRITE_INT(*options, file_ops.safe_delete_folder_maxsize);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
294
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
295
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
296
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
297
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
298 // WRITE_SUBTITLE("Properties dialog Options");
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
299 WRITE_NL(); WRITE_CHAR(*options, properties.tabs_order);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
300
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
301 // WRITE_SUBTITLE("Image Options");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
302
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
303 WRITE_NL(); WRITE_UINT(*options, image.zoom_mode);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
304
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
305 // g_string_append_printf(outstr, "# image.zoom_mode possible values are:\n"
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
306 // "# original\n"
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
307 // "# fit\n"
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
308 // "# dont_change\n");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
309 // g_string_append_printf(outstr, "image.zoom_mode: ");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
310 // switch (options->image.zoom_mode)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
311 // {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
312 // case ZOOM_RESET_ORIGINAL: g_string_append_printf(outstr, "original\n"); break;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
313 // case ZOOM_RESET_FIT_WINDOW: g_string_append_printf(outstr, "fit\n"); break;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
314 // case ZOOM_RESET_NONE: g_string_append_printf(outstr, "dont_change\n"); break;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
315 // }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
316 WRITE_SEPARATOR();
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
317 WRITE_NL(); WRITE_BOOL(*options, image.zoom_2pass);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
318 WRITE_NL(); WRITE_BOOL(*options, image.zoom_to_fit_allow_expand);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
319 WRITE_NL(); WRITE_UINT(*options, image.zoom_quality);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
320 WRITE_NL(); WRITE_INT(*options, image.zoom_increment);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
321 WRITE_NL(); WRITE_BOOL(*options, image.fit_window_to_image);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
322 WRITE_NL(); WRITE_BOOL(*options, image.limit_window_size);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
323 WRITE_NL(); WRITE_INT(*options, image.max_window_size);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
324 WRITE_NL(); WRITE_BOOL(*options, image.limit_autofit_size);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
325 WRITE_NL(); WRITE_INT(*options, image.max_autofit_size);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
326 WRITE_NL(); WRITE_UINT(*options, image.scroll_reset_method);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
327 WRITE_NL(); WRITE_INT(*options, image.tile_cache_max);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
328 WRITE_NL(); WRITE_INT(*options, image.image_cache_max);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
329 WRITE_NL(); WRITE_UINT(*options, image.dither_quality);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
330 WRITE_NL(); WRITE_BOOL(*options, image.enable_read_ahead);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
331 WRITE_NL(); WRITE_BOOL(*options, image.exif_rotate_enable);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
332 WRITE_NL(); WRITE_BOOL(*options, image.use_custom_border_color);
1639
56115e934133 the options for custom border color were made independent
nadvornik
parents: 1622
diff changeset
333 WRITE_NL(); WRITE_BOOL(*options, image.use_custom_border_color_in_fullscreen);
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
334 WRITE_NL(); WRITE_COLOR(*options, image.border_color);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
335
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
336 // WRITE_SUBTITLE("Thumbnails Options");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
337
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
338 WRITE_NL(); WRITE_INT(*options, thumbnails.max_width);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
339 WRITE_NL(); WRITE_INT(*options, thumbnails.max_height);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
340 WRITE_NL(); WRITE_BOOL(*options, thumbnails.enable_caching);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
341 WRITE_NL(); WRITE_BOOL(*options, thumbnails.cache_into_dirs);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
342 WRITE_NL(); WRITE_BOOL(*options, thumbnails.use_xvpics);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
343 WRITE_NL(); WRITE_BOOL(*options, thumbnails.spec_standard);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
344 WRITE_NL(); WRITE_UINT(*options, thumbnails.quality);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
345 WRITE_NL(); WRITE_BOOL(*options, thumbnails.use_exif);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
346
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
347
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
348 // WRITE_SUBTITLE("File sorting Options");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
349
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
350 WRITE_NL(); WRITE_INT(*options, file_sort.method);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
351 WRITE_NL(); WRITE_BOOL(*options, file_sort.ascending);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
352 WRITE_NL(); WRITE_BOOL(*options, file_sort.case_sensitive);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
353
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
354
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
355 // WRITE_SUBTITLE("Fullscreen Options");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
356
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
357 WRITE_NL(); WRITE_INT(*options, fullscreen.screen);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
358 WRITE_NL(); WRITE_BOOL(*options, fullscreen.clean_flip);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
359 WRITE_NL(); WRITE_BOOL(*options, fullscreen.disable_saver);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
360 WRITE_NL(); WRITE_BOOL(*options, fullscreen.above);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
361
1336
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1335
diff changeset
362 WRITE_SEPARATOR();
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
363
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
364 // WRITE_SUBTITLE("Image Overlay Options");
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
365 WRITE_NL(); WRITE_CHAR(*options, image_overlay.template_string);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
366
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
367 // g_string_append_printf(outstr, "# these are relative positions:\n");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
368 // g_string_append_printf(outstr, "# x >= 0: |x| pixels from left border\n");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
369 // g_string_append_printf(outstr, "# x < 0 : |x| pixels from right border\n");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
370 // g_string_append_printf(outstr, "# y >= 0: |y| pixels from top border\n");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
371 // g_string_append_printf(outstr, "# y < 0 : |y| pixels from bottom border\n");
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
372 WRITE_NL(); WRITE_INT(*options, image_overlay.x);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
373 WRITE_NL(); WRITE_INT(*options, image_overlay.y);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
374
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
375
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
376 // WRITE_SUBTITLE("Slideshow Options");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
377
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
378 WRITE_NL(); WRITE_INT_UNIT(*options, slideshow.delay, SLIDESHOW_SUBSECOND_PRECISION);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
379 WRITE_NL(); WRITE_BOOL(*options, slideshow.random);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
380 WRITE_NL(); WRITE_BOOL(*options, slideshow.repeat);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
381
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
382
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
383 // WRITE_SUBTITLE("Collection Options");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
384
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
385 WRITE_NL(); WRITE_BOOL(*options, collections.rectangular_selection);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
386
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
387
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
388 // WRITE_SUBTITLE("Filtering Options");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
389
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
390 WRITE_NL(); WRITE_BOOL(*options, file_filter.show_hidden_files);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
391 WRITE_NL(); WRITE_BOOL(*options, file_filter.show_dot_directory);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
392 WRITE_NL(); WRITE_BOOL(*options, file_filter.disable);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
393 WRITE_SEPARATOR();
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
394
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
395
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
396 // WRITE_SUBTITLE("Sidecars Options");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
397
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
398 WRITE_NL(); WRITE_CHAR(*options, sidecar.ext);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
399
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
400
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
401
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
402 // WRITE_SUBTITLE("Shell command");
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
403 WRITE_NL(); WRITE_CHAR(*options, shell.path);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
404 WRITE_NL(); WRITE_CHAR(*options, shell.options);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
405
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
406
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
407 // WRITE_SUBTITLE("Helpers");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
408 // g_string_append_printf(outstr, "# Html browser\n");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
409 // g_string_append_printf(outstr, "# command_name is: the binary's name to look for in the path\n");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
410 // g_string_append_printf(outstr, "# If command_name is empty, the program will try various common html browsers\n");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
411 // g_string_append_printf(outstr, "# command_line is:\n");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
412 // g_string_append_printf(outstr, "# \"\" (empty string) = execute binary with html file path as command line\n");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
413 // g_string_append_printf(outstr, "# \"string\" = execute string and use results for command line\n");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
414 // g_string_append_printf(outstr, "# \"!string\" = use text following ! as command line, replacing optional %%s with html file path\n");
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
415 WRITE_NL(); WRITE_CHAR(*options, helpers.html_browser.command_name);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
416 WRITE_NL(); WRITE_CHAR(*options, helpers.html_browser.command_line);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
417
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
418 /* FIXME:
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
419 WRITE_SUBTITLE("Exif Options");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
420 g_string_append_printf(outstr, "# Display: 0: never\n"
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
421 "# 1: if set\n"
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
422 "# 2: always\n\n");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
423 for (i = 0; ExifUIList[i].key; i++)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
424 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
425 g_string_append_printf(outstr, "exif.display.");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
426 write_int_option(outstr, 2, (gchar *)ExifUIList[i].key, ExifUIList[i].current);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
427 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
428 */
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
429
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
430 // WRITE_SUBTITLE("Metadata Options");
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
431 WRITE_NL(); WRITE_BOOL(*options, metadata.enable_metadata_dirs);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
432 WRITE_NL(); WRITE_BOOL(*options, metadata.save_in_image_file);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
433 WRITE_NL(); WRITE_BOOL(*options, metadata.save_legacy_IPTC);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
434 WRITE_NL(); WRITE_BOOL(*options, metadata.warn_on_write_problems);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
435 WRITE_NL(); WRITE_BOOL(*options, metadata.save_legacy_format);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
436 WRITE_NL(); WRITE_BOOL(*options, metadata.sync_grouped_files);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
437 WRITE_NL(); WRITE_BOOL(*options, metadata.confirm_write);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
438 WRITE_NL(); WRITE_INT(*options, metadata.confirm_timeout);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
439 WRITE_NL(); WRITE_BOOL(*options, metadata.confirm_after_timeout);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
440 WRITE_NL(); WRITE_BOOL(*options, metadata.confirm_on_image_change);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
441 WRITE_NL(); WRITE_BOOL(*options, metadata.confirm_on_dir_change);
1592
69abb57139f0 use "keywords" instead of "tags" in option name, it is more consistent
nadvornik
parents: 1587
diff changeset
442 WRITE_NL(); WRITE_BOOL(*options, metadata.keywords_case_sensitive);
1567
c776b1310ca6 added an option to write image orientation to the metadata
nadvornik
parents: 1548
diff changeset
443 WRITE_NL(); WRITE_BOOL(*options, metadata.write_orientation);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
444
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
445 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
446
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
447 static void write_color_profile(GString *outstr, gint indent)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
448 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
449 gint i;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
450 #ifndef HAVE_LCMS
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
451 g_string_append_printf(outstr, "<!-- NOTICE: %s was not built with support for color profiles,\n"
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
452 " color profile options will have no effect.\n-->\n", GQ_APPNAME);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
453 #endif
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
454
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
455 WRITE_NL(); WRITE_STRING("<color_profiles ");
1586
c3416996fd97 Backed out changeset b5608391f479
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 1548
diff changeset
456 WRITE_INT(options->color_profile, screen_type);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
457 WRITE_CHAR(options->color_profile, screen_file);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
458 WRITE_BOOL(options->color_profile, enabled);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
459 WRITE_BOOL(options->color_profile, use_image);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
460 WRITE_INT(options->color_profile, input_type);
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
461 WRITE_STRING(">");
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
462
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
463 indent++;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
464 for (i = 0; i < COLOR_PROFILE_INPUTS; i++)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
465 {
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
466 WRITE_NL(); WRITE_STRING("<profile ");
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
467 write_char_option(outstr, indent, "input_file", options->color_profile.input_file[i]);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
468 write_char_option(outstr, indent, "input_name", options->color_profile.input_name[i]);
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
469 WRITE_STRING("/>");
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
470 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
471 indent--;
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
472 WRITE_NL(); WRITE_STRING("</color_profiles>");
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
473 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
474
639
8b95e1859fee Rework read_*_option():
zas_
parents: 638
diff changeset
475
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
476 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
477 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
478 * save configuration (public)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
479 *-----------------------------------------------------------------------------
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
480 */
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
481
1484
9c16a93a0fdf improved sidebar configuration
nadvornik
parents: 1469
diff changeset
482 gboolean save_config_to_file(const gchar *utf8_path, ConfOptions *options)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
483 {
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
484 SecureSaveInfo *ssi;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
485 gchar *rc_pathl;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
486 GString *outstr;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
487 gint indent = 0;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
488 GList *work;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
489
741
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
490 rc_pathl = path_from_utf8(utf8_path);
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
491 ssi = secure_open(rc_pathl);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
492 g_free(rc_pathl);
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
493 if (!ssi)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
494 {
741
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
495 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
496 return FALSE;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
497 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
498
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
499 outstr = g_string_new("");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
500 g_string_append_printf(outstr, "<!--\n");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
501 g_string_append_printf(outstr, "######################################################################\n");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
502 g_string_append_printf(outstr, "# %30s config file version %-10s #\n", GQ_APPNAME, VERSION);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
503 g_string_append_printf(outstr, "######################################################################\n");
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
504 WRITE_SEPARATOR();
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
505
1314
8cca18bce950 simplified config writing
nadvornik
parents: 1313
diff changeset
506 WRITE_STRING("# Note: This file is autogenerated. Options can be changed here,\n");
8cca18bce950 simplified config writing
nadvornik
parents: 1313
diff changeset
507 WRITE_STRING("# but user comments and formatting will be lost.\n");
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
508 WRITE_SEPARATOR();
1314
8cca18bce950 simplified config writing
nadvornik
parents: 1313
diff changeset
509 WRITE_STRING("-->\n");
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
510 WRITE_SEPARATOR();
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
511
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
512 WRITE_STRING("<gq>\n");
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
513 indent++;
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
514
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
515 WRITE_NL(); WRITE_STRING("<global\n");
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
516 indent++;
1314
8cca18bce950 simplified config writing
nadvornik
parents: 1313
diff changeset
517 write_global_attributes(outstr, indent + 1);
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
518 indent--;
1314
8cca18bce950 simplified config writing
nadvornik
parents: 1313
diff changeset
519 WRITE_STRING(">\n");
8cca18bce950 simplified config writing
nadvornik
parents: 1313
diff changeset
520
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
521 indent++;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
522
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
523 write_color_profile(outstr, indent);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
524
377
9efefd85684a Cleanup read/write of image.zoom_mode option.
zas_
parents: 376
diff changeset
525 WRITE_SEPARATOR();
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
526 filter_write_list(outstr, indent);
335
0cb7f0ac5c20 Beautify rc file, adding sub-sections titles.
zas_
parents: 334
diff changeset
527
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
528 WRITE_SEPARATOR();
1404
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
529 keyword_tree_write_config(outstr, indent);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
530 indent--;
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
531 WRITE_NL(); WRITE_STRING("</global>\n");
468
2df505c60459 Replace fullscreen.info and fullscreen.show_info options by:
zas_
parents: 458
diff changeset
532
823
ed82f5bf8082 Add a comment about relative positions of image overlay in the rc file.
zas_
parents: 822
diff changeset
533 WRITE_SEPARATOR();
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
534 WRITE_SUBTITLE("Layout Options");
823
ed82f5bf8082 Add a comment about relative positions of image overlay in the rc file.
zas_
parents: 822
diff changeset
535
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
536 work = layout_window_list;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
537 while (work)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
538 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
539 LayoutWindow *lw = work->data;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
540 layout_write_config(lw, outstr, indent);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
541 work = work->next;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
542 }
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
543
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
544 indent--;
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
545 WRITE_NL(); WRITE_STRING("</gq>\n");
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
546 WRITE_SEPARATOR();
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
547
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
548 secure_fputs(ssi, outstr->str);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
549 g_string_free(outstr, TRUE);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
550
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
551 if (secure_close(ssi))
741
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
552 {
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
553 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
554 secsave_strerror(secsave_errno));
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
555 return FALSE;
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
556 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
557
741
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
558 return TRUE;
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
559 }
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
560
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
561 /*
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
562 *-----------------------------------------------------------------------------
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
563 * loading attributes for elements (private)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
564 *-----------------------------------------------------------------------------
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
565 */
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
566
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
567
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
568 static gboolean load_global_params(const gchar **attribute_names, const gchar **attribute_values)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
569 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
570 while (*attribute_names)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
571 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
572 const gchar *option = *attribute_names++;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
573 const gchar *value = *attribute_values++;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
574
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
575
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
576 /* general options */
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
577 if (READ_BOOL(*options, show_icon_names)) continue;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
578
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
579 if (READ_BOOL(*options, tree_descend_subdirs)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
580 if (READ_BOOL(*options, lazy_image_sync)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
581 if (READ_BOOL(*options, update_on_time_change)) continue;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
582
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
583 if (READ_UINT_CLAMP(*options, duplicates_similarity_threshold, 0, 100)) continue;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
584
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
585 if (READ_BOOL(*options, progressive_key_scrolling)) continue;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
586
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
587 if (READ_BOOL(*options, mousewheel_scrolls)) continue;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
588
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
589 if (READ_INT(*options, open_recent_list_maxsize)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
590 if (READ_INT(*options, dnd_icon_size)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
591 if (READ_BOOL(*options, place_dialogs_under_mouse)) continue;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
592
1436
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1404
diff changeset
593 if (READ_BOOL(*options, save_window_positions)) continue;
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1404
diff changeset
594 if (READ_BOOL(*options, tools_restore_state)) continue;
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1404
diff changeset
595
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
596 /* properties dialog options */
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
597 if (READ_CHAR(*options, properties.tabs_order)) continue;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
598
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
599 /* image options */
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
600 if (READ_UINT_CLAMP(*options, image.zoom_mode, 0, ZOOM_RESET_NONE)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
601 if (READ_BOOL(*options, image.zoom_2pass)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
602 if (READ_BOOL(*options, image.zoom_to_fit_allow_expand)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
603 if (READ_BOOL(*options, image.fit_window_to_image)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
604 if (READ_BOOL(*options, image.limit_window_size)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
605 if (READ_INT(*options, image.max_window_size)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
606 if (READ_BOOL(*options, image.limit_autofit_size)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
607 if (READ_INT(*options, image.max_autofit_size)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
608 if (READ_UINT_CLAMP(*options, image.scroll_reset_method, 0, PR_SCROLL_RESET_COUNT - 1)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
609 if (READ_INT(*options, image.tile_cache_max)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
610 if (READ_INT(*options, image.image_cache_max)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
611 if (READ_UINT_CLAMP(*options, image.zoom_quality, GDK_INTERP_NEAREST, GDK_INTERP_HYPER)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
612 if (READ_UINT_CLAMP(*options, image.dither_quality, GDK_RGB_DITHER_NONE, GDK_RGB_DITHER_MAX)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
613 if (READ_INT(*options, image.zoom_increment)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
614 if (READ_BOOL(*options, image.enable_read_ahead)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
615 if (READ_BOOL(*options, image.exif_rotate_enable)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
616 if (READ_BOOL(*options, image.use_custom_border_color)) continue;
1639
56115e934133 the options for custom border color were made independent
nadvornik
parents: 1622
diff changeset
617 if (READ_BOOL(*options, image.use_custom_border_color_in_fullscreen)) continue;
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
618 if (READ_COLOR(*options, image.border_color)) continue;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
619
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
620 /* thumbnails options */
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
621 if (READ_INT_CLAMP(*options, thumbnails.max_width, 16, 512)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
622 if (READ_INT_CLAMP(*options, thumbnails.max_height, 16, 512)) continue;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
623
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
624 if (READ_BOOL(*options, thumbnails.enable_caching)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
625 if (READ_BOOL(*options, thumbnails.cache_into_dirs)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
626 if (READ_BOOL(*options, thumbnails.use_xvpics)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
627 if (READ_BOOL(*options, thumbnails.spec_standard)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
628 if (READ_UINT_CLAMP(*options, thumbnails.quality, GDK_INTERP_NEAREST, GDK_INTERP_HYPER)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
629 if (READ_BOOL(*options, thumbnails.use_exif)) continue;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
630
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
631 /* file sorting options */
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
632 if (READ_UINT(*options, file_sort.method)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
633 if (READ_BOOL(*options, file_sort.ascending)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
634 if (READ_BOOL(*options, file_sort.case_sensitive)) continue;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
635
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
636 /* file operations *options */
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
637 if (READ_BOOL(*options, file_ops.enable_in_place_rename)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
638 if (READ_BOOL(*options, file_ops.confirm_delete)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
639 if (READ_BOOL(*options, file_ops.enable_delete_key)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
640 if (READ_BOOL(*options, file_ops.safe_delete_enable)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
641 if (READ_CHAR(*options, file_ops.safe_delete_path)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
642 if (READ_INT(*options, file_ops.safe_delete_folder_maxsize)) continue;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
643
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
644 /* fullscreen options */
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
645 if (READ_INT(*options, fullscreen.screen)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
646 if (READ_BOOL(*options, fullscreen.clean_flip)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
647 if (READ_BOOL(*options, fullscreen.disable_saver)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
648 if (READ_BOOL(*options, fullscreen.above)) continue;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
649
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
650 /* image overlay */
1336
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1335
diff changeset
651 if (READ_CHAR(*options, image_overlay.template_string)) continue;
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1335
diff changeset
652 if (READ_INT(*options, image_overlay.x)) continue;
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1335
diff changeset
653 if (READ_INT(*options, image_overlay.y)) continue;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
654
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
655
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
656 /* slideshow options */
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
657 if (READ_INT_UNIT(*options, slideshow.delay, SLIDESHOW_SUBSECOND_PRECISION)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
658 if (READ_BOOL(*options, slideshow.random)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
659 if (READ_BOOL(*options, slideshow.repeat)) continue;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
660
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
661 /* collection options */
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
662
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
663 if (READ_BOOL(*options, collections.rectangular_selection)) continue;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
664
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
665 /* filtering options */
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
666
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
667 if (READ_BOOL(*options, file_filter.show_hidden_files)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
668 if (READ_BOOL(*options, file_filter.show_dot_directory)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
669 if (READ_BOOL(*options, file_filter.disable)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
670 if (READ_CHAR(*options, sidecar.ext)) continue;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
671
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
672 /* Color Profiles */
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
673
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
674 /* Shell command */
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
675 if (READ_CHAR(*options, shell.path)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
676 if (READ_CHAR(*options, shell.options)) continue;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
677
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
678 /* Helpers */
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
679 if (READ_CHAR(*options, helpers.html_browser.command_name)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
680 if (READ_CHAR(*options, helpers.html_browser.command_line)) continue;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
681 /* Exif */
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
682 /*
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
683 if (0 == g_ascii_strncasecmp(option, "exif.display.", 13))
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
684 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
685 for (i = 0; ExifUIList[i].key; i++)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
686 if (0 == g_ascii_strcasecmp(option + 13, ExifUIList[i].key))
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
687 ExifUIList[i].current = strtol(value, NULL, 10);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
688 continue;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
689 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
690 */
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
691 /* metadata */
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
692 if (READ_BOOL(*options, metadata.enable_metadata_dirs)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
693 if (READ_BOOL(*options, metadata.save_in_image_file)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
694 if (READ_BOOL(*options, metadata.save_legacy_IPTC)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
695 if (READ_BOOL(*options, metadata.warn_on_write_problems)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
696 if (READ_BOOL(*options, metadata.save_legacy_format)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
697 if (READ_BOOL(*options, metadata.sync_grouped_files)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
698 if (READ_BOOL(*options, metadata.confirm_write)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
699 if (READ_BOOL(*options, metadata.confirm_after_timeout)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
700 if (READ_INT(*options, metadata.confirm_timeout)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
701 if (READ_BOOL(*options, metadata.confirm_on_image_change)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
702 if (READ_BOOL(*options, metadata.confirm_on_dir_change)) continue;
1592
69abb57139f0 use "keywords" instead of "tags" in option name, it is more consistent
nadvornik
parents: 1587
diff changeset
703 if (READ_BOOL(*options, metadata.keywords_case_sensitive)) continue;
1567
c776b1310ca6 added an option to write image orientation to the metadata
nadvornik
parents: 1548
diff changeset
704 if (READ_BOOL(*options, metadata.write_orientation)) continue;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
705
1464
1b3751ac4743 be more verbose on parse errors
nadvornik
parents: 1463
diff changeset
706 log_printf("unknown attribute %s = %s\n", option, value);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
707 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
708
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
709 return TRUE;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
710 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
711
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
712 static void options_load_color_profiles(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
713 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
714 while (*attribute_names)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
715 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
716 const gchar *option = *attribute_names++;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
717 const gchar *value = *attribute_values++;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
718
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
719 if (READ_BOOL(options->color_profile, enabled)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
720 if (READ_BOOL(options->color_profile, use_image)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
721 if (READ_INT(options->color_profile, input_type)) continue;
1586
c3416996fd97 Backed out changeset b5608391f479
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 1548
diff changeset
722 if (READ_INT(options->color_profile, screen_type)) continue;
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
723 if (READ_CHAR(options->color_profile, screen_file)) continue;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
724
1464
1b3751ac4743 be more verbose on parse errors
nadvornik
parents: 1463
diff changeset
725 log_printf("unknown attribute %s = %s\n", option, value);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
726 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
727
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
728 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
729
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
730 static void options_load_profile(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
731 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
732 gint i = GPOINTER_TO_INT(data);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
733 if (i < 0 || i >= COLOR_PROFILE_INPUTS) return;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
734 while (*attribute_names)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
735 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
736 const gchar *option = *attribute_names++;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
737 const gchar *value = *attribute_values++;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
738
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
739 if (READ_CHAR_FULL("input_file", options->color_profile.input_file[i])) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
740 if (READ_CHAR_FULL("input_name", options->color_profile.input_name[i])) continue;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
741
1464
1b3751ac4743 be more verbose on parse errors
nadvornik
parents: 1463
diff changeset
742 log_printf("unknown attribute %s = %s\n", option, value);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
743 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
744 i++;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
745 options_parse_func_set_data(parser_data, GINT_TO_POINTER(i));
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
746
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
747 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
748
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
749
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
750
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
751 /*
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
752 *-----------------------------------------------------------------------------
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
753 * xml file structure (private)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
754 *-----------------------------------------------------------------------------
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
755 */
1313
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
756 struct _GQParserData
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
757 {
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
758 GList *parse_func_stack;
1463
25168240a247 added function to reload external editors at any time
nadvornik
parents: 1461
diff changeset
759 gboolean startup; /* reading config for the first time - add commandline and defaults */
1313
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
760 };
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
761
1466
6e020d3ab168 added possibility to update existing layout window from config
nadvornik
parents: 1464
diff changeset
762 static const gchar *options_get_id(const gchar **attribute_names, const gchar **attribute_values)
6e020d3ab168 added possibility to update existing layout window from config
nadvornik
parents: 1464
diff changeset
763 {
6e020d3ab168 added possibility to update existing layout window from config
nadvornik
parents: 1464
diff changeset
764 while (*attribute_names)
6e020d3ab168 added possibility to update existing layout window from config
nadvornik
parents: 1464
diff changeset
765 {
6e020d3ab168 added possibility to update existing layout window from config
nadvornik
parents: 1464
diff changeset
766 const gchar *option = *attribute_names++;
6e020d3ab168 added possibility to update existing layout window from config
nadvornik
parents: 1464
diff changeset
767 const gchar *value = *attribute_values++;
6e020d3ab168 added possibility to update existing layout window from config
nadvornik
parents: 1464
diff changeset
768
6e020d3ab168 added possibility to update existing layout window from config
nadvornik
parents: 1464
diff changeset
769 if (strcmp(option, "id") == 0) return value;
6e020d3ab168 added possibility to update existing layout window from config
nadvornik
parents: 1464
diff changeset
770
6e020d3ab168 added possibility to update existing layout window from config
nadvornik
parents: 1464
diff changeset
771 }
6e020d3ab168 added possibility to update existing layout window from config
nadvornik
parents: 1464
diff changeset
772 return NULL;
6e020d3ab168 added possibility to update existing layout window from config
nadvornik
parents: 1464
diff changeset
773 }
6e020d3ab168 added possibility to update existing layout window from config
nadvornik
parents: 1464
diff changeset
774
741
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
775
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
776 void options_parse_leaf(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
777 {
1464
1b3751ac4743 be more verbose on parse errors
nadvornik
parents: 1463
diff changeset
778 log_printf("unexpected: %s\n", element_name);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
779 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
780 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
781
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
782 static void options_parse_color_profiles(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
783 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
784 if (g_ascii_strcasecmp(element_name, "profile") == 0)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
785 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
786 options_load_profile(parser_data, context, element_name, attribute_names, attribute_values, data, error);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
787 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
788 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
789 else
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
790 {
1464
1b3751ac4743 be more verbose on parse errors
nadvornik
parents: 1463
diff changeset
791 log_printf("unexpected in <profile>: <%s>\n", element_name);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
792 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
793 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
794 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
795
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
796 static void options_parse_filter(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
797 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
798 if (g_ascii_strcasecmp(element_name, "file_type") == 0)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
799 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
800 filter_load_file_type(attribute_names, attribute_values);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
801 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
802 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
803 else
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
804 {
1464
1b3751ac4743 be more verbose on parse errors
nadvornik
parents: 1463
diff changeset
805 log_printf("unexpected in <filter>: <%s>\n", element_name);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
806 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
807 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
808 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
809
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
810 static void options_parse_filter_end(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, gpointer data, GError **error)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
811 {
1463
25168240a247 added function to reload external editors at any time
nadvornik
parents: 1461
diff changeset
812 if (parser_data->startup) filter_add_defaults();
25168240a247 added function to reload external editors at any time
nadvornik
parents: 1461
diff changeset
813 filter_rebuild();
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
814 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
815
1404
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
816 static void options_parse_keyword_end(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, gpointer data, GError **error)
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
817 {
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
818 GtkTreeIter *iter_ptr = data;
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
819 gtk_tree_iter_free(iter_ptr);
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
820 }
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
821
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
822
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
823 static void options_parse_keyword(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
824 {
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
825 GtkTreeIter *iter_ptr = data;
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
826 if (g_ascii_strcasecmp(element_name, "keyword") == 0)
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
827 {
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
828 GtkTreeIter *child = keyword_add_from_config(keyword_tree, iter_ptr, attribute_names, attribute_values);
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
829 options_parse_func_push(parser_data, options_parse_keyword, options_parse_keyword_end, child);
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
830 }
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
831 else
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
832 {
1464
1b3751ac4743 be more verbose on parse errors
nadvornik
parents: 1463
diff changeset
833 log_printf("unexpected in <keyword>: <%s>\n", element_name);
1404
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
834 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
835 }
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
836 }
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
837
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
838
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
839
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
840 static void options_parse_keyword_tree(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
841 {
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
842 if (g_ascii_strcasecmp(element_name, "keyword") == 0)
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
843 {
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
844 GtkTreeIter *iter_ptr = keyword_add_from_config(keyword_tree, NULL, attribute_names, attribute_values);
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
845 options_parse_func_push(parser_data, options_parse_keyword, options_parse_keyword_end, iter_ptr);
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
846 }
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
847 else
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
848 {
1464
1b3751ac4743 be more verbose on parse errors
nadvornik
parents: 1463
diff changeset
849 log_printf("unexpected in <keyword_tree>: <%s>\n", element_name);
1404
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
850 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
851 }
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
852 }
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
853
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
854
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
855 static void options_parse_global(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
856 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
857 if (g_ascii_strcasecmp(element_name, "color_profiles") == 0)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
858 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
859 options_load_color_profiles(parser_data, context, element_name, attribute_names, attribute_values, data, error);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
860 options_parse_func_push(parser_data, options_parse_color_profiles, NULL, GINT_TO_POINTER(0));
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
861 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
862 else if (g_ascii_strcasecmp(element_name, "filter") == 0)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
863 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
864 options_parse_func_push(parser_data, options_parse_filter, options_parse_filter_end, NULL);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
865 }
1404
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
866 else if (g_ascii_strcasecmp(element_name, "keyword_tree") == 0)
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
867 {
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
868 if (!keyword_tree) keyword_tree_new();
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
869 options_parse_func_push(parser_data, options_parse_keyword_tree, NULL, NULL);
de06d83e1adc save and restore the keyword tree
nadvornik
parents: 1387
diff changeset
870 }
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
871 else
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
872 {
1464
1b3751ac4743 be more verbose on parse errors
nadvornik
parents: 1463
diff changeset
873 log_printf("unexpected in <global>: <%s>\n", element_name);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
874 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
875 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
876 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
877
1463
25168240a247 added function to reload external editors at any time
nadvornik
parents: 1461
diff changeset
878 static void options_parse_global_end(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, gpointer data, GError **error)
25168240a247 added function to reload external editors at any time
nadvornik
parents: 1461
diff changeset
879 {
1667
ece97f3f2305 fixes for a built without Exiv2
nadvornik
parents: 1639
diff changeset
880 #ifndef HAVE_EXIV2
ece97f3f2305 fixes for a built without Exiv2
nadvornik
parents: 1639
diff changeset
881 /* some options do not work without exiv2 */
ece97f3f2305 fixes for a built without Exiv2
nadvornik
parents: 1639
diff changeset
882 options->metadata.save_in_image_file = FALSE;
ece97f3f2305 fixes for a built without Exiv2
nadvornik
parents: 1639
diff changeset
883 options->metadata.save_legacy_format = TRUE;
ece97f3f2305 fixes for a built without Exiv2
nadvornik
parents: 1639
diff changeset
884 options->metadata.write_orientation = FALSE;
ece97f3f2305 fixes for a built without Exiv2
nadvornik
parents: 1639
diff changeset
885 DEBUG_1("compiled without Exiv2 - disabling XMP write support");
ece97f3f2305 fixes for a built without Exiv2
nadvornik
parents: 1639
diff changeset
886 #endif
ece97f3f2305 fixes for a built without Exiv2
nadvornik
parents: 1639
diff changeset
887
1463
25168240a247 added function to reload external editors at any time
nadvornik
parents: 1461
diff changeset
888 /* on startup there are no layout windows and this just loads the editors */
25168240a247 added function to reload external editors at any time
nadvornik
parents: 1461
diff changeset
889 layout_editors_reload_all();
25168240a247 added function to reload external editors at any time
nadvornik
parents: 1461
diff changeset
890 }
25168240a247 added function to reload external editors at any time
nadvornik
parents: 1461
diff changeset
891
1350
9d190c098b97 rewritten exif pane to support arbitrary number of entries
nadvornik
parents: 1346
diff changeset
892 static void options_parse_pane_exif(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
9d190c098b97 rewritten exif pane to support arbitrary number of entries
nadvornik
parents: 1346
diff changeset
893 {
9d190c098b97 rewritten exif pane to support arbitrary number of entries
nadvornik
parents: 1346
diff changeset
894 GtkWidget *pane = data;
9d190c098b97 rewritten exif pane to support arbitrary number of entries
nadvornik
parents: 1346
diff changeset
895 if (g_ascii_strcasecmp(element_name, "entry") == 0)
9d190c098b97 rewritten exif pane to support arbitrary number of entries
nadvornik
parents: 1346
diff changeset
896 {
9d190c098b97 rewritten exif pane to support arbitrary number of entries
nadvornik
parents: 1346
diff changeset
897 bar_pane_exif_entry_add_from_config(pane, attribute_names, attribute_values);
9d190c098b97 rewritten exif pane to support arbitrary number of entries
nadvornik
parents: 1346
diff changeset
898 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
9d190c098b97 rewritten exif pane to support arbitrary number of entries
nadvornik
parents: 1346
diff changeset
899 }
9d190c098b97 rewritten exif pane to support arbitrary number of entries
nadvornik
parents: 1346
diff changeset
900 else
9d190c098b97 rewritten exif pane to support arbitrary number of entries
nadvornik
parents: 1346
diff changeset
901 {
1464
1b3751ac4743 be more verbose on parse errors
nadvornik
parents: 1463
diff changeset
902 log_printf("unexpected in <pane_exif>: <%s>\n", element_name);
1350
9d190c098b97 rewritten exif pane to support arbitrary number of entries
nadvornik
parents: 1346
diff changeset
903 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
9d190c098b97 rewritten exif pane to support arbitrary number of entries
nadvornik
parents: 1346
diff changeset
904 }
9d190c098b97 rewritten exif pane to support arbitrary number of entries
nadvornik
parents: 1346
diff changeset
905 }
9d190c098b97 rewritten exif pane to support arbitrary number of entries
nadvornik
parents: 1346
diff changeset
906
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
907 static void options_parse_bar(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
908 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
909 GtkWidget *bar = data;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
910 if (g_ascii_strcasecmp(element_name, "pane_comment") == 0)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
911 {
1469
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
912 GtkWidget *pane = bar_find_pane_by_id(bar, PANE_COMMENT, options_get_id(attribute_names, attribute_values));
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
913 if (pane)
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
914 {
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
915 bar_pane_comment_update_from_config(pane, attribute_names, attribute_values);
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
916 }
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
917 else
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
918 {
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
919 pane = bar_pane_comment_new_from_config(attribute_names, attribute_values);
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
920 bar_add(bar, pane);
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
921 }
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
922 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
923 }
1602
6bfe8fc7a403 added GPS map support - patch by Colin Clark
nadvornik
parents: 1592
diff changeset
924 #ifdef HAVE_LIBCHAMPLAIN
6bfe8fc7a403 added GPS map support - patch by Colin Clark
nadvornik
parents: 1592
diff changeset
925 #ifdef HAVE_LIBCHAMPLAIN_GTK
6bfe8fc7a403 added GPS map support - patch by Colin Clark
nadvornik
parents: 1592
diff changeset
926 else if (g_ascii_strcasecmp(element_name, "pane_gps") == 0)
6bfe8fc7a403 added GPS map support - patch by Colin Clark
nadvornik
parents: 1592
diff changeset
927 {
6bfe8fc7a403 added GPS map support - patch by Colin Clark
nadvornik
parents: 1592
diff changeset
928 GtkWidget *pane = bar_find_pane_by_id(bar, PANE_GPS, options_get_id(attribute_names, attribute_values));
6bfe8fc7a403 added GPS map support - patch by Colin Clark
nadvornik
parents: 1592
diff changeset
929 if (pane)
6bfe8fc7a403 added GPS map support - patch by Colin Clark
nadvornik
parents: 1592
diff changeset
930 {
6bfe8fc7a403 added GPS map support - patch by Colin Clark
nadvornik
parents: 1592
diff changeset
931 bar_pane_gps_update_from_config(pane, attribute_names, attribute_values);
6bfe8fc7a403 added GPS map support - patch by Colin Clark
nadvornik
parents: 1592
diff changeset
932 }
6bfe8fc7a403 added GPS map support - patch by Colin Clark
nadvornik
parents: 1592
diff changeset
933 else
6bfe8fc7a403 added GPS map support - patch by Colin Clark
nadvornik
parents: 1592
diff changeset
934 {
6bfe8fc7a403 added GPS map support - patch by Colin Clark
nadvornik
parents: 1592
diff changeset
935 pane = bar_pane_gps_new_from_config(attribute_names, attribute_values);
6bfe8fc7a403 added GPS map support - patch by Colin Clark
nadvornik
parents: 1592
diff changeset
936 bar_add(bar, pane);
6bfe8fc7a403 added GPS map support - patch by Colin Clark
nadvornik
parents: 1592
diff changeset
937 }
6bfe8fc7a403 added GPS map support - patch by Colin Clark
nadvornik
parents: 1592
diff changeset
938 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
6bfe8fc7a403 added GPS map support - patch by Colin Clark
nadvornik
parents: 1592
diff changeset
939 }
6bfe8fc7a403 added GPS map support - patch by Colin Clark
nadvornik
parents: 1592
diff changeset
940 #endif
6bfe8fc7a403 added GPS map support - patch by Colin Clark
nadvornik
parents: 1592
diff changeset
941 #endif
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
942 else if (g_ascii_strcasecmp(element_name, "pane_exif") == 0)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
943 {
1469
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
944 GtkWidget *pane = bar_find_pane_by_id(bar, PANE_EXIF, options_get_id(attribute_names, attribute_values));
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
945 if (pane)
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
946 {
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
947 bar_pane_exif_update_from_config(pane, attribute_names, attribute_values);
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
948 }
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
949 else
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
950 {
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
951 pane = bar_pane_exif_new_from_config(attribute_names, attribute_values);
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
952 bar_add(bar, pane);
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
953 }
1350
9d190c098b97 rewritten exif pane to support arbitrary number of entries
nadvornik
parents: 1346
diff changeset
954 options_parse_func_push(parser_data, options_parse_pane_exif, NULL, pane);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
955 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
956 else if (g_ascii_strcasecmp(element_name, "pane_histogram") == 0)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
957 {
1469
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
958 GtkWidget *pane = bar_find_pane_by_id(bar, PANE_HISTOGRAM, options_get_id(attribute_names, attribute_values));
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
959 if (pane)
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
960 {
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
961 bar_pane_histogram_update_from_config(pane, attribute_names, attribute_values);
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
962 }
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
963 else
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
964 {
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
965 pane = bar_pane_histogram_new_from_config(attribute_names, attribute_values);
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
966 bar_add(bar, pane);
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
967 }
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
968 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
969 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
970 else if (g_ascii_strcasecmp(element_name, "pane_keywords") == 0)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
971 {
1469
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
972 GtkWidget *pane = bar_find_pane_by_id(bar, PANE_KEYWORDS, options_get_id(attribute_names, attribute_values));
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
973 if (pane)
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
974 {
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
975 bar_pane_keywords_update_from_config(pane, attribute_names, attribute_values);
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
976 }
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
977 else
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
978 {
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
979 pane = bar_pane_keywords_new_from_config(attribute_names, attribute_values);
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
980 bar_add(bar, pane);
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
981 }
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
982 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
983 }
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
984 else if (g_ascii_strcasecmp(element_name, "clear") == 0)
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
985 {
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
986 bar_clear(bar);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
987 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
988 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
989 else
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
990 {
1464
1b3751ac4743 be more verbose on parse errors
nadvornik
parents: 1463
diff changeset
991 log_printf("unexpected in <bar>: <%s>\n", element_name);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
992 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
993 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
994 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
995
1335
588d96cda850 save and restore toolbar configuration
nadvornik
parents: 1329
diff changeset
996 static void options_parse_toolbar(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
588d96cda850 save and restore toolbar configuration
nadvornik
parents: 1329
diff changeset
997 {
588d96cda850 save and restore toolbar configuration
nadvornik
parents: 1329
diff changeset
998 LayoutWindow *lw = data;
588d96cda850 save and restore toolbar configuration
nadvornik
parents: 1329
diff changeset
999 if (g_ascii_strcasecmp(element_name, "toolitem") == 0)
588d96cda850 save and restore toolbar configuration
nadvornik
parents: 1329
diff changeset
1000 {
588d96cda850 save and restore toolbar configuration
nadvornik
parents: 1329
diff changeset
1001 layout_toolbar_add_from_config(lw, attribute_names, attribute_values);
588d96cda850 save and restore toolbar configuration
nadvornik
parents: 1329
diff changeset
1002 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
588d96cda850 save and restore toolbar configuration
nadvornik
parents: 1329
diff changeset
1003 }
1469
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
1004 else if (g_ascii_strcasecmp(element_name, "clear") == 0)
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
1005 {
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
1006 layout_toolbar_clear(lw);
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
1007 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
1008 }
1335
588d96cda850 save and restore toolbar configuration
nadvornik
parents: 1329
diff changeset
1009 else
588d96cda850 save and restore toolbar configuration
nadvornik
parents: 1329
diff changeset
1010 {
1464
1b3751ac4743 be more verbose on parse errors
nadvornik
parents: 1463
diff changeset
1011 log_printf("unexpected in <toolbar>: <%s>\n", element_name);
1335
588d96cda850 save and restore toolbar configuration
nadvornik
parents: 1329
diff changeset
1012 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
588d96cda850 save and restore toolbar configuration
nadvornik
parents: 1329
diff changeset
1013 }
588d96cda850 save and restore toolbar configuration
nadvornik
parents: 1329
diff changeset
1014 }
588d96cda850 save and restore toolbar configuration
nadvornik
parents: 1329
diff changeset
1015
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1016 static void options_parse_layout(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1017 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1018 LayoutWindow *lw = data;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1019 if (g_ascii_strcasecmp(element_name, "bar") == 0)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1020 {
1469
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
1021 if (!lw->bar)
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
1022 {
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
1023 GtkWidget *bar = bar_new_from_config(lw, attribute_names, attribute_values);
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
1024 layout_bar_set(lw, bar);
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
1025 }
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
1026 else
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
1027 {
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
1028 bar_update_from_config(lw->bar, attribute_names, attribute_values);
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
1029 }
607c60506863 added a possibility to update existing bars from config
nadvornik
parents: 1466
diff changeset
1030
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1031 options_parse_func_push(parser_data, options_parse_bar, NULL, lw->bar);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1032 }
1320
055ed09d5a03 improved bar_sort configuration
nadvornik
parents: 1317
diff changeset
1033 else if (g_ascii_strcasecmp(element_name, "bar_sort") == 0)
055ed09d5a03 improved bar_sort configuration
nadvornik
parents: 1317
diff changeset
1034 {
055ed09d5a03 improved bar_sort configuration
nadvornik
parents: 1317
diff changeset
1035 GtkWidget *bar = bar_sort_new_from_config(lw, attribute_names, attribute_values);
055ed09d5a03 improved bar_sort configuration
nadvornik
parents: 1317
diff changeset
1036 layout_bar_sort_set(lw, bar);
055ed09d5a03 improved bar_sort configuration
nadvornik
parents: 1317
diff changeset
1037 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
055ed09d5a03 improved bar_sort configuration
nadvornik
parents: 1317
diff changeset
1038 }
1335
588d96cda850 save and restore toolbar configuration
nadvornik
parents: 1329
diff changeset
1039 else if (g_ascii_strcasecmp(element_name, "toolbar") == 0)
588d96cda850 save and restore toolbar configuration
nadvornik
parents: 1329
diff changeset
1040 {
588d96cda850 save and restore toolbar configuration
nadvornik
parents: 1329
diff changeset
1041 options_parse_func_push(parser_data, options_parse_toolbar, NULL, lw);
588d96cda850 save and restore toolbar configuration
nadvornik
parents: 1329
diff changeset
1042 }
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1043 else
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1044 {
1464
1b3751ac4743 be more verbose on parse errors
nadvornik
parents: 1463
diff changeset
1045 log_printf("unexpected in <layout>: <%s>\n", element_name);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1046 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1047 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1048 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1049
1317
cd7204a18f14 simplified and improved bar configuration
nadvornik
parents: 1315
diff changeset
1050 static void options_parse_layout_end(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, gpointer data, GError **error)
cd7204a18f14 simplified and improved bar configuration
nadvornik
parents: 1315
diff changeset
1051 {
cd7204a18f14 simplified and improved bar configuration
nadvornik
parents: 1315
diff changeset
1052 LayoutWindow *lw = data;
cd7204a18f14 simplified and improved bar configuration
nadvornik
parents: 1315
diff changeset
1053 layout_util_sync(lw);
cd7204a18f14 simplified and improved bar configuration
nadvornik
parents: 1315
diff changeset
1054 }
cd7204a18f14 simplified and improved bar configuration
nadvornik
parents: 1315
diff changeset
1055
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1056 static void options_parse_toplevel(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1057 {
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
1058 if (g_ascii_strcasecmp(element_name, "gq") == 0)
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
1059 {
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
1060 /* optional top-level node */
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
1061 options_parse_func_push(parser_data, options_parse_toplevel, NULL, NULL);
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
1062 return;
e015b6573d36 improved config file formatting
nadvornik
parents: 1444
diff changeset
1063 }
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1064 if (g_ascii_strcasecmp(element_name, "global") == 0)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1065 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1066 load_global_params(attribute_names, attribute_values);
1463
25168240a247 added function to reload external editors at any time
nadvornik
parents: 1461
diff changeset
1067 options_parse_func_push(parser_data, options_parse_global, options_parse_global_end, NULL);
1313
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
1068 return;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1069 }
1313
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
1070
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
1071 if (g_ascii_strcasecmp(element_name, "layout") == 0)
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1072 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1073 LayoutWindow *lw;
1466
6e020d3ab168 added possibility to update existing layout window from config
nadvornik
parents: 1464
diff changeset
1074 lw = layout_find_by_layout_id(options_get_id(attribute_names, attribute_values));
6e020d3ab168 added possibility to update existing layout window from config
nadvornik
parents: 1464
diff changeset
1075 if (lw)
6e020d3ab168 added possibility to update existing layout window from config
nadvornik
parents: 1464
diff changeset
1076 {
6e020d3ab168 added possibility to update existing layout window from config
nadvornik
parents: 1464
diff changeset
1077 layout_update_from_config(lw, attribute_names, attribute_values);
6e020d3ab168 added possibility to update existing layout window from config
nadvornik
parents: 1464
diff changeset
1078 }
6e020d3ab168 added possibility to update existing layout window from config
nadvornik
parents: 1464
diff changeset
1079 else
6e020d3ab168 added possibility to update existing layout window from config
nadvornik
parents: 1464
diff changeset
1080 {
6e020d3ab168 added possibility to update existing layout window from config
nadvornik
parents: 1464
diff changeset
1081 lw = layout_new_from_config(attribute_names, attribute_values, parser_data->startup);
6e020d3ab168 added possibility to update existing layout window from config
nadvornik
parents: 1464
diff changeset
1082 }
1317
cd7204a18f14 simplified and improved bar configuration
nadvornik
parents: 1315
diff changeset
1083 options_parse_func_push(parser_data, options_parse_layout, options_parse_layout_end, lw);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1084 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1085 else
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1086 {
1464
1b3751ac4743 be more verbose on parse errors
nadvornik
parents: 1463
diff changeset
1087 log_printf("unexpected in <toplevel>: <%s>\n", element_name);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1088 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1089 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1090 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1091
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1092
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1093
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1094
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1095
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1096 /*
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1097 *-----------------------------------------------------------------------------
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1098 * parser
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1099 *-----------------------------------------------------------------------------
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1100 */
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1101
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1102
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1103 struct _GQParserFuncData
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1104 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1105 GQParserStartFunc start_func;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1106 GQParserEndFunc end_func;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1107 // GQParserTextFunc text_func;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1108 gpointer data;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1109 };
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1110
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1111 void options_parse_func_push(GQParserData *parser_data, GQParserStartFunc start_func, GQParserEndFunc end_func, gpointer data)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1112 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1113 GQParserFuncData *func_data = g_new0(GQParserFuncData, 1);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1114 func_data->start_func = start_func;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1115 func_data->end_func = end_func;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1116 func_data->data = data;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1117
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1118 parser_data->parse_func_stack = g_list_prepend(parser_data->parse_func_stack, func_data);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1119 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1120
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1121 void options_parse_func_pop(GQParserData *parser_data)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1122 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1123 g_free(parser_data->parse_func_stack->data);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1124 parser_data->parse_func_stack = g_list_delete_link(parser_data->parse_func_stack, parser_data->parse_func_stack);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1125 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1126
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1127 void options_parse_func_set_data(GQParserData *parser_data, gpointer data)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1128 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1129 GQParserFuncData *func = parser_data->parse_func_stack->data;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1130 func->data = data;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1131 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1132
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1133
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1134 static void start_element(GMarkupParseContext *context,
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1135 const gchar *element_name,
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1136 const gchar **attribute_names,
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1137 const gchar **attribute_values,
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1138 gpointer user_data,
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1139 GError **error)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1140 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1141 GQParserData *parser_data = user_data;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1142 GQParserFuncData *func = parser_data->parse_func_stack->data;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1143 DEBUG_1("start %s", element_name);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1144
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1145 if (func->start_func)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1146 func->start_func(parser_data, context, element_name, attribute_names, attribute_values, func->data, error);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1147 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1148
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1149 static void end_element(GMarkupParseContext *context,
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1150 const gchar *element_name,
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1151 gpointer user_data,
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1152 GError **error)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1153 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1154 GQParserData *parser_data = user_data;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1155 GQParserFuncData *func = parser_data->parse_func_stack->data;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1156 DEBUG_1("end %s", element_name);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1157
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1158 if (func->end_func)
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1159 func->end_func(parser_data, context, element_name, func->data, error);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1160
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1161 options_parse_func_pop(parser_data);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1162 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1163
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1164 static GMarkupParser parser = {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1165 start_element,
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1166 end_element,
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1167 NULL,
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1168 NULL,
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1169 NULL
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1170 };
741
0e8b802e54d5 Move code from save_options() to new save_options_to() which takes
zas_
parents: 738
diff changeset
1171
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1172 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1173 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1174 * load configuration (public)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1175 *-----------------------------------------------------------------------------
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
1176 */
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1177
1484
9c16a93a0fdf improved sidebar configuration
nadvornik
parents: 1469
diff changeset
1178 gboolean load_config_from_buf(const gchar *buf, gsize size, gboolean startup)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1179 {
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1180 GMarkupParseContext *context;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1181 gboolean ret = TRUE;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1182 GQParserData *parser_data;
630
83d3ded39e49 An option to save and restore the last path used was added.
zas_
parents: 629
diff changeset
1183
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1184 parser_data = g_new0(GQParserData, 1);
1313
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
1185
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
1186 parser_data->startup = startup;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1187 options_parse_func_push(parser_data, options_parse_toplevel, NULL, NULL);
764
ae618ebec3e9 Save properties window width and height to rc file and restore
zas_
parents: 743
diff changeset
1188
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1189 context = g_markup_parse_context_new(&parser, 0, parser_data, NULL);
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
1190
1346
c9949c19a6d0 No space between function name and first parenthesis, it eases greping (see CODING).
zas_
parents: 1336
diff changeset
1191 if (g_markup_parse_context_parse(context, buf, size, NULL) == FALSE)
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1192 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1193 ret = FALSE;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1194 DEBUG_1("Parse failed");
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1195 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1196
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1197 g_free(parser_data);
684
9f00d0d874fa Save order of Properties dialog tabs to rc file.
zas_
parents: 641
diff changeset
1198
1484
9c16a93a0fdf improved sidebar configuration
nadvornik
parents: 1469
diff changeset
1199 g_markup_parse_context_free(context);
9c16a93a0fdf improved sidebar configuration
nadvornik
parents: 1469
diff changeset
1200 return ret;
9c16a93a0fdf improved sidebar configuration
nadvornik
parents: 1469
diff changeset
1201 }
9c16a93a0fdf improved sidebar configuration
nadvornik
parents: 1469
diff changeset
1202
9c16a93a0fdf improved sidebar configuration
nadvornik
parents: 1469
diff changeset
1203 gboolean load_config_from_file(const gchar *utf8_path, gboolean startup)
9c16a93a0fdf improved sidebar configuration
nadvornik
parents: 1469
diff changeset
1204 {
9c16a93a0fdf improved sidebar configuration
nadvornik
parents: 1469
diff changeset
1205 gsize size;
9c16a93a0fdf improved sidebar configuration
nadvornik
parents: 1469
diff changeset
1206 gchar *buf;
9c16a93a0fdf improved sidebar configuration
nadvornik
parents: 1469
diff changeset
1207 gboolean ret = TRUE;
9c16a93a0fdf improved sidebar configuration
nadvornik
parents: 1469
diff changeset
1208
9c16a93a0fdf improved sidebar configuration
nadvornik
parents: 1469
diff changeset
1209 if (g_file_get_contents(utf8_path, &buf, &size, NULL) == FALSE)
9c16a93a0fdf improved sidebar configuration
nadvornik
parents: 1469
diff changeset
1210 {
9c16a93a0fdf improved sidebar configuration
nadvornik
parents: 1469
diff changeset
1211 return FALSE;
9c16a93a0fdf improved sidebar configuration
nadvornik
parents: 1469
diff changeset
1212 }
9c16a93a0fdf improved sidebar configuration
nadvornik
parents: 1469
diff changeset
1213 ret = load_config_from_buf(buf, size, startup);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1214 g_free(buf);
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1215 return ret;
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1216 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1284
diff changeset
1217
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
1218
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1219
1055
1646720364cf Adding a vim modeline to all files - patch by Klaus Ethgen
nadvornik
parents: 1023
diff changeset
1220 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */