* Fixes NB#92694, migrated the viewer menus to 1.5 specs version

pmo-drop-split-view-r6618

diff --git a/src/hildon2/modest-msg-view-window.c b/src/hildon2/modest-msg-view-window.c
index 3f68742..d85541f 100644 (file)
--- a/src/hildon2/modest-msg-view-window.c
+++ b/src/hildon2/modest-msg-view-window.c
@@ -129,11 +129,8 @@ static void  modest_msg_view_window_find_toolbar_search (GtkWidget *widget,
                                                        ModestMsgViewWindow *obj);
 
 static void modest_msg_view_window_disconnect_signals (ModestWindow *self);
-static void modest_msg_view_window_set_zoom (ModestWindow *window,
-                                            gdouble zoom);
+
 static gdouble modest_msg_view_window_get_zoom (ModestWindow *window);
-static gboolean modest_msg_view_window_zoom_minus (ModestWindow *window);
-static gboolean modest_msg_view_window_zoom_plus (ModestWindow *window);
 static gboolean modest_msg_view_window_key_event (GtkWidget *window,
                                                  GdkEventKey *event,
                                                  gpointer userdata);
@@ -237,7 +234,65 @@ enum {
 
 static const GtkToggleActionEntry msg_view_toggle_action_entries [] = {
        { "FindInMessage",    MODEST_TOOLBAR_ICON_FIND,    N_("qgn_toolb_gene_find"), NULL, NULL, G_CALLBACK (modest_msg_view_window_toggle_find_toolbar), FALSE },
+<<<<<<< HEAD:src/hildon2/modest-msg-view-window.c
        { "ToolsFindInMessage", NULL, N_("mcen_me_viewer_find"), "<CTRL>F", NULL, G_CALLBACK (modest_msg_view_window_toggle_find_toolbar), FALSE },
+=======
+};
+
+typedef struct _ModestMsgViewWindowPrivate ModestMsgViewWindowPrivate;
+struct _ModestMsgViewWindowPrivate {
+
+       GtkWidget   *msg_view;
+       GtkWidget   *main_scroll;
+       GtkWidget   *find_toolbar;
+       gchar       *last_search;
+
+       /* Progress observers */
+       GtkWidget        *progress_bar;
+       GSList           *progress_widgets;
+
+       /* Tollbar items */
+       GtkWidget   *progress_toolitem;
+       GtkWidget   *cancel_toolitem;
+       GtkWidget   *prev_toolitem;
+       GtkWidget   *next_toolitem;
+       ModestToolBarModes current_toolbar_mode;
+
+       /* Optimized view enabled */
+       gboolean optimized_view;
+
+       /* Whether this was created via the *_new_for_search_result() function. */
+       gboolean is_search_result;
+
+       /* Whether the message is in outbox */
+       gboolean is_outbox;
+       
+       /* A reference to the @model of the header view 
+        * to allow selecting previous/next messages,
+        * if the message is currently selected in the header view.
+        */
+       const gchar *header_folder_id;
+       GtkTreeModel *header_model;
+       GtkTreeRowReference *row_reference;
+       GtkTreeRowReference *next_row_reference;
+
+       gulong clipboard_change_handler;
+       gulong queue_change_handler;
+       gulong account_removed_handler;
+       gulong row_changed_handler;
+       gulong row_deleted_handler;
+       gulong row_inserted_handler;
+       gulong rows_reordered_handler;
+
+       guint purge_timeout;
+       GtkWidget *remove_attachment_banner;
+
+       guint progress_bar_timeout;
+
+       gchar *msg_uid;
+       
+       GSList *sighandlers;
+>>>>>>> fe21497...  * Fixes NB#92694, migrated the viewer menus to 1.5 specs version:src/hildon2/modest-msg-view-window.c
 };
 
 #define MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -292,6 +347,7 @@ save_state (ModestWindow *self)
                                   MODEST_CONF_MSG_VIEW_WINDOW_KEY);
 }
 
+<<<<<<< HEAD:src/hildon2/modest-msg-view-window.c
 
 static void
 restore_settings (ModestMsgViewWindow *self)
@@ -308,6 +364,13 @@ static gboolean modest_msg_view_window_scroll_child (ModestMsgViewWindow *self,
                                                     GtkScrollType scroll_type,
                                                     gboolean horizontal,
                                                     gpointer userdata)
