pixmaps/*.png
libmodest_ui_la_SOURCES= \
- modest-ui.c \
modest-icon-names.h \
modest-main-window.h \
modest-main-window.c \
GtkWidget *transport_holder;
GtkWidget *store_holder;
+
+ GtkWidget *notebook;
};
#define MODEST_ACCOUNT_ASSISTANT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_ACCOUNT_ASSISTANT, \
ModestAccountAssistantPrivate))
/* globals */
-static GtkAssistantClass *parent_class = NULL;
+static HildonWizardDialogClass *parent_class = NULL;
/* uncomment the following if you have defined any signals */
/* static guint signals[LAST_SIGNAL] = {0}; */
(GInstanceInitFunc) modest_account_assistant_init,
NULL
};
- my_type = g_type_register_static (GTK_TYPE_ASSISTANT,
+ my_type = g_type_register_static (HILDON_TYPE_WIZARD_DIALOG,
"ModestAccountAssistant",
&my_info, 0);
}
static void
-add_intro_page (ModestAccountAssistant *assistant)
+add_intro_page (ModestAccountAssistant *self)
{
GtkWidget *page, *label;
+ ModestAccountAssistantPrivate *priv;
+
+ priv = MODEST_ACCOUNT_ASSISTANT_GET_PRIVATE(self);
page = gtk_vbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX(page), label, FALSE, FALSE, 6);
gtk_widget_show_all (page);
- gtk_assistant_append_page (GTK_ASSISTANT(assistant), page);
+ gtk_notebook_append_page (GTK_NOTEBOOK(priv->notebook), page);
- gtk_assistant_set_page_title (GTK_ASSISTANT(assistant), page,
- _("Modest Account Assistant"));
- gtk_assistant_set_page_type (GTK_ASSISTANT(assistant), page,
- GTK_ASSISTANT_PAGE_INTRO);
- gtk_assistant_set_page_complete (GTK_ASSISTANT(assistant),
- page, TRUE);
+ //gtk_nootbook_set_page_title (GTK_ASSISTANT(assistant), page,
+ // _("Modest Account Assistant"));
+ //gtk_assistant_set_page_type (GTK_ASSISTANT(assistant), page,
+ // GTK_ASSISTANT_PAGE_INTRO);
+ //gtk_assistant_set_page_complete (GTK_ASSISTANT(assistant),
+ // page, TRUE);
}
+/*
static void
set_current_page_complete (ModestAccountAssistant *self, gboolean complete)
{
gtk_assistant_set_page_complete (GTK_ASSISTANT(self), page, complete);
}
+*/
+/*
static void
identity_page_update_completeness (GtkEditable *editable,
ModestAccountAssistant *self)
return;
}
- /* FIXME: regexp check for email address */
- txt = gtk_entry_get_text (GTK_ENTRY(priv->email));
+ txt = gtk_entry_get_text (GTK_ENTRY(priv->email)); // regex scan email address
if (!txt || strlen(txt) == 0) {
set_current_page_complete (self, FALSE);
return;
}
set_current_page_complete (self, TRUE);
}
-
+*/
static void
add_identity_page (ModestAccountAssistant *self)
self);
gtk_box_pack_start (GTK_BOX(page), table, FALSE, FALSE, 6);
- gtk_widget_show_all (page);
- gtk_assistant_append_page (GTK_ASSISTANT(self), page);
+ gtk_notebook_append_page (GTK_NOTEBOOK(priv->notebook), page);
+ gtk_widget_show_all (page);
- gtk_assistant_set_page_title (GTK_ASSISTANT(self), page,
- _("Identity"));
- gtk_assistant_set_page_type (GTK_ASSISTANT(self), page,
- GTK_ASSISTANT_PAGE_INTRO);
- gtk_assistant_set_page_complete (GTK_ASSISTANT(self),
- page, FALSE);
+/* gtk_assistant_set_page_title (GTK_ASSISTANT(self), page, */
+/* _("Identity")); */
+/* gtk_assistant_set_page_type (GTK_ASSISTANT(self), page, */
+/* GTK_ASSISTANT_PAGE_INTRO); */
+/* gtk_assistant_set_page_complete (GTK_ASSISTANT(self), */
+/* page, FALSE); */
}
gtk_box_pack_start (GTK_BOX(page), priv->store_holder,
TRUE, TRUE, 0);
- gtk_assistant_append_page (GTK_ASSISTANT(self), page);
+ gtk_notebook_append_page (GTK_NOTEBOOK(priv->notebook), page);
- gtk_assistant_set_page_title (GTK_ASSISTANT(self), page,
- _("Receiving mail"));
- gtk_assistant_set_page_type (GTK_ASSISTANT(self), page,
- GTK_ASSISTANT_PAGE_INTRO);
- gtk_assistant_set_page_complete (GTK_ASSISTANT(self),
- page, TRUE);
+/* gtk_assistant_set_page_title (GTK_ASSISTANT(self), page, */
+/* _("Receiving mail")); */
+/* gtk_assistant_set_page_type (GTK_ASSISTANT(self), page, */
+/* GTK_ASSISTANT_PAGE_INTRO); */
+/* gtk_assistant_set_page_complete (GTK_ASSISTANT(self), */
+/* page, TRUE); */
gtk_widget_show_all (page);
}
gtk_box_pack_start (GTK_BOX(page), priv->transport_holder,
FALSE, FALSE, 0);
- gtk_assistant_append_page (GTK_ASSISTANT(self), page);
-
- gtk_assistant_set_page_title (GTK_ASSISTANT(self), page,
- _("Sending mail"));
- gtk_assistant_set_page_type (GTK_ASSISTANT(self), page,
- GTK_ASSISTANT_PAGE_INTRO);
- gtk_assistant_set_page_complete (GTK_ASSISTANT(self),
- page, TRUE);
+ gtk_notebook_append_page (GTK_NOTEBOOK(priv->notebook), page);
+
+/* gtk_assistant_set_page_title (GTK_ASSISTANT(self), page, */
+/* _("Sending mail")); */
+/* gtk_assistant_set_page_type (GTK_ASSISTANT(self), page, */
+/* GTK_ASSISTANT_PAGE_INTRO); */
+/* gtk_assistant_set_page_complete (GTK_ASSISTANT(self), */
+/* page, TRUE); */
gtk_widget_show_all (page);
}
gtk_box_pack_start (GTK_BOX(page), box, FALSE, FALSE, 6);
- gtk_assistant_append_page (GTK_ASSISTANT(self), page);
+ gtk_notebook_append_page (GTK_NOTEBOOK(priv->notebook), page);
- gtk_assistant_set_page_title (GTK_ASSISTANT(self), page,
- _("Account Management"));
- gtk_assistant_set_page_type (GTK_ASSISTANT(self), page,
- GTK_ASSISTANT_PAGE_CONFIRM);
+ /* gtk_assistant_set_page_title (GTK_ASSISTANT(self), page, */
+/* _("Account Management")); */
+/* gtk_assistant_set_page_type (GTK_ASSISTANT(self), page, */
+/* GTK_ASSISTANT_PAGE_CONFIRM); */
- gtk_assistant_set_page_complete (GTK_ASSISTANT(self),
- page, TRUE);
+/* gtk_assistant_set_page_complete (GTK_ASSISTANT(self), */
+/* page, TRUE); */
gtk_widget_show_all (page);
}
priv->store_widget = NULL;
priv->transport_widget = NULL;
+ priv->notebook = gtk_notebook_new ();
}
static void
priv->account_mgr = NULL;
}
-
-
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
GtkWidget*
-modest_account_assistant_new (ModestAccountMgr *account_mgr, ModestWidgetFactory *factory)
+modest_account_assistant_new (GtkWidget *parent,
+ ModestAccountMgr *account_mgr,
+ ModestWidgetFactory *factory)
{
GObject *obj;
ModestAccountAssistant *self;
g_object_ref (account_mgr);
priv->account_mgr = account_mgr;
-
+
add_intro_page (self);
add_identity_page (self);
add_receiving_page (self);
add_sending_page (self);
add_final_page (self);
-
- gtk_assistant_set_current_page (GTK_ASSISTANT(self), 0);
+
+
+ //gtk_assistant_set_current_page (GTK_ASSISTANT(self), 0);
gtk_window_set_title (GTK_WINDOW(self),
_("Modest Account Wizard"));
gtk_window_set_resizable (GTK_WINDOW(self), TRUE);
#include <gtk/gtk.h>
#include <modest-widget-factory.h>
#include <modest-account-mgr.h>
+#include <hildon-widgets/hildon-wizard-dialog.h>
G_BEGIN_DECLS
typedef struct _ModestAccountAssistantClass ModestAccountAssistantClass;
struct _ModestAccountAssistant {
- GtkAssistant parent;
+ HildonWizardDialog parent;
/* insert public members, if any */
};
struct _ModestAccountAssistantClass {
- GtkAssistantClass parent_class;
+ HildonWizardDialogClass parent_class;
/* insert signal callback declarations, eg. */
/* void (* my_event) (ModestAccountAssistant* obj); */
};
*/
#include <glib/gi18n.h>
#include <tny-account-store.h>
-#include "modest-edit-msg-window.h"
+#include <widgets/modest-edit-msg-window.h>
+#include <hildon-widgets/hildon-window.h>
+#include <widgets/modest-toolbar.h>
#include "modest-widget-memory.h"
#include "modest-mail-operation.h"
#include "modest-tny-platform-factory.h"
#include "modest-tny-msg-actions.h"
#include <tny-simple-list.h>
+#include <string.h>
+
static void modest_edit_msg_window_class_init (ModestEditMsgWindowClass *klass);
static void modest_edit_msg_window_init (ModestEditMsgWindow *obj);
-static void
-on_menu_quit (ModestEditMsgWindow *self, guint action, GtkWidget *widget)
-{
- save_settings (self);
- gtk_widget_destroy (GTK_WIDGET(self));
-}
-
-
-/* Our menu, an array of GtkItemFactoryEntry structures that defines each menu item */
-static const gchar* UI_DEF=
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
- "<ui>"
- " <popup>"
- " <menu name=\"Message\" \"MenuMessage\">"
- " <menuitem name=\"New\" action=\"on_menu_quit\" />"
- " </menu>"
-// " <menu name=\"JustifyMenu\" action=\"JustifyMenuAction\">"
-// " <menuitem name=\"Left\" action=\"justify-left\"/>"
-// " <menuitem name=\"Centre\" action=\"justify-center\"/>"
-// " <menuitem name=\"Right\" action=\"justify-right\"/>"
-// " <menuitem name=\"Fill\" action=\"justify-fill\"/>"
-// " </menu>"
- " </popup>"
- "</ui>";
-
-
-static GtkMenu *
-get_menu (ModestEditMsgWindow *self)
-{
- GtkWidget *w;
- int i = 0;
-
- ModestEditMsgWindowPrivate *priv;
- priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(self);
-
- priv->ui_manager = gtk_ui_manager_new ();
-
- gtk_ui_manager_add_ui_from_string (priv->ui_manager,
- UI_DEF, strlen(UI_DEF),
- NULL);
-
- w = gtk_ui_manager_get_widget (priv->ui_manager, "/popup");
- g_warning ("==> GtkMenu? ==> %s", GTK_IS_MENU(w) ? "yes" : "no");
-
- return GTK_MENU(w);
-}
-
-
-
-
static void
send_mail (ModestEditMsgWindow *self)
for (i = 0 ; i != sizeof(button_ids) / sizeof(ModestToolbarButton); ++i)
buttons = g_slist_append (buttons, GINT_TO_POINTER(button_ids[i]));
- toolbar = modest_widget_factory_get_edit_toolbar (priv->factory, buttons);
+ toolbar = modest_toolbar_new (buttons);
g_slist_free (buttons);
g_signal_connect (G_OBJECT(toolbar), "button_clicked",
GtkWidget*
-modest_edit_msg_window_new (ModestWidgetFactory *factory,
- ModestEditType type, TnyMsg *msg)
+modest_edit_msg_window_new (ModestWidgetFactory *factory, ModestEditType type)
{
GObject *obj;
ModestEditMsgWindowPrivate *priv;
g_return_val_if_fail (factory, NULL);
g_return_val_if_fail (type < MODEST_EDIT_TYPE_NUM, NULL);
- g_return_val_if_fail (!(type==MODEST_EDIT_TYPE_NEW && msg), NULL);
- g_return_val_if_fail (!(type!=MODEST_EDIT_TYPE_NEW && !msg), NULL);
obj = g_object_new(MODEST_TYPE_EDIT_MSG_WINDOW, NULL);
priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(obj);
g_signal_connect (G_OBJECT(obj), "delete-event",
G_CALLBACK(on_delete_event), obj);
- if (msg) {
- /* Testing code. Should be into a set_msg method */
- TnyHeader *header;
- GtkTextBuffer *buf;
-
- header = tny_msg_get_header (msg);
- gtk_entry_set_text (GTK_ENTRY(priv->to_field),
- tny_header_get_to (header));
- gtk_entry_set_text (GTK_ENTRY(priv->cc_field),
- tny_header_get_cc (header));
- gtk_entry_set_text (GTK_ENTRY(priv->bcc_field),
- tny_header_get_bcc (header));
- gtk_entry_set_text (GTK_ENTRY(priv->subject_field),
- tny_header_get_subject (header));
-
- buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW(priv->msg_body));
- gtk_text_buffer_set_text (buf,
- (const gchar *) modest_tny_msg_actions_find_body (msg, FALSE),
- -1);
-
- /* TODO: lower priority, select in the From: combo to
- the value that comes from msg */
-
- /* TODO: set attachments */
- }
return GTK_WIDGET (obj);
}
+
+
+
+void
+modest_edit_msg_window_set_msg (ModestEditMsgWindow *self, TnyMsg *msg)
+{
+ TnyHeader *header;
+ GtkTextBuffer *buf;
+ const gchar *to, *cc, *bcc, *subject;
+ ModestEditMsgWindowPrivate *priv;
+
+ g_return_if_fail (MODEST_IS_EDIT_MSG_WINDOW (self));
+ g_return_if_fail (TNY_IS_MSG (msg));
+
+ priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE (self);
+
+ header = tny_msg_get_header (msg);
+ to = tny_header_get_to (header);
+ cc = tny_header_get_cc (header);
+ bcc = tny_header_get_bcc (header);
+ subject = tny_header_get_subject (header);
+
+ if (to)
+ gtk_entry_set_text (GTK_ENTRY(priv->to_field), to);
+ if (cc)
+ gtk_entry_set_text (GTK_ENTRY(priv->cc_field), cc);
+ if (bcc)
+ gtk_entry_set_text (GTK_ENTRY(priv->bcc_field), bcc);
+ if (subject)
+ gtk_entry_set_text (GTK_ENTRY(priv->subject_field), subject);
+
+ buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW(priv->msg_body));
+ gtk_text_buffer_set_text (buf,
+ (const gchar *) modest_tny_msg_actions_find_body (msg, TRUE),
+ -1);
+
+ /* TODO: lower priority, select in the From: combo to the
+ value that comes from msg <- not sure, should it be
+ allowed? */
+
+ /* TODO: set attachments */
+}
#include <glib/gi18n.h>
#include <gtk/gtktreeviewcolumn.h>
-#include "modest-main-window.h"
-#include "modest-widget-factory.h"
+#include <widgets/modest-main-window.h>
+#include <widgets/modest-edit-msg-window.h>
+#include <modest-widget-factory.h>
#include "modest-widget-memory.h"
#include "modest-icon-factory.h"
#include "modest-ui.h"
#include "modest-account-view-window.h"
#include "modest-account-mgr.h"
#include "modest-conf.h"
-#include "modest-edit-msg-window.h"
+
#include "modest-tny-platform-factory.h"
#include "modest-tny-msg-actions.h"
#include "modest-mail-operation.h"
GtkWidget *toolbar;
GtkWidget *menubar;
-
- GtkWidget *folder_paned;
GtkWidget *msg_paned;
GtkWidget *main_paned;
ModestHeaderView *header_view;
ModestFolderView *folder_view;
- ModestMsgView *msg_preview;
+ //ModestMsgView *msg_preview;
};
ModestHeaderViewColumn cols[] = {
MODEST_HEADER_VIEW_COLUMN_MSGTYPE,
MODEST_HEADER_VIEW_COLUMN_ATTACH,
-/* MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER, */
- MODEST_HEADER_VIEW_COLUMN_FROM,
- MODEST_HEADER_VIEW_COLUMN_SUBJECT,
- MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE
+ MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN,
};
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
header_view = modest_widget_factory_get_header_view (priv->widget_factory);
modest_header_view_set_columns (header_view, columns);
- g_list_free (columns);
+ modest_header_view_set_style (header_view, 0); /* don't show headers */
+
+ g_list_free (columns);
return header_view;
}
modest_widget_memory_restore (conf,G_OBJECT(self),
"modest-main-window");
- modest_widget_memory_restore (conf, G_OBJECT(priv->folder_paned),
- "modest-folder-paned");
- modest_widget_memory_restore (conf, G_OBJECT(priv->msg_paned),
- "modest-msg-paned");
modest_widget_memory_restore (conf, G_OBJECT(priv->main_paned),
"modest-main-paned");
modest_widget_memory_restore (conf, G_OBJECT(priv->header_view),
conf = modest_tny_platform_factory_get_modest_conf_instance (priv->factory);
modest_widget_memory_save (conf,G_OBJECT(self), "modest-main-window");
- modest_widget_memory_save (conf, G_OBJECT(priv->folder_paned),
- "modest-folder-paned");
- modest_widget_memory_save (conf, G_OBJECT(priv->msg_paned),
- "modest-msg-paned");
modest_widget_memory_save (conf, G_OBJECT(priv->main_paned),
"modest-main-paned");
modest_widget_memory_save (conf, G_OBJECT(priv->header_view), "header-view");
/* widgets from factory */
priv->folder_view = modest_widget_factory_get_folder_view (widget_factory);
priv->header_view = header_view_new (MODEST_MAIN_WINDOW(obj));
- priv->msg_preview = modest_widget_factory_get_msg_preview (widget_factory);
folder_win = wrapped_in_scrolled_window (GTK_WIDGET(priv->folder_view),
FALSE);
FALSE);
/* paned */
- priv->folder_paned = gtk_vpaned_new ();
- priv->msg_paned = gtk_vpaned_new ();
priv->main_paned = gtk_hpaned_new ();
gtk_paned_add1 (GTK_PANED(priv->main_paned), folder_win);
- gtk_paned_add2 (GTK_PANED(priv->main_paned), priv->msg_paned);
- gtk_paned_add1 (GTK_PANED(priv->msg_paned), header_win);
- gtk_paned_add2 (GTK_PANED(priv->msg_paned), GTK_WIDGET(priv->msg_preview));
-
+ gtk_paned_add2 (GTK_PANED(priv->main_paned), header_win);
gtk_widget_show (GTK_WIDGET(priv->header_view));
+
gtk_tree_view_columns_autosize (GTK_TREE_VIEW(priv->header_view));
projects / modest / commitdiff
