Mailing List Archive

Author: femorandeira
Date: 2009-09-04 13:33:44 +0300 (Fri, 04 Sep 2009)
New Revision: 19290

Modified:
projects/haf/trunk/hildon-input-method-plugins-example/AUTHORS
projects/haf/trunk/hildon-input-method-plugins-example/src/hildon-im-example-fkb.c
Log:
remove trailing spaces and useless comments
added myself to AUTHORS

Modified: projects/haf/trunk/hildon-input-method-plugins-example/AUTHORS
===================================================================
--- projects/haf/trunk/hildon-input-method-plugins-example/AUTHORS 2009-09-03 16:11:24 UTC (rev 19289)
+++ projects/haf/trunk/hildon-input-method-plugins-example/AUTHORS 2009-09-04 10:33:44 UTC (rev 19290)
@@ -1,2 +1,3 @@
Mohammad Anwari <mohammad.anwari@nokia.com>
Tomas Junnonen <tomas.junnonen@nokia.com>
+Felipe Erias Morandeira <femorandeira@igalia.com>

Modified: projects/haf/trunk/hildon-input-method-plugins-example/src/hildon-im-example-fkb.c
===================================================================
--- projects/haf/trunk/hildon-input-method-plugins-example/src/hildon-im-example-fkb.c 2009-09-03 16:11:24 UTC (rev 19289)
+++ projects/haf/trunk/hildon-input-method-plugins-example/src/hildon-im-example-fkb.c 2009-09-04 10:33:44 UTC (rev 19290)
@@ -21,41 +21,34 @@

/* ***** LAYOUTS ***** */

-/* I don't know why this doesn't work:
-static const gchar* keyboard_layout[][] = {{"q", "w", "e", "r", "t", "y", "u", "i", "o", "p", NULL},
- {"a", "s", "d", "f", "g", "h", "j", "k", "l", NULL},
- {"z", "x", "c", "v", "b", "n", "m", NULL},
- NULL};
-*/
-
static const gchar* alpha_lower_1[] = {"q", "w", "e", "r", "t", "y", "u", "i", "o", "p", NULL};
static const gchar* alpha_lower_2[] = {"a", "s", "d", "f", "g", "h", "j", "k", "l", ":", NULL};
static const gchar* alpha_lower_3[] = {"z", "x", "c", "v", "b", "n", "m", ".", ",", ";", NULL};
/* static const gchar* layout_4[] = {"↑", "1*?", " ", "Return", "←", "Close", NULL}; */
static const gchar** alpha_lower[] = {alpha_lower_1,
alpha_lower_2,
- alpha_lower_3, NULL};
+ alpha_lower_3, NULL};

static const gchar* alpha_upper_1[] = {"Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", NULL};
static const gchar* alpha_upper_2[] = {"A", "S", "D", "F", "G", "H", "J", "K", "L", "'", NULL};
static const gchar* alpha_upper_3[] = {"Z", "X", "C", "V", "B", "N", "M", "?", "!", "_", NULL};
static const gchar** alpha_upper[] = {alpha_upper_1,
alpha_upper_2,
- alpha_upper_3, NULL};
+ alpha_upper_3, NULL};

static const gchar* special_lower_1[] = {"1", "2", "3", "4", "5", "6", "7", "8", "9", "0", NULL};
static const gchar* special_lower_2[] = {"á", "é", "í", "ó", "ú", "ñ", "ç", "æ", "ß", "\"", NULL};
static const gchar* special_lower_3[] = {"+", "-", "*", "/", "\\", "%", "#", "=", "¿", "¡", NULL};
static const gchar** special_lower[] = {special_lower_1,
special_lower_2,
- special_lower_3, NULL};
+ special_lower_3, NULL};

static const gchar* special_upper_1[] = {"1", "2", "3", "4", "5", "6", "7", "8", "9", "0", NULL};
static const gchar* special_upper_2[] = {"Á", "É", "Í", "Ó", "Ú", "Ñ", "Ç", "Æ", "_", "£", NULL};
static const gchar* special_upper_3[] = {"(", ")", "[", "]", "{", "}", "<", ">", "€", "$", NULL};
static const gchar** special_upper[] = {special_upper_1,
special_upper_2,
- special_upper_3, NULL};
+ special_upper_3, NULL};


typedef struct
@@ -67,7 +60,7 @@
typedef struct
{
GtkContainer parent;
-
+
}
HildonIMExampleFKB;

@@ -76,17 +69,17 @@
HildonIMUI *ui;
GtkWidget *window;
GtkWidget *text_view;
-
+
gint saved_offset;
-
+
GtkWidget *vbox;
GtkWidget *keyboard_nbook;
-
+
gint alpha_lower;
gint alpha_upper;
gint special_lower;
gint special_upper;
-
+
GtkWidget *shift_button;
GtkWidget *symbols_button;
GtkWidget *space_button;
@@ -103,7 +96,7 @@
GType hildon_im_example_fkb_get_type (void);
GtkWidget *hildon_im_example_fkb_new (HildonIMUI *kbd);

