#include "modest-edit-msg-window.h"
#include <widgets/modest-msg-view.h>
#include <modest-widget-memory.h>
+#include <modest-widget-factory.h>
+#include "modest-icon-names.h"
-/* 'private'/'protected' functions */
static void modest_edit_msg_window_class_init (ModestEditMsgWindowClass *klass);
static void modest_edit_msg_window_init (ModestEditMsgWindow *obj);
static void modest_edit_msg_window_finalize (GObject *obj);
struct _ModestEditMsgWindowPrivate {
ModestConf *conf;
+ ModestWidgetFactory *factory;
- GtkWidget *msg_body;
- GtkWidget *to_field, *cc_field, *bcc_field,
- *subject_field;
+ GtkWidget *toolbar, *menubar;
+ GtkWidget *msg_body;
+ GtkWidget *to_field, *cc_field, *bcc_field,
+ *subject_field;
};
#define MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_EDIT_MSG_WINDOW, \
sizeof(ModestEditMsgWindow),
1, /* n_preallocs */
(GInstanceInitFunc) modest_edit_msg_window_init,
+ NULL
};
my_type = g_type_register_static (GTK_TYPE_WINDOW,
"ModestEditMsgWindow",
static void
modest_edit_msg_window_init (ModestEditMsgWindow *obj)
{
+ ModestEditMsgWindowPrivate *priv;
+ priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(obj);
+
+ priv->factory = NULL;
+ priv->toolbar = NULL;
+ priv->menubar = NULL;
+
+}
+
+
+
+
+/* Our menu, an array of GtkItemFactoryEntry structures that defines each menu item */
+static GtkItemFactoryEntry menu_items[] = {
+ { "/_File", NULL, NULL, 0, "<Branch>" },
+ { "/File/_New", "<control>N", NULL, 0, "<StockItem>", GTK_STOCK_NEW },
+ { "/File/_Open", "<control>O", NULL, 0, "<StockItem>", GTK_STOCK_OPEN },
+ { "/File/_Save", "<control>S", NULL, 0, "<StockItem>", GTK_STOCK_SAVE },
+ { "/File/Save _As", NULL, NULL, 0, "<Item>" },
+ { "/File/Save Draft", "<control><shift>S", NULL, 0, "<Item>" },
+
+
+ { "/File/sep1", NULL, NULL, 0, "<Separator>" },
+ { "/File/_Quit", "<CTRL>Q", NULL, 0, "<StockItem>", GTK_STOCK_QUIT },
+
+ { "/_Edit", NULL, NULL, 0, "<Branch>" },
+ { "/Edit/_Undo", "<CTRL>Z", NULL, 0, "<StockItem>", GTK_STOCK_UNDO },
+ { "/Edit/_Redo", "<shift><CTRL>Z", NULL, 0, "<StockItem>", GTK_STOCK_REDO },
+ { "/File/sep1", NULL, NULL, 0, "<Separator>" },
+ { "/Edit/Cut", "<control>X", NULL, 0, "<StockItem>", GTK_STOCK_CUT },
+ { "/Edit/Copy", "<CTRL>C", NULL, 0, "<StockItem>", GTK_STOCK_COPY },
+ { "/Edit/Paste", NULL, NULL, 0, "<StockItem>", GTK_STOCK_PASTE},
+ { "/Edit/sep1", NULL, NULL, 0, "<Separator>" },
+ { "/Edit/Delete", "<CTRL>Q", NULL, 0, "<Item>" },
+ { "/Edit/Select all", "<CTRL>A", NULL, 0, "<Item>" },
+ { "/Edit/Deselect all", "<Shift><CTRL>A", NULL, 0, "<Item>" },
+
+ { "/_View", NULL, NULL, 0, "<Branch>" },
+ { "/View/To-field", NULL, NULL, 0, "<Item>" },
+
+ { "/View/Cc-field:", NULL, NULL, 0, "<Item>" },
+ { "/View/Bcc-field:", NULL, NULL, 0, "<Item>" },
+
+
+ { "/_Insert", NULL, NULL, 0, "<Branch>" },
+/* { "/Actions/_Reply", NULL, NULL, 0, "<Item>" }, */
+/* { "/Actions/_Forward", NULL, NULL, 0, "<Item>" }, */
+/* { "/Actions/_Bounce", NULL, NULL, 0, "<Item>" }, */
+
+ { "/_Format", NULL, NULL, 0, "<Branch>" }
+/* { "/Options/_Accounts", NULL, on_menu_accounts,0, "<Item>" }, */
+/* { "/Options/_Contacts", NULL, NULL, 0, "<Item>" }, */
+
+
+/* { "/_Help", NULL, NULL, 0, "<Branch>" }, */
+/* { "/_Help/About", NULL, on_menu_about, 0, "<StockItem>", GTK_STOCK_ABOUT}, */
+};
+
+static gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
+
+
+static GtkWidget *
+menubar_new (ModestEditMsgWindow *self)
+{
+ GtkItemFactory *item_factory;
+ GtkAccelGroup *accel_group;
+
+ /* Make an accelerator group (shortcut keys) */
+ accel_group = gtk_accel_group_new ();
+
+ /* Make an ItemFactory (that makes a menubar) */
+ item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>",
+ accel_group);
+
+ /* This function generates the menu items. Pass the item factory,
+ the number of items in the array, the array itself, and any
+ callback data for the the menu items. */
+ gtk_item_factory_create_items (item_factory, nmenu_items, menu_items, self);
+
+ ///* Attach the new accelerator group to the window. */
+ gtk_window_add_accel_group (GTK_WINDOW (self), accel_group);
+
+ /* Finally, return the actual menu bar created by the item factory. */
+ return gtk_item_factory_get_widget (item_factory, "<main>");
+}
+
+
+
+
+static ModestToolbar*
+toolbar_new (ModestEditMsgWindow *self)
+{
+ int i;
+ ModestToolbar *toolbar;
+ GSList *buttons = NULL;
+ ModestEditMsgWindowPrivate *priv;
+
+ ModestToolbarButton button_ids[] = {
+ MODEST_TOOLBAR_BUTTON_MAIL_SEND
+ };
+
+ priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(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);
+ g_slist_free (buttons);
+
+ return toolbar;
+}
+
+
+static void
+init_window (ModestEditMsgWindow *obj)
+{
GtkWidget *to_button, *cc_button, *bcc_button, *subject_label;
GtkWidget *header_table;
GtkWidget *main_vbox;
main_vbox = gtk_vbox_new (FALSE, 6);
- gtk_box_pack_start (GTK_BOX(main_vbox), header_table, FALSE, FALSE, 6);
+ priv->menubar = menubar_new (obj);
+ priv->toolbar = GTK_WIDGET(toolbar_new (obj));
+
+ gtk_box_pack_start (GTK_BOX(main_vbox), priv->menubar, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(main_vbox), priv->toolbar, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(main_vbox), header_table, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX(main_vbox), priv->msg_body, TRUE, TRUE, 6);
gtk_widget_show_all (GTK_WIDGET(main_vbox));
gtk_container_add (GTK_CONTAINER(obj), main_vbox);
}
+
+
static void
modest_edit_msg_window_finalize (GObject *obj)
g_object_unref (G_OBJECT(priv->conf));
priv->conf = NULL;
+ g_object_unref (G_OBJECT(priv->factory));
+ priv->factory = NULL;
+
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
+
+
static gboolean
on_delete_event (GtkWidget *widget, GdkEvent *event, ModestEditMsgWindow *self)
{
ModestEditMsgWindowPrivate *priv;
priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(self);
-
+
modest_widget_memory_save_settings (priv->conf,
GTK_WIDGET(priv->msg_body),
"modest-edit-msg-body");
- gtk_widget_destroy (GTK_WIDGET(self));
- return TRUE;
+ return FALSE;
}
-
-
GtkWidget*
-modest_edit_msg_window_new (ModestConf *conf, ModestEditType type,
- TnyMsgIface *msg)
+modest_edit_msg_window_new (ModestConf *conf, ModestWidgetFactory *factory,
+ ModestEditType type, TnyMsgIface *msg)
{
GObject *obj;
ModestEditMsgWindowPrivate *priv;
g_return_val_if_fail (conf, NULL);
+ g_return_val_if_fail (factory, NULL);
g_return_val_if_fail (type >= 0 && 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);
-
+ 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_object_ref (G_OBJECT(conf));
priv->conf = conf;
+
+ g_object_ref (factory);
+ priv->factory = factory;
+
+ init_window (obj);
- modest_widget_memory_restore_settings (priv->conf, GTK_WIDGET(priv->msg_body),
+ modest_widget_memory_restore_settings (priv->conf, GTK_WIDGET(obj),
"modest-edit-msg-body");
+
+ gtk_window_set_title (GTK_WINDOW(obj), "Modest");
+ gtk_window_set_icon (GTK_WINDOW(obj),
+ modest_icon_factory_get_icon (MODEST_APP_ICON));
g_signal_connect (G_OBJECT(obj), "delete-event",
G_CALLBACK(on_delete_event), obj);
#include <modest-widget-memory.h>
#include <modest-icon-factory.h>
+#include <widgets/modest-toolbar.h>
+
#include "modest-main-window.h"
#include "modest-account-view-window.h"
#include "modest-edit-msg-window.h"
GtkWidget *msg_paned;
GtkWidget *main_paned;
- ModestWidgetFactory *widget_factory;
+ ModestWidgetFactory *factory;
ModestConf *conf;
ModestAccountMgr *account_mgr;
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj);
- priv->widget_factory = NULL;
+ priv->factory = NULL;
priv->conf = NULL;
priv->account_mgr = NULL;
}
{
ModestMainWindowPrivate *priv;
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj);
- if (priv->widget_factory) {
- g_object_unref (G_OBJECT(priv->widget_factory));
- priv->widget_factory = NULL;
+ if (priv->factory) {
+ g_object_unref (G_OBJECT(priv->factory));
+ priv->factory = NULL;
}
if (priv->conf) {
g_object_unref (G_OBJECT(priv->conf));
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
account_win = modest_account_view_window_new (priv->account_mgr,
- priv->widget_factory);
+ priv->factory);
gtk_window_set_transient_for (GTK_WINDOW(account_win),
GTK_WINDOW(self));
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
msg_win = modest_edit_msg_window_new (priv->conf,
+ priv->factory,
MODEST_EDIT_TYPE_NEW,
NULL);
gtk_widget_show (msg_win);
static void
on_menu_quit (ModestMainWindow *self, guint action, GtkWidget *widget)
{
- gtk_main_quit ();
+ save_sizes (self);
+ gtk_widget_destroy (GTK_WIDGET(self));
}
-
/* Our menu, an array of GtkItemFactoryEntry structures that defines each menu item */
static GtkItemFactoryEntry menu_items[] = {
{ "/_File", NULL, NULL, 0, "<Branch>" },
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 */
};
-
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
for (i = 0 ; i != sizeof(cols) / sizeof(ModestHeaderViewColumn); ++i)
columns = g_slist_append (columns, GINT_TO_POINTER(cols[i]));
- header_view = modest_widget_factory_get_header_view (priv->widget_factory);
+ header_view = modest_widget_factory_get_header_view (priv->factory);
modest_header_view_set_columns (header_view, columns);
g_slist_free (columns);
return header_view;
}
+static ModestToolbar*
+toolbar_new (ModestMainWindow *self)
+{
+ int i;
+ ModestToolbar *toolbar;
+ GSList *buttons = NULL;
+ ModestMainWindowPrivate *priv;
+
+ ModestToolbarButton button_ids[] = {
+ MODEST_TOOLBAR_BUTTON_NEW_MAIL,
+ MODEST_TOOLBAR_BUTTON_REPLY,
+ MODEST_TOOLBAR_BUTTON_REPLY_ALL,
+ MODEST_TOOLBAR_BUTTON_FORWARD,
+ MODEST_TOOLBAR_SEPARATOR,
+ MODEST_TOOLBAR_BUTTON_SEND_RECEIVE,
+ MODEST_TOOLBAR_SEPARATOR,
+ MODEST_TOOLBAR_BUTTON_NEXT,
+ MODEST_TOOLBAR_BUTTON_PREV,
+ MODEST_TOOLBAR_SEPARATOR,
+ MODEST_TOOLBAR_BUTTON_DELETE
+ };
+
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE(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_main_toolbar (priv->factory, buttons);
+ g_slist_free (buttons);
+
+ return toolbar;
+}
+
+
static void
restore_sizes (ModestMainWindow *self)
{
- ModestMainWindowPrivate *priv;
-
+ ModestMainWindowPrivate *priv;
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
modest_widget_memory_restore_settings (priv->conf,GTK_WIDGET(self),
"modest-msg-paned");
modest_widget_memory_restore_settings (priv->conf, GTK_WIDGET(priv->main_paned),
"modest-main-paned");
-
}
"modest-msg-paned");
modest_widget_memory_save_settings (priv->conf, GTK_WIDGET(priv->main_paned),
"modest-main-paned");
-
-
-
}
-
static GtkWidget*
wrapped_in_scrolled_window (GtkWidget *widget, gboolean needs_viewport)
{
on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMainWindow *self)
{
save_sizes (self);
- gtk_widget_destroy (GTK_WIDGET(self));
-
- return TRUE;
+ return FALSE;
}
+static GtkWidget*
+favorites_view ()
+{
+ GtkWidget *favorites;
+ GtkTreeStore *store;
+ GtkTreeViewColumn *col;
+
+ store = gtk_tree_store_new (1, G_TYPE_STRING);
+ favorites = gtk_tree_view_new_with_model (GTK_TREE_MODEL(store));
+ col = gtk_tree_view_column_new_with_attributes (_("Favorites"),
+ gtk_cell_renderer_text_new(),
+ "text", 0, NULL);
+
+ gtk_tree_view_append_column (GTK_TREE_VIEW(favorites), col);
+ gtk_widget_show_all (favorites);
+
+ g_object_unref (G_OBJECT(store));
+
+ return favorites;
+}
GtkWidget *main_vbox;
GtkWidget *status_hbox;
- GtkWidget *header_win, *folder_win;
+ GtkWidget *header_win, *folder_win, *favorites_win;
g_return_val_if_fail (factory, NULL);
g_return_val_if_fail (conf, NULL);
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj);
g_object_ref (factory);
- priv->widget_factory = factory;
+ priv->factory = factory;
g_object_ref (conf);
priv->conf = conf;
g_object_ref (account_mgr);
priv->account_mgr = account_mgr;
-
/* widgets from factory */
priv->folder_view = modest_widget_factory_get_folder_view (factory);
priv->header_view = header_view_new (MODEST_MAIN_WINDOW(obj));
priv->msg_preview = modest_widget_factory_get_msg_preview (factory);
-
+
folder_win = wrapped_in_scrolled_window (GTK_WIDGET(priv->folder_view),
FALSE);
header_win = wrapped_in_scrolled_window (GTK_WIDGET(priv->header_view),
FALSE);
+ favorites_win = wrapped_in_scrolled_window (favorites_view(),FALSE);
+
/* tool/menubar */
priv->menubar = menubar_new (MODEST_MAIN_WINDOW(obj));
- priv->toolbar = gtk_toolbar_new ();
+ priv->toolbar = GTK_WIDGET(toolbar_new (MODEST_MAIN_WINDOW(obj)));
/* paned */
priv->folder_paned = gtk_vpaned_new ();
priv->main_paned = gtk_hpaned_new ();
gtk_paned_add1 (GTK_PANED(priv->main_paned), priv->folder_paned);
gtk_paned_add2 (GTK_PANED(priv->main_paned), priv->msg_paned);
-// gtk_paned_add1 (GTK_PANED(priv->folder_paned),
-// gtk_label_new (_("Favorites")));
+ gtk_paned_add1 (GTK_PANED(priv->folder_paned), favorites_win);
gtk_paned_add2 (GTK_PANED(priv->folder_paned), folder_win);
gtk_paned_add1 (GTK_PANED(priv->msg_paned), header_win);
gtk_paned_add2 (GTK_PANED(priv->msg_paned), GTK_WIDGET(priv->msg_preview));
/* status bar / progress */
status_hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX(status_hbox),
+ modest_widget_factory_get_folder_info_label (factory),
+ FALSE,FALSE, 6);
+ gtk_box_pack_start (GTK_BOX(status_hbox),
modest_widget_factory_get_status_bar(factory),
TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX(status_hbox),
modest_icon_factory_get_icon (MODEST_APP_ICON));
gtk_widget_show_all (main_vbox);
-
+
g_signal_connect (G_OBJECT(obj), "delete-event",
G_CALLBACK(on_delete_event), obj);
projects / modest / commitdiff