#include <widgets/modest-main-window.h>
#include <widgets/modest-msg-view-window.h>
#include <widgets/modest-account-view-window.h>
-#include <widgets/modest-msg-view-details-dialog.h>
+#include <widgets/modest-details-dialog.h>
#include "modest-account-mgr-helpers.h"
#include "modest-mail-operation.h"
+#include "modest-text-utils.h"
#ifdef MODEST_HAVE_EASYSETUP
#include "easysetup/modest-easysetup-wizard.h"
static void get_msg_cb (TnyFolder *folder, TnyMsg *msg, GError **err,
gpointer user_data);
static void reply_forward (ReplyForwardAction action, ModestWindow *win);
-static void modest_ui_actions_message_details_cb (gpointer msg_data,
- gpointer helper_data);
+
static gchar* ask_for_folder_name (GtkWindow *parent_window, const gchar *title);
} else if (TNY_IS_ACCOUNT (folder_store)) {
modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS);
-
-/* if (selected) { */
-
-/* } else { */
-/* /\* TODO *\/ */
-/* } */
}
}
parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
if (parent_folder) {
- gchar *folder_name;
-
- folder_name = ask_for_folder_name (GTK_WINDOW (main_window),
- _("Please enter a name for the new folder"));
-
- if (folder_name != NULL && strlen (folder_name) > 0) {
- TnyFolder *new_folder;
- ModestMailOperation *mail_op;
+ /* Run the new folder dialog */
+ while (!modest_platform_run_new_folder_dialog (MODEST_WINDOW (main_window),
+ parent_folder));
- mail_op = modest_mail_operation_new ();
- modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
- mail_op);
-
- new_folder = modest_mail_operation_create_folder (mail_op,
- parent_folder,
- (const gchar *) folder_name);
- if (new_folder)
- g_object_unref (new_folder);
- g_object_unref (mail_op);
- g_free (folder_name);
- }
g_object_unref (parent_folder);
}
}
gtk_window_present (GTK_WINDOW (window));
}
+/*
+ * Show the header details in a ModestDetailsDialog widget
+ */
static void
-modest_ui_actions_message_details_cb (gpointer msg_data,
- gpointer helper_data)
+show_header_details (TnyHeader *header,
+ GtkWindow *window)
{
GtkWidget *dialog;
- TnyMsg *msg = (TnyMsg *) msg_data;
- TnyHeader *header;
- GetMsgAsyncHelper *helper = (GetMsgAsyncHelper *) helper_data;
- header = tny_msg_get_header (msg);
-
- dialog = modest_msg_view_details_dialog_new (GTK_WINDOW (helper->window), header);
- g_object_unref (header);
+ /* Create dialog */
+ dialog = modest_details_dialog_new_with_header (window, header);
+
+ /* Run dialog */
gtk_widget_show_all (dialog);
+ gtk_dialog_run (GTK_DIALOG (dialog));
+
+ gtk_widget_destroy (dialog);
+}
+
+/*
+ * Show the folder details in a ModestDetailsDialog widget
+ */
+static void
+show_folder_details (TnyFolder *folder,
+ GtkWindow *window)
+{
+ GtkWidget *dialog;
+
+ /* Create dialog */
+ dialog = modest_details_dialog_new_with_folder (window, folder);
+ /* Run dialog */
+ gtk_widget_show_all (dialog);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
+
void
-modest_ui_actions_on_message_details (GtkAction *action,
- ModestWindow *win)
+modest_ui_actions_on_details (GtkAction *action,
+ ModestWindow *win)
{
TnyList * headers_list;
- GetMsgAsyncHelper *helper;
-
- headers_list = get_selected_headers (win);
- if (!headers_list)
- return;
-
- helper = g_slice_new0 (GetMsgAsyncHelper);
- helper->window = win;
- helper->func = modest_ui_actions_message_details_cb;
- helper->iter = tny_list_create_iterator (headers_list);
- helper->user_data = NULL;
+ TnyIterator *iter;
+ TnyHeader *header;
if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
TnyMsg *msg;
msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW (win));
- if (!msg)
+ if (!msg) {
return;
- else {
- modest_ui_actions_message_details_cb (msg, helper);
+ } else {
+ headers_list = get_selected_headers (win);
+ if (!headers_list)
+ return;
+
+ iter = tny_list_create_iterator (headers_list);
+
+ header = TNY_HEADER (tny_iterator_get_current (iter));
+ show_header_details (header, GTK_WINDOW (win));
+ g_object_unref (header);
+
+ g_object_unref (iter);
+ }
+ } else if (MODEST_IS_MAIN_WINDOW (win)) {
+ GtkWidget *folder_view, *header_view;
+
+ /* Check which widget has the focus */
+ folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
+ MODEST_WIDGET_TYPE_FOLDER_VIEW);
+ if (gtk_widget_is_focus (folder_view)) {
+ TnyFolder *folder;
+
+ folder = (TnyFolder *) modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+
+ /* Show only when it's a folder */
+ if (!folder || !TNY_IS_FOLDER (folder))
+ return;
+
+ show_folder_details (folder, GTK_WINDOW (win));
+
+ } else {
+ header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
+ MODEST_WIDGET_TYPE_HEADER_VIEW);
+ if (!gtk_widget_is_focus (header_view))
+ return;
+
+ headers_list = get_selected_headers (win);
+ if (!headers_list)
+ return;
+
+ iter = tny_list_create_iterator (headers_list);
+ while (!tny_iterator_is_done (iter)) {
+
+ header = TNY_HEADER (tny_iterator_get_current (iter));
+ show_header_details (header, GTK_WINDOW (win));
+ g_object_unref (header);
+
+ tny_iterator_next (iter);
+ }
+ g_object_unref (iter);
}
- } else {
- /* here we should add an implementation to run the message details dialog
- from the main window */
- g_return_if_reached ();
}
}
the focus. This callback could be called even if the folder
view has not the focus, because the handled signal could be
emitted when the folder view is redrawn */
- if (GTK_WIDGET_HAS_FOCUS (folder_view)) {
+ if (gtk_widget_is_focus (GTK_WIDGET (folder_view))) {
if (display_name)
gtk_window_set_title (window, display_name);
else
projects / modest / blobdiff