-/*
+/*
* HildonIMPlugin interface
*/

@@ -118,7 +111,7 @@
static void hildon_im_example_fkb_settings_changed (HildonIMPlugin *plugin,
const gchar *key,
const GConfValue *value);
-static void hildon_im_example_fkb_language_settings_changed (HildonIMPlugin *plugin,
+static void hildon_im_example_fkb_language_settings_changed (HildonIMPlugin *plugin,
gint index);
static void hildon_im_example_fkb_input_mode_changed (HildonIMPlugin *plugin);
static void hildon_im_example_fkb_keyboard_state_changed (HildonIMPlugin *plugin);
@@ -177,7 +170,7 @@
* Module functions
*/

-HildonIMPlugin*
+HildonIMPlugin*
module_create (HildonIMUI *keyboard)
{
return HILDON_IM_PLUGIN (hildon_im_example_fkb_new (keyboard));
@@ -215,7 +208,7 @@
GTK_TYPE_CONTAINER, "HildonIMExampleFKB",
&type_info,
0);
-
+
g_type_module_add_interface(module,
HILDON_IM_EXAMPLE_FKB_TYPE,
HILDON_IM_TYPE_PLUGIN,
@@ -253,7 +246,7 @@
* This function returns the list of available languages supported
* by the plugin.
*/
-gchar **
+gchar **
hildon_im_plugin_get_available_languages (gboolean *free)
{
static gchar *list[] = { "en_GB", NULL };
@@ -283,7 +276,7 @@
iface->input_mode_changed = hildon_im_example_fkb_input_mode_changed;
iface->keyboard_state_changed = hildon_im_example_fkb_keyboard_state_changed;
iface->client_widget_changed = hildon_im_example_fkb_client_widget_changed;
-
+
iface->character_autocase = hildon_im_example_fkb_character_autocase;
iface->clear = hildon_im_example_fkb_clear;
iface->save_data = hildon_im_example_fkb_save_data;
@@ -321,11 +314,11 @@
object_class->set_property = hildon_im_example_fkb_set_property;
object_class->get_property = hildon_im_example_fkb_get_property;
object_class->finalize = hildon_im_example_fkb_finalize;
-
+
/* install properties and signals as needed */
-
+
g_object_class_install_property(object_class, HILDON_IM_PROP_UI,
- g_param_spec_object (HILDON_IM_PROP_UI_DESCRIPTION,
+ g_param_spec_object (HILDON_IM_PROP_UI_DESCRIPTION,
HILDON_IM_PROP_UI_DESCRIPTION,
"UI that uses plugin",
HILDON_IM_TYPE_UI,
@@ -340,11 +333,11 @@

g_return_if_fail (HILDON_IS_IM_EXAMPLE_FKB (self));
priv = HILDON_IM_EXAMPLE_FKB_GET_PRIVATE(self);
-
+
priv->window = NULL;
}

-static void
+static void
hildon_im_example_fkb_finalize(GObject *obj)
{
if (G_OBJECT_CLASS(parent_class)->finalize)
@@ -415,9 +408,9 @@
g_return_if_fail (HILDON_IS_IM_EXAMPLE_FKB (plugin));
self = HILDON_IM_EXAMPLE_FKB(plugin);
priv = HILDON_IM_EXAMPLE_FKB_GET_PRIVATE(self);
-
+
window_is_new = (priv->window == NULL);
-
+
if (window_is_new)
{
priv->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@@ -427,20 +420,20 @@
gtk_window_set_decorated(GTK_WINDOW(priv->window), FALSE);
/*
we don't really support this...
- hildon_gtk_window_set_portrait_flags (GTK_WINDOW(priv->window),
+ hildon_gtk_window_set_portrait_flags (GTK_WINDOW(priv->window),
HILDON_PORTRAIT_MODE_SUPPORT);
*/
-
+
priv->saved_offset = 0;
hildon_im_ui_send_communication_message(priv->ui,
HILDON_IM_CONTEXT_REQUEST_SURROUNDING_FULL);
-
+
gtk_window_fullscreen(GTK_WINDOW(priv->window));
gtk_widget_show_all(priv->window);

gdk_window_set_transient_for(GTK_WIDGET(priv->window)->window,
gtk_widget_get_root_window(GTK_WIDGET(priv->window)));
-
+
if (window_is_new)
{
populate_window(self);
@@ -483,7 +476,7 @@
gtk_text_buffer_set_text(buffer, surrounding, -1);
gtk_text_buffer_get_iter_at_offset(buffer, &cursor_iter, offset);
gtk_text_buffer_place_cursor(buffer, &cursor_iter);
-
+
priv->saved_offset = offset;
}

@@ -495,7 +488,7 @@
GtkTextBuffer *buffer;
GtkTextIter iter;
gint offset;
-
+
g_return_val_if_fail (HILDON_IS_IM_EXAMPLE_FKB (data), FALSE);
self = HILDON_IM_EXAMPLE_FKB(data);
priv = HILDON_IM_EXAMPLE_FKB_GET_PRIVATE(self);
@@ -513,7 +506,7 @@
offset - priv->saved_offset);
priv->saved_offset = offset;
}
-
+
return FALSE;
}

@@ -533,7 +526,7 @@
text = hildon_button_get_title(HILDON_BUTTON(button));
gtk_text_buffer_insert_at_cursor(gtk_text_view_get_buffer(GTK_TEXT_VIEW(priv->text_view)),
text, strlen(text));
-
+
if (hildon_im_ui_get_commit_mode(priv->ui) == HILDON_IM_COMMIT_REDIRECT)
{
hildon_im_ui_send_utf8(priv->ui, text);
@@ -551,7 +544,7 @@

if (!widget || !data)
return;
-
+
container = (GtkContainer*)data;
gtk_container_remove (container, widget);
}
@@ -579,7 +572,7 @@
/*
GtkWidget *menu = hildon_gtk_menu_new();
gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_menu_item_new_with_label("á"));
- gtk_widget_tap_and_hold_setup(button, menu, NULL, 0);
+ gtk_widget_tap_and_hold_setup(button, menu, NULL, 0);
gtk_widget_tap_and_hold_menu_position_top ?
gtk_widget_show_all (menu);
*/
@@ -602,11 +595,11 @@
g_return_if_fail (HILDON_IS_IM_EXAMPLE_FKB (user_data));
self = HILDON_IM_EXAMPLE_FKB(user_data);
priv = HILDON_IM_EXAMPLE_FKB_GET_PRIVATE(self);
-
+
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(priv->text_view));
gtk_text_buffer_get_iter_at_mark(buffer, &iter, gtk_text_buffer_get_insert(buffer));
gtk_text_buffer_backspace (buffer, &iter, TRUE, TRUE);
-
+
if (hildon_im_ui_get_commit_mode(priv->ui) == HILDON_IM_COMMIT_REDIRECT)
{
hildon_im_ui_send_communication_message(priv->ui,
@@ -628,10 +621,10 @@
g_return_if_fail (HILDON_IS_IM_EXAMPLE_FKB (user_data));
self = HILDON_IM_EXAMPLE_FKB(user_data);
priv = HILDON_IM_EXAMPLE_FKB_GET_PRIVATE(self);
-
+
gtk_text_buffer_insert_at_cursor(gtk_text_view_get_buffer(GTK_TEXT_VIEW(priv->text_view)),
"\n", 1);
-
+
if (hildon_im_ui_get_commit_mode(priv->ui) == HILDON_IM_COMMIT_REDIRECT)
{
hildon_im_ui_send_utf8(priv->ui, "\n");
@@ -647,11 +640,11 @@
{
HildonIMExampleFKB *self;
HildonIMExampleFKBPrivate *priv;
-
+
g_return_if_fail (HILDON_IS_IM_EXAMPLE_FKB (user_data));
self = HILDON_IM_EXAMPLE_FKB(user_data);
priv = HILDON_IM_EXAMPLE_FKB_GET_PRIVATE(self);
-
+
hildon_im_ui_restore_previous_mode(priv->ui);
}

@@ -661,14 +654,14 @@
{
HildonIMExampleFKB *self;
HildonIMExampleFKBPrivate *priv;
-
+
/* TODO implement this with a Notebook without tabs
* toggling the selectors just changes the tab that is being shown */

g_return_if_fail (HILDON_IS_IM_EXAMPLE_FKB (user_data));
self = HILDON_IM_EXAMPLE_FKB(user_data);
priv = HILDON_IM_EXAMPLE_FKB_GET_PRIVATE(self);
-
+
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->symbols_button)))
{
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->shift_button)))
@@ -705,29 +698,29 @@
gint screen_width = gdk_screen_width();

priv = HILDON_IM_EXAMPLE_FKB_GET_PRIVATE(self);
-
+
priv->vbox = gtk_vbox_new(FALSE, 5);
-
+
priv->text_view = hildon_text_view_new();
gtk_widget_set_name(priv->text_view, "him-textview");
gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(priv->text_view), GTK_WRAP_WORD_CHAR);
gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(priv->text_view), TRUE);
gtk_widget_set_name(priv->text_view, "him-textview");
-
+
g_signal_connect_after(G_OBJECT(priv->text_view), "button-press-event",
G_CALLBACK(textview_button_release_cb), self);
-
+
parea = hildon_pannable_area_new();
g_object_set(G_OBJECT(parea), "mov_mode", HILDON_MOVEMENT_MODE_VERT, NULL);
hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA(parea), priv->text_view);
-
+
gtk_box_pack_start(GTK_BOX(priv->vbox), parea, TRUE, TRUE, 0);
-
+
/* now we create the different layouts and place them in a notebook */
-
+
priv->keyboard_nbook = gtk_notebook_new();
g_object_set (G_OBJECT(priv->keyboard_nbook), "show-tabs", FALSE, NULL);
-
+
priv->alpha_lower =
gtk_notebook_append_page(GTK_NOTEBOOK(priv->keyboard_nbook),
get_keyboard_layout(self, alpha_lower), NULL);
@@ -737,19 +730,19 @@
priv->special_lower =
gtk_notebook_append_page(GTK_NOTEBOOK(priv->keyboard_nbook),
get_keyboard_layout(self, special_lower), NULL);
- priv->special_upper =
+ priv->special_upper =
gtk_notebook_append_page(GTK_NOTEBOOK(priv->keyboard_nbook),
get_keyboard_layout(self, special_upper), NULL);

