Rename user_specified_window_background and window_background_color

to image.use_custom_border_color and image.border_color.
Rename pref_background_color_set_cb() to pref_color_button_set_cb().
Rename pref_colorbutton_new() to pref_color_button_new().

diff --git a/src/fullscreen.c b/src/fullscreen.c
index d195d31..99a271e 100644 (file)
--- a/src/fullscreen.c
+++ b/src/fullscreen.c
@@ -289,9 +289,9 @@ FullScreenData *fullscreen_start(GtkWidget *window, ImageWindow *imd,
 
        gtk_container_add(GTK_CONTAINER(fs->window), fs->imd->widget);
 
-       if (options->user_specified_window_background)
+       if (options->image.use_custom_border_color)
                {
-               image_background_set_color(fs->imd, &options->window_background_color);
+               image_background_set_color(fs->imd, &options->image.border_color);
                }
 
        image_set_delay_flip(fs->imd, options->fullscreen.clean_flip);

diff --git a/src/globals.c b/src/globals.c
index 3d0f552..80eb207 100644 (file)
--- a/src/globals.c
+++ b/src/globals.c
@@ -97,8 +97,8 @@ ConfOptions *init_options(ConfOptions *options)
        
        options->place_dialogs_under_mouse = FALSE;
        
-       options->user_specified_window_background = FALSE;
-       memset(&options->window_background_color, 0, sizeof(options->window_background_color));
+       options->image.use_custom_border_color = FALSE;
+       memset(&options->image.border_color, 0, sizeof(options->image.border_color));
        
        options->fullscreen.screen = -1;
        options->fullscreen.clean_flip = FALSE;

diff --git a/src/img-view.c b/src/img-view.c
index 7873480..7b29a20 100644 (file)
--- a/src/img-view.c
+++ b/src/img-view.c
@@ -855,7 +855,7 @@ static ViewWindow *real_view_window_new(FileData *fd, GList *list, CollectionDat
 
        vw->imd = image_new(FALSE);
 
-       image_background_set_color(vw->imd, options->user_specified_window_background ? &options->window_background_color : NULL);
+       image_background_set_color(vw->imd, options->image.use_custom_border_color ? &options->image.border_color : NULL);
 
        image_attach_window(vw->imd, vw->window, NULL, GQ_APPNAME, TRUE);
 
@@ -1011,7 +1011,7 @@ void view_window_colors_update(void)
                ViewWindow *vw = work->data;
                work = work->next;
 
-               image_background_set_color(vw->imd, options->user_specified_window_background ? &options->window_background_color : NULL);
+               image_background_set_color(vw->imd, options->image.use_custom_border_color ? &options->image.border_color : NULL);
                }
 }
 

diff --git a/src/layout.c b/src/layout.c
index 61f6ac4..4de27ed 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -1719,7 +1719,7 @@ void layout_colors_update(void)
                work = work->next;
                
                if (!lw->image) continue;
-               image_background_set_color(lw->image, options->user_specified_window_background ? &options->window_background_color : NULL);
+               image_background_set_color(lw->image, options->image.use_custom_border_color ? &options->image.border_color : NULL);
                }
 }
 

diff --git a/src/layout_image.c b/src/layout_image.c
index 6b0d85c..6d79783 100644 (file)
--- a/src/layout_image.c
+++ b/src/layout_image.c
@@ -1698,7 +1698,7 @@ GtkWidget *layout_image_new(LayoutWindow *lw, gint i)
 
                gtk_widget_ref(lw->split_images[i]->widget);
 
-               image_background_set_color(lw->split_images[i], options->user_specified_window_background ? &options->window_background_color : NULL);
+               image_background_set_color(lw->split_images[i], options->image.use_custom_border_color ? &options->image.border_color : NULL);
 
                image_auto_refresh(lw->split_images[i], 0);
 

diff --git a/src/preferences.c b/src/preferences.c
index 415ca67..56a3d0d 100644 (file)
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -233,11 +233,11 @@ static void config_window_apply(void)
 
        options->image.enable_read_ahead = c_options->image.enable_read_ahead;
 
-       if (options->user_specified_window_background != c_options->user_specified_window_background
-           || !gdk_color_equal(&options->window_background_color, &c_options->window_background_color))
+       if (options->image.use_custom_border_color != c_options->image.use_custom_border_color
+           || !gdk_color_equal(&options->image.border_color, &c_options->image.border_color))
                {
-               options->user_specified_window_background = c_options->user_specified_window_background;
-               options->window_background_color = c_options->window_background_color;
+               options->image.use_custom_border_color = c_options->image.use_custom_border_color;
+               options->image.border_color = c_options->image.border_color;
                layout_colors_update();
                view_window_colors_update();
                }
@@ -919,11 +919,11 @@ static void config_tab_image(GtkWidget *notebook)
 
        group = pref_group_new(vbox, FALSE, _("Appearance"), GTK_ORIENTATION_VERTICAL);
 
-       pref_checkbox_new_int(group, _("User specified background color"),
-                             options->user_specified_window_background, &c_options->user_specified_window_background);
+       pref_checkbox_new_int(group, _("Custom border color"),
+                             options->image.use_custom_border_color, &c_options->image.use_custom_border_color);
 
