* message viewer window now also show message body

pmo-trunk-r244

diff --git a/src/gtk-glade/modest-ui-message-editor.c b/src/gtk-glade/modest-ui-message-editor.c
index 08c4631..5732817 100644 (file)
--- a/src/gtk-glade/modest-ui-message-editor.c
+++ b/src/gtk-glade/modest-ui-message-editor.c
@@ -227,7 +227,8 @@ modest_ui_editor_window_update_attachments(gpointer window_data)
 }
 
 
 }
 
 

-static void on_editor_entry_changed(GtkEditable *editable,
+static
+void on_editor_entry_changed(GtkEditable *editable,

                                             gpointer     user_data)
 {
        GtkWidget *edit_win;
                                             gpointer     user_data)
 {
        GtkWidget *edit_win;

@@ -240,7 +241,8 @@ static void on_editor_entry_changed(GtkEditable *editable,
 }
 
 
 }
 
 

-static void on_editor_buffer_changed (GtkTextBuffer *textbuffer,
+static
+void on_editor_buffer_changed (GtkTextBuffer *textbuffer,

                                             gpointer       user_data)
 {
        GtkWidget *edit_win;
                                             gpointer       user_data)
 {
        GtkWidget *edit_win;

@@ -317,68 +319,15 @@ new_editor_with_presets (ModestUI *modest_ui, const gchar *to_header,
        gtk_widget_show(edit_win);
 }
 
        gtk_widget_show(edit_win);
 }
 

-#if 1
+

 void
 void

-on_new_mail_clicked (GtkWidget *widget, ModestUI *modest_ui)
+on_new_mail_clicked (GtkWidget *widget, gpointer user_data)

 {
 {

+       ModestUI *modest_ui = (ModestUI *) modest_ui;
+

        new_editor_with_presets(modest_ui, "", "", "", "", "");
 }
        new_editor_with_presets(modest_ui, "", "", "", "", "");
 }

-#else
-void
-on_new_mail_clicked (GtkWidget *widget, ModestUI *modest_ui)
-{
-       GtkWidget *edit_win;
-       GladeXML *glade_xml;
-       GtkWidget *btn, *w;
-       GtkTextBuffer *buf;
-       EditWinData *windata;
-       ModestUIPrivate *priv;
-       gint height, width;
-
-       g_return_if_fail (modest_ui);
-       //modest_ui_new_edit_window (modest_ui, "", "", "", "", "", NULL);
-
-       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);
-
-       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);
-       btn = glade_xml_get_widget (glade_xml, "toolb_attach");
-       g_signal_connect (btn, "clicked", G_CALLBACK(on_attach_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),
-                         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);
-       gtk_widget_show(edit_win);
-}
-#endif

 
 void
 quoted_send_msg (ModestUI *modest_ui, quoted_send_type qstype)
 
 void
 quoted_send_msg (ModestUI *modest_ui, quoted_send_type qstype)

diff --git a/src/gtk-glade/modest-ui-message-editor.h b/src/gtk-glade/modest-ui-message-editor.h
index 695f1b9..40ba7e3 100644 (file)
--- a/src/gtk-glade/modest-ui-message-editor.h
+++ b/src/gtk-glade/modest-ui-message-editor.h
@@ -7,9 +7,16 @@ typedef enum {
        QUOTED_SEND_FORWARD
 } quoted_send_type;
 
        QUOTED_SEND_FORWARD
 } quoted_send_type;
 

-
+/*
+ * open a new editor window quoting the currently selected message
+ * the quote type determines which parts are to be quoted
+ */

 void quoted_send_msg (ModestUI *modest_ui, quoted_send_type qstype);
 
 void quoted_send_msg (ModestUI *modest_ui, quoted_send_type qstype);
 

-void on_new_mail_clicked (GtkWidget *widget, ModestUI *modest_ui);
+/*
+ * callback used in main-window
+ * called when user presses the "New Mail" button
+ */
+void on_new_mail_clicked (GtkWidget *widget, gpointer user_data);

 
 #endif /* _MODEST_UI_MESSAGE_EDITOR_H */
 
 #endif /* _MODEST_UI_MESSAGE_EDITOR_H */

diff --git a/src/gtk-glade/modest-ui-message-viewer.c b/src/gtk-glade/modest-ui-message-viewer.c
index a3d59c6..96c36ea 100644 (file)
--- a/src/gtk-glade/modest-ui-message-viewer.c
+++ b/src/gtk-glade/modest-ui-message-viewer.c
@@ -69,7 +69,7 @@ GtkContainer
                return NULL;
        paned = glade_xml_get_widget(glade_xml, "vpaned3");
        gtk_paned_add2(GTK_PANED(paned), msg_view);
                return NULL;
        paned = glade_xml_get_widget(glade_xml, "vpaned3");
        gtk_paned_add2(GTK_PANED(paned), msg_view);

