#include <hildon/hildon-program.h>
#include <hildon/hildon-banner.h>
#include <modest-ui-dimming-rules.h>
+#include <modest-tny-folder.h>
typedef enum {
CONTENTS_STATE_NONE = 0,
GSList *sighandlers;
gulong queue_change_handler;
- /* Display state */
- osso_display_state_t display_state;
-
/* progress hint */
gboolean progress_hint;
};
priv = MODEST_HEADER_WINDOW_GET_PRIVATE(obj);
priv->sighandlers = NULL;
- priv->display_state = OSSO_DISPLAY_ON;
priv->header_view = NULL;
priv->empty_view = NULL;
self);
}
-static void
-osso_display_event_cb (osso_display_state_t state,
- gpointer data)
-{
- ModestHeaderWindowPrivate *priv = MODEST_HEADER_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);
-}
-
static GtkWidget *
create_header_view (ModestWindow *progress_window, TnyFolder *folder)
{
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);
+ /* Set window title */
+ if (TNY_IS_FOLDER (folder)) {
+ gchar *folder_name;
+
+ folder_name = modest_tny_folder_get_display_name (folder);
+ gtk_window_set_title (GTK_WINDOW (self), folder_name);
+ g_free (folder_name);
+ }
/* Dont't restore settings here,
* because it requires a gtk_widget_show(),
/* setup edit modes */
modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_DELETE,
- _("TODO: Select messages to delete"), _("TODO: Delete"),
+ _("mcen_ti_edit_delete"), _HL("wdgt_bd_delete"),
GTK_TREE_VIEW (priv->header_view),
GTK_SELECTION_MULTIPLE,
EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_delete_message));
modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_MOVE,
- _("TODO: Select messages to move"), _("TODO: Move"),
+ _("mcen_ti_edit_move"), _("mcen_me_move"),
GTK_TREE_VIEW (priv->header_view),
GTK_SELECTION_MULTIPLE,
EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_move_to));
return MODEST_WINDOW(self);
}
-gboolean
-modest_header_window_screen_is_on (ModestHeaderWindow *self)
-{
- ModestHeaderWindowPrivate *priv = NULL;
-
- g_return_val_if_fail (MODEST_IS_HEADER_WINDOW(self), FALSE);
-
- priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
-
- return (priv->display_state == OSSO_DISPLAY_ON) ? TRUE : FALSE;
-}
-
ModestHeaderView *
modest_header_window_get_header_view (ModestHeaderWindow *self)
{
{
g_return_if_fail (MODEST_IS_HEADER_WINDOW(self));
- modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_moveto"),
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_moveto"), NULL,
APP_MENU_CALLBACK (set_moveto_edit_mode),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_delete));
- modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_delete"),
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_delete_messages"), NULL,
APP_MENU_CALLBACK (set_delete_edit_mode),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_move_to));
- modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_messagedetails"),
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_folder details"), NULL,
APP_MENU_CALLBACK (modest_ui_actions_on_details),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_details));
- modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_sort"),
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_sort"), NULL,
APP_MENU_CALLBACK (modest_ui_actions_on_sort),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_sort));
- 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"), "<Control>n",
APP_MENU_CALLBACK (modest_ui_actions_on_new_msg),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_new_msg));
- 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));
- 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));
}
{
ModestHeaderWindow *self;
ModestMailOperationTypeOperation op_type;
-
+ GSList *operations = NULL;
+ ModestMailOperationQueue *queue;
+
self = MODEST_HEADER_WINDOW (user_data);
op_type = modest_mail_operation_get_type_operation (mail_op);
-
- /* If no more operations are being observed, NORMAL mode is enabled again */
- if (modest_mail_operation_queue_num_elements (modest_runtime_get_mail_operation_queue ()) == 0) {
+
+ queue = modest_runtime_get_mail_operation_queue ();
+ operations = modest_mail_operation_queue_get_by_source (queue, user_data);
+
+ /* There should be at least the current one */
+ if (!operations)
+ g_return_if_reached ();
+
+ /* Don't disable the progress hint if there are more pending
+ operations from this window */
+ if (g_slist_length (operations) == 1)
set_progress_hint (self, FALSE);
- }
-
+
+ g_slist_free (operations);
modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (self));
}
projects / modest / blobdiff