Include a Other Software section in Help file

[geeqie.git] / src / rcfile.c

diff --git a/src/rcfile.c b/src/rcfile.c
index 0d3a03c..7f3d384 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -298,7 +298,7 @@ gboolean read_bool_option(const gchar *option, const gchar *label, const gchar *
 
 /*
  *-----------------------------------------------------------------------------
- * write fuctions for elements (private)
+ * write functions for elements (private)
  *-----------------------------------------------------------------------------
  */
 
@@ -313,6 +313,7 @@ static void write_global_attributes(GString *outstr, gint indent)
 
        WRITE_NL(); WRITE_BOOL(*options, tree_descend_subdirs);
        WRITE_NL(); WRITE_BOOL(*options, view_dir_list_single_click_enter);
+       WRITE_NL(); WRITE_BOOL(*options, circular_selection_lists);
        WRITE_NL(); WRITE_BOOL(*options, lazy_image_sync);
        WRITE_NL(); WRITE_BOOL(*options, update_on_time_change);
        WRITE_SEPARATOR();
@@ -340,6 +341,7 @@ static void write_global_attributes(GString *outstr, gint indent)
 
        WRITE_NL(); WRITE_BOOL(*options, save_window_positions);
        WRITE_NL(); WRITE_BOOL(*options, use_saved_window_positions_for_new_windows);
+       WRITE_NL(); WRITE_BOOL(*options, save_window_workspace);
        WRITE_NL(); WRITE_BOOL(*options, tools_restore_state);
        WRITE_NL(); WRITE_BOOL(*options, save_dialog_window_positions);
        WRITE_NL(); WRITE_BOOL(*options, show_window_ids);
@@ -351,6 +353,10 @@ static void write_global_attributes(GString *outstr, gint indent)
        WRITE_NL(); WRITE_BOOL(*options, marks_save);
        WRITE_NL(); WRITE_CHAR(*options, help_search_engine);
 
+       WRITE_NL(); WRITE_BOOL(*options, external_preview.enable);
+       WRITE_NL(); WRITE_CHAR(*options, external_preview.select);
+       WRITE_NL(); WRITE_CHAR(*options, external_preview.extract);
+
        WRITE_NL(); WRITE_BOOL(*options, with_rename);
        WRITE_NL(); WRITE_BOOL(*options, collections_on_top);
        WRITE_NL(); WRITE_BOOL(*options, hide_window_in_fullscreen);
@@ -404,6 +410,7 @@ static void write_global_attributes(GString *outstr, gint indent)
        WRITE_NL(); WRITE_BOOL(*options, thumbnails.spec_standard);
        WRITE_NL(); WRITE_UINT(*options, thumbnails.quality);
        WRITE_NL(); WRITE_BOOL(*options, thumbnails.use_exif);
+       WRITE_NL(); WRITE_BOOL(*options, thumbnails.use_color_management);
        WRITE_NL(); WRITE_BOOL(*options, thumbnails.use_ft_metadata);
        WRITE_NL(); WRITE_INT(*options, thumbnails.collection_preview);
 //     WRITE_NL(); WRITE_BOOL(*options, thumbnails.use_ft_metadata_small);
@@ -744,6 +751,7 @@ static gboolean load_global_params(const gchar **attribute_names, const gchar **
 
                if (READ_BOOL(*options, tree_descend_subdirs)) continue;
                if (READ_BOOL(*options, view_dir_list_single_click_enter)) continue;
+               if (READ_BOOL(*options, circular_selection_lists)) continue;
                if (READ_BOOL(*options, lazy_image_sync)) continue;
                if (READ_BOOL(*options, update_on_time_change)) continue;
 
@@ -770,6 +778,7 @@ static gboolean load_global_params(const gchar **attribute_names, const gchar **
 
                if (READ_BOOL(*options, save_window_positions)) continue;
                if (READ_BOOL(*options, use_saved_window_positions_for_new_windows)) continue;
+               if (READ_BOOL(*options, save_window_workspace)) continue;
                if (READ_BOOL(*options, tools_restore_state)) continue;
                if (READ_BOOL(*options, save_dialog_window_positions)) continue;
                if (READ_BOOL(*options, show_window_ids)) continue;
@@ -781,6 +790,10 @@ static gboolean load_global_params(const gchar **attribute_names, const gchar **
                if (READ_BOOL(*options, marks_save)) continue;
                if (READ_CHAR(*options, help_search_engine)) continue;
 
+               if (READ_BOOL(*options, external_preview.enable)) continue;
+               if (READ_CHAR(*options, external_preview.select)) continue;
+               if (READ_CHAR(*options, external_preview.extract)) continue;
+
                if (READ_BOOL(*options, collections_on_top)) continue;
                if (READ_BOOL(*options, hide_window_in_fullscreen)) continue;
 
@@ -823,6 +836,7 @@ static gboolean load_global_params(const gchar **attribute_names, const gchar **
                if (READ_BOOL(*options, thumbnails.spec_standard)) continue;
                if (READ_UINT_CLAMP(*options, thumbnails.quality, GDK_INTERP_NEAREST, GDK_INTERP_BILINEAR)) continue;
                if (READ_BOOL(*options, thumbnails.use_exif)) continue;
+               if (READ_BOOL(*options, thumbnails.use_color_management)) continue;
                if (READ_INT(*options, thumbnails.collection_preview)) continue;
                if (READ_BOOL(*options, thumbnails.use_ft_metadata)) continue;
 //             if (READ_BOOL(*options, thumbnails.use_ft_metadata_small)) continue;
@@ -1308,17 +1322,21 @@ static void options_parse_bar(GQParserData *parser_data, GMarkupParseContext *co
 #ifdef HAVE_LIBCHAMPLAIN_GTK
        else if (g_ascii_strcasecmp(element_name, "pane_gps") == 0)
                {
-               GtkWidget *pane = bar_find_pane_by_id(bar, PANE_GPS, options_get_id(attribute_names, attribute_values));
-               if (pane)
-                       {
-                       bar_pane_gps_update_from_config(pane, attribute_names, attribute_values);
-                       }
-               else
+               /* Use this flag to determine if --disable-clutter has been issued */
+               if (!options->disable_gpu)
                        {
-                       pane = bar_pane_gps_new_from_config(attribute_names, attribute_values);
-                       bar_add(bar, pane);
+                       GtkWidget *pane = bar_find_pane_by_id(bar, PANE_GPS, options_get_id(attribute_names, attribute_values));
+                       if (pane)
+                               {
+                               bar_pane_gps_update_from_config(pane, attribute_names, attribute_values);
+                               }
+                       else
+                               {
+                               pane = bar_pane_gps_new_from_config(attribute_names, attribute_values);
+                               bar_add(bar, pane);
+                               }
+                       options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
                        }
-               options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
                }
 #endif
 #endif