#include "modest-widget-memory.h"
#include "modest-icon-factory.h"
#include "modest-ui.h"
+#include "modest-main-window-ui.h"
#include "modest-account-view-window.h"
#include "modest-account-mgr.h"
#include "modest-conf.h"
struct _ModestMainWindowPrivate {
GtkUIManager *ui_manager;
-
+ ModestWidgetFactory *widget_factory;
+ TnyPlatformFactory *factory;
+ ModestTnyAccountStore *account_store;
+
GtkWidget *toolbar;
GtkWidget *menubar;
GtkWidget *msg_paned;
GtkWidget *main_paned;
- ModestWidgetFactory *widget_factory;
- TnyPlatformFactory *factory;
-
ModestHeaderView *header_view;
ModestFolderView *folder_view;
ModestMsgView *msg_preview;
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj);
priv->factory = modest_tny_platform_factory_get_instance ();
+ priv->widget_factory = NULL;
+ priv->ui_manager = NULL;
+ priv->account_store = NULL;
}
static void
g_object_unref (G_OBJECT(priv->widget_factory));
priv->widget_factory = NULL;
}
+ if (priv->ui_manager) {
+ g_object_unref (G_OBJECT(priv->ui_manager));
+ priv->ui_manager = NULL;
+ }
+ if (priv->account_store) {
+ g_object_unref (G_OBJECT(priv->account_store));
+ priv->account_store = NULL;
+ }
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
header_view_new (ModestMainWindow *self)
{
int i;
- GList *columns = NULL;
ModestHeaderView *header_view;
ModestMainWindowPrivate *priv;
- 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
- };
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
- for (i = 0 ; i != sizeof(cols) / sizeof(ModestHeaderViewColumn); ++i)
- columns = g_list_append (columns, GINT_TO_POINTER(cols[i]));
-
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,
+ MODEST_HEADER_VIEW_STYLE_SHOW_HEADERS);
return header_view;
}
ModestMainWindowPrivate *priv;
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
- conf = modest_tny_platform_factory_get_modest_conf_instance (priv->factory);
+ conf = modest_tny_platform_factory_get_conf_instance
+ (MODEST_TNY_PLATFORM_FACTORY(priv->factory));
- 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-main-paned");
modest_widget_memory_restore (conf, G_OBJECT(priv->header_view),
"header-view");
+ modest_widget_memory_restore (conf,G_OBJECT(self),
+ "modest-main-window");
}
ModestConf *conf;
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
- conf = modest_tny_platform_factory_get_modest_conf_instance (priv->factory);
+ conf = modest_tny_platform_factory_get_conf_instance
+ (MODEST_TNY_PLATFORM_FACTORY(priv->factory));
modest_widget_memory_save (conf,G_OBJECT(self), "modest-main-window");
modest_widget_memory_save (conf, G_OBJECT(priv->folder_paned),
}
-GtkWidget*
+ModestWindow *
modest_main_window_new (ModestWidgetFactory *widget_factory,
- GtkUIManager *ui_manager)
+ TnyAccountStore *account_store)
{
GObject *obj;
ModestMainWindowPrivate *priv;
GtkWidget *main_vbox;
GtkWidget *status_hbox;
GtkWidget *header_win, *folder_win;
+ GtkActionGroup *action_group;
+ GError *error = NULL;
g_return_val_if_fail (widget_factory, NULL);
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj);
priv->widget_factory = g_object_ref (widget_factory);
- priv->ui_manager = g_object_ref (ui_manager);
+ priv->account_store = g_object_ref (account_store);
+
+ /* ***************** */
+ priv->ui_manager = gtk_ui_manager_new();
+ action_group = gtk_action_group_new ("ModestMainWindowActions");
+
+ /* Add common actions */
+ gtk_action_group_add_actions (action_group,
+ modest_action_entries,
+ G_N_ELEMENTS (modest_action_entries),
+ obj);
+
+ gtk_ui_manager_insert_action_group (priv->ui_manager, action_group, 0);
+ g_object_unref (action_group);
+
+ /* Load the UI definition */
+ gtk_ui_manager_add_ui_from_file (priv->ui_manager, MODEST_UIDIR "modest-ui.xml", &error);
+ if (error != NULL) {
+ g_warning ("Could not merge modest-ui.xml: %s", error->message);
+ g_error_free (error);
+ error = NULL;
+ }
+ /* *************** */
+/* priv->ui_manager = g_object_ref (ui_manager); */
/* Add accelerators */
gtk_window_add_accel_group (GTK_WINDOW (obj),
gtk_paned_add2 (GTK_PANED(priv->msg_paned), GTK_WIDGET(priv->msg_preview));
gtk_widget_show (GTK_WIDGET(priv->header_view));
- gtk_tree_view_columns_autosize (GTK_TREE_VIEW(priv->header_view));
-
/* status bar / progress */
status_hbox = gtk_hbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER(obj), main_vbox);
restore_sizes (MODEST_MAIN_WINDOW(obj));
- gtk_window_set_title (GTK_WINDOW(obj), "Modest");
+ gtk_window_set_title (GTK_WINDOW(obj), _("Modest"));
gtk_window_set_icon (GTK_WINDOW(obj),
- modest_icon_factory_get_icon (MODEST_APP_ICON));
-
+ 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);
- return GTK_WIDGET(obj);
+ return (ModestWindow *) obj;
+}
+
+ModestWidgetFactory *
+modest_main_window_get_widget_factory (ModestMainWindow *main_window)
+{
+ ModestMainWindowPrivate *priv;
+
+ g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (main_window), NULL);
+
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window);
+
+ return g_object_ref (priv->widget_factory);
+}
+
+TnyAccountStore *
+modest_main_window_get_account_store (ModestMainWindow *main_window)
+{
+ ModestMainWindowPrivate *priv;
+
+ g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (main_window), NULL);
+
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window);
+
+ return g_object_ref (priv->account_store);
}