#include <modest-window.h>
#include <hildon/hildon-program.h>
#include <hildon/hildon-banner.h>
-#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>
+#include "modest-text-utils.h"
typedef enum {
- EDIT_MODE_COMMAND_NONE = 0,
EDIT_MODE_COMMAND_MOVE = 1,
EDIT_MODE_COMMAND_DELETE = 2,
EDIT_MODE_COMMAND_RENAME = 3,
gpointer userdata);
static void setup_menu (ModestFolderWindow *self);
-static void set_edit_mode (ModestFolderWindow *self,
- EditModeCommand command);
-static void edit_toolbar_button_clicked (HildonEditToolbar *toolbar,
- ModestFolderWindow *self);
-static void edit_toolbar_arrow_clicked (HildonEditToolbar *toolbar,
- ModestFolderWindow *self);
static void set_delete_edit_mode (GtkButton *button,
ModestFolderWindow *self);
static void set_moveto_edit_mode (GtkButton *button,
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 *edit_toolbar;
GtkWidget *top_vbox;
- gboolean edit_mode;
- EditModeCommand edit_command;
-
/* 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, \
priv = MODEST_FOLDER_WINDOW_GET_PRIVATE(obj);
priv->sighandlers = NULL;
- priv->display_state = OSSO_DISPLAY_ON;
priv->folder_view = NULL;
priv->top_vbox = NULL;
- priv->edit_mode = FALSE;
- priv->edit_command = EDIT_MODE_COMMAND_NONE;
- priv->edit_toolbar = NULL;
-
+
modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(),
GTK_WINDOW(obj),
"applications_email_folderview");
}
-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)
{
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);
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);
-}
-
-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"),
+ _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 (priv->display_state == OSSO_DISPLAY_ON) ? TRUE : FALSE;
+ return MODEST_WINDOW(self);
}
ModestFolderView *
g_return_if_fail (MODEST_IS_FOLDER_WINDOW(self));
/* folders actions */
- modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("TODO: new folder"),
+ 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"),
+ 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), _("TODO: move folder"),
+ 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), _("TODO: delete folder"),
+ 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"),
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self),
+ _("mcen_me_new_message"),
+ "<Ctrl>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"),
+ 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"),
+ 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), _("TODO: new account"),
+ 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), _("TODO: edit accounts"),
+ 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"),
+ 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"),
+ 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
-set_edit_mode (ModestFolderWindow *self,
- EditModeCommand command)
-{
- ModestFolderWindowPrivate *priv;
-
- priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self);
- if (priv->edit_toolbar) {
- gtk_widget_destroy (priv->edit_toolbar);
- priv->edit_toolbar = NULL;
- }
-
- if (command == EDIT_MODE_COMMAND_NONE) {
- if (priv->edit_mode) {
- priv->edit_mode = FALSE;
- priv->edit_command = command;
- g_object_set (G_OBJECT (priv->folder_view),
- "hildon-ui-mode", HILDON_UI_MODE_NORMAL,
- NULL);
- gtk_widget_queue_resize (priv->folder_view);
- gtk_window_unfullscreen (GTK_WINDOW (self));
- }
- } else {
- if (!priv->edit_mode) {
- GtkTreeSelection *selection;
-
- g_object_set (G_OBJECT (priv->folder_view),
- "hildon-ui-mode", HILDON_UI_MODE_EDIT,
- NULL);
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->folder_view));
- gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
- gtk_tree_selection_unselect_all (selection);
-
- priv->edit_mode = TRUE;
- priv->edit_command = command;
-
- /* Setup toolbar */
- priv->edit_toolbar = hildon_edit_toolbar_new ();
- switch (command) {
- case EDIT_MODE_COMMAND_DELETE:
- hildon_edit_toolbar_set_label (HILDON_EDIT_TOOLBAR (priv->edit_toolbar),
- _("TODO: Select folder to delete"));
- hildon_edit_toolbar_set_button_label (HILDON_EDIT_TOOLBAR (priv->edit_toolbar),
- _("TODO: Delete"));
- break;
- case EDIT_MODE_COMMAND_MOVE:
- hildon_edit_toolbar_set_label (HILDON_EDIT_TOOLBAR (priv->edit_toolbar),
- _("TODO: Select folder to move"));
- hildon_edit_toolbar_set_button_label (HILDON_EDIT_TOOLBAR (priv->edit_toolbar),
- _("TODO: Move"));
- break;
- case EDIT_MODE_COMMAND_RENAME:
- hildon_edit_toolbar_set_label (HILDON_EDIT_TOOLBAR (priv->edit_toolbar),
- _("TODO: Select folder to rename"));
- hildon_edit_toolbar_set_button_label (HILDON_EDIT_TOOLBAR (priv->edit_toolbar),
- _("TODO: Rename"));
- break;
- case EDIT_MODE_COMMAND_NONE:
- g_assert ("Shouldn't reach");
- }
- modest_hildon2_window_pack_toolbar (MODEST_HILDON2_WINDOW (self), GTK_PACK_START,
- priv->edit_toolbar);
- g_signal_connect (G_OBJECT (priv->edit_toolbar), "button-clicked",
- G_CALLBACK (edit_toolbar_button_clicked), (gpointer) self);
- g_signal_connect (G_OBJECT (priv->edit_toolbar), "arrow-clicked",
- G_CALLBACK (edit_toolbar_arrow_clicked), (gpointer) self);
- gtk_widget_show (priv->edit_toolbar);
-
- gtk_widget_queue_resize (priv->folder_view);
- gtk_window_fullscreen (GTK_WINDOW (self));
- }
- }
-}
-
-static void
-edit_toolbar_button_clicked (HildonEditToolbar *toolbar,
- ModestFolderWindow *self)
-{
- ModestFolderWindowPrivate *priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self);
-
- switch (priv->edit_command) {
- case EDIT_MODE_COMMAND_DELETE:
- if (modest_ui_actions_on_edit_mode_delete_folder (MODEST_WINDOW (self)))
- set_edit_mode (self, EDIT_MODE_COMMAND_NONE);
- break;
- case EDIT_MODE_COMMAND_MOVE:
- if (modest_ui_actions_on_edit_mode_move_to (MODEST_WINDOW (self)))
- set_edit_mode (self, EDIT_MODE_COMMAND_NONE);
- break;
- case EDIT_MODE_COMMAND_RENAME:
- 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 ();
- }
-}
-
-static void
-edit_toolbar_arrow_clicked (HildonEditToolbar *toolbar,
- ModestFolderWindow *self)
-{
- set_edit_mode (self, EDIT_MODE_COMMAND_NONE);
-}
-
-static void
set_delete_edit_mode (GtkButton *button,
ModestFolderWindow *self)
{
- set_edit_mode (self, EDIT_MODE_COMMAND_DELETE);
+ modest_hildon2_window_set_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_DELETE);
}
static void
set_moveto_edit_mode (GtkButton *button,
ModestFolderWindow *self)
{
- set_edit_mode (self, EDIT_MODE_COMMAND_MOVE);
+ modest_hildon2_window_set_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_MOVE);
}
static void
set_rename_edit_mode (GtkButton *button,
ModestFolderWindow *self)
{
- set_edit_mode (self, EDIT_MODE_COMMAND_RENAME);
+ modest_hildon2_window_set_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_RENAME);
}
static void
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);
+}
projects / modest / blobdiff