[maemo-commits] [maemo-commits] r18621 - in projects/haf/trunk/gtk+: . gtk
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Fri Jun 5 13:25:23 EEST 2009
- Previous message: [maemo-commits] r18620 - in projects/haf/trunk/gtk+: . gtk
- Next message: [maemo-commits] r18622 - projects/haf/trunk/ke-recv/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: kris Date: 2009-06-05 13:25:17 +0300 (Fri, 05 Jun 2009) New Revision: 18621 Modified: projects/haf/trunk/gtk+/ChangeLog projects/haf/trunk/gtk+/gtk/gtk.symbols projects/haf/trunk/gtk+/gtk/gtkentry.c projects/haf/trunk/gtk+/gtk/gtkentry.h projects/haf/trunk/gtk+/gtk/gtkimcontext.c projects/haf/trunk/gtk+/gtk/gtktextview.c projects/haf/trunk/gtk+/gtk/gtktextview.h Log: 2009-06-05 Kristian Rietveld <kris at lanedo.com> Addresses: NB#106177 - No API to enable alphanumeric input mode with numeric mode as default * gtk/gtkimcontext.c: add new hildon-input-default property. * gtk/gtktextview.[ch]: add hildon-input-default propery, plus accessor functions. * gtk/gtkentry.[ch]: likewise. * gtk/gtk.symbols: add new symbols. Modified: projects/haf/trunk/gtk+/ChangeLog =================================================================== --- projects/haf/trunk/gtk+/ChangeLog 2009-06-05 07:32:08 UTC (rev 18620) +++ projects/haf/trunk/gtk+/ChangeLog 2009-06-05 10:25:17 UTC (rev 18621) @@ -1,3 +1,17 @@ +2009-06-05 Kristian Rietveld <kris at lanedo.com> + + Addresses: NB#106177 - No API to enable alphanumeric input mode + with numeric mode as default + + * gtk/gtkimcontext.c: add new hildon-input-default property. + + * gtk/gtktextview.[ch]: add hildon-input-default propery, plus + accessor functions. + + * gtk/gtkentry.[ch]: likewise. + + * gtk/gtk.symbols: add new symbols. + 2009-06-05 Michael Natterer <mitch at lanedo.com> Fixes: NB#110433 - First menu item should not be automatically Modified: projects/haf/trunk/gtk+/gtk/gtk.symbols =================================================================== --- projects/haf/trunk/gtk+/gtk/gtk.symbols 2009-06-05 07:32:08 UTC (rev 18620) +++ projects/haf/trunk/gtk+/gtk/gtk.symbols 2009-06-05 10:25:17 UTC (rev 18621) @@ -1308,7 +1308,9 @@ gtk_entry_set_cursor_hadjustment gtk_entry_get_cursor_hadjustment #ifdef MAEMO_CHANGES +hildon_gtk_entry_get_input_default hildon_gtk_entry_get_input_mode +hildon_gtk_entry_set_input_default hildon_gtk_entry_set_input_mode #endif #endif @@ -4076,7 +4078,9 @@ gtk_text_view_starts_display_line gtk_text_view_window_to_buffer_coords #ifdef MAEMO_CHANGES +hildon_gtk_text_view_get_input_default hildon_gtk_text_view_get_input_mode +hildon_gtk_text_view_set_input_default hildon_gtk_text_view_set_input_mode #endif #endif Modified: projects/haf/trunk/gtk+/gtk/gtkentry.c =================================================================== --- projects/haf/trunk/gtk+/gtk/gtkentry.c 2009-06-05 07:32:08 UTC (rev 18620) +++ projects/haf/trunk/gtk+/gtk/gtkentry.c 2009-06-05 10:25:17 UTC (rev 18621) @@ -151,6 +151,7 @@ PROP_PROGRESS_PULSE_STEP #ifdef MAEMO_CHANGES , PROP_HILDON_INPUT_MODE + , PROP_HILDON_INPUT_DEFAULT #endif /* MAEMO_CHANGES */ }; @@ -748,6 +749,25 @@ HILDON_GTK_INPUT_MODE_AUTOCAP | HILDON_GTK_INPUT_MODE_DICTIONARY, GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + + /** + * GtkEntry:hildon-input-default: + * + * Default input mode for this IM context. See #HildonGtkInputMode. + * The default setting for this property is %HILDON_GTK_INPUT_MODE_FULL, + * which means that the default input mode to be used is up to the + * implementation of the IM context. + * + * Since: maemo 5 + **/ + g_object_class_install_property (gobject_class, + PROP_HILDON_INPUT_DEFAULT, + g_param_spec_flags ("hildon-input-default", + P_("Hildon input default"), + P_("Define widget's default input mode"), + HILDON_TYPE_GTK_INPUT_MODE, + HILDON_GTK_INPUT_MODE_FULL, + GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT)); #endif /* MAEMO_CHANGES */ signals[POPULATE_POPUP] = @@ -1214,6 +1234,10 @@ case PROP_HILDON_INPUT_MODE: hildon_gtk_entry_set_input_mode (entry, g_value_get_flags (value)); break; + + case PROP_HILDON_INPUT_DEFAULT: + hildon_gtk_entry_set_input_default (entry, g_value_get_flags (value)); + break; #endif /* MAEMO_CHANGES */ case PROP_SCROLL_OFFSET: @@ -1296,6 +1320,10 @@ case PROP_HILDON_INPUT_MODE: g_value_set_flags (value, hildon_gtk_entry_get_input_mode (entry)); break; + + case PROP_HILDON_INPUT_DEFAULT: + g_value_set_flags (value, hildon_gtk_entry_get_input_default (entry)); + break; #endif /* MAEMO_CHANGES */ default: @@ -7092,6 +7120,51 @@ return mode; } +/** + * hildon_gtk_entry_set_input_default: + * @entry: a #GtkEntry + * @mode: a #HildonGtkInputMode + * + * Sets the default input mode of the widget. + * + * Since: maemo 5 + */ +void +hildon_gtk_entry_set_input_default (GtkEntry *entry, + HildonGtkInputMode mode) +{ + g_return_if_fail (GTK_IS_ENTRY (entry)); + + if (hildon_gtk_entry_get_input_default (entry) != mode) + { + g_object_set (G_OBJECT (entry->im_context), + "hildon-input-default", mode, NULL); + g_object_notify (G_OBJECT (entry), "hildon-input-default"); + } +} + +/** + * hildon_gtk_entry_get_input_default: + * @entry: a #GtkEntry + * + * Gets the default input mode of the widget. + * + * Return value: the default input mode of the widget. + * + * Since: maemo 5 + */ +HildonGtkInputMode +hildon_gtk_entry_get_input_default (GtkEntry *entry) +{ + HildonGtkInputMode mode; + + g_return_val_if_fail (GTK_IS_ENTRY (entry), FALSE); + + g_object_get (G_OBJECT (entry->im_context), + "hildon-input-default", &mode, NULL); + + return mode; +} #endif /* MAEMO_CHANGES */ #define __GTK_ENTRY_C__ Modified: projects/haf/trunk/gtk+/gtk/gtkentry.h =================================================================== --- projects/haf/trunk/gtk+/gtk/gtkentry.h 2009-06-05 07:32:08 UTC (rev 18620) +++ projects/haf/trunk/gtk+/gtk/gtkentry.h 2009-06-05 10:25:17 UTC (rev 18621) @@ -252,6 +252,10 @@ void hildon_gtk_entry_set_input_mode (GtkEntry *entry, HildonGtkInputMode input_mode); HildonGtkInputMode hildon_gtk_entry_get_input_mode (GtkEntry *entry); + +void hildon_gtk_entry_set_input_default (GtkEntry *entry, + HildonGtkInputMode input_mode); +HildonGtkInputMode hildon_gtk_entry_get_input_default (GtkEntry *entry); #endif /* MAEMO_CHANGES */ G_END_DECLS Modified: projects/haf/trunk/gtk+/gtk/gtkimcontext.c =================================================================== --- projects/haf/trunk/gtk+/gtk/gtkimcontext.c 2009-06-05 07:32:08 UTC (rev 18620) +++ projects/haf/trunk/gtk+/gtk/gtkimcontext.c 2009-06-05 10:25:17 UTC (rev 18621) @@ -33,7 +33,8 @@ GTK_TYPE_IM_CONTEXT, GtkIMContextPrivate)) enum { - PROP_HILDON_INPUT_MODE = 1 + PROP_HILDON_INPUT_MODE = 1, + PROP_HILDON_INPUT_DEFAULT }; #endif /* MAEMO_CHANGES */ @@ -54,6 +55,7 @@ #ifdef MAEMO_CHANGES struct _GtkIMContextPrivate { HildonGtkInputMode mode; + HildonGtkInputMode default_mode; }; #endif /* MAEMO_CHANGES */ @@ -226,6 +228,25 @@ HILDON_GTK_INPUT_MODE_AUTOCAP | HILDON_GTK_INPUT_MODE_DICTIONARY, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + + /** + * GtkIMContext:hildon-input-default: + * + * Default input mode for this IM context. See #HildonGtkInputMode. + * The default setting for this property is %HILDON_GTK_INPUT_MODE_FULL, + * which means that the default input mode to be used is up to the + * implementation of the IM context. + * + * Since: maemo 5 + **/ + g_object_class_install_property (gobject_class, + PROP_HILDON_INPUT_DEFAULT, + g_param_spec_flags ("hildon-input-default", + "Hildon input default", + "Default input mode", + HILDON_TYPE_GTK_INPUT_MODE, + HILDON_GTK_INPUT_MODE_FULL, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); #endif /* MAEMO_CHANGES */ } @@ -248,6 +269,9 @@ case PROP_HILDON_INPUT_MODE: priv->mode = g_value_get_flags (value); break; + case PROP_HILDON_INPUT_DEFAULT: + priv->default_mode = g_value_get_flags (value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -267,6 +291,9 @@ case PROP_HILDON_INPUT_MODE: g_value_set_flags (value, priv->mode); break; + case PROP_HILDON_INPUT_DEFAULT: + g_value_set_flags (value, priv->default_mode); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; Modified: projects/haf/trunk/gtk+/gtk/gtktextview.c =================================================================== --- projects/haf/trunk/gtk+/gtk/gtktextview.c 2009-06-05 07:32:08 UTC (rev 18620) +++ projects/haf/trunk/gtk+/gtk/gtktextview.c 2009-06-05 10:25:17 UTC (rev 18621) @@ -159,6 +159,7 @@ PROP_ACCEPTS_TAB #ifdef MAEMO_CHANGES , PROP_HILDON_INPUT_MODE + , PROP_HILDON_INPUT_DEFAULT #endif /* MAEMO_CHANGES */ }; @@ -690,6 +691,25 @@ HILDON_GTK_INPUT_MODE_AUTOCAP | HILDON_GTK_INPUT_MODE_DICTIONARY, GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + + /** + * GtkTextView:hildon-input-default: + * + * Default input mode for this IM context. See #HildonGtkInputMode. + * The default setting for this property is %HILDON_GTK_INPUT_MODE_FULL, + * which means that the default input mode to be used is up to the + * implementation of the IM context. + * + * Since: maemo 5 + **/ + g_object_class_install_property (gobject_class, + PROP_HILDON_INPUT_DEFAULT, + g_param_spec_flags ("hildon-input-default", + P_("Hildon input default"), + P_("Define widget's default input mode"), + HILDON_TYPE_GTK_INPUT_MODE, + HILDON_GTK_INPUT_MODE_FULL, + GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT)); #endif /* MAEMO_CHANGES */ /* @@ -2961,6 +2981,10 @@ case PROP_HILDON_INPUT_MODE: hildon_gtk_text_view_set_input_mode (text_view, g_value_get_flags (value)); break; + + case PROP_HILDON_INPUT_DEFAULT: + hildon_gtk_text_view_set_input_default (text_view, g_value_get_flags (value)); + break; #endif /* MAEMO_CHANGES */ default: @@ -3041,6 +3065,10 @@ case PROP_HILDON_INPUT_MODE: g_value_set_flags (value, hildon_gtk_text_view_get_input_mode (text_view)); break; + + case PROP_HILDON_INPUT_DEFAULT: + g_value_set_flags (value, hildon_gtk_text_view_get_input_default (text_view)); + break; #endif /* MAEMO_CHANGES */ default: @@ -9268,6 +9296,52 @@ return mode; } +/** + * hildon_gtk_text_view_set_input_default: + * @text_view: a #GtkTextView + * @mode: a #HildonGtkInputMode + * + * Sets the default input mode of the widget. + * + * Since: maemo 5 + */ +void +hildon_gtk_text_view_set_input_default (GtkTextView *text_view, + HildonGtkInputMode mode) +{ + g_return_if_fail (GTK_IS_TEXT_VIEW (text_view)); + + if (hildon_gtk_text_view_get_input_default (text_view) != mode) + { + g_object_set (G_OBJECT (text_view->im_context), + "hildon-input-default", mode, NULL); + g_object_notify (G_OBJECT (text_view), "hildon-input-default"); + } +} + +/** + * hildon_gtk_text_view_get_input_default: + * @text_view: a #GtkTextView + * + * Gets the default input mode of the widget. + * + * Return value: the default input mode of the widget. + * + * Since: maemo 5 + */ +HildonGtkInputMode +hildon_gtk_text_view_get_input_default (GtkTextView *text_view) +{ + HildonGtkInputMode mode; + + g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), FALSE); + + g_object_get (G_OBJECT (text_view->im_context), + "hildon-input-default", &mode, NULL); + + return mode; +} + #endif /* MAEMO_CHANGES */ #define __GTK_TEXT_VIEW_C__ Modified: projects/haf/trunk/gtk+/gtk/gtktextview.h =================================================================== --- projects/haf/trunk/gtk+/gtk/gtktextview.h 2009-06-05 07:32:08 UTC (rev 18620) +++ projects/haf/trunk/gtk+/gtk/gtktextview.h 2009-06-05 10:25:17 UTC (rev 18621) @@ -368,6 +368,10 @@ void hildon_gtk_text_view_set_input_mode (GtkTextView *text_view, HildonGtkInputMode mode); HildonGtkInputMode hildon_gtk_text_view_get_input_mode (GtkTextView *text_view); + +void hildon_gtk_text_view_set_input_default (GtkTextView *text_view, + HildonGtkInputMode mode); +HildonGtkInputMode hildon_gtk_text_view_get_input_default (GtkTextView *text_view); #endif /* MAEMO_CHANGES */ G_END_DECLS
- Previous message: [maemo-commits] r18620 - in projects/haf/trunk/gtk+: . gtk
- Next message: [maemo-commits] r18622 - projects/haf/trunk/ke-recv/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]