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

Wed Jun 6 18:17:27 EEST 2007

Author: moimart
Date: 2007-06-06 18:17:26 +0300 (Wed, 06 Jun 2007)
New Revision: 12133

Modified:
   projects/haf/trunk/hildon-plugins-settings/ChangeLog
   projects/haf/trunk/hildon-plugins-settings/configure.ac
   projects/haf/trunk/hildon-plugins-settings/src/Makefile.am
   projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.c
   projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.h
   projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-main.c
Log:
2007-06-06  Moises Martinez  <moises.martinez at nokia.com>

        * configure.ac: Added hildon-1 for standalone application.
        * src/hildon-plugin-settings-dialog.[ch]:
        - Make Ok & Cancel buttons plubic.
        * src/Makefile.am: Added hildon-1 for standalone application.
        * src/hildon-plugin-settings-main.c:
        - Use a HildonWindow a reparent GtkDialog content to it.
	* ChangeLog updated.



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

--- projects/haf/trunk/hildon-plugins-settings/ChangeLog	2007-06-06 14:20:36 UTC (rev 12132)
+++ projects/haf/trunk/hildon-plugins-settings/ChangeLog	2007-06-06 15:17:26 UTC (rev 12133)
@@ -1,5 +1,14 @@
-2007-06-05  Moises Martinez  <moises.martinez at nokia.com>
+2007-06-06  Moises Martinez  <moises.martinez at nokia.com>
 
+	* configure.ac: Added hildon-1 for standalone application.
+	* src/hildon-plugin-settings-dialog.[ch]:
+	- Make Ok & Cancel buttons plubic.
+	* src/Makefile.am: Added hildon-1 for standalone application.
+	* src/hildon-plugin-settings-main.c:
+	- Use a HildonWindow a reparent GtkDialog content to it.
+
+2007-06-06  Moises Martinez  <moises.martinez at nokia.com>
+
 	* src/hildon-plugin-cell-renderer-button.c:
 	- Fixed some special cases.
 	* src/hildon-plugin-settings-dialog.[ch]: Added property to be shown

Modified: projects/haf/trunk/hildon-plugins-settings/configure.ac
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/configure.ac	2007-06-06 14:20:36 UTC (rev 12132)
+++ projects/haf/trunk/hildon-plugins-settings/configure.ac	2007-06-06 15:17:26 UTC (rev 12133)
@@ -76,6 +76,10 @@
 AC_SUBST(LIBHILDONMENU_LIBS)
 AC_SUBST(LIBHILDONMENU_CFLAGS)
 
+PKG_CHECK_MODULES(LIBHILDONMENU, hildon-1)
+AC_SUBST(LIBHILDON_LIBS)
+AC_SUBST(LIBHILDON_CFLAGS)
+
 pluginlibdir=`pkg-config hildon-control-panel --variable=pluginlibdir`
 AC_SUBST(pluginlibdir)
 desktopentrydir=`pkg-config hildon-control-panel --variable=plugindesktopentrydir`

Modified: projects/haf/trunk/hildon-plugins-settings/src/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/src/Makefile.am	2007-06-06 14:20:36 UTC (rev 12132)
+++ projects/haf/trunk/hildon-plugins-settings/src/Makefile.am	2007-06-06 15:17:26 UTC (rev 12133)
@@ -29,14 +29,14 @@
 pluginlib_LTLIBRARIES = libhildonpluginsettings.la
 
 
-libhildonpluginsettings_la_CPPFLAGS = $(INCLUDES)
+libhildonpluginsettings_la_CPPFLAGS = $(INCLUDES) $(LIBHILDON_CFLAGS)
 
 libhildonpluginsettings_la_LIBADD = \
 	$(CP_LIBS) $(OSSO_LIBS) $(GCONF_LIBS) \
 	$(LIBOSSOHELP_LIBS) $(LIBHILDONMENU_LIBS)
 
 libhildonpluginsettings_la_SOURCES = \
-	$(HILDON_PLUGIN_SOURCES)				     
+	$(HILDON_PLUGIN_SOURCES) \
 	hildon-plugin-settings.c
 
 bin_PROGRAMS = hildon-plugin-settings
@@ -45,7 +45,7 @@
 
 hildon_plugin_settings_LDADD = \
 	$(CP_LIBS) $(OSSO_LIBS) $(GCONF_LIBS) \
-        $(LIBOSSOHELP_LIBS) $(LIBHILDONMENU_LIBS)
+        $(LIBOSSOHELP_LIBS) $(LIBHILDONMENU_LIBS) $(LIBHILDON_LIBS)
 
 hildon_plugin_settings_SOURCES = \
 	$(HILDON_PLUGIN_SOURCES) \

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-06 14:20:36 UTC (rev 12132)
+++ projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.c	2007-06-06 15:17:26 UTC (rev 12133)
@@ -141,9 +141,6 @@
 {
   settings->priv = HILDON_PLUGIN_SETTINGS_DIALOG_GET_PRIVATE (settings);
 
-  settings->sbtm = 
-  settings->tntm = NULL;	  
-  
   settings->priv->tabs = NULL;
 
   settings->priv->type = HILDON_PLUGIN_SETTINGS_DIALOG_TYPE_DIALOG;
@@ -223,7 +220,8 @@
 
   gtk_widget_push_composite_child ();
 
-  gtk_dialog_add_button (dialog,
+  settings->button_ok =
+    gtk_dialog_add_button (dialog,
 		  	 HPSD_OK,
 			 GTK_RESPONSE_OK);
 
@@ -240,9 +238,10 @@
   settings->priv->button_up   = button_up;
   settings->priv->button_down = button_down;
 
-  gtk_dialog_add_button (dialog,
-			 HPSD_CANCEL,
-		       	 GTK_RESPONSE_CANCEL);
+  settings->button_cancel =
+    gtk_dialog_add_button (dialog,
+			   HPSD_CANCEL,
+		       	   GTK_RESPONSE_CANCEL);
 
   g_signal_connect (dialog, 
 		    "response",

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-06 14:20:36 UTC (rev 12132)
+++ projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.h	2007-06-06 15:17:26 UTC (rev 12133)
@@ -49,8 +49,8 @@
 {
   GtkDialog parent;
 
-  GtkTreeModel *sbtm;
-  GtkTreeModel *tntm;
+  GtkWidget *button_ok;
+  GtkWidget *button_cancel;
 
   HildonPluginSettingsDialogPrivate *priv;
 };

Modified: projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-main.c
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-main.c	2007-06-06 14:20:36 UTC (rev 12132)
+++ projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-main.c	2007-06-06 15:17:26 UTC (rev 12133)
@@ -24,28 +24,45 @@
  */
 
 #include <gtk/gtkmain.h>
+#include <hildon/hildon-window.h>
 #include "hildon-plugin-settings-dialog.h"
 
+static void 
+_exit (GtkWidget *widget, gpointer data)
+{
+  gtk_main_quit ();
+}	
+
 int 
 main (int argc, char **argv)
 {
-  GtkWidget *dialog;
+  GtkWidget *dialog, *window;
 	
   gtk_init (&argc, &argv);
+
+  window = hildon_window_new ();
   
   dialog = GTK_WIDGET (g_object_new (HILDON_PLUGIN_TYPE_SETTINGS_DIALOG,
 			  	     "window-type", HILDON_PLUGIN_SETTINGS_DIALOG_TYPE_WINDOW,
 				     "hide-home", FALSE,
 				     NULL));
 
-  gtk_widget_show (dialog);
+  gtk_widget_realize (dialog);
 
-  gtk_dialog_run (GTK_DIALOG (dialog));
+  gtk_widget_reparent (GTK_BIN (dialog)->child, window);
 
+  gtk_button_set_label (GTK_BUTTON (HILDON_PLUGIN_SETTINGS_DIALOG (dialog)->button_ok), "Apply");
+  gtk_button_set_label (GTK_BUTTON (HILDON_PLUGIN_SETTINGS_DIALOG (dialog)->button_ok), "Exit");
+ 
+  g_signal_connect_after (HILDON_PLUGIN_SETTINGS_DIALOG (dialog)->button_cancel,
+		          "clicked",
+			  G_CALLBACK (_exit),
+			  NULL);
+
+  gtk_widget_show (window);
+
   gtk_main ();	
 
-  gtk_widget_destroy (dialog);
-
   return 0;
 }	
 