-       gtk_widget_show(msg_view);
+       gtk_widget_show_all(msg_view);

 
        return GTK_CONTAINER(top_container);
 }
 
        return GTK_CONTAINER(top_container);
 }

@@ -107,7 +107,7 @@ open_message_viewer_window(ModestUI *modest_ui)
        ModestTnyHeaderTreeView *header_view;
        TnyMsgHeaderIface *header;
        const TnyMsgFolderIface *folder;
        ModestTnyHeaderTreeView *header_view;
        TnyMsgHeaderIface *header;
        const TnyMsgFolderIface *folder;

-       const TnyMsgIface *msg;
+       TnyMsgIface *msg;

        const gchar *subject, *to, *from;
        time_t sent_date;
        gchar date_str[101];
        const gchar *subject, *to, *from;
        time_t sent_date;
        gchar date_str[101];

diff --git a/src/gtk-glade/modest-ui-message-viewer.h b/src/gtk-glade/modest-ui-message-viewer.h
index 612847e..447aaf3 100644 (file)
--- a/src/gtk-glade/modest-ui-message-viewer.h
+++ b/src/gtk-glade/modest-ui-message-viewer.h
@@ -1,4 +1,17 @@
 
 

+#ifndef _MODEST_UI_MESSAGE_VIEWER_H
+#define _MODEST_UI_MESSAGE_VIEWER_H
+
+/*
+ * callback used in main-window
+ * called when the menu-item "Open" is activated
+ */

 void on_open_message_clicked (GtkWidget *widget, gpointer user_data);
 
 void on_open_message_clicked (GtkWidget *widget, gpointer user_data);
 

+/*
+ * callback used in main-window
+ * called when double clicking on a message header
+ */

 void on_message_activated (GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data);
 void on_message_activated (GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data);

+
+#endif /* _MODEST_UI_MESSAGE_VIEWER_H */

diff --git a/src/modest-viewer-window.c b/src/modest-viewer-window.c
index 02d3c6d..e954584 100644 (file)
--- a/src/modest-viewer-window.c
+++ b/src/modest-viewer-window.c
@@ -80,6 +80,7 @@ modest_viewer_window_init (ModestViewerWindow *obj)
        ModestViewerWindowPrivate *priv = MODEST_VIEWER_WINDOW_GET_PRIVATE(obj);
 
        priv->user_data = NULL;
        ModestViewerWindowPrivate *priv = MODEST_VIEWER_WINDOW_GET_PRIVATE(obj);
 
        priv->user_data = NULL;

+       priv->msg_view = NULL;

 }
 
 
 }
 
 

@@ -93,6 +94,9 @@ modest_viewer_window_finalize (GObject *obj)
        if (priv->user_data)
                g_free(priv->user_data);
 
        if (priv->user_data)
                g_free(priv->user_data);
 

+//     if (priv->msg_view)
+//             gtk_widget_destroy(GTK_WIDGET(priv->msg_view));
+

        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 

@@ -120,6 +124,7 @@ modest_viewer_window_new (ModestUI *ui, TnyMsgIface *msg)
 
        gtk_container_add(GTK_CONTAINER(self), w);
        priv->user_data = data;
 
        gtk_container_add(GTK_CONTAINER(self), w);
        priv->user_data = data;

+       priv->msg_view = msg_view;

 
        return GTK_WIDGET(self);
 }
 
        return GTK_WIDGET(self);
 }

@@ -144,3 +149,17 @@ gpointer modest_viewer_window_get_data(ModestViewerWindow *viewer_win)
 }
 
 
 }
 
 

+ModestTnyMsgView
+*modest_viewer_window_get_tiny_msg_view(ModestViewerWindow *viewer_win)
+{
+       ModestViewerWindowPrivate *priv;
+
+       if (!viewer_win) {
+               return NULL;
+       }
+       priv = MODEST_VIEWER_WINDOW_GET_PRIVATE(viewer_win);
+
+       // g_message("get priv->data = %p", priv->user_data);
+
+       return priv->msg_view;
+}

diff --git a/src/modest-viewer-window.h b/src/modest-viewer-window.h
index eda73f5..98a3277 100644 (file)
--- a/src/modest-viewer-window.h
+++ b/src/modest-viewer-window.h
@@ -41,6 +41,7 @@ GtkWidget*   modest_viewer_window_new (ModestUI *ui, TnyMsgIface *msg);
 
 gpointer modest_viewer_window_get_data(ModestViewerWindow *viewer_win);
 
 
 gpointer modest_viewer_window_get_data(ModestViewerWindow *viewer_win);
 

+ModestTnyMsgView *modest_viewer_window_get_tiny_msg_view(ModestViewerWindow *viewer_win);

 
 /* fill in other public functions, eg.: */
 /*     void       modest_viewer_window_do_something (ModestViewerWindow *self, const gchar* param); */
 
 /* fill in other public functions, eg.: */
 /*     void       modest_viewer_window_do_something (ModestViewerWindow *self, const gchar* param); */