Made possibile to hide/show date part.

diff --git a/glade/gtkdateentry.xml b/glade/gtkdateentry.xml
index 035c1ed98636c2dfeae4a288170c0a1115d3c790..9fe7c0f805a84ef3825827ad426cdcf1fb35de3e 100644 (file)
--- a/glade/gtkdateentry.xml
+++ b/glade/gtkdateentry.xml
@@ -9,6 +9,7 @@
                                <property name="Format" id="format" />
                                <property name="Editable only from calendar" id="editable-from-calendar" />
                                <property name="Calendar's button visible" id="calendar-button-visible" />
+                               <property name="Date part visible" id="date-visible" />
                                <property name="Time part visible" id="time-visible" />
                                <property name="Seconds in time part visible" id="time-with-seconds" />
                        </properties>

diff --git a/src/gtkdateentry.c b/src/gtkdateentry.c
index 38300d4bd8ef831f6e0ca8251ee1213f1957b4e8..f8ff95d441d3998500b58bd76d9ccd1cb1fa67af 100644 (file)
--- a/src/gtkdateentry.c
+++ b/src/gtkdateentry.c
@@ -47,6 +47,7 @@ enum
        PROP_FORMAT,
        PROP_EDITABLE_WITH_CALENDAR,
        PROP_CALENDAR_BUTTON_VISIBLE,
+       PROP_DATE_VISIBLE,
        PROP_TIME_VISIBLE,
        PROP_TIME_WITH_SECONDS
 };
@@ -116,6 +117,7 @@ struct _GtkDateEntryPrivate
                gchar *format;
                gboolean editable_with_calendar;
 
+               gboolean date_is_visible;
                gboolean time_is_visible;
                gboolean time_with_seconds;
        };
@@ -176,6 +178,13 @@ gtk_date_entry_class_init (GtkDateEntryClass *klass)
                                                               TRUE,
                                                               G_PARAM_READWRITE));
 
+       g_object_class_install_property (object_class, PROP_DATE_VISIBLE,
+                                        g_param_spec_boolean ("date-visible",
+                                                              "TRUE to show the date part",
+                                                              "Determines if the date part of the widget is visible or not.",
+                                                              TRUE,
+                                                              G_PARAM_READWRITE));
+
        g_object_class_install_property (object_class, PROP_TIME_VISIBLE,
                                         g_param_spec_boolean ("time-visible",
                                                               "TRUE to show the time part",
@@ -247,6 +256,7 @@ gtk_date_entry_init (GtkDateEntry *date)
        g_signal_connect (G_OBJECT (priv->calendar), "day-selected-double-click",
                          G_CALLBACK (calendar_on_day_selected_double_click), (gpointer)date);
 
+       priv->date_is_visible = TRUE;
        priv->time_is_visible = TRUE;
        priv->time_with_seconds = TRUE;
 
@@ -686,7 +696,7 @@ const gchar
 struct tm
 *gtk_date_entry_get_tm (GtkDateEntry *date)
 {
-       struct tm tm;
+       struct tm *tm;
 
        const GDate *gdate;
        GtkDateEntryPrivate *priv;
@@ -695,20 +705,22 @@ struct tm
 
        priv = GTK_DATE_ENTRY_GET_PRIVATE (date);
 
+       tm = g_malloc0 (sizeof (struct tm));
+
        gdate = gtk_date_entry_get_gdate (date);
 
        if (gdate == NULL) return NULL;
 
-       g_date_to_struct_tm (gdate, &tm);
+       g_date_to_struct_tm (gdate, tm);
 
-       if (gtk_widget_get_visible (priv->spnHours))
+       if (priv->time_is_visible)
                {
-                       tm.tm_hour = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (priv->spnHours));
-                       tm.tm_min = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (priv->spnMinutes));
-                       tm.tm_sec = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (priv->spnSeconds));
+                       tm->tm_hour = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (priv->spnHours));
+                       tm->tm_min = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (priv->spnMinutes));
+                       tm->tm_sec = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (priv->spnSeconds));
                }
 
