X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-account-view-window.c;h=5253bccef12ca2cf3f4a0f239ba8acebcfd9fac6;hp=460f8c4cebe8be4961a465d63761b234a9c4df3c;hb=ae06a114724e713c7cc743f8ea792ca91f65c4d4;hpb=c5d3d58e007163eacca918beea9d50a6a2cfb521 diff --git a/src/hildon2/modest-account-view-window.c b/src/hildon2/modest-account-view-window.c index 460f8c4..5253bcc 100644 --- a/src/hildon2/modest-account-view-window.c +++ b/src/hildon2/modest-account-view-window.c @@ -34,6 +34,7 @@ #include #include +#include "modest-ui-actions.h" #include "modest-platform.h" #include "modest-text-utils.h" #include "modest-account-protocol.h" @@ -60,7 +61,6 @@ enum { typedef struct _ModestAccountViewWindowPrivate ModestAccountViewWindowPrivate; struct _ModestAccountViewWindowPrivate { - GtkWidget *new_button; GtkWidget *edit_button; ModestAccountView *account_view; guint acc_removed_handler; @@ -126,91 +126,6 @@ modest_account_view_window_finalize (GObject *self) G_OBJECT_CLASS(parent_class)->finalize (self); } - -/** Check whether any connections are active, and cancel them if - * the user wishes. - * Returns TRUE is there was no problem, - * or if an operation was cancelled so we can continue. - * Returns FALSE if the user chose to cancel his request instead. - */ -static gboolean -check_for_active_account (ModestAccountViewWindow *self, const gchar* account_name) -{ - ModestTnySendQueue *send_queue; - ModestTnyAccountStore *acc_store; - ModestMailOperationQueue* queue; - TnyConnectionStatus store_conn_status; - TnyAccount *store_account = NULL, *transport_account = NULL; - gboolean retval = TRUE, sending = FALSE; - - acc_store = modest_runtime_get_account_store (); - queue = modest_runtime_get_mail_operation_queue (); - - store_account = - modest_tny_account_store_get_server_account (acc_store, - account_name, - TNY_ACCOUNT_TYPE_STORE); - - /* This could happen if the account was deleted before the - call to this function */ - if (!store_account) - return FALSE; - - transport_account = - modest_tny_account_store_get_server_account (acc_store, - account_name, - TNY_ACCOUNT_TYPE_TRANSPORT); - - /* This could happen if the account was deleted before the - call to this function */ - if (!transport_account) { - g_object_unref (store_account); - return FALSE; - } - - /* If the transport account was not used yet, then the send - queue could not exist (it's created on demand) */ - send_queue = modest_runtime_get_send_queue (TNY_TRANSPORT_ACCOUNT (transport_account), FALSE); - if (TNY_IS_SEND_QUEUE (send_queue)) - sending = modest_tny_send_queue_sending_in_progress (send_queue); - - store_conn_status = tny_account_get_connection_status (store_account); - if (store_conn_status == TNY_CONNECTION_STATUS_CONNECTED || sending) { - gint response; - - response = modest_platform_run_confirmation_dialog (GTK_WINDOW (self), - _("emev_nc_disconnect_account")); - if (response == GTK_RESPONSE_OK) { - retval = TRUE; - } else { - retval = FALSE; - } - } - - if (retval) { - - /* FIXME: We should only cancel those of this account */ - modest_mail_operation_queue_cancel_all (queue); - - /* Also disconnect the account */ - if ((tny_account_get_connection_status (store_account) != TNY_CONNECTION_STATUS_DISCONNECTED) && - (tny_account_get_connection_status (store_account) != TNY_CONNECTION_STATUS_DISCONNECTED_BROKEN)) { - tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (store_account), - FALSE, NULL, NULL); - } - if (sending) { - tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (transport_account), - FALSE, NULL, NULL); - } - } - - /* Frees */ - g_object_unref (store_account); - g_object_unref (transport_account); - - return retval; -} - static void on_account_settings_dialog_response (GtkDialog *dialog, gint response, @@ -256,7 +171,7 @@ on_account_activated (GtkTreeView *account_view, /* Check whether any connections are active, and cancel them if * the user wishes. */ - if (check_for_active_account (self, account_name)) { + if (modest_ui_actions_check_for_active_account ((ModestWindow *) self, account_name)) { ModestAccountProtocol *proto; ModestProtocolType proto_type; @@ -280,60 +195,6 @@ on_account_activated (GtkTreeView *account_view, } static void -on_wizard_response (GtkDialog *dialog, - gint response, - gpointer user_data) -{ - /* The response has already been handled by the wizard dialog itself, - * creating the new account. - */ - if (dialog) - gtk_widget_destroy (GTK_WIDGET (dialog)); - - /* Re-focus the account list view widget */ - if (MODEST_IS_ACCOUNT_VIEW_WINDOW (user_data)) { - ModestAccountViewWindowPrivate *priv; - priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (user_data); - gtk_widget_grab_focus (GTK_WIDGET (priv->account_view)); - } -} - -static void -on_new_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) -{ - GtkDialog *wizard; - - /* there is no such wizard yet */ - wizard = GTK_DIALOG (modest_easysetup_wizard_dialog_new ()); - modest_window_mgr_set_modal (modest_runtime_get_window_mgr(), - GTK_WINDOW (wizard), GTK_WINDOW (self)); - - gtk_window_set_modal (GTK_WINDOW (wizard), TRUE); - gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (self)); - /* Destroy the dialog when it is closed: */ - g_signal_connect (G_OBJECT (wizard), "response", G_CALLBACK - (on_wizard_response), self); - gtk_widget_show (GTK_WIDGET (wizard)); -} - -static void -setup_button_box (ModestAccountViewWindow *self, GtkButtonBox *box) -{ - ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self); - - priv->new_button = gtk_button_new_from_stock(_HL("wdgt_bd_new")); - hildon_gtk_widget_set_theme_size (priv->new_button, - HILDON_SIZE_FINGER_HEIGHT); - - g_signal_connect (G_OBJECT(priv->new_button), "clicked", - G_CALLBACK(on_new_button_clicked), - self); - gtk_box_pack_start (GTK_BOX(box), priv->new_button, FALSE, FALSE,0); - - gtk_widget_show_all (GTK_WIDGET (box)); -} - -static void window_vbox_new (ModestAccountViewWindow *self) { } @@ -344,10 +205,14 @@ modest_account_view_window_init (ModestAccountViewWindow *self) { ModestAccountViewWindowPrivate *priv; GtkWidget *main_vbox, *pannable; + GtkWidget *align; /* Specify a default size */ - gtk_window_set_default_size (GTK_WINDOW (self), -1, 320); + gtk_window_set_default_size (GTK_WINDOW (self), -1, MODEST_DIALOG_WINDOW_MAX_HEIGHT); + gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE); + gtk_widget_hide (GTK_DIALOG (self)->action_area); + /* This seems to be necessary to make the window show at the front with decoration. * If we use property type=GTK_WINDOW_TOPLEVEL instead of the default GTK_WINDOW_POPUP+decoration, @@ -358,12 +223,11 @@ modest_account_view_window_init (ModestAccountViewWindow *self) priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self); priv->acc_removed_handler = 0; priv->account_view = modest_account_view_new (modest_runtime_get_account_mgr()); + modest_account_view_set_picker_mode (MODEST_ACCOUNT_VIEW (priv->account_view), TRUE); main_vbox = GTK_DIALOG (self)->vbox; pannable = hildon_pannable_area_new (); - g_object_set (G_OBJECT (pannable), "initial-hint", TRUE, NULL); - gtk_container_set_border_width (GTK_CONTAINER (pannable), MODEST_MARGIN_DEFAULT); gtk_widget_show (pannable); gtk_container_add (GTK_CONTAINER (pannable), GTK_WIDGET (priv->account_view)); @@ -372,7 +236,13 @@ modest_account_view_window_init (ModestAccountViewWindow *self) g_signal_connect (G_OBJECT (priv->account_view), "row-activated", G_CALLBACK (on_account_activated), self); - gtk_box_pack_start (GTK_BOX(main_vbox), pannable, TRUE, TRUE, MODEST_MARGIN_HALF); + align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); + gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DEFAULT, MODEST_MARGIN_DEFAULT); + gtk_widget_show (align); + + gtk_container_add (GTK_CONTAINER (align), pannable); + + gtk_box_pack_start (GTK_BOX(main_vbox), align, TRUE, TRUE, 0); } @@ -404,8 +274,6 @@ modest_account_view_window_new (void) /* Add widgets */ window_vbox_new (MODEST_ACCOUNT_VIEW_WINDOW (self)); - setup_button_box (MODEST_ACCOUNT_VIEW_WINDOW (self), GTK_BUTTON_BOX (GTK_DIALOG (self)->action_area)); - gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_emailsetup_accounts")); /* Connect signals */