[maemo-commits] [maemo-commits] r10017 - in projects/haf/branches/hildon-libs/hildon-1: . doc src
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Mon Feb 19 15:12:14 EET 2007
- Previous message: [maemo-commits] r10016 - in projects/haf/trunk/hildon-theme-layout-4: . rc
- Next message: [maemo-commits] r10018 - in projects/haf/trunk/hildon-theme-layout-4: . rc
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: mdk Date: 2007-02-19 15:12:13 +0200 (Mon, 19 Feb 2007) New Revision: 10017 Removed: projects/haf/branches/hildon-libs/hildon-1/src/hildon-input-mode-hint.h Modified: projects/haf/branches/hildon-libs/hildon-1/ChangeLog.2 projects/haf/branches/hildon-libs/hildon-1/doc/hildon.types projects/haf/branches/hildon-libs/hildon-1/src/Makefile.am projects/haf/branches/hildon-libs/hildon-1/src/hildon-date-editor.c projects/haf/branches/hildon-libs/hildon-1/src/hildon-get-password-dialog.c projects/haf/branches/hildon-libs/hildon-1/src/hildon-number-editor.c projects/haf/branches/hildon-libs/hildon-1/src/hildon-range-editor.c projects/haf/branches/hildon-libs/hildon-1/src/hildon-time-editor.c projects/haf/branches/hildon-libs/hildon-1/src/hildon.h Log: Removing all the duplicated and deprecated input-mode enums. They're now defined in gtkenums.h. Modified: projects/haf/branches/hildon-libs/hildon-1/ChangeLog.2 =================================================================== --- projects/haf/branches/hildon-libs/hildon-1/ChangeLog.2 2007-02-19 12:47:11 UTC (rev 10016) +++ projects/haf/branches/hildon-libs/hildon-1/ChangeLog.2 2007-02-19 13:12:13 UTC (rev 10017) @@ -1,3 +1,18 @@ +2007-02-19 Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com> + + * doc/hildon.types: + * src/Makefile.am: + * src/hildon-input-mode-hint.h: Removing this file. + Now all the input-method related things are declared in gtkenums.h. + + * src/hildon-number-editor.c: + * src/hildon-range-editor.c: + * src/hildon-time-editor.c: + * src/hildon.h: + * src/hildon-date-editor.c: + * src/hildon-get-password-dialog.c: Use the input-mode enums defined + in gtkenums.h + 2007-02-16 Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com> * debian/changelog: Modified: projects/haf/branches/hildon-libs/hildon-1/doc/hildon.types =================================================================== --- projects/haf/branches/hildon-libs/hildon-1/doc/hildon.types 2007-02-19 12:47:11 UTC (rev 10016) +++ projects/haf/branches/hildon-libs/hildon-1/doc/hildon.types 2007-02-19 13:12:13 UTC (rev 10017) @@ -14,7 +14,6 @@ #include <src/hildon-font-selection-dialog.h> #include <src/hildon-get-password-dialog.h> #include <src/hildon-hvolumebar.h> -#include <src/hildon-input-mode-hint.h> #include <src/hildon-login-dialog.h> #include <src/hildon-marshalers.h> #include <src/hildon-note.h> Modified: projects/haf/branches/hildon-libs/hildon-1/src/Makefile.am =================================================================== --- projects/haf/branches/hildon-libs/hildon-1/src/Makefile.am 2007-02-19 12:47:11 UTC (rev 10016) +++ projects/haf/branches/hildon-libs/hildon-1/src/Makefile.am 2007-02-19 13:12:13 UTC (rev 10017) @@ -75,7 +75,6 @@ hildon-font-selection-dialog.h \ hildon-get-password-dialog.h \ hildon-hvolumebar.h \ - hildon-input-mode-hint.h \ hildon-login-dialog.h \ hildon-marshalers.h \ hildon-note.h \ Modified: projects/haf/branches/hildon-libs/hildon-1/src/hildon-date-editor.c =================================================================== --- projects/haf/branches/hildon-libs/hildon-1/src/hildon-date-editor.c 2007-02-19 12:47:11 UTC (rev 10016) +++ projects/haf/branches/hildon-libs/hildon-1/src/hildon-date-editor.c 2007-02-19 13:12:13 UTC (rev 10017) @@ -52,6 +52,7 @@ #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> @@ -59,7 +60,6 @@ #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" @@ -450,11 +450,11 @@ priv->y_entry = gtk_entry_new (); g_object_set (G_OBJECT(priv->d_entry), "input-mode", - HILDON_INPUT_MODE_HINT_NUMERIC, NULL); + HILDON_GTK_INPUT_MODE_NUMERIC, NULL); g_object_set (G_OBJECT(priv->m_entry), "input-mode", - HILDON_INPUT_MODE_HINT_NUMERIC, NULL); + HILDON_GTK_INPUT_MODE_NUMERIC, NULL); g_object_set (G_OBJECT(priv->y_entry), "input-mode", - HILDON_INPUT_MODE_HINT_NUMERIC, NULL); + HILDON_GTK_INPUT_MODE_NUMERIC, NULL); /* set entry look */ gtk_entry_set_width_chars (GTK_ENTRY (priv->d_entry), DAY_ENTRY_WIDTH); Modified: projects/haf/branches/hildon-libs/hildon-1/src/hildon-get-password-dialog.c =================================================================== --- projects/haf/branches/hildon-libs/hildon-1/src/hildon-get-password-dialog.c 2007-02-19 12:47:11 UTC (rev 10016) +++ projects/haf/branches/hildon-libs/hildon-1/src/hildon-get-password-dialog.c 2007-02-19 13:12:13 UTC (rev 10017) @@ -79,7 +79,6 @@ #include <unistd.h> #include <stdio.h> #include <gtk/gtk.h> -#include "hildon-input-mode-hint.h" #include "hildon-caption.h" #include "hildon-banner.h" #include <libintl.h> @@ -174,8 +173,8 @@ g_object_set(G_OBJECT (gtk_bin_get_child GTK_BIN ((priv->password_entry))), "input-mode", (g_value_get_boolean (value) - ? HILDON_INPUT_MODE_HINT_NUMERIC - : HILDON_INPUT_MODE_HINT_ALPHANUMERICSPECIAL), + ? HILDON_GTK_INPUT_MODE_NUMERIC + : HILDON_GTK_INPUT_MODE_FULL), NULL); break; @@ -231,7 +230,7 @@ g_object_get (G_OBJECT (gtk_bin_get_child (GTK_BIN (priv->password_entry))), "input-mode", &input_mode, NULL); g_value_set_boolean (value, - (input_mode == HILDON_INPUT_MODE_HINT_NUMERIC)); + (input_mode == HILDON_GTK_INPUT_MODE_NUMERIC)); break; case PROP_CAPTION_LABEL: Deleted: projects/haf/branches/hildon-libs/hildon-1/src/hildon-input-mode-hint.h =================================================================== --- projects/haf/branches/hildon-libs/hildon-1/src/hildon-input-mode-hint.h 2007-02-19 12:47:11 UTC (rev 10016) +++ projects/haf/branches/hildon-libs/hildon-1/src/hildon-input-mode-hint.h 2007-02-19 13:12:13 UTC (rev 10017) @@ -1,75 +0,0 @@ -/* - * This file is a part of hildon - * - * Copyright (C) 2005, 2006 Nokia Corporation, all rights reserved. - * - * Contact: Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com> - * - * 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. - * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA - * - */ - -#ifndef __HILDON_INPUT_MODE_HINT_H__ -#define __HILDON_INPUT_MODE_HINT_H__ - -G_BEGIN_DECLS - -/* Hildon wrapper for setting the input mode in a GtkEntry - * Usage: g_object_set(G_OBJECT(entry), HILDON_INPUT_MODE_HINT, HILDON_INPUT_MODE_HINT_HEXA, NULL); - */ -#define HILDON_INPUT_MODE_HINT "input-mode" - -/* Hildon wrapper for setting the autocapitalization in text widgets. - * Usage: g_object_set(G_OBJECT(entry), HILDON_AUTOCAP, FALSE, NULL); - */ -#define HILDON_AUTOCAP "autocap" - -/** - * HildonInputModeHint: - * @HILDON_INPUT_MODE_HINT_ALPHANUMERICSPECIAL: accept all characters. - * @HILDON_INPUT_MODE_HINT_NUMERIC: accept only NUMERIC characters. - * @HILDON_INPUT_MODE_HINT_ALPHA: accept only ALPHA characters - * @HILDON_INPUT_MODE_HINT_NUMERICSPECIAL: accept only NUMERIC and SPECIAL - * @HILDON_INPUT_MODE_HINT_ALPHASPECIAL: accept only ALPHA and SPECIAL - * @HILDON_INPUT_MODE_HINT_ALPHANUMERIC: accept only ALPHA and NUMERIC - * @HILDON_INPUT_MODE_HINT_HEXA: accept only HEXA - * @HILDON_INPUT_MODE_HINT_HEXASPECIAL: accept only HEXA and SPECIAL - * @HILDON_INPUT_MODE_HINT_TELE: accept only TELEPHONE - * @HILDON_INPUT_MODE_HINT_TELESPECIAL: accept only TELEPHONE and SPECIAL - * - * Keys to set the mode in a GtkEntry widget into ALPHANUMERIC or NUMERIC mode. - * Note that this is only a hint; it only shows VKB with specified layout. - * Use it by calling 'g_object_set(G_OBJECT(entry), "input-mode", HILDON_INPUT_MODE_HINT_NUMERIC, NULL);'. - * This should not be used to as the only method of verifying user input. - */ -typedef enum -{ - HILDON_INPUT_MODE_HINT_ALPHANUMERICSPECIAL = 0, - HILDON_INPUT_MODE_HINT_NUMERIC, - HILDON_INPUT_MODE_HINT_ALPHA, - HILDON_INPUT_MODE_HINT_NUMERICSPECIAL, - HILDON_INPUT_MODE_HINT_ALPHASPECIAL, - HILDON_INPUT_MODE_HINT_ALPHANUMERIC, - HILDON_INPUT_MODE_HINT_HEXA, - HILDON_INPUT_MODE_HINT_HEXASPECIAL, - HILDON_INPUT_MODE_HINT_TELE, - HILDON_INPUT_MODE_HINT_TELESPECIAL - -} HildonInputModeHint; - -G_END_DECLS - -#endif /* __HILDON_INPUT_MODE_HINT_H__ */ Modified: projects/haf/branches/hildon-libs/hildon-1/src/hildon-number-editor.c =================================================================== --- projects/haf/branches/hildon-libs/hildon-1/src/hildon-number-editor.c 2007-02-19 12:47:11 UTC (rev 10016) +++ projects/haf/branches/hildon-libs/hildon-1/src/hildon-number-editor.c 2007-02-19 13:12:13 UTC (rev 10017) @@ -51,7 +51,6 @@ #include <stdlib.h> #include "hildon-marshalers.h" #include "hildon-private.h" -#include "hildon-input-mode-hint.h" #include "hildon-defines.h" #include "hildon-enum-types.h" #include "hildon-banner.h" @@ -408,7 +407,7 @@ editor); g_object_set (G_OBJECT (priv->num_entry), - "input-mode", HILDON_INPUT_MODE_HINT_NUMERIC, NULL); + "input-mode", HILDON_GTK_INPUT_MODE_NUMERIC, NULL); gtk_widget_show (priv->num_entry); gtk_widget_show (priv->minus); Modified: projects/haf/branches/hildon-libs/hildon-1/src/hildon-range-editor.c =================================================================== --- projects/haf/branches/hildon-libs/hildon-1/src/hildon-range-editor.c 2007-02-19 12:47:11 UTC (rev 10016) +++ projects/haf/branches/hildon-libs/hildon-1/src/hildon-range-editor.c 2007-02-19 13:12:13 UTC (rev 10017) @@ -52,7 +52,6 @@ #include <glib/gprintf.h> #include <string.h> #include <stdlib.h> -#include "hildon-input-mode-hint.h" #include "hildon-banner.h" #include <libintl.h> #include "hildon-range-editor-private.h" @@ -330,10 +329,10 @@ G_CALLBACK (hildon_range_editor_entry_changed), editor); g_object_set (G_OBJECT (priv->start_entry), - "input-mode", HILDON_INPUT_MODE_HINT_NUMERIC, NULL); + "input-mode", HILDON_GTK_INPUT_MODE_NUMERIC, NULL); g_object_set( G_OBJECT (priv->end_entry), - "input-mode", HILDON_INPUT_MODE_HINT_NUMERIC, NULL); + "input-mode", HILDON_GTK_INPUT_MODE_NUMERIC, NULL); gtk_widget_show (priv->start_entry); gtk_widget_show (priv->end_entry); Modified: projects/haf/branches/hildon-libs/hildon-1/src/hildon-time-editor.c =================================================================== --- projects/haf/branches/hildon-libs/hildon-1/src/hildon-time-editor.c 2007-02-19 12:47:11 UTC (rev 10016) +++ projects/haf/branches/hildon-libs/hildon-1/src/hildon-time-editor.c 2007-02-19 13:12:13 UTC (rev 10017) @@ -61,6 +61,7 @@ #include <gtk/gtklabel.h> #include <gtk/gtkframe.h> #include <gdk/gdkkeysyms.h> +#include <gtk/gtkenums.h> #include <string.h> #include <time.h> #include <stdlib.h> @@ -69,7 +70,6 @@ #include "hildon-defines.h" #include "hildon-time-picker.h" #include "hildon-banner.h" -#include "hildon-input-mode-hint.h" #include "hildon-private.h" #include "hildon-marshalers.h" #include "hildon-enum-types.h" @@ -533,7 +533,7 @@ gtk_entry_set_has_frame (GTK_ENTRY (priv->entries[i]), FALSE); /* Set the entries to accept only numeric characters */ - g_object_set (priv->entries[i], "input-mode", HILDON_INPUT_MODE_HINT_NUMERIC, NULL); + g_object_set (priv->entries[i], "input-mode", HILDON_GTK_INPUT_MODE_NUMERIC, NULL); /* The entry fields all take exactly two characters */ gtk_entry_set_max_length (GTK_ENTRY (priv->entries[i]), 2); Modified: projects/haf/branches/hildon-libs/hildon-1/src/hildon.h =================================================================== --- projects/haf/branches/hildon-libs/hildon-1/src/hildon.h 2007-02-19 12:47:11 UTC (rev 10016) +++ projects/haf/branches/hildon-libs/hildon-1/src/hildon.h 2007-02-19 13:12:13 UTC (rev 10017) @@ -41,7 +41,6 @@ #include "hildon-font-selection-dialog.h" #include "hildon-get-password-dialog.h" #include "hildon-hvolumebar.h" -#include "hildon-input-mode-hint.h" #include "hildon-login-dialog.h" #include "hildon-marshalers.h" #include "hildon-note.h"
- Previous message: [maemo-commits] r10016 - in projects/haf/trunk/hildon-theme-layout-4: . rc
- Next message: [maemo-commits] r10018 - in projects/haf/trunk/hildon-theme-layout-4: . rc
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]