annotate src/rcfile.c @ 2826:d0c6c5ae586b

Option to hide predefined keyword tree Selected on Preferences/General
author Colin Clark <colin.clark@cclark.uk>
date Sun, 26 Aug 2018 19:32:38 +0100
parents 5ed1842634a6
children 5d88a8dfa364
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
1 /*
2350
95507e596256 Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2339
diff changeset
2 * Copyright (C) 2006 John Ellis
95507e596256 Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2339
diff changeset
3 * Copyright (C) 2008 - 2016 The Geeqie Team
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
4 *
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
5 * Author: John Ellis
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
6 *
2350
95507e596256 Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2339
diff changeset
7 * This program is free software; you can redistribute it and/or modify
95507e596256 Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2339
diff changeset
8 * it under the terms of the GNU General Public License as published by
95507e596256 Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2339
diff changeset
9 * the Free Software Foundation; either version 2 of the License, or
95507e596256 Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2339
diff changeset
10 * (at your option) any later version.
95507e596256 Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2339
diff changeset
11 *
95507e596256 Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2339
diff changeset
12 * This program is distributed in the hope that it will be useful,
95507e596256 Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2339
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
95507e596256 Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2339
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
95507e596256 Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2339
diff changeset
15 * GNU General Public License for more details.
95507e596256 Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2339
diff changeset
16 *
95507e596256 Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2339
diff changeset
17 * You should have received a copy of the GNU General Public License along
95507e596256 Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2339
diff changeset
18 * with this program; if not, write to the Free Software Foundation, Inc.,
95507e596256 Update copyright in all files
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2339
diff changeset
19 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
20 */
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
21
276
9625a36d4a69 Implement secure rc file saving.
Laurent Monin <geeqie@norz.org>
parents: 267
diff changeset
22 #include <glib/gstdio.h>
9625a36d4a69 Implement secure rc file saving.
Laurent Monin <geeqie@norz.org>
parents: 267
diff changeset
23 #include <errno.h>
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
24
281
b1c2c2cf19d4 gqview.h -> main.h
Laurent Monin <geeqie@norz.org>
parents: 276
diff changeset
25 #include "main.h"
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
26 #include "rcfile.h"
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
27
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
28 #include "bar.h"
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
29 #include "bar_comment.h"
307
fa0e5a589fdb Move secure save code to its own files: secure_save.{c,h}.
Laurent Monin <geeqie@norz.org>
parents: 288
diff changeset
30 #include "bar_exif.h"
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
31 #include "bar_histogram.h"
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
32 #include "bar_keywords.h"
1320
f1607e105298 improved bar_sort configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1317
diff changeset
33 #include "bar_sort.h"
768
11eadcaeb207 Use functions to set editors name and command and ensure they are
Laurent Monin <geeqie@norz.org>
parents: 764
diff changeset
34 #include "editors.h"
586
122fc2223b42 split filelist.c to filefilter.c and filedata.c
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 556
diff changeset
35 #include "filefilter.h"
1023
574427d7aeed Move quoted_value() and escquote_value() to misc.[ch].
Laurent Monin <geeqie@norz.org>
parents: 1019
diff changeset
36 #include "misc.h"
858
d0fd70db05b9 Use stricter types for image options.
Laurent Monin <geeqie@norz.org>
parents: 848
diff changeset
37 #include "pixbuf-renderer.h"
307
fa0e5a589fdb Move secure save code to its own files: secure_save.{c,h}.
Laurent Monin <geeqie@norz.org>
parents: 288
diff changeset
38 #include "secure_save.h"
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
39 #include "slideshow.h"
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
40 #include "ui_fileops.h"
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
41 #include "layout.h"
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
42 #include "layout_util.h"
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
43 #include "bar.h"
1404
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
44 #include "metadata.h"
1604
934646ea4af8 added GPS map support - patch by Colin Clark
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1590
diff changeset
45 #include "bar_gps.h"
2426
28546abc2b90 Fix #435: Remember duplicates settings
Colin Clark <cclark@mcb.net>
parents: 2417
diff changeset
46 #include "dupe.h"
2670
ec21b78a088c Fix #543: Size of dialog windows in the GTK3 version is too small
Colin Clark <colin.clark@cclark.uk>
parents: 2662
diff changeset
47 #include "ui_utildlg.h"
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
48
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
49 /*
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
50 *-----------------------------------------------------------------------------
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
51 * line write/parse routines (public)
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
52 *-----------------------------------------------------------------------------
442
f698b737556b Big whitespaces cleanup:
Laurent Monin <geeqie@norz.org>
parents: 433
diff changeset
53 */
f698b737556b Big whitespaces cleanup:
Laurent Monin <geeqie@norz.org>
parents: 433
diff changeset
54
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
55 void write_indent(GString *str, gint indent)
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
56 {
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
57 g_string_append_printf(str, "\n%*s", indent * 4, "");
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
58 }
210
71d6db01101c Improve escaping and quoting of strings saved in rc files.
Laurent Monin <geeqie@norz.org>
parents: 209
diff changeset
59
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
60 void write_char_option(GString *str, gint indent, const gchar *label, const gchar *text)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
61 {
2184
9cdebd070874 Trim trailing white spaces.
Laurent Monin <zas@norz.org>
parents: 2142
diff changeset
62 /* this is needed for overlay string, because g_markup_escape_text does not handle \n and such,
1325
7cf113b35917 correctly save and restore overlay string
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1321
diff changeset
63 ideas for improvement are welcome
7cf113b35917 correctly save and restore overlay string
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1321
diff changeset
64 */
7cf113b35917 correctly save and restore overlay string
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1321
diff changeset
65 static const unsigned char no_quote_utf[] = {
7cf113b35917 correctly save and restore overlay string
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1321
diff changeset
66 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b,
7cf113b35917 correctly save and restore overlay string
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1321
diff changeset
67 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
7cf113b35917 correctly save and restore overlay string
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1321
diff changeset
68 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3,
7cf113b35917 correctly save and restore overlay string
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1321
diff changeset
69 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
7cf113b35917 correctly save and restore overlay string
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1321
diff changeset
70 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb,
7cf113b35917 correctly save and restore overlay string
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1321
diff changeset
71 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
7cf113b35917 correctly save and restore overlay string
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1321
diff changeset
72 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3,
7cf113b35917 correctly save and restore overlay string
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1321
diff changeset
73 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
7cf113b35917 correctly save and restore overlay string
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1321
diff changeset
74 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb,
7cf113b35917 correctly save and restore overlay string
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1321
diff changeset
75 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
7cf113b35917 correctly save and restore overlay string
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1321
diff changeset
76 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
7cf113b35917 correctly save and restore overlay string
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1321
diff changeset
77 '"', 0 /* '"' is handled in g_markup_escape_text */
7cf113b35917 correctly save and restore overlay string
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1321
diff changeset
78 };
7cf113b35917 correctly save and restore overlay string
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1321
diff changeset
79
2184
9cdebd070874 Trim trailing white spaces.
Laurent Monin <zas@norz.org>
parents: 2142
diff changeset
80 gchar *escval1 = g_strescape(text ? text : "", (gchar *) no_quote_utf);
1325
7cf113b35917 correctly save and restore overlay string
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1321
diff changeset
81 gchar *escval2 = g_markup_escape_text(escval1, -1);
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
82 g_string_append_printf(str, "%s = \"%s\" ", label, escval2);
1325
7cf113b35917 correctly save and restore overlay string
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1321
diff changeset
83 g_free(escval2);
7cf113b35917 correctly save and restore overlay string
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1321
diff changeset
84 g_free(escval1);
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
85 }
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
86
2072
6b9508574641 Add read_dummy_option() to handle old/deprecated options.
Laurent Monin <zas@norz.org>
parents: 2043
diff changeset
87 /* dummy read for old/obsolete/futur/deprecated/unused options */
6b9508574641 Add read_dummy_option() to handle old/deprecated options.
Laurent Monin <zas@norz.org>
parents: 2043
diff changeset
88 gboolean read_dummy_option(const gchar *option, const gchar *label, const gchar *message)
6b9508574641 Add read_dummy_option() to handle old/deprecated options.
Laurent Monin <zas@norz.org>
parents: 2043
diff changeset
89 {
6b9508574641 Add read_dummy_option() to handle old/deprecated options.
Laurent Monin <zas@norz.org>
parents: 2043
diff changeset
90 if (g_ascii_strcasecmp(option, label) != 0) return FALSE;
6b9508574641 Add read_dummy_option() to handle old/deprecated options.
Laurent Monin <zas@norz.org>
parents: 2043
diff changeset
91 log_printf(_("Option %s ignored: %s\n"), option, message);
6b9508574641 Add read_dummy_option() to handle old/deprecated options.
Laurent Monin <zas@norz.org>
parents: 2043
diff changeset
92 return TRUE;
6b9508574641 Add read_dummy_option() to handle old/deprecated options.
Laurent Monin <zas@norz.org>
parents: 2043
diff changeset
93 }
6b9508574641 Add read_dummy_option() to handle old/deprecated options.
Laurent Monin <zas@norz.org>
parents: 2043
diff changeset
94
6b9508574641 Add read_dummy_option() to handle old/deprecated options.
Laurent Monin <zas@norz.org>
parents: 2043
diff changeset
95
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
96 gboolean read_char_option(const gchar *option, const gchar *label, const gchar *value, gchar **text)
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
97 {
639
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
98 if (g_ascii_strcasecmp(option, label) != 0) return FALSE;
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
99 if (!text) return FALSE;
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
100
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
101 g_free(*text);
1325
7cf113b35917 correctly save and restore overlay string
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1321
diff changeset
102 *text = g_strcompress(value);
639
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
103 return TRUE;
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
104 }
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
105
267
e4cf5091eab6 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
Laurent Monin <geeqie@norz.org>
parents: 250
diff changeset
106 /* Since gdk_color_to_string() is only available since gtk 2.12
e4cf5091eab6 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
Laurent Monin <geeqie@norz.org>
parents: 250
diff changeset
107 * here is an equivalent stub function. */
e4cf5091eab6 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
Laurent Monin <geeqie@norz.org>
parents: 250
diff changeset
108 static gchar *color_to_string(GdkColor *color)
e4cf5091eab6 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
Laurent Monin <geeqie@norz.org>
parents: 250
diff changeset
109 {
e4cf5091eab6 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
Laurent Monin <geeqie@norz.org>
parents: 250
diff changeset
110 return g_strdup_printf("#%04X%04X%04X", color->red, color->green, color->blue);
e4cf5091eab6 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
Laurent Monin <geeqie@norz.org>
parents: 250
diff changeset
111 }
e4cf5091eab6 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
Laurent Monin <geeqie@norz.org>
parents: 250
diff changeset
112
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
113 void write_color_option(GString *str, gint indent, gchar *label, GdkColor *color)
208
d74cfaa3d146 set user-defined color as image background - patch by Laurent MONIN
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 196
diff changeset
114 {
d74cfaa3d146 set user-defined color as image background - patch by Laurent MONIN
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 196
diff changeset
115 if (color)
d74cfaa3d146 set user-defined color as image background - patch by Laurent MONIN
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 196
diff changeset
116 {
267
e4cf5091eab6 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
Laurent Monin <geeqie@norz.org>
parents: 250
diff changeset
117 gchar *colorstring = color_to_string(color);
208
d74cfaa3d146 set user-defined color as image background - patch by Laurent MONIN
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 196
diff changeset
118
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
119 write_char_option(str, indent, label, colorstring);
208
d74cfaa3d146 set user-defined color as image background - patch by Laurent MONIN
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 196
diff changeset
120 g_free(colorstring);
d74cfaa3d146 set user-defined color as image background - patch by Laurent MONIN
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 196
diff changeset
121 }
d74cfaa3d146 set user-defined color as image background - patch by Laurent MONIN
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 196
diff changeset
122 else
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
123 write_char_option(str, indent, label, "");
208
d74cfaa3d146 set user-defined color as image background - patch by Laurent MONIN
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 196
diff changeset
124 }
d74cfaa3d146 set user-defined color as image background - patch by Laurent MONIN
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 196
diff changeset
125
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
126 gboolean read_color_option(const gchar *option, const gchar *label, const gchar *value, GdkColor *color)
208
d74cfaa3d146 set user-defined color as image background - patch by Laurent MONIN
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 196
diff changeset
127 {
639
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
128 if (g_ascii_strcasecmp(option, label) != 0) return FALSE;
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
129 if (!color) return FALSE;
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
130
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
131 if (!*value) return FALSE;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
132 gdk_color_parse(value, color);
639
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
133 return TRUE;
208
d74cfaa3d146 set user-defined color as image background - patch by Laurent MONIN
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 196
diff changeset
134 }
d74cfaa3d146 set user-defined color as image background - patch by Laurent MONIN
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 196
diff changeset
135
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
136 void write_int_option(GString *str, gint indent, const gchar *label, gint n)
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
137 {
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
138 g_string_append_printf(str, "%s = \"%d\" ", label, n);
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
139 }
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
140
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
141 gboolean read_int_option(const gchar *option, const gchar *label, const gchar *value, gint *n)
995
401cd18f8d38 Whitespaces cleanup.
Laurent Monin <geeqie@norz.org>
parents: 980
diff changeset
142 {
639
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
143 if (g_ascii_strcasecmp(option, label) != 0) return FALSE;
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
144 if (!n) return FALSE;
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
145
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
146 if (g_ascii_isdigit(value[0]) || (value[0] == '-' && g_ascii_isdigit(value[1])))
351
f988d2f0b787 Simplify read_*_option() stuff by passing pointer to option value.
Laurent Monin <geeqie@norz.org>
parents: 350
diff changeset
147 {
f988d2f0b787 Simplify read_*_option() stuff by passing pointer to option value.
Laurent Monin <geeqie@norz.org>
parents: 350
diff changeset
148 *n = strtol(value, NULL, 10);
f988d2f0b787 Simplify read_*_option() stuff by passing pointer to option value.
Laurent Monin <geeqie@norz.org>
parents: 350
diff changeset
149 }
639
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
150 else
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
151 {
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
152 if (g_ascii_strcasecmp(value, "true") == 0)
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
153 *n = 1;
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
154 else
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
155 *n = 0;
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
156 }
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
157
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
158 return TRUE;
351
f988d2f0b787 Simplify read_*_option() stuff by passing pointer to option value.
Laurent Monin <geeqie@norz.org>
parents: 350
diff changeset
159 }
f988d2f0b787 Simplify read_*_option() stuff by passing pointer to option value.
Laurent Monin <geeqie@norz.org>
parents: 350
diff changeset
160
2413
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
161 void write_ushort_option(GString *str, gint indent, const gchar *label, guint16 n)
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
162 {
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
163 g_string_append_printf(str, "%s = \"%uh\" ", label, n);
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
164 }
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
165
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
166 gboolean read_ushort_option(const gchar *option, const gchar *label, const gchar *value, guint16 *n)
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
167 {
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
168 if (g_ascii_strcasecmp(option, label) != 0) return FALSE;
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
169 if (!n) return FALSE;
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
170
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
171 if (g_ascii_isdigit(value[0]))
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
172 {
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
173 *n = strtoul(value, NULL, 10);
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
174 }
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
175 else
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
176 {
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
177 if (g_ascii_strcasecmp(value, "true") == 0)
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
178 *n = 1;
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
179 else
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
180 *n = 0;
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
181 }
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
182
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
183 return TRUE;
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
184 }
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
185
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
186 void write_uint_option(GString *str, gint indent, const gchar *label, guint n)
380
41079d11eba7 Introduce a new struct ViewDir to handle directory views common
Laurent Monin <geeqie@norz.org>
parents: 377
diff changeset
187 {
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
188 g_string_append_printf(str, "%s = \"%u\" ", label, n);
380
41079d11eba7 Introduce a new struct ViewDir to handle directory views common
Laurent Monin <geeqie@norz.org>
parents: 377
diff changeset
189 }
41079d11eba7 Introduce a new struct ViewDir to handle directory views common
Laurent Monin <geeqie@norz.org>
parents: 377
diff changeset
190
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
191 gboolean read_uint_option(const gchar *option, const gchar *label, const gchar *value, guint *n)
351
f988d2f0b787 Simplify read_*_option() stuff by passing pointer to option value.
Laurent Monin <geeqie@norz.org>
parents: 350
diff changeset
192 {
639
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
193 if (g_ascii_strcasecmp(option, label) != 0) return FALSE;
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
194 if (!n) return FALSE;
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
195
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
196 if (g_ascii_isdigit(value[0]))
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
197 {
351
f988d2f0b787 Simplify read_*_option() stuff by passing pointer to option value.
Laurent Monin <geeqie@norz.org>
parents: 350
diff changeset
198 *n = strtoul(value, NULL, 10);
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
199 }
639
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
200 else
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
201 {
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
202 if (g_ascii_strcasecmp(value, "true") == 0)
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
203 *n = 1;
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
204 else
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
205 *n = 0;
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
206 }
2185
c14a1d8e6aa4 Trim trailing white spaces on empty lines.
Laurent Monin <zas@norz.org>
parents: 2184
diff changeset
207
639
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
208 return TRUE;
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
209 }
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
210
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
211 gboolean read_uint_option_clamp(const gchar *option, const gchar *label, const gchar *value, guint *n, guint min, guint max)
858
d0fd70db05b9 Use stricter types for image options.
Laurent Monin <geeqie@norz.org>
parents: 848
diff changeset
212 {
d0fd70db05b9 Use stricter types for image options.
Laurent Monin <geeqie@norz.org>
parents: 848
diff changeset
213 gboolean ret;
d0fd70db05b9 Use stricter types for image options.
Laurent Monin <geeqie@norz.org>
parents: 848
diff changeset
214
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
215 ret = read_uint_option(option, label, value, n);
858
d0fd70db05b9 Use stricter types for image options.
Laurent Monin <geeqie@norz.org>
parents: 848
diff changeset
216 if (ret) *n = CLAMP(*n, min, max);
d0fd70db05b9 Use stricter types for image options.
Laurent Monin <geeqie@norz.org>
parents: 848
diff changeset
217
d0fd70db05b9 Use stricter types for image options.
Laurent Monin <geeqie@norz.org>
parents: 848
diff changeset
218 return ret;
d0fd70db05b9 Use stricter types for image options.
Laurent Monin <geeqie@norz.org>
parents: 848
diff changeset
219 }
d0fd70db05b9 Use stricter types for image options.
Laurent Monin <geeqie@norz.org>
parents: 848
diff changeset
220
d0fd70db05b9 Use stricter types for image options.
Laurent Monin <geeqie@norz.org>
parents: 848
diff changeset
221
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
222 gboolean read_int_option_clamp(const gchar *option, const gchar *label, const gchar *value, gint *n, gint min, gint max)
351
f988d2f0b787 Simplify read_*_option() stuff by passing pointer to option value.
Laurent Monin <geeqie@norz.org>
parents: 350
diff changeset
223 {
639
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
224 gboolean ret;
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
225
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
226 ret = read_int_option(option, label, value, n);
639
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
227 if (ret) *n = CLAMP(*n, min, max);
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
228
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
229 return ret;
351
f988d2f0b787 Simplify read_*_option() stuff by passing pointer to option value.
Laurent Monin <geeqie@norz.org>
parents: 350
diff changeset
230 }
f988d2f0b787 Simplify read_*_option() stuff by passing pointer to option value.
Laurent Monin <geeqie@norz.org>
parents: 350
diff changeset
231
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
232 void write_int_unit_option(GString *str, gint indent, gchar *label, gint n, gint subunits)
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
233 {
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
234 gint l, r;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
235
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
236 if (subunits > 0)
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
237 {
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
238 l = n / subunits;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
239 r = n % subunits;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
240 }
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
241 else
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
242 {
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
243 l = n;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
244 r = 0;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
245 }
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
246
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
247 g_string_append_printf(str, "%s = \"%d.%d\" ", label, l, r);
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
248 }
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
249
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
250 gboolean read_int_unit_option(const gchar *option, const gchar *label, const gchar *value, gint *n, gint subunits)
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
251 {
639
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
252 gint l, r;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
253 gchar *ptr, *buf;
639
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
254
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
255 if (g_ascii_strcasecmp(option, label) != 0) return FALSE;
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
256 if (!n) return FALSE;
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
257
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
258 buf = g_strdup(value);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
259 ptr = buf;
639
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
260 while (*ptr != '\0' && *ptr != '.') ptr++;
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
261 if (*ptr == '.')
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
262 {
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
263 *ptr = '\0';
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
264 l = strtol(value, NULL, 10);
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
265 *ptr = '.';
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
266 ptr++;
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
267 r = strtol(ptr, NULL, 10);
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
268 }
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
269 else
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
270 {
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
271 l = strtol(value, NULL, 10);
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
272 r = 0;
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
273 }
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
274
639
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
275 *n = l * subunits + r;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
276 g_free(buf);
2185
c14a1d8e6aa4 Trim trailing white spaces on empty lines.
Laurent Monin <zas@norz.org>
parents: 2184
diff changeset
277
639
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
278 return TRUE;
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
279 }
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
280
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
281 void write_bool_option(GString *str, gint indent, gchar *label, gint n)
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
282 {
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
283 g_string_append_printf(str, "%s = \"%s\" ", label, n ? "true" : "false");
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
284 }
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
285
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
286 gboolean read_bool_option(const gchar *option, const gchar *label, const gchar *value, gint *n)
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
287 {
639
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
288 if (g_ascii_strcasecmp(option, label) != 0) return FALSE;
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
289 if (!n) return FALSE;
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
290
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
291 if (g_ascii_strcasecmp(value, "true") == 0 || atoi(value) != 0)
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
292 *n = TRUE;
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
293 else
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
294 *n = FALSE;
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
295
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
296 return TRUE;
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
297 }
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
298
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
299 /*
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
300 *-----------------------------------------------------------------------------
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
301 * write fuctions for elements (private)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
302 *-----------------------------------------------------------------------------
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
303 */
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
304
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
305 static void write_global_attributes(GString *outstr, gint indent)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
306 {
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
307 /* General Options */
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
308 WRITE_NL(); WRITE_BOOL(*options, show_icon_names);
2777
813be27b1cd5 Addl fix #323: Rating system
Colin Clark <colin.clark@cclark.uk>
parents: 2770
diff changeset
309 WRITE_NL(); WRITE_BOOL(*options, show_star_rating);
2794
780a9b685335 Ref #331: Overimposed custom composition rule lines
Colin Clark <colin.clark@cclark.uk>
parents: 2793
diff changeset
310 WRITE_NL(); WRITE_BOOL(*options, show_guidelines);
2826
d0c6c5ae586b Option to hide predefined keyword tree
Colin Clark <colin.clark@cclark.uk>
parents: 2815
diff changeset
311 WRITE_NL(); WRITE_BOOL(*options, show_predefined_keyword_tree);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
312 WRITE_SEPARATOR();
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
313
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
314 WRITE_NL(); WRITE_BOOL(*options, tree_descend_subdirs);
2376
6c310168a91c Add four new preferences
Maciej S. Szmigiero <mail@maciej.szmigiero.name>
parents: 2350
diff changeset
315 WRITE_NL(); WRITE_BOOL(*options, view_dir_list_single_click_enter);
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
316 WRITE_NL(); WRITE_BOOL(*options, lazy_image_sync);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
317 WRITE_NL(); WRITE_BOOL(*options, update_on_time_change);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
318 WRITE_SEPARATOR();
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
319
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
320 WRITE_NL(); WRITE_BOOL(*options, progressive_key_scrolling);
2376
6c310168a91c Add four new preferences
Maciej S. Szmigiero <mail@maciej.szmigiero.name>
parents: 2350
diff changeset
321 WRITE_NL(); WRITE_UINT(*options, keyboard_scroll_step);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
322
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
323 WRITE_NL(); WRITE_UINT(*options, duplicates_similarity_threshold);
2426
28546abc2b90 Fix #435: Remember duplicates settings
Colin Clark <cclark@mcb.net>
parents: 2417
diff changeset
324 WRITE_NL(); WRITE_UINT(*options, duplicates_match);
28546abc2b90 Fix #435: Remember duplicates settings
Colin Clark <cclark@mcb.net>
parents: 2417
diff changeset
325 WRITE_NL(); WRITE_UINT(*options, duplicates_select_type);
28546abc2b90 Fix #435: Remember duplicates settings
Colin Clark <cclark@mcb.net>
parents: 2417
diff changeset
326 WRITE_NL(); WRITE_BOOL(*options, duplicates_thumbnails);
2328
ad005c02001a Allow to configure rotation invariance
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2301
diff changeset
327 WRITE_NL(); WRITE_BOOL(*options, rot_invariant_sim);
2489
ab6a0d1bd821 Fix #477: similarity duplicate search
Colin Clark <colin.clark@cclark.uk>
parents: 2485
diff changeset
328 WRITE_NL(); WRITE_BOOL(*options, sort_totals);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
329 WRITE_SEPARATOR();
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
330
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
331 WRITE_NL(); WRITE_BOOL(*options, mousewheel_scrolls);
2376
6c310168a91c Add four new preferences
Maciej S. Szmigiero <mail@maciej.szmigiero.name>
parents: 2350
diff changeset
332 WRITE_NL(); WRITE_BOOL(*options, image_lm_click_nav);
2631
e493a7df8745 Addl fix #510: Rudimentary video support
Tomasz Golinski <tomaszg@math.uwb.edu.pl>
parents: 2623
diff changeset
333 WRITE_NL(); WRITE_BOOL(*options, image_l_click_video);
e493a7df8745 Addl fix #510: Rudimentary video support
Tomasz Golinski <tomaszg@math.uwb.edu.pl>
parents: 2623
diff changeset
334 WRITE_NL(); WRITE_CHAR(*options, image_l_click_video_editor);
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
335 WRITE_NL(); WRITE_INT(*options, open_recent_list_maxsize);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
336 WRITE_NL(); WRITE_INT(*options, dnd_icon_size);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
337 WRITE_NL(); WRITE_BOOL(*options, place_dialogs_under_mouse);
2662
08d2547d72ea Fix #137: "Copy path" problem (or may be feature)
Colin Clark <colin.clark@cclark.uk>
parents: 2631
diff changeset
338 WRITE_NL(); WRITE_INT(*options, clipboard_selection);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
339
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
340 WRITE_NL(); WRITE_BOOL(*options, save_window_positions);
2376
6c310168a91c Add four new preferences
Maciej S. Szmigiero <mail@maciej.szmigiero.name>
parents: 2350
diff changeset
341 WRITE_NL(); WRITE_BOOL(*options, use_saved_window_positions_for_new_windows);
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
342 WRITE_NL(); WRITE_BOOL(*options, tools_restore_state);
2670
ec21b78a088c Fix #543: Size of dialog windows in the GTK3 version is too small
Colin Clark <colin.clark@cclark.uk>
parents: 2662
diff changeset
343 WRITE_NL(); WRITE_BOOL(*options, save_dialog_window_positions);
2740
808983eb036e Option to display window ID
Colin Clark <colin.clark@cclark.uk>
parents: 2673
diff changeset
344 WRITE_NL(); WRITE_BOOL(*options, show_window_ids);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
345
2505
d01e5b8e80d9 Eliminate FIXME: Log window line limit
Colin Clark <colin.clark@cclark.uk>
parents: 2504
diff changeset
346 WRITE_NL(); WRITE_UINT(*options, log_window_lines);
2596
9c435c86a296 Optional timer data in log window
Colin Clark <colin.clark@cclark.uk>
parents: 2512
diff changeset
347 WRITE_NL(); WRITE_BOOL(*options, log_window.timer_data);
2505
d01e5b8e80d9 Eliminate FIXME: Log window line limit
Colin Clark <colin.clark@cclark.uk>
parents: 2504
diff changeset
348
2750
0eac8ea9b1be Fix #220, 269: marks do not persist
Colin Clark <colin.clark@cclark.uk>
parents: 2740
diff changeset
349 WRITE_NL(); WRITE_BOOL(*options, marks_save);
2756
f2f01d556f51 Fix #597: Help file search
Colin Clark <colin.clark@cclark.uk>
parents: 2752
diff changeset
350 WRITE_NL(); WRITE_CHAR(*options, help_search_engine);
2750
0eac8ea9b1be Fix #220, 269: marks do not persist
Colin Clark <colin.clark@cclark.uk>
parents: 2740
diff changeset
351
2769
ed8cc78cb9dd Option to change default button for copy/move dialogs
Colin Clark <colin.clark@cclark.uk>
parents: 2756
diff changeset
352 WRITE_NL(); WRITE_BOOL(*options, with_rename);
2793
2feed80bcd34 Collections changes
Colin Clark <colin.clark@cclark.uk>
parents: 2777
diff changeset
353 WRITE_NL(); WRITE_BOOL(*options, collections_on_top);
2769
ed8cc78cb9dd Option to change default button for copy/move dialogs
Colin Clark <colin.clark@cclark.uk>
parents: 2756
diff changeset
354
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
355 /* File operations Options */
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
356 WRITE_NL(); WRITE_BOOL(*options, file_ops.enable_in_place_rename);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
357 WRITE_NL(); WRITE_BOOL(*options, file_ops.confirm_delete);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
358 WRITE_NL(); WRITE_BOOL(*options, file_ops.enable_delete_key);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
359 WRITE_NL(); WRITE_BOOL(*options, file_ops.safe_delete_enable);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
360 WRITE_NL(); WRITE_CHAR(*options, file_ops.safe_delete_path);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
361 WRITE_NL(); WRITE_INT(*options, file_ops.safe_delete_folder_maxsize);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
362
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
363 /* Properties dialog Options */
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
364 WRITE_NL(); WRITE_CHAR(*options, properties.tabs_order);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
365
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
366 /* Image Options */
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
367 WRITE_NL(); WRITE_UINT(*options, image.zoom_mode);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
368
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
369 WRITE_SEPARATOR();
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
370 WRITE_NL(); WRITE_BOOL(*options, image.zoom_2pass);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
371 WRITE_NL(); WRITE_BOOL(*options, image.zoom_to_fit_allow_expand);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
372 WRITE_NL(); WRITE_UINT(*options, image.zoom_quality);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
373 WRITE_NL(); WRITE_INT(*options, image.zoom_increment);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
374 WRITE_NL(); WRITE_BOOL(*options, image.fit_window_to_image);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
375 WRITE_NL(); WRITE_BOOL(*options, image.limit_window_size);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
376 WRITE_NL(); WRITE_INT(*options, image.max_window_size);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
377 WRITE_NL(); WRITE_BOOL(*options, image.limit_autofit_size);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
378 WRITE_NL(); WRITE_INT(*options, image.max_autofit_size);
2474
f591509cb3d3 Fix #123: Limit image expansion in Fit To Window
Colin Clark <colin.clark@cclark.uk>
parents: 2457
diff changeset
379 WRITE_NL(); WRITE_INT(*options, image.max_enlargement_size);
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
380 WRITE_NL(); WRITE_UINT(*options, image.scroll_reset_method);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
381 WRITE_NL(); WRITE_INT(*options, image.tile_cache_max);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
382 WRITE_NL(); WRITE_INT(*options, image.image_cache_max);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
383 WRITE_NL(); WRITE_BOOL(*options, image.enable_read_ahead);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
384 WRITE_NL(); WRITE_BOOL(*options, image.exif_rotate_enable);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
385 WRITE_NL(); WRITE_BOOL(*options, image.use_custom_border_color);
1644
2b10e2bee592 the options for custom border color were made independent
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1626
diff changeset
386 WRITE_NL(); WRITE_BOOL(*options, image.use_custom_border_color_in_fullscreen);
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
387 WRITE_NL(); WRITE_COLOR(*options, image.border_color);
2457
58f993045468 Fix #219: Ability to set solid colour for transparency layer
Colin Clark <cclark@mcb.net>
parents: 2454
diff changeset
388 WRITE_NL(); WRITE_COLOR(*options, image.alpha_color_1);
58f993045468 Fix #219: Ability to set solid colour for transparency layer
Colin Clark <cclark@mcb.net>
parents: 2454
diff changeset
389 WRITE_NL(); WRITE_COLOR(*options, image.alpha_color_2);
2084
1c712b43f063 added option for clutter renderer
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 2072
diff changeset
390 WRITE_NL(); WRITE_BOOL(*options, image.use_clutter_renderer);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
391
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
392 /* Thumbnails Options */
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
393 WRITE_NL(); WRITE_INT(*options, thumbnails.max_width);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
394 WRITE_NL(); WRITE_INT(*options, thumbnails.max_height);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
395 WRITE_NL(); WRITE_BOOL(*options, thumbnails.enable_caching);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
396 WRITE_NL(); WRITE_BOOL(*options, thumbnails.cache_into_dirs);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
397 WRITE_NL(); WRITE_BOOL(*options, thumbnails.use_xvpics);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
398 WRITE_NL(); WRITE_BOOL(*options, thumbnails.spec_standard);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
399 WRITE_NL(); WRITE_UINT(*options, thumbnails.quality);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
400 WRITE_NL(); WRITE_BOOL(*options, thumbnails.use_exif);
2673
bef1f1a91df9 Fix #541: Showing existing, or maybe generating thumbnails for MP4 and WEBM
Tomasz Golinski <tomaszg@math.uwb.edu.pl>
parents: 2670
diff changeset
401 WRITE_NL(); WRITE_BOOL(*options, thumbnails.use_ft_metadata);
2800
0ecd4885dc09 Bug fix: Collection preview
Colin Clark <colin.clark@cclark.uk>
parents: 2794
diff changeset
402 WRITE_NL(); WRITE_INT(*options, thumbnails.collection_preview);
2673
bef1f1a91df9 Fix #541: Showing existing, or maybe generating thumbnails for MP4 and WEBM
Tomasz Golinski <tomaszg@math.uwb.edu.pl>
parents: 2670
diff changeset
403 // WRITE_NL(); WRITE_BOOL(*options, thumbnails.use_ft_metadata_small);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
404
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
405 /* File sorting Options */
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
406 WRITE_NL(); WRITE_INT(*options, file_sort.method);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
407 WRITE_NL(); WRITE_BOOL(*options, file_sort.ascending);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
408 WRITE_NL(); WRITE_BOOL(*options, file_sort.case_sensitive);
2406
16fcfac12c77 Fix #417: Natural sort order
Colin Clark <cclark@mcb.net>
parents: 2386
diff changeset
409 WRITE_NL(); WRITE_BOOL(*options, file_sort.natural);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
410
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
411 /* Fullscreen Options */
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
412 WRITE_NL(); WRITE_INT(*options, fullscreen.screen);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
413 WRITE_NL(); WRITE_BOOL(*options, fullscreen.clean_flip);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
414 WRITE_NL(); WRITE_BOOL(*options, fullscreen.disable_saver);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
415 WRITE_NL(); WRITE_BOOL(*options, fullscreen.above);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
416
1336
7fe7536f02e1 fixed overlay configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1335
diff changeset
417 WRITE_SEPARATOR();
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
418
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
419 /* Image Overlay Options */
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
420 WRITE_NL(); WRITE_CHAR(*options, image_overlay.template_string);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
421
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
422 WRITE_NL(); WRITE_INT(*options, image_overlay.x);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
423 WRITE_NL(); WRITE_INT(*options, image_overlay.y);
2335
aa2e9d37193b Image overlay configurable colours
Colin Clark <cclark@mcb.net>
parents: 2334
diff changeset
424 WRITE_NL(); WRITE_INT(*options, image_overlay.text_red);
aa2e9d37193b Image overlay configurable colours
Colin Clark <cclark@mcb.net>
parents: 2334
diff changeset
425 WRITE_NL(); WRITE_INT(*options, image_overlay.text_green);
aa2e9d37193b Image overlay configurable colours
Colin Clark <cclark@mcb.net>
parents: 2334
diff changeset
426 WRITE_NL(); WRITE_INT(*options, image_overlay.text_blue);
aa2e9d37193b Image overlay configurable colours
Colin Clark <cclark@mcb.net>
parents: 2334
diff changeset
427 WRITE_NL(); WRITE_INT(*options, image_overlay.text_alpha);
aa2e9d37193b Image overlay configurable colours
Colin Clark <cclark@mcb.net>
parents: 2334
diff changeset
428 WRITE_NL(); WRITE_INT(*options, image_overlay.background_red);
aa2e9d37193b Image overlay configurable colours
Colin Clark <cclark@mcb.net>
parents: 2334
diff changeset
429 WRITE_NL(); WRITE_INT(*options, image_overlay.background_green);
aa2e9d37193b Image overlay configurable colours
Colin Clark <cclark@mcb.net>
parents: 2334
diff changeset
430 WRITE_NL(); WRITE_INT(*options, image_overlay.background_blue);
aa2e9d37193b Image overlay configurable colours
Colin Clark <cclark@mcb.net>
parents: 2334
diff changeset
431 WRITE_NL(); WRITE_INT(*options, image_overlay.background_alpha);
2334
e38178f556f6 Image overlay configurable font
Colin Clark <cclark@mcb.net>
parents: 2328
diff changeset
432 WRITE_NL(); WRITE_CHAR(*options, image_overlay.font);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
433
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
434 /* Slideshow Options */
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
435 WRITE_NL(); WRITE_INT_UNIT(*options, slideshow.delay, SLIDESHOW_SUBSECOND_PRECISION);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
436 WRITE_NL(); WRITE_BOOL(*options, slideshow.random);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
437 WRITE_NL(); WRITE_BOOL(*options, slideshow.repeat);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
438
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
439 /* Collection Options */
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
440 WRITE_NL(); WRITE_BOOL(*options, collections.rectangular_selection);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
441
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
442 /* Filtering Options */
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
443 WRITE_NL(); WRITE_BOOL(*options, file_filter.show_hidden_files);
2265
15d51cf8ff3d Allow to choose to show parent folder
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2185
diff changeset
444 WRITE_NL(); WRITE_BOOL(*options, file_filter.show_parent_directory);
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
445 WRITE_NL(); WRITE_BOOL(*options, file_filter.show_dot_directory);
2301
dec8d9db5770 Fix #333 Renaming file extensions
Colin Clark <cclark@mcb.net>
parents: 2265
diff changeset
446 WRITE_NL(); WRITE_BOOL(*options, file_filter.disable_file_extension_checks);
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
447 WRITE_NL(); WRITE_BOOL(*options, file_filter.disable);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
448 WRITE_SEPARATOR();
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
449
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
450 /* Sidecars Options */
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
451 WRITE_NL(); WRITE_CHAR(*options, sidecar.ext);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
452
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
453 /* Shell command */
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
454 WRITE_NL(); WRITE_CHAR(*options, shell.path);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
455 WRITE_NL(); WRITE_CHAR(*options, shell.options);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
456
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
457 /* Helpers */
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
458 WRITE_NL(); WRITE_CHAR(*options, helpers.html_browser.command_name);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
459 WRITE_NL(); WRITE_CHAR(*options, helpers.html_browser.command_line);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
460
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
461 /* Metadata Options */
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
462 WRITE_NL(); WRITE_BOOL(*options, metadata.enable_metadata_dirs);
2184
9cdebd070874 Trim trailing white spaces.
Laurent Monin <zas@norz.org>
parents: 2142
diff changeset
463 WRITE_NL(); WRITE_BOOL(*options, metadata.save_in_image_file);
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
464 WRITE_NL(); WRITE_BOOL(*options, metadata.save_legacy_IPTC);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
465 WRITE_NL(); WRITE_BOOL(*options, metadata.warn_on_write_problems);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
466 WRITE_NL(); WRITE_BOOL(*options, metadata.save_legacy_format);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
467 WRITE_NL(); WRITE_BOOL(*options, metadata.sync_grouped_files);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
468 WRITE_NL(); WRITE_BOOL(*options, metadata.confirm_write);
2454
93d1c77a312b Fix #147: Alternative format for sidecar extension
Tomasz Golinski <tomaszg@math.uwb.edu.pl>
parents: 2426
diff changeset
469 WRITE_NL(); WRITE_BOOL(*options, metadata.sidecar_extended_name);
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
470 WRITE_NL(); WRITE_INT(*options, metadata.confirm_timeout);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
471 WRITE_NL(); WRITE_BOOL(*options, metadata.confirm_after_timeout);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
472 WRITE_NL(); WRITE_BOOL(*options, metadata.confirm_on_image_change);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
473 WRITE_NL(); WRITE_BOOL(*options, metadata.confirm_on_dir_change);
1590
32a63a57690f use "keywords" instead of "tags" in option name, it is more consistent
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1582
diff changeset
474 WRITE_NL(); WRITE_BOOL(*options, metadata.keywords_case_sensitive);
1567
ef3ca18df43f added an option to write image orientation to the metadata
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1548
diff changeset
475 WRITE_NL(); WRITE_BOOL(*options, metadata.write_orientation);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
476
2141
8ea33f1c3d52 Those stereo image options are of type int, not uint, use appropriate macros.
Laurent Monin <zas@norz.org>
parents: 2084
diff changeset
477 WRITE_NL(); WRITE_INT(*options, stereo.mode);
8ea33f1c3d52 Those stereo image options are of type int, not uint, use appropriate macros.
Laurent Monin <zas@norz.org>
parents: 2084
diff changeset
478 WRITE_NL(); WRITE_INT(*options, stereo.fsmode);
1893
5f724783a871 save and load stereo options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1802
diff changeset
479 WRITE_NL(); WRITE_BOOL(*options, stereo.enable_fsmode);
2141
8ea33f1c3d52 Those stereo image options are of type int, not uint, use appropriate macros.
Laurent Monin <zas@norz.org>
parents: 2084
diff changeset
480 WRITE_NL(); WRITE_INT(*options, stereo.fixed_w);
8ea33f1c3d52 Those stereo image options are of type int, not uint, use appropriate macros.
Laurent Monin <zas@norz.org>
parents: 2084
diff changeset
481 WRITE_NL(); WRITE_INT(*options, stereo.fixed_h);
8ea33f1c3d52 Those stereo image options are of type int, not uint, use appropriate macros.
Laurent Monin <zas@norz.org>
parents: 2084
diff changeset
482 WRITE_NL(); WRITE_INT(*options, stereo.fixed_x1);
8ea33f1c3d52 Those stereo image options are of type int, not uint, use appropriate macros.
Laurent Monin <zas@norz.org>
parents: 2084
diff changeset
483 WRITE_NL(); WRITE_INT(*options, stereo.fixed_y1);
8ea33f1c3d52 Those stereo image options are of type int, not uint, use appropriate macros.
Laurent Monin <zas@norz.org>
parents: 2084
diff changeset
484 WRITE_NL(); WRITE_INT(*options, stereo.fixed_x2);
8ea33f1c3d52 Those stereo image options are of type int, not uint, use appropriate macros.
Laurent Monin <zas@norz.org>
parents: 2084
diff changeset
485 WRITE_NL(); WRITE_INT(*options, stereo.fixed_y2);
2504
130acea2daa0 Fix #280: Set defaults for Auto Rename
Colin Clark <colin.clark@cclark.uk>
parents: 2489
diff changeset
486
2770
2e819f4a7a41 Read metadata in the idle loop
Colin Clark <colin.clark@cclark.uk>
parents: 2769
diff changeset
487 WRITE_NL(); WRITE_BOOL(*options, read_metadata_in_idle);
2e819f4a7a41 Read metadata in the idle loop
Colin Clark <colin.clark@cclark.uk>
parents: 2769
diff changeset
488
2777
813be27b1cd5 Addl fix #323: Rating system
Colin Clark <colin.clark@cclark.uk>
parents: 2770
diff changeset
489 WRITE_NL(); WRITE_UINT(*options, star_rating.star);
813be27b1cd5 Addl fix #323: Rating system
Colin Clark <colin.clark@cclark.uk>
parents: 2770
diff changeset
490 WRITE_NL(); WRITE_UINT(*options, star_rating.rejected);
813be27b1cd5 Addl fix #323: Rating system
Colin Clark <colin.clark@cclark.uk>
parents: 2770
diff changeset
491
2504
130acea2daa0 Fix #280: Set defaults for Auto Rename
Colin Clark <colin.clark@cclark.uk>
parents: 2489
diff changeset
492 /* copy move rename */
130acea2daa0 Fix #280: Set defaults for Auto Rename
Colin Clark <colin.clark@cclark.uk>
parents: 2489
diff changeset
493 WRITE_NL(); WRITE_INT(*options, cp_mv_rn.auto_start);
130acea2daa0 Fix #280: Set defaults for Auto Rename
Colin Clark <colin.clark@cclark.uk>
parents: 2489
diff changeset
494 WRITE_NL(); WRITE_INT(*options, cp_mv_rn.auto_padding);
130acea2daa0 Fix #280: Set defaults for Auto Rename
Colin Clark <colin.clark@cclark.uk>
parents: 2489
diff changeset
495 WRITE_NL(); WRITE_CHAR(*options, cp_mv_rn.auto_end);
130acea2daa0 Fix #280: Set defaults for Auto Rename
Colin Clark <colin.clark@cclark.uk>
parents: 2489
diff changeset
496 WRITE_NL(); WRITE_INT(*options, cp_mv_rn.formatted_start);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
497 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
498
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
499 static void write_color_profile(GString *outstr, gint indent)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
500 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
501 gint i;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
502 #ifndef HAVE_LCMS
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
503 g_string_append_printf(outstr, "<!-- NOTICE: %s was not built with support for color profiles,\n"
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
504 " color profile options will have no effect.\n-->\n", GQ_APPNAME);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
505 #endif
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
506
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
507 WRITE_NL(); WRITE_STRING("<color_profiles ");
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
508 WRITE_CHAR(options->color_profile, screen_file);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
509 WRITE_BOOL(options->color_profile, enabled);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
510 WRITE_BOOL(options->color_profile, use_image);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
511 WRITE_INT(options->color_profile, input_type);
1548
1bd57e730350 support X11 screen profile
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1540
diff changeset
512 WRITE_BOOL(options->color_profile, use_x11_screen_profile);
2386
a22a815359f9 Fix #414 Render Intents
Colin Clark <cclark@mcb.net>
parents: 2376
diff changeset
513 WRITE_INT(options->color_profile, render_intent);
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
514 WRITE_STRING(">");
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
515
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
516 indent++;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
517 for (i = 0; i < COLOR_PROFILE_INPUTS; i++)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
518 {
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
519 WRITE_NL(); WRITE_STRING("<profile ");
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
520 write_char_option(outstr, indent, "input_file", options->color_profile.input_file[i]);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
521 write_char_option(outstr, indent, "input_name", options->color_profile.input_name[i]);
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
522 WRITE_STRING("/>");
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
523 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
524 indent--;
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
525 WRITE_NL(); WRITE_STRING("</color_profiles>");
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
526 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
527
2752
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
528 static void write_marks_tooltips(GString *outstr, gint indent)
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
529 {
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
530 gint i;
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
531
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
532 WRITE_NL(); WRITE_STRING("<marks_tooltips>");
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
533 indent++;
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
534 for (i = 0; i < FILEDATA_MARKS_SIZE; i++)
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
535 {
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
536 WRITE_NL();
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
537 write_char_option(outstr, indent, "<tooltip text", options->marks_tooltips[i]);
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
538 WRITE_STRING("/>");
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
539 }
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
540 indent--;
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
541 WRITE_NL(); WRITE_STRING("</marks_tooltips>");
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
542 }
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
543
639
d7a3d8396461 Rework read_*_option():
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
544
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
545 /*
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
546 *-----------------------------------------------------------------------------
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
547 * save configuration (public)
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
548 *-----------------------------------------------------------------------------
442
f698b737556b Big whitespaces cleanup:
Laurent Monin <geeqie@norz.org>
parents: 433
diff changeset
549 */
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
550
1484
f3b033a71fc9 improved sidebar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1469
diff changeset
551 gboolean save_config_to_file(const gchar *utf8_path, ConfOptions *options)
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
552 {
276
9625a36d4a69 Implement secure rc file saving.
Laurent Monin <geeqie@norz.org>
parents: 267
diff changeset
553 SecureSaveInfo *ssi;
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
554 gchar *rc_pathl;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
555 GString *outstr;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
556 gint indent = 0;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
557 GList *work;
2185
c14a1d8e6aa4 Trim trailing white spaces on empty lines.
Laurent Monin <zas@norz.org>
parents: 2184
diff changeset
558
741
04f1095bcca6 Move code from save_options() to new save_options_to() which takes
Laurent Monin <geeqie@norz.org>
parents: 738
diff changeset
559 rc_pathl = path_from_utf8(utf8_path);
276
9625a36d4a69 Implement secure rc file saving.
Laurent Monin <geeqie@norz.org>
parents: 267
diff changeset
560 ssi = secure_open(rc_pathl);
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents: 4
diff changeset
561 g_free(rc_pathl);
276
9625a36d4a69 Implement secure rc file saving.
Laurent Monin <geeqie@norz.org>
parents: 267
diff changeset
562 if (!ssi)
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
563 {
741
04f1095bcca6 Move code from save_options() to new save_options_to() which takes
Laurent Monin <geeqie@norz.org>
parents: 738
diff changeset
564 log_printf(_("error saving config file: %s\n"), utf8_path);
04f1095bcca6 Move code from save_options() to new save_options_to() which takes
Laurent Monin <geeqie@norz.org>
parents: 738
diff changeset
565 return FALSE;
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
566 }
442
f698b737556b Big whitespaces cleanup:
Laurent Monin <geeqie@norz.org>
parents: 433
diff changeset
567
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
568 outstr = g_string_new("");
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
569 g_string_append_printf(outstr, "<!--\n");
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
570 g_string_append_printf(outstr, "######################################################################\n");
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
571 g_string_append_printf(outstr, "# %30s config file version %-10s #\n", GQ_APPNAME, VERSION);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
572 g_string_append_printf(outstr, "######################################################################\n");
372
76e0426bdc26 Add and use few new macros in rc file writing code.
Laurent Monin <geeqie@norz.org>
parents: 356
diff changeset
573 WRITE_SEPARATOR();
338
300f3fcec821 Rename window options (moved to layout) and re-order rc file.
Laurent Monin <geeqie@norz.org>
parents: 337
diff changeset
574
1314
c933e9655c0d simplified config writing
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1313
diff changeset
575 WRITE_STRING("# Note: This file is autogenerated. Options can be changed here,\n");
c933e9655c0d simplified config writing
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1313
diff changeset
576 WRITE_STRING("# but user comments and formatting will be lost.\n");
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
577 WRITE_SEPARATOR();
1314
c933e9655c0d simplified config writing
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1313
diff changeset
578 WRITE_STRING("-->\n");
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
579 WRITE_SEPARATOR();
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
580
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
581 WRITE_STRING("<gq>\n");
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
582 indent++;
2185
c14a1d8e6aa4 Trim trailing white spaces on empty lines.
Laurent Monin <zas@norz.org>
parents: 2184
diff changeset
583
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
584 WRITE_NL(); WRITE_STRING("<global\n");
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
585 indent++;
1314
c933e9655c0d simplified config writing
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1313
diff changeset
586 write_global_attributes(outstr, indent + 1);
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
587 indent--;
1314
c933e9655c0d simplified config writing
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1313
diff changeset
588 WRITE_STRING(">\n");
c933e9655c0d simplified config writing
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1313
diff changeset
589
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
590 indent++;
442
f698b737556b Big whitespaces cleanup:
Laurent Monin <geeqie@norz.org>
parents: 433
diff changeset
591
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
592 write_color_profile(outstr, indent);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
593
377
571230dd6404 Cleanup read/write of image.zoom_mode option.
Laurent Monin <geeqie@norz.org>
parents: 376
diff changeset
594 WRITE_SEPARATOR();
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
595 filter_write_list(outstr, indent);
335
006fa9607e6a Beautify rc file, adding sub-sections titles.
Laurent Monin <geeqie@norz.org>
parents: 334
diff changeset
596
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
597 WRITE_SEPARATOR();
2752
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
598 write_marks_tooltips(outstr, indent);
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
599
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
600 WRITE_SEPARATOR();
1404
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
601 keyword_tree_write_config(outstr, indent);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
602 indent--;
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
603 WRITE_NL(); WRITE_STRING("</global>\n");
468
2a1711fecfde Replace fullscreen.info and fullscreen.show_info options by:
Laurent Monin <geeqie@norz.org>
parents: 458
diff changeset
604
823
58697074b6d5 Add a comment about relative positions of image overlay in the rc file.
Laurent Monin <geeqie@norz.org>
parents: 822
diff changeset
605 WRITE_SEPARATOR();
58697074b6d5 Add a comment about relative positions of image overlay in the rc file.
Laurent Monin <geeqie@norz.org>
parents: 822
diff changeset
606
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
607 /* Layout Options */
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
608 work = layout_window_list;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
609 while (work)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
610 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
611 LayoutWindow *lw = work->data;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
612 layout_write_config(lw, outstr, indent);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
613 work = work->next;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
614 }
276
9625a36d4a69 Implement secure rc file saving.
Laurent Monin <geeqie@norz.org>
parents: 267
diff changeset
615
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
616 indent--;
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
617 WRITE_NL(); WRITE_STRING("</gq>\n");
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
618 WRITE_SEPARATOR();
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
619
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
620 secure_fputs(ssi, outstr->str);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
621 g_string_free(outstr, TRUE);
442
f698b737556b Big whitespaces cleanup:
Laurent Monin <geeqie@norz.org>
parents: 433
diff changeset
622
276
9625a36d4a69 Implement secure rc file saving.
Laurent Monin <geeqie@norz.org>
parents: 267
diff changeset
623 if (secure_close(ssi))
741
04f1095bcca6 Move code from save_options() to new save_options_to() which takes
Laurent Monin <geeqie@norz.org>
parents: 738
diff changeset
624 {
04f1095bcca6 Move code from save_options() to new save_options_to() which takes
Laurent Monin <geeqie@norz.org>
parents: 738
diff changeset
625 log_printf(_("error saving config file: %s\nerror: %s\n"), utf8_path,
04f1095bcca6 Move code from save_options() to new save_options_to() which takes
Laurent Monin <geeqie@norz.org>
parents: 738
diff changeset
626 secsave_strerror(secsave_errno));
04f1095bcca6 Move code from save_options() to new save_options_to() which takes
Laurent Monin <geeqie@norz.org>
parents: 738
diff changeset
627 return FALSE;
04f1095bcca6 Move code from save_options() to new save_options_to() which takes
Laurent Monin <geeqie@norz.org>
parents: 738
diff changeset
628 }
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
629
741
04f1095bcca6 Move code from save_options() to new save_options_to() which takes
Laurent Monin <geeqie@norz.org>
parents: 738
diff changeset
630 return TRUE;
04f1095bcca6 Move code from save_options() to new save_options_to() which takes
Laurent Monin <geeqie@norz.org>
parents: 738
diff changeset
631 }
04f1095bcca6 Move code from save_options() to new save_options_to() which takes
Laurent Monin <geeqie@norz.org>
parents: 738
diff changeset
632
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
633 /*
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
634 *-----------------------------------------------------------------------------
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
635 * loading attributes for elements (private)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
636 *-----------------------------------------------------------------------------
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
637 */
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
638
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
639
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
640 static gboolean load_global_params(const gchar **attribute_names, const gchar **attribute_values)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
641 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
642 while (*attribute_names)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
643 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
644 const gchar *option = *attribute_names++;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
645 const gchar *value = *attribute_values++;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
646
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
647 /* General options */
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
648 if (READ_BOOL(*options, show_icon_names)) continue;
2777
813be27b1cd5 Addl fix #323: Rating system
Colin Clark <colin.clark@cclark.uk>
parents: 2770
diff changeset
649 if (READ_BOOL(*options, show_star_rating)) continue;
2794
780a9b685335 Ref #331: Overimposed custom composition rule lines
Colin Clark <colin.clark@cclark.uk>
parents: 2793
diff changeset
650 if (READ_BOOL(*options, show_guidelines)) continue;
2826
d0c6c5ae586b Option to hide predefined keyword tree
Colin Clark <colin.clark@cclark.uk>
parents: 2815
diff changeset
651 if (READ_BOOL(*options, show_predefined_keyword_tree)) continue;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
652
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
653 if (READ_BOOL(*options, tree_descend_subdirs)) continue;
2376
6c310168a91c Add four new preferences
Maciej S. Szmigiero <mail@maciej.szmigiero.name>
parents: 2350
diff changeset
654 if (READ_BOOL(*options, view_dir_list_single_click_enter)) continue;
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
655 if (READ_BOOL(*options, lazy_image_sync)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
656 if (READ_BOOL(*options, update_on_time_change)) continue;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
657
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
658 if (READ_UINT_CLAMP(*options, duplicates_similarity_threshold, 0, 100)) continue;
2426
28546abc2b90 Fix #435: Remember duplicates settings
Colin Clark <cclark@mcb.net>
parents: 2417
diff changeset
659 if (READ_UINT_CLAMP(*options, duplicates_match, 0, DUPE_MATCH_NAME_CI)) continue;
28546abc2b90 Fix #435: Remember duplicates settings
Colin Clark <cclark@mcb.net>
parents: 2417
diff changeset
660 if (READ_UINT_CLAMP(*options, duplicates_select_type, 0, DUPE_SELECT_GROUP2)) continue;
28546abc2b90 Fix #435: Remember duplicates settings
Colin Clark <cclark@mcb.net>
parents: 2417
diff changeset
661 if (READ_BOOL(*options, duplicates_thumbnails)) continue;
2328
ad005c02001a Allow to configure rotation invariance
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2301
diff changeset
662 if (READ_BOOL(*options, rot_invariant_sim)) continue;
2489
ab6a0d1bd821 Fix #477: similarity duplicate search
Colin Clark <colin.clark@cclark.uk>
parents: 2485
diff changeset
663 if (READ_BOOL(*options, sort_totals)) continue;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
664
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
665 if (READ_BOOL(*options, progressive_key_scrolling)) continue;
2376
6c310168a91c Add four new preferences
Maciej S. Szmigiero <mail@maciej.szmigiero.name>
parents: 2350
diff changeset
666 if (READ_UINT_CLAMP(*options, keyboard_scroll_step, 1, 32)) continue;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
667
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
668 if (READ_BOOL(*options, mousewheel_scrolls)) continue;
2376
6c310168a91c Add four new preferences
Maciej S. Szmigiero <mail@maciej.szmigiero.name>
parents: 2350
diff changeset
669 if (READ_BOOL(*options, image_lm_click_nav)) continue;
2631
e493a7df8745 Addl fix #510: Rudimentary video support
Tomasz Golinski <tomaszg@math.uwb.edu.pl>
parents: 2623
diff changeset
670 if (READ_BOOL(*options, image_l_click_video)) continue;
e493a7df8745 Addl fix #510: Rudimentary video support
Tomasz Golinski <tomaszg@math.uwb.edu.pl>
parents: 2623
diff changeset
671 if (READ_CHAR(*options, image_l_click_video_editor)) continue;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
672
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
673 if (READ_INT(*options, open_recent_list_maxsize)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
674 if (READ_INT(*options, dnd_icon_size)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
675 if (READ_BOOL(*options, place_dialogs_under_mouse)) continue;
2662
08d2547d72ea Fix #137: "Copy path" problem (or may be feature)
Colin Clark <colin.clark@cclark.uk>
parents: 2631
diff changeset
676 if (READ_INT(*options, clipboard_selection)) continue;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
677
1436
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1404
diff changeset
678 if (READ_BOOL(*options, save_window_positions)) continue;
2376
6c310168a91c Add four new preferences
Maciej S. Szmigiero <mail@maciej.szmigiero.name>
parents: 2350
diff changeset
679 if (READ_BOOL(*options, use_saved_window_positions_for_new_windows)) continue;
1436
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1404
diff changeset
680 if (READ_BOOL(*options, tools_restore_state)) continue;
2670
ec21b78a088c Fix #543: Size of dialog windows in the GTK3 version is too small
Colin Clark <colin.clark@cclark.uk>
parents: 2662
diff changeset
681 if (READ_BOOL(*options, save_dialog_window_positions)) continue;
2740
808983eb036e Option to display window ID
Colin Clark <colin.clark@cclark.uk>
parents: 2673
diff changeset
682 if (READ_BOOL(*options, show_window_ids)) continue;
1436
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1404
diff changeset
683
2512
d9de7027d853 Fix int<->uint problem
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2505
diff changeset
684 if (READ_INT(*options, log_window_lines)) continue;
2596
9c435c86a296 Optional timer data in log window
Colin Clark <colin.clark@cclark.uk>
parents: 2512
diff changeset
685 if (READ_BOOL(*options, log_window.timer_data)) continue;
2505
d01e5b8e80d9 Eliminate FIXME: Log window line limit
Colin Clark <colin.clark@cclark.uk>
parents: 2504
diff changeset
686
2750
0eac8ea9b1be Fix #220, 269: marks do not persist
Colin Clark <colin.clark@cclark.uk>
parents: 2740
diff changeset
687 if (READ_BOOL(*options, marks_save)) continue;
2756
f2f01d556f51 Fix #597: Help file search
Colin Clark <colin.clark@cclark.uk>
parents: 2752
diff changeset
688 if (READ_CHAR(*options, help_search_engine)) continue;
2750
0eac8ea9b1be Fix #220, 269: marks do not persist
Colin Clark <colin.clark@cclark.uk>
parents: 2740
diff changeset
689
2793
2feed80bcd34 Collections changes
Colin Clark <colin.clark@cclark.uk>
parents: 2777
diff changeset
690 if (READ_BOOL(*options, collections_on_top)) continue;
2feed80bcd34 Collections changes
Colin Clark <colin.clark@cclark.uk>
parents: 2777
diff changeset
691
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
692 /* Properties dialog options */
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
693 if (READ_CHAR(*options, properties.tabs_order)) continue;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
694
2769
ed8cc78cb9dd Option to change default button for copy/move dialogs
Colin Clark <colin.clark@cclark.uk>
parents: 2756
diff changeset
695 if (READ_BOOL(*options, with_rename)) continue;
ed8cc78cb9dd Option to change default button for copy/move dialogs
Colin Clark <colin.clark@cclark.uk>
parents: 2756
diff changeset
696
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
697 /* Image options */
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
698 if (READ_UINT_CLAMP(*options, image.zoom_mode, 0, ZOOM_RESET_NONE)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
699 if (READ_BOOL(*options, image.zoom_2pass)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
700 if (READ_BOOL(*options, image.zoom_to_fit_allow_expand)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
701 if (READ_BOOL(*options, image.fit_window_to_image)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
702 if (READ_BOOL(*options, image.limit_window_size)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
703 if (READ_INT(*options, image.max_window_size)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
704 if (READ_BOOL(*options, image.limit_autofit_size)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
705 if (READ_INT(*options, image.max_autofit_size)) continue;
2474
f591509cb3d3 Fix #123: Limit image expansion in Fit To Window
Colin Clark <colin.clark@cclark.uk>
parents: 2457
diff changeset
706 if (READ_INT(*options, image.max_enlargement_size)) continue;
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
707 if (READ_UINT_CLAMP(*options, image.scroll_reset_method, 0, PR_SCROLL_RESET_COUNT - 1)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
708 if (READ_INT(*options, image.tile_cache_max)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
709 if (READ_INT(*options, image.image_cache_max)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
710 if (READ_UINT_CLAMP(*options, image.zoom_quality, GDK_INTERP_NEAREST, GDK_INTERP_HYPER)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
711 if (READ_INT(*options, image.zoom_increment)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
712 if (READ_BOOL(*options, image.enable_read_ahead)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
713 if (READ_BOOL(*options, image.exif_rotate_enable)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
714 if (READ_BOOL(*options, image.use_custom_border_color)) continue;
1644
2b10e2bee592 the options for custom border color were made independent
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1626
diff changeset
715 if (READ_BOOL(*options, image.use_custom_border_color_in_fullscreen)) continue;
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
716 if (READ_COLOR(*options, image.border_color)) continue;
2457
58f993045468 Fix #219: Ability to set solid colour for transparency layer
Colin Clark <cclark@mcb.net>
parents: 2454
diff changeset
717 if (READ_COLOR(*options, image.alpha_color_1)) continue;
58f993045468 Fix #219: Ability to set solid colour for transparency layer
Colin Clark <cclark@mcb.net>
parents: 2454
diff changeset
718 if (READ_COLOR(*options, image.alpha_color_2)) continue;
2084
1c712b43f063 added option for clutter renderer
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 2072
diff changeset
719 if (READ_BOOL(*options, image.use_clutter_renderer)) continue;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
720
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
721 /* Thumbnails options */
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
722 if (READ_INT_CLAMP(*options, thumbnails.max_width, 16, 512)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
723 if (READ_INT_CLAMP(*options, thumbnails.max_height, 16, 512)) continue;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
724
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
725 if (READ_BOOL(*options, thumbnails.enable_caching)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
726 if (READ_BOOL(*options, thumbnails.cache_into_dirs)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
727 if (READ_BOOL(*options, thumbnails.use_xvpics)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
728 if (READ_BOOL(*options, thumbnails.spec_standard)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
729 if (READ_UINT_CLAMP(*options, thumbnails.quality, GDK_INTERP_NEAREST, GDK_INTERP_HYPER)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
730 if (READ_BOOL(*options, thumbnails.use_exif)) continue;
2800
0ecd4885dc09 Bug fix: Collection preview
Colin Clark <colin.clark@cclark.uk>
parents: 2794
diff changeset
731 if (READ_INT(*options, thumbnails.collection_preview)) continue;
2673
bef1f1a91df9 Fix #541: Showing existing, or maybe generating thumbnails for MP4 and WEBM
Tomasz Golinski <tomaszg@math.uwb.edu.pl>
parents: 2670
diff changeset
732 if (READ_BOOL(*options, thumbnails.use_ft_metadata)) continue;
bef1f1a91df9 Fix #541: Showing existing, or maybe generating thumbnails for MP4 and WEBM
Tomasz Golinski <tomaszg@math.uwb.edu.pl>
parents: 2670
diff changeset
733 // if (READ_BOOL(*options, thumbnails.use_ft_metadata_small)) continue;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
734
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
735 /* File sorting options */
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
736 if (READ_UINT(*options, file_sort.method)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
737 if (READ_BOOL(*options, file_sort.ascending)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
738 if (READ_BOOL(*options, file_sort.case_sensitive)) continue;
2406
16fcfac12c77 Fix #417: Natural sort order
Colin Clark <cclark@mcb.net>
parents: 2386
diff changeset
739 if (READ_BOOL(*options, file_sort.natural)) continue;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
740
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
741 /* File operations *options */
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
742 if (READ_BOOL(*options, file_ops.enable_in_place_rename)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
743 if (READ_BOOL(*options, file_ops.confirm_delete)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
744 if (READ_BOOL(*options, file_ops.enable_delete_key)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
745 if (READ_BOOL(*options, file_ops.safe_delete_enable)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
746 if (READ_CHAR(*options, file_ops.safe_delete_path)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
747 if (READ_INT(*options, file_ops.safe_delete_folder_maxsize)) continue;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
748
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
749 /* Fullscreen options */
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
750 if (READ_INT(*options, fullscreen.screen)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
751 if (READ_BOOL(*options, fullscreen.clean_flip)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
752 if (READ_BOOL(*options, fullscreen.disable_saver)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
753 if (READ_BOOL(*options, fullscreen.above)) continue;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
754
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
755 /* Image overlay */
1336
7fe7536f02e1 fixed overlay configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1335
diff changeset
756 if (READ_CHAR(*options, image_overlay.template_string)) continue;
7fe7536f02e1 fixed overlay configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1335
diff changeset
757 if (READ_INT(*options, image_overlay.x)) continue;
7fe7536f02e1 fixed overlay configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1335
diff changeset
758 if (READ_INT(*options, image_overlay.y)) continue;
2413
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
759 if (READ_USHORT(*options, image_overlay.text_red)) continue;
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
760 if (READ_USHORT(*options, image_overlay.text_green)) continue;
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
761 if (READ_USHORT(*options, image_overlay.text_blue)) continue;
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
762 if (READ_USHORT(*options, image_overlay.text_alpha)) continue;
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
763 if (READ_USHORT(*options, image_overlay.background_red)) continue;
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
764 if (READ_USHORT(*options, image_overlay.background_green)) continue;
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
765 if (READ_USHORT(*options, image_overlay.background_blue)) continue;
8e9d5cf1edcb Fix errors in -Werror (except GdkPixbuf deprecation warnings)
Omari Stephens <xsdg@google.com>
parents: 2386
diff changeset
766 if (READ_USHORT(*options, image_overlay.background_alpha)) continue;
2334
e38178f556f6 Image overlay configurable font
Colin Clark <cclark@mcb.net>
parents: 2328
diff changeset
767 if (READ_CHAR(*options, image_overlay.font)) continue;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
768
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
769 /* Slideshow options */
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
770 if (READ_INT_UNIT(*options, slideshow.delay, SLIDESHOW_SUBSECOND_PRECISION)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
771 if (READ_BOOL(*options, slideshow.random)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
772 if (READ_BOOL(*options, slideshow.repeat)) continue;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
773
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
774 /* Collection options */
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
775 if (READ_BOOL(*options, collections.rectangular_selection)) continue;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
776
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
777 /* Filtering options */
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
778 if (READ_BOOL(*options, file_filter.show_hidden_files)) continue;
2265
15d51cf8ff3d Allow to choose to show parent folder
Klaus Ethgen <Klaus@Ethgen.de>
parents: 2185
diff changeset
779 if (READ_BOOL(*options, file_filter.show_parent_directory)) continue;
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
780 if (READ_BOOL(*options, file_filter.show_dot_directory)) continue;
2301
dec8d9db5770 Fix #333 Renaming file extensions
Colin Clark <cclark@mcb.net>
parents: 2265
diff changeset
781 if (READ_BOOL(*options, file_filter.disable_file_extension_checks)) continue;
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
782 if (READ_BOOL(*options, file_filter.disable)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
783 if (READ_CHAR(*options, sidecar.ext)) continue;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
784
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
785 /* Color Profiles */
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
786
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
787 /* Shell command */
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
788 if (READ_CHAR(*options, shell.path)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
789 if (READ_CHAR(*options, shell.options)) continue;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
790
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
791 /* Helpers */
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
792 if (READ_CHAR(*options, helpers.html_browser.command_name)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
793 if (READ_CHAR(*options, helpers.html_browser.command_line)) continue;
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
794
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
795 /* Metadata */
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
796 if (READ_BOOL(*options, metadata.enable_metadata_dirs)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
797 if (READ_BOOL(*options, metadata.save_in_image_file)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
798 if (READ_BOOL(*options, metadata.save_legacy_IPTC)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
799 if (READ_BOOL(*options, metadata.warn_on_write_problems)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
800 if (READ_BOOL(*options, metadata.save_legacy_format)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
801 if (READ_BOOL(*options, metadata.sync_grouped_files)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
802 if (READ_BOOL(*options, metadata.confirm_write)) continue;
2454
93d1c77a312b Fix #147: Alternative format for sidecar extension
Tomasz Golinski <tomaszg@math.uwb.edu.pl>
parents: 2426
diff changeset
803 if (READ_BOOL(*options, metadata.sidecar_extended_name)) continue;
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
804 if (READ_BOOL(*options, metadata.confirm_after_timeout)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
805 if (READ_INT(*options, metadata.confirm_timeout)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
806 if (READ_BOOL(*options, metadata.confirm_on_image_change)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
807 if (READ_BOOL(*options, metadata.confirm_on_dir_change)) continue;
1590
32a63a57690f use "keywords" instead of "tags" in option name, it is more consistent
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1582
diff changeset
808 if (READ_BOOL(*options, metadata.keywords_case_sensitive)) continue;
1567
ef3ca18df43f added an option to write image orientation to the metadata
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1548
diff changeset
809 if (READ_BOOL(*options, metadata.write_orientation)) continue;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
810
2141
8ea33f1c3d52 Those stereo image options are of type int, not uint, use appropriate macros.
Laurent Monin <zas@norz.org>
parents: 2084
diff changeset
811 if (READ_INT(*options, stereo.mode)) continue;
8ea33f1c3d52 Those stereo image options are of type int, not uint, use appropriate macros.
Laurent Monin <zas@norz.org>
parents: 2084
diff changeset
812 if (READ_INT(*options, stereo.fsmode)) continue;
1893
5f724783a871 save and load stereo options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1802
diff changeset
813 if (READ_BOOL(*options, stereo.enable_fsmode)) continue;
2141
8ea33f1c3d52 Those stereo image options are of type int, not uint, use appropriate macros.
Laurent Monin <zas@norz.org>
parents: 2084
diff changeset
814 if (READ_INT(*options, stereo.fixed_w)) continue;
8ea33f1c3d52 Those stereo image options are of type int, not uint, use appropriate macros.
Laurent Monin <zas@norz.org>
parents: 2084
diff changeset
815 if (READ_INT(*options, stereo.fixed_h)) continue;
8ea33f1c3d52 Those stereo image options are of type int, not uint, use appropriate macros.
Laurent Monin <zas@norz.org>
parents: 2084
diff changeset
816 if (READ_INT(*options, stereo.fixed_x1)) continue;
8ea33f1c3d52 Those stereo image options are of type int, not uint, use appropriate macros.
Laurent Monin <zas@norz.org>
parents: 2084
diff changeset
817 if (READ_INT(*options, stereo.fixed_y1)) continue;
8ea33f1c3d52 Those stereo image options are of type int, not uint, use appropriate macros.
Laurent Monin <zas@norz.org>
parents: 2084
diff changeset
818 if (READ_INT(*options, stereo.fixed_x2)) continue;
8ea33f1c3d52 Those stereo image options are of type int, not uint, use appropriate macros.
Laurent Monin <zas@norz.org>
parents: 2084
diff changeset
819 if (READ_INT(*options, stereo.fixed_y2)) continue;
1893
5f724783a871 save and load stereo options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1802
diff changeset
820
2770
2e819f4a7a41 Read metadata in the idle loop
Colin Clark <colin.clark@cclark.uk>
parents: 2769
diff changeset
821 if (READ_BOOL(*options, read_metadata_in_idle)) continue;
2e819f4a7a41 Read metadata in the idle loop
Colin Clark <colin.clark@cclark.uk>
parents: 2769
diff changeset
822
2777
813be27b1cd5 Addl fix #323: Rating system
Colin Clark <colin.clark@cclark.uk>
parents: 2770
diff changeset
823 if (READ_UINT(*options, star_rating.star)) continue;
813be27b1cd5 Addl fix #323: Rating system
Colin Clark <colin.clark@cclark.uk>
parents: 2770
diff changeset
824 if (READ_UINT(*options, star_rating.rejected)) continue;
813be27b1cd5 Addl fix #323: Rating system
Colin Clark <colin.clark@cclark.uk>
parents: 2770
diff changeset
825
2504
130acea2daa0 Fix #280: Set defaults for Auto Rename
Colin Clark <colin.clark@cclark.uk>
parents: 2489
diff changeset
826 /* copy move rename */
130acea2daa0 Fix #280: Set defaults for Auto Rename
Colin Clark <colin.clark@cclark.uk>
parents: 2489
diff changeset
827 if (READ_INT(*options, cp_mv_rn.auto_start)) continue;
130acea2daa0 Fix #280: Set defaults for Auto Rename
Colin Clark <colin.clark@cclark.uk>
parents: 2489
diff changeset
828 if (READ_INT(*options, cp_mv_rn.auto_padding)) continue;
130acea2daa0 Fix #280: Set defaults for Auto Rename
Colin Clark <colin.clark@cclark.uk>
parents: 2489
diff changeset
829 if (READ_CHAR(*options, cp_mv_rn.auto_end)) continue;
130acea2daa0 Fix #280: Set defaults for Auto Rename
Colin Clark <colin.clark@cclark.uk>
parents: 2489
diff changeset
830 if (READ_INT(*options, cp_mv_rn.formatted_start)) continue;
130acea2daa0 Fix #280: Set defaults for Auto Rename
Colin Clark <colin.clark@cclark.uk>
parents: 2489
diff changeset
831
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
832 /* Dummy options */
2072
6b9508574641 Add read_dummy_option() to handle old/deprecated options.
Laurent Monin <zas@norz.org>
parents: 2043
diff changeset
833 if (READ_DUMMY(*options, image.dither_quality, "deprecated since 2012-08-13")) continue;
6b9508574641 Add read_dummy_option() to handle old/deprecated options.
Laurent Monin <zas@norz.org>
parents: 2043
diff changeset
834
2142
fc678ab8edb7 Cleanup, drop WRITE_SUBTITLE() macro, remove commented out code.
Laurent Monin <zas@norz.org>
parents: 2141
diff changeset
835 /* Unknown options */
1464
6c71e4a9d06a be more verbose on parse errors
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1463
diff changeset
836 log_printf("unknown attribute %s = %s\n", option, value);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
837 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
838
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
839 return TRUE;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
840 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
841
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
842 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)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
843 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
844 while (*attribute_names)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
845 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
846 const gchar *option = *attribute_names++;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
847 const gchar *value = *attribute_values++;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
848
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
849 if (READ_BOOL(options->color_profile, enabled)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
850 if (READ_BOOL(options->color_profile, use_image)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
851 if (READ_INT(options->color_profile, input_type)) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
852 if (READ_CHAR(options->color_profile, screen_file)) continue;
1548
1bd57e730350 support X11 screen profile
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1540
diff changeset
853 if (READ_BOOL(options->color_profile, use_x11_screen_profile)) continue;
2386
a22a815359f9 Fix #414 Render Intents
Colin Clark <cclark@mcb.net>
parents: 2376
diff changeset
854 if (READ_INT(options->color_profile, render_intent)) continue;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
855
1464
6c71e4a9d06a be more verbose on parse errors
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1463
diff changeset
856 log_printf("unknown attribute %s = %s\n", option, value);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
857 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
858
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
859 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
860
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
861 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)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
862 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
863 gint i = GPOINTER_TO_INT(data);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
864 if (i < 0 || i >= COLOR_PROFILE_INPUTS) return;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
865 while (*attribute_names)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
866 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
867 const gchar *option = *attribute_names++;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
868 const gchar *value = *attribute_values++;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
869
1315
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
870 if (READ_CHAR_FULL("input_file", options->color_profile.input_file[i])) continue;
4f8f11de5c36 Since READ_*() macros are now exported, do not hide
Laurent Monin <geeqie@norz.org>
parents: 1314
diff changeset
871 if (READ_CHAR_FULL("input_name", options->color_profile.input_name[i])) continue;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
872
1464
6c71e4a9d06a be more verbose on parse errors
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1463
diff changeset
873 log_printf("unknown attribute %s = %s\n", option, value);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
874 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
875 i++;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
876 options_parse_func_set_data(parser_data, GINT_TO_POINTER(i));
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
877
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
878 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
879
2752
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
880 static void options_load_marks_tooltips(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
881 {
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
882 gint i = GPOINTER_TO_INT(data);
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
883 if (i < 0 || i >= FILEDATA_MARKS_SIZE) return;
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
884 while (*attribute_names)
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
885 {
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
886 const gchar *option = *attribute_names++;
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
887 const gchar *value = *attribute_values++;
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
888 if (READ_CHAR_FULL("text", options->marks_tooltips[i])) continue;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
889
2815
5ed1842634a6 Fix typo unkown/unknown
Andreas Rönnquist <andreas@ronnquist.net>
parents: 2800
diff changeset
890 log_printf("unknown attribute %s = %s\n", option, value);
2752
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
891 }
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
892 i++;
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
893 options_parse_func_set_data(parser_data, GINT_TO_POINTER(i));
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
894
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
895 }
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
896
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
897 /*
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
898 *-----------------------------------------------------------------------------
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
899 * xml file structure (private)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
900 *-----------------------------------------------------------------------------
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
901 */
1313
29ff0de0a67e enabled commandline again
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1309
diff changeset
902 struct _GQParserData
29ff0de0a67e enabled commandline again
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1309
diff changeset
903 {
29ff0de0a67e enabled commandline again
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1309
diff changeset
904 GList *parse_func_stack;
1463
7031da014d97 added function to reload external editors at any time
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1461
diff changeset
905 gboolean startup; /* reading config for the first time - add commandline and defaults */
1313
29ff0de0a67e enabled commandline again
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1309
diff changeset
906 };
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
907
1466
a8a7e7feeefc added possibility to update existing layout window from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1464
diff changeset
908 static const gchar *options_get_id(const gchar **attribute_names, const gchar **attribute_values)
a8a7e7feeefc added possibility to update existing layout window from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1464
diff changeset
909 {
a8a7e7feeefc added possibility to update existing layout window from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1464
diff changeset
910 while (*attribute_names)
a8a7e7feeefc added possibility to update existing layout window from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1464
diff changeset
911 {
a8a7e7feeefc added possibility to update existing layout window from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1464
diff changeset
912 const gchar *option = *attribute_names++;
a8a7e7feeefc added possibility to update existing layout window from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1464
diff changeset
913 const gchar *value = *attribute_values++;
2185
c14a1d8e6aa4 Trim trailing white spaces on empty lines.
Laurent Monin <zas@norz.org>
parents: 2184
diff changeset
914
1466
a8a7e7feeefc added possibility to update existing layout window from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1464
diff changeset
915 if (strcmp(option, "id") == 0) return value;
a8a7e7feeefc added possibility to update existing layout window from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1464
diff changeset
916
a8a7e7feeefc added possibility to update existing layout window from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1464
diff changeset
917 }
a8a7e7feeefc added possibility to update existing layout window from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1464
diff changeset
918 return NULL;
a8a7e7feeefc added possibility to update existing layout window from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1464
diff changeset
919 }
a8a7e7feeefc added possibility to update existing layout window from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1464
diff changeset
920
741
04f1095bcca6 Move code from save_options() to new save_options_to() which takes
Laurent Monin <geeqie@norz.org>
parents: 738
diff changeset
921
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
922 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)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
923 {
1464
6c71e4a9d06a be more verbose on parse errors
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1463
diff changeset
924 log_printf("unexpected: %s\n", element_name);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
925 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
926 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
927
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
928 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)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
929 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
930 if (g_ascii_strcasecmp(element_name, "profile") == 0)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
931 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
932 options_load_profile(parser_data, context, element_name, attribute_names, attribute_values, data, error);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
933 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
934 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
935 else
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
936 {
1464
6c71e4a9d06a be more verbose on parse errors
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1463
diff changeset
937 log_printf("unexpected in <profile>: <%s>\n", element_name);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
938 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
939 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
940 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
941
2752
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
942 static void options_parse_marks_tooltips(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
943 {
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
944 if (g_ascii_strcasecmp(element_name, "tooltip") == 0)
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
945 {
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
946 options_load_marks_tooltips(parser_data, context, element_name, attribute_names, attribute_values, data, error);
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
947 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
948 }
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
949 else
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
950 {
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
951 log_printf("unexpected in <profile>: <%s>\n", element_name);
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
952 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
953 }
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
954 }
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
955
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
956 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)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
957 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
958 if (g_ascii_strcasecmp(element_name, "file_type") == 0)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
959 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
960 filter_load_file_type(attribute_names, attribute_values);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
961 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
962 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
963 else
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
964 {
1464
6c71e4a9d06a be more verbose on parse errors
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1463
diff changeset
965 log_printf("unexpected in <filter>: <%s>\n", element_name);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
966 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
967 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
968 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
969
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
970 static void options_parse_filter_end(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, gpointer data, GError **error)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
971 {
1463
7031da014d97 added function to reload external editors at any time
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1461
diff changeset
972 if (parser_data->startup) filter_add_defaults();
2184
9cdebd070874 Trim trailing white spaces.
Laurent Monin <zas@norz.org>
parents: 2142
diff changeset
973 filter_rebuild();
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
974 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
975
1404
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
976 static void options_parse_keyword_end(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, gpointer data, GError **error)
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
977 {
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
978 GtkTreeIter *iter_ptr = data;
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
979 gtk_tree_iter_free(iter_ptr);
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
980 }
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
981
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
982
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
983 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)
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
984 {
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
985 GtkTreeIter *iter_ptr = data;
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
986 if (g_ascii_strcasecmp(element_name, "keyword") == 0)
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
987 {
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
988 GtkTreeIter *child = keyword_add_from_config(keyword_tree, iter_ptr, attribute_names, attribute_values);
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
989 options_parse_func_push(parser_data, options_parse_keyword, options_parse_keyword_end, child);
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
990 }
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
991 else
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
992 {
1464
6c71e4a9d06a be more verbose on parse errors
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1463
diff changeset
993 log_printf("unexpected in <keyword>: <%s>\n", element_name);
1404
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
994 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
995 }
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
996 }
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
997
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
998
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
999
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
1000 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)
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
1001 {
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
1002 if (g_ascii_strcasecmp(element_name, "keyword") == 0)
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
1003 {
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
1004 GtkTreeIter *iter_ptr = keyword_add_from_config(keyword_tree, NULL, attribute_names, attribute_values);
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
1005 options_parse_func_push(parser_data, options_parse_keyword, options_parse_keyword_end, iter_ptr);
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
1006 }
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
1007 else
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
1008 {
1464
6c71e4a9d06a be more verbose on parse errors
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1463
diff changeset
1009 log_printf("unexpected in <keyword_tree>: <%s>\n", element_name);
1404
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
1010 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
1011 }
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
1012 }
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
1013
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
1014
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1015 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)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1016 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1017 if (g_ascii_strcasecmp(element_name, "color_profiles") == 0)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1018 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1019 options_load_color_profiles(parser_data, context, element_name, attribute_names, attribute_values, data, error);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1020 options_parse_func_push(parser_data, options_parse_color_profiles, NULL, GINT_TO_POINTER(0));
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1021 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1022 else if (g_ascii_strcasecmp(element_name, "filter") == 0)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1023 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1024 options_parse_func_push(parser_data, options_parse_filter, options_parse_filter_end, NULL);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1025 }
2752
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
1026 else if (g_ascii_strcasecmp(element_name, "marks_tooltips") == 0)
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
1027 {
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
1028 options_load_marks_tooltips(parser_data, context, element_name, attribute_names, attribute_values, data, error);
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
1029 options_parse_func_push(parser_data, options_parse_marks_tooltips, NULL, NULL);
829c6cb08dd9 Mnemonic text for marks
Colin Clark <colin.clark@cclark.uk>
parents: 2750
diff changeset
1030 }
1404
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
1031 else if (g_ascii_strcasecmp(element_name, "keyword_tree") == 0)
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
1032 {
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
1033 if (!keyword_tree) keyword_tree_new();
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
1034 options_parse_func_push(parser_data, options_parse_keyword_tree, NULL, NULL);
093f360034e3 save and restore the keyword tree
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1387
diff changeset
1035 }
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1036 else
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1037 {
1464
6c71e4a9d06a be more verbose on parse errors
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1463
diff changeset
1038 log_printf("unexpected in <global>: <%s>\n", element_name);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1039 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1040 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1041 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1042
1463
7031da014d97 added function to reload external editors at any time
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1461
diff changeset
1043 static void options_parse_global_end(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, gpointer data, GError **error)
7031da014d97 added function to reload external editors at any time
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1461
diff changeset
1044 {
1686
4cb7c2245306 fixes for a built without Exiv2
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1644
diff changeset
1045 #ifndef HAVE_EXIV2
4cb7c2245306 fixes for a built without Exiv2
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1644
diff changeset
1046 /* some options do not work without exiv2 */
4cb7c2245306 fixes for a built without Exiv2
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1644
diff changeset
1047 options->metadata.save_in_image_file = FALSE;
4cb7c2245306 fixes for a built without Exiv2
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1644
diff changeset
1048 options->metadata.save_legacy_format = TRUE;
4cb7c2245306 fixes for a built without Exiv2
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1644
diff changeset
1049 options->metadata.write_orientation = FALSE;
4cb7c2245306 fixes for a built without Exiv2
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1644
diff changeset
1050 DEBUG_1("compiled without Exiv2 - disabling XMP write support");
4cb7c2245306 fixes for a built without Exiv2
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1644
diff changeset
1051 #endif
1463
7031da014d97 added function to reload external editors at any time
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1461
diff changeset
1052 }
7031da014d97 added function to reload external editors at any time
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1461
diff changeset
1053
1350
1ef332b8a27a rewritten exif pane to support arbitrary number of entries
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1346
diff changeset
1054 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)
1ef332b8a27a rewritten exif pane to support arbitrary number of entries
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1346
diff changeset
1055 {
1ef332b8a27a rewritten exif pane to support arbitrary number of entries
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1346
diff changeset
1056 GtkWidget *pane = data;
1ef332b8a27a rewritten exif pane to support arbitrary number of entries
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1346
diff changeset
1057 if (g_ascii_strcasecmp(element_name, "entry") == 0)
1ef332b8a27a rewritten exif pane to support arbitrary number of entries
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1346
diff changeset
1058 {
1ef332b8a27a rewritten exif pane to support arbitrary number of entries
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1346
diff changeset
1059 bar_pane_exif_entry_add_from_config(pane, attribute_names, attribute_values);
1ef332b8a27a rewritten exif pane to support arbitrary number of entries
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1346
diff changeset
1060 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
1ef332b8a27a rewritten exif pane to support arbitrary number of entries
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1346
diff changeset
1061 }
1ef332b8a27a rewritten exif pane to support arbitrary number of entries
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1346
diff changeset
1062 else
1ef332b8a27a rewritten exif pane to support arbitrary number of entries
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1346
diff changeset
1063 {
1464
6c71e4a9d06a be more verbose on parse errors
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1463
diff changeset
1064 log_printf("unexpected in <pane_exif>: <%s>\n", element_name);
1350
1ef332b8a27a rewritten exif pane to support arbitrary number of entries
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1346
diff changeset
1065 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
1ef332b8a27a rewritten exif pane to support arbitrary number of entries
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1346
diff changeset
1066 }
1ef332b8a27a rewritten exif pane to support arbitrary number of entries
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1346
diff changeset
1067 }
1ef332b8a27a rewritten exif pane to support arbitrary number of entries
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1346
diff changeset
1068
2485
0e9ff39bcdd3 Remember keywords layout
Colin Clark <colin.clark@cclark.uk>
parents: 2480
diff changeset
1069 static void options_parse_pane_keywords(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
0e9ff39bcdd3 Remember keywords layout
Colin Clark <colin.clark@cclark.uk>
parents: 2480
diff changeset
1070 {
0e9ff39bcdd3 Remember keywords layout
Colin Clark <colin.clark@cclark.uk>
parents: 2480
diff changeset
1071 GtkWidget *pane = data;
0e9ff39bcdd3 Remember keywords layout
Colin Clark <colin.clark@cclark.uk>
parents: 2480
diff changeset
1072
0e9ff39bcdd3 Remember keywords layout
Colin Clark <colin.clark@cclark.uk>
parents: 2480
diff changeset
1073 if (g_ascii_strcasecmp(element_name, "expanded") == 0)
0e9ff39bcdd3 Remember keywords layout
Colin Clark <colin.clark@cclark.uk>
parents: 2480
diff changeset
1074 {
0e9ff39bcdd3 Remember keywords layout
Colin Clark <colin.clark@cclark.uk>
parents: 2480
diff changeset
1075 bar_pane_keywords_entry_add_from_config(pane, attribute_names, attribute_values);
0e9ff39bcdd3 Remember keywords layout
Colin Clark <colin.clark@cclark.uk>
parents: 2480
diff changeset
1076 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
0e9ff39bcdd3 Remember keywords layout
Colin Clark <colin.clark@cclark.uk>
parents: 2480
diff changeset
1077 }
0e9ff39bcdd3 Remember keywords layout
Colin Clark <colin.clark@cclark.uk>
parents: 2480
diff changeset
1078 else
0e9ff39bcdd3 Remember keywords layout
Colin Clark <colin.clark@cclark.uk>
parents: 2480
diff changeset
1079 {
0e9ff39bcdd3 Remember keywords layout
Colin Clark <colin.clark@cclark.uk>
parents: 2480
diff changeset
1080 log_printf("unexpected in <pane_keywords>: <%s>\n", element_name);
0e9ff39bcdd3 Remember keywords layout
Colin Clark <colin.clark@cclark.uk>
parents: 2480
diff changeset
1081 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
0e9ff39bcdd3 Remember keywords layout
Colin Clark <colin.clark@cclark.uk>
parents: 2480
diff changeset
1082 }
0e9ff39bcdd3 Remember keywords layout
Colin Clark <colin.clark@cclark.uk>
parents: 2480
diff changeset
1083 }
0e9ff39bcdd3 Remember keywords layout
Colin Clark <colin.clark@cclark.uk>
parents: 2480
diff changeset
1084
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1085 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)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1086 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1087 GtkWidget *bar = data;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1088 if (g_ascii_strcasecmp(element_name, "pane_comment") == 0)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1089 {
1469
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1090 GtkWidget *pane = bar_find_pane_by_id(bar, PANE_COMMENT, options_get_id(attribute_names, attribute_values));
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1091 if (pane)
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1092 {
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1093 bar_pane_comment_update_from_config(pane, attribute_names, attribute_values);
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1094 }
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1095 else
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1096 {
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1097 pane = bar_pane_comment_new_from_config(attribute_names, attribute_values);
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1098 bar_add(bar, pane);
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1099 }
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1100 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1101 }
1604
934646ea4af8 added GPS map support - patch by Colin Clark
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1590
diff changeset
1102 #ifdef HAVE_LIBCHAMPLAIN
934646ea4af8 added GPS map support - patch by Colin Clark
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1590
diff changeset
1103 #ifdef HAVE_LIBCHAMPLAIN_GTK
934646ea4af8 added GPS map support - patch by Colin Clark
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1590
diff changeset
1104 else if (g_ascii_strcasecmp(element_name, "pane_gps") == 0)
934646ea4af8 added GPS map support - patch by Colin Clark
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1590
diff changeset
1105 {
934646ea4af8 added GPS map support - patch by Colin Clark
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1590
diff changeset
1106 GtkWidget *pane = bar_find_pane_by_id(bar, PANE_GPS, options_get_id(attribute_names, attribute_values));
934646ea4af8 added GPS map support - patch by Colin Clark
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1590
diff changeset
1107 if (pane)
934646ea4af8 added GPS map support - patch by Colin Clark
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1590
diff changeset
1108 {
934646ea4af8 added GPS map support - patch by Colin Clark
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1590
diff changeset
1109 bar_pane_gps_update_from_config(pane, attribute_names, attribute_values);
934646ea4af8 added GPS map support - patch by Colin Clark
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1590
diff changeset
1110 }
934646ea4af8 added GPS map support - patch by Colin Clark
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1590
diff changeset
1111 else
934646ea4af8 added GPS map support - patch by Colin Clark
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1590
diff changeset
1112 {
934646ea4af8 added GPS map support - patch by Colin Clark
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1590
diff changeset
1113 pane = bar_pane_gps_new_from_config(attribute_names, attribute_values);
934646ea4af8 added GPS map support - patch by Colin Clark
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1590
diff changeset
1114 bar_add(bar, pane);
934646ea4af8 added GPS map support - patch by Colin Clark
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1590
diff changeset
1115 }
934646ea4af8 added GPS map support - patch by Colin Clark
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1590
diff changeset
1116 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
934646ea4af8 added GPS map support - patch by Colin Clark
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1590
diff changeset
1117 }
934646ea4af8 added GPS map support - patch by Colin Clark
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1590
diff changeset
1118 #endif
934646ea4af8 added GPS map support - patch by Colin Clark
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1590
diff changeset
1119 #endif
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1120 else if (g_ascii_strcasecmp(element_name, "pane_exif") == 0)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1121 {
1469
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1122 GtkWidget *pane = bar_find_pane_by_id(bar, PANE_EXIF, options_get_id(attribute_names, attribute_values));
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1123 if (pane)
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1124 {
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1125 bar_pane_exif_update_from_config(pane, attribute_names, attribute_values);
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1126 }
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1127 else
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1128 {
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1129 pane = bar_pane_exif_new_from_config(attribute_names, attribute_values);
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1130 bar_add(bar, pane);
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1131 }
1350
1ef332b8a27a rewritten exif pane to support arbitrary number of entries
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1346
diff changeset
1132 options_parse_func_push(parser_data, options_parse_pane_exif, NULL, pane);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1133 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1134 else if (g_ascii_strcasecmp(element_name, "pane_histogram") == 0)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1135 {
1469
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1136 GtkWidget *pane = bar_find_pane_by_id(bar, PANE_HISTOGRAM, options_get_id(attribute_names, attribute_values));
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1137 if (pane)
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1138 {
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1139 bar_pane_histogram_update_from_config(pane, attribute_names, attribute_values);
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1140 }
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1141 else
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1142 {
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1143 pane = bar_pane_histogram_new_from_config(attribute_names, attribute_values);
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1144 bar_add(bar, pane);
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1145 }
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1146 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1147 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1148 else if (g_ascii_strcasecmp(element_name, "pane_keywords") == 0)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1149 {
1469
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1150 GtkWidget *pane = bar_find_pane_by_id(bar, PANE_KEYWORDS, options_get_id(attribute_names, attribute_values));
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1151 if (pane)
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1152 {
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1153 bar_pane_keywords_update_from_config(pane, attribute_names, attribute_values);
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1154 }
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1155 else
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1156 {
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1157 pane = bar_pane_keywords_new_from_config(attribute_names, attribute_values);
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1158 bar_add(bar, pane);
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1159 }
2485
0e9ff39bcdd3 Remember keywords layout
Colin Clark <colin.clark@cclark.uk>
parents: 2480
diff changeset
1160 options_parse_func_push(parser_data, options_parse_pane_keywords, NULL, pane);
1469
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1161 }
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1162 else if (g_ascii_strcasecmp(element_name, "clear") == 0)
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1163 {
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1164 bar_clear(bar);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1165 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1166 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1167 else
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1168 {
1464
6c71e4a9d06a be more verbose on parse errors
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1463
diff changeset
1169 log_printf("unexpected in <bar>: <%s>\n", element_name);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1170 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1171 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1172 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1173
2623
f5886b8e1968 Fix #444: User-definable toolbar
Colin Clark <colin.clark@cclark.uk>
parents: 2619
diff changeset
1174 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)
1335
6a3808bb1b24 save and restore toolbar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1329
diff changeset
1175 {
2623
f5886b8e1968 Fix #444: User-definable toolbar
Colin Clark <colin.clark@cclark.uk>
parents: 2619
diff changeset
1176 LayoutWindow *lw = data;
f5886b8e1968 Fix #444: User-definable toolbar
Colin Clark <colin.clark@cclark.uk>
parents: 2619
diff changeset
1177 if (g_ascii_strcasecmp(element_name, "toolitem") == 0)
f5886b8e1968 Fix #444: User-definable toolbar
Colin Clark <colin.clark@cclark.uk>
parents: 2619
diff changeset
1178 {
f5886b8e1968 Fix #444: User-definable toolbar
Colin Clark <colin.clark@cclark.uk>
parents: 2619
diff changeset
1179 layout_toolbar_add_from_config(lw, TOOLBAR_MAIN, attribute_names, attribute_values);
f5886b8e1968 Fix #444: User-definable toolbar
Colin Clark <colin.clark@cclark.uk>
parents: 2619
diff changeset
1180 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
f5886b8e1968 Fix #444: User-definable toolbar
Colin Clark <colin.clark@cclark.uk>
parents: 2619
diff changeset
1181 }
f5886b8e1968 Fix #444: User-definable toolbar
Colin Clark <colin.clark@cclark.uk>
parents: 2619
diff changeset
1182 else if (g_ascii_strcasecmp(element_name, "clear") == 0)
f5886b8e1968 Fix #444: User-definable toolbar
Colin Clark <colin.clark@cclark.uk>
parents: 2619
diff changeset
1183 {
f5886b8e1968 Fix #444: User-definable toolbar
Colin Clark <colin.clark@cclark.uk>
parents: 2619
diff changeset
1184 layout_toolbar_clear(lw, TOOLBAR_MAIN);
f5886b8e1968 Fix #444: User-definable toolbar
Colin Clark <colin.clark@cclark.uk>
parents: 2619
diff changeset
1185 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
f5886b8e1968 Fix #444: User-definable toolbar
Colin Clark <colin.clark@cclark.uk>
parents: 2619
diff changeset
1186 }
f5886b8e1968 Fix #444: User-definable toolbar
Colin Clark <colin.clark@cclark.uk>
parents: 2619
diff changeset
1187 else
f5886b8e1968 Fix #444: User-definable toolbar
Colin Clark <colin.clark@cclark.uk>
parents: 2619
diff changeset
1188 {
f5886b8e1968 Fix #444: User-definable toolbar
Colin Clark <colin.clark@cclark.uk>
parents: 2619
diff changeset
1189 log_printf("unexpected in <toolbar>: <%s>\n", element_name);
f5886b8e1968 Fix #444: User-definable toolbar
Colin Clark <colin.clark@cclark.uk>
parents: 2619
diff changeset
1190 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
f5886b8e1968 Fix #444: User-definable toolbar
Colin Clark <colin.clark@cclark.uk>
parents: 2619
diff changeset
1191 }
1582
f137ec3fd85e - handle color profile and write metadata buttons on statusbar by ui_manager
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1567
diff changeset
1192 }
2670
ec21b78a088c Fix #543: Size of dialog windows in the GTK3 version is too small
Colin Clark <colin.clark@cclark.uk>
parents: 2662
diff changeset
1193 static void options_parse_dialogs(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
ec21b78a088c Fix #543: Size of dialog windows in the GTK3 version is too small
Colin Clark <colin.clark@cclark.uk>
parents: 2662
diff changeset
1194 {
ec21b78a088c Fix #543: Size of dialog windows in the GTK3 version is too small
Colin Clark <colin.clark@cclark.uk>
parents: 2662
diff changeset
1195 if (g_ascii_strcasecmp(element_name, "window") == 0)
ec21b78a088c Fix #543: Size of dialog windows in the GTK3 version is too small
Colin Clark <colin.clark@cclark.uk>
parents: 2662
diff changeset
1196 {
ec21b78a088c Fix #543: Size of dialog windows in the GTK3 version is too small
Colin Clark <colin.clark@cclark.uk>
parents: 2662
diff changeset
1197 generic_dialog_windows_load_config(attribute_names, attribute_values);
ec21b78a088c Fix #543: Size of dialog windows in the GTK3 version is too small
Colin Clark <colin.clark@cclark.uk>
parents: 2662
diff changeset
1198 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
ec21b78a088c Fix #543: Size of dialog windows in the GTK3 version is too small
Colin Clark <colin.clark@cclark.uk>
parents: 2662
diff changeset
1199 }
ec21b78a088c Fix #543: Size of dialog windows in the GTK3 version is too small
Colin Clark <colin.clark@cclark.uk>
parents: 2662
diff changeset
1200 else
ec21b78a088c Fix #543: Size of dialog windows in the GTK3 version is too small
Colin Clark <colin.clark@cclark.uk>
parents: 2662
diff changeset
1201 {
ec21b78a088c Fix #543: Size of dialog windows in the GTK3 version is too small
Colin Clark <colin.clark@cclark.uk>
parents: 2662
diff changeset
1202 log_printf("unexpected in <dialogs>: <%s>\n", element_name);
ec21b78a088c Fix #543: Size of dialog windows in the GTK3 version is too small
Colin Clark <colin.clark@cclark.uk>
parents: 2662
diff changeset
1203 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
ec21b78a088c Fix #543: Size of dialog windows in the GTK3 version is too small
Colin Clark <colin.clark@cclark.uk>
parents: 2662
diff changeset
1204 }
ec21b78a088c Fix #543: Size of dialog windows in the GTK3 version is too small
Colin Clark <colin.clark@cclark.uk>
parents: 2662
diff changeset
1205 }
1582
f137ec3fd85e - handle color profile and write metadata buttons on statusbar by ui_manager
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1567
diff changeset
1206
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1207 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)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1208 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1209 LayoutWindow *lw = data;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1210 if (g_ascii_strcasecmp(element_name, "bar") == 0)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1211 {
1469
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1212 if (!lw->bar)
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1213 {
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1214 GtkWidget *bar = bar_new_from_config(lw, attribute_names, attribute_values);
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1215 layout_bar_set(lw, bar);
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1216 }
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1217 else
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1218 {
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1219 bar_update_from_config(lw->bar, attribute_names, attribute_values);
b9ef2bfd9d95 added a possibility to update existing bars from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
1220 }
2185
c14a1d8e6aa4 Trim trailing white spaces on empty lines.
Laurent Monin <zas@norz.org>
parents: 2184
diff changeset
1221
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1222 options_parse_func_push(parser_data, options_parse_bar, NULL, lw->bar);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1223 }
1320
f1607e105298 improved bar_sort configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1317
diff changeset
1224 else if (g_ascii_strcasecmp(element_name, "bar_sort") == 0)
f1607e105298 improved bar_sort configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1317
diff changeset
1225 {
2619
77596dda797e Fix #207: Symlink doesn't show in Sort Manager
Colin Clark <colin.clark@cclark.uk>
parents: 2596
diff changeset
1226 bar_sort_cold_start(lw, attribute_names, attribute_values);
1320
f1607e105298 improved bar_sort configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1317
diff changeset
1227 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
f1607e105298 improved bar_sort configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1317
diff changeset
1228 }
1335
6a3808bb1b24 save and restore toolbar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1329
diff changeset
1229 else if (g_ascii_strcasecmp(element_name, "toolbar") == 0)
6a3808bb1b24 save and restore toolbar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1329
diff changeset
1230 {
2623
f5886b8e1968 Fix #444: User-definable toolbar
Colin Clark <colin.clark@cclark.uk>
parents: 2619
diff changeset
1231 options_parse_func_push(parser_data, options_parse_toolbar, NULL, lw);
1335
6a3808bb1b24 save and restore toolbar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1329
diff changeset
1232 }
1582
f137ec3fd85e - handle color profile and write metadata buttons on statusbar by ui_manager
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1567
diff changeset
1233 else if (g_ascii_strcasecmp(element_name, "statusbar") == 0)
f137ec3fd85e - handle color profile and write metadata buttons on statusbar by ui_manager
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1567
diff changeset
1234 {
2623
f5886b8e1968 Fix #444: User-definable toolbar
Colin Clark <colin.clark@cclark.uk>
parents: 2619
diff changeset
1235 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
1582
f137ec3fd85e - handle color profile and write metadata buttons on statusbar by ui_manager
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1567
diff changeset
1236 }
2670
ec21b78a088c Fix #543: Size of dialog windows in the GTK3 version is too small
Colin Clark <colin.clark@cclark.uk>
parents: 2662
diff changeset
1237 else if (g_ascii_strcasecmp(element_name, "dialogs") == 0)
ec21b78a088c Fix #543: Size of dialog windows in the GTK3 version is too small
Colin Clark <colin.clark@cclark.uk>
parents: 2662
diff changeset
1238 {
ec21b78a088c Fix #543: Size of dialog windows in the GTK3 version is too small
Colin Clark <colin.clark@cclark.uk>
parents: 2662
diff changeset
1239 options_parse_func_push(parser_data, options_parse_dialogs, NULL, NULL);
ec21b78a088c Fix #543: Size of dialog windows in the GTK3 version is too small
Colin Clark <colin.clark@cclark.uk>
parents: 2662
diff changeset
1240 }
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1241 else
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1242 {
1464
6c71e4a9d06a be more verbose on parse errors
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1463
diff changeset
1243 log_printf("unexpected in <layout>: <%s>\n", element_name);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1244 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1245 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1246 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1247
1317
bb9d01551d6c simplified and improved bar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1315
diff changeset
1248 static void options_parse_layout_end(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, gpointer data, GError **error)
bb9d01551d6c simplified and improved bar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1315
diff changeset
1249 {
bb9d01551d6c simplified and improved bar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1315
diff changeset
1250 LayoutWindow *lw = data;
bb9d01551d6c simplified and improved bar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1315
diff changeset
1251 layout_util_sync(lw);
bb9d01551d6c simplified and improved bar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1315
diff changeset
1252 }
bb9d01551d6c simplified and improved bar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1315
diff changeset
1253
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1254 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)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1255 {
1461
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
1256 if (g_ascii_strcasecmp(element_name, "gq") == 0)
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
1257 {
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
1258 /* optional top-level node */
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
1259 options_parse_func_push(parser_data, options_parse_toplevel, NULL, NULL);
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
1260 return;
8f4df7710af8 improved config file formatting
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1444
diff changeset
1261 }
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1262 if (g_ascii_strcasecmp(element_name, "global") == 0)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1263 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1264 load_global_params(attribute_names, attribute_values);
1463
7031da014d97 added function to reload external editors at any time
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1461
diff changeset
1265 options_parse_func_push(parser_data, options_parse_global, options_parse_global_end, NULL);
1313
29ff0de0a67e enabled commandline again
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1309
diff changeset
1266 return;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1267 }
2185
c14a1d8e6aa4 Trim trailing white spaces on empty lines.
Laurent Monin <zas@norz.org>
parents: 2184
diff changeset
1268
1313
29ff0de0a67e enabled commandline again
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1309
diff changeset
1269 if (g_ascii_strcasecmp(element_name, "layout") == 0)
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1270 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1271 LayoutWindow *lw;
1466
a8a7e7feeefc added possibility to update existing layout window from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1464
diff changeset
1272 lw = layout_find_by_layout_id(options_get_id(attribute_names, attribute_values));
2184
9cdebd070874 Trim trailing white spaces.
Laurent Monin <zas@norz.org>
parents: 2142
diff changeset
1273 if (lw)
1466
a8a7e7feeefc added possibility to update existing layout window from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1464
diff changeset
1274 {
a8a7e7feeefc added possibility to update existing layout window from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1464
diff changeset
1275 layout_update_from_config(lw, attribute_names, attribute_values);
a8a7e7feeefc added possibility to update existing layout window from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1464
diff changeset
1276 }
a8a7e7feeefc added possibility to update existing layout window from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1464
diff changeset
1277 else
a8a7e7feeefc added possibility to update existing layout window from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1464
diff changeset
1278 {
a8a7e7feeefc added possibility to update existing layout window from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1464
diff changeset
1279 lw = layout_new_from_config(attribute_names, attribute_values, parser_data->startup);
a8a7e7feeefc added possibility to update existing layout window from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1464
diff changeset
1280 }
1317
bb9d01551d6c simplified and improved bar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1315
diff changeset
1281 options_parse_func_push(parser_data, options_parse_layout, options_parse_layout_end, lw);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1282 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1283 else
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1284 {
1464
6c71e4a9d06a be more verbose on parse errors
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1463
diff changeset
1285 log_printf("unexpected in <toplevel>: <%s>\n", element_name);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1286 options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1287 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1288 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1289
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1290
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1291
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1292
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1293
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1294 /*
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1295 *-----------------------------------------------------------------------------
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1296 * parser
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1297 *-----------------------------------------------------------------------------
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1298 */
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1299
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1300
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1301 struct _GQParserFuncData
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1302 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1303 GQParserStartFunc start_func;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1304 GQParserEndFunc end_func;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1305 gpointer data;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1306 };
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1307
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1308 void options_parse_func_push(GQParserData *parser_data, GQParserStartFunc start_func, GQParserEndFunc end_func, gpointer data)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1309 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1310 GQParserFuncData *func_data = g_new0(GQParserFuncData, 1);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1311 func_data->start_func = start_func;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1312 func_data->end_func = end_func;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1313 func_data->data = data;
2185
c14a1d8e6aa4 Trim trailing white spaces on empty lines.
Laurent Monin <zas@norz.org>
parents: 2184
diff changeset
1314
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1315 parser_data->parse_func_stack = g_list_prepend(parser_data->parse_func_stack, func_data);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1316 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1317
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1318 void options_parse_func_pop(GQParserData *parser_data)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1319 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1320 g_free(parser_data->parse_func_stack->data);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1321 parser_data->parse_func_stack = g_list_delete_link(parser_data->parse_func_stack, parser_data->parse_func_stack);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1322 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1323
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1324 void options_parse_func_set_data(GQParserData *parser_data, gpointer data)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1325 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1326 GQParserFuncData *func = parser_data->parse_func_stack->data;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1327 func->data = data;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1328 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1329
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1330
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1331 static void start_element(GMarkupParseContext *context,
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1332 const gchar *element_name,
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1333 const gchar **attribute_names,
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1334 const gchar **attribute_values,
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1335 gpointer user_data,
2184
9cdebd070874 Trim trailing white spaces.
Laurent Monin <zas@norz.org>
parents: 2142
diff changeset
1336 GError **error)
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1337 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1338 GQParserData *parser_data = user_data;
2184
9cdebd070874 Trim trailing white spaces.
Laurent Monin <zas@norz.org>
parents: 2142
diff changeset
1339 GQParserFuncData *func = parser_data->parse_func_stack->data;
1735
d60ff6f78f81 added messages for debugging startup time
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1686
diff changeset
1340 DEBUG_2("start %s", element_name);
2185
c14a1d8e6aa4 Trim trailing white spaces on empty lines.
Laurent Monin <zas@norz.org>
parents: 2184
diff changeset
1341
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1342 if (func->start_func)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1343 func->start_func(parser_data, context, element_name, attribute_names, attribute_values, func->data, error);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1344 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1345
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1346 static void end_element(GMarkupParseContext *context,
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1347 const gchar *element_name,
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1348 gpointer user_data,
2184
9cdebd070874 Trim trailing white spaces.
Laurent Monin <zas@norz.org>
parents: 2142
diff changeset
1349 GError **error)
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1350 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1351 GQParserData *parser_data = user_data;
2184
9cdebd070874 Trim trailing white spaces.
Laurent Monin <zas@norz.org>
parents: 2142
diff changeset
1352 GQParserFuncData *func = parser_data->parse_func_stack->data;
1735
d60ff6f78f81 added messages for debugging startup time
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1686
diff changeset
1353 DEBUG_2("end %s", element_name);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1354
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1355 if (func->end_func)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1356 func->end_func(parser_data, context, element_name, func->data, error);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1357
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1358 options_parse_func_pop(parser_data);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1359 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1360
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1361 static GMarkupParser parser = {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1362 start_element,
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1363 end_element,
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1364 NULL,
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1365 NULL,
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1366 NULL
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1367 };
741
04f1095bcca6 Move code from save_options() to new save_options_to() which takes
Laurent Monin <geeqie@norz.org>
parents: 738
diff changeset
1368
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
1369 /*
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
1370 *-----------------------------------------------------------------------------
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
1371 * load configuration (public)
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
1372 *-----------------------------------------------------------------------------
442
f698b737556b Big whitespaces cleanup:
Laurent Monin <geeqie@norz.org>
parents: 433
diff changeset
1373 */
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
1374
1484
f3b033a71fc9 improved sidebar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1469
diff changeset
1375 gboolean load_config_from_buf(const gchar *buf, gsize size, gboolean startup)
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
1376 {
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1377 GMarkupParseContext *context;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1378 gboolean ret = TRUE;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1379 GQParserData *parser_data;
630
e68e998d6c23 An option to save and restore the last path used was added.
Laurent Monin <geeqie@norz.org>
parents: 629
diff changeset
1380
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1381 parser_data = g_new0(GQParserData, 1);
2185
c14a1d8e6aa4 Trim trailing white spaces on empty lines.
Laurent Monin <zas@norz.org>
parents: 2184
diff changeset
1382
1313
29ff0de0a67e enabled commandline again
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1309
diff changeset
1383 parser_data->startup = startup;
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1384 options_parse_func_push(parser_data, options_parse_toplevel, NULL, NULL);
2185
c14a1d8e6aa4 Trim trailing white spaces on empty lines.
Laurent Monin <zas@norz.org>
parents: 2184
diff changeset
1385
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1386 context = g_markup_parse_context_new(&parser, 0, parser_data, NULL);
338
300f3fcec821 Rename window options (moved to layout) and re-order rc file.
Laurent Monin <geeqie@norz.org>
parents: 337
diff changeset
1387
1346
b3378273091e No space between function name and first parenthesis, it eases greping (see CODING).
Laurent Monin <geeqie@norz.org>
parents: 1336
diff changeset
1388 if (g_markup_parse_context_parse(context, buf, size, NULL) == FALSE)
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1389 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1390 ret = FALSE;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1391 DEBUG_1("Parse failed");
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1392 }
2185
c14a1d8e6aa4 Trim trailing white spaces on empty lines.
Laurent Monin <zas@norz.org>
parents: 2184
diff changeset
1393
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1394 g_free(parser_data);
684
47248196ef4c Save order of Properties dialog tabs to rc file.
Laurent Monin <geeqie@norz.org>
parents: 641
diff changeset
1395
1484
f3b033a71fc9 improved sidebar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1469
diff changeset
1396 g_markup_parse_context_free(context);
f3b033a71fc9 improved sidebar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1469
diff changeset
1397 return ret;
f3b033a71fc9 improved sidebar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1469
diff changeset
1398 }
f3b033a71fc9 improved sidebar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1469
diff changeset
1399
f3b033a71fc9 improved sidebar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1469
diff changeset
1400 gboolean load_config_from_file(const gchar *utf8_path, gboolean startup)
f3b033a71fc9 improved sidebar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1469
diff changeset
1401 {
f3b033a71fc9 improved sidebar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1469
diff changeset
1402 gsize size;
f3b033a71fc9 improved sidebar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1469
diff changeset
1403 gchar *buf;
f3b033a71fc9 improved sidebar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1469
diff changeset
1404 gboolean ret = TRUE;
f3b033a71fc9 improved sidebar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1469
diff changeset
1405
2184
9cdebd070874 Trim trailing white spaces.
Laurent Monin <zas@norz.org>
parents: 2142
diff changeset
1406 if (g_file_get_contents(utf8_path, &buf, &size, NULL) == FALSE)
1484
f3b033a71fc9 improved sidebar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1469
diff changeset
1407 {
f3b033a71fc9 improved sidebar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1469
diff changeset
1408 return FALSE;
f3b033a71fc9 improved sidebar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1469
diff changeset
1409 }
f3b033a71fc9 improved sidebar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1469
diff changeset
1410 ret = load_config_from_buf(buf, size, startup);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1411 g_free(buf);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1412 return ret;
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1284
diff changeset
1413 }
2185
c14a1d8e6aa4 Trim trailing white spaces on empty lines.
Laurent Monin <zas@norz.org>
parents: 2184
diff changeset
1414
442
f698b737556b Big whitespaces cleanup:
Laurent Monin <geeqie@norz.org>
parents: 433
diff changeset
1415
1
0102f897ed33 Initial revision
John Ellis <johne@verizon.net>
parents:
diff changeset
1416
1055
4bbdfab3c89a Adding a vim modeline to all files - patch by Klaus Ethgen
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1023
diff changeset
1417 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */