* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <hildon-widgets/hildon-window.h>
+#include <hildon-widgets/hildon-note.h>
+
#include <glib/gi18n.h>
#include <gtk/gtktreeviewcolumn.h>
+#include <tny-account-store-view.h>
+#include <modest-runtime.h>
+#include <string.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-platform.h"
#include "modest-widget-memory.h"
-#include "modest-icon-factory.h"
-#include "modest-ui.h"
-#include "modest-account-view-window.h"
+#include "modest-window-priv.h"
+#include "modest-main-window-ui.h"
#include "modest-account-mgr.h"
#include "modest-conf.h"
-
+#include <modest-maemo-utils.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_class_init (ModestMainWindowClass *klass);
static void modest_main_window_init (ModestMainWindow *obj);
static void modest_main_window_finalize (GObject *obj);
+static gboolean modest_main_window_window_state_event (GtkWidget *widget,
+ GdkEventWindowState *event,
+ gpointer userdata);
+static void connect_signals (ModestMainWindow *self);
static void restore_sizes (ModestMainWindow *self);
static void save_sizes (ModestMainWindow *self);
+static void modest_main_window_show_toolbar (ModestWindow *window,
+ gboolean show_toolbar);
+
/* list my signals */
enum {
/* MY_SIGNAL_1, */
typedef struct _ModestMainWindowPrivate ModestMainWindowPrivate;
struct _ModestMainWindowPrivate {
-
- GtkUIManager *ui_manager;
- ModestWidgetFactory *widget_factory;
- TnyPlatformFactory *factory;
- ModestTnyAccountStore *account_store;
-
- GtkWidget *toolbar;
GtkWidget *msg_paned;
GtkWidget *main_paned;
-
+ GtkWidget *main_vbox;
+ GtkWidget *progress_bar;
+
ModestHeaderView *header_view;
ModestFolderView *folder_view;
- ModestMsgView *msg_preview;
-};
-
+ ModestMainWindowStyle style;
+};
#define MODEST_MAIN_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_MAIN_WINDOW, \
ModestMainWindowPrivate))
typedef struct _GetMsgAsyncHelper {
ModestMainWindowPrivate *main_window_private;
guint action;
- ModestMailOperationReplyType reply_type;
- ModestMailOperationForwardType forward_type;
+ ModestTnyMsgReplyType reply_type;
+ ModestTnyMsgForwardType forward_type;
gchar *from;
TnyIterator *iter;
} GetMsgAsyncHelper;
+
/* globals */
static GtkWindowClass *parent_class = NULL;
(GInstanceInitFunc) modest_main_window_init,
NULL
};
- my_type = g_type_register_static (GTK_TYPE_WINDOW,
+ my_type = g_type_register_static (MODEST_TYPE_WINDOW,
"ModestMainWindow",
&my_info, 0);
}
{
GObjectClass *gobject_class;
gobject_class = (GObjectClass*) klass;
+ ModestWindowClass *modest_window_class;
+
+ modest_window_class = (ModestWindowClass *) klass;
parent_class = g_type_class_peek_parent (klass);
gobject_class->finalize = modest_main_window_finalize;
+ modest_window_class->show_toolbar_func = modest_main_window_show_toolbar;
+
g_type_class_add_private (gobject_class, sizeof(ModestMainWindowPrivate));
+}
+
+
+static void
+on_key_changed (ModestConf* conf, const gchar *key, ModestConfEvent event, ModestMainWindow *win)
+{
+ TnyAccount *account;
+
+ if (!key || strcmp (key, MODEST_CONF_DEVICE_NAME) != 0)
+ return; /* wrong key */
+
+ /* ok, the device name changed; thus, we have to update the
+ * local folder account name*/
+ account =
+ modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(),
+ MODEST_LOCAL_FOLDERS_ACCOUNT_ID,
+ TNY_ACCOUNT_TYPE_STORE);
+ if (!account) {
+ g_printerr ("modest: could not get account\n");
+ return;
+ }
- /* signal definitions go here, e.g.: */
-/* signals[MY_SIGNAL_1] = */
-/* g_signal_new ("my_signal_1",....); */
-/* signals[MY_SIGNAL_2] = */
-/* g_signal_new ("my_signal_2",....); */
-/* etc. */
+ if (event == MODEST_CONF_EVENT_KEY_UNSET)
+ tny_account_set_name (account, MODEST_LOCAL_FOLDERS_DEFAULT_DISPLAY_NAME);
+ else {
+ gchar *device_name = modest_conf_get_string (modest_runtime_get_conf(),
+ MODEST_CONF_DEVICE_NAME, NULL);
+ tny_account_set_name (account, device_name);
+ g_free (device_name);
+ }
+ g_object_unref (G_OBJECT(account));
}
static void
ModestMainWindowPrivate *priv;
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;
+
+ priv->msg_paned = NULL;
+ priv->main_paned = NULL;
+ priv->main_vbox = NULL;
+ priv->header_view = NULL;
+ priv->folder_view = NULL;
+ priv->style = MODEST_MAIN_WINDOW_STYLE_SPLIT;
+
+ /* 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
modest_main_window_finalize (GObject *obj)
{
- 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->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);
}
-
-static ModestHeaderView*
-header_view_new (ModestMainWindow *self)
+GtkWidget*
+modest_main_window_get_child_widget (ModestMainWindow *self,
+ ModestWidgetType widget_type)
{
- ModestHeaderView *header_view;
ModestMainWindowPrivate *priv;
+ GtkWidget *widget;
- priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
- header_view = modest_widget_factory_get_header_view (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:
+ return NULL;
+ }
+
+ return widget ? GTK_WIDGET(widget) : NULL;
}
+
static void
restore_sizes (ModestMainWindow *self)
{
ModestConf *conf;
ModestMainWindowPrivate *priv;
-
+
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
- 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");
+ conf = modest_runtime_get_conf ();
+
modest_widget_memory_restore (conf, G_OBJECT(priv->main_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");
}
static void
save_sizes (ModestMainWindow *self)
{
- ModestMainWindowPrivate *priv;
ModestConf *conf;
-
+ ModestMainWindowPrivate *priv;
+
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
- conf = modest_tny_platform_factory_get_conf_instance
- (MODEST_TNY_PLATFORM_FACTORY(priv->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 FALSE;
}
-
-ModestWindow*
-modest_main_window_new (ModestWidgetFactory *widget_factory,
- TnyAccountStore *account_store)
-{
- GObject *obj;
+static void
+connect_signals (ModestMainWindow *self)
+{
+ ModestWindowPrivate *parent_priv;
ModestMainWindowPrivate *priv;
- GtkWidget *main_vbox;
- GtkWidget *status_hbox;
- GtkWidget *header_win, *folder_win;
+ GtkWidget *menu;
- g_return_val_if_fail (widget_factory, NULL);
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+ parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
+
+ /* folder view */
+ g_signal_connect (G_OBJECT(priv->folder_view), "folder_selection_changed",
+ G_CALLBACK(modest_ui_actions_on_folder_selection_changed), self);
+
+ menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/FolderViewContextMenu");
+ gtk_widget_tap_and_hold_setup (GTK_WIDGET (priv->folder_view), menu, NULL, 0);
+
+ /* 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);
+
+ /* window */
+ g_signal_connect (G_OBJECT(self), "delete-event", G_CALLBACK(on_delete_event), self);
+ g_signal_connect (G_OBJECT (self), "window-state-event",
+ G_CALLBACK (modest_main_window_window_state_event),
+ NULL);
- obj = g_object_new(MODEST_TYPE_MAIN_WINDOW, NULL);
- priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj);
- priv->widget_factory = g_object_ref (widget_factory);
- priv->account_store = g_object_ref (account_store);
- //priv->ui_manager = g_object_ref (ui_manager);
+
+ /* modest_maemo_utils_get_device_name will probably change
+ * MODEST_CONF_DEVICE_NAME. If that happens, we update the local folders
+ * account name in the callback
+ */
+ g_signal_connect (G_OBJECT(modest_runtime_get_conf()), "key_changed",
+ G_CALLBACK(on_key_changed), self);
+
+ g_signal_connect (G_OBJECT(self), "delete-event", G_CALLBACK(on_delete_event), self);
+}
+
- /* Add accelerators */
- gtk_window_add_accel_group (GTK_WINDOW (obj),
- gtk_ui_manager_get_accel_group (priv->ui_manager));
+gboolean
+sync_accounts_cb (ModestMainWindow *win)
+{
+ modest_ui_actions_on_send_receive (NULL, MODEST_WINDOW(win));
+ return FALSE;
+}
- /* Toolbar / Menubar */
- priv->toolbar = gtk_ui_manager_get_widget (priv->ui_manager, "/ToolBar");
- gtk_toolbar_set_tooltips (GTK_TOOLBAR (priv->toolbar), TRUE);
+ModestWindow*
+modest_main_window_new (void)
+{
+ ModestMainWindow *self;
+ ModestMainWindowPrivate *priv;
+ ModestWindowPrivate *parent_priv;
+ GtkWidget *header_win, *folder_win;
+ GtkActionGroup *action_group;
+ GError *error = NULL;
+ TnyFolderStoreQuery *query;
+ GdkPixbuf *window_icon;
+ ModestConf *conf;
+ GtkAction *action;
+
+ 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_set_translation_domain (action_group, GETTEXT_PACKAGE);
+
+ /* Add common actions */
+ gtk_action_group_add_actions (action_group,
+ modest_action_entries,
+ G_N_ELEMENTS (modest_action_entries),
+ self);
+
+ gtk_action_group_add_toggle_actions (action_group,
+ modest_toggle_action_entries,
+ G_N_ELEMENTS (modest_toggle_action_entries),
+ 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-main-window-ui.xml", &error);
+ if (error != NULL) {
+ g_warning ("Could not merge modest-ui.xml: %s", error->message);
+ g_error_free (error);
+ error = NULL;
+ }
- /* widgets from factory */
- priv->folder_view = modest_widget_factory_get_folder_view (widget_factory);
- priv->header_view = header_view_new (MODEST_MAIN_WINDOW(obj));
+ /* Add accelerators */
+ gtk_window_add_accel_group (GTK_WINDOW (self),
+ gtk_ui_manager_get_accel_group (parent_priv->ui_manager));
+
+ /* Menubar. Update the state of some toggles */
+ parent_priv->menubar = modest_maemo_utils_menubar_to_menu (parent_priv->ui_manager);
+ conf = modest_runtime_get_conf ();
+ action = gtk_ui_manager_get_action (parent_priv->ui_manager,
+ "/MenuBar/ViewMenu/ViewShowToolbarMainMenu/ViewShowToolbarNormalScreenMenu");
+ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
+ modest_conf_get_bool (conf, MODEST_CONF_SHOW_TOOLBAR, NULL));
+ action = gtk_ui_manager_get_action (parent_priv->ui_manager,
+ "/MenuBar/ViewMenu/ViewShowToolbarMainMenu/ViewShowToolbarFullScreenMenu");
+ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
+ modest_conf_get_bool (conf, MODEST_CONF_SHOW_TOOLBAR_FULLSCREEN, NULL));
+ 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));
+ modest_maemo_utils_get_device_name ();
+
+ /* 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");
+ modest_header_view_set_style (priv->header_view, MODEST_HEADER_VIEW_STYLE_TWOLINES);
- 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), priv->toolbar, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX(main_vbox), status_hbox, FALSE, FALSE, 0);
+ priv->main_vbox = gtk_vbox_new (FALSE, 6);
+ gtk_box_pack_start (GTK_BOX(priv->main_vbox), priv->main_paned, TRUE, TRUE,0);
-
- gtk_container_add (GTK_CONTAINER(obj), main_vbox);
- restore_sizes (MODEST_MAIN_WINDOW(obj));
+ gtk_container_add (GTK_CONTAINER(self), priv->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_widget_show_all (main_vbox);
+ /* Set window icon */
+ window_icon = modest_platform_get_icon (MODEST_APP_ICON);
+ gtk_window_set_icon (GTK_WINDOW (self), window_icon);
- g_signal_connect (G_OBJECT(obj), "delete-event",
- G_CALLBACK(on_delete_event), obj);
-
- return (ModestWindow *) obj;
+ /* 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 ()));
+ g_idle_add ((GSourceFunc)sync_accounts_cb, self);
+ /* do send & receive when we are idle */
+
+ g_message ("online? %s",
+ tny_device_is_online (modest_runtime_get_device()) ? "yes" : "no");
+
+ return MODEST_WINDOW(self);
}
-ModestWidgetFactory *
-modest_main_window_get_widget_factory (ModestMainWindow *main_window)
+gboolean
+modest_main_window_close_all (ModestMainWindow *self)
+{
+ GtkWidget *note;
+ GtkResponseType response;
+
+ /* Create the confirmation dialog MSG-NOT308 */
+ note = hildon_note_new_confirmation_add_buttons (GTK_WINDOW (self),
+ _("emev_nc_close_windows"),
+ _("mcen_db_yes"), GTK_RESPONSE_YES,
+ _("mcen_db_no"), GTK_RESPONSE_NO,
+ NULL);
+
+ response = gtk_dialog_run (GTK_DIALOG (note));
+ gtk_widget_destroy (GTK_WIDGET (note));
+
+ if (response == GTK_RESPONSE_YES)
+ return TRUE;
+ else
+ return FALSE;
+}
+
+void
+modest_main_window_set_style (ModestMainWindow *self,
+ ModestMainWindowStyle style)
{
ModestMainWindowPrivate *priv;
-
- g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (main_window), NULL);
+ GtkWidget *scrolled_win;
- priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window);
+ g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
+
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
- return g_object_ref (priv->widget_factory);
+ /* no change -> nothing to do */
+ if (priv->style == style)
+ return;
+
+ priv->style = style;
+ scrolled_win = gtk_widget_get_parent (GTK_WIDGET (priv->header_view));
+
+ switch (style) {
+ case MODEST_MAIN_WINDOW_STYLE_SIMPLE:
+ /* Remove main paned */
+ g_object_ref (priv->main_paned);
+ gtk_container_remove (GTK_CONTAINER (priv->main_vbox), priv->main_paned);
+
+ /* Reparent header view with scrolled window */
+ gtk_widget_reparent (scrolled_win, priv->main_vbox);
+ break;
+ case MODEST_MAIN_WINDOW_STYLE_SPLIT:
+ /* Remove header view */
+ g_object_ref (scrolled_win);
+ gtk_container_remove (GTK_CONTAINER (priv->main_vbox), scrolled_win);
+
+ /* Reparent the main paned */
+ gtk_paned_add2 (GTK_PANED (priv->main_paned), scrolled_win);
+ gtk_container_add (GTK_CONTAINER (priv->main_vbox), priv->main_paned);
+ break;
+ default:
+ g_return_if_reached ();
+ }
+
+ /* Show changes */
+ gtk_widget_show_all (GTK_WIDGET (priv->main_vbox));
}
-
-TnyAccountStore *
-modest_main_window_get_account_store (ModestMainWindow *main_window)
+
+ModestMainWindowStyle
+modest_main_window_get_style (ModestMainWindow *self)
{
ModestMainWindowPrivate *priv;
-
- g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (main_window), NULL);
+ g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (self), -1);
+
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+ return priv->style;
+}
+
+static gboolean
+modest_main_window_window_state_event (GtkWidget *widget, GdkEventWindowState *event, gpointer userdata)
+{
+ if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) {
+ ModestWindowPrivate *parent_priv;
+ ModestWindowMgr *mgr;
+ gboolean is_fullscreen;
+ GtkAction *fs_toggle_action;
+ gboolean active;
+
+ mgr = modest_runtime_get_window_mgr ();
+
+ is_fullscreen = modest_window_mgr_get_fullscreen_mode (mgr);
+
+ parent_priv = MODEST_WINDOW_GET_PRIVATE (widget);
+
+ fs_toggle_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewToggleFullscreenMenu");
+ active = (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (fs_toggle_action)))?1:0;
+ if (is_fullscreen != active) {
+ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (fs_toggle_action), is_fullscreen);
+ }
+ }
+
+ return FALSE;
+
+}
+
+static void
+set_homogeneous (GtkWidget *widget,
+ gpointer data)
+{
+ gtk_tool_item_set_expand (GTK_TOOL_ITEM (widget), TRUE);
+ gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), TRUE);
+}
+
+static void
+modest_main_window_show_toolbar (ModestWindow *self,
+ gboolean show_toolbar)
+{
+ ModestWindowPrivate *parent_priv;
+ GtkWidget *reply_button = NULL, *menu = NULL;
+
+ parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
+
+ if (!parent_priv->toolbar && show_toolbar) {
+ parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager,
+ "/ToolBar");
+
+ /* Set homogeneous toolbar */
+ gtk_container_foreach (GTK_CONTAINER (parent_priv->toolbar),
+ set_homogeneous, NULL);
+
+ /* Add to window */
+ hildon_window_add_toolbar (HILDON_WINDOW (self),
+ GTK_TOOLBAR (parent_priv->toolbar));
+
+ /* Set reply button tap and hold menu */
+ reply_button = gtk_ui_manager_get_widget (parent_priv->ui_manager,
+ "/ToolBar/ToolbarMessageReply");
+ menu = gtk_ui_manager_get_widget (parent_priv->ui_manager,
+ "/ToolbarReplyContextMenu");
+ gtk_widget_tap_and_hold_setup (GTK_WIDGET (reply_button), menu, NULL, 0);
+ }
- priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window);
- return g_object_ref (priv->account_store);
+ if (show_toolbar)
+ gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
+ else
+ gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
}