#include "../modest-ui.h"
#include "../modest-window-mgr.h"
#include "../modest-account-mgr.h"
+#include "../modest-account-mgr.h"
#include "../modest-identity-mgr.h"
#include "../modest-tny-account-store.h"
static void modest_ui_window_destroy (GtkWidget *win, GdkEvent *event, gpointer data);
static void modest_ui_last_window_closed (GObject *obj, gpointer data);
-static GtkWidget* modest_main_window_toolbar (void);
static GtkWidget* modest_main_window_folder_tree (ModestAccountMgr *modest_acc_mgr,
TnyAccountStoreIface *account_store);
static GtkWidget* modest_main_window_header_tree (TnyMsgFolderIface *folder);
-
-static void on_account_settings1_activate (GtkMenuItem *,
- gpointer);
+//static void on_account_settings1_activate (GtkMenuItem *,
+// gpointer);
static void on_password_requested (ModestTnyAccountStore *account_store,
const gchar *account_name, gpointer user_data);
static void on_delete_clicked (GtkWidget *widget, ModestUI *modest_ui);
+static void on_view_attachments_toggled(GtkWidget *widget, ModestUI *modest_ui);
+
#if 1
static void on_send_button_clicked (GtkWidget *widget, ModestEditorWindow *modest_editwin);
#else
priv->modest_conf = NULL;
priv->modest_window_mgr = NULL;
priv->glade_xml = NULL;
+ priv->folder_view = NULL;
+ priv->header_view = NULL;
}
ModestAccountMgr *modest_acc_mgr;
ModestIdentityMgr *modest_id_mgr;
TnyAccountStoreIface *account_store_iface;
+ GSList *account_names_list;
+ GSList *identities_list;
g_return_val_if_fail (modest_conf, NULL);
g_signal_connect (priv->modest_window_mgr, "last_window_closed",
G_CALLBACK(modest_ui_last_window_closed),
NULL);
+
+ account_names_list=modest_account_mgr_server_account_names(modest_acc_mgr, NULL, MODEST_PROTO_TYPE_ANY, NULL, FALSE);
+ identities_list=modest_identity_mgr_identity_names(modest_id_mgr, NULL);
+ if (!(account_names_list!=NULL || identities_list!=NULL))
+ wizard_account_dialog(MODEST_UI(obj));
+ g_slist_free(account_names_list);
+ g_slist_free(identities_list);
+
return obj;
}
GtkWidget *message_view;
GtkWidget *account_settings_item;
GtkWidget *new_account_item;
- GtkWidget *delete_item;
- GtkWidget *AccountWizardryMenu;
+ GtkWidget *delete_item;
+ GtkWidget *view_attachments_item;
GtkWidget *folder_view_holder,
*header_view_holder,
folder_view =
GTK_WIDGET(modest_main_window_folder_tree(priv->modest_acc_mgr,
priv->account_store));
+ priv->folder_view = folder_view;
folder_view_holder = glade_xml_get_widget (priv->glade_xml, "folders");
if (!folder_view||!folder_view_holder) {
g_warning ("failed to create folder tree");
gtk_container_add (GTK_CONTAINER(folder_view_holder), folder_view);
header_view = GTK_WIDGET(modest_main_window_header_tree (NULL));
+ priv->header_view = header_view;
header_view_holder = glade_xml_get_widget (priv->glade_xml, "mail_list");
if (!header_view) {
g_warning ("failed to create header tree");
g_signal_connect (G_OBJECT(folder_view), "folder_selected",
G_CALLBACK(on_folder_clicked), modest_ui);
- message_view = GTK_WIDGET(modest_tny_msg_view_new (NULL));
+ message_view = GTK_WIDGET(modest_tny_msg_view_new (NULL, priv->modest_conf));
if (!message_view) {
g_warning ("failed to create message view");
return FALSE;
g_warning ("The account settings item isn't available!\n");
return FALSE;
}
+ /*
g_signal_connect (account_settings_item, "activate",
G_CALLBACK(on_account_settings1_activate),
modest_ui);
+ */
new_account_item = glade_xml_get_widget (priv->glade_xml, "NewAccountWizardMenuItem");
if (!new_account_item)
g_signal_connect (delete_item, "activate", G_CALLBACK(on_delete_clicked),
modest_ui);
+ view_attachments_item = glade_xml_get_widget (priv->glade_xml, "menu_view_attachments");
+ if (!view_attachments_item)
+ {
+ g_warning ("The view_attachments_item isn't available!");
+ return FALSE;
+ }
+
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(view_attachments_item),
+ modest_conf_get_bool(priv->modest_conf,
+ MODEST_CONF_MSG_VIEW_SHOW_ATTACHMENTS_INLINE,
+ NULL)
+ );
+
+ g_signal_connect (view_attachments_item,
+ "toggled",
+ G_CALLBACK(on_view_attachments_toggled),
+ modest_ui);
+
register_toolbar_callbacks (modest_ui);
modest_window_mgr_register (priv->modest_window_mgr,
modest_ui);
g_signal_connect (win, "delete-event", G_CALLBACK(modest_ui_window_destroy),
modest_ui);
- gtk_widget_set_usize (GTK_WIDGET(win), height, width);
+ gtk_widget_set_usize (GTK_WIDGET(win), width, height);
gtk_window_set_title (GTK_WINDOW(win), PACKAGE_STRING);
gtk_widget_show_all (win);
}
}
-
+#if 0
static void
hide_edit_window (GtkWidget *win, GdkEvent *event, gpointer data)
{
gtk_widget_hide (win);
modest_window_mgr_unregister(priv->modest_window_mgr, G_OBJECT(win));
}
+#endif
+static gboolean close_edit_confirm_dialog(ModestEditorWindow *edit_win)
+{
+ GtkWidget *mdialog;
+ gint res;
+
+ mdialog = gtk_message_dialog_new(GTK_WINDOW(edit_win),
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_YES_NO,
+ _("Message was modified.\nDiscard Changes?"));
+ gtk_widget_show_all (mdialog);
+
+ res=gtk_dialog_run(GTK_DIALOG(mdialog));
+ gtk_widget_destroy (mdialog);
+ if (res == GTK_RESPONSE_YES)
+ return TRUE;
+ else
+ return FALSE;
+}
+
static void
close_edit_window (GtkWidget *win, GdkEvent *event, gpointer data)
{
ModestEditorWindow *edit_win;
- ModestUI *modest_ui;
ModestUIPrivate *priv;
EditWinData *win_data;
win_data = modest_editor_window_get_data(edit_win);
priv = MODEST_UI_GET_PRIVATE(win_data->modest_ui);
- gtk_widget_hide (GTK_WIDGET(edit_win));
- modest_window_mgr_unregister(priv->modest_window_mgr, G_OBJECT(edit_win));
- //gtk_widget_destroy(GTK_WIDGET(edit_win));
+ // g_message("window was %s modified", modest_editor_window_get_modified(edit_win) ? "" : "not");
+
+ if (modest_editor_window_get_modified(edit_win)) {
+ if (close_edit_confirm_dialog(edit_win)) {
+ gtk_widget_hide (GTK_WIDGET(edit_win));
+ modest_window_mgr_unregister(priv->modest_window_mgr, G_OBJECT(edit_win));
+ gtk_widget_destroy(GTK_WIDGET(edit_win));
+ g_message("closing window");
+ } else {
+ g_message("not closing window");
+ }
+ }
}
GtkContainer
*modest_ui_new_editor_window (ModestUI *modest_ui, gpointer *user_data)
{
- GtkWidget *top_container, *to_entry, *subject_entry, *body_view;
+ GtkWidget *top_container;
- ModestUIPrivate *priv;
GladeXML *glade_xml;
- GtkWidget *btn, *dummy;
- GtkTextBuffer *buf;
EditWinData *win_data;
glade_xml = glade_xml_new(MODEST_GLADE, "new_mail_top_container", NULL);
gboolean
-modest_ui_editor_window_set_to_header(gchar *to, gpointer window_data)
+modest_ui_editor_window_set_to_header(const gchar *to, gpointer window_data)
{
GladeXML *glade_xml;
GtkWidget *w;
+ EditWinData *win_data;
- glade_xml = (GladeXML *)window_data;
+ win_data = (EditWinData *)window_data;
+ glade_xml = win_data->glade_xml;
w = glade_xml_get_widget(glade_xml, "to_entry");
gtk_entry_set_text(GTK_ENTRY(w), to);
gboolean
-modest_ui_editor_window_set_cc_header(gchar *cc, gpointer window_data)
+modest_ui_editor_window_set_cc_header(const gchar *cc, gpointer window_data)
{
GladeXML *glade_xml;
- GtkWidget *w;
+ // GtkWidget *w;
+ EditWinData *win_data;
- glade_xml = (GladeXML *)window_data;
+ win_data = (EditWinData *)window_data;
+ glade_xml = win_data->glade_xml;
+/*
w = glade_xml_get_widget(glade_xml, "cc_entry");
gtk_entry_set_text(GTK_ENTRY(w), cc);
-
+*/
return TRUE;
}
gboolean
-modest_ui_editor_window_set_bcc_header(gchar *bcc, gpointer window_data)
+modest_ui_editor_window_set_bcc_header(const gchar *bcc, gpointer window_data)
{
GladeXML *glade_xml;
- GtkWidget *w;
+ // GtkWidget *w;
+ EditWinData *win_data;
- glade_xml = (GladeXML *)window_data;
+ win_data = (EditWinData *)window_data;
+ glade_xml = win_data->glade_xml;
+/*
w = glade_xml_get_widget(glade_xml, "bcc_entry");
gtk_entry_set_text(GTK_ENTRY(w), bcc);
-
+*/
return TRUE;
}
gboolean
-modest_ui_editor_window_set_subject_header(gchar *subject, gpointer window_data)
+modest_ui_editor_window_set_subject_header(const gchar *subject, gpointer window_data)
{
GladeXML *glade_xml;
GtkWidget *w;
+ EditWinData *win_data;
+
+ win_data = (EditWinData *)window_data;
+ glade_xml = win_data->glade_xml;
- glade_xml = (GladeXML *)window_data;
w = glade_xml_get_widget(glade_xml, "subject_entry");
gtk_entry_set_text(GTK_ENTRY(w), subject);
gboolean
-modest_ui_editor_window_set_body(gchar *body, gpointer window_data)
+modest_ui_editor_window_set_body(const gchar *body, gpointer window_data)
{
GladeXML *glade_xml;
- GtkWidget *w;
+ GtkWidget *body_view;
+ GtkTextBuffer *buf;
+ EditWinData *win_data;
+
+ win_data = (EditWinData *)window_data;
+ glade_xml = win_data->glade_xml;
+
+ body_view = glade_xml_get_widget(glade_xml, "body_view");
+ buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(body_view));
- glade_xml = (GladeXML *)window_data;
- w = glade_xml_get_widget(glade_xml, "body_view");
- gtk_text_buffer_set_text(GTK_TEXT_BUFFER(w), body, -1);
+ gtk_text_buffer_set_text(GTK_TEXT_BUFFER(buf), body, -1);
return TRUE;
}
-
+#if 0
gboolean
modest_ui_new_edit_window (ModestUI *modest_ui, const gchar* to,
const gchar* cc, const gchar* bcc,
GtkWidget *win, *to_entry, *subject_entry, *body_view;
ModestUIPrivate *priv;
- GtkWidget *btn, *dummy;
+ GtkWidget *btn;
GtkTextBuffer *buf;
priv = MODEST_UI_GET_PRIVATE(modest_ui);
return TRUE;
}
-
+#endif
static void
modest_ui_window_destroy (GtkWidget *win, GdkEvent *event, gpointer data)
free(account_name);
}
-
+#if 0
static void
on_account_settings1_activate (GtkMenuItem *menuitem,
gpointer user_data)
g_object_unref(glade_xml);
}
+#endif
static void
return folder_tree;
}
+static void on_editor_entry_changed(GtkEditable *editable,
+ gpointer user_data)
+{
+ GtkWidget *edit_win;
+ EditWinData *windata;
+
+ edit_win = (GtkWidget *)user_data;
+ windata = (EditWinData *)modest_editor_window_get_data(MODEST_EDITOR_WINDOW(edit_win));
+
+ modest_editor_window_set_modified(MODEST_EDITOR_WINDOW(edit_win), TRUE);
+}
+
+static void on_editor_buffer_changed (GtkTextBuffer *textbuffer,
+ gpointer user_data)
+{
+ GtkWidget *edit_win;
+ EditWinData *windata;
+
+ edit_win = (GtkWidget *)user_data;
+ windata = (EditWinData *)modest_editor_window_get_data(MODEST_EDITOR_WINDOW(edit_win));
+
+ modest_editor_window_set_modified(MODEST_EDITOR_WINDOW(edit_win), TRUE);
+}
static void
on_new_mail_clicked (GtkWidget *widget, ModestUI *modest_ui)
{
GtkWidget *edit_win;
GladeXML *glade_xml;
- GtkWidget *btn;
+ GtkWidget *btn, *w;
+ GtkTextBuffer *buf;
EditWinData *windata;
ModestUIPrivate *priv;
gint height, width;
windata = (EditWinData *)modest_editor_window_get_data(MODEST_EDITOR_WINDOW(edit_win));
g_return_if_fail(windata);
+ windata->edit_win = MODEST_EDITOR_WINDOW(edit_win);
glade_xml = windata->glade_xml;
btn = glade_xml_get_widget (glade_xml, "toolb_send");
g_signal_connect (btn, "clicked", G_CALLBACK(on_send_button_clicked),
edit_win);
+ w = glade_xml_get_widget (glade_xml, "to_entry");
+ g_signal_connect(w, "changed", G_CALLBACK(on_editor_entry_changed), edit_win);
+ w = glade_xml_get_widget (glade_xml, "subject_entry");
+ g_signal_connect(w, "changed", G_CALLBACK(on_editor_entry_changed), edit_win);
+ w = glade_xml_get_widget (glade_xml, "body_view");
+ buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(w));
+ gtk_text_buffer_set_text(buf, "", -1);
+ g_signal_connect(buf, "changed", G_CALLBACK(on_editor_buffer_changed), edit_win);
+
g_signal_connect (edit_win, "destroy-event", G_CALLBACK(close_edit_window),
edit_win);
g_signal_connect (edit_win, "delete-event", G_CALLBACK(close_edit_window),
width = modest_conf_get_int (priv->modest_conf,
MODEST_CONF_EDIT_WINDOW_WIDTH, NULL);
- g_message("new editor win@%dx%d", width, height);
+ // g_message("new editor win@%dx%d", width, height);
gtk_widget_set_usize (GTK_WIDGET(edit_win), width, height);
- /*gtk_window_set_title (GTK_WINDOW(edit_win),
- subject ? subject : "Untitled");*/
+ gtk_window_set_title (GTK_WINDOW(edit_win), _("Untitled"));
modest_window_mgr_register(priv->modest_window_mgr, G_OBJECT(edit_win), MODEST_EDIT_WINDOW, 0);
gtk_widget_show(edit_win);
}
static void
+new_editor_with_presets (ModestUI *modest_ui, const gchar *to_header,
+ const gchar *cc_header, const gchar *bcc_header,
+ const gchar *subject_header, const gchar *body)
+{
+ GtkWidget *edit_win;
+ GladeXML *glade_xml;
+ GtkWidget *btn, *w;
+ GtkTextBuffer *buf;
+ EditWinData *windata;
+ ModestUIPrivate *priv;
+ gint height, width;
+
+ g_return_if_fail (modest_ui);
+
+ edit_win = modest_editor_window_new(modest_ui);
+ windata = (EditWinData *)modest_editor_window_get_data(MODEST_EDITOR_WINDOW(edit_win));
+ g_return_if_fail(windata);
+
+ glade_xml = windata->glade_xml;
+ btn = glade_xml_get_widget (glade_xml, "toolb_send");
+ g_signal_connect (btn, "clicked", G_CALLBACK(on_send_button_clicked),
+ edit_win);
+
+ w = glade_xml_get_widget (glade_xml, "to_entry");
+ g_signal_connect(w, "changed", G_CALLBACK(on_editor_entry_changed), edit_win);
+ w = glade_xml_get_widget (glade_xml, "subject_entry");
+ g_signal_connect(w, "changed", G_CALLBACK(on_editor_entry_changed), edit_win);
+ w = glade_xml_get_widget (glade_xml, "body_view");
+ buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(w));
+ g_signal_connect(buf, "changed", G_CALLBACK(on_editor_buffer_changed), edit_win);
+
+ g_signal_connect (edit_win, "destroy-event", G_CALLBACK(close_edit_window),
+ edit_win);
+ g_signal_connect (edit_win, "delete-event", G_CALLBACK(close_edit_window),
+ edit_win);
+
+ priv = MODEST_UI_GET_PRIVATE(windata->modest_ui);
+ height = modest_conf_get_int (priv->modest_conf,
+ MODEST_CONF_EDIT_WINDOW_HEIGHT, NULL);
+ width = modest_conf_get_int (priv->modest_conf,
+ MODEST_CONF_EDIT_WINDOW_WIDTH, NULL);
+
+ // g_message("new editor win@%dx%d", width, height);
+
+ gtk_widget_set_usize (GTK_WIDGET(edit_win), width, height);
+ gtk_window_set_title (GTK_WINDOW(edit_win), _("Untitled"));
+ modest_window_mgr_register(priv->modest_window_mgr, G_OBJECT(edit_win), MODEST_EDIT_WINDOW, 0);
+
+ modest_editor_window_set_to_header(MODEST_EDITOR_WINDOW(edit_win), to_header);
+ modest_editor_window_set_cc_header(MODEST_EDITOR_WINDOW(edit_win), cc_header);
+ modest_editor_window_set_bcc_header(MODEST_EDITOR_WINDOW(edit_win), bcc_header);
+ modest_editor_window_set_subject_header(MODEST_EDITOR_WINDOW(edit_win), subject_header);
+ modest_editor_window_set_body(MODEST_EDITOR_WINDOW(edit_win), body);
+
+ modest_editor_window_set_modified(MODEST_EDITOR_WINDOW(edit_win), FALSE);
+
+ gtk_widget_show(edit_win);
+}
+
+
+static void
quoted_send_msg (ModestUI *modest_ui, quoted_send_type qstype) {
GtkTreeSelection *sel;
GtkWidget *paned;
switch (qstype) {
case QUOTED_SEND_REPLY:
g_string_prepend(re_sub, _("Re: "));
- modest_ui_new_edit_window (modest_ui, from, /* cc */ "", /* bcc */ "", re_sub->str, quoted, NULL);
+ new_editor_with_presets(modest_ui, from, /* cc */ "", /* bcc */ "", re_sub->str, quoted);
break;
case QUOTED_SEND_FORWARD:
g_string_prepend(re_sub, _("Fwd: "));
- modest_ui_new_edit_window (modest_ui, /* from */ "", /* cc */ "", /* bcc */ "", re_sub->str, quoted, NULL);
+ new_editor_with_presets(modest_ui, /* from */ "", /* cc */ "", /* bcc */ "", re_sub->str, quoted);
break;
default:
break;
actions = MODEST_TNY_TRANSPORT_ACTIONS
(modest_tny_transport_actions_new ());
+
priv = MODEST_UI_GET_PRIVATE(modest_ui);
-#if 0
+
account_store = priv->account_store;
transport_accounts =
tny_account_store_iface_get_transport_accounts (account_store);
} else /* take the first one! */
transport_account =
TNY_TRANSPORT_ACCOUNT_IFACE(transport_accounts->data);
-#endif
+
to_entry = glade_xml_get_widget (win_data->glade_xml, "to_entry");
subject_entry = glade_xml_get_widget (win_data->glade_xml, "subject_entry");
body_view = glade_xml_get_widget (win_data->glade_xml, "body_view");
MODEST_IDENTITY_DEFAULT_IDENTITY,
MODEST_IDENTITY_EMAIL, NULL);
+ if (!email_from)
+ email_from = "";
+
g_message("sending \"%s\" %s ==> %s", subject, email_from, to);
-#if 0
+
modest_tny_transport_actions_send_message (actions,
transport_account,
email_from,
to, "", "", subject,
body);
-#endif
+
g_free (body);
g_object_unref (G_OBJECT(actions));
gtk_widget_hide (GTK_WIDGET(modest_editwin));
- gtk_widget_destroy(GTK_WIDGET(modest_editwin));
+ modest_window_mgr_unregister(priv->modest_window_mgr, G_OBJECT(modest_editwin));
+ if (GTK_IS_WIDGET(modest_editwin)) {
+ gtk_widget_destroy(GTK_WIDGET(modest_editwin));
+ } else
+ g_warning("editor window has vanished!");
}
+static void
+on_view_attachments_toggled(GtkWidget *widget, ModestUI *modest_ui)
+{
+ GtkWidget *view_attachments_item, *paned;
+ ModestTnyMsgView *msg_view;
+ ModestUIPrivate *priv;
+
+ priv = MODEST_UI_GET_PRIVATE(modest_ui);
+ view_attachments_item = glade_xml_get_widget (priv->glade_xml, "menu_view_attachments");
+ g_return_if_fail(view_attachments_item);
+
+ modest_conf_set_bool(priv->modest_conf,
+ MODEST_CONF_MSG_VIEW_SHOW_ATTACHMENTS_INLINE,
+ gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(view_attachments_item)),
+ NULL);
+ /* refresh message view */
+ paned = glade_xml_get_widget (priv->glade_xml,"mail_paned");
+ msg_view = MODEST_TNY_MSG_VIEW(gtk_paned_get_child2 (GTK_PANED(paned)));
+ modest_tny_msg_view_redraw(MODEST_TNY_MSG_VIEW(msg_view));
+}
static void
on_delete_clicked (GtkWidget *widget, ModestUI *modest_ui)
{
GtkTreeModel *model;
GtkTreeIter iter;
GtkScrolledWindow *scroll;
- GtkTreeModel *mymodel, *sortable;
+ GtkTreeModel *mymodel;
ModestTnyHeaderTreeView *header_view;
ModestTnyMsgView *msg_view;
if (G_LIKELY (header))
{
TnyMsgFolderIface *folder;
- const TnyMsgIface *msg;
+ // const TnyMsgIface *msg;
if (GTK_IS_TREE_MODEL_SORT (model))
{
tny_account_store_iface_get_store_accounts (account_store);
for (iter = store_accounts; iter; iter = iter->next)
+ {
modest_tny_store_actions_update_folders (store_actions,
TNY_STORE_ACCOUNT_IFACE (iter->data));
- /* TODO, lock, refresh display */
-
+ }
g_object_unref (store_actions);
}
projects / modest / blobdiff