-       return (struct tm *)g_memdup ((gconstpointer)&tm, sizeof (struct tm));
+       return tm;
 }
 
 /**
@@ -1164,6 +1176,53 @@ gtk_date_entry_set_calendar_button_visible (GtkDateEntry *date,
                }
 }
 
+/**
+ * gtk_date_entry_set_date_visible:
+ * @date: a #GtkDateEntry.
+ * @is_visible: TRUE if the date must be visible.
+ * 
+ * Determines if the date is visible or not.
+ */
+void
+gtk_date_entry_set_date_visible (GtkDateEntry *date,
+                                 gboolean is_visible)
+{
+       g_return_if_fail (GTK_IS_DATE_ENTRY (date));
+
+       GtkDateEntryPrivate *priv = GTK_DATE_ENTRY_GET_PRIVATE (date);
+
+       priv->date_is_visible = is_visible;
+
+       gtk_date_entry_set_calendar_button_visible (date, priv->date_is_visible);
+
+       if (priv->date_is_visible)
+               {
+                       gtk_widget_show (priv->day);
+               }
+       else
+               {
+                       gtk_widget_hide (priv->day);
+
+                       gtk_date_entry_set_date_gdatetime (date, NULL);
+               }
+}
+
+/**
+ * gtk_date_entry_is_date_visible:
+ * @date: a #GtkDateEntry.
+ * 
+ * Returns: #TRUE or #FALSE if date part is visible or not.
+ */
+gboolean
+gtk_date_entry_is_date_visible (GtkDateEntry *date)
+{
+       g_return_if_fail (GTK_IS_DATE_ENTRY (date));
+
+       GtkDateEntryPrivate *priv = GTK_DATE_ENTRY_GET_PRIVATE (date);
+
+       return priv->date_is_visible;
+}
+
 /**
  * gtk_date_entry_set_time_visible:
  * @date: a #GtkDateEntry.
@@ -1455,6 +1514,10 @@ gtk_date_entry_set_property (GObject *object, guint property_id, const GValue *v
                                gtk_date_entry_set_calendar_button_visible (date_entry, g_value_get_boolean (value));
                                break;
 
+                       case PROP_DATE_VISIBLE:
+                               gtk_date_entry_set_date_visible (date_entry, g_value_get_boolean (value));
+                               break;
+
                        case PROP_TIME_VISIBLE:
                                gtk_date_entry_set_time_visible (date_entry, g_value_get_boolean (value));
                                break;
@@ -1498,6 +1561,10 @@ gtk_date_entry_get_property (GObject *object, guint property_id, GValue *value,
                                g_value_set_boolean (value, gtk_widget_get_visible (priv->btnCalendar));
                                break;
 
+                       case PROP_DATE_VISIBLE:
+                               g_value_set_boolean (value, priv->date_is_visible);
+                               break;
+
                        case PROP_TIME_VISIBLE:
                                g_value_set_boolean (value, priv->time_is_visible);
                                break;

diff --git a/src/gtkdateentry.h b/src/gtkdateentry.h
index 8bf020dc3ec3cb9d9ccbbbe80c55fd5ccdd82d0b..0e05474d5f85d6230cd5f878f4b2fc568780f693 100644 (file)
--- a/src/gtkdateentry.h
+++ b/src/gtkdateentry.h
@@ -98,6 +98,10 @@ void gtk_date_entry_set_editable_with_calendar (GtkDateEntry *date,
 void gtk_date_entry_set_calendar_button_visible (GtkDateEntry *date,
                                                  gboolean is_visible);
 
+void gtk_date_entry_set_date_visible (GtkDateEntry *date,
+                                      gboolean is_visible);
+gboolean gtk_date_entry_is_date_visible (GtkDateEntry *date);
+
 void gtk_date_entry_set_time_visible (GtkDateEntry *date,
                                       gboolean is_visible);
 gboolean gtk_date_entry_is_time_visible (GtkDateEntry *date);