[maemo-commits] [maemo-commits] r12178 - in projects/haf/trunk/hildon-plugins-settings: . debian src

Thu Jun 7 15:15:55 EEST 2007

Author: moimart
Date: 2007-06-07 15:15:53 +0300 (Thu, 07 Jun 2007)
New Revision: 12178

Modified:
   projects/haf/trunk/hildon-plugins-settings/ChangeLog
   projects/haf/trunk/hildon-plugins-settings/debian/control
   projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.c
   projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.h
Log:
2007-06-07  Moises Martinez  <moises.martinez at nokia.com>

        * debian/control: Fixed some deps
        * src/hildon-plugin-settings-dialog.[ch]:
        - Added method to set GtkTreeCellDataFunc to specific containers.
        - Get list of containers' name.
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-plugins-settings/ChangeLog
===================================================================

--- projects/haf/trunk/hildon-plugins-settings/ChangeLog	2007-06-07 11:55:45 UTC (rev 12177)
+++ projects/haf/trunk/hildon-plugins-settings/ChangeLog	2007-06-07 12:15:53 UTC (rev 12178)
@@ -1,3 +1,10 @@
+2007-06-07  Moises Martinez  <moises.martinez at nokia.com>
+
+	* debian/control: Fixed some deps
+	* src/hildon-plugin-settings-dialog.[ch]:
+	- Added method to set GtkTreeCellDataFunc to specific containers.
+	- Get list of containers' name.
+
 2007-06-06  Moises Martinez  <moises.martinez at nokia.com>
 
 	* debian/*: updated.

Modified: projects/haf/trunk/hildon-plugins-settings/debian/control
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/debian/control	2007-06-07 11:55:45 UTC (rev 12177)
+++ projects/haf/trunk/hildon-plugins-settings/debian/control	2007-06-07 12:15:53 UTC (rev 12178)
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Moises Martinez <moises.martinez at nokia.com>
-Build-Depends: debhelper (>= 4.0.0), libosso-dev (>= 0.9.19), osso-af-settings, hildon-control-panel-dev, hildon-desktop (>= 0.0.16), libhildondesktop (>= 0.0.16), libhildon1-dev
+Build-Depends: debhelper (>= 4.0.0), libosso-dev (>= 0.9.19), osso-af-settings, hildon-control-panel-dev, hildon-desktop-dev (>= 0.0.16), libhildondesktop-dev (>= 0.0.16), libhildon1-dev
 Standards-Version: 3.6.1
 
 Package: hildon-plugins-settings-cpa

Modified: projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.c
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.c	2007-06-07 11:55:45 UTC (rev 12177)
+++ projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.c	2007-06-07 12:15:53 UTC (rev 12178)
@@ -47,14 +47,7 @@
 
 #define HPSD_TITLE _("tncpa_ti_tnsb_title") 
 
-#ifndef HP_PATH_TN
-#define HP_PATH_TN "/usr/share/applications/hildon-navigator"
-#endif
 
-#ifndef HP_PATH_SB
-#define HP_PATH_SB "/usr/share/applications/hildon-status-bar"
-#endif
-
 /* TODO: FIXME: 
  * This should read /etc/hildon-desktop/desktop.conf and look for panels 
  * and create as many pages as necessary */
@@ -785,6 +778,17 @@
       (g_object_new (HILDON_PLUGIN_TYPE_SETTINGS_DIALOG,NULL));
 }
 
+GList *
+hildon_plugin_settings_dialog_get_container_names (HildonPluginSettingsDialog *settings)
+{
+  GList *names = NULL, *l;
+  
+  for (l = settings->priv->tabs; l != NULL ; l = g_list_next (l))
+     names = g_list_append (names, ((HPSDTab *)l->data)->name);
+
+  return names;
+}
+
 GtkTreeModel *
 hildon_plugin_settings_dialog_set_visibility_filter (HildonPluginSettingsDialog *settings,
 					             const gchar *container_name,
@@ -869,3 +873,44 @@
   return filter; 
 }
 
+void
+hildon_plugin_settings_dialog_set_cell_data_func (HildonPluginSettingsDialog *settings,
+						  HildonPluginSettingsDialogColumn column,
+						  const gchar *container_name,
+                                                  GtkTreeCellDataFunc func,
+                                                  gpointer func_data,
+                                                  GtkDestroyNotify destroy)
+{
+  GList *container_tab = NULL;
+
+  container_tab =
+    g_list_find_custom (settings->priv->tabs,
+                        container_name,
+                        (GCompareFunc)hildon_plugin_settings_dialog_compare_tab);
+
+  if (!container_tab)
+    return;
+
+  HPSDTab *tab = (HPSDTab *)container_tab->data;
+
+  GtkTreeViewColumn *twcolumn = gtk_tree_view_get_column (tab->tw, column);
+
+  if (!twcolumn)
+    return;
+
+  GList *renderers = gtk_tree_view_column_get_cell_renderers (twcolumn);
+
+  /* We only have a cell renderer per column */
+
+  if (!renderers)
+    return;
+
+  gtk_tree_view_column_set_cell_data_func (twcolumn,
+					   GTK_CELL_RENDERER (renderers->data),
+					   func,
+					   func_data,
+					   destroy);
+
+  g_list_free (renderers);
+}
+

Modified: projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.h
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.h	2007-06-07 11:55:45 UTC (rev 12177)
+++ projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.h	2007-06-07 12:15:53 UTC (rev 12178)
@@ -29,10 +29,19 @@
 #include <gtk/gtkdialog.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtktreemodelfilter.h>
+#include <gtk/gtk.h> /* <--- Funny hem? :) */
 
 #define HILDON_PLUGIN_SETTINGS_DIALOG_TYPE_DIALOG TRUE
 #define HILDON_PLUGIN_SETTINGS_DIALOG_TYPE_WINDOW FALSE
 
+typedef enum
+{
+  HPSD_COLUMN_PB,
+  HPSD_COLUMN_TXT,
+  HPSD_COLUMN_TOGGLE=3
+}
+HildonPluginSettingsDialogColumn;
+
 G_BEGIN_DECLS
 
 typedef struct _HildonPluginSettingsDialog HildonPluginSettingsDialog;
@@ -68,6 +77,9 @@
 GtkWidget *
 hildon_plugin_settings_dialog_new (void);
 
+GList *
+hildon_plugin_settings_dialog_get_container_names (HildonPluginSettingsDialog *settings);
+
 GtkTreeModel *
 hildon_plugin_settings_dialog_set_visibility_filter (HildonPluginSettingsDialog *settings,
 					             const gchar *container_name,
@@ -84,6 +96,14 @@
                                                  gpointer data,
                                                  GtkDestroyNotify destroy);
 
+void
+hildon_plugin_settings_dialog_set_cell_data_func (HildonPluginSettingsDialog *settings,
+						  HildonPluginSettingsDialogColumn column,
+                                                  const gchar *container_name,
+                                                  GtkTreeCellDataFunc func,
+                                                  gpointer func_data,
+                                                  GtkDestroyNotify destroy);
+
 G_END_DECLS
 
 #endif/*__HILDON_PLUGIN_SETTINGS_DIALOG_H__*/