+=======
+static 
+gboolean modest_msg_view_window_scroll_child (ModestMsgViewWindow *self,
+                                             GtkScrollType scroll_type,
+                                             gboolean horizontal,
+                                             gpointer userdata)
+>>>>>>> fe21497...  * Fixes NB#92694, migrated the viewer menus to 1.5 specs version:src/hildon2/modest-msg-view-window.c
 {
        ModestMsgViewWindowPrivate *priv;
        gboolean return_value;
@@ -353,8 +416,6 @@ modest_msg_view_window_class_init (ModestMsgViewWindowClass *klass)
 
        modest_window_class->set_zoom_func = modest_msg_view_window_set_zoom;
        modest_window_class->get_zoom_func = modest_msg_view_window_get_zoom;
-       modest_window_class->zoom_minus_func = modest_msg_view_window_zoom_minus;
-       modest_window_class->zoom_plus_func = modest_msg_view_window_zoom_plus;
        modest_window_class->show_toolbar_func = modest_msg_view_window_show_toolbar;
        modest_window_class->disconnect_signals_func = modest_msg_view_window_disconnect_signals;
 
@@ -420,10 +481,6 @@ modest_msg_view_window_init (ModestMsgViewWindow *obj)
                                      G_N_ELEMENTS (modest_action_entries),
                                      obj);
        gtk_action_group_add_toggle_actions (action_group,
-                                            modest_toggle_action_entries,
-                                            G_N_ELEMENTS (modest_toggle_action_entries),
-                                            obj);
-       gtk_action_group_add_toggle_actions (action_group,
                                             msg_view_toggle_action_entries,
                                             G_N_ELEMENTS (msg_view_toggle_action_entries),
                                             obj);
@@ -789,8 +846,6 @@ modest_msg_view_window_construct (ModestMsgViewWindow *self,
        g_object_unref (toolbar_rules_group);
        g_object_unref (clipboard_rules_group);
 
-       restore_settings (MODEST_MSG_VIEW_WINDOW(obj));
-       
        /* g_signal_connect (G_OBJECT(obj), "delete-event", G_CALLBACK(on_delete_event), obj); */
 
        priv->clipboard_change_handler = g_signal_connect (G_OBJECT (gtk_clipboard_get (GDK_SELECTION_PRIMARY)), "owner-change", G_CALLBACK (modest_msg_view_window_clipboard_owner_change), obj);
@@ -1441,9 +1496,13 @@ modest_msg_view_window_toggle_find_toolbar (GtkToggleAction *toggle,
 
        /* update the toggle buttons status */
        action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/FindInMessage");
+<<<<<<< HEAD:src/hildon2/modest-msg-view-window.c
        if (action)
                modest_utils_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), is_active);
 
+=======
+       modest_utils_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), is_active);
+>>>>>>> fe21497...  * Fixes NB#92694, migrated the viewer menus to 1.5 specs version:src/hildon2/modest-msg-view-window.c
 }
 
 static void
@@ -1511,6 +1570,7 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget,
                
 }
 
+<<<<<<< HEAD:src/hildon2/modest-msg-view-window.c
 static void
 modest_msg_view_window_set_zoom (ModestWindow *window,
                                 gdouble zoom)
@@ -1526,6 +1586,8 @@ modest_msg_view_window_set_zoom (ModestWindow *window,
 
 }
 
+=======
+>>>>>>> fe21497...  * Fixes NB#92694, migrated the viewer menus to 1.5 specs version:src/hildon2/modest-msg-view-window.c
 static gdouble
 modest_msg_view_window_get_zoom (ModestWindow *window)
 {
@@ -1538,6 +1600,7 @@ modest_msg_view_window_get_zoom (ModestWindow *window)
 }
 
 static gboolean
+<<<<<<< HEAD:src/hildon2/modest-msg-view-window.c
 modest_msg_view_window_zoom_plus (ModestWindow *window)
 {
        gdouble zoom_level;
@@ -1608,6 +1671,8 @@ modest_msg_view_window_zoom_minus (ModestWindow *window)
 }
 
 static gboolean
+=======
+>>>>>>> fe21497...  * Fixes NB#92694, migrated the viewer menus to 1.5 specs version:src/hildon2/modest-msg-view-window.c
 modest_msg_view_window_key_event (GtkWidget *window,
                                  GdkEventKey *event,
                                  gpointer userdata)
@@ -2183,7 +2248,10 @@ toolbar_resize (ModestMsgViewWindow *self)
                
 }
 
+<<<<<<< HEAD:src/hildon2/modest-msg-view-window.c
 
+=======
+>>>>>>> fe21497...  * Fixes NB#92694, migrated the viewer menus to 1.5 specs version:src/hildon2/modest-msg-view-window.c
 static void
 modest_msg_view_window_show_toolbar (ModestWindow *self,
                                     gboolean show_toolbar)
