* modest-tny-platform-factory.[ch]:

[modest] / src / modest-ui.h

diff --git a/src/modest-ui.h b/src/modest-ui.h
index 0e3ffa5..0d109ca 100644 (file)
--- a/src/modest-ui.h
+++ b/src/modest-ui.h
@@ -31,9 +31,10 @@
 #define __MODEST_UI_H__
 
 #include <glib-object.h>
-#include <gtk/gtkcontainer.h>
-#include "modest-conf.h"
-#include "modest-tny-msg-view.h"
+#include <tny-account-store.h>
+#include <gtk/gtkactiongroup.h>
+#include <widgets/modest-window.h>
+#include <widgets/modest-edit-msg-window.h>
 
 G_BEGIN_DECLS
 
@@ -56,10 +57,8 @@ struct _ModestUI {
 struct _ModestUIClass {
        GObjectClass parent_class;
        /* insert signal callback declarations, eg. */
-       /* void (* my_event) (ModestUI* obj); */
 };
 
-
 /**
  * modest_ui_get_type:
  * 
@@ -69,65 +68,42 @@ struct _ModestUIClass {
  */
 GType        modest_ui_get_type        (void) G_GNUC_CONST;
 
-
-
 /**
  * modest_ui_new:
- * @modest_conf: a ModestConf instance 
+ * @account_store: a #TnyAccountStore
  *  
  * Returns: a new ModestUI, or NULL in case of error
  */
-ModestUI*     modest_ui_new             (ModestConf *modest_conf);
+ModestUI*     modest_ui_new            (TnyAccountStore *account_store);
 
 
 /**
- * modest_ui_show_main_window:
- * @ui: a ModestUI instance 
- * 
- * show the application's main window
- * 
- * Returns: TRUE if succeeded, FALSE otherwise
+ * modest_ui_main_window:
+ * @modest_ui: a ModestUI instance 
+ *  
+ * Creates an new main window and returns it. If there is already a
+ * main window then the current one is returned and no new window is
+ * created
+ *
+ * Returns: a #ModestMainWindow, or NULL in case of error
  */
-gboolean     modest_ui_show_main_window (ModestUI *ui);
+ModestWindow*    modest_ui_main_window    (ModestUI *modest_ui);
 
 
 /**
- * modest_ui_new_edit_window:
- * @ui: a ModestUI instance 
- * @to: people to send this to, ';' separated
- * @cc: people to send carbon-copies (cc), ';' separated
- * @bcc people to send blind-carbon-copies (bcc),';' separated
- * @subject: the subject of the message
- * @body: the body text of the message
- * @att: a list with the filepaths for attachments
+ * modest_edit_msg_ui_main_window:
+ * @modest_edit_msg_ui: a ModestEditMsgUI instance 
+ * @edit_type: the type of edit window
  *  
- * Returns: TRUE if succeeded, FALSE otherwise
+ * Creates an new main window and returns it. If there is already a
+ * main window then the current one is returned and no new window is
+ * created
+ *
+ * Returns: a #ModestEditMsgWindow, or NULL in case of error
  */
-gboolean     modest_ui_new_edit_window (ModestUI *ui,
-                                        const gchar* to,
-                                        const gchar* cc,
-                                        const gchar* bcc,
-                                        const gchar* subject,
-                                        const gchar* body,
-                                        const GSList* att);
-
-
-GtkContainer *modest_ui_new_editor_window (ModestUI *modest_ui, gpointer *user_data);
+ModestWindow*    modest_ui_edit_window    (ModestUI       *modest_ui,
+                                          ModestEditType  edit_type);
 
-gboolean modest_ui_editor_window_set_to_header(const gchar *to, gpointer window_data);
-gboolean modest_ui_editor_window_set_cc_header(const gchar *cc, gpointer window_data);
-gboolean modest_ui_editor_window_set_bcc_header(const gchar *bcc, gpointer window_data);
-gboolean modest_ui_editor_window_set_subject_header(const gchar *subject, gpointer window_data);
-gboolean modest_ui_editor_window_set_body(const gchar *body, gpointer window_data);
-gboolean modest_ui_editor_window_update_attachments(gpointer window_data);
-
-GtkContainer *modest_ui_new_viewer_window (ModestUI *modest_ui, GtkWidget *msg_view,
-                                          TnyMsgIface *msg, gpointer *user_data);
-
-/*
- * the new API below
- */
-GtkWidget *modest_ui_main_window (ModestUI *modest_ui);
 
 G_END_DECLS
 #endif /* __MODEST_UI_H__ */