#include <glib/gi18n.h>
#include <gtk/gtktreeviewcolumn.h>
+#include <tny-account-store-view.h>
+#include <modest-runtime.h>
#include <widgets/modest-main-window.h>
-#include <widgets/modest-edit-msg-window.h>
-#include <modest-widget-factory.h>
+#include <widgets/modest-msg-edit-window.h>
+#include <widgets/modest-account-view-window.h>
+
#include "modest-widget-memory.h"
#include "modest-window-priv.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"
#include "modest-tny-platform-factory.h"
-#include "modest-tny-msg-actions.h"
+#include "modest-tny-msg.h"
#include "modest-mail-operation.h"
#include "modest-icon-names.h"
static void modest_main_window_init (ModestMainWindow *obj);
static void modest_main_window_finalize (GObject *obj);
+static void connect_signals (ModestMainWindow *self);
static void restore_sizes (ModestMainWindow *self);
static void save_sizes (ModestMainWindow *self);
typedef struct _ModestMainWindowPrivate ModestMainWindowPrivate;
struct _ModestMainWindowPrivate {
-
GtkWidget *msg_paned;
GtkWidget *main_paned;
-
+ GtkWidget *progress_bar;
+
ModestHeaderView *header_view;
ModestFolderView *folder_view;
- ModestMsgView *msg_preview;
+
};
priv->main_paned = NULL;
priv->header_view = NULL;
priv->folder_view = NULL;
- priv->msg_preview = NULL;
+
+ /* progress bar */
+ priv->progress_bar = gtk_progress_bar_new ();
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(priv->progress_bar), 1.0);
+ gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR(priv->progress_bar),
+ PANGO_ELLIPSIZE_END);
}
static void
}
-static ModestHeaderView*
-header_view_new (ModestMainWindow *self)
+GtkWidget*
+modest_main_window_get_child_widget (ModestMainWindow *self,
+ ModestWidgetType widget_type)
{
- ModestHeaderView *header_view;
- ModestWindowPrivate *parent_priv;
+ ModestMainWindowPrivate *priv;
+ GtkWidget *widget;
- parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
- header_view = modest_widget_factory_get_header_view (parent_priv->widget_factory);
- modest_header_view_set_style (header_view, 0); /* don't show headers */
+ g_return_val_if_fail (self, NULL);
+ g_return_val_if_fail (widget_type >= 0 && widget_type < MODEST_WIDGET_TYPE_NUM,
+ NULL);
- return header_view;
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+
+ switch (widget_type) {
+ case MODEST_WIDGET_TYPE_HEADER_VIEW:
+ widget = (GtkWidget*)priv->header_view; break;
+ case MODEST_WIDGET_TYPE_FOLDER_VIEW:
+ widget = (GtkWidget*)priv->folder_view; break;
+ default:
+ g_return_val_if_reached (NULL);
+ return NULL;
+ }
+
+ return widget ? GTK_WIDGET(widget) : NULL;
}
+
static void
restore_sizes (ModestMainWindow *self)
{
ModestConf *conf;
ModestMainWindowPrivate *priv;
- ModestWindowPrivate *parent_priv;
-
- priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
- parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
- conf = modest_tny_platform_factory_get_conf_instance
- (MODEST_TNY_PLATFORM_FACTORY(parent_priv->plat_factory));
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+ conf = modest_runtime_get_conf ();
+
modest_widget_memory_restore (conf,G_OBJECT(self),
"modest-main-window");
modest_widget_memory_restore (conf, G_OBJECT(priv->main_paned),
static void
save_sizes (ModestMainWindow *self)
{
- ModestMainWindowPrivate *priv;
- ModestWindowPrivate *parent_priv;
ModestConf *conf;
-
+ ModestMainWindowPrivate *priv;
+
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
- parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
-
- conf = modest_tny_platform_factory_get_conf_instance
- (MODEST_TNY_PLATFORM_FACTORY (parent_priv->plat_factory));
+ conf = modest_runtime_get_conf ();
modest_widget_memory_save (conf,G_OBJECT(self), "modest-main-window");
modest_widget_memory_save (conf, G_OBJECT(priv->main_paned),
return main_menu;
}
+static GtkWidget*
+get_toolbar (ModestMainWindow *self)
+{
+ GtkWidget *toolbar, *progress_box, *progress_alignment;
+ GtkToolItem *progress_item;
+ ModestWindowPrivate *parent_priv;
+ ModestMainWindowPrivate *priv;
+ GtkWidget *stop_icon;
+
+ parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+
+ /* Toolbar */
+ toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
+
+ gtk_progress_bar_set_text (GTK_PROGRESS_BAR(priv->progress_bar), "Connecting...");
+
+ progress_box = gtk_hbox_new (FALSE, HILDON_MARGIN_DEFAULT);
+ progress_alignment = gtk_alignment_new (0.5, 0.5, 1, 0);
+
+ gtk_container_add (GTK_CONTAINER(progress_alignment), priv->progress_bar);
+ gtk_box_pack_start (GTK_BOX(progress_box), progress_alignment, TRUE, TRUE, 0);
+
+ progress_item = gtk_tool_item_new ();
+ gtk_container_add (GTK_CONTAINER(progress_item), progress_box);
+ gtk_tool_item_set_homogeneous (progress_item, FALSE);
+ gtk_tool_item_set_expand(progress_item, TRUE);
+
+ gtk_toolbar_insert (GTK_TOOLBAR(toolbar), progress_item,
+ gtk_toolbar_get_n_items(GTK_TOOLBAR(toolbar)));
+
+ stop_icon = gtk_image_new_from_icon_name("qgn_toolb_gene_stop", GTK_ICON_SIZE_BUTTON);
+ gtk_toolbar_insert (GTK_TOOLBAR(toolbar), gtk_tool_button_new(stop_icon, NULL),
+ gtk_toolbar_get_n_items(GTK_TOOLBAR(toolbar)));
+
+
+ gtk_widget_show_all (toolbar);
+ return toolbar;
+}
+
+
+static void
+on_destroy (GtkWidget *widget, GdkEvent *event, ModestMainWindow *self)
+{
+ gtk_main_quit();
+}
+
+static void
+connect_signals (ModestMainWindow *self)
+{
+ ModestWindowPrivate *parent_priv;
+ ModestMainWindowPrivate *priv;
+ TnyDevice *device;
+ ModestTnyAccountStore *account_store;
+
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+ parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
+
+ account_store = modest_runtime_get_account_store ();
+ device = tny_account_store_get_device(TNY_ACCOUNT_STORE(account_store));
+
+ /* folder view */
+ g_signal_connect (G_OBJECT(priv->folder_view), "folder_selection_changed",
+ G_CALLBACK(modest_ui_actions_on_folder_selection_changed), self);
+ g_signal_connect (G_OBJECT(priv->folder_view), "folder_moved",
+ G_CALLBACK(modest_ui_actions_on_folder_moved), NULL);
+// g_signal_connect (G_OBJECT(self->folder_view), "button-press-event",
+// G_CALLBACK (on_folder_view_button_press_event),self);
+// g_signal_connect (self->folder_view,"popup-menu",
+// G_CALLBACK (on_folder_view_button_press_event),self);
+
+ /* header view */
+ g_signal_connect (G_OBJECT(priv->header_view), "status_update",
+ G_CALLBACK(modest_ui_actions_on_header_status_update), self);
+ g_signal_connect (G_OBJECT(priv->header_view), "header_selected",
+ G_CALLBACK(modest_ui_actions_on_header_selected), self);
+ g_signal_connect (G_OBJECT(priv->header_view), "header_activated",
+ G_CALLBACK(modest_ui_actions_on_header_activated), self);
+ g_signal_connect (G_OBJECT(priv->header_view), "item_not_found",
+ G_CALLBACK(modest_ui_actions_on_item_not_found), self);
+// g_signal_connect (G_OBJECT(self->header_view), "button-press-event",
+// G_CALLBACK (on_header_view_button_press_event), self);
+// g_signal_connect (G_OBJECT(self->header_view),"popup-menu",0
+// G_CALLBACK (on_header_view_button_press_event), self);
+
+ /* Account store */
+ g_signal_connect (G_OBJECT (modest_runtime_get_account_store()), "accounts_reloaded",
+ G_CALLBACK (modest_ui_actions_on_accounts_reloaded), self);
+
+
+ /* window */
+ g_signal_connect (G_OBJECT(self), "destroy", G_CALLBACK(on_destroy), NULL);
+ g_signal_connect (G_OBJECT(self), "delete-event", G_CALLBACK(on_delete_event), self);
+}
+
+
+
ModestWindow*
-modest_main_window_new (ModestWidgetFactory *widget_factory,
- TnyAccountStore *account_store)
+modest_main_window_new (void)
{
- GObject *obj;
+ ModestMainWindow *self;
ModestMainWindowPrivate *priv;
ModestWindowPrivate *parent_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);
-
- obj = g_object_new(MODEST_TYPE_MAIN_WINDOW, NULL);
+ TnyFolderStoreQuery *query;
- priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj);
- parent_priv = MODEST_WINDOW_GET_PRIVATE(obj);
-
- parent_priv->widget_factory = g_object_ref (widget_factory);
- parent_priv->account_store = g_object_ref (account_store);
+ self = MODEST_MAIN_WINDOW(g_object_new(MODEST_TYPE_MAIN_WINDOW, NULL));
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+ parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
parent_priv->ui_manager = gtk_ui_manager_new();
action_group = gtk_action_group_new ("ModestMainWindowActions");
gtk_action_group_add_actions (action_group,
modest_action_entries,
G_N_ELEMENTS (modest_action_entries),
- obj);
-
+ self);
+
gtk_ui_manager_insert_action_group (parent_priv->ui_manager, action_group, 0);
g_object_unref (action_group);
/* Load the UI definition */
- gtk_ui_manager_add_ui_from_file (parent_priv->ui_manager, MODEST_UIDIR "modest-ui.xml", &error);
+ gtk_ui_manager_add_ui_from_file (parent_priv->ui_manager, MODEST_UIDIR "modest-main-window-ui.xml", &error);
if (error != NULL) {
g_warning ("Could not merge modest-ui.xml: %s", error->message);
g_error_free (error);
}
/* Add accelerators */
- gtk_window_add_accel_group (GTK_WINDOW (obj),
+ gtk_window_add_accel_group (GTK_WINDOW (self),
gtk_ui_manager_get_accel_group (parent_priv->ui_manager));
-
- /* Toolbar */
- parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
- hildon_window_add_toolbar (HILDON_WINDOW (obj), GTK_TOOLBAR (parent_priv->toolbar));
+ /* add the toolbar */
+ parent_priv->toolbar = get_toolbar(self);
+ hildon_window_add_toolbar (HILDON_WINDOW (self), GTK_TOOLBAR (parent_priv->toolbar));
/* Menubar */
parent_priv->menubar = menubar_to_menu (parent_priv->ui_manager);
- hildon_window_set_menu (HILDON_WINDOW (obj), GTK_MENU (parent_priv->menubar));
-
- /* 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);
+ hildon_window_set_menu (HILDON_WINDOW (self), GTK_MENU (parent_priv->menubar));
+
+ /* folder view */
+ query = tny_folder_store_query_new ();
+ tny_folder_store_query_add_item (query, NULL,
+ TNY_FOLDER_STORE_QUERY_OPTION_SUBSCRIBED);
+ priv->folder_view = MODEST_FOLDER_VIEW(modest_folder_view_new (query));
+ if (!priv->folder_view)
+ g_printerr ("modest: cannot instantiate folder view\n");
+ g_object_unref (G_OBJECT (query));
+
+ /* header view */
+ priv->header_view =
+ MODEST_HEADER_VIEW(modest_header_view_new (NULL, MODEST_HEADER_VIEW_STYLE_DETAILS));
+ if (!priv->header_view)
+ g_printerr ("modest: cannot instantiate header view\n");
+
- folder_win = wrapped_in_scrolled_window (GTK_WIDGET(priv->folder_view),
- FALSE);
- header_win = wrapped_in_scrolled_window (GTK_WIDGET(priv->header_view),
- FALSE);
+ folder_win = wrapped_in_scrolled_window (GTK_WIDGET(priv->folder_view), FALSE);
+ header_win = wrapped_in_scrolled_window (GTK_WIDGET(priv->header_view), FALSE);
/* paned */
priv->main_paned = gtk_hpaned_new ();
gtk_paned_add1 (GTK_PANED(priv->main_paned), folder_win);
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));
-
- /* 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 (widget_factory),
- FALSE,FALSE, 6);
- gtk_box_pack_start (GTK_BOX(status_hbox),
- modest_widget_factory_get_status_bar(widget_factory),
- TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX(status_hbox),
- modest_widget_factory_get_progress_bar(widget_factory),
- FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX(status_hbox),
- modest_widget_factory_get_online_toggle(widget_factory),
- FALSE, FALSE, 0);
-
/* putting it all together... */
main_vbox = gtk_vbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX(main_vbox), priv->main_paned, TRUE, TRUE,0);
-/* gtk_box_pack_start (GTK_BOX(main_vbox), parent_priv->toolbar, FALSE, FALSE, 0); */
- gtk_box_pack_start (GTK_BOX(main_vbox), status_hbox, FALSE, FALSE, 0);
-
- gtk_container_add (GTK_CONTAINER(obj), main_vbox);
- restore_sizes (MODEST_MAIN_WINDOW(obj));
+ gtk_container_add (GTK_CONTAINER(self), main_vbox);
+ restore_sizes (MODEST_MAIN_WINDOW(self));
- gtk_window_set_title (GTK_WINDOW(obj), _("Modest"));
- gtk_window_set_icon (GTK_WINDOW(obj),
- modest_icon_factory_get_icon (MODEST_APP_ICON));
+ gtk_window_set_title (GTK_WINDOW(self), _("Modest"));
+ gtk_window_set_icon_from_file (GTK_WINDOW(self), MODEST_APP_ICON, NULL);
gtk_widget_show_all (main_vbox);
- g_signal_connect (G_OBJECT(obj), "delete-event",
- G_CALLBACK(on_delete_event), obj);
-
- return (ModestWindow *) obj;
+ g_signal_connect (G_OBJECT(self), "delete-event",
+ G_CALLBACK(on_delete_event), self);
+
+ /* Connect signals */
+ connect_signals (self);
+
+ /* Set account store */
+ tny_account_store_view_set_account_store (TNY_ACCOUNT_STORE_VIEW (priv->folder_view),
+ TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()));
+ return MODEST_WINDOW(self);
}
projects / modest / blobdiff