#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,
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,
- ModestDimmingRulesGroup *group,
- GCallback dimming_callback);
-static void setup_menu (ModestFolderWindow *self,
- ModestDimmingRulesGroup *group);
-
-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 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 gboolean modest_folder_window_toggle_menu (HildonWindow *window,
- guint button,
- guint32 time);
+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,
+ ModestFolderWindow *self);
typedef struct _ModestFolderWindowPrivate ModestFolderWindowPrivate;
struct _ModestFolderWindowPrivate {
GtkWidget *folder_view;
- GtkWidget *edit_toolbar;
GtkWidget *top_vbox;
- GtkWidget *app_menu;
-
- 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, \
(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);
}
GObjectClass *gobject_class;
gobject_class = (GObjectClass*) klass;
ModestWindowClass *modest_window_class = (ModestWindowClass *) klass;
- HildonWindowClass *hildon_window_class = (HildonWindowClass *) 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));
- hildon_window_class->toggle_menu = modest_folder_window_toggle_menu;
-
- 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
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)
{
HildonProgram *app;
GdkPixbuf *window_icon;
GtkWidget *pannable;
- ModestWindowPrivate *parent_priv = NULL;
- ModestDimmingRulesGroup *menu_rules_group = NULL;
self = MODEST_FOLDER_WINDOW(g_object_new(MODEST_TYPE_FOLDER_WINDOW, NULL));
priv = MODEST_FOLDER_WINDOW_GET_PRIVATE(self);
- parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
-
- parent_priv->ui_dimming_manager = modest_ui_dimming_manager_new();
- menu_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_MENU, FALSE);
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);
+ g_signal_connect (G_OBJECT (self), "edit-mode-changed",
+ G_CALLBACK (edit_mode_changed), (gpointer) self);
- setup_menu (self, menu_rules_group);
-
- modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, menu_rules_group);
- g_object_unref (menu_rules_group);
+ setup_menu (self);
/* Set account store */
tny_account_store_view_set_account_store (TNY_ACCOUNT_STORE_VIEW (priv->folder_view),
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_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 *
}
-static void add_to_menu (ModestFolderWindow *self,
- HildonAppMenu *menu,
- gchar *label,
- GCallback callback,
- ModestDimmingRulesGroup *group,
- GCallback dimming_callback)
-{
- GtkWidget *button;
-
- button = gtk_button_new_with_label (label);
- g_signal_connect_after (G_OBJECT (button), "clicked",
- callback, (gpointer) self);
- if (dimming_callback)
- modest_dimming_rules_group_add_widget_rule (group,
- button,
- dimming_callback,
- MODEST_WINDOW (self));
- hildon_app_menu_append (menu, GTK_BUTTON (button));
-}
-
-static void setup_menu (ModestFolderWindow *self,
- ModestDimmingRulesGroup *group)
+static void setup_menu (ModestFolderWindow *self)
{
- ModestFolderWindowPrivate *priv = NULL;
-
g_return_if_fail (MODEST_IS_FOLDER_WINDOW(self));
- priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self);
-
- priv->app_menu = hildon_app_menu_new ();
-
/* folders actions */
- add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("TODO: new folder"),
- G_CALLBACK (modest_ui_actions_on_new_folder),
- group, NULL);
- add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_user_renamefolder"),
- G_CALLBACK (set_rename_edit_mode),
- group, NULL);
- add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("TODO: move folder"),
- G_CALLBACK (set_moveto_edit_mode),
- group, NULL);
- add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("TODO: delete folder"),
- G_CALLBACK (set_delete_edit_mode),
- group, NULL);
+ 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 */
- add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_viewer_newemail"),
- G_CALLBACK (modest_ui_actions_on_new_msg),
- group, NULL);
+ 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 */
- add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_inbox_sendandreceive"),
- G_CALLBACK (modest_ui_actions_on_send_receive),
- group, G_CALLBACK (modest_ui_dimming_rules_on_send_receive_all));
- add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_outbox_cancelsend"),
- G_CALLBACK (modest_ui_actions_cancel_send),
- group, G_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all));
+ 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 (priv->app_menu), _("TODO: new account"),
- G_CALLBACK (modest_ui_actions_on_new_account),
- group, NULL);
- add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("TODO: edit accounts"),
- G_CALLBACK (modest_ui_actions_on_accounts),
- group, NULL);
- add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_inbox_options"),
- G_CALLBACK (modest_ui_actions_on_settings),
- group, NULL);
- add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_inbox_globalsmtpservers"),
- G_CALLBACK (modest_ui_actions_on_smtp_servers),
- group, G_CALLBACK (modest_ui_dimming_rules_on_tools_smtp_servers));
+ 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));
- hildon_stackable_window_set_main_menu (HILDON_STACKABLE_WINDOW (self),
- HILDON_APP_MENU (priv->app_menu));
-}
-
-static gboolean
-modest_folder_window_toggle_menu (HildonWindow *window,
- guint button,
- guint32 time)
-{
- ModestFolderWindowPrivate *priv = NULL;
-
- priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (window);
-
- modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window));
-
- gtk_widget_queue_resize (priv->app_menu);
-
- return HILDON_WINDOW_CLASS (parent_class)->toggle_menu (window, button, time);
}
static void
}
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");
- }
- gtk_box_pack_start (GTK_BOX (priv->top_vbox), priv->edit_toolbar, FALSE, FALSE, 0);
- 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)
+set_delete_edit_mode (GtkButton *button,
+ 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 ();
- }
+ modest_hildon2_window_set_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_DELETE);
}
static void
-edit_toolbar_arrow_clicked (HildonEditToolbar *toolbar,
- ModestFolderWindow *self)
+set_moveto_edit_mode (GtkButton *button,
+ ModestFolderWindow *self)
{
- set_edit_mode (self, EDIT_MODE_COMMAND_NONE);
+ modest_hildon2_window_set_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_MOVE);
}
static void
-set_delete_edit_mode (GtkButton *button,
+set_rename_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_RENAME);
}
static void
-set_moveto_edit_mode (GtkButton *button,
- ModestFolderWindow *self)
+modest_folder_window_pack_toolbar (ModestHildon2Window *self,
+ GtkPackType pack_type,
+ GtkWidget *toolbar)
{
- set_edit_mode (self, EDIT_MODE_COMMAND_MOVE);
+ 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
-set_rename_edit_mode (GtkButton *button,
- ModestFolderWindow *self)
+static void
+edit_mode_changed (ModestFolderWindow *folder_window,
+ gint edit_mode_id,
+ ModestFolderWindow *self)
{
- set_edit_mode (self, EDIT_MODE_COMMAND_RENAME);
-}
+ 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;
+ }
+
+ modest_folder_view_set_filter (MODEST_FOLDER_VIEW (priv->folder_view), filter);
+}
projects / modest / blobdiff