gtk_notebook_set_current_page(GTK_NOTEBOOK(priv->keyboard_nbook),
priv->alpha_lower);
-
+
gtk_box_pack_start(GTK_BOX(priv->vbox), priv->keyboard_nbook, FALSE, FALSE, 0);

hbox = gtk_hbox_new(FALSE, 0);

/* Close button */
-
+
priv->close_button = hildon_button_new(HILDON_SIZE_FINGER_HEIGHT,
HILDON_BUTTON_ARRANGEMENT_VERTICAL);
hildon_button_set_image(HILDON_BUTTON(priv->close_button),
@@ -758,9 +751,9 @@
gtk_widget_set_size_request(priv->close_button, screen_width*0.1, 70);
gtk_box_pack_start(GTK_BOX(hbox), priv->close_button, FALSE, FALSE, 0);
g_signal_connect(priv->close_button, "clicked", G_CALLBACK(close_fkb), self);
-
+
/* Shift button */
-
+
priv->shift_button = hildon_gtk_toggle_button_new(HILDON_SIZE_FINGER_HEIGHT);
gtk_button_set_label(GTK_BUTTON(priv->shift_button), "↑");
gtk_widget_set_size_request(priv->shift_button, screen_width*0.15, 70);
@@ -769,7 +762,7 @@
G_CALLBACK(shift_symbols_buttons_toggled), self);

