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

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-07-17 16:00:00 +0300 (Tue, 17 Jul 2007)
New Revision: 12759

Modified:
   projects/haf/trunk/hildon-plugins-settings/ChangeLog
   projects/haf/trunk/hildon-plugins-settings/configure.ac
   projects/haf/trunk/hildon-plugins-settings/debian/control
   projects/haf/trunk/hildon-plugins-settings/src/Makefile.am
   projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings.c
Log:
2007-07-17  Moises Martinez  <moises.martinez at nokia.com>

        * configure.ac:
        * debian/control:
        * src/Makefile.am:
        - Added hildon-help
        * src/hildon-plugin-settings.c: (_cell_mandatory_data_func),
        (execute):
        - Don't show checkboxes in tasknavigator if there are only 3 plugins.
        Fixes: NB#63295.
        - Include help dialog support. Fixes: NB62878
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-plugins-settings/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/ChangeLog	2007-07-17 09:16:23 UTC (rev 12758)
+++ projects/haf/trunk/hildon-plugins-settings/ChangeLog	2007-07-17 13:00:00 UTC (rev 12759)
@@ -1,3 +1,15 @@
+2007-07-17  Moises Martinez  <moises.martinez at nokia.com>
+
+	* configure.ac:
+	* debian/control:
+	* src/Makefile.am:
+	- Added hildon-help
+	* src/hildon-plugin-settings.c: (_cell_mandatory_data_func),
+	(execute):
+	- Don't show checkboxes in tasknavigator if there are only 3 plugins.
+	Fixes: NB#63295.
+	- Include help dialog support. Fixes: NB62878
+
 2007-07-16  Moises Martinez  <moises.martinez at nokia.com>
 
 	* src/hildon-plugin-cell-renderer-button.c:

Modified: projects/haf/trunk/hildon-plugins-settings/configure.ac
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/configure.ac	2007-07-17 09:16:23 UTC (rev 12758)
+++ projects/haf/trunk/hildon-plugins-settings/configure.ac	2007-07-17 13:00:00 UTC (rev 12759)
@@ -83,6 +83,10 @@
 AC_SUBST(LIBHILDON_LIBS)
 AC_SUBST(LIBHILDON_CFLAGS)
 
+PKG_CHECK_MODULES(LIBHILDONHELP, hildon-help)
+AC_SUBST(LIBHILDONHELP_LIBS)
+AC_SUBST(LIBHILDONHELP_CFLAGS)
+
 PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1)
 AC_SUBST(DBUS_GLIB_LIBS)
 AC_SUBST(DBUS_GLIB_CFLAGS)

Modified: projects/haf/trunk/hildon-plugins-settings/debian/control
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/debian/control	2007-07-17 09:16:23 UTC (rev 12758)
+++ projects/haf/trunk/hildon-plugins-settings/debian/control	2007-07-17 13:00:00 UTC (rev 12759)
@@ -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-dev (>= 0.0.16), libhildondesktop-dev (>= 0.0.16), libhildon1-dev, libdbus-glib-1-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, libdbus-glib-1-dev, libhildonhelp-dev
 Standards-Version: 3.6.1
 
 Package: hildon-plugins-settings-cpa

Modified: projects/haf/trunk/hildon-plugins-settings/src/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/src/Makefile.am	2007-07-17 09:16:23 UTC (rev 12758)
+++ projects/haf/trunk/hildon-plugins-settings/src/Makefile.am	2007-07-17 13:00:00 UTC (rev 12759)
@@ -33,11 +33,12 @@
 
 BUILT_SOURCES = hd-marshalers.c hd-marshalers.h
 
-libhildonpluginsettings_la_CPPFLAGS = $(INCLUDES) $(LIBHILDON_CFLAGS)
+libhildonpluginsettings_la_CPPFLAGS = $(INCLUDES) $(LIBHILDON_CFLAGS) $(LIBHILDONHELP_CFLAGS)
 
 libhildonpluginsettings_la_LIBADD = \
 	$(CP_LIBS) $(OSSO_LIBS) $(GCONF_LIBS) \
-	$(LIBOSSOHELP_LIBS) $(LIBHILDONMENU_LIBS)
+	$(LIBHILDONMENU_LIBS) \
+	$(LIBHILDONHELP_LIBS)
 
 libhildonpluginsettings_la_SOURCES = \
 	$(HILDON_PLUGIN_SOURCES) \

Modified: projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings.c
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings.c	2007-07-17 09:16:23 UTC (rev 12758)
+++ projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings.c	2007-07-17 13:00:00 UTC (rev 12759)
@@ -29,6 +29,8 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-bindings.h>
 
+#include <hildon/hildon-help.h>
+
 #include "hd-marshalers.h"
 
 #include "hildon-plugin-settings-dialog.h"
@@ -44,14 +46,14 @@
 #include <libintl.h>
 #define _(a) dgettext(PACKAGE, a)
 
-#define TN_MAX_ITEMS 5
+#define TN_MAX_ITEMS 3
 
 /* HARDCODE_PARTY */
 /* Plugins to not be shown */
 #define HP_APPLICATION_SWITCHER "/usr/share/applications/hildon-navigator/app-switcher.desktop"
 #define HP_SWITCHER_MENU "/usr/share/applications/hildon-navigator/switcher-menu.desktop"
 
-GtkTreeRowReference *selected[TN_MAX_ITEMS];
+#define CPA_TN_HELP_TOPIC  "utilities_controlpanelapplettasknavigator_tana"
 
 static gboolean
 _tn_visibility_filter (GtkTreeModel *model,
@@ -121,6 +123,9 @@
 		"sensitive", !mandatory,
 		"activatable", !mandatory,
 		NULL);
+
+  if (gtk_tree_model_iter_n_children (tm, NULL) <= TN_MAX_ITEMS)
+    g_object_set (G_OBJECT (cell), "visible", FALSE, NULL);
 }
 
 static void 
@@ -232,6 +237,8 @@
 
   GtkWidget *dialog = hildon_plugin_settings_dialog_new (GTK_WINDOW (user_data));
 
+  hildon_help_dialog_help_enable (GTK_DIALOG (dialog), CPA_TN_HELP_TOPIC, osso);
+
   hildon_plugin_settings_dialog_set_visibility_filter
     (HILDON_PLUGIN_SETTINGS_DIALOG (dialog),
      "Tasknavigator",
@@ -273,7 +280,7 @@
   hildon_plugin_settings_dialog_set_choosing_limit 
     (HILDON_PLUGIN_SETTINGS_DIALOG (dialog),
      "Tasknavigator",
-     3);
+     TN_MAX_ITEMS);
 
   sbtm = hildon_plugin_settings_dialog_get_model_by_name
           (HILDON_PLUGIN_SETTINGS_DIALOG (dialog),