X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-folder-window.c;h=e782b9d0936167c21a44e266c19bbbf8cabef018;hp=71744be897fc87ca82c1133c3873c6e5759acd1d;hb=6e0ed95f0118e1954676abdade7dc00d4b7cb2fd;hpb=48d90b657563c7533c8c7b6e4b97db3a2200f566 diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c index 71744be..e782b9d 100644 --- a/src/hildon2/modest-folder-window.c +++ b/src/hildon2/modest-folder-window.c @@ -38,10 +38,25 @@ #include #include #include +#include +#include #include +#include +#include #include #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); @@ -51,18 +66,34 @@ 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 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); +static void edit_mode_changed (ModestFolderWindow *folder_window, + gint edit_mode_id, + gboolean enabled, + ModestFolderWindow *self); 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, \ @@ -90,7 +121,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); } @@ -103,15 +134,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 @@ -122,10 +153,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"); @@ -163,6 +195,9 @@ connect_signals (ModestFolderWindow *self) priv = MODEST_FOLDER_WINDOW_GET_PRIVATE(self); /* folder view */ + priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (priv->folder_view), "folder-activated", + G_CALLBACK (on_folder_activated), self); /* TODO: connect folder view activate */ @@ -174,19 +209,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) { @@ -198,18 +220,31 @@ 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), + MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT); + modest_folder_view_set_filter (MODEST_FOLDER_VIEW (priv->folder_view), + MODEST_FOLDER_VIEW_FILTER_HIDE_ACCOUNTS); + g_signal_connect (G_OBJECT (self), "edit-mode-changed", + G_CALLBACK (edit_mode_changed), (gpointer) self); + + setup_menu (self); /* 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 ())); + 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)); @@ -230,40 +265,239 @@ 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. */ + /* 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"), + _HL("wdgt_bd_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_folder"), + _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 MODEST_WINDOW(self); } -static gboolean -on_zoom_minus_plus_not_implemented (ModestWindow *window) +ModestFolderView * +modest_folder_window_get_folder_view (ModestFolderWindow *self) { - g_return_val_if_fail (MODEST_IS_FOLDER_WINDOW (window), FALSE); + ModestFolderWindowPrivate *priv = NULL; - hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_cannot_zoom_here")); - return FALSE; + g_return_val_if_fail (MODEST_IS_FOLDER_WINDOW(self), FALSE); + priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self); + + return MODEST_FOLDER_VIEW (priv->folder_view); } -gboolean -modest_folder_window_screen_is_on (ModestFolderWindow *self) +void +modest_folder_window_set_account (ModestFolderWindow *self, + const gchar *account_name) { ModestFolderWindowPrivate *priv = NULL; + ModestAccountMgr *mgr; + ModestAccountSettings *settings = NULL; + ModestServerAccountSettings *store_settings = NULL; - g_return_val_if_fail (MODEST_IS_FOLDER_WINDOW(self), FALSE); + g_return_if_fail (MODEST_IS_FOLDER_WINDOW(self)); priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self); - return (priv->display_state == OSSO_DISPLAY_ON) ? TRUE : FALSE; + /* Get account data */ + mgr = modest_runtime_get_account_mgr (); + + settings = modest_account_mgr_load_account_settings (mgr, account_name); + if (!settings) + goto free_refs; + + store_settings = modest_account_settings_get_store_settings (settings); + if (!store_settings) + goto free_refs; + + modest_folder_view_set_account_id_of_visible_server_account + (MODEST_FOLDER_VIEW (priv->folder_view), + modest_server_account_settings_get_account_name (store_settings)); + + modest_window_set_active_account (MODEST_WINDOW (self), account_name); + gtk_window_set_title (GTK_WINDOW (self), + modest_account_settings_get_display_name (settings)); + +free_refs: + if (store_settings) + g_object_unref (store_settings); + if (settings) + g_object_unref (settings); + +} + +static void setup_menu (ModestFolderWindow *self) +{ + g_return_if_fail (MODEST_IS_FOLDER_WINDOW(self)); + + /* 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_rename_folder"), 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_new_message"), + "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)); + 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 */ + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_account"), 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)); + } +static void +on_folder_activated (ModestFolderView *folder_view, + TnyFolder *folder, + gpointer userdata) +{ + ModestFolderWindowPrivate *priv = NULL; + ModestWindow *headerwin; + ModestFolderWindow *self = (ModestFolderWindow *) userdata; + + g_return_if_fail (MODEST_IS_FOLDER_WINDOW(self)); + + priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self); + + if (!folder) + return; + + if (!TNY_IS_FOLDER (folder)) + return; + + headerwin = modest_header_window_new (folder); + modest_window_mgr_register_window (modest_runtime_get_window_mgr (), + MODEST_WINDOW (headerwin), + MODEST_WINDOW (self)); + + modest_window_set_active_account (MODEST_WINDOW (headerwin), + 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); + } +} + +static void +edit_mode_changed (ModestFolderWindow *folder_window, + gint edit_mode_id, + gboolean enabled, + ModestFolderWindow *self) +{ + ModestFolderWindowPrivate *priv; + ModestFolderViewFilter filter = MODEST_FOLDER_VIEW_FILTER_NONE; + + g_return_if_fail (MODEST_IS_FOLDER_WINDOW (self)); + priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self); + + switch (edit_mode_id) { + case EDIT_MODE_COMMAND_MOVE: + filter = MODEST_FOLDER_VIEW_FILTER_MOVEABLE; + break; + case EDIT_MODE_COMMAND_DELETE: + filter = MODEST_FOLDER_VIEW_FILTER_DELETABLE; + break; + case EDIT_MODE_COMMAND_RENAME: + filter = MODEST_FOLDER_VIEW_FILTER_RENAMEABLE; + break; + case MODEST_HILDON2_WINDOW_EDIT_MODE_NONE: + filter = MODEST_FOLDER_VIEW_FILTER_NONE; + break; + } + + if (enabled) + modest_folder_view_set_filter (MODEST_FOLDER_VIEW (priv->folder_view), + filter); + else + modest_folder_view_unset_filter (MODEST_FOLDER_VIEW (priv->folder_view), + filter); +}