[maemo-commits] [maemo-commits] r9565 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . libhildondesktop

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Fri Feb 2 15:52:01 EET 2007
Author: moimart
Date: 2007-02-02 15:52:00 +0200 (Fri, 02 Feb 2007)
New Revision: 9565

Modified:
   projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
   projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c
   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.c
   projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel.h
Log:

	* libhildondesktop/hildon-desktop-panel.[ch]:
        - Added property for type of packing.
        * libhildondesktop/hildon-desktop-panel-expandable.c:
        - Using packing end.
        * libhildondesktop/hildon-desktop-panel-window-dialog.c:
        - Set modal as false.
	* ChangeLog updated.



Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2007-02-02 13:47:13 UTC (rev 9564)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2007-02-02 13:52:00 UTC (rev 9565)
@@ -1,3 +1,12 @@
+2007-02-02  Moises Martinez  <moises.martinez at nokia.com>
+	
+	* libhildondesktop/hildon-desktop-panel.[ch]:
+	- Added property for type of packing.
+	* libhildondesktop/hildon-desktop-panel-expandable.c:
+	- Using packing end.
+	* libhildondesktop/hildon-desktop-panel-window-dialog.c:
+	- Set modal as false.
+
 2007-02-02  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/hd-panel-window-dialog.[ch]: HildonDesktopPanelWindowDialog

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c	2007-02-02 13:47:13 UTC (rev 9564)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-expandable.c	2007-02-02 13:52:00 UTC (rev 9565)
@@ -137,6 +137,8 @@
   panel->priv->extension_opened = FALSE;
 
   panel->priv->extension_table = NULL;
+
+  HILDON_DESKTOP_PANEL (panel)->pack_start = FALSE;
 }
 
 GObject *

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-02 13:47:13 UTC (rev 9564)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-window-dialog.c	2007-02-02 13:52:00 UTC (rev 9565)
@@ -141,7 +141,10 @@
   
   gtk_widget_show (GTK_WIDGET (HILDON_DESKTOP_WINDOW (window)->container));
 
+  gtk_widget_realize (GTK_WIDGET (window));
+  
   gdk_window_set_transient_for (GTK_WIDGET (window)->window, gdk_get_default_root_window ());
+  gtk_window_set_accept_focus (GTK_WINDOW (window), FALSE);
 
   gtk_widget_pop_composite_child ();
 

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel.c
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel.c	2007-02-02 13:47:13 UTC (rev 9564)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel.c	2007-02-02 13:52:00 UTC (rev 9565)
@@ -36,7 +36,8 @@
   PROP_0,
   PROP_ORI,
   PROP_ITEM_WIDTH,
-  PROP_ITEM_HEIGHT
+  PROP_ITEM_HEIGHT,
+  PROP_PACK_START
 };
 
 enum
@@ -157,6 +158,15 @@
                                                      G_MAXINT,
                                                      0,
                                                      G_PARAM_CONSTRUCT | G_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_ITEM_HEIGHT,
+                                   g_param_spec_boolean  ("pack_start",
+                                                          "packstart",
+                                                           "pack start or pack end",
+                                                           TRUE,
+                                                           G_PARAM_CONSTRUCT | G_PARAM_READWRITE));
+
 }
 
 static void 
@@ -216,6 +226,10 @@
       g_value_set_int (value, panel->item_height);
       break;
 
+    case PROP_PACK_START:
+      g_value_set_boolean (value, panel->pack_start);
+      break;
+      
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;						
@@ -248,12 +262,16 @@
       break;
       
     case PROP_ITEM_WIDTH:
-      panel->item_width = g_value_get_int (value);
+      panel->item_width  = g_value_get_int (value);
       break;
       
     case PROP_ITEM_HEIGHT:
       panel->item_height = g_value_get_int (value);
       break;
+
+    case PROP_PACK_START:
+      panel->pack_start  = g_value_get_boolean (value);
+      break;
       
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -762,7 +780,11 @@
 {
   /* FIXME: Please, implement me smoothly and very optimized */
   /* FIXME: This is not that smooth implementation, this only add the item*/
-  gtk_box_pack_start (GTK_BOX (panel), GTK_WIDGET (item), FALSE, FALSE,0);
+  if (panel->pack_start)
+    gtk_box_pack_start (GTK_BOX (panel), GTK_WIDGET (item), FALSE, FALSE,0);
+  else
+    gtk_box_pack_end   (GTK_BOX (panel), GTK_WIDGET (item), FALSE, FALSE, 0);
+
   gtk_widget_show    (GTK_WIDGET (item)); 
 }
 
@@ -821,7 +843,10 @@
   }
   else
   {
-    gtk_box_pack_start (GTK_BOX (panel), widget, FALSE, FALSE, 0);
+    if (panel->pack_start)
+      gtk_box_pack_start (GTK_BOX (panel), widget, FALSE, FALSE, 0);
+    else
+      gtk_box_pack_end   (GTK_BOX (panel), widget, FALSE, FALSE, 0);
   }
 }
 /* Public declarations */

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel.h
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel.h	2007-02-02 13:47:13 UTC (rev 9564)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel.h	2007-02-02 13:52:00 UTC (rev 9565)
@@ -48,6 +48,8 @@
 
   gint		 item_width;
   gint		 item_height;
+
+  gboolean       pack_start;
 };
 
 struct _HildonDesktopPanelClass


More information about the maemo-commits mailing list