[maemo-commits] [maemo-commits] r12446 - in projects/haf/trunk/hildon-desktop: . background-manager src
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Mon Jun 25 15:39:39 EEST 2007
- Previous message: [maemo-commits] r12445 - in projects/haf/trunk/hildon-desktop: . libhildondesktop
- Next message: [maemo-commits] r12447 - projects/haf/branches/maemo-af-desktop
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: jobi Date: 2007-06-25 15:39:25 +0300 (Mon, 25 Jun 2007) New Revision: 12446 Modified: projects/haf/trunk/hildon-desktop/ChangeLog projects/haf/trunk/hildon-desktop/background-manager/background-manager.c projects/haf/trunk/hildon-desktop/background-manager/background-manager.h projects/haf/trunk/hildon-desktop/background-manager/background-manager.xml.in projects/haf/trunk/hildon-desktop/src/hd-home-background.c projects/haf/trunk/hildon-desktop/src/hd-home-window.c Log: 2007-06-25 Johan Bilien <johan.bilien at nokia.com> * background-manager/{background-manager.[ch], background-manager.xml.in}: - removed the west and north border argument, not used anymore * src/hd-home-background.[ch]: - Removed _border properties, not used anymore Modified: projects/haf/trunk/hildon-desktop/ChangeLog =================================================================== --- projects/haf/trunk/hildon-desktop/ChangeLog 2007-06-25 12:26:07 UTC (rev 12445) +++ projects/haf/trunk/hildon-desktop/ChangeLog 2007-06-25 12:39:25 UTC (rev 12446) @@ -1,5 +1,14 @@ 2007-06-25 Johan Bilien <johan.bilien at nokia.com> + * background-manager/{background-manager.[ch], + background-manager.xml.in}: + - removed the west and north border argument, not used + anymore + * src/hd-home-background.[ch]: + - Removed _border properties, not used anymore + +2007-06-25 Johan Bilien <johan.bilien at nokia.com> + * libhildondesktop/hildon-home-area.c: - created Layout struct which adds the stack index - save and load the stack order Modified: projects/haf/trunk/hildon-desktop/background-manager/background-manager.c =================================================================== --- projects/haf/trunk/hildon-desktop/background-manager/background-manager.c 2007-06-25 12:26:07 UTC (rev 12445) +++ projects/haf/trunk/hildon-desktop/background-manager/background-manager.c 2007-06-25 12:39:25 UTC (rev 12446) @@ -350,43 +350,6 @@ } static GdkPixbuf * -load_image_from_file (const gchar *filename, - gboolean cancellable, - GError **error) -{ - gchar *filename_uri; - GdkPixbuf *retval; - GError *uri_error; - GError *load_error; - - uri_error = NULL; - filename_uri = g_filename_to_uri (filename, NULL, &uri_error); - if (uri_error) - { - g_set_error (error, BACKGROUND_MANAGER_ERROR, - BACKGROUND_MANAGER_ERROR_UNKNOWN, - "Unable to convert `%s' to a valid URI: %s", - filename, - uri_error->message); - g_error_free (uri_error); - - return NULL; - } - - load_error = NULL; - retval = load_image_from_uri (filename_uri, TRUE, cancellable, &load_error); - if (load_error) - { - g_propagate_error (error, load_error); - } - - g_free (filename_uri); - - return retval; -} - - -static GdkPixbuf * create_background_from_color (const GdkColor *src, gint width, gint height) @@ -566,8 +529,6 @@ composite_background (const GdkPixbuf *bg_image, const GdkColor *bg_color, BackgroundMode mode, - const gchar *sidebar_path, - const gchar *titlebar_path, gint window_width, gint window_height, gboolean cancellable, @@ -579,11 +540,7 @@ { GError *bg_error; GdkPixbuf *pixbuf; - GdkPixbuf *compose; - gint titlebar_height = 0; - g_debug ("Compositing background image..."); - bg_error = NULL; if (bg_image) @@ -619,116 +576,6 @@ return NULL; } - if (titlebar_path && *titlebar_path) - { - compose = load_image_from_file (titlebar_path, cancellable, &bg_error); - - titlebar_height = gdk_pixbuf_get_height (compose); - - if (bg_error) - { - g_warning ("Unable to load titlebar pixbuf: %s", bg_error->message); - - g_error_free (bg_error); - bg_error = NULL; - } - else if (!compose) - { - g_debug ("Assuming loading of titlebar cancelled"); - if (pixbuf) - g_object_unref (pixbuf); - return NULL; - } - else - { - g_debug ("Compositing titlebar"); - /* Scale it horizontally */ - double x_scale; - - x_scale = (double)(window_width - left_offset - right_offset) / - gdk_pixbuf_get_width (compose); - - gdk_pixbuf_composite (compose, - pixbuf, - left_offset, top_offset, - window_width - left_offset - right_offset, - gdk_pixbuf_get_height (compose), - left_offset, top_offset, - x_scale, - 1.0, - GDK_INTERP_NEAREST, - HILDON_HOME_IMAGE_ALPHA_FULL); - - g_object_unref (compose); - compose = NULL; - } - } - - if (sidebar_path && *sidebar_path) - { - - compose = load_image_from_file (sidebar_path, cancellable, &bg_error); - if (bg_error) - { - g_warning ("Unable to load sidebar pixbuf: %s", bg_error->message); - - g_error_free (bg_error); - bg_error = NULL; - } - else if (!compose) - { - g_debug ("Assuming loading of sidebar cancelled"); - if (pixbuf) - g_object_unref (pixbuf); - return NULL; - } - else - { - gint width = gdk_pixbuf_get_width (compose); - gint height = gdk_pixbuf_get_height (compose); - gint sidebar_height; - - g_debug ("Compositing sidebar (w:%d, h:%d)", - width, height); - - sidebar_height = window_height - titlebar_height; - if (height != sidebar_height) - { - GdkPixbuf *scaled; - gint i; - - scaled = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, - width, sidebar_height); - for (i = 0; i < (sidebar_height - height); i += height) - { - gdk_pixbuf_copy_area (compose, - 0, 0, - width, height, - scaled, - 0, i + height); - } - - g_object_unref (compose); - compose = scaled; - } - - gdk_pixbuf_composite (compose, - pixbuf, - left_offset, - top_offset + titlebar_height, - gdk_pixbuf_get_width (compose), - gdk_pixbuf_get_height (compose), - left_offset, - top_offset, - 1.0, 1.0, - GDK_INTERP_NEAREST, - HILDON_HOME_IMAGE_ALPHA_FULL); - - g_object_unref (compose); - compose = NULL; - } - } - return pixbuf; } @@ -774,8 +621,6 @@ background_manager_set_background (BackgroundManager *manager, gint window_xid, const gchar *filename, - const gchar *top_bar, - const gchar *left_bar, guint16 red, guint16 green, guint16 blue, @@ -858,8 +703,6 @@ background = composite_background (image, &color, mode, - NULL, - left_bar, width, height, TRUE, @@ -931,7 +774,7 @@ gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), colormap); gdk_flush (); - gdk_draw_pixbuf (pixmap, gc, background, + gdk_draw_pixbuf (pixmap, gc, background, 0, 0, 0, 0, gdk_pixbuf_get_width (background), gdk_pixbuf_get_height (background), Modified: projects/haf/trunk/hildon-desktop/background-manager/background-manager.h =================================================================== --- projects/haf/trunk/hildon-desktop/background-manager/background-manager.h 2007-06-25 12:26:07 UTC (rev 12445) +++ projects/haf/trunk/hildon-desktop/background-manager/background-manager.h 2007-06-25 12:39:25 UTC (rev 12446) @@ -92,12 +92,10 @@ GType background_manager_get_type (void) G_GNUC_CONST; -gboolean background_manager_set_background +gboolean background_manager_set_background (BackgroundManager *manager, gint window_xid, const gchar *filename, - const gchar *top_bar, - const gchar *left_bar, guint16 red, guint16 green, guint16 blue, Modified: projects/haf/trunk/hildon-desktop/background-manager/background-manager.xml.in =================================================================== --- projects/haf/trunk/hildon-desktop/background-manager/background-manager.xml.in 2007-06-25 12:26:07 UTC (rev 12445) +++ projects/haf/trunk/hildon-desktop/background-manager/background-manager.xml.in 2007-06-25 12:39:25 UTC (rev 12446) @@ -5,8 +5,6 @@ <method name="SetBackground"> <arg type="i" name="window_id"/> <arg type="s" name="filename"/> - <arg type="s" name="west_border"/> - <arg type="s" name="north_border"/> <arg type="i" name="red"/> <arg type="i" name="green"/> <arg type="i" name="blue"/> Modified: projects/haf/trunk/hildon-desktop/src/hd-home-background.c =================================================================== --- projects/haf/trunk/hildon-desktop/src/hd-home-background.c 2007-06-25 12:26:07 UTC (rev 12445) +++ projects/haf/trunk/hildon-desktop/src/hd-home-background.c 2007-06-25 12:39:25 UTC (rev 12446) @@ -43,10 +43,6 @@ /* Key used in the home-background.conf */ #define HD_HOME_BACKGROUND_KEY_GROUP "Hildon Home" #define HD_HOME_BACKGROUND_KEY_URI "BackgroundImage" -#define HD_HOME_BACKGROUND_KEY_SIDEBAR "SidebarImage" -#define HD_HOME_BACKGROUND_KEY_TITLEBAR "TitlebarImage" -#define HD_HOME_BACKGROUND_KEY_BOTTOMBAR "BottombarImage" -#define HD_HOME_BACKGROUND_KEY_RIGHTBAR "RightbarImage" #define HD_HOME_BACKGROUND_KEY_RED "Red" #define HD_HOME_BACKGROUND_KEY_GREEN "Green" #define HD_HOME_BACKGROUND_KEY_BLUE "Blue" @@ -62,10 +58,6 @@ enum { PROP_FILENAME = 1, - PROP_NORTH_BORDER, - PROP_SOUTH_BORDER, - PROP_EAST_BORDER, - PROP_WEST_BORDER, PROP_MODE, PROP_COLOR }; @@ -77,10 +69,6 @@ BackgroundMode mode; gchar *filename; - gchar *north_border; - gchar *west_border; - gchar *east_border; - gchar *south_border; }; @@ -127,42 +115,6 @@ PROP_FILENAME, pspec); - pspec = g_param_spec_string ("north-border", - "North border", - "North border image filename", - "", - G_PARAM_READWRITE | G_PARAM_CONSTRUCT); - g_object_class_install_property (object_class, - PROP_NORTH_BORDER, - pspec); - - pspec = g_param_spec_string ("south-border", - "South border", - "South border image filename", - "", - G_PARAM_READWRITE | G_PARAM_CONSTRUCT); - g_object_class_install_property (object_class, - PROP_SOUTH_BORDER, - pspec); - - pspec = g_param_spec_string ("west-border", - "West border", - "West border image filename", - "", - G_PARAM_READWRITE | G_PARAM_CONSTRUCT); - g_object_class_install_property (object_class, - PROP_WEST_BORDER, - pspec); - - pspec = g_param_spec_string ("east-border", - "East border", - "East border image filename", - "", - G_PARAM_READWRITE | G_PARAM_CONSTRUCT); - g_object_class_install_property (object_class, - PROP_EAST_BORDER, - pspec); - pspec = g_param_spec_int ("mode", "Mode", "Background stretching mode", @@ -181,33 +133,21 @@ g_object_class_install_property (object_class, PROP_COLOR, pspec); - + g_type_class_add_private (klass, sizeof (HDHomeBackgroundPrivate)); } static void hd_home_background_finalize (GObject *object) { - HDHomeBackgroundPrivate *priv; - + HDHomeBackgroundPrivate *priv; + g_return_if_fail (HD_IS_HOME_BACKGROUND (object)); priv = HD_HOME_BACKGROUND (object)->priv; g_free (priv->filename); priv->filename = NULL; - g_free (priv->north_border); - priv->north_border = NULL; - - g_free (priv->west_border); - priv->west_border = NULL; - - g_free (priv->east_border); - priv->east_border = NULL; - - g_free (priv->south_border); - priv->south_border = NULL; - if (priv->color) gdk_color_free (priv->color); priv->color = NULL; @@ -232,22 +172,6 @@ else priv->filename = g_strdup (g_value_get_string (value)); break; - case PROP_NORTH_BORDER: - g_free (priv->north_border); - priv->north_border = g_strdup (g_value_get_string (value)); - break; - case PROP_WEST_BORDER: - g_free (priv->west_border); - priv->west_border = g_strdup (g_value_get_string (value)); - break; - case PROP_EAST_BORDER: - g_free (priv->east_border); - priv->east_border = g_strdup (g_value_get_string (value)); - break; - case PROP_SOUTH_BORDER: - g_free (priv->south_border); - priv->east_border = g_strdup (g_value_get_string (value)); - break; case PROP_MODE: priv->mode = g_value_get_int (value); break; @@ -274,18 +198,6 @@ case PROP_FILENAME: g_value_set_string (value, priv->filename); break; - case PROP_NORTH_BORDER: - g_value_set_string (value, priv->north_border); - break; - case PROP_WEST_BORDER: - g_value_set_string (value, priv->west_border); - break; - case PROP_EAST_BORDER: - g_value_set_string (value, priv->east_border); - break; - case PROP_SOUTH_BORDER: - g_value_set_string (value, priv->south_border); - break; case PROP_MODE: g_value_set_int (value, priv->mode); break; @@ -302,7 +214,7 @@ const gchar *filename, GError **error) { - HDHomeBackgroundPrivate *priv; + HDHomeBackgroundPrivate *priv; GKeyFile *keyfile; GError *local_error = NULL; gchar *buffer; @@ -326,29 +238,6 @@ HD_HOME_BACKGROUND_KEY_URI, HD_HOME_BACKGROUND_VALUE_NO_IMAGE); - if (priv->north_border) - g_key_file_set_string (keyfile, - HD_HOME_BACKGROUND_KEY_GROUP, - HD_HOME_BACKGROUND_KEY_TITLEBAR, - priv->north_border); - - if (priv->south_border) - g_key_file_set_string (keyfile, - HD_HOME_BACKGROUND_KEY_GROUP, - HD_HOME_BACKGROUND_KEY_BOTTOMBAR, - priv->south_border); - - if (priv->west_border) - g_key_file_set_string (keyfile, - HD_HOME_BACKGROUND_KEY_GROUP, - HD_HOME_BACKGROUND_KEY_SIDEBAR, - priv->west_border); - - if (priv->east_border) - g_key_file_set_string (keyfile, - HD_HOME_BACKGROUND_KEY_GROUP, - HD_HOME_BACKGROUND_KEY_RIGHTBAR, - priv->east_border); /* Color */ if (priv->color) @@ -405,7 +294,7 @@ buffer, buffer_length, &local_error); - + cleanup: g_key_file_free (keyfile); @@ -420,12 +309,12 @@ const gchar *filename, GError **error) { - HDHomeBackgroundPrivate *priv; + HDHomeBackgroundPrivate *priv; GKeyFile *keyfile; GError *local_error = NULL; gint component; gchar *mode = NULL; - + g_return_if_fail (HD_IS_HOME_BACKGROUND (background) && filename); priv = background->priv; @@ -443,7 +332,7 @@ HD_HOME_BACKGROUND_KEY_GROUP, HD_HOME_BACKGROUND_KEY_URI, &local_error); - + if (local_error) goto cleanup; if (g_str_equal (priv->filename, HD_HOME_BACKGROUND_VALUE_NO_IMAGE)) @@ -452,28 +341,6 @@ priv->filename = NULL; } - /* the borders are not mandatory */ - g_free (priv->north_border); - priv->north_border = g_key_file_get_string (keyfile, - HD_HOME_BACKGROUND_KEY_GROUP, - HD_HOME_BACKGROUND_KEY_TITLEBAR, - NULL); - g_free (priv->west_border); - priv->west_border = g_key_file_get_string (keyfile, - HD_HOME_BACKGROUND_KEY_GROUP, - HD_HOME_BACKGROUND_KEY_SIDEBAR, - NULL); - g_free (priv->east_border); - priv->east_border = g_key_file_get_string (keyfile, - HD_HOME_BACKGROUND_KEY_GROUP, - HD_HOME_BACKGROUND_KEY_RIGHTBAR, - NULL); - g_free (priv->south_border); - priv->south_border = g_key_file_get_string (keyfile, - HD_HOME_BACKGROUND_KEY_GROUP, - HD_HOME_BACKGROUND_KEY_BOTTOMBAR, - NULL); - /* Color */ component = g_key_file_get_integer (keyfile, HD_HOME_BACKGROUND_KEY_GROUP, @@ -490,7 +357,7 @@ } else priv->color->red = component; - + component = g_key_file_get_integer (keyfile, HD_HOME_BACKGROUND_KEY_GROUP, HD_HOME_BACKGROUND_KEY_GREEN, @@ -502,7 +369,7 @@ } else priv->color->green = component; - + component = g_key_file_get_integer (keyfile, HD_HOME_BACKGROUND_KEY_GROUP, HD_HOME_BACKGROUND_KEY_BLUE, @@ -516,7 +383,6 @@ priv->color->blue = component; /* Mode */ - mode = g_key_file_get_string (keyfile, HD_HOME_BACKGROUND_KEY_GROUP, HD_HOME_BACKGROUND_KEY_MODE, @@ -593,14 +459,10 @@ right_offset = MAX (0, width- area->width - area->x); } - g_debug ("Trying to apply background to window: %x", (int)GDK_WINDOW_XID(window)); - #define S(string) (string?string:"") org_maemo_hildon_background_manager_set_background (background_manager_proxy, GDK_WINDOW_XID (window), S(priv->filename), - S(priv->west_border), - S(priv->north_border), priv->color->red, priv->color->green, priv->color->blue, @@ -742,8 +604,6 @@ (background_manager_proxy, GDK_WINDOW_XID (window), S(priv->filename), - "", - "", priv->color->red, priv->color->green, priv->color->blue, @@ -771,10 +631,6 @@ "mode", priv->mode, "color", priv->color, "filename", priv->filename, - "west-border", priv->west_border, - "east-border", priv->east_border, - "south-border", priv->south_border, - "north-border", priv->north_border, NULL); return dest; @@ -797,10 +653,6 @@ #define equal_or_null(s, t) ((!s && !t) || ((s && t) && g_str_equal (s,t))) return (equal_or_null (priv1->filename, priv2->filename) && - equal_or_null (priv1->west_border, priv2->west_border) && - equal_or_null (priv1->east_border, priv2->east_border) && - equal_or_null (priv1->north_border, priv2->north_border) && - equal_or_null (priv1->south_border, priv2->south_border) && gdk_color_equal (priv1->color, priv2->color) && priv1->mode == priv2->mode); #undef equal_or_null Modified: projects/haf/trunk/hildon-desktop/src/hd-home-window.c =================================================================== --- projects/haf/trunk/hildon-desktop/src/hd-home-window.c 2007-06-25 12:26:07 UTC (rev 12445) +++ projects/haf/trunk/hildon-desktop/src/hd-home-window.c 2007-06-25 12:39:25 UTC (rev 12446) @@ -106,9 +106,6 @@ GtkWidget *layout_mode_banner; gint layout_mode_banner_to; - gchar *north_border; - gchar *west_border; - HDHomeBackground *background; HDHomeBackground *previous_background;
- Previous message: [maemo-commits] r12445 - in projects/haf/trunk/hildon-desktop: . libhildondesktop
- Next message: [maemo-commits] r12447 - projects/haf/branches/maemo-af-desktop
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]