Mercurial > hg > forks > geeqie

annotate src/options.c @ 2221:59b559f747a7 ke-lua

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'master' into ke-lua * master: (185 commits) better fix for big-endian architectures Minor indentation fixes. Cleanup checker shader code. Fix exif orientation in clutter rendering mode. Silent 2 warnings using explicit type casting. Polish translation was updated, thanks to Grzegorz Gibas. Update pt_BR translation. Add *~, *.rej, *.orig files to git ignore list. Fix for support >=automake-1.11.4 Trim trailing white spaces on empty lines. Trim trailing white spaces. Add missing vim modeline. Fix indentation and few trailing white spaces. Clear few more warnings, unused variables mostly. Drop unused variable. Remove commented out code. Remove commented out code. Remove commented out code. Remove commented out code. Remove commented out code. ...
author Klaus Ethgen <Klaus@Ethgen.de>
date Tue, 02 Oct 2012 22:19:13 +0100
parents 6e91033c7fb3 c14a1d8e6aa4
children 15d51cf8ff3d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
508
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
1 /*
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
2 * Geeqie
2021
26dfd7a4d130 updated version and copyright notice
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1922
diff changeset
3 * Copyright (C) 2008 - 2012 The Geeqie Team
508
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
4 *
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
5 * Authors: Vladimir Nadvornik, Laurent Monin
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
6 *
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
7 * This software is released under the GNU General Public License (GNU GPL).
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
8 * Please read the included file COPYING for more information.
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
9 * This software comes with no warranty of any kind, use at your own risk!
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
10 */
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
11
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
12 #include "main.h"
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
13 #include "options.h"
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
14
740
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
15 #include "bar_exif.h"
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
16 #include "editors.h"
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
17 #include "filefilter.h"
612
a7932dffc6ff Preserve last histogram modes.
Laurent Monin <geeqie@norz.org>
parents: 594
diff changeset
18 #include "histogram.h" /* HCHAN_RGB */
619
2060eff74498 Initialize to correct value (OSD_SHOW_NOTHING instead of FALSE).
Laurent Monin <geeqie@norz.org>
parents: 612
diff changeset
19 #include "image-overlay.h" /* OSD_SHOW_NOTHING */
740
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
20 #include "layout.h"
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
21 #include "layout_image.h"
1019
90fb159e5161 Move save/load_options() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 1013
diff changeset
22 #include "rcfile.h"
740
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
23 #include "ui_bookmark.h"
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
24 #include "ui_fileops.h"
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
25 #include "window.h"
612
a7932dffc6ff Preserve last histogram modes.
Laurent Monin <geeqie@norz.org>
parents: 594
diff changeset
26
508
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
27 ConfOptions *init_options(ConfOptions *options)
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
28 {
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
29 if (!options) options = g_new0(ConfOptions, 1);
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
30
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
31 options->collections.rectangular_selection = FALSE;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
32
1034
bd1fccd7aecd adjusted default options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1019
diff changeset
33 options->color_profile.enabled = TRUE;
508
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
34 options->color_profile.input_type = 0;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
35 options->color_profile.screen_file = NULL;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
36 options->color_profile.use_image = TRUE;
1548
1bd57e730350 support X11 screen profile
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1540
diff changeset
37 options->color_profile.use_x11_screen_profile = TRUE;
508
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
38
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
39 options->dnd_icon_size = 48;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
40 options->duplicates_similarity_threshold = 99;
2185
c14a1d8e6aa4 Trim trailing white spaces on empty lines.
Laurent Monin <zas@norz.org>
parents: 2164
diff changeset
41
508
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
42 options->file_filter.disable = FALSE;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
43 options->file_filter.show_dot_directory = FALSE;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
44 options->file_filter.show_hidden_files = FALSE;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
45
1436
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
46 options->save_window_positions = TRUE;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
47 options->tools_restore_state = TRUE;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
48
508
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
49 options->file_ops.confirm_delete = TRUE;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
50 options->file_ops.enable_delete_key = TRUE;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
51 options->file_ops.enable_in_place_rename = TRUE;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
52 options->file_ops.safe_delete_enable = FALSE;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
53 options->file_ops.safe_delete_folder_maxsize = 128;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
54 options->file_ops.safe_delete_path = NULL;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
55
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
56 options->file_sort.ascending = TRUE;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
57 options->file_sort.case_sensitive = FALSE;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
58 options->file_sort.method = SORT_NAME;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
59
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
60 options->fullscreen.above = FALSE;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
61 options->fullscreen.clean_flip = FALSE;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
62 options->fullscreen.disable_saver = TRUE;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
63 options->fullscreen.screen = -1;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
64
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
65 memset(&options->image.border_color, 0, sizeof(options->image.border_color));
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
66 options->image.enable_read_ahead = TRUE;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
67 options->image.exif_rotate_enable = TRUE;
2066
01d2c966209e exif autorotate for proofs
Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
parents: 2043
diff changeset
68 options->image.exif_proof_rotate_enable = TRUE;
508
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
69 options->image.fit_window_to_image = FALSE;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
70 options->image.limit_autofit_size = FALSE;
1034
bd1fccd7aecd adjusted default options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1019
diff changeset
71 options->image.limit_window_size = TRUE;
508
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
72 options->image.max_autofit_size = 100;
1034
bd1fccd7aecd adjusted default options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1019
diff changeset
73 options->image.max_window_size = 90;
1037
e7adeebbbe5d fixed various problems with preserving viewport on image change,
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1034
diff changeset
74 options->image.scroll_reset_method = SCROLL_RESET_NOCHANGE;
508
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
75 options->image.tile_cache_max = 10;
848
79fc2c215d64 cache size made configurable
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 825
diff changeset
76 options->image.image_cache_max = 128; /* 4 x 10MPix */
508
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
77 options->image.use_custom_border_color = FALSE;
1644
2b10e2bee592 the options for custom border color were made independent
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1626
diff changeset
78 options->image.use_custom_border_color_in_fullscreen = TRUE;
508
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
79 options->image.zoom_2pass = TRUE;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
80 options->image.zoom_increment = 5;
1034
bd1fccd7aecd adjusted default options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1019
diff changeset
81 options->image.zoom_mode = ZOOM_RESET_NONE;
870
9934892744f7 Make better matching between options types in options.h and the rest of the code.
Laurent Monin <geeqie@norz.org>
parents: 848
diff changeset
82 options->image.zoom_quality = GDK_INTERP_BILINEAR;
1034
bd1fccd7aecd adjusted default options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1019
diff changeset
83 options->image.zoom_to_fit_allow_expand = FALSE;
508
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
84
1336
7fe7536f02e1 fixed overlay configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1329
diff changeset
85 options->image_overlay.template_string = NULL;
7fe7536f02e1 fixed overlay configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1329
diff changeset
86 options->image_overlay.x = 10;
7fe7536f02e1 fixed overlay configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1329
diff changeset
87 options->image_overlay.y = -10;
508
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
88
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
89 options->lazy_image_sync = FALSE;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
90 options->mousewheel_scrolls = FALSE;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
91 options->open_recent_list_maxsize = 10;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
92 options->place_dialogs_under_mouse = FALSE;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
93
1034
bd1fccd7aecd adjusted default options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1019
diff changeset
94 options->progressive_key_scrolling = TRUE;
2185
c14a1d8e6aa4 Trim trailing white spaces on empty lines.
Laurent Monin <zas@norz.org>
parents: 2164
diff changeset
95
1208
338afd22a394 added options for metadata - not yet used
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1145
diff changeset
96 options->metadata.enable_metadata_dirs = FALSE;
338afd22a394 added options for metadata - not yet used
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1145
diff changeset
97 options->metadata.save_in_image_file = FALSE;
338afd22a394 added options for metadata - not yet used
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1145
diff changeset
98 options->metadata.save_legacy_IPTC = FALSE;
338afd22a394 added options for metadata - not yet used
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1145
diff changeset
99 options->metadata.warn_on_write_problems = TRUE;
338afd22a394 added options for metadata - not yet used
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1145
diff changeset
100 options->metadata.save_legacy_format = FALSE;
338afd22a394 added options for metadata - not yet used
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1145
diff changeset
101 options->metadata.sync_grouped_files = TRUE;
338afd22a394 added options for metadata - not yet used
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1145
diff changeset
102 options->metadata.confirm_write = TRUE;
1244
eeefa0f10d39 improved metadata preferences
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1229
diff changeset
103 options->metadata.confirm_after_timeout = FALSE;
eeefa0f10d39 improved metadata preferences
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1229
diff changeset
104 options->metadata.confirm_timeout = 10;
1208
338afd22a394 added options for metadata - not yet used
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1145
diff changeset
105 options->metadata.confirm_on_image_change = FALSE;
338afd22a394 added options for metadata - not yet used
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1145
diff changeset
106 options->metadata.confirm_on_dir_change = TRUE;
1590
32a63a57690f use "keywords" instead of "tags" in option name, it is more consistent
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1584
diff changeset
107 options->metadata.keywords_case_sensitive = FALSE;
1567
ef3ca18df43f added an option to write image orientation to the metadata
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1548
diff changeset
108 options->metadata.write_orientation = TRUE;
2185
c14a1d8e6aa4 Trim trailing white spaces on empty lines.
Laurent Monin <zas@norz.org>
parents: 2164
diff changeset
109
508
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
110 options->show_icon_names = TRUE;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
111
1034
bd1fccd7aecd adjusted default options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1019
diff changeset
112 options->slideshow.delay = 50;
508
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
113 options->slideshow.random = FALSE;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
114 options->slideshow.repeat = FALSE;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
115
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
116 options->thumbnails.cache_into_dirs = FALSE;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
117 options->thumbnails.enable_caching = TRUE;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
118 options->thumbnails.max_height = DEFAULT_THUMB_HEIGHT;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
119 options->thumbnails.max_width = DEFAULT_THUMB_WIDTH;
870
9934892744f7 Make better matching between options types in options.h and the rest of the code.
Laurent Monin <geeqie@norz.org>
parents: 848
diff changeset
120 options->thumbnails.quality = GDK_INTERP_TILES;
508
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
121 options->thumbnails.spec_standard = TRUE;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
122 options->thumbnails.use_xvpics = TRUE;
1060
54806f8e4af5 added option to use exif thumbnails
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1055
diff changeset
123 options->thumbnails.use_exif = FALSE;
508
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
124
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
125 options->tree_descend_subdirs = FALSE;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
126 options->update_on_time_change = TRUE;
2185
c14a1d8e6aa4 Trim trailing white spaces on empty lines.
Laurent Monin <zas@norz.org>
parents: 2164
diff changeset
127
1922
4f200abfccd7 set stereo.fixed default values to hdmi stereo standard
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1891
diff changeset
128 options->stereo.fixed_w = 1920;
4f200abfccd7 set stereo.fixed default values to hdmi stereo standard
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1891
diff changeset
129 options->stereo.fixed_h = 1080;
1891
25645af65caf added fixed stereo mode
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1809
diff changeset
130 options->stereo.fixed_x1 = 0;
1922
4f200abfccd7 set stereo.fixed default values to hdmi stereo standard
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1891
diff changeset
131 options->stereo.fixed_y1 = 0;
1891
25645af65caf added fixed stereo mode
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1809
diff changeset
132 options->stereo.fixed_x2 = 0;
1922
4f200abfccd7 set stereo.fixed default values to hdmi stereo standard
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1891
diff changeset
133 options->stereo.fixed_y2 = 1125;
508
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
134
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
135 return options;
a1b9ad02cf71 Move options stuff to options.{c,h} and remove globals.c
Laurent Monin <geeqie@norz.org>
parents:
diff changeset
136 }
740
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
137
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
138 void setup_default_options(ConfOptions *options)
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
139 {
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
140 gchar *path;
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
141 gint i;
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
142
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
143 bookmark_add_default(_("Home"), homedir());
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
144 path = g_build_filename(homedir(), "Desktop", NULL);
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
145 bookmark_add_default(_("Desktop"), path);
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
146 g_free(path);
1145
94adf34fe826 Use functions to return directories instead of constants.
Laurent Monin <geeqie@norz.org>
parents: 1060
diff changeset
147 bookmark_add_default(_("Collections"), get_collections_dir());
740
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
148
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
149 g_free(options->file_ops.safe_delete_path);
1145
94adf34fe826 Use functions to return directories instead of constants.
Laurent Monin <geeqie@norz.org>
parents: 1060
diff changeset
150 options->file_ops.safe_delete_path = g_strdup(get_trash_dir());
740
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
151
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
152 for (i = 0; i < COLOR_PROFILE_INPUTS; i++)
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
153 {
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
154 options->color_profile.input_file[i] = NULL;
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
155 options->color_profile.input_name[i] = NULL;
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
156 }
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
157
1336
7fe7536f02e1 fixed overlay configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1329
diff changeset
158 set_default_image_overlay_template_string(&options->image_overlay.template_string);
1809
40850a3d4289 Add unknown file class to grouping
Klaus Ethgen <Klaus@Ethgen.de>
parents: 1802
diff changeset
159 options->sidecar.ext = g_strdup(".jpg;%raw;.ufraw;.xmp;%unknown");
740
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
160
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
161 options->shell.path = g_strdup(GQ_DEFAULT_SHELL_PATH);
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
162 options->shell.options = g_strdup(GQ_DEFAULT_SHELL_OPTIONS);
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
163 }
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
164
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1292
diff changeset
165 void copy_layout_options(LayoutOptions *dest, const LayoutOptions *src)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1292
diff changeset
166 {
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1292
diff changeset
167 free_layout_options_content(dest);
2185
c14a1d8e6aa4 Trim trailing white spaces on empty lines.
Laurent Monin <zas@norz.org>
parents: 2164
diff changeset
168
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1292
diff changeset
169 *dest = *src;
1466
a8a7e7feeefc added possibility to update existing layout window from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1436
diff changeset
170 dest->id = g_strdup(src->id);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1292
diff changeset
171 dest->order = g_strdup(src->order);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1292
diff changeset
172 dest->home_path = g_strdup(src->home_path);
1511
ce48bdc8350d startup path options simplified and moved to layout options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1486
diff changeset
173 dest->last_path = g_strdup(src->last_path);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1292
diff changeset
174 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1292
diff changeset
175
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1292
diff changeset
176 void free_layout_options_content(LayoutOptions *dest)
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1292
diff changeset
177 {
1466
a8a7e7feeefc added possibility to update existing layout window from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1436
diff changeset
178 g_free(dest->id);
a8a7e7feeefc added possibility to update existing layout window from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1436
diff changeset
179 g_free(dest->order);
a8a7e7feeefc added possibility to update existing layout window from config
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1436
diff changeset
180 g_free(dest->home_path);
1511
ce48bdc8350d startup path options simplified and moved to layout options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1486
diff changeset
181 g_free(dest->last_path);
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1292
diff changeset
182 }
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1292
diff changeset
183
1436
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
184 LayoutOptions *init_layout_options(LayoutOptions *options)
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
185 {
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
186 memset(options, 0, sizeof(LayoutOptions));
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
187
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
188 options->dir_view_type = DIRVIEW_LIST;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
189 options->file_view_type = FILEVIEW_LIST;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
190 options->float_window.h = 450;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
191 options->float_window.vdivider_pos = -1;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
192 options->float_window.w = 260;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
193 options->float_window.x = 0;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
194 options->float_window.y = 0;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
195 options->home_path = NULL;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
196 options->main_window.h = 540;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
197 options->main_window.hdivider_pos = -1;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
198 options->main_window.maximized = FALSE;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
199 options->main_window.vdivider_pos = 200;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
200 options->main_window.w = 720;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
201 options->main_window.x = 0;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
202 options->main_window.y = 0;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
203 options->order = g_strdup("123");
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
204 options->show_directory_date = FALSE;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
205 options->show_marks = FALSE;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
206 options->show_thumbnails = FALSE;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
207 options->style = 0;
1584
c97dea5d82d7 improved pixel info, changed the menu entry from "Hide" to "Show",
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1567
diff changeset
208 options->show_info_pixel = FALSE;
1436
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
209 options->toolbar_hidden = FALSE;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
210 options->tools_float = FALSE;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
211 options->tools_hidden = FALSE;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
212 options->image_overlay.histogram_channel = HCHAN_RGB;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
213 options->image_overlay.histogram_mode = 1;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
214 options->image_overlay.state = OSD_SHOW_NOTHING;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
215 return options;
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
216 }
13d61fe760fb completely separated global and layout window options
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1375
diff changeset
217
1019
90fb159e5161 Move save/load_options() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 1013
diff changeset
218 static void sync_options_with_current_state(ConfOptions *options)
740
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
219 {
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
220 LayoutWindow *lw = NULL;
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
221
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
222 if (layout_valid(&lw))
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
223 {
1309
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1292
diff changeset
224 layout_sync_options_with_current_state(lw);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1292
diff changeset
225 layout_sort_get(lw, &options->file_sort.method, &options->file_sort.ascending);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1292
diff changeset
226
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1292
diff changeset
227 options->color_profile.enabled = layout_image_color_profile_get_use(lw);
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1292
diff changeset
228 layout_image_color_profile_get(lw,
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1292
diff changeset
229 &options->color_profile.input_type,
d89f8c4d593b config file format changed to XML
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1292
diff changeset
230 &options->color_profile.use_image);
740
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
231 }
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
232
004aa8fe7914 Move setup_default_options() and sync_options_with_current_state() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 638
diff changeset
233 }
1019
90fb159e5161 Move save/load_options() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 1013
diff changeset
234
90fb159e5161 Move save/load_options() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 1013
diff changeset
235 void save_options(ConfOptions *options)
90fb159e5161 Move save/load_options() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 1013
diff changeset
236 {
90fb159e5161 Move save/load_options() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 1013
diff changeset
237 gchar *rc_path;
90fb159e5161 Move save/load_options() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 1013
diff changeset
238
90fb159e5161 Move save/load_options() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 1013
diff changeset
239 sync_options_with_current_state(options);
90fb159e5161 Move save/load_options() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 1013
diff changeset
240
1145
94adf34fe826 Use functions to return directories instead of constants.
Laurent Monin <geeqie@norz.org>
parents: 1060
diff changeset
241 rc_path = g_build_filename(get_rc_dir(), RC_FILE_NAME, NULL);
1484
f3b033a71fc9 improved sidebar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
242 save_config_to_file(rc_path, options);
1019
90fb159e5161 Move save/load_options() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 1013
diff changeset
243 g_free(rc_path);
90fb159e5161 Move save/load_options() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 1013
diff changeset
244 }
90fb159e5161 Move save/load_options() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 1013
diff changeset
245
1313
29ff0de0a67e enabled commandline again
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1309
diff changeset
246 gboolean load_options(ConfOptions *options)
1019
90fb159e5161 Move save/load_options() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 1013
diff changeset
247 {
90fb159e5161 Move save/load_options() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 1013
diff changeset
248 gboolean success;
90fb159e5161 Move save/load_options() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 1013
diff changeset
249 gchar *rc_path;
90fb159e5161 Move save/load_options() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 1013
diff changeset
250
90fb159e5161 Move save/load_options() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 1013
diff changeset
251 if (isdir(GQ_SYSTEM_WIDE_DIR))
90fb159e5161 Move save/load_options() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 1013
diff changeset
252 {
90fb159e5161 Move save/load_options() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 1013
diff changeset
253 rc_path = g_build_filename(GQ_SYSTEM_WIDE_DIR, RC_FILE_NAME, NULL);
1484
f3b033a71fc9 improved sidebar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
254 success = load_config_from_file(rc_path, TRUE);
1019
90fb159e5161 Move save/load_options() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 1013
diff changeset
255 DEBUG_1("Loading options from %s ... %s", rc_path, success ? "done" : "failed");
90fb159e5161 Move save/load_options() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 1013
diff changeset
256 g_free(rc_path);
90fb159e5161 Move save/load_options() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 1013
diff changeset
257 }
2185
c14a1d8e6aa4 Trim trailing white spaces on empty lines.
Laurent Monin <zas@norz.org>
parents: 2164
diff changeset
258
1145
94adf34fe826 Use functions to return directories instead of constants.
Laurent Monin <geeqie@norz.org>
parents: 1060
diff changeset
259 rc_path = g_build_filename(get_rc_dir(), RC_FILE_NAME, NULL);
1484
f3b033a71fc9 improved sidebar configuration
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1466
diff changeset
260 success = load_config_from_file(rc_path, TRUE);
1019
90fb159e5161 Move save/load_options() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 1013
diff changeset
261 DEBUG_1("Loading options from %s ... %s", rc_path, success ? "done" : "failed");
90fb159e5161 Move save/load_options() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 1013
diff changeset
262 g_free(rc_path);
1313
29ff0de0a67e enabled commandline again
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1309
diff changeset
263 return(success);
1019
90fb159e5161 Move save/load_options() to options.[ch].
Laurent Monin <geeqie@norz.org>
parents: 1013
diff changeset
264 }
1055
4bbdfab3c89a Adding a vim modeline to all files - patch by Klaus Ethgen
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1037
diff changeset
265 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */