From: Andrea Zagli Date: Tue, 28 Aug 2012 09:11:40 +0000 (+0200) Subject: Added function GtkForm::get_values_as_xml (refs #305). X-Git-Tag: 0.5.0~11 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=bec7cc409dcca1b9ce1f1708d6a3612087fb5bc1;p=libgtkform Added function GtkForm::get_values_as_xml (refs #305). --- diff --git a/.cproject b/.cproject index 609c776..b7d8ef0 100644 --- a/.cproject +++ b/.cproject @@ -3,8 +3,8 @@ - - + + @@ -14,31 +14,30 @@ - - - - - - - + + + + + + + - - - + + + - - - - - + + + + diff --git a/libgtkform/form.c b/libgtkform/form.c index a35f9ce..de8765c 100644 --- a/libgtkform/form.c +++ b/libgtkform/form.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Andrea Zagli + * Copyright (C) 2005-2012 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -2373,6 +2373,54 @@ gtk_form_fill_from_hashtable (GtkForm *form, GHashTable *hashtable) return ret; } +/** + * gtk_form_get_original_values_as_xml: + * @form: + * + */ +xmlNode +*gtk_form_get_values_as_xml (GtkForm *form) +{ + GtkFormPrivate *priv; + GSList *fields; + GtkFormField *field; + gchar *field_name; + gchar *str; + xmlNode *xnode; + xmlNode *xnode_field; + + g_return_val_if_fail (IS_GTK_FORM (form), NULL); + + priv = GTK_FORM_GET_PRIVATE (form); + + fields = priv->fields; + + if (fields != NULL) + { + xnode = xmlNewNode (NULL, "values"); + } + + while (fields != NULL) + { + field = (GtkFormField *)fields->data; + + field_name = gtk_form_field_get_field_name (field); + + str = gtk_form_field_get_value_stringify (field); + if (str != NULL) + { + /* TODO check if the field already exists */ + xnode_field = xmlNewNode (NULL, field_name); + xmlNodeAddContent (xnode_field, str); + xmlAddChild (xnode, xnode_field); + } + + fields = g_slist_next (fields); + } + + return xnode; +} + /** * gtk_form_add_group: * @form: diff --git a/libgtkform/form.h b/libgtkform/form.h index 2dca1c6..c8e0a1d 100644 --- a/libgtkform/form.h +++ b/libgtkform/form.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Andrea Zagli + * Copyright (C) 2005-2012 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -132,6 +132,8 @@ GHashTable *gtk_form_get_values_as_hashtable (GtkForm *form); GHashTable *gtk_form_get_original_values_as_hashtable (GtkForm *form); gboolean gtk_form_fill_from_hashtable (GtkForm *form, GHashTable *hashtable); +xmlNode *gtk_form_get_values_as_xml (GtkForm *form); + gboolean gtk_form_add_group (GtkForm *form, GtkFormGroup *group); GtkFormGroup *gtk_form_get_group_by_name (GtkForm *form, const gchar *group_name); diff --git a/test/from_xml.c b/test/from_xml.c index edb72a6..4666882 100644 --- a/test/from_xml.c +++ b/test/from_xml.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 Andrea Zagli + * Copyright (C) 2005-2012 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -137,6 +137,24 @@ on_btnSqlDelete_clicked (GtkButton *button, gtk_text_buffer_set_text (buf, sql, strlen (sql)); } +G_MODULE_EXPORT void +on_btnXml_clicked (GtkButton *button, + gpointer user_data) +{ + gint size; + xmlChar *str; + + GtkTextBuffer *buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (txtvSql)); + xmlNode *xnode = gtk_form_get_values_as_xml (form); + + xmlDoc *xdoc = xmlNewDoc ("1.0"); + xmlDocSetRootElement (xdoc, xnode); + + xmlDocDumpMemory (xdoc, &str, &size); + + gtk_text_buffer_set_text (buf, str, strlen (str)); +} + void create_cb_nation (GtkWidget *w) { diff --git a/test/main.c b/test/main.c index d614182..7b2f42d 100644 --- a/test/main.c +++ b/test/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 Andrea Zagli + * Copyright (C) 2005-2012 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -50,6 +51,7 @@ GtkFormWidget *wtxtv; GtkFormWidget *wspin; GtkFormWidget *wcheck; GtkFormWidget *wcombobox; +GtkFormWidget *wradio; GtkWidget *w; GtkWidget *txtvSql; @@ -151,6 +153,24 @@ on_btnSqlDelete_clicked (GtkButton *button, gtk_text_buffer_set_text (buf, sql, strlen (sql)); } +G_MODULE_EXPORT void +on_btnXml_clicked (GtkButton *button, + gpointer user_data) +{ + gint size; + xmlChar *str; + + GtkTextBuffer *buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (txtvSql)); + xmlNode *xnode = gtk_form_get_values_as_xml (form); + + xmlDoc *xdoc = xmlNewDoc ("1.0"); + xmlDocSetRootElement (xdoc, xnode); + + xmlDocDumpMemory (xdoc, &str, &size); + + gtk_text_buffer_set_text (buf, str, strlen (str)); +} + void create_cb_nation (GtkWidget *w) { @@ -342,11 +362,57 @@ main (int argc, char **argv) "field", "now", "form-widget", wlabel, "type", GTK_FORM_FIELD_DATETIME_TYPE_DATE, - "default", now, + "default", g_strdup_printf ("%04d-%02d-%02d %02d:%02d:%02d", + now->tm_year + 1900, + now->tm_mon + 1, + now->tm_mday, + now->tm_hour, + now->tm_min, + now->tm_sec), "display-format", "%d/%m/%Y", NULL); gtk_form_add_field (form, fdatetime); + /* RADIO - TEXT */ + wradio = gtk_form_widget_radio_new (); + gtk_form_widget_set_from_gtkbuilder (wradio, gtkbuilder, "rbtnNone"); + g_object_set (wradio, + "return-value", "", + NULL); + + ftext = gtk_form_field_text_new (); + g_object_set (ftext, + "field", "sex", + "form-widget", wradio, + NULL); + gtk_form_add_field (form, ftext); + + wradio = gtk_form_widget_radio_new (); + gtk_form_widget_set_from_gtkbuilder (wradio, gtkbuilder, "rbtnMale"); + g_object_set (wradio, + "return-value", "M", + NULL); + + ftext = gtk_form_field_text_new (); + g_object_set (ftext, + "field", "sex", + "form-widget", wradio, + NULL); + gtk_form_add_field (form, ftext); + + wradio = gtk_form_widget_radio_new (); + gtk_form_widget_set_from_gtkbuilder (wradio, gtkbuilder, "rbtnFemale"); + g_object_set (wradio, + "return-value", "F", + NULL); + + ftext = gtk_form_field_text_new (); + g_object_set (ftext, + "field", "sex", + "form-widget", wradio, + NULL); + gtk_form_add_field (form, ftext); + txtvSql = GTK_WIDGET (gtk_builder_get_object (gtkbuilder, "txtvSql")); gtk_builder_connect_signals (gtkbuilder, NULL); diff --git a/test/test.gui b/test/test.gui index f566558..6183e43 100644 --- a/test/test.gui +++ b/test/test.gui @@ -1,21 +1,35 @@ - + - + + + 100 + 1 + 1 + 1 + + + 100 + 1 + 1 + 10 + True + False test libform 600 440 - + True + False 3 - vertical True + False 3 10 2 @@ -24,6 +38,7 @@ True + False 0 Label (id) @@ -35,6 +50,7 @@ True + False 0 GtkEntry (name) @@ -48,6 +64,7 @@ True + False 0 @@ -61,6 +78,10 @@ True True + False + False + True + True 1 @@ -73,6 +94,7 @@ True + False 0 GtkSpinButton (Integer) (age) @@ -87,6 +109,10 @@ True True + False + False + True + True adjustment2 1 @@ -101,6 +127,7 @@ True + False 0 GtkSpinButton (Float) (amount) @@ -115,6 +142,10 @@ True True + False + False + True + True adjustment1 1 2 @@ -130,6 +161,7 @@ True + False 0 GtkComboBox (integer) (id_nation) @@ -143,6 +175,7 @@ True + False 0 Label (?) (text) @@ -156,6 +189,7 @@ True + False 0 @@ -170,6 +204,7 @@ True + False 0 GtkCheckButton (married) @@ -182,6 +217,7 @@ + False True True False @@ -200,6 +236,7 @@ True + False 0 GtkTextView (description) @@ -234,6 +271,7 @@ True + False 0 Label (DateTime) (now) @@ -247,6 +285,7 @@ True + False 0 @@ -261,6 +300,7 @@ True + False 1 @@ -274,6 +314,7 @@ True + False 0 Radio (sex) @@ -285,9 +326,11 @@ True + False None + False True True False @@ -295,12 +338,15 @@ True + True + True 0 Male + False True True False @@ -309,12 +355,15 @@ rbtnNone + True + True 1 Female + False True True False @@ -323,6 +372,8 @@ rbtnNone + True + True 2 @@ -337,21 +388,24 @@ False + True 0 True + False 4 gtk-clear + False True True False True - + False @@ -362,11 +416,12 @@ Check + False True True False True - + False @@ -377,11 +432,12 @@ Editable + False True True False True - + False @@ -392,11 +448,12 @@ Sensitive + False True True False True - + False @@ -407,22 +464,25 @@ False + True 1 True + False start Sql _UPDATE + False True True True False True - + False @@ -433,12 +493,13 @@ Sql _INSERT INTO + False True True True False True - + False @@ -449,12 +510,13 @@ Sql _DELETE + False True True True False True - + False @@ -465,12 +527,13 @@ Sql _SELECT + False True True True False True - + False @@ -478,21 +541,41 @@ 3 + + + _XML + False + True + True + True + True + + + + False + False + 4 + + False + True 2 True + False 2 True + False 0 - SQL + SQL +XML GTK_FILL @@ -519,22 +602,12 @@ + True + True 3 - - 1 - 100 - 1 - 1 - - - 1 - 100 - 1 - 10 -