nautilus r14168 - in branches/gnome-2-22: . libnautilus-private
- From: cneumair svn gnome org
- To: svn-commits-list gnome org
- Subject: nautilus r14168 - in branches/gnome-2-22: . libnautilus-private
- Date: Mon, 19 May 2008 12:03:00 +0000 (UTC)
Author: cneumair
Date: Mon May 19 12:02:59 2008
New Revision: 14168
URL: http://svn.gnome.org/viewvc/nautilus?rev=14168&view=rev
Log:
2008-05-19 Christian Neumair <cneumair gnome org>
(from SÃren Sandmann <sandmann redhat com>, backported from trunk)
* libnautilus-private/nautilus-directory-background.c
(nautilus_file_background_read_desktop_settings):
Rewrite this function using gconf directly instead of relying on
libbackground.
* libnautilus-private/nautilus-directory-background.c
(nautilus_file_background_write_desktop_settings):
Rewrite to use gconf directly
* libbackground:
Remove.
Modified:
branches/gnome-2-22/ (props changed)
branches/gnome-2-22/ChangeLog
branches/gnome-2-22/Makefile.am
branches/gnome-2-22/configure.in
branches/gnome-2-22/libnautilus-private/Makefile.am
branches/gnome-2-22/libnautilus-private/nautilus-directory-background.c
Modified: branches/gnome-2-22/Makefile.am
==============================================================================
--- branches/gnome-2-22/Makefile.am (original)
+++ branches/gnome-2-22/Makefile.am Mon May 19 12:02:59 2008
@@ -15,7 +15,6 @@
SUBDIRS = \
libnautilus-extension \
cut-n-paste-code \
- libbackground \
libnautilus-private \
src \
test \
Modified: branches/gnome-2-22/configure.in
==============================================================================
--- branches/gnome-2-22/configure.in (original)
+++ branches/gnome-2-22/configure.in Mon May 19 12:02:59 2008
@@ -477,7 +477,6 @@
data/patterns/Makefile
docs/Makefile
icons/Makefile
-libbackground/Makefile
libnautilus-private/Makefile
libnautilus-extension/Makefile
libnautilus-extension/libnautilus-extension.pc
Modified: branches/gnome-2-22/libnautilus-private/Makefile.am
==============================================================================
--- branches/gnome-2-22/libnautilus-private/Makefile.am (original)
+++ branches/gnome-2-22/libnautilus-private/Makefile.am Mon May 19 12:02:59 2008
@@ -18,7 +18,6 @@
dependency_static_libs = \
$(top_builddir)/cut-n-paste-code/libegg/libegg.la \
- $(top_builddir)/libbackground/libbackground.la \
$(NULL)
libnautilus_private_la_LDFLAGS = \
Modified: branches/gnome-2-22/libnautilus-private/nautilus-directory-background.c
==============================================================================
--- branches/gnome-2-22/libnautilus-private/nautilus-directory-background.c (original)
+++ branches/gnome-2-22/libnautilus-private/nautilus-directory-background.c Mon May 19 12:02:59 2008
@@ -35,7 +35,7 @@
#include "nautilus-metadata.h"
#include "nautilus-file-attributes.h"
#include <gtk/gtkmain.h>
-#include <libbackground/preferences.h>
+#include <string.h>
static void background_changed_callback (EelBackground *background,
GdkDragAction action,
@@ -100,63 +100,132 @@
}
+#define BG_PREFERENCES_DRAW_BACKGROUND "/desktop/gnome/background/draw_background"
+#define BG_PREFERENCES_PRIMARY_COLOR "/desktop/gnome/background/primary_color"
+#define BG_PREFERENCES_SECONDARY_COLOR "/desktop/gnome/background/secondary_color"
+#define BG_PREFERENCES_COLOR_SHADING_TYPE "/desktop/gnome/background/color_shading_type"
+#define BG_PREFERENCES_PICTURE_OPTIONS "/desktop/gnome/background/picture_options"
+#define BG_PREFERENCES_PICTURE_OPACITY "/desktop/gnome/background/picture_opacity"
+#define BG_PREFERENCES_PICTURE_FILENAME "/desktop/gnome/background/picture_filename"
+
+static void
+read_color (GConfClient *client, const char *key, GdkColor *color)
+{
+ gchar *tmp;
+
+ tmp = gconf_client_get_string (client, key, NULL);
+
+ if (tmp != NULL) {
+ if (!gdk_color_parse (tmp, color))
+ gdk_color_parse ("black", color);
+ }
+ else {
+ gdk_color_parse ("black", color);
+ }
+
+ gdk_rgb_find_color (gdk_rgb_get_colormap (), color);
+}
+
static void
nautilus_file_background_read_desktop_settings (char **color,
char **image,
EelBackgroundImagePlacement *placement)
{
+ GConfClient *client;
+ gboolean enabled;
+ GdkColor primary, secondary;
+ gchar *tmp, *filename;
char *end_color;
char *start_color;
gboolean use_gradient;
gboolean is_horizontal;
- BGPreferences *prefs;
+ client = gconf_client_get_default ();
- prefs = BG_PREFERENCES (bg_preferences_new ());
+ filename = NULL;
- bg_preferences_load (prefs);
+ /* Get the image filename */
+ enabled = gconf_client_get_bool (client, BG_PREFERENCES_DRAW_BACKGROUND, NULL);
+ if (enabled) {
+ tmp = gconf_client_get_string (client, BG_PREFERENCES_PICTURE_FILENAME, NULL);
+ if (tmp != NULL) {
+ if (g_utf8_validate (tmp, -1, NULL) && g_file_test (tmp, G_FILE_TEST_EXISTS)) {
+ filename = g_strdup (tmp);
+ }
+ else {
+ filename = g_filename_from_utf8 (tmp, -1, NULL, NULL, NULL);
+ }
+ }
+ g_free (tmp);
- if (prefs->wallpaper_enabled) {
- if (prefs->wallpaper_filename != NULL &&
- prefs->wallpaper_filename [0] != '\0') {
- *image = g_filename_to_uri (prefs->wallpaper_filename, NULL, NULL);
- } else {
+ if (filename != NULL && filename[0] != '\0') {
+ *image = g_filename_to_uri (filename, NULL, NULL);
+ }
+ else {
*image = NULL;
}
- }
+ g_free (filename);
+ }
+ else {
+ *image = NULL;
+ }
+
+ /* Get the placement */
+ tmp = gconf_client_get_string (client, BG_PREFERENCES_PICTURE_OPTIONS, NULL);
+ if (tmp != NULL) {
+ if (strcmp (tmp, "wallpaper") == 0) {
+ *placement = EEL_BACKGROUND_TILED;
+ }
+ else if (strcmp (tmp, "centered") == 0) {
+ *placement = EEL_BACKGROUND_CENTERED;
+ }
+ else if (strcmp (tmp, "scaled") == 0) {
+ *placement = EEL_BACKGROUND_SCALED_ASPECT;
+ }
+ else if (strcmp (tmp, "stretched") == 0) {
+ *placement = EEL_BACKGROUND_SCALED;
+ }
+ else if (strcmp (tmp, "zoom") == 0) {
+ *placement = EEL_BACKGROUND_ZOOM;
+ }
+ else {
+ *placement = EEL_BACKGROUND_CENTERED;
+ }
+ }
else {
- *image = NULL;
- }
-
- switch (prefs->wallpaper_type) {
- default:
- g_assert_not_reached ();
-
-/* case WPTYPE_EMBOSSED:*/
- /* FIXME bugzilla.gnome.org 42193: we don't support embossing.
- * Just treat it as centered - ugh.
- */
- case WPTYPE_CENTERED:
*placement = EEL_BACKGROUND_CENTERED;
- break;
- case WPTYPE_TILED:
- *placement = EEL_BACKGROUND_TILED;
- break;
- case WPTYPE_STRETCHED:
- *placement = EEL_BACKGROUND_SCALED;
- break;
- case WPTYPE_SCALED:
- *placement = EEL_BACKGROUND_SCALED_ASPECT;
- break;
- case WPTYPE_ZOOM:
- *placement = EEL_BACKGROUND_ZOOM;
- break;
}
-
- end_color = eel_gdk_rgb_to_color_spec (eel_gdk_color_to_rgb (prefs->color2));
- start_color = eel_gdk_rgb_to_color_spec (eel_gdk_color_to_rgb (prefs->color1));
- use_gradient = prefs->gradient_enabled;
- is_horizontal = (prefs->orientation == ORIENTATION_HORIZ);
+
+ /* Get the color */
+ tmp = gconf_client_get_string (client, BG_PREFERENCES_COLOR_SHADING_TYPE, NULL);
+ if (tmp != NULL) {
+ if (strcmp (tmp, "solid") == 0) {
+ use_gradient = FALSE;
+ is_horizontal = FALSE;
+ }
+ else if (strcmp (tmp, "vertical-gradient") == 0) {
+ use_gradient = TRUE;
+ is_horizontal = FALSE;
+ }
+ else if (strcmp (tmp, "horizontal-gradient") == 0) {
+ use_gradient = TRUE;
+ is_horizontal = TRUE;
+ }
+ else {
+ use_gradient = FALSE;
+ is_horizontal = FALSE;
+ }
+ }
+ else {
+ use_gradient = FALSE;
+ is_horizontal = FALSE;
+ }
+
+ read_color (client, BG_PREFERENCES_PRIMARY_COLOR, &primary);
+ read_color (client, BG_PREFERENCES_SECONDARY_COLOR, &secondary);
+
+ start_color = eel_gdk_rgb_to_color_spec (eel_gdk_color_to_rgb (&primary));
+ end_color = eel_gdk_rgb_to_color_spec (eel_gdk_color_to_rgb (&secondary));
if (use_gradient) {
*color = eel_gradient_new (start_color, end_color, is_horizontal);
@@ -166,8 +235,15 @@
g_free (start_color);
g_free (end_color);
+}
- g_object_unref (prefs);
+static char *
+color_to_string (const GdkColor *color)
+{
+ return g_strdup_printf ("#%02x%02x%02x",
+ color->red >> 8,
+ color->green >> 8,
+ color->blue >> 8);
}
static void
@@ -175,76 +251,89 @@
{
char *end_color;
char *start_color;
- char *original_filename;
-
- wallpaper_type_t wallpaper_align;
- BGPreferences *prefs;
-
- prefs = BG_PREFERENCES (bg_preferences_new ());
- bg_preferences_load (prefs);
+ GdkColor tmp;
+ const char *options;
+ const char *shading;
+ gchar *primary;
+ gchar *secondary;
+ GConfClient *client;
+ gchar *filename;
+
+ client = gconf_client_get_default();
+
if (color != NULL) {
start_color = eel_gradient_get_start_color_spec (color);
- gdk_color_parse (start_color, prefs->color1);
+ gdk_color_parse (start_color, &tmp);
g_free (start_color);
+ primary = color_to_string (&tmp);
/* if color is not a gradient, this ends up writing same as start_color */
end_color = eel_gradient_get_end_color_spec (color);
- gdk_color_parse (end_color, prefs->color2);
+ gdk_color_parse (end_color, &tmp);
g_free (end_color);
+ secondary = color_to_string (&tmp);
if (eel_gradient_is_gradient (color)) {
- prefs->gradient_enabled = TRUE;
- prefs->orientation = eel_gradient_is_horizontal (color) ? ORIENTATION_HORIZ : ORIENTATION_VERT;
+ if (eel_gradient_is_horizontal (color)) {
+ shading = "horizontal-gradient";
+ }
+ else {
+ shading = "vertical-gradient";
+ }
} else {
- prefs->gradient_enabled = FALSE;
- prefs->orientation = ORIENTATION_SOLID;
- }
+ shading = "solid";
+ }
} else {
- /* We set it to white here because that's how backgrounds with a NULL color
- * are drawn by Nautilus - due to usage of eel_gdk_color_parse_with_white_default.
- */
- gdk_color_parse ("#FFFFFF", prefs->color1);
- gdk_color_parse ("#FFFFFF", prefs->color2);
- prefs->gradient_enabled = FALSE;
- prefs->orientation = ORIENTATION_SOLID;
- }
+ shading = "solid";
+ primary = g_strdup ("#FFFFFF");
+ secondary = g_strdup ("#FFFFFF");
+ }
- original_filename = prefs->wallpaper_filename;
- if (image != NULL) {
- prefs->wallpaper_filename = g_filename_from_uri (image, NULL, NULL);
- prefs->wallpaper_enabled = TRUE;
- switch (placement) {
- case EEL_BACKGROUND_TILED:
- wallpaper_align = WPTYPE_TILED;
- break;
- case EEL_BACKGROUND_CENTERED:
- wallpaper_align = WPTYPE_CENTERED;
- break;
- case EEL_BACKGROUND_SCALED:
- wallpaper_align = WPTYPE_STRETCHED;
- break;
- case EEL_BACKGROUND_SCALED_ASPECT:
- wallpaper_align = WPTYPE_SCALED;
- break;
- case EEL_BACKGROUND_ZOOM:
- wallpaper_align = WPTYPE_ZOOM;
- break;
- default:
- g_assert_not_reached ();
- wallpaper_align = WPTYPE_TILED;
- break;
- }
-
- prefs->wallpaper_type = wallpaper_align;
- } else {
- prefs->wallpaper_enabled = FALSE;
- prefs->wallpaper_filename = g_strdup (original_filename);
+ gconf_client_set_string (client, BG_PREFERENCES_PRIMARY_COLOR, primary, NULL);
+ gconf_client_set_string (client, BG_PREFERENCES_SECONDARY_COLOR, secondary, NULL);
+ gconf_client_set_string (client, BG_PREFERENCES_COLOR_SHADING_TYPE, shading, NULL);
+
+ g_free (primary);
+ g_free (secondary);
+
+ if (image != NULL) {
+ filename = g_filename_from_uri (image, NULL, NULL);
+
+ switch (placement) {
+ case EEL_BACKGROUND_TILED:
+ options = "wallpaper";
+ break;
+ case EEL_BACKGROUND_CENTERED:
+ options = "centered";
+ break;
+ case EEL_BACKGROUND_SCALED:
+ options = "stretched";
+ break;
+ case EEL_BACKGROUND_SCALED_ASPECT:
+ options = "scaled";
+ break;
+ case EEL_BACKGROUND_ZOOM:
+ options = "zoom";
+ break;
+ default:
+ g_assert_not_reached ();
+ options = "wallpaper";
+ break;
+ }
}
- g_free (original_filename);
+ else {
+ filename = NULL;
+ options = "none";
+ }
+
+ if (filename != NULL) {
+ gconf_client_set_string (client, BG_PREFERENCES_PICTURE_FILENAME, filename, NULL);
+ }
+
+ gconf_client_set_string (client, BG_PREFERENCES_PICTURE_OPTIONS, options, NULL);
- bg_preferences_save (prefs);
- g_object_unref (prefs);
+ g_free (filename);
}
static void
@@ -445,7 +534,7 @@
== file);
if (eel_background_is_desktop (background)) {
- nautilus_file_background_read_desktop_settings (&color, &image, &placement);
+ nautilus_file_background_read_desktop_settings (&color, &image, &placement);
} else {
color = nautilus_file_get_metadata (file,
NAUTILUS_METADATA_KEY_LOCATION_BACKGROUND_COLOR,
@@ -455,11 +544,11 @@
NULL);
placement = EEL_BACKGROUND_TILED; /* non-tiled only avail for desktop, at least for now */
- /* if there's none, read the default from the theme */
- if (color == NULL && image == NULL) {
- nautilus_file_background_get_default_settings
+ /* if there's none, read the default from the theme */
+ if (color == NULL && image == NULL) {
+ nautilus_file_background_get_default_settings
(&color, &image, &placement);
- }
+ }
}
/* Block the other handler while we are responding to changes
@@ -478,7 +567,7 @@
eel_background_set_image_uri (background, image);
}
eel_background_set_image_placement (background, placement);
-
+
/* Unblock the handler. */
g_signal_handlers_unblock_by_func
(background,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
