Added public method for pack toolbar
[modest] / src / hildon2 / modest-folder-window.c
index f03c502..d2bddb2 100644 (file)
@@ -48,6 +48,9 @@
 #include <hildon/hildon-edit-toolbar.h>
 #include <tny-account-store-view.h>
 #include <modest-header-window.h>
+#include <modest-ui-dimming-rules.h>
+#include <modest-ui-dimming-manager.h>
+#include <modest-window-priv.h>
 
 typedef enum {
        EDIT_MODE_COMMAND_NONE = 0,
@@ -64,14 +67,9 @@ static void modest_folder_window_finalize    (GObject *obj);
 static void connect_signals (ModestFolderWindow *self);
 static void modest_folder_window_disconnect_signals (ModestWindow *self);
 
-static gboolean on_zoom_minus_plus_not_implemented (ModestWindow *window);
 static void on_folder_activated (ModestFolderView *folder_view,
                                 TnyFolder *folder,
                                 gpointer userdata);
-static void add_to_menu (ModestFolderWindow *self,
-                        HildonAppMenu *menu,
-                        gchar *label,
-                        GCallback callback);
 static void setup_menu (ModestFolderWindow *self);
 
 static void set_edit_mode (ModestFolderWindow *self,
@@ -129,7 +127,7 @@ modest_folder_window_get_type (void)
                        (GInstanceInitFunc) modest_folder_window_init,
                        NULL
                };
-               my_type = g_type_register_static (MODEST_TYPE_WINDOW,
+               my_type = g_type_register_static (MODEST_TYPE_HILDON2_WINDOW,
                                                  "ModestFolderWindow",
                                                  &my_info, 0);
        }
@@ -148,8 +146,6 @@ modest_folder_window_class_init (ModestFolderWindowClass *klass)
 
        g_type_class_add_private (gobject_class, sizeof(ModestFolderWindowPrivate));
        
-       modest_window_class->zoom_minus_func = on_zoom_minus_plus_not_implemented;
-       modest_window_class->zoom_plus_func = on_zoom_minus_plus_not_implemented;
        modest_window_class->disconnect_signals_func = modest_folder_window_disconnect_signals;
 }
 
@@ -245,6 +241,7 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
        
        self  = MODEST_FOLDER_WINDOW(g_object_new(MODEST_TYPE_FOLDER_WINDOW, NULL));
        priv = MODEST_FOLDER_WINDOW_GET_PRIVATE(self);
+
        pannable = hildon_pannable_area_new ();
        priv->folder_view  = modest_platform_create_folder_view (query);
        modest_folder_view_set_cell_style (MODEST_FOLDER_VIEW (priv->folder_view),
@@ -300,16 +297,6 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
        return MODEST_WINDOW(self);
 }
 
-static gboolean
-on_zoom_minus_plus_not_implemented (ModestWindow *window)
-{
-       g_return_val_if_fail (MODEST_IS_FOLDER_WINDOW (window), FALSE);
-
-       hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_cannot_zoom_here"));
-       return FALSE;
-
-}
-
 gboolean
 modest_folder_window_screen_is_on (ModestFolderWindow *self)
 {
@@ -374,62 +361,51 @@ free_refs:
 
 }
 
-static void add_to_menu (ModestFolderWindow *self,
-                        HildonAppMenu *menu,
-                        gchar *label,
-                        GCallback callback)
-{
-       GtkWidget *button;
-
-       button = gtk_button_new_with_label (label);
-       g_signal_connect_after (G_OBJECT (button), "clicked",
-                               callback, (gpointer) self);
-       hildon_app_menu_append (menu, GTK_BUTTON (button));
-}
-
 static void setup_menu (ModestFolderWindow *self)
 {
-       ModestFolderWindowPrivate *priv = NULL;
-       GtkWidget *app_menu;
-
        g_return_if_fail (MODEST_IS_FOLDER_WINDOW(self));
 
-       priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self);
-
-       app_menu = hildon_app_menu_new ();
-
        /* folders actions */