@@ -2191,6 +2259,11 @@ modest_msg_view_window_show_toolbar (ModestWindow *self,
        ModestMsgViewWindowPrivate *priv = NULL;
        ModestWindowPrivate *parent_priv;
        GtkWidget *reply_button = NULL, *menu = NULL;
+<<<<<<< HEAD:src/hildon2/modest-msg-view-window.c
+=======
+       GtkWidget *placeholder = NULL;
+       gint insert_index;
+>>>>>>> fe21497...  * Fixes NB#92694, migrated the viewer menus to 1.5 specs version:src/hildon2/modest-msg-view-window.c
 
        parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(self);
@@ -2207,6 +2280,25 @@ modest_msg_view_window_show_toolbar (ModestWindow *self,
                priv->prev_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarMessageBack");
                toolbar_resize (MODEST_MSG_VIEW_WINDOW (self));
 
+<<<<<<< HEAD:src/hildon2/modest-msg-view-window.c
+=======
+               /* Add ProgressBar (Transfer toolbar) */ 
+               priv->progress_bar = modest_progress_bar_new ();
+               gtk_widget_set_no_show_all (priv->progress_bar, TRUE);
+               placeholder = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ProgressbarView");
+               insert_index = gtk_toolbar_get_item_index(GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM(placeholder));
+               gtk_container_add (GTK_CONTAINER (priv->progress_toolitem), priv->progress_bar);
+               gtk_toolbar_insert(GTK_TOOLBAR(parent_priv->toolbar), GTK_TOOL_ITEM (priv->progress_toolitem), insert_index);
+
+               /* Connect cancel 'clicked' signal to abort progress mode */
+               g_signal_connect(priv->cancel_toolitem, "clicked",
+                                G_CALLBACK(cancel_progressbar),
+                                self);
+
+               /* Add it to the observers list */
+               priv->progress_widgets = g_slist_prepend(priv->progress_widgets, priv->progress_bar);
+
+>>>>>>> fe21497...  * Fixes NB#92694, migrated the viewer menus to 1.5 specs version:src/hildon2/modest-msg-view-window.c
                /* Add to window */
                hildon_window_add_toolbar (HILDON_WINDOW (self), 
                                           GTK_TOOLBAR (parent_priv->toolbar));
@@ -2235,7 +2327,10 @@ modest_msg_view_window_show_toolbar (ModestWindow *self,
                gtk_widget_set_no_show_all (parent_priv->toolbar, TRUE);
                gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
        }
+<<<<<<< HEAD:src/hildon2/modest-msg-view-window.c
 
+=======
+>>>>>>> fe21497...  * Fixes NB#92694, migrated the viewer menus to 1.5 specs version:src/hildon2/modest-msg-view-window.c
 }
 
 static void 

diff --git a/src/hildon2/ui/modest-msg-view-window-ui.xml b/src/hildon2/ui/modest-msg-view-window-ui.xml
index 89dab0e..0aac525 100644 (file)
--- a/src/hildon2/ui/modest-msg-view-window-ui.xml
+++ b/src/hildon2/ui/modest-msg-view-window-ui.xml
@@ -32,40 +32,13 @@
 
   <menubar name="MenuBar">
     <menu name="MessageMenu" action="Email">
-      <menuitem name="MessageReplyMenu" action="EmailReply"/>
       <menuitem name="MessageReplyAllMenu" action="EmailReplyAll"/>
       <menuitem name="MessageForwardMenu" action="EmailForward"/>
       <separator/>
       <menuitem name="MessageNewMenu"  action="EmailNewDefault"/>
       <separator/>
-      <menuitem name="MessageDeleteMenu" action="EmailDelete"/>
-      <separator/>
       <menuitem name="MessageDetailsMenu"      action="EmailDetails"/>
     </menu>
-       
-    <menu name="EditMenu" action="Edit">
-      <menuitem name="EditCutMenu" action="EditCut"/>
-      <menuitem name="EditCopyMenu" action="EditCopy"/>
-      <menuitem name="EditPasteMenu" action="EditPaste"/>
-      <separator/>
-      <menuitem name="EditSelectAllMenu" action="EditSelectAll"/>
-      <separator/>
-      <menuitem name="EditMoveToMenu" action="EditMoveTo"/>
-    </menu> 
- 
-    <menu name="ViewMenu" action="View">
-      <menu name="ZoomMenu" action="Zoom">
-       <menuitem name="Zoom50Menu" action="Zoom50"/>
-       <menuitem name="Zoom80Menu" action="Zoom80"/>
-       <menuitem name="Zoom100Menu" action="Zoom100"/>
-       <menuitem name="Zoom120Menu" action="Zoom120"/>
-       <menuitem name="Zoom150Menu" action="Zoom150"/>
-       <menuitem name="Zoom200Menu" action="Zoom200"/>
-      </menu>
-      <separator/>
-      <menuitem name="ViewNextMessageMenu" action="ViewNextMessage"/>
-      <menuitem name="ViewPreviousMessageMenu" action="ViewPreviousMessage"/>
-    </menu>
 
     <menu name="AttachmentsMenu" action="Attachments">
       <menuitem name="SaveAttachmentMenu" action="SaveAttachment"/>
@@ -74,10 +47,6 @@
 
    <menu name="ToolsMenu" action="Tools">
       <menuitem name="ToolsAddToContactsMenu" action="ToolsAddToContacts"/>
-      <separator/>
-      <menuitem name="ToolsFindInMessageMenu" action="ToolsFindInMessage"/>
-      <separator/>
-      <menuitem name="ToolsHelpMenu" action="ToolsHelp"/>
    </menu>
 
   </menubar>