Addl fix #521: zoom increment is not multiplicative

[geeqie.git] / src / rcfile.c

diff --git a/src/rcfile.c b/src/rcfile.c
index 8c90aec..e546b1b 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -307,7 +307,6 @@ static void write_global_attributes(GString *outstr, gint indent)
        /* General Options */
        WRITE_NL(); WRITE_BOOL(*options, show_icon_names);
        WRITE_NL(); WRITE_BOOL(*options, show_star_rating);
-       WRITE_NL(); WRITE_BOOL(*options, show_guidelines);
        WRITE_NL(); WRITE_BOOL(*options, show_predefined_keyword_tree);
        WRITE_SEPARATOR();
 
@@ -331,6 +330,7 @@ static void write_global_attributes(GString *outstr, gint indent)
 
        WRITE_NL(); WRITE_BOOL(*options, mousewheel_scrolls);
        WRITE_NL(); WRITE_BOOL(*options, image_lm_click_nav);
+       WRITE_NL(); WRITE_BOOL(*options, image_l_click_archive);
        WRITE_NL(); WRITE_BOOL(*options, image_l_click_video);
        WRITE_NL(); WRITE_CHAR(*options, image_l_click_video_editor);
        WRITE_NL(); WRITE_INT(*options, open_recent_list_maxsize);
@@ -383,6 +383,7 @@ static void write_global_attributes(GString *outstr, gint indent)
        WRITE_NL(); WRITE_BOOL(*options, image.zoom_to_fit_allow_expand);
        WRITE_NL(); WRITE_UINT(*options, image.zoom_quality);
        WRITE_NL(); WRITE_INT(*options, image.zoom_increment);
+       WRITE_NL(); WRITE_UINT(*options, image.zoom_style);
        WRITE_NL(); WRITE_BOOL(*options, image.fit_window_to_image);
        WRITE_NL(); WRITE_BOOL(*options, image.limit_window_size);
        WRITE_NL(); WRITE_INT(*options, image.max_window_size);
@@ -400,6 +401,7 @@ static void write_global_attributes(GString *outstr, gint indent)
        WRITE_NL(); WRITE_COLOR(*options, image.alpha_color_1);
        WRITE_NL(); WRITE_COLOR(*options, image.alpha_color_2);
        WRITE_NL(); WRITE_BOOL(*options, image.use_clutter_renderer);
+       WRITE_NL(); WRITE_INT(*options, image.tile_size);
 
        /* Thumbnails Options */
        WRITE_NL(); WRITE_INT(*options, thumbnails.max_width);
@@ -521,6 +523,10 @@ static void write_global_attributes(GString *outstr, gint indent)
        WRITE_NL(); WRITE_BOOL(*options, printer.show_page_text);
        WRITE_SEPARATOR();
 
+       /* Threads */
+       WRITE_NL(); WRITE_INT(*options, threads.duplicates);
+       WRITE_SEPARATOR();
+
        /* user-definable mouse buttons */
        WRITE_NL(); WRITE_CHAR(*options, mouse_button_8);
        WRITE_NL(); WRITE_CHAR(*options, mouse_button_9);
@@ -801,7 +807,6 @@ static gboolean load_global_params(const gchar **attribute_names, const gchar **
                /* General options */
                if (READ_BOOL(*options, show_icon_names)) continue;
                if (READ_BOOL(*options, show_star_rating)) continue;
-               if (READ_BOOL(*options, show_guidelines)) continue;
                if (READ_BOOL(*options, show_predefined_keyword_tree)) continue;
 
                if (READ_BOOL(*options, tree_descend_subdirs)) continue;
@@ -822,6 +827,7 @@ static gboolean load_global_params(const gchar **attribute_names, const gchar **
 
                if (READ_BOOL(*options, mousewheel_scrolls)) continue;
                if (READ_BOOL(*options, image_lm_click_nav)) continue;
+               if (READ_BOOL(*options, image_l_click_archive)) continue;
                if (READ_BOOL(*options, image_l_click_video)) continue;
                if (READ_CHAR(*options, image_l_click_video_editor)) continue;
 
@@ -859,6 +865,7 @@ static gboolean load_global_params(const gchar **attribute_names, const gchar **
 
                /* Image options */
                if (READ_UINT_CLAMP(*options, image.zoom_mode, 0, ZOOM_RESET_NONE)) continue;
+               if (READ_UINT_CLAMP(*options, image.zoom_style, 0, ZOOM_ARITHMETIC)) continue;
                if (READ_BOOL(*options, image.zoom_2pass)) continue;
                if (READ_BOOL(*options, image.zoom_to_fit_allow_expand)) continue;
                if (READ_BOOL(*options, image.fit_window_to_image)) continue;
@@ -880,6 +887,7 @@ static gboolean load_global_params(const gchar **attribute_names, const gchar **
                if (READ_COLOR(*options, image.alpha_color_1)) continue;
                if (READ_COLOR(*options, image.alpha_color_2)) continue;
                if (READ_BOOL(*options, image.use_clutter_renderer)) continue;
+               if (READ_INT(*options, image.tile_size)) continue;
 
                /* Thumbnails options */
                if (READ_INT_CLAMP(*options, thumbnails.max_width, 16, 512)) continue;
@@ -1006,6 +1014,9 @@ static gboolean load_global_params(const gchar **attribute_names, const gchar **
                if (READ_BOOL(*options, printer.show_image_text)) continue;
                if (READ_BOOL(*options, printer.show_page_text)) continue;
 
+               /* Threads */
+               if (READ_INT(*options, threads.duplicates)) continue;
+
                /* user-definable mouse buttons */
                if (READ_CHAR(*options, mouse_button_8)) continue;
                if (READ_CHAR(*options, mouse_button_9)) continue;
@@ -1515,7 +1526,7 @@ static void options_parse_layout(GQParserData *parser_data, GMarkupParseContext
                        }
                else
                        {
-                       bar_update_from_config(lw->bar, attribute_names, attribute_values);
+                       bar_update_from_config(lw->bar, attribute_names, attribute_values, lw);
                        }
 
                options_parse_func_push(parser_data, options_parse_bar, NULL, lw->bar);