-       pref_colorbutton_new(group, _("Background color"), &options->window_background_color,
-                            G_CALLBACK(pref_background_color_set_cb), &c_options->window_background_color);
+       pref_color_button_new(group, _("Border color"), &options->image.border_color,
+                             G_CALLBACK(pref_color_button_set_cb), &c_options->image.border_color);
 
        group = pref_group_new(vbox, FALSE, _("Convenience"), GTK_ORIENTATION_VERTICAL);
 

diff --git a/src/rcfile.c b/src/rcfile.c
index 18d829c..4ba3693 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -303,11 +303,7 @@ void save_options(void)
        write_bool_option(ssi, "in_place_rename", options->enable_in_place_rename);
        write_int_option(ssi, "open_recent_max", options->recent_list_max);
        write_bool_option(ssi, "display_dialogs_under_mouse", options->place_dialogs_under_mouse);
-       secure_fputc(ssi, '\n');
-
-       write_bool_option(ssi, "user_specified_window_background", options->user_specified_window_background);
-       write_color_option(ssi, "window_background_color", &options->window_background_color);
-
+       
 
        secure_fprintf(ssi, "\n##### Layout Options #####\n\n");
 
@@ -364,6 +360,8 @@ void save_options(void)
        write_int_option(ssi, "image.dither_quality", options->image.dither_quality);
        write_bool_option(ssi, "image.enable_read_ahead", options->image.enable_read_ahead);
        write_bool_option(ssi, "image.exif_rotate_enable", options->image.exif_rotate_enable);
+       write_bool_option(ssi, "image.use_custom_border_color", options->image.use_custom_border_color);
+       write_color_option(ssi, "image.border_color", &options->image.border_color);
 
 
        secure_fprintf(ssi, "\n##### Thumbnails Options #####\n\n");
@@ -642,6 +640,10 @@ void load_options(void)
                        "image.enable_read_ahead", value, options->image.enable_read_ahead);
                options->image.exif_rotate_enable = read_bool_option(f, option,
                        "image.exif_rotate_enable", value, options->image.exif_rotate_enable);
+               options->image.use_custom_border_color = read_bool_option(f, option,
+                       "image.use_custom_border_color", value, options->image.use_custom_border_color);
+               read_color_option(f, option,
+                       "image.border_color", value, &options->image.border_color);
 
                options->progressive_key_scrolling = read_bool_option(f, option,
                        "progressive_keyboard_scrolling", value, options->progressive_key_scrolling);
@@ -702,11 +704,6 @@ void load_options(void)
                options->place_dialogs_under_mouse = read_bool_option(f, option,
                        "display_dialogs_under_mouse", value, options->place_dialogs_under_mouse);
 
-               options->user_specified_window_background = read_bool_option(f, option,
-                       "user_specified_window_background", value, options->user_specified_window_background);
-               read_color_option(f, option,
-                       "window_background_color", value, &options->window_background_color);
-
                options->fullscreen.screen = read_int_option(f, option,
                        "fullscreen.screen", value, options->fullscreen.screen);
                options->fullscreen.clean_flip = read_bool_option(f, option,

diff --git a/src/typedefs.h b/src/typedefs.h
index 06fcfe5..cade487 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -778,10 +778,10 @@ struct _ConfOptions
                gint zoom_to_fit_allow_expand;
                gint zoom_quality;
                gint zoom_increment;    /* 10 is 1.0, 5 is 0.05, 20 is 2.0, etc. */
-       } image;
 
-       gint user_specified_window_background;
-       GdkColor window_background_color;
+               gint use_custom_border_color;
+               GdkColor border_color;
+       } image;
 
        /* thumbnails */
        struct {

diff --git a/src/ui_misc.c b/src/ui_misc.c
index aaf38c3..a2a2bbf 100644 (file)
--- a/src/ui_misc.c
+++ b/src/ui_misc.c
@@ -1614,16 +1614,16 @@ gint pref_list_string_get(const gchar *group, const gchar *key, const gchar **re
 }
 
 
-void pref_background_color_set_cb(GtkWidget *widget, gpointer data)
+void pref_color_button_set_cb(GtkWidget *widget, gpointer data)
 {
        GdkColor *color = data;
 
        gtk_color_button_get_color(GTK_COLOR_BUTTON(widget), color);
 }
 
-GtkWidget *pref_colorbutton_new(GtkWidget *parent_box,
-                               const gchar *title, const GdkColor *color,
-                               GCallback func, gpointer data)
+GtkWidget *pref_color_button_new(GtkWidget *parent_box,
+                                const gchar *title, const GdkColor *color,
+                                GCallback func, gpointer data)
 {
        GtkWidget *button;
        

diff --git a/src/ui_misc.h b/src/ui_misc.h
index 6d8c12e..68fbb95 100644 (file)
--- a/src/ui_misc.h
+++ b/src/ui_misc.h
@@ -179,10 +179,10 @@ void pref_list_string_set(const gchar *group, const gchar *key, const gchar *val
 gint pref_list_string_get(const gchar *group, const gchar *key, const gchar **result);
 
 
-void pref_background_color_set_cb(GtkWidget *widget, gpointer data);
-GtkWidget *pref_colorbutton_new(GtkWidget *parent_box,
-                               const gchar *title, const GdkColor *color,
-                               GCallback func, gpointer data);
+void pref_color_button_set_cb(GtkWidget *widget, gpointer data);
+GtkWidget *pref_color_button_new(GtkWidget *parent_box,
+                                const gchar *title, const GdkColor *color,
+                                GCallback func, gpointer data);
 
 
 #endif