/* progress hint */
gboolean progress_hint;
+ gchar *current_store_account;
+
+ /* sort button */
+ GtkWidget *sort_button;
};
#define MODEST_HEADER_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_HEADER_WINDOW, \
static gboolean on_expose_event(GtkTreeView *header_view,
GdkEventExpose *event,
gpointer user_data);
+static gboolean on_map_event (GtkWidget *widget,
+ GdkEvent *event,
+ gpointer userdata);
static void on_vertical_movement (HildonPannableArea *area,
HildonMovementDirection direction,
gdouble x, gdouble y, gpointer user_data);
-static void set_progress_hint (ModestHeaderWindow *self,
- gboolean enabled);
static void on_queue_changed (ModestMailOperationQueue *queue,
ModestMailOperation *mail_op,
ModestMailOperationQueueNotification type,
ModestHeaderWindow *self);
-static void modest_header_window_show_toolbar (ModestWindow *window,
- gboolean show_toolbar);
static void modest_header_window_pack_toolbar (ModestHildon2Window *self,
GtkPackType pack_type,
GtkWidget *toolbar);
gint edit_mode_id,
gboolean enabled,
ModestHeaderWindow *self);
+static void on_progress_list_changed (ModestWindowMgr *mgr,
+ ModestHeaderWindow *self);
+static void update_progress_hint (ModestHeaderWindow *self);
+static void on_sort_column_changed (GtkTreeSortable *treesortable,
+ gpointer user_data);
+static void update_sort_button (ModestHeaderWindow *self);
/* globals */
g_type_class_add_private (gobject_class, sizeof(ModestHeaderWindowPrivate));
- modest_window_class->show_toolbar_func = modest_header_window_show_toolbar;
modest_window_class->disconnect_signals_func = modest_header_window_disconnect_signals;
modest_hildon2_window_class->pack_toolbar_func = modest_header_window_pack_toolbar;
}
priv->autoscroll = TRUE;
priv->progress_hint = FALSE;
priv->queue_change_handler = 0;
+ priv->current_store_account = NULL;
+ priv->sort_button = NULL;
modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(),
GTK_WINDOW(obj),
priv = MODEST_HEADER_WINDOW_GET_PRIVATE(obj);
- g_object_unref (priv->header_view);
- g_object_unref (priv->empty_view);
g_object_unref (priv->folder);
+ if (priv->current_store_account) {
+ g_free (priv->current_store_account);
+ priv->current_store_account = NULL;
+ }
+
/* Sanity check: shouldn't be needed, the window mgr should
call this function before */
modest_header_window_disconnect_signals (MODEST_WINDOW (obj));
static void
modest_header_window_disconnect_signals (ModestWindow *self)
-{
- ModestHeaderWindowPrivate *priv;
+{
+ ModestHeaderWindowPrivate *priv;
priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self);
if (g_signal_handler_is_connected (G_OBJECT (modest_runtime_get_mail_operation_queue ()),
connect_signals (ModestHeaderWindow *self)
{
ModestHeaderWindowPrivate *priv;
+ GtkTreeSortable *sortable;
priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self);
G_CALLBACK (on_expose_event),
self);
+ sortable = GTK_TREE_SORTABLE (gtk_tree_model_filter_get_model
+ (GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (
+ GTK_TREE_VIEW (priv->header_view)))));
+ priv->sighandlers =
+ modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT (sortable),
+ "sort-column-changed",
+ G_CALLBACK (on_sort_column_changed),
+ self);
+
+ priv->sighandlers =
+ modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT (self),
+ "map-event",
+ G_CALLBACK (on_map_event),
+ self);
+
priv->sighandlers =
modest_signal_mgr_connect (priv->sighandlers,
G_OBJECT (priv->contents_view),
"queue-changed",
G_CALLBACK (on_queue_changed),
self);
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT (modest_runtime_get_window_mgr ()),
+ "progress-list-changed",
+ G_CALLBACK (on_progress_list_changed), self);
}
static GtkWidget *
ModestWindow *
-modest_header_window_new (TnyFolder *folder)
+modest_header_window_new (TnyFolder *folder, const gchar *account_name)
{
ModestHeaderWindow *self = NULL;
ModestHeaderWindowPrivate *priv = NULL;
HildonProgram *app;
GdkPixbuf *window_icon;
+ ModestAccountMgr *mgr;
+ ModestAccountSettings *settings = NULL;
+ ModestServerAccountSettings *store_settings = NULL;
self = MODEST_HEADER_WINDOW(g_object_new(MODEST_TYPE_HEADER_WINDOW, NULL));
priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self);
priv->header_view = create_header_view (MODEST_WINDOW (self), folder);
priv->empty_view = create_empty_view ();
- g_object_ref (priv->header_view);
- g_object_ref (priv->empty_view);
g_signal_connect (G_OBJECT (self), "edit-mode-changed",
G_CALLBACK (edit_mode_changed), (gpointer) self);
setup_menu (self);
app = hildon_program_get_instance ();
hildon_program_add_window (app, HILDON_WINDOW (self));
-
+
/* Set window icon */
window_icon = modest_platform_get_icon (MODEST_APP_ICON, MODEST_ICON_SIZE_BIG);
if (window_icon) {
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,
- _("mcen_ti_edit_move"), _("mcen_me_move"),
+ _("mcen_ti_edit_move"), _HL("wdgt_bd_move"),
GTK_TREE_VIEW (priv->header_view),
GTK_SELECTION_MULTIPLE,
EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_move_to));
+
+ modest_window_set_active_account (MODEST_WINDOW (self), account_name);
+ mgr = modest_runtime_get_account_mgr ();
+ settings = modest_account_mgr_load_account_settings (mgr, account_name);
+ if (settings) {
+ store_settings = modest_account_settings_get_store_settings (settings);
+ if (store_settings) {
+ priv->current_store_account =
+ g_strdup (modest_server_account_settings_get_account_name (store_settings));
+ g_object_unref (store_settings);
+ }
+ g_object_unref (settings);
+ }
+
+ update_progress_hint (self);
+ update_sort_button (self);
+
return MODEST_WINDOW(self);
}
static void setup_menu (ModestHeaderWindow *self)
{
+ ModestHeaderWindowPrivate *priv;
+
g_return_if_fail (MODEST_IS_HEADER_WINDOW(self));
+ priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+ 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_move_messages"), NULL,
APP_MENU_CALLBACK (set_moveto_edit_mode),
- MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_delete));
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_move_to));
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_DIMMING_CALLBACK (modest_ui_dimming_rules_on_delete));
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_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_new_message"), "<Control>n",
- APP_MENU_CALLBACK (modest_ui_actions_on_new_msg),
- MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_new_msg));
+ priv->sort_button = hildon_button_new (MODEST_EDITABLE_SIZE,
+ HILDON_BUTTON_ARRANGEMENT_VERTICAL);
+ hildon_button_set_title (HILDON_BUTTON (priv->sort_button), _("mcen_me_sort"));
+ g_signal_connect (G_OBJECT (priv->sort_button), "clicked",
+ G_CALLBACK (modest_ui_actions_on_sort), (gpointer) self);
+ modest_hildon2_window_add_button_to_menu (MODEST_HILDON2_WINDOW (self), GTK_BUTTON (priv->sort_button),
+ modest_ui_dimming_rules_on_sort);
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));
return FALSE;
}
-static gboolean
-set_toolbar_transfer_mode (ModestHeaderWindow *self)
+static gboolean
+on_map_event(GtkWidget *widget,
+ GdkEvent *event,
+ gpointer user_data)
{
- ModestHeaderWindowPrivate *priv = NULL;
-
- g_return_val_if_fail (MODEST_IS_HEADER_WINDOW (self), FALSE);
+ ModestHeaderWindow *self = (ModestHeaderWindow *) user_data;
+ ModestHeaderWindowPrivate *priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
- priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self);
+ g_return_val_if_fail (MODEST_IS_HEADER_WINDOW (self), FALSE);
- set_progress_hint (self, TRUE);
-
+ if (priv->progress_hint) {
+ hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), TRUE);
+ }
return FALSE;
}
-static void
-set_progress_hint (ModestHeaderWindow *self,
- gboolean enabled)
+static void
+on_progress_list_changed (ModestWindowMgr *mgr,
+ ModestHeaderWindow *self)
{
- ModestWindowPrivate *parent_priv;
- ModestHeaderWindowPrivate *priv;
+ update_progress_hint (self);
+}
- g_return_if_fail (MODEST_IS_HEADER_WINDOW (self));
+static gboolean
+has_active_operations (ModestHeaderWindow *self)
+{
+ GSList *operations = NULL, *node;
+ ModestMailOperationQueue *queue;
+ gboolean has_active = FALSE;
- parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
- priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self);
-
- /* Sets current progress hint */
- priv->progress_hint = enabled;
+ queue = modest_runtime_get_mail_operation_queue ();
+ operations = modest_mail_operation_queue_get_by_source (queue, G_OBJECT (self));
- if (GTK_WIDGET_VISIBLE (self)) {
- hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), enabled?1:0);
+ for (node = operations; node != NULL; node = g_slist_next (node)) {
+ if (!modest_mail_operation_is_finished (MODEST_MAIL_OPERATION (node->data))) {
+ has_active = TRUE;
+ break;
+ }
+ }
+
+ if (operations) {
+ g_slist_foreach (operations, (GFunc) g_object_unref, NULL);
+ g_slist_free (operations);
}
+ return has_active;
}
-gboolean
-modest_header_window_toolbar_on_transfer_mode (ModestHeaderWindow *self)
+static void
+update_progress_hint (ModestHeaderWindow *self)
{
- ModestHeaderWindowPrivate *priv= NULL;
+ ModestHeaderWindowPrivate *priv;
- g_return_val_if_fail (MODEST_IS_HEADER_WINDOW (self), FALSE);
priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
- return priv->progress_hint;
+ priv->progress_hint = FALSE;
+
+ if (has_active_operations (self)) {
+ priv->progress_hint = TRUE;
+ }
+
+ return;
+
+ if (!priv->progress_hint && priv->current_store_account) {
+ priv->progress_hint =
+ modest_window_mgr_has_progress_operation_on_account (modest_runtime_get_window_mgr (),
+ priv->current_store_account);
+ }
+
+ modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (self));
+
+ if (GTK_WIDGET_VISIBLE (self)) {
+ hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), priv->progress_hint?1:0);
+ }
}
-static void
-modest_header_window_show_toolbar (ModestWindow *self,
- gboolean show_toolbar)
+gboolean
+modest_header_window_toolbar_on_transfer_mode (ModestHeaderWindow *self)
{
- ModestHeaderWindowPrivate *priv = NULL;
- ModestWindowPrivate *parent_priv;
+ ModestHeaderWindowPrivate *priv= NULL;
- parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
- priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self);
+ g_return_val_if_fail (MODEST_IS_HEADER_WINDOW (self), FALSE);
+ priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
- if (modest_header_window_transfer_mode_enabled (MODEST_HEADER_WINDOW (self)))
- set_progress_hint (MODEST_HEADER_WINDOW (self), TRUE);
- else
- set_progress_hint (MODEST_HEADER_WINDOW (self), FALSE);
+ return priv->progress_hint;
}
gboolean
op_type = modest_mail_operation_get_type_operation (mail_op);
source = modest_mail_operation_get_source(mail_op);
if (G_OBJECT (self) == source) {
- set_toolbar_transfer_mode(self);
+ update_progress_hint (self);
}
g_object_unref (source);
}
gpointer user_data)
{
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);
-
- 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);
+ update_progress_hint (self);
- g_slist_free (operations);
modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (self));
}
break;
}
- if (enabled)
+ if (enabled) {
modest_header_view_set_filter (MODEST_HEADER_VIEW (priv->header_view),
filter);
- else
+ } else {
+ GtkTreeSelection *sel;
+
+ /* Unselect all. This will prevent us from keeping a
+ reference to a TnyObject that we don't want to
+ have */
+ sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->header_view));
+ gtk_tree_selection_unselect_all (sel);
+
modest_header_view_unset_filter (MODEST_HEADER_VIEW (priv->header_view),
filter);
+ }
+}
+
+static void
+on_sort_column_changed (GtkTreeSortable *treesortable,
+ gpointer user_data)
+{
+ update_sort_button (MODEST_HEADER_WINDOW (user_data));
+}
+
+static void
+update_sort_button (ModestHeaderWindow *self)
+{
+ ModestHeaderWindowPrivate *priv;
+ GtkTreeSortable *sortable;
+ gint current_sort_colid = -1;
+ GtkSortType current_sort_type;
+ const gchar *value = NULL;
+
+ priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+ sortable = GTK_TREE_SORTABLE (gtk_tree_model_filter_get_model
+ (GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (
+ GTK_TREE_VIEW (priv->header_view)))));
+
+ if (!gtk_tree_sortable_get_sort_column_id (sortable,
+ ¤t_sort_colid, ¤t_sort_type)) {
+ value = _("mcen_li_sort_sender_date_newest");
+ } else {
+ switch (current_sort_colid) {
+ case TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN:
+ {
+ GList *cols = NULL;
+ cols = modest_header_view_get_columns (MODEST_HEADER_VIEW (priv->header_view));
+ if (cols != NULL) {
+ gpointer flags_sort_type_pointer;
+ flags_sort_type_pointer = g_object_get_data (G_OBJECT (cols->data),
+ MODEST_HEADER_VIEW_FLAG_SORT);
+ if (GPOINTER_TO_INT (flags_sort_type_pointer) == TNY_HEADER_FLAG_PRIORITY_MASK)
+ value = _("mcen_li_sort_priority");
+ else
+ value = _("mcen_li_sort_attachment");
+ g_list_free(cols);
+ }
+ }
+ break;
+ case TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN:
+ case TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN:
+ if (current_sort_type == GTK_SORT_ASCENDING)
+ value = _("mcen_li_sort_sender_recipient_az");
+ else
+ value = _("mcen_li_sort_sender_recipient_za");
+ break;
+ case TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN:
+ case TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN:
+ if (current_sort_type == GTK_SORT_ASCENDING)
+ value = _("mcen_li_sort_date_oldest");
+ else
+ value = _("mcen_li_sort_date_newest");
+ break;
+ case TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN:
+ if (current_sort_type == GTK_SORT_ASCENDING)
+ value = _("mcen_li_sort_subject_az");
+ else
+ value = _("mcen_li_sort_subject_za");
+ break;
+ case TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN:
+ if (current_sort_type == GTK_SORT_ASCENDING)
+ value = _("mcen_li_sort_size_smallest");
+ else
+ value = _("mcen_li_sort_size_largest");
+ break;
+ }
+ }
+
+ hildon_button_set_value (HILDON_BUTTON (priv->sort_button), value?value:"");
}
projects / modest / blobdiff