[maemo-commits] [maemo-commits] r18548 - in projects/haf/trunk/hildon-control-panel: . src

[From: subversion at stage.maemo.org]

Author: paradi
Date: 2009-05-29 18:04:50 +0300 (Fri, 29 May 2009)
New Revision: 18548

Modified:
   projects/haf/trunk/hildon-control-panel/ChangeLog
   projects/haf/trunk/hildon-control-panel/src/hcp-app.c
   projects/haf/trunk/hildon-control-panel/src/hcp-grid.c
   projects/haf/trunk/hildon-control-panel/src/hcp-window.c
Log:
* src/hcp-window.c:
  Fixes: NB#118112 - Control panel displays without elements if HildonWindow sizes itself
  Fixes: NB#116905 - Two row layout of settings (control panel) is not centered
* src/hcp-app.c:
  Fixes: NB#115122 - S A Setup dialogs becoming non-responsive...
  Fixes: NB#117320 - T and S application is hangs for sometimes when...



Modified: projects/haf/trunk/hildon-control-panel/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-control-panel/ChangeLog	2009-05-29 15:02:21 UTC (rev 18547)
+++ projects/haf/trunk/hildon-control-panel/ChangeLog	2009-05-29 15:04:50 UTC (rev 18548)
@@ -1,3 +1,13 @@
+2009-05-29 Peter Aradi <peter.aradi at maemo.org>
+
+	* src/hcp-window.c:
+	* src/hcp-grid.c:
+	Fixes: NB#118112 - Control panel displays without elements if HildonWindow sizes itself
+	Fixes: NB#116905 - Two row layout of settings (control panel) is not centered
+	* src/hcp-app.c:
+	Fixes: NB#115122 - S A Setup dialogs becoming non-responsive...
+	Fixes: NB#117320 - T and S application is hangs for sometimes when...
+
 2009-04-24 Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
 
 	Release 2.2.7

Modified: projects/haf/trunk/hildon-control-panel/src/hcp-app.c
===================================================================
--- projects/haf/trunk/hildon-control-panel/src/hcp-app.c	2009-05-29 15:02:21 UTC (rev 18547)
+++ projects/haf/trunk/hildon-control-panel/src/hcp-app.c	2009-05-29 15:04:50 UTC (rev 18548)
@@ -197,14 +197,9 @@
 
   priv->is_running = TRUE;
 
-  /* Always use hcp->window as parent. If CP is launched without
-   * UI (run_applet RPC) the applet's dialog will be system modal */
+  /* Always use hcp->window as parent. */
 
-  gchar* basename = g_path_get_basename (priv->plugin);
-  
-  osso_cp_plugin_execute (program->osso, basename,
-                          program->window, d->user_activated);
-  g_free (basename);
+  priv->exec (program->osso, program->window, d->user_activated);
 
   priv->is_running = FALSE;
 
@@ -529,10 +524,9 @@
   g_return_if_fail (HCP_IS_APP (app));
 
   priv = app->priv;
-  gchar* basename = g_path_get_basename (priv->plugin);
-  osso_cp_plugin_save_state (program->osso, basename, NULL);
 
-  g_free (basename);
+  if (priv->save_state)
+    priv->save_state (program->osso, NULL);
 }
 
 gboolean

Modified: projects/haf/trunk/hildon-control-panel/src/hcp-grid.c
===================================================================
--- projects/haf/trunk/hildon-control-panel/src/hcp-grid.c	2009-05-29 15:02:21 UTC (rev 18547)
+++ projects/haf/trunk/hildon-control-panel/src/hcp-grid.c	2009-05-29 15:04:50 UTC (rev 18548)
@@ -196,6 +196,10 @@
 
   model = gtk_icon_view_get_model (GTK_ICON_VIEW (grid));
   gtk_tree_model_foreach (model, hcp_grid_update_icon, grid);
+  GtkRequisition req;
+  gtk_widget_size_request (GTK_WIDGET(grid), &req);
+  GtkAllocation alloc = {0,0,req.width, req.height};
+  gtk_widget_size_allocate (GTK_WIDGET(grid), &alloc);
   gtk_widget_queue_resize (GTK_WIDGET (grid));
 }
 

Modified: projects/haf/trunk/hildon-control-panel/src/hcp-window.c
===================================================================
--- projects/haf/trunk/hildon-control-panel/src/hcp-window.c	2009-05-29 15:02:21 UTC (rev 18547)
+++ projects/haf/trunk/hildon-control-panel/src/hcp-window.c	2009-05-29 15:04:50 UTC (rev 18548)
@@ -586,9 +586,16 @@
   scrolled_window = g_object_new (HILDON_TYPE_PANNABLE_AREA, NULL);
 
   gtk_container_add (GTK_CONTAINER (window), scrolled_window);
+
+  GtkWidget *align = gtk_alignment_new (0,0,0,0);
+  gtk_alignment_set_padding (GTK_ALIGNMENT(align),0,0, 68,0);
+
+  gtk_container_add (GTK_CONTAINER(align), GTK_WIDGET(priv->view));
+
+  /*gtk_container_add (GTK_CONTAINER(view), align); */
   hildon_pannable_area_add_with_viewport (
           HILDON_PANNABLE_AREA (scrolled_window),
-          priv->view);
+          align);
 
 }