X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-accounts-window.c;h=06e1d1ab841ef871f85ca94afd5ccf1361461b64;hb=f7a19b4d2155c3f769d00f95553da7ba5ea136e9;hp=bf9c4825d122170d8e67b6144f4db6c70c415a02;hpb=b04a0f0e32210d22b404bc75c6408f939f26aea5;p=modest diff --git a/src/hildon2/modest-accounts-window.c b/src/hildon2/modest-accounts-window.c index bf9c482..06e1d1a 100644 --- a/src/hildon2/modest-accounts-window.c +++ b/src/hildon2/modest-accounts-window.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -46,6 +47,9 @@ #include #include #include +#include +#include +#include /* 'private'/'protected' functions */ @@ -79,8 +83,10 @@ static void row_count_changed (ModestAccountsWindow *self); typedef struct _ModestAccountsWindowPrivate ModestAccountsWindowPrivate; struct _ModestAccountsWindowPrivate { + GtkWidget *box; + GtkWidget *pannable; GtkWidget *account_view; - GtkWidget *no_accounts_label; + GtkWidget *no_accounts_container; GtkWidget *new_message_button; /* signals */ @@ -228,45 +234,71 @@ modest_accounts_window_new (void) ModestAccountsWindowPrivate *priv = NULL; HildonProgram *app; GdkPixbuf *window_icon; - GtkWidget *pannable; - GtkWidget *box; GdkPixbuf *new_message_pixbuf; GtkWidget *action_area_box; + guint accel_key; + GdkModifierType accel_mods; + GtkAccelGroup *accel_group; + GtkWidget *no_accounts_label; + GtkWidget *empty_view_new_message_button; + GtkWidget *box_alignment; self = MODEST_ACCOUNTS_WINDOW(g_object_new(MODEST_TYPE_ACCOUNTS_WINDOW, NULL)); priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE(self); - box = gtk_vbox_new (FALSE, 0); + new_message_pixbuf = modest_platform_get_icon ("general_add", MODEST_ICON_SIZE_BIG); + + box_alignment = gtk_alignment_new (0, 0, 1.0, 1.0); + gtk_alignment_set_padding (GTK_ALIGNMENT (box_alignment), + 0, 0, + HILDON_MARGIN_DOUBLE, HILDON_MARGIN_DOUBLE); + priv->box = gtk_vbox_new (FALSE, 0); + + no_accounts_label = gtk_label_new (_("mcen_ia_noaccounts")); + + gtk_misc_set_alignment (GTK_MISC (no_accounts_label), 0.5, 0.5); + hildon_helper_set_logical_font (no_accounts_label, "LargeSystemFont"); + + empty_view_new_message_button = hildon_button_new (MODEST_EDITABLE_SIZE, HILDON_BUTTON_ARRANGEMENT_HORIZONTAL); + hildon_button_set_title (HILDON_BUTTON (empty_view_new_message_button), _("mcen_ti_new_message")); + hildon_button_set_image (HILDON_BUTTON (empty_view_new_message_button), gtk_image_new_from_pixbuf (new_message_pixbuf)); - priv->no_accounts_label = gtk_label_new (_("mcen_ia_noaccounts")); - gtk_misc_set_alignment (GTK_MISC (priv->no_accounts_label), 0.5, 0.0); - gtk_box_pack_start (GTK_BOX (box), priv->no_accounts_label, TRUE, TRUE, 0); - pannable = hildon_pannable_area_new (); + priv->no_accounts_container = gtk_vbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (priv->no_accounts_container), empty_view_new_message_button, FALSE, FALSE, 0); + gtk_widget_show_all (empty_view_new_message_button); + gtk_box_pack_end (GTK_BOX (priv->no_accounts_container), no_accounts_label, TRUE, TRUE, 0); + gtk_widget_show (no_accounts_label); + gtk_box_pack_start (GTK_BOX (priv->box), priv->no_accounts_container, TRUE, TRUE, 0); + + g_signal_connect (G_OBJECT (empty_view_new_message_button), + "clicked", + G_CALLBACK (modest_ui_actions_on_new_msg), self); + + priv->pannable = hildon_pannable_area_new (); priv->account_view = GTK_WIDGET (modest_account_view_new (modest_runtime_get_account_mgr ())); action_area_box = hildon_tree_view_get_action_area_box (GTK_TREE_VIEW (priv->account_view)); priv->new_message_button = hildon_button_new (0, HILDON_BUTTON_ARRANGEMENT_HORIZONTAL); hildon_button_set_title (HILDON_BUTTON (priv->new_message_button), _("mcen_ti_new_message")); - new_message_pixbuf = modest_platform_get_icon ("general_add", MODEST_ICON_SIZE_BIG); hildon_button_set_image (HILDON_BUTTON (priv->new_message_button), gtk_image_new_from_pixbuf (new_message_pixbuf)); - g_object_unref (new_message_pixbuf); gtk_box_pack_start (GTK_BOX (action_area_box), priv->new_message_button, TRUE, TRUE, 0); gtk_widget_show_all (priv->new_message_button); hildon_tree_view_set_action_area_visible (GTK_TREE_VIEW (priv->account_view), TRUE); - + g_object_unref (new_message_pixbuf); setup_menu (self); - gtk_container_add (GTK_CONTAINER (pannable), priv->account_view); - gtk_box_pack_start (GTK_BOX (box), pannable, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (self), box); + gtk_container_add (GTK_CONTAINER (priv->pannable), priv->account_view); + gtk_box_pack_start (GTK_BOX (priv->box), priv->pannable, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (box_alignment), priv->box); + gtk_container_add (GTK_CONTAINER (self), box_alignment); - gtk_widget_show (priv->account_view); - gtk_widget_show (pannable); - gtk_widget_show (box); + gtk_widget_show (priv->pannable); + gtk_widget_show (priv->box); + gtk_widget_show (box_alignment); connect_signals (MODEST_ACCOUNTS_WINDOW (self)); @@ -300,6 +332,11 @@ modest_accounts_window_new (void) row_count_changed (self); + accel_group = gtk_accel_group_new (); + gtk_accelerator_parse ("n", &accel_key, &accel_mods); + gtk_widget_add_accelerator (priv->new_message_button, "clicked", accel_group, + accel_key, accel_mods, 0); + gtk_window_add_accel_group (GTK_WINDOW (self), accel_group); return MODEST_WINDOW(self); } @@ -340,9 +377,6 @@ setup_menu (ModestAccountsWindow *self) modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_options"), NULL, APP_MENU_CALLBACK (modest_ui_actions_on_settings), NULL); - modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_message"), "n", - APP_MENU_CALLBACK (modest_ui_actions_on_new_msg), - MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_new_msg)); } @@ -354,8 +388,10 @@ on_account_activated (GtkTreeView *account_view, { ModestAccountsWindowPrivate *priv; gchar* account_name; - GtkWidget *folder_window; + GtkWidget *new_window; gboolean registered; + ModestProtocolType store_protocol; + gboolean mailboxes_protocol; priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE (self); @@ -363,17 +399,32 @@ on_account_activated (GtkTreeView *account_view, if (!account_name) return; - folder_window = GTK_WIDGET (modest_folder_window_new (NULL)); + /* If it's a multimailbox container, we have to show the mailboxes window */ + store_protocol = modest_account_mgr_get_store_protocol (modest_runtime_get_account_mgr (), + account_name); + mailboxes_protocol = + modest_protocol_registry_protocol_type_has_tag (modest_runtime_get_protocol_registry (), + store_protocol, + MODEST_PROTOCOL_REGISTRY_MULTI_MAILBOX_PROVIDER_PROTOCOLS); + if (mailboxes_protocol) { + new_window = GTK_WIDGET (modest_mailboxes_window_new (account_name)); + } else { + + new_window = GTK_WIDGET (modest_folder_window_new (NULL)); + } + registered = modest_window_mgr_register_window (modest_runtime_get_window_mgr (), - MODEST_WINDOW (folder_window), + MODEST_WINDOW (new_window), MODEST_WINDOW (self)); if (!registered) { - gtk_widget_destroy (folder_window); - folder_window = NULL; + gtk_widget_destroy (new_window); + new_window = NULL; } else { - modest_folder_window_set_account (MODEST_FOLDER_WINDOW (folder_window), account_name); - gtk_widget_show (folder_window); + if (!mailboxes_protocol) { + modest_folder_window_set_account (MODEST_FOLDER_WINDOW (new_window), account_name); + } + gtk_widget_show (new_window); } g_free (account_name); } @@ -450,9 +501,13 @@ static void row_count_changed (ModestAccountsWindow *self) if (count == 0) { gtk_widget_hide (priv->account_view); - gtk_widget_show (priv->no_accounts_label); + gtk_widget_show (priv->no_accounts_container); } else { - gtk_widget_hide (priv->no_accounts_label); + gtk_widget_hide (priv->no_accounts_container); gtk_widget_show (priv->account_view); } + gtk_container_child_set (GTK_CONTAINER(priv->box), priv->pannable, + "expand", count > 0, + "fill", count > 0, + NULL); }