From: Andrea Zagli Date: Sun, 21 Feb 2010 08:25:20 +0000 (+0100) Subject: Enabled checkbutton to be label of themselves. X-Git-Tag: 0.1.0~5 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=1662b0b7ac3018bb977f5a1410f3001187fd6b6f;p=libgtkform Enabled checkbutton to be label of themselves. --- diff --git a/ChangeLog b/ChangeLog index efd75de..ae5bb0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,80 @@ +commit d3fc95d79ce768084415ac0851648c1a87b59888 +Author: Andrea Zagli +Date: 2009-11-07 + + Bugfix for gtk_form_field_datetime_is_empty that it was incomplete. + +M src/fielddatetime.c + +commit eaa8c96188b0296c109982ee0f2d4902f447d7a9 +Author: Andrea Zagli +Date: 2009-11-01 + + Bug fix for datetime fields sql value. + +M .gitignore +M docs/reference/libgtkform-decl.txt +M src/fielddatetime.c +M test/database.db +M test/from_xml_with_db.c + +commit d15e65a21d7f0bbded0e68d515f9e06db5d73aa7 +Author: Andrea Zagli +Date: 2009-10-19 + + Removed const from every return values. + Removed some memory leaks. + Some bugfixes. + Some new string localized. + +M docs/reference/libgtkform-decl.txt +M po/it.po +M src/field.c +M src/field.h +M src/fieldboolean.c +M src/fieldboolean.h +M src/fielddatetime.c +M src/fielddatetime.h +M src/fieldfloat.c +M src/fieldfloat.h +M src/fieldinteger.c +M src/fieldinteger.h +M src/fieldtext.c +M src/fieldtext.h +M src/form.c +M src/form.h +M src/key.c +M src/widget.c +M src/widget.h +M src/widgetcheck.c +M src/widgetcheck.h +M src/widgetcombobox.c +M src/widgetcombobox.h +M src/widgetentry.c +M src/widgetentry.h +M src/widgetlabel.c +M src/widgetlabel.h +M src/widgetspin.c +M src/widgetspin.h +M src/widgettextview.c +M src/widgettextview.h +M test/database.db +M test/from_xml_with_db.c +M test/test_db.gui +M test/test_db.xml + +commit 68807fd56f41aa61747e31312f9a5cb3276e5b34 +Author: Andrea Zagli +Date: 2009-10-19 + + Another bugfix for localization on windows. + +M ChangeLog +M src/form.c + commit 4cb4bfb22a273451502dc5094143e1fd23b5f42f Author: Andrea Zagli -Date: 2009-10-18 +Date: 2009-10-18 Missing some test files on tarball creation. diff --git a/docs/reference/libgtkform-decl.txt b/docs/reference/libgtkform-decl.txt index 724ce22..24aeb33 100644 --- a/docs/reference/libgtkform-decl.txt +++ b/docs/reference/libgtkform-decl.txt @@ -45,27 +45,27 @@ struct _GtkFormWidgetSpinClass gtk_form_widget_spin_get_type GType -void +void gtk_form_widget_spin_new GtkFormWidget * -void +void gtk_form_widget_spin_get_value_stringify gchar * -GtkFormWidget *widget +GtkFormWidget *widget gtk_form_widget_spin_set_value_stringify gboolean -GtkFormWidget *fwidget, const gchar *value +GtkFormWidget *fwidget, const gchar *value gtk_form_widget_spin_set_editable void -GtkFormWidget *fwidget, gboolean editable +GtkFormWidget *fwidget, gboolean editable TYPE_GTK_FORM_WIDGET_CHECK @@ -114,27 +114,27 @@ struct _GtkFormWidgetCheckClass gtk_form_widget_check_get_type GType -void +void gtk_form_widget_check_new GtkFormWidget * -void +void gtk_form_widget_check_get_value_stringify gchar * -GtkFormWidget *widget +GtkFormWidget *widget gtk_form_widget_check_set_value_stringify gboolean -GtkFormWidget *fwidget, const gchar *value +GtkFormWidget *fwidget, const gchar *value gtk_form_widget_check_set_editable void -GtkFormWidget *fwidget, gboolean editable +GtkFormWidget *fwidget, gboolean editable TYPE_GTK_FORM_FIELD_BOOLEAN @@ -183,57 +183,57 @@ struct _GtkFormFieldBooleanClass gtk_form_field_boolean_get_type GType -void +void gtk_form_field_boolean_new GtkFormField * -void +void gtk_form_field_boolean_get_value_stringify gchar * -GtkFormField *field +GtkFormField *field gtk_form_field_boolean_get_value GValue * -GtkFormField *field +GtkFormField *field gtk_form_field_boolean_get_value_sql gchar * -GtkFormField *field +GtkFormField *field gtk_form_field_boolean_clear gboolean -GtkFormField *field +GtkFormField *field gtk_form_field_boolean_is_empty gboolean -GtkFormField *field +GtkFormField *field gtk_form_filed_boolean_is_changed gboolean -GtkFormField *field +GtkFormField *field gtk_form_field_boolean_set_as_origin void -GtkFormField *field +GtkFormField *field gtk_form_field_boolean_set_from_datamodel gboolean -GtkFormField *field, GdaDataModel *dm, gint row +GtkFormField *field, GdaDataModel *dm, gint row gtk_form_field_boolean_str_to_boolean gboolean -const gchar *value +const gchar *value TYPE_GTK_FORM_WIDGET @@ -288,52 +288,52 @@ struct _GtkFormWidgetClass gtk_form_widget_get_type GType -void +void gtk_form_widget_new GtkFormWidget * -void +void gtk_form_widget_set_from_gtkbuilder gboolean -GtkFormWidget *fwidget,GtkBuilder *gtkbuilder,const gchar *widget_name +GtkFormWidget *fwidget, GtkBuilder *gtkbuilder, const gchar *widget_name gtk_form_widget_get_widget GtkWidget * -GtkFormWidget *fwidget +GtkFormWidget *fwidget gtk_form_widget_get_widget_name gchar * -GtkFormWidget *fwidget +GtkFormWidget *fwidget gtk_form_widget_get_label GtkWidget * -GtkFormWidget *fwidget +GtkFormWidget *fwidget gtk_form_widget_set_label void -GtkFormWidget *fwidget, GtkLabel *label +GtkFormWidget *fwidget, GtkWidget *label gtk_form_widget_get_value_stringify gchar * -GtkFormWidget *fwidget +GtkFormWidget *fwidget gtk_form_widget_set_value_stringify gboolean -GtkFormWidget *fwidget, const gchar *value +GtkFormWidget *fwidget, const gchar *value gtk_form_widget_set_editable void -GtkFormWidget *fwidget, gboolean editable +GtkFormWidget *fwidget, gboolean editable TYPE_GTK_FORM_FIELD_TEXT @@ -382,52 +382,52 @@ struct _GtkFormFieldTextClass gtk_form_field_text_get_type GType -void +void gtk_form_field_text_new GtkFormField * -void +void gtk_form_field_text_get_value_stringify gchar * -GtkFormField *field +GtkFormField *field gtk_form_field_text_get_value GValue * -GtkFormField *field +GtkFormField *field gtk_form_field_text_get_value_sql gchar * -GtkFormField *field +GtkFormField *field gtk_form_field_text_clear gboolean -GtkFormField *field +GtkFormField *field gtk_form_field_text_is_empty gboolean -GtkFormField *field +GtkFormField *field gtk_form_field_text_is_changed gboolean -GtkFormField *field +GtkFormField *field gtk_form_field_text_set_as_origin void -GtkFormField *field +GtkFormField *field gtk_form_field_text_set_from_datamodel gboolean -GtkFormField *field, GdaDataModel *dm, gint row +GtkFormField *field, GdaDataModel *dm, gint row TYPE_GTK_FORM_FIELD_DATETIME @@ -476,72 +476,72 @@ struct _GtkFormFieldDateTimeClass gtk_form_field_datetime_get_type GType -void +void gtk_form_field_datetime_new GtkFormField * -void +void gtk_form_field_datetime_get_value_stringify gchar * -GtkFormField *field +GtkFormField *field gtk_form_field_datetime_get_value GValue * -GtkFormField *field +GtkFormField *field gtk_form_field_datetime_get_value_sql gchar * -GtkFormField *field +GtkFormField *field gtk_form_field_datetime_clear gboolean -GtkFormField *field +GtkFormField *field gtk_form_field_datetime_is_empty gboolean -GtkFormField *field +GtkFormField *field gtk_form_field_datetime_is_changed gboolean -GtkFormField *field +GtkFormField *field gtk_form_field_datetime_set_as_origin void -GtkFormField *field +GtkFormField *field gtk_form_field_datetime_set_from_datamodel gboolean -GtkFormField *field, GdaDataModel *dm, gint row +GtkFormField *field, GdaDataModel *dm, gint row gtk_form_field_datetime_get_tm_from_str struct tm * -const gchar *str, const gchar *format +const gchar *str, const gchar *format gtk_form_field_datetime_get_str_from_tm gchar * -struct tm *datetime, const gchar *format +struct tm *datetime, const gchar *format gtk_form_field_datetime_get_gdate_from_tm GDate * -struct tm *datetime +struct tm *datetime gtk_form_field_datetime_get_now struct tm * -void +void TYPE_GTK_FORM_WIDGET_LABEL @@ -590,22 +590,22 @@ struct _GtkFormWidgetLabelClass gtk_form_widget_label_get_type GType -void +void gtk_form_widget_label_new GtkFormWidget * -void +void gtk_form_widget_label_get_value_stringify gchar * -GtkFormWidget *widget +GtkFormWidget *widget gtk_form_widget_label_set_value_stringify gboolean -GtkFormWidget *fwidget, const gchar *value +GtkFormWidget *fwidget, const gchar *value TYPE_GTK_FORM_FIELD_FLOAT @@ -654,52 +654,52 @@ struct _GtkFormFieldFloatClass gtk_form_field_float_get_type GType -void +void gtk_form_field_float_new GtkFormField * -void +void gtk_form_field_float_get_value_stringify gchar * -GtkFormField *field +GtkFormField *field gtk_form_field_float_get_value GValue * -GtkFormField *field +GtkFormField *field gtk_form_field_float_get_value_sql gchar * -GtkFormField *field +GtkFormField *field gtk_form_field_float_clear gboolean -GtkFormField *field +GtkFormField *field gtk_form_field_float_is_empty gboolean -GtkFormField *field +GtkFormField *field gtk_form_field_float_is_changed gboolean -GtkFormField *field +GtkFormField *field gtk_form_field_float_set_as_origin void -GtkFormField *field +GtkFormField *field gtk_form_field_float_set_from_datamodel gboolean -GtkFormField *field, GdaDataModel *dm, gint row +GtkFormField *field, GdaDataModel *dm, gint row TYPE_GTK_FORM_KEY @@ -748,42 +748,42 @@ struct _GtkFormKeyClass gtk_form_key_get_type GType -void +void gtk_form_key_new GtkFormKey * -void +void gtk_form_key_add_field gboolean -GtkFormKey *gtk_form_key, GtkFormField *field +GtkFormKey *gtk_form_key, GtkFormField *field gtk_form_key_remove_field gboolean -GtkFormKey *gtk_form_key, GtkFormField *field +GtkFormKey *gtk_form_key, GtkFormField *field gtk_form_key_add_fields gboolean -GtkFormKey *gtk_form_key, ... +GtkFormKey *gtk_form_key, ... gtk_form_key_check gboolean -GtkFormKey *gtk_form_key, GtkFormWidget **form_widget +GtkFormKey *gtk_form_key, GtkFormWidget **form_widget gtk_form_key_get_sql gchar * -GtkFormKey *gtk_form_key +GtkFormKey *gtk_form_key gtk_form_key_field_is_key gboolean -GtkFormKey *gtk_form_key, GtkFormField *field +GtkFormKey *gtk_form_key, GtkFormField *field TYPE_GTK_FORM_WIDGET_TEXTVIEW @@ -832,27 +832,27 @@ struct _GtkFormWidgetTextviewClass gtk_form_widget_textview_get_type GType -void +void gtk_form_widget_textview_new GtkFormWidget * -void +void gtk_form_widget_textview_get_value_stringify gchar * -GtkFormWidget *widget +GtkFormWidget *widget gtk_form_widget_textview_set_value_stringify gboolean -GtkFormWidget *fwidget, const gchar *value +GtkFormWidget *fwidget, const gchar *value gtk_form_widget_textview_set_editable void -GtkFormWidget *fwidget, gboolean editable +GtkFormWidget *fwidget, gboolean editable TYPE_GTK_FORM_FIELD @@ -911,72 +911,72 @@ struct _GtkFormFieldClass gtk_form_field_get_type GType -void +void gtk_form_field_new GtkFormField * -void +void gtk_form_field_new_from_gtk_form_widget GtkFormField * -GtkFormWidget *fwidget +GtkFormWidget *fwidget gtk_form_field_get_field_name gchar * -GtkFormField *field +GtkFormField *field gtk_form_field_get_form_widget GtkFormWidget * -GtkFormField *field +GtkFormField *field gtk_form_field_get_value_stringify gchar * -GtkFormField *field +GtkFormField *field gtk_form_field_get_value GValue * -GtkFormField *field +GtkFormField *field gtk_form_field_get_value_sql gchar * -GtkFormField *field +GtkFormField *field gtk_form_field_clear gboolean -GtkFormField *field +GtkFormField *field gtk_form_field_is_to_save gboolean -GtkFormField *field +GtkFormField *field gtk_form_field_is_empty gboolean -GtkFormField *field +GtkFormField *field gtk_form_field_is_changed gboolean -GtkFormField *field +GtkFormField *field gtk_form_field_set_as_origin void -GtkFormField *field +GtkFormField *field gtk_form_field_set_from_datamodel gboolean -GtkFormField *field, GdaDataModel *dm, gint row +GtkFormField *field, GdaDataModel *dm, gint row TYPE_GTK_FORM @@ -1025,117 +1025,117 @@ struct _GtkFormClass gtk_form_get_type GType -void +void gtk_form_new GtkForm * -void +void gtk_form_new_from_xml GtkForm * -xmlDoc *xmldoc, GtkBuilder *gtkbuilder +xmlDoc *xmldoc, GtkBuilder *gtkbuilder gtk_form_new_from_file GtkForm * -const gchar *filename, GtkBuilder *gtkbuilder +const gchar *filename, GtkBuilder *gtkbuilder gtk_form_get_gtkbuilder GtkBuilder * -GtkForm *form +GtkForm *form gtk_form_get_table gchar * -GtkForm *form +GtkForm *form gtk_form_set_table void -GtkForm *form, const gchar *table +GtkForm *form, const gchar *table gtk_form_get_key GtkFormKey * -GtkForm *form +GtkForm *form gtk_form_set_key void -GtkForm *form, GtkFormKey *key +GtkForm *form, GtkFormKey *key gtk_form_add_field gboolean -GtkForm *form, GtkFormField *field +GtkForm *form, GtkFormField *field gtk_form_remove_field gboolean -GtkForm *form, GtkFormField *field +GtkForm *form, GtkFormField *field gtk_form_add_fields gboolean -GtkForm *form, ... +GtkForm *form, ... gtk_form_get_form_field_from_name GtkFormField * -GtkForm *form, const gchar *field_name +GtkForm *form, const gchar *field_name gtk_form_get_form_widget_from_name GtkFormWidget * -GtkForm *form, const gchar *widget_name +GtkForm *form, const gchar *widget_name gtk_form_get_widgets GtkWidget ** -GtkForm *form +GtkForm *form gtk_form_get_objects_by_name GObject ** -GtkForm *form, ... +GtkForm *form, ... gtk_form_clear gboolean -GtkForm *form +GtkForm *form gtk_form_check gboolean -GtkForm *form, gboolean with_key,GtkFormWidget **form_widget,gboolean show_error_dialog, GtkWidget *parent_window,gboolean set_focus +GtkForm *form, gboolean with_key, GtkFormWidget **form_widget, gboolean show_error_dialog, GtkWidget *parent_window, gboolean set_focus gtk_form_is_changed gboolean -GtkForm *form +GtkForm *form gtk_form_set_as_origin void -GtkForm *form +GtkForm *form gtk_form_set_sensitive void -GtkForm *form, gboolean sensitive +GtkForm *form, gboolean sensitive gtk_form_set_sensitive_by_name void -GtkForm *form, gboolean sensitive, ... +GtkForm *form, gboolean sensitive, ... gtk_form_set_editable void -GtkForm *form, gboolean editable +GtkForm *form, gboolean editable GtkFormSqlType @@ -1150,12 +1150,12 @@ typedef enum gtk_form_get_sql gchar * -GtkForm *form, GtkFormSqlType type +GtkForm *form, GtkFormSqlType type gtk_form_fill_from_datamodel gboolean -GtkForm *form, GdaDataModel *dm, gint row +GtkForm *form, GdaDataModel *dm, gint row TYPE_GTK_FORM_WIDGET_COMBO_BOX @@ -1204,27 +1204,27 @@ struct _GtkFormWidgetComboBoxClass gtk_form_widget_combo_box_get_type GType -void +void gtk_form_widget_combo_box_new GtkFormWidget * -void +void gtk_form_widget_combo_box_get_value_stringify gchar * -GtkFormWidget *widget +GtkFormWidget *widget gtk_form_widget_combo_box_set_value_stringify gboolean -GtkFormWidget *fwidget, const gchar *value +GtkFormWidget *fwidget, const gchar *value gtk_form_widget_combo_box_set_editable void -GtkFormWidget *fwidget, gboolean editable +GtkFormWidget *fwidget, gboolean editable TYPE_GTK_FORM_WIDGET_ENTRY @@ -1273,27 +1273,27 @@ struct _GtkFormWidgetEntryClass gtk_form_widget_entry_get_type GType -void +void gtk_form_widget_entry_new GtkFormWidget * -void +void gtk_form_widget_entry_get_value_stringify gchar * -GtkFormWidget *widget +GtkFormWidget *widget gtk_form_widget_entry_set_value_stringify gboolean -GtkFormWidget *fwidget, const gchar *value +GtkFormWidget *fwidget, const gchar *value gtk_form_widget_entry_set_editable void -GtkFormWidget *fwidget, gboolean editable +GtkFormWidget *fwidget, gboolean editable TYPE_GTK_FORM_FIELD_INTEGER @@ -1342,50 +1342,50 @@ struct _GtkFormFieldIntegerClass gtk_form_field_integer_get_type GType -void +void gtk_form_field_integer_new GtkFormField * -void +void gtk_form_field_integer_get_value_stringify gchar * -GtkFormField *field +GtkFormField *field gtk_form_field_integer_get_value GValue * -GtkFormField *field +GtkFormField *field gtk_form_field_integer_get_value_sql gchar * -GtkFormField *field +GtkFormField *field gtk_form_field_integer_clear gboolean -GtkFormField *field +GtkFormField *field gtk_form_field_integer_is_empty gboolean -GtkFormField *field +GtkFormField *field gtk_form_field_integer_is_changed gboolean -GtkFormField *field +GtkFormField *field gtk_form_field_integer_set_as_origin void -GtkFormField *field +GtkFormField *field gtk_form_field_integer_set_from_datamodel gboolean -GtkFormField *field, GdaDataModel *dm, gint row +GtkFormField *field, GdaDataModel *dm, gint row diff --git a/docs/reference/libgtkform-undocumented.txt b/docs/reference/libgtkform-undocumented.txt index 933d06a..6141135 100644 --- a/docs/reference/libgtkform-undocumented.txt +++ b/docs/reference/libgtkform-undocumented.txt @@ -1,7 +1,7 @@ 7% symbol docs coverage. 22 symbols documented. 1 symbols incomplete. -274 not documented. +277 not documented. GTK_FORM @@ -152,6 +152,7 @@ gtk_form_field_float_new gtk_form_field_float_set_as_origin gtk_form_field_float_set_from_datamodel gtk_form_field_get_field_name +gtk_form_field_get_gtk_form_widget gtk_form_field_get_type gtk_form_field_get_value gtk_form_field_get_value_sql @@ -184,6 +185,7 @@ gtk_form_field_text_set_as_origin gtk_form_field_text_set_from_datamodel gtk_form_filed_boolean_is_changed gtk_form_fill_from_datamodel +gtk_form_get_field_from_name gtk_form_get_form_field_from_name gtk_form_get_form_widget_from_name gtk_form_get_gtkbuilder @@ -193,6 +195,7 @@ gtk_form_get_objects_by_name gtk_form_get_sql gtk_form_get_table gtk_form_get_type +gtk_form_get_widget_from_name gtk_form_is_changed gtk_form_key_add_field gtk_form_key_add_fields diff --git a/src/form.c b/src/form.c index b107042..f698a11 100644 --- a/src/form.c +++ b/src/form.c @@ -266,12 +266,17 @@ GtkForm label = xmlGetProp (cur, (const xmlChar *)"label"); if (label != NULL && g_strcmp0 (g_strstrip (label), "") != 0) { - GtkLabel *wlabel; - wlabel = GTK_LABEL (gtk_builder_get_object (priv->gtkbuilder, label)); + GtkWidget *wlabel; + wlabel = GTK_WIDGET (gtk_builder_get_object (priv->gtkbuilder, label)); if (GTK_IS_LABEL (wlabel)) { gtk_form_widget_set_label (widget, wlabel); } + else if (g_strcmp0 (type, "checkbox") == 0 + && g_strcmp0 (label, name) == 0) + { + gtk_form_widget_set_label (widget, wlabel); + } else { g_warning (_("Label «%s» not found."), label); @@ -508,9 +513,9 @@ gchar gchar *ret; GtkFormPrivate *priv; - ret = g_strdup (""); + g_return_val_if_fail (IS_GTK_FORM (form), ""); - g_return_val_if_fail (IS_GTK_FORM (form), ret); + ret = g_strdup (""); priv = GTK_FORM_GET_PRIVATE (form); @@ -1331,11 +1336,18 @@ gtk_form_show_check_error_dialog (GtkFormWidget *fwidget, GtkWidget *parent_wind GtkWidget *label; const gchar *label_text; + g_return_if_fail (IS_GTK_FORM_WIDGET (fwidget)); + g_return_if_fail (GTK_IS_WINDOW (parent_window)); + label = gtk_form_widget_get_label (fwidget); if (GTK_IS_LABEL (label)) { label_text = gtk_label_get_text (GTK_LABEL (label)); } + else if (GTK_IS_CHECK_BUTTON (label)) + { + label_text = gtk_button_get_label (GTK_BUTTON (label)); + } else { label_text = gtk_form_widget_get_widget_name (fwidget); diff --git a/src/widget.c b/src/widget.c index 6a9e234..e66bda2 100644 --- a/src/widget.c +++ b/src/widget.c @@ -203,11 +203,11 @@ GtkWidget /** * gtk_form_widget_set_label: * @fwidget: a #GtkFormWidget object. - * @label: a @GtkLabel object. + * @label: a @GtkWidget object. * */ void -gtk_form_widget_set_label (GtkFormWidget *fwidget, GtkLabel *label) +gtk_form_widget_set_label (GtkFormWidget *fwidget, GtkWidget *label) { GtkFormWidgetPrivate *priv; diff --git a/src/widget.h b/src/widget.h index 6d3199a..3ff3b78 100644 --- a/src/widget.h +++ b/src/widget.h @@ -66,7 +66,7 @@ GtkWidget *gtk_form_widget_get_widget (GtkFormWidget *fwidget); gchar *gtk_form_widget_get_widget_name (GtkFormWidget *fwidget); GtkWidget *gtk_form_widget_get_label (GtkFormWidget *fwidget); -void gtk_form_widget_set_label (GtkFormWidget *fwidget, GtkLabel *label); +void gtk_form_widget_set_label (GtkFormWidget *fwidget, GtkWidget *label); gchar *gtk_form_widget_get_value_stringify (GtkFormWidget *fwidget); diff --git a/src/widgetcheck.c b/src/widgetcheck.c index b822f1b..f9e1b01 100644 --- a/src/widgetcheck.c +++ b/src/widgetcheck.c @@ -104,6 +104,10 @@ gchar { ret = g_strdup ("TRUE"); } + else if (gtk_toggle_button_get_inconsistent (GTK_TOGGLE_BUTTON (w))) + { + ret = g_strdup (""); + } return ret; } @@ -197,7 +201,9 @@ static gboolean check_value (const gchar *value) { gchar *str_value; - gboolean active = FALSE; + gboolean active; + + active = FALSE; str_value = g_strstrip (g_strdup (value));