#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>
+
+typedef enum {
+ EDIT_MODE_COMMAND_NONE = 0,
+ 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);
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,
+ 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,
+ ModestFolderWindow *self);
+static void set_rename_edit_mode (GtkButton *button,
+ 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;
(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);
}
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;
}
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),
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),
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));
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)
{
}
-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 ()); */
-/* add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_user_renamefolder"), */
-/* G_CALLBACK ()); */
-/* add_to_menu (self, HILDON_APP_MENU (app_menu), _("TODO: move folder"), */
-/* G_CALLBACK ()); */
-/* add_to_menu (self, HILDON_APP_MENU (app_menu), _("TODO: delete folder"), */
-/* G_CALLBACK ()); */
+ 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
modest_window_get_active_account (MODEST_WINDOW (self)));
gtk_widget_show (GTK_WIDGET (headerwin));
}
+
+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)
+{
+ 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);
+}
+
+static void
+set_moveto_edit_mode (GtkButton *button,
+ ModestFolderWindow *self)
+{
+ set_edit_mode (self, EDIT_MODE_COMMAND_MOVE);
+}
+
+static void
+set_rename_edit_mode (GtkButton *button,
+ ModestFolderWindow *self)
+{
+ set_edit_mode (self, EDIT_MODE_COMMAND_RENAME);
+}
+
projects / modest / blobdiff