* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; version 2.1 of
- * the License.
+ * the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
#include "hildon-date-editor.h"
#include <glib.h>
#include <gtk/gtk.h>
+#include <gtk/gtkenums.h>
#include <gdk/gdkkeysyms.h>
#include <time.h>
#include <stdlib.h>
#include <string.h>
#include "hildon-calendar-popup.h"
#include "hildon-defines.h"
-#include "hildon-input-mode-hint.h"
#include "hildon-private.h"
#include "hildon-marshalers.h"
#include "hildon-enum-types.h"
#define DEFAULT_MIN_YEAR 1970
-#define DEFAULT_MAX_YEAR 3000
+#define DEFAULT_MAX_YEAR 2037
static GtkContainerClass* parent_class;
static void
hildon_date_editor_size_request (GtkWidget *widget,
GtkRequisition *requisition);
-
+static gboolean
+hildon_date_editor_focus (GtkWidget *widget,
+ GtkDirectionType direction);
static gboolean
hildon_date_editor_entry_select_all (GtkWidget *widget);
gobject_class->get_property = hildon_date_editor_get_property;
widget_class->size_request = hildon_date_editor_size_request;
widget_class->size_allocate = hildon_date_editor_size_allocate;
- widget_class->focus = hildon_private_composite_focus;
+ widget_class->focus = hildon_date_editor_focus;
container_class->forall = hildon_child_forall;
GTK_OBJECT_CLASS(editor_class)->destroy = hildon_date_editor_destroy;
g_param_spec_uint ("year",
"Current year",
"Current year",
- 1, 2100,
- 2005,
+ 1, 10000,
+ 2007,
G_PARAM_READABLE | G_PARAM_WRITABLE));
/**
g_param_spec_uint ("min-year",
"Minimum valid year",
"Minimum valid year",
- 1, 3000,
+ 1, 10000,
DEFAULT_MIN_YEAR,
G_PARAM_READWRITE));
g_param_spec_uint ("max-year",
"Maximum valid year",
"Maximum valid year",
- 1, 3000,
+ 1, 10000,
DEFAULT_MAX_YEAR,
G_PARAM_READWRITE));
}
priv->m_entry = gtk_entry_new ();
priv->y_entry = gtk_entry_new ();
- g_object_set (G_OBJECT(priv->d_entry), "input-mode",
- HILDON_INPUT_MODE_HINT_NUMERIC, NULL);
- g_object_set (G_OBJECT(priv->m_entry), "input-mode",
- HILDON_INPUT_MODE_HINT_NUMERIC, NULL);
- g_object_set (G_OBJECT(priv->y_entry), "input-mode",
- HILDON_INPUT_MODE_HINT_NUMERIC, NULL);
+#ifdef MAEMO_GTK
+ g_object_set (G_OBJECT(priv->d_entry), "hildon-input-mode",
+ HILDON_GTK_INPUT_MODE_NUMERIC, NULL);
+ g_object_set (G_OBJECT(priv->m_entry), "hildon-input-mode",
+ HILDON_GTK_INPUT_MODE_NUMERIC, NULL);
+ g_object_set (G_OBJECT(priv->y_entry), "hildon-input-mode",
+ HILDON_GTK_INPUT_MODE_NUMERIC, NULL);
+#endif
/* set entry look */
gtk_entry_set_width_chars (GTK_ENTRY (priv->d_entry), DAY_ENTRY_WIDTH);
case PROP_MIN_YEAR:
val = g_value_get_uint (value);
- g_return_if_fail (val > priv->max_year);
priv->min_year = val;
/* Clamp current year */
if (hildon_date_editor_get_year (editor) < priv->min_year)
case PROP_MAX_YEAR:
val = g_value_get_uint (value);
- g_return_if_fail (val < priv->min_year);
priv->max_year = val;
/* Clamp current year */
if (hildon_date_editor_get_year (editor) > priv->max_year)
{
GtkEntry *entry;
gint error_code;
+
HildonDateEditorPrivate *priv;
+ priv = HILDON_DATE_EDITOR_GET_PRIVATE (HILDON_DATE_EDITOR (data));
g_assert (GTK_IS_ENTRY (ed));
g_assert (HILDON_IS_DATE_EDITOR (data));
+ g_assert (priv);
entry = GTK_ENTRY (ed);
error_code = hildon_date_editor_entry_validate (GTK_WIDGET (entry), data);
if (error_code == HILDON_DATE_TIME_ERROR_NO_ERROR)
{
- priv = HILDON_DATE_EDITOR_GET_PRIVATE (HILDON_DATE_EDITOR (data));
- g_assert (priv);
priv->skip_validation = TRUE;
gtk_widget_child_focus (GTK_WIDGET (data), GTK_DIR_RIGHT);
}
+ } else {
+ priv->skip_validation = FALSE;
}
}
{
HildonDateEditor *ed;
HildonDateEditorPrivate *priv;
- gint pos;
- gboolean r;
g_assert (HILDON_IS_DATE_EDITOR (data));
g_assert (GTK_IS_ENTRY (widget));
ed = HILDON_DATE_EDITOR (data);
- priv = HILDON_DATE_EDITOR_GET_PRIVATE (ed);
- pos = gtk_editable_get_position (GTK_EDITABLE (widget));
- g_assert (priv);
-
- /* Show error message in case the key pressed is not allowed
- (only digits and control characters are allowed )*/
- if (!g_unichar_isdigit (event->keyval) && ! (event->keyval & 0xF000)) {
- g_signal_emit (ed, date_editor_signals[DATE_ERROR], 0, HILDON_DATE_TIME_ERROR_INVALID_CHAR, &r);
- return TRUE;
- }
switch (event->keyval) {
- case GDK_Left:
- if (pos == 0) {
- (void) gtk_widget_child_focus (GTK_WIDGET (data), GTK_DIR_LEFT);
- return TRUE;
- }
- break;
-
- case GDK_Right:
- if (pos >= g_utf8_strlen (gtk_entry_get_text (GTK_ENTRY (widget)), -1)) {
- (void) gtk_widget_child_focus (GTK_WIDGET (data), GTK_DIR_RIGHT);
- return TRUE;
- }
- break;
case GDK_Return:
case GDK_ISO_Enter:
/* Ignore return value, since we want to handle event at all times.
otherwise vkb would popup when the keyrepeat starts. */
- (void) hildon_date_editor_set_calendar_icon_state (ed, TRUE);
+ hildon_date_editor_set_calendar_icon_state (ed, TRUE);
return TRUE;
-
case GDK_Escape:
+ priv = HILDON_DATE_EDITOR_GET_PRIVATE (ed);
priv->skip_validation = TRUE;
break;
default:
}
}
+static gboolean
+hildon_date_editor_focus (GtkWidget *widget,
+ GtkDirectionType direction)
+{
+ gboolean retval;
+ GtkDirectionType effective_direction;
+
+ g_assert (HILDON_IS_DATE_EDITOR (widget));
+
+ retval = hildon_private_composite_focus (widget, direction, &effective_direction);
+
+ if (retval == TRUE)
+ return GTK_WIDGET_CLASS (parent_class)->focus (widget, effective_direction);
+ else
+ return FALSE;
+}
+
/**
* hildon_date_editor_set_year:
* @editor: the @HildonDateEditor widget
projects / hildon / blobdiff