Mercurial > geeqie.yaz
comparison src/preferences.c @ 339:de1c2cd06fce
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().
author | zas_ |
---|---|
date | Sat, 12 Apr 2008 21:38:55 +0000 |
parents | 41c3cb73120f |
children | 15c6b94545a2 |
comparison
equal
deleted
inserted
replaced
338:41c3cb73120f | 339:de1c2cd06fce |
---|---|
231 | 231 |
232 options->image.zoom_increment = c_options->image.zoom_increment; | 232 options->image.zoom_increment = c_options->image.zoom_increment; |
233 | 233 |
234 options->image.enable_read_ahead = c_options->image.enable_read_ahead; | 234 options->image.enable_read_ahead = c_options->image.enable_read_ahead; |
235 | 235 |
236 if (options->user_specified_window_background != c_options->user_specified_window_background | 236 if (options->image.use_custom_border_color != c_options->image.use_custom_border_color |
237 || !gdk_color_equal(&options->window_background_color, &c_options->window_background_color)) | 237 || !gdk_color_equal(&options->image.border_color, &c_options->image.border_color)) |
238 { | 238 { |
239 options->user_specified_window_background = c_options->user_specified_window_background; | 239 options->image.use_custom_border_color = c_options->image.use_custom_border_color; |
240 options->window_background_color = c_options->window_background_color; | 240 options->image.border_color = c_options->image.border_color; |
241 layout_colors_update(); | 241 layout_colors_update(); |
242 view_window_colors_update(); | 242 view_window_colors_update(); |
243 } | 243 } |
244 | 244 |
245 options->fullscreen.screen = c_options->fullscreen.screen; | 245 options->fullscreen.screen = c_options->fullscreen.screen; |
917 (options->image.zoom_mode == ZOOM_RESET_NONE), | 917 (options->image.zoom_mode == ZOOM_RESET_NONE), |
918 G_CALLBACK(zoom_mode_none_cb), NULL); | 918 G_CALLBACK(zoom_mode_none_cb), NULL); |
919 | 919 |
920 group = pref_group_new(vbox, FALSE, _("Appearance"), GTK_ORIENTATION_VERTICAL); | 920 group = pref_group_new(vbox, FALSE, _("Appearance"), GTK_ORIENTATION_VERTICAL); |
921 | 921 |
922 pref_checkbox_new_int(group, _("User specified background color"), | 922 pref_checkbox_new_int(group, _("Custom border color"), |
923 options->user_specified_window_background, &c_options->user_specified_window_background); | 923 options->image.use_custom_border_color, &c_options->image.use_custom_border_color); |
924 | 924 |
925 pref_colorbutton_new(group, _("Background color"), &options->window_background_color, | 925 pref_color_button_new(group, _("Border color"), &options->image.border_color, |
926 G_CALLBACK(pref_background_color_set_cb), &c_options->window_background_color); | 926 G_CALLBACK(pref_color_button_set_cb), &c_options->image.border_color); |
927 | 927 |
928 group = pref_group_new(vbox, FALSE, _("Convenience"), GTK_ORIENTATION_VERTICAL); | 928 group = pref_group_new(vbox, FALSE, _("Convenience"), GTK_ORIENTATION_VERTICAL); |
929 | 929 |
930 pref_checkbox_new_int(group, _("Refresh on file change"), | 930 pref_checkbox_new_int(group, _("Refresh on file change"), |
931 options->update_on_time_change, &c_options->update_on_time_change); | 931 options->update_on_time_change, &c_options->update_on_time_change); |