/* Symbols button */
-
+
priv->symbols_button = hildon_gtk_toggle_button_new (HILDON_SIZE_FINGER_HEIGHT);
gtk_button_set_label(GTK_BUTTON(priv->symbols_button), "1*?");
gtk_widget_set_size_request(priv->symbols_button, screen_width*0.15, 70);
@@ -778,7 +771,7 @@
G_CALLBACK(shift_symbols_buttons_toggled), self);

/* Space button */
-
+
priv->space_button = hildon_button_new_with_text (HILDON_SIZE_FINGER_HEIGHT,
HILDON_BUTTON_ARRANGEMENT_VERTICAL,
" ", NULL);
@@ -786,7 +779,7 @@
g_signal_connect(priv->space_button, "pressed", G_CALLBACK(text_button_clicked), self);

/* Return button */
-
+
priv->return_button = hildon_button_new(HILDON_SIZE_FINGER_HEIGHT,
HILDON_BUTTON_ARRANGEMENT_VERTICAL);
hildon_button_set_image(HILDON_BUTTON(priv->return_button),
@@ -797,7 +790,7 @@
g_signal_connect(priv->return_button, "pressed", G_CALLBACK(return_button_clicked), self);

/* Delete button */
-
+
priv->delete_button = hildon_button_new(HILDON_SIZE_FINGER_HEIGHT,
HILDON_BUTTON_ARRANGEMENT_VERTICAL);
hildon_button_set_image(HILDON_BUTTON(priv->delete_button),
@@ -807,8 +800,8 @@
gtk_widget_set_size_request(priv->delete_button, screen_width*0.15, 70);
gtk_box_pack_start(GTK_BOX(hbox), priv->delete_button, FALSE, FALSE, 0);
g_signal_connect(priv->delete_button, "clicked", G_CALLBACK(delete_button_clicked), self);
-
+
gtk_box_pack_start(GTK_BOX(priv->vbox), hbox, FALSE, FALSE, 0);
-
+
gtk_container_add (GTK_CONTAINER(priv->window), priv->vbox);
}

_______________________________________________
maemo-commits mailing list
maemo-commits@maemo.org
https://lists.maemo.org/mailman/listinfo/maemo-commits