Revision: 1743
http://geeqie.svn.sourceforge.net/geeqie/?rev=1743&view=rev
Author: nadvornik
Date: 2009-06-13 19:26:32 +0000 (Sat, 13 Jun 2009)
Log Message:
-----------
the options for custom border color were made independent
Modified Paths:
--------------
trunk/src/image.c
trunk/src/options.c
trunk/src/options.h
trunk/src/preferences.c
trunk/src/rcfile.c
Modified: trunk/src/image.c
===================================================================
--- trunk/src/image.c 2009-06-11 18:18:07 UTC (rev 1742)
+++ trunk/src/image.c 2009-06-13 19:26:32 UTC (rev 1743)
@@ -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;
}
Modified: trunk/src/options.c
===================================================================
--- trunk/src/options.c 2009-06-11 18:18:07 UTC (rev 1742)
+++ trunk/src/options.c 2009-06-13 19:26:32 UTC (rev 1743)
@@ -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;
Modified: trunk/src/options.h
===================================================================
--- trunk/src/options.h 2009-06-11 18:18:07 UTC (rev 1742)
+++ trunk/src/options.h 2009-06-13 19:26:32 UTC (rev 1743)
@@ -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;
Modified: trunk/src/preferences.c
===================================================================
--- trunk/src/preferences.c 2009-06-11 18:18:07 UTC (rev 1742)
+++ trunk/src/preferences.c 2009-06-13 19:26:32 UTC (rev 1743)
@@ -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);
Modified: trunk/src/rcfile.c
===================================================================
--- trunk/src/rcfile.c 2009-06-11 18:18:07 UTC (rev 1742)
+++ trunk/src/rcfile.c 2009-06-13 19:26:32 UTC (rev 1743)
@@ -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 */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
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-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
