From 6add40b3433694cfb4ae10bd10a9ca9ca7f5c8e3 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sun, 26 Jul 2009 17:21:40 +0200 Subject: [PATCH] Removed libglade dependency. --- configure.ac | 5 +- docs/reference/libform-undocumented.txt | 154 ---------------------- src/form.h | 1 - src/widget.c | 10 +- src/widget.h | 5 +- test/Makefile.am | 2 +- test/main.c | 39 +++--- test/{test.glade => test.gui} | 168 +++++++++++++----------- 8 files changed, 124 insertions(+), 260 deletions(-) delete mode 100644 docs/reference/libform-undocumented.txt rename test/{test.glade => test.gui} (83%) diff --git a/configure.ac b/configure.ac index f1c343e..fcad5c7 100644 --- a/configure.ac +++ b/configure.ac @@ -29,9 +29,8 @@ AC_PROG_LIBTOOL GTK_DOC_CHECK # Checks for libraries. -PKG_CHECK_MODULES(GTKFORM, [gtk+-2.0 >= 2.6.0 - libgdaex >= 0.1.0 - libglade-2.0 >= 2.0.0]) +PKG_CHECK_MODULES(GTKFORM, [gtk+-2.0 >= 2.12.0 + libgdaex >= 0.1.0]) AC_SUBST(GTKFORM_CFLAGS) AC_SUBST(GTKFORM_LIBS) diff --git a/docs/reference/libform-undocumented.txt b/docs/reference/libform-undocumented.txt deleted file mode 100644 index 161e230..0000000 --- a/docs/reference/libform-undocumented.txt +++ /dev/null @@ -1,154 +0,0 @@ -11% symbol docs coverage. -18 symbols documented. -1 symbols incomplete. -145 not documented. - - -Form -FormField -FormFieldBoolean -FormFieldDateTime -FormFieldFloat -FormFieldInteger -FormFieldText -FormKey -FormSqlType -FormWidget -FormWidgetCheck -FormWidgetComboBox -FormWidgetDateEntry -FormWidgetEntry -FormWidgetLabel -FormWidgetSpin -FormWidgetTextview -form_add_field -form_add_fields -form_check -form_clear -form_field_boolean_clear -form_field_boolean_get_value -form_field_boolean_get_value_sql -form_field_boolean_get_value_stringify -form_field_boolean_is_empty -form_field_boolean_new -form_field_boolean_set_from_datamodel -form_field_clear -form_field_datetime_clear -form_field_datetime_get_value -form_field_datetime_get_value_sql -form_field_datetime_get_value_stringify -form_field_datetime_is_empty -form_field_datetime_new -form_field_datetime_set_from_datamodel -form_field_float_clear -form_field_float_get_value -form_field_float_get_value_sql -form_field_float_get_value_stringify -form_field_float_is_empty -form_field_float_new -form_field_float_set_from_datamodel -form_field_get_field_name -form_field_get_form_widget (field, Returns) -form_field_get_value -form_field_get_value_sql -form_field_get_value_stringify -form_field_integer_clear -form_field_integer_get_value -form_field_integer_get_value_sql -form_field_integer_get_value_stringify -form_field_integer_is_empty -form_field_integer_new -form_field_integer_set_from_datamodel -form_field_is_empty -form_field_new -form_field_new_from_form_widget -form_field_set_from_datamodel -form_field_text_clear -form_field_text_get_value -form_field_text_get_value_sql -form_field_text_get_value_stringify -form_field_text_is_empty -form_field_text_new -form_field_text_set_from_datamodel -form_fill_from_datamodel -form_get_field_from_name -form_get_sql -form_get_widget_from_name -form_key_add_field -form_key_add_fields -form_key_check -form_key_field_is_key -form_key_get_sql -form_key_new -form_key_remove_field -form_new -form_remove_field -form_set_editable -form_set_sensitive -form_widget_check_get_value_stringify -form_widget_check_new -form_widget_check_set_editable -form_widget_check_set_value_stringify -form_widget_combo_box_get_value_stringify -form_widget_combo_box_new -form_widget_combo_box_set_editable -form_widget_combo_box_set_value_stringify -form_widget_date_entry_get_value_stringify -form_widget_date_entry_new -form_widget_date_entry_set_editable -form_widget_date_entry_set_value_stringify -form_widget_entry_get_value_stringify -form_widget_entry_new -form_widget_entry_set_editable -form_widget_entry_set_value_stringify -form_widget_get_value_stringify -form_widget_get_widget -form_widget_get_widget_name -form_widget_label_get_value_stringify -form_widget_label_new -form_widget_label_set_value_stringify -form_widget_new -form_widget_set_editable -form_widget_set_from_glade -form_widget_set_value_stringify -form_widget_spin_get_value_stringify -form_widget_spin_new -form_widget_spin_set_editable -form_widget_spin_set_value_stringify -form_widget_textview_get_value_stringify -form_widget_textview_new -form_widget_textview_set_editable -form_widget_textview_set_value_stringify - - -libform:Long_Description -libform:Short_Description -libformfield:Long_Description -libformfield:Short_Description -libformfieldboolean:Long_Description -libformfieldboolean:Short_Description -libformfielddatetime:Long_Description -libformfielddatetime:Short_Description -libformfieldfloat:Long_Description -libformfieldfloat:Short_Description -libformfieldinteger:Long_Description -libformfieldinteger:Short_Description -libformfieldtext:Long_Description -libformfieldtext:Short_Description -libformkey:Long_Description -libformkey:Short_Description -libformwidget:Long_Description -libformwidget:Short_Description -libformwidgetcheck:Long_Description -libformwidgetcheck:Short_Description -libformwidgetcombobox:Short_Description -libformwidgetdateentry:Long_Description -libformwidgetdateentry:Short_Description -libformwidgetentry:Long_Description -libformwidgetentry:Short_Description -libformwidgetlabel:Long_Description -libformwidgetlabel:Short_Description -libformwidgetspin:Long_Description -libformwidgetspin:Short_Description -libformwidgettextview:Long_Description -libformwidgettextview:Short_Description diff --git a/src/form.h b/src/form.h index 0c23a0c..4191586 100644 --- a/src/form.h +++ b/src/form.h @@ -20,7 +20,6 @@ #define __LIBGTK_FORM_H__ #include -#include #include "field.h" #include "widget.h" diff --git a/src/widget.c b/src/widget.c index bbde559..908c866 100644 --- a/src/widget.c +++ b/src/widget.c @@ -97,18 +97,20 @@ GtkFormWidget } /** - * gtk_form_widget_set_from_glade: + * gtk_form_widget_set_from_gtkbuilder: * @fwidget: - * @glade: + * @gtkbuilder: * @widget_name: * */ gboolean -gtk_form_widget_set_from_glade (GtkFormWidget *fwidget, GladeXML *glade, const gchar *widget_name) +gtk_form_widget_set_from_gtkbuilder (GtkFormWidget *fwidget, + GtkBuilder *gtkbuilder, + const gchar *widget_name) { gboolean ret = FALSE; - GtkWidget *w = glade_xml_get_widget (glade, widget_name); + GtkWidget *w = GTK_WIDGET (gtk_builder_get_object (gtkbuilder, widget_name)); if (w != NULL) { g_object_set (fwidget, diff --git a/src/widget.h b/src/widget.h index b8c5f39..98f0eaa 100644 --- a/src/widget.h +++ b/src/widget.h @@ -21,7 +21,6 @@ #include #include -#include G_BEGIN_DECLS @@ -58,7 +57,9 @@ GType gtk_form_widget_get_type (void) G_GNUC_CONST; GtkFormWidget *gtk_form_widget_new (void); -gboolean gtk_form_widget_set_from_glade (GtkFormWidget *fwidget, GladeXML *glade, const gchar *widget_name); +gboolean gtk_form_widget_set_from_gtkbuilder (GtkFormWidget *fwidget, + GtkBuilder *gtkbuilder, + const gchar *widget_name); GtkWidget *gtk_form_widget_get_widget (GtkFormWidget *fwidget); diff --git a/test/Makefile.am b/test/Makefile.am index 20c7776..a653687 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -3,7 +3,7 @@ LIBS = $(GTKFORM_LIBS) \ AM_CPPFLAGS = $(GTKFORM_CFLAGS) \ -I$(top_srcdir)/src \ - -DGLADEDIR="\"@abs_builddir@\"" + -DGUIDIR="\"@abs_builddir@\"" noinst_PROGRAMS = test diff --git a/test/main.c b/test/main.c index 07fabaf..d11ff9e 100644 --- a/test/main.c +++ b/test/main.c @@ -20,7 +20,6 @@ #include #include -#include #include "form.h" #include "field.h" @@ -204,19 +203,21 @@ create_cb_nation (GtkWidget *w) int main (int argc, char **argv) { - GladeXML *glade; + GtkBuilder *gtkbuilder; GtkFormKey *key; time_t time_now; struct tm *now; gtk_init (&argc, &argv); - glade = glade_xml_new (GLADEDIR "/test.glade", NULL, NULL); + gtkbuilder = gtk_builder_new (); - w = glade_xml_get_widget (glade, "wMain"); + gtk_builder_add_from_file (gtkbuilder, GUIDIR "/test.gui", NULL); - tbtnEditable = glade_xml_get_widget (glade, "tbtnEditable"); - tbtnSensitive = glade_xml_get_widget (glade, "tbtnSensitive"); + w = GTK_WIDGET (gtk_builder_get_object (gtkbuilder, "wMain")); + + tbtnEditable = GTK_WIDGET (gtk_builder_get_object (gtkbuilder, "tbtnEditable")); + tbtnSensitive = GTK_WIDGET (gtk_builder_get_object (gtkbuilder, "tbtnSensitive")); form = gtk_form_new (); if (form == NULL) return 0; @@ -229,7 +230,7 @@ main (int argc, char **argv) /* LABEL - INTEGER */ wlabel = gtk_form_widget_label_new (); - gtk_form_widget_set_from_glade (wlabel, glade, "lblID"); + gtk_form_widget_set_from_gtkbuilder (wlabel, gtkbuilder, "lblID"); fint = gtk_form_field_integer_new (); g_object_set (fint, @@ -242,7 +243,7 @@ main (int argc, char **argv) /* LABEL - TEXT */ wlabel = gtk_form_widget_label_new (); - gtk_form_widget_set_from_glade (wlabel, glade, "lblText"); + gtk_form_widget_set_from_gtkbuilder (wlabel, gtkbuilder, "lblText"); ftext = gtk_form_field_text_new (); g_object_set (ftext, @@ -254,7 +255,7 @@ main (int argc, char **argv) /* ENTRY - TEXT */ wentry = gtk_form_widget_entry_new (); - gtk_form_widget_set_from_glade (wentry, glade, "txtName"); + gtk_form_widget_set_from_gtkbuilder (wentry, gtkbuilder, "txtName"); ftext = gtk_form_field_text_new (); g_object_set (ftext, @@ -267,7 +268,7 @@ main (int argc, char **argv) /* SPIN - INTEGER */ wspin = gtk_form_widget_spin_new (); - gtk_form_widget_set_from_glade (wspin, glade, "spnAge"); + gtk_form_widget_set_from_gtkbuilder (wspin, gtkbuilder, "spnAge"); fint = gtk_form_field_integer_new (); g_object_set (fint, @@ -279,7 +280,7 @@ main (int argc, char **argv) /* SPIN - FLOAT */ wspin = gtk_form_widget_spin_new (); - gtk_form_widget_set_from_glade (wspin, glade, "spnAmount"); + gtk_form_widget_set_from_gtkbuilder (wspin, gtkbuilder, "spnAmount"); ffloat = gtk_form_field_float_new (); g_object_set (ffloat, @@ -290,10 +291,10 @@ main (int argc, char **argv) gtk_form_add_field (form, ffloat); /* COMBOBOX - INTEGER */ - create_cb_nation (glade_xml_get_widget (glade, "cbNation")); + create_cb_nation (GTK_WIDGET (gtk_builder_get_object (gtkbuilder, "cbNation"))); wcombobox = gtk_form_widget_combo_box_new (); - gtk_form_widget_set_from_glade (wcombobox, glade, "cbNation"); + gtk_form_widget_set_from_gtkbuilder (wcombobox, gtkbuilder, "cbNation"); g_object_set (wcombobox, "column-field", 0, NULL); @@ -308,7 +309,7 @@ main (int argc, char **argv) /* CHECK - BOOL*/ wcheck = gtk_form_widget_check_new (); - gtk_form_widget_set_from_glade (wcheck, glade, "chkMarried"); + gtk_form_widget_set_from_gtkbuilder (wcheck, gtkbuilder, "chkMarried"); fbool = gtk_form_field_boolean_new (); g_object_set (fbool, @@ -319,7 +320,7 @@ main (int argc, char **argv) /* TEXTVIEW - TEXT */ wtxtv = gtk_form_widget_textview_new (); - gtk_form_widget_set_from_glade (wtxtv, glade, "txtvDescription"); + gtk_form_widget_set_from_gtkbuilder (wtxtv, gtkbuilder, "txtvDescription"); ftext = gtk_form_field_text_new (); g_object_set (ftext, @@ -334,7 +335,7 @@ main (int argc, char **argv) now = localtime (&time_now); wlabel = gtk_form_widget_label_new (); - gtk_form_widget_set_from_glade (wlabel, glade, "lblDateTime"); + gtk_form_widget_set_from_gtkbuilder (wlabel, gtkbuilder, "lblDateTime"); fdatetime = gtk_form_field_datetime_new (); g_object_set (fdatetime, @@ -344,9 +345,11 @@ main (int argc, char **argv) NULL); gtk_form_add_field (form, fdatetime); - txtvSql = glade_xml_get_widget (glade, "txtvSql"); + txtvSql = GTK_WIDGET (gtk_builder_get_object (gtkbuilder, "txtvSql")); + + gtk_builder_connect_signals (gtkbuilder, NULL); - glade_xml_signal_autoconnect (glade); + gtk_widget_show_all (w); gtk_main (); diff --git a/test/test.glade b/test/test.gui similarity index 83% rename from test/test.glade rename to test/test.gui index 9035c10..7f28f99 100644 --- a/test/test.glade +++ b/test/test.gui @@ -1,19 +1,19 @@ - - + + - + True test libform 600 440 - + True 3 - + True 3 10 @@ -21,22 +21,22 @@ 3 3 - + True 0 Label (id) - + GTK_FILL - + True 0 GtkEntry (name) - + 1 2 @@ -45,10 +45,10 @@ - + True 0 - + 1 2 @@ -57,10 +57,10 @@ - + True True - + 1 2 @@ -70,11 +70,11 @@ - + True 0 GtkSpinButton (Integer) (age) - + 2 3 @@ -83,12 +83,12 @@ - + True True - 1 0 100 1 10 10 + adjustment2 1 - + 1 2 @@ -98,11 +98,11 @@ - + True 0 GtkSpinButton (Float) (amount) - + 3 4 @@ -111,13 +111,13 @@ - + True True - 1 0 100 1 10 10 + adjustment1 1 2 - + 1 2 @@ -127,11 +127,11 @@ - + True 0 GtkComboBox (integer) (id_nation) - + 4 5 @@ -140,11 +140,11 @@ - + True 0 Label (?) (text) - + 5 6 @@ -153,10 +153,10 @@ - + True 0 - + 1 2 @@ -167,11 +167,11 @@ - + True 0 GtkCheckButton (married) - + 6 7 @@ -180,13 +180,13 @@ - + True True False True True - + 1 2 @@ -197,11 +197,11 @@ - + True 0 GtkTextView (description) - + 7 8 @@ -210,16 +210,16 @@ - + True True - + True True - + - + 1 2 @@ -230,11 +230,11 @@ - + True 0 Label (DateTime) (now) - + 8 9 @@ -243,10 +243,10 @@ - + True 0 - + 1 2 @@ -257,9 +257,9 @@ - + True - + 1 2 @@ -275,25 +275,25 @@ - + False 0 - + True 4 - + gtk-clear True True False True - + False False @@ -301,14 +301,14 @@ - + Check True True False True - + False False @@ -316,14 +316,14 @@ - + Editable True True False True - + False False @@ -331,32 +331,32 @@ - + Sensitive True True False True - + False False 3 - + False 1 - + True start - + Sql _UPDATE True True @@ -364,7 +364,7 @@ False True - + False False @@ -372,7 +372,7 @@ - + Sql _INSERT INTO True True @@ -380,7 +380,7 @@ False True - + False False @@ -388,7 +388,7 @@ - + Sql _DELETE True True @@ -396,7 +396,7 @@ False True - + False False @@ -404,7 +404,7 @@ - + Sql _SELECT True True @@ -412,58 +412,72 @@ False True - + False False 3 - + False 2 - + True 2 - + True 0 SQL - + GTK_FILL - + True True in - + True True word - + - + 1 2 - + 3 - + - - + + + 1 + 100 + 1 + 10 + 10 + + + 1 + 100 + 1 + 10 + 10 + + -- 2.49.0