* small fix:
[modest] / src / maemo / modest-main-window.c
index efa7896..cdebd41 100644 (file)
 #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-msg-edit-window.h>
 #include <widgets/modest-account-view-window.h>
 
+
 #include "modest-widget-memory.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.h"
 #include "modest-mail-operation.h"
@@ -132,6 +134,37 @@ modest_main_window_class_init (ModestMainWindowClass *klass)
        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;
+       }
+
+       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
 modest_main_window_init (ModestMainWindow *obj)
 {
@@ -157,7 +190,6 @@ modest_main_window_finalize (GObject *obj)
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
-
 GtkWidget*
 modest_main_window_get_child_widget (ModestMainWindow *self,
                                     ModestWidgetType widget_type)
@@ -247,30 +279,6 @@ on_delete_event (GtkWidget *widget, GdkEvent  *event, ModestMainWindow *self)
        return FALSE;
 }
 
-static GtkWidget *
-menubar_to_menu (GtkUIManager *ui_manager)
-{
-       GtkWidget *main_menu;
-       GtkWidget *menubar;
-       GList *iter;
-
-       /* Create new main menu */
-       main_menu = gtk_menu_new();
-
-       /* Get the menubar from the UI manager */
-       menubar = gtk_ui_manager_get_widget (ui_manager, "/MenuBar");
-
-       iter = gtk_container_get_children (GTK_CONTAINER (menubar));
-       while (iter) {
-               GtkWidget *menu;
-
-               menu = GTK_WIDGET (iter->data);
-               gtk_widget_reparent(menu, main_menu);
-
-               iter = g_list_next (iter);
-       }
-       return main_menu;
-}
 
 static GtkWidget*
 get_toolbar (ModestMainWindow *self)
@@ -285,10 +293,7 @@ get_toolbar (ModestMainWindow *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...");
-
+       toolbar             = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
        progress_box        = gtk_hbox_new (FALSE, HILDON_MARGIN_DEFAULT);
        progress_alignment  = gtk_alignment_new (0.5, 0.5, 1, 0);
        
@@ -307,7 +312,6 @@ get_toolbar (ModestMainWindow *self)
        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;
 }
@@ -331,12 +335,6 @@ connect_signals (ModestMainWindow *self)
        /* 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_xfer",
-                         G_CALLBACK(modest_ui_actions_on_folder_xfer), 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",
@@ -347,18 +345,32 @@ connect_signals (ModestMainWindow *self)
                          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);
 
        /* 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);
+
+       
+       /* 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);
 }
 
 
+gboolean
+sync_accounts_cb (ModestMainWindow *win)
+{
+       modest_ui_actions_on_send_receive (NULL, MODEST_WINDOW(win));
+       return FALSE;
+}
+
 
+       
 ModestWindow*
 modest_main_window_new (void)
 {
@@ -388,7 +400,8 @@ modest_main_window_new (void)
        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);
+       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);
@@ -404,7 +417,7 @@ modest_main_window_new (void)
        hildon_window_add_toolbar (HILDON_WINDOW (self), GTK_TOOLBAR (parent_priv->toolbar));
 
        /* Menubar */
-       parent_priv->menubar = menubar_to_menu (parent_priv->ui_manager);
+       parent_priv->menubar = modest_maemo_utils_menubar_to_menu (parent_priv->ui_manager);
        hildon_window_set_menu (HILDON_WINDOW (self), GTK_MENU (parent_priv->menubar));
 
        /* folder view */
@@ -414,18 +427,18 @@ modest_main_window_new (void)
        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));
-       
+       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);                    
-
        /* paned */
        priv->main_paned = gtk_hpaned_new ();
        gtk_paned_add1 (GTK_PANED(priv->main_paned), folder_win);
@@ -439,14 +452,14 @@ modest_main_window_new (void)
 
        gtk_container_add (GTK_CONTAINER(self), main_vbox);
        restore_sizes (MODEST_MAIN_WINDOW(self));       
-
+       
        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(self), "delete-event",
-                         G_CALLBACK(on_delete_event), self);
+       /* should we hide the toolbar? */
+       if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_TOOLBAR, NULL))
+               gtk_widget_hide (parent_priv->toolbar);
 
        /* Connect signals */
        connect_signals (self);
@@ -454,7 +467,17 @@ modest_main_window_new (void)
        /* 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");
 
-       tny_device_force_online (modest_runtime_get_device());
        return MODEST_WINDOW(self);
 }
+
+
+
+
+
+