X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-accounts-window.c;h=345ee437e15abd137cb1c61b797a81a80b189aa2;hb=65672fc46aa168a161d33f78325245e1ea4f2611;hp=b05e8dcc7e94d3378833e2b179cff2bd43475f5a;hpb=8ef67be83b1b65ad112585d7e1ecefd8beb46b69;p=modest

diff --git a/src/hildon2/modest-accounts-window.c b/src/hildon2/modest-accounts-window.c
index b05e8dc..345ee43 100644
--- a/src/hildon2/modest-accounts-window.c
+++ b/src/hildon2/modest-accounts-window.c
@@ -83,6 +83,9 @@ static void on_row_deleted (GtkTreeModel *tree_model,
 			    GtkTreePath  *path,
 			    gpointer      user_data);
 static void row_count_changed (ModestAccountsWindow *self);
+static gboolean on_key_press(GtkWidget *widget,
+				GdkEventKey *event,
+				gpointer user_data);
 
 typedef struct _ModestAccountsWindowPrivate ModestAccountsWindowPrivate;
 struct _ModestAccountsWindowPrivate {
@@ -236,6 +239,10 @@ connect_signals (ModestAccountsWindow *self)
 
 	/* we don't register this in sighandlers, as it should be run
 	 * after disconnecting all signals, in destroy stage */
+
+
+	g_signal_connect(G_OBJECT(self), "key-press-event",
+			G_CALLBACK(on_key_press), self);
 }
 
 static ModestWindow *
@@ -259,7 +266,7 @@ modest_accounts_window_new_real (void)
 
 	box_alignment = gtk_alignment_new (0, 0, 1.0, 1.0);
 	gtk_alignment_set_padding (GTK_ALIGNMENT (box_alignment), 
-				   0, 0,
+				   HILDON_MARGIN_HALF, 0,
 				   HILDON_MARGIN_DOUBLE, HILDON_MARGIN_DOUBLE);
 	priv->box = gtk_vbox_new (FALSE, 0);
 
@@ -292,7 +299,8 @@ modest_accounts_window_new_real (void)
 				  G_CALLBACK (on_queue_changed),
 				  self);
 
-	priv->new_message_button = hildon_button_new (0, HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
+	priv->new_message_button = hildon_button_new (MODEST_EDITABLE_SIZE,
+						      HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
 
 	hildon_button_set_title (HILDON_BUTTON (priv->new_message_button), _("mcen_ti_new_message"));
 	hildon_button_set_image (HILDON_BUTTON (priv->new_message_button), gtk_image_new_from_pixbuf (new_message_pixbuf));
@@ -373,6 +381,8 @@ modest_accounts_window_new (void)
 
 	row_count_changed (MODEST_ACCOUNTS_WINDOW (self));
 
+	gtk_window_set_title (GTK_WINDOW (self), _("mcen_ap_name"));
+
 	return self;
 }
 
@@ -398,7 +408,12 @@ setup_menu (ModestAccountsWindow *self)
 	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_account"), NULL, 
 					   APP_MENU_CALLBACK (modest_ui_actions_on_new_account), 
 					   NULL);
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_edit_accounts"), NULL,
+	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self),
+					   dngettext(GETTEXT_PACKAGE,
+						     "mcen_me_edit_account",
+						     "mcen_me_edit_accounts",
+						     2),
+					   NULL,
 					   APP_MENU_CALLBACK (modest_ui_actions_on_accounts), 
 					   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_edit_accounts));
 	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_globalsmtpservers"), NULL,
@@ -660,3 +675,31 @@ modest_accounts_window_pre_create (void)
 		pre_created_accounts_window = GTK_WIDGET (modest_accounts_window_new_real ());
 	}
 }
+
+
+static gboolean
+on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
+{
+	ModestAccountsWindowPrivate *priv;
+	HildonPannableArea *pannable;
+
+	if (event->type == GDK_KEY_RELEASE)
+		return FALSE;
+
+	priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE(user_data);
+
+	pannable = HILDON_PANNABLE_AREA (priv->pannable);
+
+	switch (event->keyval) {
+
+	case GDK_Up:
+		modest_maemo_utils_scroll_pannable(pannable, 0, -1);
+		break;
+
+	case GDK_Down:
+		modest_maemo_utils_scroll_pannable(pannable, 0, 1);
+		break;
+	}
+
+	return FALSE;
+}