* Reggister application service.

[modest] / src / hildon / modest-ui-main-view.c

diff --git a/src/hildon/modest-ui-main-view.c b/src/hildon/modest-ui-main-view.c
index 45a5a49..508e56a 100644 (file)
--- a/src/hildon/modest-ui-main-view.c
+++ b/src/hildon/modest-ui-main-view.c
@@ -7,6 +7,8 @@
 #include <config.h>
 #endif /*HAVE_CONFIG_H*/
 
+#include <hildon-widgets/hildon-app.h>
+
 /* TODO: put in auto* */
 #include <tny-text-buffer-stream.h>
 #include <tny-msg-folder.h>
@@ -90,7 +92,7 @@ modest_ui_main_view_destroy (GtkWidget *win, GdkEvent *event, gpointer data)
 gboolean
 modest_ui_show_main_window (ModestUI *modest_ui)
 {
-       GtkWidget       *win;
+       GtkWidget       *win, *app_view;
        gint              height, width;
        ModestUIPrivate *priv;
        GtkWidget     *folder_view, *header_view;
@@ -101,6 +103,7 @@ modest_ui_show_main_window (ModestUI *modest_ui)
        GtkWidget     *open_item;
        GtkWidget     *view_attachments_item;
        GtkWidget     *new_account_item;
+       GtkWidget     *main_menu, *menu_item, *main_toolbar;
        
        GtkWidget  *folder_view_holder,
                *header_view_holder,
@@ -152,7 +155,9 @@ modest_ui_show_main_window (ModestUI *modest_ui)
                g_warning ("failed to create message view");
                return FALSE;
        }
-
+       g_signal_connect(G_OBJECT(message_view), "on_mailto_clicked",
+                     G_CALLBACK(ui_on_mailto_clicked), modest_ui);
+       
        mail_paned = glade_xml_get_widget (priv->glade_xml, "mail_paned");
        gtk_paned_add2 (GTK_PANED(mail_paned), message_view);
 
@@ -232,9 +237,39 @@ modest_ui_show_main_window (ModestUI *modest_ui)
        g_signal_connect (win, "delete-event", G_CALLBACK(modest_ui_main_view_destroy),
                          modest_ui);
        gtk_widget_set_usize (GTK_WIDGET(win), width, height);
-       gtk_window_set_title (GTK_WINDOW(win), PACKAGE_STRING);
+       hildon_app_set_title (HILDON_APP(win), PACKAGE_STRING);
+
+       app_view = glade_xml_get_widget (priv->glade_xml, "appview1");
+       
+       main_menu = hildon_appview_get_menu(HILDON_APPVIEW(app_view));
+       menu_item = glade_xml_get_widget (priv->glade_xml, "MessageMenuItem");
+       gtk_widget_reparent(menu_item, main_menu);
+       menu_item = glade_xml_get_widget (priv->glade_xml, "EditMenuItem");
+       gtk_widget_reparent(menu_item, main_menu);
+       menu_item = glade_xml_get_widget (priv->glade_xml, "FoldersMenuItem");
+       gtk_widget_reparent(menu_item, main_menu);
+       menu_item = glade_xml_get_widget (priv->glade_xml, "ViewMenuItem");
+       gtk_widget_reparent(menu_item, main_menu);
+       menu_item = glade_xml_get_widget (priv->glade_xml, "EMailMenuItem");
+       gtk_widget_reparent(menu_item, main_menu);
+       menu_item = glade_xml_get_widget (priv->glade_xml, "ToolsMenuItem");
+       gtk_widget_reparent(menu_item, main_menu);
+       menu_item = glade_xml_get_widget (priv->glade_xml, "CloseMenuItem");
+       gtk_widget_reparent(menu_item, main_menu);
+
+       main_toolbar = glade_xml_get_widget (priv->glade_xml, "toolbar1");
+       g_object_ref (main_toolbar);
+       gtk_container_remove (glade_xml_get_widget (priv->glade_xml, 
+                             "main_top_container"), main_toolbar);
+       hildon_appview_set_toolbar (HILDON_APPVIEW(app_view), GTK_TOOLBAR(main_toolbar));
+
 
        gtk_widget_show_all (win);
+
+       menu_item = glade_xml_get_widget (priv->glade_xml, "menubar1");
+       gtk_widget_hide(menu_item);
+
+
        return TRUE;
 }