Bugfix and Glade catalog for GtkFormDecoder.

diff --git a/ui/glade/gtkformui.xml b/ui/glade/gtkformui.xml
index 48be43e44714549054f0e8322ca6c362de679115..9ef08299a4a8b07d8e64589ff55b75f813784b54 100644 (file)
--- a/ui/glade/gtkformui.xml
+++ b/ui/glade/gtkformui.xml
@@ -4,6 +4,9 @@
        <glade-widget-classes>
                <glade-widget-class name="GtkFormDecoder" generic-name="gtkformdecoder" title="Decoder">
                        <properties>
+                               <property name="GdaEx object" id="gdaex" visible="False" />
+                               <property name="Sql statement" id="sql" />
+                               <property name="Show clean icon" id="show-btn-clean" />
                        </properties>
                </glade-widget-class>
        </glade-widget-classes>

diff --git a/ui/glade/icons/hicolor/16x16/actions/widget-gtkformui-gtkformdecoder.png b/ui/glade/icons/hicolor/16x16/actions/widget-gtkformui-gtkformdecoder.png
index ec4e622ff3796a561a8957ebd06a1316d06ec333..9796233187884bf4dd8cfdaf861354ff82c914eb 100644 (file)
Binary files a/ui/glade/icons/hicolor/16x16/actions/widget-gtkformui-gtkformdecoder.png and b/ui/glade/icons/hicolor/16x16/actions/widget-gtkformui-gtkformdecoder.png differ

diff --git a/ui/glade/icons/hicolor/22x22/actions/widget-gtkformui-gtkformdecoder.png b/ui/glade/icons/hicolor/22x22/actions/widget-gtkformui-gtkformdecoder.png
index 7945a480a7529fb6580223bcd7defdaf05c85976..d26591a1272a6d6d15b44e5d466960572cbc59c7 100644 (file)
Binary files a/ui/glade/icons/hicolor/22x22/actions/widget-gtkformui-gtkformdecoder.png and b/ui/glade/icons/hicolor/22x22/actions/widget-gtkformui-gtkformdecoder.png differ

diff --git a/ui/gtkformdecoder.c b/ui/gtkformdecoder.c
index b279bda8ba5d33119616917c01bbf2d6ead32165..cc6f02864cd4b7f2b9d3d081775a19a199c6024a 100644 (file)
--- a/ui/gtkformdecoder.c
+++ b/ui/gtkformdecoder.c
@@ -314,9 +314,9 @@ gtk_form_decoder_show_btn_clean (GtkFormDecoder *decoder, gboolean visible)
 {
        GtkFormDecoderPrivate *priv = GTK_FORM_DECODER_GET_PRIVATE (decoder);
 
-       gtk_entry_set_icon_from_stock (GTK_ENTRY (priv->txt_decoded), GTK_ENTRY_ICON_SECONDARY, "gtk-clear");
-       gtk_entry_set_icon_activatable (GTK_ENTRY (priv->txt_decoded), GTK_ENTRY_ICON_SECONDARY, TRUE);
-       gtk_entry_set_icon_sensitive (GTK_ENTRY (priv->txt_decoded), GTK_ENTRY_ICON_SECONDARY, TRUE);
+       gtk_entry_set_icon_from_stock (GTK_ENTRY (priv->txt_decoded), GTK_ENTRY_ICON_SECONDARY, visible ? "gtk-clear" : NULL);
+       gtk_entry_set_icon_activatable (GTK_ENTRY (priv->txt_decoded), GTK_ENTRY_ICON_SECONDARY, visible);
+       gtk_entry_set_icon_sensitive (GTK_ENTRY (priv->txt_decoded), GTK_ENTRY_ICON_SECONDARY, visible);
 }
 
 /* CALLBACKS */