X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-folder-window.c;h=8dd66b887a06c2546b1f5611a5bc15dfa3542003;hp=54cc733479a42cf5b55bff237aa91ef1521e5669;hb=9de4a682c6c45422a713c5e3f53fcaed2618b3fb;hpb=e374da56f67092cecb1572dd4bee2ca34e0bc04c diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c index 54cc733..8dd66b8 100644 --- a/src/hildon2/modest-folder-window.c +++ b/src/hildon2/modest-folder-window.c @@ -47,6 +47,16 @@ #include #include #include +#include +#include +#include +#include "modest-text-utils.h" + +typedef enum { + EDIT_MODE_COMMAND_MOVE = 1, + EDIT_MODE_COMMAND_DELETE = 2, + EDIT_MODE_COMMAND_RENAME = 3, +} EditModeCommand; /* 'private'/'protected' functions */ static void modest_folder_window_class_init (ModestFolderWindowClass *klass); @@ -56,26 +66,30 @@ 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_delete_edit_mode (GtkButton *button, + ModestFolderWindow *self); +static void set_moveto_edit_mode (GtkButton *button, + ModestFolderWindow *self); +static void set_rename_edit_mode (GtkButton *button, + ModestFolderWindow *self); +static void modest_folder_window_pack_toolbar (ModestHildon2Window *self, + GtkPackType pack_type, + GtkWidget *toolbar); + typedef struct _ModestFolderWindowPrivate ModestFolderWindowPrivate; struct _ModestFolderWindowPrivate { GtkWidget *folder_view; + GtkWidget *top_vbox; /* signals */ GSList *sighandlers; - /* Display state */ - osso_display_state_t display_state; }; #define MODEST_FOLDER_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_FOLDER_WINDOW, \ @@ -103,7 +117,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); } @@ -116,15 +130,15 @@ modest_folder_window_class_init (ModestFolderWindowClass *klass) GObjectClass *gobject_class; gobject_class = (GObjectClass*) klass; ModestWindowClass *modest_window_class = (ModestWindowClass *) klass; + ModestHildon2WindowClass *modest_hildon2_window_class = (ModestHildon2WindowClass *) klass; parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = modest_folder_window_finalize; 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; + modest_hildon2_window_class->pack_toolbar_func = modest_folder_window_pack_toolbar; } static void @@ -135,10 +149,11 @@ modest_folder_window_init (ModestFolderWindow *obj) priv = MODEST_FOLDER_WINDOW_GET_PRIVATE(obj); priv->sighandlers = NULL; - priv->display_state = OSSO_DISPLAY_ON; priv->folder_view = NULL; - + + priv->top_vbox = NULL; + modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(), GTK_WINDOW(obj), "applications_email_folderview"); @@ -190,19 +205,6 @@ connect_signals (ModestFolderWindow *self) } -static void -osso_display_event_cb (osso_display_state_t state, - gpointer data) -{ - ModestFolderWindowPrivate *priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (data); - - priv->display_state = state; - - /* Stop blinking if the screen becomes on */ - if (priv->display_state == OSSO_DISPLAY_ON) - modest_platform_remove_new_mail_notifications (TRUE); -} - ModestWindow * modest_folder_window_new (TnyFolderStoreQuery *query) { @@ -214,6 +216,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), @@ -225,11 +228,15 @@ modest_folder_window_new (TnyFolderStoreQuery *query) tny_account_store_view_set_account_store (TNY_ACCOUNT_STORE_VIEW (priv->folder_view), TNY_ACCOUNT_STORE (modest_runtime_get_account_store ())); + priv->top_vbox = gtk_vbox_new (0, FALSE); + gtk_container_add (GTK_CONTAINER (pannable), priv->folder_view); - gtk_container_add (GTK_CONTAINER (self), pannable); + gtk_box_pack_end (GTK_BOX (priv->top_vbox), pannable, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (self), priv->top_vbox); gtk_widget_show (priv->folder_view); gtk_widget_show (pannable); + gtk_widget_show (priv->top_vbox); connect_signals (MODEST_FOLDER_WINDOW (self)); @@ -250,41 +257,30 @@ modest_folder_window_new (TnyFolderStoreQuery *query) g_object_unref (window_icon); } - /* Listen for changes in the screen, we don't want to show a - led pattern when the display is on for example */ - osso_hw_set_display_event_cb (modest_maemo_utils_get_osso_context (), - osso_display_event_cb, - self); - /* Dont't restore settings here, * because it requires a gtk_widget_show(), * and we don't want to do that until later, * so that the UI is not visible for non-menu D-Bus activation. */ - 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) -{ - ModestFolderWindowPrivate *priv = NULL; - - g_return_val_if_fail (MODEST_IS_FOLDER_WINDOW(self), FALSE); - - priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self); + /* Register edit modes */ + modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_DELETE, + _("mcen_ti_edit_folder_delete"), _HL("wdgt_bd_delete"), + GTK_TREE_VIEW (priv->folder_view), + GTK_SELECTION_SINGLE, + EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_delete_folder)); + modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_MOVE, + _("mcen_ti_edit_move_folder"), _("mcen_me_move"), + GTK_TREE_VIEW (priv->folder_view), + GTK_SELECTION_SINGLE, + EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_move_to)); + modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_RENAME, + _("mcen_ti_edit_rename_folde"), _HL("wdgt_bd_rename"), + GTK_TREE_VIEW (priv->folder_view), + GTK_SELECTION_SINGLE, + EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_rename_folder)); - return (priv->display_state == OSSO_DISPLAY_ON) ? TRUE : FALSE; + return MODEST_WINDOW(self); } ModestFolderView * @@ -339,45 +335,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 (); - - add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_viewer_newemail"), - G_CALLBACK (modest_ui_actions_on_new_msg)); - add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_sendandreceive"), - G_CALLBACK (modest_ui_actions_on_send_receive)); + /* folders actions */ + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_folder"), NULL, + APP_MENU_CALLBACK (modest_ui_actions_on_new_folder), + NULL); + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_user_renamefolder"), NULL, + APP_MENU_CALLBACK (set_rename_edit_mode), + NULL); + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_move_folder"), NULL, + APP_MENU_CALLBACK (set_moveto_edit_mode), + NULL); + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_delete_folder"), NULL, + APP_MENU_CALLBACK (set_delete_edit_mode), + NULL); + + /* new message */ + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_viewer_newemail"), "n", + APP_MENU_CALLBACK (modest_ui_actions_on_new_msg), + NULL); + + /* send receive actions should be only one visible always */ + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_sendandreceive"), NULL, + 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"), NULL, + 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), _("mcen_me_inbox_options"), - G_CALLBACK (modest_ui_actions_on_settings)); - add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_accounts"), - G_CALLBACK (modest_ui_actions_on_accounts)); - 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), _("mcen_me_new_accounts"), NULL, + APP_MENU_CALLBACK (modest_ui_actions_on_new_account), + NULL); + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_edit_accounts"), NULL, + APP_MENU_CALLBACK (modest_ui_actions_on_accounts), + NULL); + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_options"), NULL, + APP_MENU_CALLBACK (modest_ui_actions_on_settings), + NULL); + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_globalsmtpservers"), NULL, + 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 @@ -408,3 +410,41 @@ on_folder_activated (ModestFolderView *folder_view, modest_window_get_active_account (MODEST_WINDOW (self))); gtk_widget_show (GTK_WIDGET (headerwin)); } + +static void +set_delete_edit_mode (GtkButton *button, + ModestFolderWindow *self) +{ + modest_hildon2_window_set_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_DELETE); +} + +static void +set_moveto_edit_mode (GtkButton *button, + ModestFolderWindow *self) +{ + modest_hildon2_window_set_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_MOVE); +} + +static void +set_rename_edit_mode (GtkButton *button, + ModestFolderWindow *self) +{ + modest_hildon2_window_set_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_RENAME); +} + +static void +modest_folder_window_pack_toolbar (ModestHildon2Window *self, + GtkPackType pack_type, + GtkWidget *toolbar) +{ + ModestFolderWindowPrivate *priv; + + g_return_if_fail (MODEST_IS_FOLDER_WINDOW (self)); + priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self); + + if (pack_type == GTK_PACK_START) { + gtk_box_pack_start (GTK_BOX (priv->top_vbox), toolbar, FALSE, FALSE, 0); + } else { + gtk_box_pack_end (GTK_BOX (priv->top_vbox), toolbar, FALSE, FALSE, 0); + } +}