#include <tny-camel-imap-folder.h>
#include <tny-camel-pop-folder.h>
#ifdef MODEST_TOOLKIT_HILDON2
+#include <modest-accounts-window.h>
#include <hildon/hildon-pannable-area.h>
+#include <hildon/hildon-gtk.h>
#include <modest-header-window.h>
#endif
#include <gtkhtml/gtkhtml.h>
#define MIN_FREE_SPACE 5 * 1024 * 1024
-#define MOVE_FOLDER_OK_BUTTON "ok-button"
-#define MOVE_FOLDER_NEW_BUTTON "new-button"
+#define MODEST_MOVE_TO_DIALOG_FOLDER_VIEW "move-to-dialog-folder-view"
typedef struct _GetMsgAsyncHelper {
ModestWindow *window;
GtkWidget *banner;
} PasteAsAttachmentHelper;
+typedef struct {
+ TnyList *list;
+ ModestWindow *win;
+} MoveToInfo;
/*
* The do_headers_action uses this kind of functions to perform some
TnyFolderStore *parent_folder,
const gchar *suggested_name);
-static GtkWidget* get_folder_view_from_move_to_dialog (GtkWidget *move_to_dialog);
-
static TnyAccount *get_account_from_folder_store (TnyFolderStore *folder_store);
+static void modest_ui_actions_on_main_window_move_to (GtkAction *action,
+ GtkWidget *folder_view,
+ TnyFolderStore *dst_folder,
+ ModestMainWindow *win);
+
+static void modest_ui_actions_on_window_move_to (GtkAction *action,
+ TnyList *list_to_move,
+ TnyFolderStore *dst_folder,
+ ModestWindow *win);
+
/*
* This function checks whether a TnyFolderStore is a pop account
*/
return list;
+#ifdef MODEST_TOOLKIT_HILDON2
+ } else if (MODEST_IS_HEADER_WINDOW (win)) {
+ GtkWidget *header_view;
+
+ header_view = GTK_WIDGET (modest_header_window_get_header_view (MODEST_HEADER_WINDOW (win)));
+ return modest_header_view_get_selected_headers (MODEST_HEADER_VIEW(header_view));
+#endif
} else
return NULL;
}
void
modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
{
+ modest_ui_actions_on_edit_mode_delete_message (win);
+}
+
+gboolean
+modest_ui_actions_on_edit_mode_delete_message (ModestWindow *win)
+{
TnyList *header_list = NULL;
TnyIterator *iter = NULL;
TnyHeader *header = NULL;
gint response;
ModestWindowMgr *mgr;
GtkWidget *header_view = NULL;
+ gboolean retval = TRUE;
- g_return_if_fail (MODEST_IS_WINDOW(win));
+ g_return_val_if_fail (MODEST_IS_WINDOW(win), FALSE);
/* Check first if the header view has the focus */
if (MODEST_IS_MAIN_WINDOW (win)) {
modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
if (!gtk_widget_is_focus (header_view))
- return;
+ return FALSE;
}
/* Get the headers, either from the header view (if win is the main window),
* or from the message view window: */
header_list = get_selected_headers (win);
- if (!header_list) return;
+ if (!header_list) return FALSE;
/* Check if any of the headers are already opened, or in the process of being opened */
if (MODEST_IS_MAIN_WINDOW (win)) {
g_free (msg);
g_object_unref (header_list);
- return;
+ return FALSE;
}
}
/* Get main window */
mgr = modest_runtime_get_window_mgr ();
main_window = modest_window_mgr_get_main_window (mgr, FALSE); /* don't create */
- } else {
+ } else if (MODEST_IS_MAIN_WINDOW (win)) {
/* Move cursor to next row */
main_window = win;
/* Free */
g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL);
g_list_free (sel_list);
+ retval = TRUE;
+ } else {
+ retval = FALSE;
}
/* Free*/
g_free(message);
g_free(desc);
g_object_unref (header_list);
+
+ return retval;
}
}
void
+modest_ui_actions_add_to_contacts (GtkAction *action, ModestWindow *win)
+{
+ g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (win));
+
+ modest_msg_view_window_add_to_contacts (MODEST_MSG_VIEW_WINDOW (win));
+}
+
+void
modest_ui_actions_on_add_to_contacts (GtkAction *action, ModestWindow *win)
{
GtkClipboard *clipboard = NULL;
allowed_size = MODEST_MAX_ATTACHMENT_SIZE;
msg_win = modest_msg_edit_window_new (msg, account_name, FALSE);
- if (!modest_window_mgr_register_window (modest_runtime_get_window_mgr(), msg_win, NULL)) {
+ if (!modest_window_mgr_register_window (modest_runtime_get_window_mgr(), msg_win, win)) {
gtk_widget_destroy (GTK_WIDGET (msg_win));
goto cleanup;
}
outbox which is not in
failed state */
g_object_unref(traccount);
- goto cleanup;
}
#endif
}
g_object_unref(headers);
}
+static void
+rf_helper_window_closed (gpointer data,
+ GObject *object)
+{
+ ReplyForwardHelper *helper = (ReplyForwardHelper *) data;
+
+ helper->parent_window = NULL;
+}
+
static ReplyForwardHelper*
create_reply_forward_helper (ReplyForwardAction action,
ModestWindow *win,
g_strdup (active_acc) :
modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
+ /* Note that window could be destroyed just AFTER calling
+ register_window so we must ensure that this pointer does
+ not hold invalid references */
+ if (rf_helper->parent_window)
+ g_object_weak_ref (G_OBJECT (rf_helper->parent_window),
+ rf_helper_window_closed, rf_helper);
+
return rf_helper;
}
g_free (helper->account_name);
if (helper->header)
g_object_unref (helper->header);
+ if (helper->parent_window)
+ g_object_weak_unref (G_OBJECT (helper->parent_window),
+ rf_helper_window_closed, helper);
g_slice_free (ReplyForwardHelper, helper);
}
mgr = modest_runtime_get_window_mgr ();
modest_window_mgr_register_window (mgr, msg_win, (ModestWindow *) rf_helper->parent_window);
- if (rf_helper->parent_window != NULL) {
+ /* Note that register_window could have deleted the account */
+ if (MODEST_IS_WINDOW (rf_helper->parent_window)) {
gdouble parent_zoom;
parent_zoom = modest_window_get_zoom (MODEST_WINDOW (rf_helper->parent_window));
{
ReplyForwardHelper *rf_helper = NULL;
guint reply_forward_type;
-
+
g_return_if_fail (MODEST_IS_WINDOW(win));
-
+
/* we check for low-mem; in that case, show a warning, and don't allow
* reply/forward (because it could potentially require a lot of memory */
if (modest_platform_check_memory_low (MODEST_WINDOW(win), TRUE))
if (!modest_ui_actions_run_account_setup_wizard (win))
return;
}
-
+
reply_forward_type =
modest_conf_get_int (modest_runtime_get_conf (),
- (action == ACTION_FORWARD) ?
+ (action == ACTION_FORWARD) ?
MODEST_CONF_FORWARD_TYPE :
MODEST_CONF_REPLY_TYPE,
NULL);
if (msg && header) {
/* Create helper */
- rf_helper = create_reply_forward_helper (action, win,
+ rf_helper = create_reply_forward_helper (action, win,
reply_forward_type, header);
reply_forward_cb (NULL, header, FALSE, msg, NULL, rf_helper);
} else {
g_warning("%s: no message or header found in viewer\n", __FUNCTION__);
}
-
+
if (msg)
g_object_unref (msg);
if (header)
/* Allways download if we are online. */
if (!tny_device_is_online (modest_runtime_get_device ())) {
gint response;
-
+
/* If ask for user permission to download the messages */
response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
ngettext("mcen_nc_get_msg",
"mcen_nc_get_msgs",
uncached_msgs));
-
+
/* End if the user does not want to continue */
if (response == GTK_RESPONSE_CANCEL)
download = FALSE;
}
}
-
+
if (download) {
/* Create helper */
rf_helper = create_reply_forward_helper (action, win,
/* Refresh the active account. Force the connection if needed
and poke the status of all folders */
modest_ui_actions_do_send_receive (NULL, TRUE, TRUE, TRUE, win);
+#ifdef MODEST_TOOLKIT_HILDON2
+ } else if (MODEST_IS_ACCOUNTS_WINDOW (win)) {
+ modest_ui_actions_do_send_receive_all (win, TRUE, TRUE, TRUE);
+#endif
} else {
const gchar *active_account;
active_account = modest_window_get_active_account (MODEST_WINDOW (win));
void
modest_ui_actions_on_msg_attachment_clicked (ModestMsgView *msgview, TnyMimePart *mime_part,
ModestWindow *win)
-{
+{
/* we check for low-mem; in that case, show a warning, and don't allow
* viewing attachments
*/
#endif
} else {
/* the 'source_win' is either the ModestMainWindow, or the 'Move to folder'-dialog
- * FIXME: any other? */
+ * FIXME: any other? */
GtkWidget *folder_view;
if (MODEST_IS_MAIN_WINDOW(source_win))
modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (source_win),
MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
else
- folder_view =
- get_folder_view_from_move_to_dialog (GTK_WIDGET(source_win));
-
+ folder_view = GTK_WIDGET(g_object_get_data (G_OBJECT (source_win),
+ MODEST_MOVE_TO_DIALOG_FOLDER_VIEW));
+
/* Select the newly created folder. It could happen
that the widget is no longer there (i.e. the window
has been destroyed, so we need to check this */
}
void
-modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
+modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
const gchar* server_account_name,
gchar **username,
- gchar **password,
- gboolean *cancel,
+ gchar **password,
+ gboolean *cancel,
gboolean *remember,
ModestMainWindow *main_window)
{
g_return_if_fail(server_account_name);
gboolean completed = FALSE;
PasswordDialogFields *fields = NULL;
-
+
/* Initalize output parameters: */
if (cancel)
*cancel = FALSE;
-
+
if (remember)
*remember = TRUE;
-
+
#ifndef MODEST_TOOLKIT_GTK
/* Maemo uses a different (awkward) button order,
* It should probably just use gtk_alternative_dialog_button_order ().
*/
- GtkWidget *dialog = gtk_dialog_new_with_buttons (_("mail_ti_password_protected"),
- NULL,
- GTK_DIALOG_MODAL,
- _("mcen_bd_dialog_ok"),
- GTK_RESPONSE_ACCEPT,
- _("mcen_bd_dialog_cancel"),
- GTK_RESPONSE_REJECT,
- NULL);
+#ifdef MODEST_TOOLKIT_HILDON2
+ GtkWidget *dialog =
+ gtk_dialog_new_with_buttons (_("mail_ti_password_protected"),
+ NULL,
+ GTK_DIALOG_MODAL,
+ _HL("wdgt_bd_done"),
+ GTK_RESPONSE_ACCEPT,
+ NULL);
#else
- GtkWidget *dialog = gtk_dialog_new_with_buttons (_("mail_ti_password_protected"),
- NULL,
- GTK_DIALOG_MODAL,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_REJECT,
- GTK_STOCK_OK,
- GTK_RESPONSE_ACCEPT,
- NULL);
-#endif /* !MODEST_TOOLKIT_GTK */
+ GtkWidget *dialog =
+ gtk_dialog_new_with_buttons (_("mail_ti_password_protected"),
+ NULL,
+ GTK_DIALOG_MODAL,
+ _("mcen_bd_dialog_ok"),
+ GTK_RESPONSE_ACCEPT,
+ _("mcen_bd_dialog_cancel"),
+ GTK_RESPONSE_REJECT,
+ NULL);
+#endif /* MODEST_TOOLKIT_HILDON2 */
+#else
+ GtkWidget *dialog =
+ gtk_dialog_new_with_buttons (_("mail_ti_password_protected"),
+ NULL,
+ GTK_DIALOG_MODAL,
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_REJECT,
+ GTK_STOCK_OK,
+ GTK_RESPONSE_ACCEPT,
+ NULL);
+#endif /* MODEST_TOOLKIT_GTK */
modest_window_mgr_set_modal (modest_runtime_get_window_mgr(), GTK_WINDOW (dialog), NULL);
-
+
gchar *server_name = modest_account_mgr_get_server_account_hostname (
modest_runtime_get_account_mgr(), server_account_name);
if (!server_name) {/* This happened once, though I don't know why. murrayc. */
gtk_widget_destroy (dialog);
return;
}
-
- /* This causes a warning because the logical ID has no %s in it,
- * though the translation does, but there is not much we can do about that: */
+
gchar *txt = g_strdup_printf (_("mail_ia_password_info"), server_name);
gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), gtk_label_new(txt),
FALSE, FALSE, 0);
/* username: */
gchar *initial_username = modest_account_mgr_get_server_account_username (
modest_runtime_get_account_mgr(), server_account_name);
-
+
GtkWidget *entry_username = gtk_entry_new ();
if (initial_username)
gtk_entry_set_text (GTK_ENTRY (entry_username), initial_username);
#ifndef MODEST_TOOLKIT_GTK
/* Auto-capitalization is the default, so let's turn it off: */
hildon_gtk_entry_set_input_mode (GTK_ENTRY (entry_username), HILDON_GTK_INPUT_MODE_FULL);
-
+
/* Create a size group to be used by all captions.
* Note that HildonCaption does not create a default size group if we do not specify one.
* We use GTK_SIZE_GROUP_HORIZONTAL, so that the widths are the same. */
GtkSizeGroup *sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-
+
GtkWidget *caption = hildon_caption_new (sizegroup,
_("mail_fi_username"), entry_username, NULL, HILDON_CAPTION_MANDATORY);
gtk_widget_show (entry_username);
gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), caption,
FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
-#else
+#else
gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), entry_username,
TRUE, FALSE, 0);
-#endif /* !MODEST_TOOLKIT_GTK */
-
+#endif /* !MODEST_TOOLKIT_GTK */
+
/* password: */
GtkWidget *entry_password = gtk_entry_new ();
gtk_entry_set_visibility (GTK_ENTRY(entry_password), FALSE);
/* gtk_entry_set_invisible_char (GTK_ENTRY(entry_password), "*"); */
-
+
#ifndef MODEST_TOOLKIT_GTK
/* Auto-capitalization is the default, so let's turn it off: */
- hildon_gtk_entry_set_input_mode (GTK_ENTRY (entry_password),
+ hildon_gtk_entry_set_input_mode (GTK_ENTRY (entry_password),
HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE);
-
- caption = hildon_caption_new (sizegroup,
+
+ caption = hildon_caption_new (sizegroup,
_("mail_fi_password"), entry_password, NULL, HILDON_CAPTION_MANDATORY);
gtk_widget_show (entry_password);
- gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), caption,
+ gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), caption,
FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
g_object_unref (sizegroup);
-#else
+#else
gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), entry_password,
TRUE, FALSE, 0);
-#endif /* !MODEST_TOOLKIT_GTK */
+#endif /* !MODEST_TOOLKIT_GTK */
if (initial_username != NULL)
gtk_widget_grab_focus (GTK_WIDGET (entry_password));
-
+
/* This is not in the Maemo UI spec:
remember_pass_check = gtk_check_button_new_with_label (_("Remember password"));
gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), remember_pass_check,
gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox));
while (!completed) {
-
+
if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
if (username) {
*username = g_strdup (gtk_entry_get_text (GTK_ENTRY(entry_username)));
-
+
/* Note that an empty field becomes the "" string */
if (*username && strlen (*username) > 0) {
modest_account_mgr_set_server_account_username (modest_runtime_get_account_mgr(),
server_account_name,
*username);
completed = TRUE;
-
+
const gboolean username_was_changed =
(strcmp (*username, initial_username) != 0);
if (username_was_changed) {
completed = FALSE;
}
}
-
+
if (password) {
*password = g_strdup (gtk_entry_get_text (GTK_ENTRY(entry_password)));
-
+
/* We do not save the password in the configuration,
* because this function is only called for passwords that should
* not be remembered:
modest_runtime_get_account_mgr(), server_account_name,
*password);
*/
- }
+ }
if (cancel)
- *cancel = FALSE;
+ *cancel = FALSE;
} else {
+#ifndef MODEST_TOOLKIT_HILDON2
/* Set parent to NULL or the banner will disappear with its parent dialog */
modest_platform_information_banner(NULL, NULL, _("mail_ib_login_cancelled"));
+#endif
completed = TRUE;
if (username)
- *username = NULL;
+ *username = NULL;
if (password)
- *password = NULL;
+ *password = NULL;
if (cancel)
*cancel = TRUE;
}
modest_msg_edit_window_check_names (window, FALSE);
}
-static void
-create_move_to_dialog_on_new_folder(GtkWidget *button, gpointer user_data)
-{
- modest_ui_actions_create_folder (gtk_widget_get_toplevel (button),
- GTK_WIDGET (user_data));
-}
-
+#ifndef MODEST_TOOLKIT_HILDON2
/*
* This function is used to track changes in the selection of the
* folder view that is inside the "move to" dialog to enable/disable
gpointer user_data)
{
GtkWidget *dialog = NULL;
- GtkWidget *ok_button = NULL, *new_button = NULL;
gboolean ok_sensitive = TRUE, new_sensitive = TRUE;
gboolean moving_folder = FALSE;
gboolean is_local_account = TRUE;
ModestTnyFolderRules rules;
g_return_if_fail (MODEST_IS_FOLDER_VIEW(self));
-
+
if (!selected)
return;
-
- /* Get the OK button */
+
dialog = gtk_widget_get_ancestor (GTK_WIDGET (self), GTK_TYPE_DIALOG);
if (!dialog)
return;
- ok_button = g_object_get_data (G_OBJECT (dialog), MOVE_FOLDER_OK_BUTTON);
- new_button = g_object_get_data (G_OBJECT (dialog), MOVE_FOLDER_NEW_BUTTON);
-
/* check if folder_store is an remote account */
if (TNY_IS_ACCOUNT (folder_store)) {
TnyAccount *local_account = NULL;
/* Get the folder to move */
moved_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
-
+
/* Check that we're not moving to the same folder */
if (TNY_IS_FOLDER (moved_folder)) {
parent = tny_folder_get_folder_store (TNY_FOLDER (moved_folder));
if (parent == folder_store)
ok_sensitive = FALSE;
g_object_unref (parent);
- }
+ }
if (ok_sensitive && TNY_IS_ACCOUNT (folder_store)) {
/* Do not allow to move to an account unless it's the
local folders account */
if (!is_local_account)
ok_sensitive = FALSE;
- }
+ }
if (ok_sensitive && (moved_folder == folder_store)) {
/* Do not allow to move to itself */
}
end:
- /* Set sensitivity of the OK button */
- gtk_widget_set_sensitive (ok_button, ok_sensitive);
- /* Set sensitivity of the NEW button */
- gtk_widget_set_sensitive (new_button, new_sensitive);
+ /* Set sensitivity of the OK and NEW button */
+ gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, ok_sensitive);
+ gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), MODEST_GTK_RESPONSE_NEW_FOLDER, new_sensitive);
}
+#endif
+static void
+on_move_to_dialog_response (GtkDialog *dialog,
+ gint response,
+ gpointer user_data)
+{
+ GtkWidget *parent_win, *folder_view;
+ MoveToInfo *helper = NULL;
-#define MODEST_MOVE_TO_DIALOG_FOLDER_VIEW "move-to-dialog-folder-view"
+ helper = (MoveToInfo *) user_data;
-static GtkWidget*
-get_folder_view_from_move_to_dialog (GtkWidget *move_to_dialog)
-{
- return GTK_WIDGET(g_object_get_data (G_OBJECT(move_to_dialog),
- MODEST_MOVE_TO_DIALOG_FOLDER_VIEW));
+ parent_win = (GtkWidget *) helper->win;
+ folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog),
+ MODEST_MOVE_TO_DIALOG_FOLDER_VIEW));
+
+ switch (response) {
+ TnyFolderStore *dst_folder;
+
+ case MODEST_GTK_RESPONSE_NEW_FOLDER:
+ modest_ui_actions_create_folder (GTK_WIDGET (dialog), folder_view);
+ return;
+ case GTK_RESPONSE_NONE:
+ case GTK_RESPONSE_CANCEL:
+ case GTK_RESPONSE_DELETE_EVENT:
+ break;
+ case GTK_RESPONSE_OK:
+ dst_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+ /* Do window specific stuff */
+ if (MODEST_IS_MAIN_WINDOW (parent_win)) {
+ modest_ui_actions_on_main_window_move_to (NULL,
+ folder_view,
+ dst_folder,
+ MODEST_MAIN_WINDOW (parent_win));
+ } else {
+ /* Moving from headers window in edit mode */
+ modest_ui_actions_on_window_move_to (NULL, helper->list,
+ dst_folder,
+ MODEST_WINDOW (parent_win));
+ }
+
+ if (dst_folder)
+ g_object_unref (dst_folder);
+
+ break;
+ default:
+ g_warning ("%s unexpected response id %d", __FUNCTION__, response);
+ }
+
+ /* Free the helper and exit */
+ g_object_unref (helper->list);
+ g_slice_free (MoveToInfo, helper);
+ gtk_widget_destroy (GTK_WIDGET (dialog));
}
static GtkWidget*
create_move_to_dialog (GtkWindow *win,
- GtkWidget *folder_view,
- GtkWidget **tree_view)
+ GtkWidget *folder_view)
{
- GtkWidget *dialog;
-#ifdef MODEST_TOOLKIT_HILDON2
- GtkWidget *pannable;
-#else
- GtkWidget *scroll;
-#endif
- GtkWidget *new_button, *ok_button;
+ GtkWidget *dialog, *tree_view = NULL;
- dialog = gtk_dialog_new_with_buttons (_("mcen_ti_moveto_folders_title"),
- GTK_WINDOW (win),
- GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT,
- NULL);
+ dialog = modest_platform_create_move_to_dialog (win, &tree_view);
-#ifndef MODEST_TOOLKIT_GTK
- ok_button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("mcen_bd_dialog_ok"), GTK_RESPONSE_ACCEPT);
- /* We do this manually so GTK+ does not associate a response ID for
- * the button. */
- new_button = gtk_button_new_from_stock (_("mcen_bd_new"));
- gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->action_area), new_button, FALSE, FALSE, 0);
- gtk_widget_show (new_button);
#ifndef MODEST_TOOLKIT_HILDON2
- gtk_dialog_add_button (GTK_DIALOG (dialog), _("mcen_bd_dialog_cancel"), GTK_RESPONSE_REJECT);
-#endif
-#else
- /* We do this manually so GTK+ does not associate a response ID for
- * the button. */
- new_button = gtk_button_new_with_label (_("mcen_ti_new_folder"));
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), new_button, FALSE, FALSE, 0);
- gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (GTK_DIALOG (dialog)->action_area), new_button, TRUE);
- gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT);
- ok_button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_OK, GTK_RESPONSE_ACCEPT);
- gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
- gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 24);
-#endif
- g_object_set_data (G_OBJECT (dialog), MOVE_FOLDER_OK_BUTTON, ok_button);
- g_object_set_data (G_OBJECT (dialog), MOVE_FOLDER_NEW_BUTTON, new_button);
-
- /* Create scrolled window */
-#ifdef MODEST_TOOLKIT_HILDON2
- pannable = hildon_pannable_area_new ();
-#else
- scroll = gtk_scrolled_window_new (NULL, NULL);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
-#endif
-
-#ifdef MODEST_TOOLKIT_GTK
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll), GTK_SHADOW_IN);
-#endif
-
- /* Create folder view */
- *tree_view = modest_platform_create_folder_view (NULL);
-
/* Track changes in the selection to
* disable the OK button whenever "Move to" is not possible
* disbale NEW button whenever New is not possible */
- g_signal_connect (*tree_view,
+ g_signal_connect (tree_view,
"folder_selection_changed",
G_CALLBACK (on_move_to_dialog_folder_selection_changed),
win);
-
- /* Listen to clicks on New button */
- g_signal_connect (G_OBJECT (new_button),
- "clicked",
- G_CALLBACK(create_move_to_dialog_on_new_folder),
- *tree_view);
+#endif
/* It could happen that we're trying to move a message from a
window (msg window for example) after the main window was
if (MODEST_IS_FOLDER_VIEW (folder_view)) {
const gchar *visible_id = NULL;
- modest_folder_view_set_style (MODEST_FOLDER_VIEW (*tree_view),
+ modest_folder_view_set_style (MODEST_FOLDER_VIEW (tree_view),
MODEST_FOLDER_VIEW_STYLE_SHOW_ALL);
modest_folder_view_copy_model (MODEST_FOLDER_VIEW(folder_view),
- MODEST_FOLDER_VIEW(*tree_view));
+ MODEST_FOLDER_VIEW(tree_view));
visible_id =
modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(folder_view));
/* Show the same account than the one that is shown in the main window */
- modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(*tree_view),
+ modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(tree_view),
visible_id);
} else {
const gchar *active_account_name = NULL;
ModestAccountSettings *settings = NULL;
ModestServerAccountSettings *store_settings = NULL;
- modest_folder_view_set_style (MODEST_FOLDER_VIEW (*tree_view),
+ modest_folder_view_set_style (MODEST_FOLDER_VIEW (tree_view),
MODEST_FOLDER_VIEW_STYLE_SHOW_ALL);
- modest_folder_view_update_model (MODEST_FOLDER_VIEW (*tree_view),
+ modest_folder_view_update_model (MODEST_FOLDER_VIEW (tree_view),
TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()));
active_account_name = modest_window_get_active_account (MODEST_WINDOW (win));
store_settings = modest_account_settings_get_store_settings (settings);
store_account_name = modest_server_account_settings_get_account_name (store_settings);
- modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (*tree_view),
+ modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (tree_view),
store_account_name);
g_object_unref (store_settings);
g_object_unref (settings);
}
}
- /* we keep a pointer to the embedded folder view, so we can retrieve it with
- * get_folder_view_from_move_to_dialog
- * (see above) later (needed for focus handling)
+ /* we keep a pointer to the embedded folder view, so we can
+ * retrieve it with get_folder_view_from_move_to_dialog (see
+ * above) later (needed for focus handling)
*/
- g_object_set_data (G_OBJECT(dialog), MODEST_MOVE_TO_DIALOG_FOLDER_VIEW, *tree_view);
+ g_object_set_data (G_OBJECT(dialog), MODEST_MOVE_TO_DIALOG_FOLDER_VIEW, tree_view);
-
/* Hide special folders */
- modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (*tree_view), FALSE);
-
-#ifdef MODEST_TOOLKIT_HILDON2
- gtk_container_add (GTK_CONTAINER (pannable), *tree_view);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
- pannable, TRUE, TRUE, 0);
-#else
- gtk_container_add (GTK_CONTAINER (scroll), *tree_view);
- /* Add scroll to dialog */
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
- scroll, TRUE, TRUE, 0);
+ modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (tree_view), FALSE);
+#ifndef MODEST_TOOLKIT_HILDON2
+ modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (tree_view));
#endif
-
- gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox));
-#ifndef MODEST_TOOLKIT_GTK
- gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 300);
-#else
- gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 400);
-#endif
+ gtk_widget_show (GTK_WIDGET (tree_view));
return dialog;
}
-
-
/*
* Shows a confirmation dialog to the user when we're moving messages
* from a remote server to the local storage. Returns the dialog
src_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
/* Get header view */
- header_view = MODEST_HEADER_VIEW(modest_main_window_get_child_widget (win, MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW));
+ header_view = (ModestHeaderView *)
+ modest_main_window_get_child_widget (win, MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
/* Get folder or messages to transfer */
if (gtk_widget_is_focus (folder_view)) {
do_xfer = FALSE;
}
- if (do_xfer) {
+ if (do_xfer) {
MoveFolderInfo *info = g_new0 (MoveFolderInfo, 1);
DoubleConnectionInfo *connect_info = g_slice_new (DoubleConnectionInfo);
* UI handler for the "Move to" action when invoked from the
* ModestMsgViewWindow
*/
-static void
-modest_ui_actions_on_msg_view_window_move_to (GtkAction *action,
- TnyFolderStore *dst_folder,
- ModestMsgViewWindow *win)
+static void
+modest_ui_actions_on_window_move_to (GtkAction *action,
+ TnyList *headers,
+ TnyFolderStore *dst_folder,
+ ModestWindow *win)
{
- TnyList *headers = NULL;
- TnyHeader *header = NULL;
TnyFolder *src_folder = NULL;
g_return_if_fail (TNY_IS_FOLDER (dst_folder));
- /* Create header list */
- header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));
- src_folder = TNY_FOLDER (tny_header_get_folder(header));
- headers = tny_simple_list_new ();
- tny_list_append (headers, G_OBJECT (header));
+ if (headers) {
+ TnyHeader *header = NULL;
+ TnyIterator *iter;
- /* Transfer the messages */
- modest_ui_actions_transfer_messages_helper (GTK_WINDOW (win), src_folder, headers,
- TNY_FOLDER (dst_folder));
+ iter = tny_list_create_iterator (headers);
+ header = (TnyHeader *) tny_iterator_get_current (iter);
+ src_folder = tny_header_get_folder (header);
- /* Frees */
- g_object_unref (src_folder);
- g_object_unref (header);
- g_object_unref (headers);
+ /* Transfer the messages */
+ modest_ui_actions_transfer_messages_helper (GTK_WINDOW (win), src_folder,
+ headers,
+ TNY_FOLDER (dst_folder));
+
+ /* Frees */
+ g_object_unref (header);
+ g_object_unref (iter);
+ g_object_unref (src_folder);
+ }
}
void
modest_ui_actions_on_move_to (GtkAction *action,
ModestWindow *win)
{
- GtkWidget *dialog = NULL, *folder_view = NULL, *tree_view = NULL;
- gint result = 0;
- TnyFolderStore *dst_folder = NULL;
+ GtkWidget *dialog = NULL, *folder_view = NULL;
ModestMainWindow *main_window;
+ MoveToInfo *helper = NULL;
- g_return_if_fail (MODEST_IS_MAIN_WINDOW (win) ||
- MODEST_IS_MSG_VIEW_WINDOW (win));
+ g_return_if_fail (MODEST_IS_WINDOW (win));
/* Get the main window if exists */
if (MODEST_IS_MAIN_WINDOW (win))
folder_view = NULL;
/* Create and run the dialog */
- dialog = create_move_to_dialog (GTK_WINDOW (win), folder_view, &tree_view);
- modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (tree_view));
- modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog), (GtkWindow *) win);
- result = gtk_dialog_run (GTK_DIALOG(dialog));
- g_object_ref (tree_view);
- gtk_widget_destroy (dialog);
+ dialog = create_move_to_dialog (GTK_WINDOW (win), folder_view);
+ modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
+ GTK_WINDOW (dialog),
+ (GtkWindow *) win);
- if (result != GTK_RESPONSE_ACCEPT)
- return;
+ /* Create helper */
+ helper = g_slice_new0 (MoveToInfo);
+ helper->list = modest_platform_get_list_to_move (MODEST_WINDOW (win));
+ helper->win = win;
- dst_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (tree_view));
- /* Do window specific stuff */
- if (MODEST_IS_MAIN_WINDOW (win)) {
- modest_ui_actions_on_main_window_move_to (action,
- folder_view,
- dst_folder,
- MODEST_MAIN_WINDOW (win));
- } else {
- modest_ui_actions_on_msg_view_window_move_to (action,
- dst_folder,
- MODEST_MSG_VIEW_WINDOW (win));
- }
+ /* Listen to response signal */
+ g_signal_connect (dialog, "response", G_CALLBACK (on_move_to_dialog_response), helper);
- if (dst_folder)
- g_object_unref (dst_folder);
+ /* Show the dialog */
+ gtk_widget_show (dialog);
}
/*
folder = TNY_FOLDER_STORE (tny_header_get_folder (header));
g_object_unref (iter);
g_object_unref (headers);
+#ifdef MODEST_TOOLKIT_HILDON2
+ } else if (MODEST_IS_HEADER_WINDOW (win)) {
+ GtkWidget *header_view;
+ TnyList* headers = NULL;
+ TnyIterator *iter;
+ header_view = GTK_WIDGET (modest_header_window_get_header_view (MODEST_HEADER_WINDOW (win)));
+ headers = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (header_view));
+ if (!headers || tny_list_get_length (headers) == 0) {
+ if (headers)
+ g_object_unref (headers);
+ return NULL;
+ }
+ iter = tny_list_create_iterator (headers);
+ header = TNY_HEADER (tny_iterator_get_current (iter));
+ folder = TNY_FOLDER_STORE (tny_header_get_folder (header));
+ g_object_unref (iter);
+ g_object_unref (headers);
+#endif
} else if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));
folder = TNY_FOLDER_STORE (tny_header_get_folder (header));
projects / modest / blobdiff