-       add_to_menu (self, HILDON_APP_MENU (app_menu), _("TODO: new folder"),
-                    G_CALLBACK (modest_ui_actions_on_new_folder));
-       add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_user_renamefolder"),
-                    G_CALLBACK (set_rename_edit_mode));
-       add_to_menu (self, HILDON_APP_MENU (app_menu), _("TODO: move folder"),
-                    G_CALLBACK (set_moveto_edit_mode));
-       add_to_menu (self, HILDON_APP_MENU (app_menu), _("TODO: delete folder"),
-                    G_CALLBACK (set_delete_edit_mode));
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("TODO: new folder"),
+                                          APP_MENU_CALLBACK (modest_ui_actions_on_new_folder),
+                                          NULL);
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_user_renamefolder"),
+                                          APP_MENU_CALLBACK (set_rename_edit_mode),
+                                          NULL);
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("TODO: move folder"),
+                                          APP_MENU_CALLBACK (set_moveto_edit_mode),
+                                          NULL);
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("TODO: delete folder"),
+                                          APP_MENU_CALLBACK (set_delete_edit_mode),
+                                          NULL);
 
        /* new message */
-       add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_viewer_newemail"),
-                    G_CALLBACK (modest_ui_actions_on_new_msg));
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_viewer_newemail"),
+                                          APP_MENU_CALLBACK (modest_ui_actions_on_new_msg),
+                                          NULL);
 
        /* send receive actions should be only one visible always */
-       add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_sendandreceive"),
-                    G_CALLBACK (modest_ui_actions_on_send_receive));
-       add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_outbox_cancelsend"),
-                    G_CALLBACK (modest_ui_actions_cancel_send));
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_sendandreceive"),
+                                          APP_MENU_CALLBACK (modest_ui_actions_on_send_receive),
+                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive_all));
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_outbox_cancelsend"),
+                                          APP_MENU_CALLBACK (modest_ui_actions_cancel_send),
+                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all));
 
        /* Settings menu buttons */
-       add_to_menu (self, HILDON_APP_MENU (app_menu), _("TODO: new account"),
-                    G_CALLBACK (modest_ui_actions_on_new_account));
-       add_to_menu (self, HILDON_APP_MENU (app_menu), _("TODO: edit accounts"),
-                    G_CALLBACK (modest_ui_actions_on_accounts));
-       add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_options"),
-                    G_CALLBACK (modest_ui_actions_on_settings));
-       add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_globalsmtpservers"),
-                    G_CALLBACK (modest_ui_actions_on_smtp_servers));
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("TODO: new account"),
+                                          APP_MENU_CALLBACK (modest_ui_actions_on_new_account),
+                                          NULL);
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("TODO: edit accounts"),
+                                          APP_MENU_CALLBACK (modest_ui_actions_on_accounts),
+                                          NULL);
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_options"),
+                                          APP_MENU_CALLBACK (modest_ui_actions_on_settings),
+                                          NULL);
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_globalsmtpservers"),
+                                          APP_MENU_CALLBACK (modest_ui_actions_on_smtp_servers),
+                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_tools_smtp_servers));
        
-       hildon_stackable_window_set_main_menu (HILDON_STACKABLE_WINDOW (self), 
-                                              HILDON_APP_MENU (app_menu));
 }
 
 static void
@@ -550,8 +526,8 @@ edit_toolbar_button_clicked (HildonEditToolbar *toolbar,
                        set_edit_mode (self, EDIT_MODE_COMMAND_NONE);
                break;
        case EDIT_MODE_COMMAND_RENAME:
-/*             modest_ui_actions_on_rename (NULL, MODEST_WINDOW (self)); */
-               set_edit_mode (self, EDIT_MODE_COMMAND_NONE);
+               if (modest_ui_actions_on_edit_mode_rename_folder (MODEST_WINDOW (self)))
+                       set_edit_mode (self, EDIT_MODE_COMMAND_NONE);
                break;
        case EDIT_MODE_COMMAND_NONE:
                        g_assert_not_reached ();