[maemo-commits] [maemo-commits] r9660 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . libhildondesktop src
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Tue Feb 6 10:41:03 EET 2007
- Previous message: [maemo-commits] r9659 - in projects/haf/branches/hildon-libs/hildon-1: . src
- Next message: [maemo-commits] r9661 - in projects/haf/branches/hildon-libs/hildon-1: . src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: lucasr Date: 2007-02-06 10:41:01 +0200 (Tue, 06 Feb 2007) New Revision: 9660 Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-window-dialog.c projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-window.c projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-window.c projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-desktop.c Log: 2007-02-06 Lucas Rocha <lucas.rocha at nokia.com> * src/hd-desktop.c: define padding for HDPanelDialog. * libhildondesktop/hildon-desktop-panel-window-dialog.c, libhildondesktop/hildon-desktop-panel-window.c: use HildonDesktopWindow padding properties to define the panel padding. * libhildondesktop/hildon-desktop-window.c: add padding-(left|right|top|bottom) properties. Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog 2007-02-06 08:28:22 UTC (rev 9659) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog 2007-02-06 08:41:01 UTC (rev 9660) @@ -1,3 +1,12 @@ +2007-02-06 Lucas Rocha <lucas.rocha at nokia.com> + + * src/hd-desktop.c: define padding for HDPanelDialog. + * libhildondesktop/hildon-desktop-panel-window-dialog.c, + libhildondesktop/hildon-desktop-panel-window.c: use + HildonDesktopWindow padding properties to define the panel padding. + * libhildondesktop/hildon-desktop-window.c: add + padding-(left|right|top|bottom) properties. + 2007-02-05 Lucas Rocha <lucas.rocha at nokia.com> * src/hd-plugin-loader-factory.c, src/hd-plugin-loader-default.c: Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-window-dialog.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-window-dialog.c 2007-02-06 08:28:22 UTC (rev 9659) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-window-dialog.c 2007-02-06 08:41:01 UTC (rev 9660) @@ -101,6 +101,7 @@ GObject *object; HildonDesktopPanelWindowDialog *window; GtkWidget *widget; + GtkContainer *parent = NULL; gint orientation; object = G_OBJECT_CLASS (hildon_desktop_panel_window_dialog_parent_class)->constructor (gtype, @@ -115,18 +116,24 @@ gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_DIALOG); gtk_window_set_decorated (GTK_WINDOW (window), FALSE); - if (HILDON_DESKTOP_WINDOW (window)->container != NULL) - gtk_container_remove (GTK_CONTAINER (window), GTK_WIDGET (HILDON_DESKTOP_WINDOW (window)->container)); + if (HILDON_DESKTOP_WINDOW (window)->container != NULL) + { + parent = GTK_CONTAINER (GTK_WIDGET (HILDON_DESKTOP_WINDOW (window)->container)->parent); + gtk_container_remove (parent, + GTK_WIDGET (HILDON_DESKTOP_WINDOW (window)->container)); + } + gtk_widget_push_composite_child (); HILDON_DESKTOP_WINDOW (window)->container = - g_object_new (HILDON_DESKTOP_TYPE_PANEL_EXPANDABLE, "items_row", 3,NULL); + g_object_new (HILDON_DESKTOP_TYPE_PANEL_EXPANDABLE, "items_row", 3, NULL); - gtk_container_add (GTK_CONTAINER (window), - GTK_WIDGET (HILDON_DESKTOP_WINDOW (window)->container)); + if (parent != NULL) + gtk_container_add (parent, + GTK_WIDGET (HILDON_DESKTOP_WINDOW (window)->container)); - g_object_get (object,"orientation",&orientation,NULL); + g_object_get (object,"orientation", &orientation, NULL); if (orientation & HILDON_DESKTOP_PANEL_WINDOW_ORIENTATION_HORIZONTAL) g_object_set (G_OBJECT (HILDON_DESKTOP_WINDOW (window)->container), Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-window.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-window.c 2007-02-06 08:28:22 UTC (rev 9659) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-window.c 2007-02-06 08:41:01 UTC (rev 9660) @@ -398,7 +398,8 @@ { GObject *object; HildonDesktopPanelWindow *window; - GtkWidget *widget; + GtkWidget *widget, *alignment; + gint padding_left = 0, padding_right = 0, padding_top = 0, padding_bottom = 0; object = G_OBJECT_CLASS (hildon_desktop_panel_window_parent_class)->constructor (gtype, n_params, @@ -407,6 +408,7 @@ widget = GTK_WIDGET (object); window = HILDON_DESKTOP_PANEL_WINDOW (object); + GTK_WINDOW (window)->type = GTK_WINDOW_TOPLEVEL; gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_DOCK); @@ -425,9 +427,29 @@ "orientation", GTK_ORIENTATION_VERTICAL, NULL); + + g_object_get (G_OBJECT (window), + "padding-left", &padding_left, + "padding-right", &padding_right, + "padding-top", &padding_top, + "padding-bottom", &padding_bottom, + NULL); + + alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); + + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), + padding_top, + padding_bottom, + padding_left, + padding_right); - gtk_container_add (GTK_CONTAINER (window), + gtk_widget_show (alignment); + + gtk_container_add (GTK_CONTAINER (alignment), GTK_WIDGET (HILDON_DESKTOP_WINDOW (window)->container)); + + gtk_container_add (GTK_CONTAINER (window), alignment); + gtk_widget_show (GTK_WIDGET (HILDON_DESKTOP_WINDOW (window)->container)); g_signal_connect_after (object, Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-window.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-window.c 2007-02-06 08:28:22 UTC (rev 9659) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-window.c 2007-02-06 08:41:01 UTC (rev 9660) @@ -33,7 +33,11 @@ enum { PROP_0, PROP_CONFIG_FILE, - PROP_PLUGIN_DIR + PROP_PLUGIN_DIR, + PROP_PADDING_LEFT, + PROP_PADDING_RIGHT, + PROP_PADDING_TOP, + PROP_PADDING_BOTTOM }; enum { @@ -49,6 +53,10 @@ { gchar *config_file; gchar *plugin_dir; + gint padding_left; + gint padding_right; + gint padding_top; + gint padding_bottom; }; static void @@ -88,6 +96,10 @@ const GValue *value, GParamSpec *pspec) { + HildonDesktopWindowPrivate *priv; + + priv = HILDON_DESKTOP_WINDOW_GET_PRIVATE (object); + switch (prop_id) { case PROP_CONFIG_FILE: @@ -102,6 +114,22 @@ (gchar *) g_value_get_string (value)); break; + case PROP_PADDING_LEFT: + priv->padding_left = g_value_get_int (value); + break; + + case PROP_PADDING_RIGHT: + priv->padding_right = g_value_get_int (value); + break; + + case PROP_PADDING_TOP: + priv->padding_top = g_value_get_int (value); + break; + + case PROP_PADDING_BOTTOM: + priv->padding_bottom = g_value_get_int (value); + break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); } @@ -120,13 +148,29 @@ switch (prop_id) { case PROP_CONFIG_FILE: - g_value_set_string (value, priv->config_file); - break; + g_value_set_string (value, priv->config_file); + break; case PROP_PLUGIN_DIR: - g_value_set_string (value, priv->plugin_dir); - break; + g_value_set_string (value, priv->plugin_dir); + break; + case PROP_PADDING_LEFT: + g_value_set_int (value, priv->padding_left); + break; + + case PROP_PADDING_RIGHT: + g_value_set_int (value, priv->padding_right); + break; + + case PROP_PADDING_TOP: + g_value_set_int (value, priv->padding_top); + break; + + case PROP_PADDING_BOTTOM: + g_value_set_int (value, priv->padding_bottom); + break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); } @@ -139,14 +183,22 @@ desktop_window->container = NULL; + desktop_window->priv->config_file = NULL; desktop_window->priv->plugin_dir = NULL; + + desktop_window->priv->padding_left = 0; + desktop_window->priv->padding_right = 0; + desktop_window->priv->padding_top = 0; + desktop_window->priv->padding_bottom = 0; } static void hildon_desktop_window_class_init (HildonDesktopWindowClass *desktopwindow_class) { + GObjectClass *g_object_class; GParamSpec *pspec; - GObjectClass *g_object_class = G_OBJECT_CLASS (desktopwindow_class); + + g_object_class = G_OBJECT_CLASS (desktopwindow_class); g_object_class->finalize = hildon_desktop_window_finalize; g_object_class->set_property = hildon_desktop_window_set_property; @@ -179,24 +231,74 @@ g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - pspec = g_param_spec_pointer ("plugin-dir", - "Plugin Directory", - "Plugin Directory", - G_PARAM_READWRITE); + pspec = g_param_spec_string ("plugin-dir", + "Plugin Directory", + "Plugin Directory", + NULL, + G_PARAM_READWRITE); g_object_class_install_property (g_object_class, PROP_PLUGIN_DIR, pspec); - pspec = g_param_spec_pointer ("config-file", + pspec = g_param_spec_string ("config-file", "Config File", "Config File", + NULL, G_PARAM_READWRITE); g_object_class_install_property (g_object_class, PROP_CONFIG_FILE, pspec); + pspec = g_param_spec_int ("padding-left", + "Padding Left", + "Padding Left", + 0, + G_MAXINT, + 0, + G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE); + + g_object_class_install_property (g_object_class, + PROP_PADDING_LEFT, + pspec); + + pspec = g_param_spec_int ("padding-right", + "Padding Right", + "Padding Right", + 0, + G_MAXINT, + 0, + G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE); + + g_object_class_install_property (g_object_class, + PROP_PADDING_RIGHT, + pspec); + + pspec = g_param_spec_int ("padding-top", + "Padding Top", + "Padding Top", + 0, + G_MAXINT, + 0, + G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE); + + g_object_class_install_property (g_object_class, + PROP_PADDING_TOP, + pspec); + + pspec = g_param_spec_int ("padding-bottom", + "Padding Bottom", + "Padding Bottom", + 0, + G_MAXINT, + 0, + G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE); + + g_object_class_install_property (g_object_class, + PROP_PADDING_BOTTOM, + pspec); + g_type_class_add_private (g_object_class, sizeof (HildonDesktopWindowPrivate)); } Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-desktop.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-desktop.c 2007-02-06 08:28:22 UTC (rev 9659) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-desktop.c 2007-02-06 08:41:01 UTC (rev 9660) @@ -673,6 +673,10 @@ "width", width, "height", height, "orientation", orientation, + "padding-left", 10, + "padding-right", 10, + "padding-top", 0, + "padding-bottom", 0, NULL); }
- Previous message: [maemo-commits] r9659 - in projects/haf/branches/hildon-libs/hildon-1: . src
- Next message: [maemo-commits] r9661 - in projects/haf/branches/hildon-libs/hildon-1: . src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]