X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-accounts-window.c;h=06e1d1ab841ef871f85ca94afd5ccf1361461b64;hb=f7a19b4d2155c3f769d00f95553da7ba5ea136e9;hp=fddce682020ab07ad3615adaa00040bde882e487;hpb=417ddaf0d4d6e5f5ee2ce1f9be55f64a6b204a83;p=modest diff --git a/src/hildon2/modest-accounts-window.c b/src/hildon2/modest-accounts-window.c index fddce68..06e1d1a 100644 --- a/src/hildon2/modest-accounts-window.c +++ b/src/hildon2/modest-accounts-window.c @@ -32,12 +32,14 @@ #include #include #include +#include #include #include #include #include #include #include +#include #include #include #include @@ -45,6 +47,9 @@ #include #include #include +#include +#include +#include /* 'private'/'protected' functions */ @@ -55,37 +60,39 @@ static void modest_accounts_window_finalize (GObject *obj); static void connect_signals (ModestAccountsWindow *self); static void modest_accounts_window_disconnect_signals (ModestWindow *self); -static gboolean on_zoom_minus_plus_not_implemented (ModestWindow *window); static void on_account_activated (GtkTreeView *treeview, GtkTreePath *path, GtkTreeViewColumn *column, ModestAccountsWindow *accounts_window); -static void add_to_menu (ModestAccountsWindow *self, - HildonAppMenu *menu, - gchar *label, - GCallback callback, - ModestDimmingRulesGroup *group, - GCallback dimming_callback); -static void setup_menu (ModestAccountsWindow *self, - ModestDimmingRulesGroup *group); - -static void modest_accounts_window_show_toolbar (ModestWindow *self, - gboolean show_toolbar); -static gboolean modest_accounts_window_toggle_menu (HildonWindow *window, - guint button, - guint32 time); +static void on_progress_list_changed (ModestWindowMgr *mgr, + ModestAccountsWindow *self); +static void setup_menu (ModestAccountsWindow *self); +static gboolean _modest_accounts_window_map_event (GtkWidget *widget, + GdkEvent *event, + gpointer userdata); +static void update_progress_hint (ModestAccountsWindow *self); +static void on_row_inserted (GtkTreeModel *tree_model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer user_data); +static void on_row_deleted (GtkTreeModel *tree_model, + GtkTreePath *path, + gpointer user_data); +static void row_count_changed (ModestAccountsWindow *self); typedef struct _ModestAccountsWindowPrivate ModestAccountsWindowPrivate; struct _ModestAccountsWindowPrivate { + GtkWidget *box; + GtkWidget *pannable; GtkWidget *account_view; - GtkWidget *app_menu; + GtkWidget *no_accounts_container; + GtkWidget *new_message_button; /* signals */ GSList *sighandlers; - /* Display state */ - osso_display_state_t display_state; + gboolean progress_hint; }; #define MODEST_ACCOUNTS_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_ACCOUNTS_WINDOW, \ @@ -113,7 +120,7 @@ modest_accounts_window_get_type (void) (GInstanceInitFunc) modest_accounts_window_instance_init, NULL }; - my_type = g_type_register_static (MODEST_TYPE_WINDOW, + my_type = g_type_register_static (MODEST_TYPE_HILDON2_WINDOW, "ModestAccountsWindow", &my_info, 0); } @@ -126,18 +133,12 @@ modest_accounts_window_class_init (ModestAccountsWindowClass *klass) GObjectClass *gobject_class; gobject_class = (GObjectClass*) klass; ModestWindowClass *modest_window_class = (ModestWindowClass *) klass; - HildonWindowClass *hildon_window_class = (HildonWindowClass *) klass; parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = modest_accounts_window_finalize; g_type_class_add_private (gobject_class, sizeof(ModestAccountsWindowPrivate)); - hildon_window_class->toggle_menu = modest_accounts_window_toggle_menu; - - modest_window_class->zoom_minus_func = on_zoom_minus_plus_not_implemented; - modest_window_class->zoom_plus_func = on_zoom_minus_plus_not_implemented; - modest_window_class->show_toolbar_func = modest_accounts_window_show_toolbar; modest_window_class->disconnect_signals_func = modest_accounts_window_disconnect_signals; } @@ -149,9 +150,9 @@ modest_accounts_window_instance_init (ModestAccountsWindow *obj) priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE(obj); priv->sighandlers = NULL; - priv->display_state = OSSO_DISPLAY_ON; priv->account_view = NULL; + priv->progress_hint = FALSE; modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(), GTK_WINDOW(obj), @@ -184,68 +185,120 @@ modest_accounts_window_disconnect_signals (ModestWindow *self) static void connect_signals (ModestAccountsWindow *self) -{ +{ ModestAccountsWindowPrivate *priv; - + GtkTreeModel *model; + priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE(self); /* accounts view */ - priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, - G_OBJECT (priv->account_view), "row-activated", - G_CALLBACK (on_account_activated), self); - - /* window */ - - /* we don't register this in sighandlers, as it should be run after disconnecting all signals, - * in destroy stage */ - - -} - -static void -osso_display_event_cb (osso_display_state_t state, - gpointer data) -{ - ModestAccountsWindowPrivate *priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE (data); - - priv->display_state = state; - - /* Stop blinking if the screen becomes on */ - if (priv->display_state == OSSO_DISPLAY_ON) - modest_platform_remove_new_mail_notifications (TRUE); + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (priv->account_view), "row-activated", + G_CALLBACK (on_account_activated), self); + + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (modest_runtime_get_window_mgr ()), + "progress-list-changed", + G_CALLBACK (on_progress_list_changed), self); + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->account_view)); + + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (model), + "row-inserted", + G_CALLBACK (on_row_inserted), self); + + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (model), + "row-deleted", + G_CALLBACK (on_row_deleted), self); + + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (priv->new_message_button), + "clicked", + G_CALLBACK (modest_ui_actions_on_new_msg), self); + + /* we don't register this in sighandlers, as it should be run + * after disconnecting all signals, in destroy stage */ } ModestWindow * modest_accounts_window_new (void) { - ModestAccountsWindow *self = NULL; + ModestAccountsWindow *self = NULL; ModestAccountsWindowPrivate *priv = NULL; HildonProgram *app; GdkPixbuf *window_icon; - GtkWidget *pannable; - ModestWindowPrivate *parent_priv = NULL; - ModestDimmingRulesGroup *menu_rules_group = NULL; - + 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); - parent_priv = MODEST_WINDOW_GET_PRIVATE(self); - parent_priv->ui_dimming_manager = modest_ui_dimming_manager_new(); - menu_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_MENU, FALSE); + 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); - pannable = hildon_pannable_area_new (); + 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_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 ())); - setup_menu (self, menu_rules_group); + 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); - modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, menu_rules_group); - g_object_unref (menu_rules_group); + 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)); - gtk_container_add (GTK_CONTAINER (pannable), priv->account_view); - gtk_container_add (GTK_CONTAINER (self), pannable); + 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); - gtk_widget_show (priv->account_view); - gtk_widget_show (pannable); + g_object_unref (new_message_pixbuf); + setup_menu (self); + + 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->pannable); + gtk_widget_show (priv->box); + gtk_widget_show (box_alignment); connect_signals (MODEST_ACCOUNTS_WINDOW (self)); @@ -266,41 +319,26 @@ modest_accounts_window_new (void) g_object_unref (window_icon); } - /* Listen for changes in the screen, we don't want to show a - led pattern when the display is on for example */ - osso_hw_set_display_event_cb (modest_maemo_utils_get_osso_context (), - osso_display_event_cb, - self); - /* Dont't restore settings here, * because it requires a gtk_widget_show(), * and we don't want to do that until later, * so that the UI is not visible for non-menu D-Bus activation. */ - return MODEST_WINDOW(self); -} + g_signal_connect (G_OBJECT (self), "map-event", + G_CALLBACK (_modest_accounts_window_map_event), + G_OBJECT (self)); + update_progress_hint (self); -static gboolean -on_zoom_minus_plus_not_implemented (ModestWindow *window) -{ - g_return_val_if_fail (MODEST_IS_ACCOUNTS_WINDOW (window), FALSE); - - hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_cannot_zoom_here")); - return FALSE; - -} - -gboolean -modest_accounts_window_screen_is_on (ModestAccountsWindow *self) -{ - ModestAccountsWindowPrivate *priv = NULL; + row_count_changed (self); - g_return_val_if_fail (MODEST_IS_ACCOUNTS_WINDOW(self), FALSE); + 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); - priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE (self); - - return (priv->display_state == OSSO_DISPLAY_ON) ? TRUE : FALSE; + return MODEST_WINDOW(self); } ModestAccountView * @@ -315,80 +353,32 @@ modest_accounts_window_get_account_view (ModestAccountsWindow *self) return MODEST_ACCOUNT_VIEW (priv->account_view); } -static void add_to_menu (ModestAccountsWindow *self, - HildonAppMenu *menu, - gchar *label, - GCallback callback, - ModestDimmingRulesGroup *group, - GCallback dimming_callback) -{ - GtkWidget *button; - - button = gtk_button_new_with_label (label); - g_signal_connect_after (G_OBJECT (button), "clicked", - callback, (gpointer) self); - if (dimming_callback) - modest_dimming_rules_group_add_widget_rule (group, - button, - dimming_callback, - MODEST_WINDOW (self)); - hildon_app_menu_append (menu, GTK_BUTTON (button)); -} - -static void setup_menu (ModestAccountsWindow *self, ModestDimmingRulesGroup *group) +static void +setup_menu (ModestAccountsWindow *self) { - ModestAccountsWindowPrivate *priv = NULL; - g_return_if_fail (MODEST_IS_ACCOUNTS_WINDOW(self)); - priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE (self); - - priv->app_menu = hildon_app_menu_new (); - /* Settings menu buttons */ - add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("TODO: new account"), - G_CALLBACK (modest_ui_actions_on_new_account), - group, NULL); - add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("TODO: edit accounts"), - G_CALLBACK (modest_ui_actions_on_accounts), - group, NULL); - add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_inbox_options"), - G_CALLBACK (modest_ui_actions_on_settings), - group, NULL); - add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_inbox_globalsmtpservers"), - G_CALLBACK (modest_ui_actions_on_smtp_servers), - group, G_CALLBACK (modest_ui_dimming_rules_on_tools_smtp_servers)); - add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_viewer_newemail"), - G_CALLBACK (modest_ui_actions_on_new_msg), - group, G_CALLBACK (modest_ui_dimming_rules_on_new_msg)); - add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_inbox_sendandreceive"), - G_CALLBACK (modest_ui_actions_on_send_receive), - group, G_CALLBACK (modest_ui_dimming_rules_on_send_receive_all)); - add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_outbox_cancelsend"), - G_CALLBACK (modest_ui_actions_cancel_send), - group, G_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all)); - - hildon_stackable_window_set_main_menu (HILDON_STACKABLE_WINDOW (self), - HILDON_APP_MENU (priv->app_menu)); + 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, + 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, + APP_MENU_CALLBACK (modest_ui_actions_on_smtp_servers), + MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_tools_smtp_servers)); + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_sendandreceive"), NULL, + APP_MENU_CALLBACK (modest_ui_actions_on_send_receive), + MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive_all)); + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_outbox_cancelsend"), NULL, + APP_MENU_CALLBACK (modest_ui_actions_cancel_send), + MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all)); + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_options"), NULL, + APP_MENU_CALLBACK (modest_ui_actions_on_settings), + NULL); } -static gboolean -modest_accounts_window_toggle_menu (HildonWindow *window, - guint button, - guint32 time) -{ - ModestAccountsWindowPrivate *priv = NULL; - - priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE (window); - - modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window)); - - gtk_widget_queue_resize (priv->app_menu); - - return HILDON_WINDOW_CLASS (parent_class)->toggle_menu (window, button, time); -} - - static void on_account_activated (GtkTreeView *account_view, @@ -398,28 +388,126 @@ 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); - + account_name = modest_account_view_get_path_account (MODEST_ACCOUNT_VIEW (priv->account_view), path); if (!account_name) return; - folder_window = GTK_WIDGET (modest_folder_window_new (NULL)); - modest_window_mgr_register_window (modest_runtime_get_window_mgr (), - MODEST_WINDOW (folder_window), - MODEST_WINDOW (self)); - modest_folder_window_set_account (MODEST_FOLDER_WINDOW (folder_window), account_name); - gtk_widget_show (folder_window); + /* 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 (new_window), + MODEST_WINDOW (self)); + + if (!registered) { + gtk_widget_destroy (new_window); + new_window = NULL; + } else { + if (!mailboxes_protocol) { + modest_folder_window_set_account (MODEST_FOLDER_WINDOW (new_window), account_name); + } + gtk_widget_show (new_window); + } g_free (account_name); +} + +static gboolean +_modest_accounts_window_map_event (GtkWidget *widget, + GdkEvent *event, + gpointer userdata) +{ + ModestAccountsWindow *self = (ModestAccountsWindow *) userdata; + ModestAccountsWindowPrivate *priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE (self); + if (priv->progress_hint) { + hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), TRUE); + } + + return FALSE; } static void -modest_accounts_window_show_toolbar (ModestWindow *self, - gboolean show_toolbar) +update_progress_hint (ModestAccountsWindow *self) { - /* Empty implementation, this view does not show any - toolbar */ + ModestAccountsWindowPrivate *priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE (self); + + priv->progress_hint = modest_window_mgr_has_progress_operation (modest_runtime_get_window_mgr ()); + + if (GTK_WIDGET_VISIBLE (self)) { + hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), priv->progress_hint?1:0); + } +} + +static void +on_progress_list_changed (ModestWindowMgr *mgr, + ModestAccountsWindow *self) +{ + update_progress_hint (self); +} + +static void +on_row_inserted (GtkTreeModel *tree_model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer user_data) +{ + ModestAccountsWindow *self; + + self = (ModestAccountsWindow *) user_data; + + row_count_changed (self); +} + +static void +on_row_deleted (GtkTreeModel *tree_model, + GtkTreePath *path, + gpointer user_data) +{ + ModestAccountsWindow *self; + + self = (ModestAccountsWindow *) user_data; + + row_count_changed (self); +} + +static void row_count_changed (ModestAccountsWindow *self) +{ + ModestAccountsWindowPrivate *priv; + GtkTreeModel *model; + gint count; + + priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE (self); + model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->account_view)); + + count = gtk_tree_model_iter_n_children (model, NULL); + + if (count == 0) { + gtk_widget_hide (priv->account_view); + gtk_widget_show (priv->no_accounts_container); + } else { + 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); }