#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_MOVE = 1,
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 {
/* 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;
}
-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);
+ 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,
*/
/* Register edit modes */
- modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_DELETE,
- _("TODO: Select folder to delete"), _("TODO: Delete"),
+ 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,
- _("TODO: Select folder to move"), _("TODO: Move"),
+ 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,
- _("TODO: Select folder to rename"), _("TODO: Rename"),
+ 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);
}
-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);
-
- return (priv->display_state == OSSO_DISPLAY_ON) ? TRUE : FALSE;
-}
-
ModestFolderView *
modest_folder_window_get_folder_view (ModestFolderWindow *self)
{
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_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));
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,
+ 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;
+ }
+
+ modest_folder_view_set_filter (MODEST_FOLDER_VIEW (priv->folder_view), filter);
+}
projects / modest / blobdiff