On Thursday 04 June 2009 21:51:20 z...@users.sourceforge.net wrote:
> Revision: 1725
> http://geeqie.svn.sourceforge.net/geeqie/?rev=1725&view=rev
> Author: zas_
> Date: 2009-06-04 19:51:20 +0000 (Thu, 04 Jun 2009)
>
> Log Message:
> -----------
> Add an option to Image preferences to restrict custom border to fullscreen
> mode only. Bug 2798062.
>
IMHO the two options should be independent, now it is a bit confusing and
one of the four combinations is wasted ;-)
See the attached patch.
Vladimir
Index: preferences.c
===================================================================
--- preferences.c (revision 1741)
+++ preferences.c (working copy)
@@ -316,10 +316,10 @@
if (options->image.use_custom_border_color != c_options->image.use_custom_border_color
- || options->image.custom_border_fullscreen_only != c_options->image.custom_border_fullscreen_only
+ || options->image.use_custom_border_color_in_fullscreen != c_options->image.use_custom_border_color_in_fullscreen
|| !gdk_color_equal(&options->image.border_color, &c_options->image.border_color))
{
- options->image.custom_border_fullscreen_only = c_options->image.custom_border_fullscreen_only;
+ options->image.use_custom_border_color_in_fullscreen = c_options->image.use_custom_border_color_in_fullscreen;
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();
@@ -1334,11 +1334,11 @@
group = pref_group_new(vbox, FALSE, _("Appearance"), GTK_ORIENTATION_VERTICAL);
- pref_checkbox_new_int(group, _("Custom border color"),
+ pref_checkbox_new_int(group, _("Use custom border color in window mode"),
options->image.use_custom_border_color, &c_options->image.use_custom_border_color);
- pref_checkbox_new_int(group, _("Apply custom border to fullscreen mode only"),
- options->image.custom_border_fullscreen_only, &c_options->image.custom_border_fullscreen_only);
+ pref_checkbox_new_int(group, _("Use custom border color in fullscreen mode"),
+ options->image.use_custom_border_color_in_fullscreen, &c_options->image.use_custom_border_color_in_fullscreen);
pref_color_button_new(group, _("Border color"), &options->image.border_color,
G_CALLBACK(pref_color_button_set_cb), &c_options->image.border_color);
Index: options.c
===================================================================
--- options.c (revision 1741)
+++ options.c (working copy)
@@ -75,7 +75,7 @@
options->image.tile_cache_max = 10;
options->image.image_cache_max = 128; /* 4 x 10MPix */
options->image.use_custom_border_color = FALSE;
- options->image.custom_border_fullscreen_only = FALSE;
+ options->image.use_custom_border_color_in_fullscreen = TRUE;
options->image.zoom_2pass = TRUE;
options->image.zoom_increment = 5;
options->image.zoom_mode = ZOOM_RESET_NONE;
Index: options.h
===================================================================
--- options.h (revision 1741)
+++ options.h (working copy)
@@ -68,7 +68,7 @@
guint zoom_quality;
gint zoom_increment; /* 10 is 1.0, 5 is 0.05, 20 is 2.0, etc. */
- gboolean custom_border_fullscreen_only;
+ gboolean use_custom_border_color_in_fullscreen;
gboolean use_custom_border_color;
GdkColor border_color;
} image;
Index: image.c
===================================================================
--- image.c (revision 1741)
+++ image.c (working copy)
@@ -1474,8 +1474,8 @@
{
GdkColor *color = NULL;
- if (options->image.use_custom_border_color
- && (!options->image.custom_border_fullscreen_only || fullscreen))
+ if ((options->image.use_custom_border_color && !fullscreen) ||
+ (options->image.use_custom_border_color_in_fullscreen && fullscreen))
{
color = &options->image.border_color;
}
Index: rcfile.c
===================================================================
--- rcfile.c (revision 1741)
+++ rcfile.c (working copy)
@@ -330,7 +330,7 @@
WRITE_NL(); WRITE_BOOL(*options, image.enable_read_ahead);
WRITE_NL(); WRITE_BOOL(*options, image.exif_rotate_enable);
WRITE_NL(); WRITE_BOOL(*options, image.use_custom_border_color);
- WRITE_NL(); WRITE_BOOL(*options, image.custom_border_fullscreen_only);
+ WRITE_NL(); WRITE_BOOL(*options, image.use_custom_border_color_in_fullscreen);
WRITE_NL(); WRITE_COLOR(*options, image.border_color);
// WRITE_SUBTITLE("Thumbnails Options");
@@ -614,7 +614,7 @@
if (READ_BOOL(*options, image.enable_read_ahead)) continue;
if (READ_BOOL(*options, image.exif_rotate_enable)) continue;
if (READ_BOOL(*options, image.use_custom_border_color)) continue;
- if (READ_BOOL(*options, image.custom_border_fullscreen_only)) continue;
+ if (READ_BOOL(*options, image.use_custom_border_color_in_fullscreen)) continue;
if (READ_COLOR(*options, image.border_color)) continue;
/* thumbnails options */
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables unlimited
royalty-free distribution of the report engine for externally facing
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Geeqie-devel mailing list
Geeqie-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geeqie-devel
