/* signals */
GSList *sighandlers;
gulong queue_change_handler;
- gulong sort_column_handler;
gulong notify_model;
/* progress hint */
gboolean progress_hint;
gchar *current_store_account;
- /* sort button */
- GtkWidget *sort_button;
-
/* CSM menu */
GtkWidget *csm_menu;
gdouble x_coord;
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);
static void on_horizontal_movement (HildonPannableArea *hildonpannable,
gint direction,
gdouble initial_x,
gpointer user_data);
static void modest_header_window_show_more (GtkAction *action, ModestWindow *win);
-static void show_isearch_toolbar (GtkWidget *obj, gpointer data);
static void isearch_toolbar_close (GtkWidget *widget,
ModestHeaderWindow *obj);
static void isearch_toolbar_search (GtkWidget *widget,
ModestHeaderWindow *obj);
+#ifndef MODEST_TOOLKIT_HILDON2
+static void show_isearch_toolbar (GtkWidget *obj, gpointer data);
static void toggle_isearch_toolbar (GtkWidget *obj,
gpointer data);
+#endif
/* globals */
priv->autoscroll = TRUE;
priv->progress_hint = FALSE;
priv->queue_change_handler = 0;
- priv->sort_column_handler = 0;
priv->model_weak_ref = NULL;
priv->current_store_account = NULL;
- priv->sort_button = NULL;
priv->new_message_button = NULL;
priv->show_more_button = NULL;
priv->x_coord = 0;
g_object_weak_unref ((GObject *) priv->model_weak_ref,
on_header_view_model_destroyed,
obj);
- if (g_signal_handler_is_connected (G_OBJECT (priv->model_weak_ref),
- priv->sort_column_handler)) {
- g_signal_handler_disconnect (G_OBJECT (priv->model_weak_ref),
- priv->sort_column_handler);
- }
on_header_view_model_destroyed (obj, (GObject *) priv->model_weak_ref);
}
priv->queue_change_handler = 0;
}
- if (priv->header_view) {
- GtkTreeModel *sortable;
-
- sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->header_view));
- if (sortable) {
- if (g_signal_handler_is_connected (G_OBJECT (sortable),
- priv->sort_column_handler)) {
- g_signal_handler_disconnect (G_OBJECT (sortable),
- priv->sort_column_handler);
- priv->sort_column_handler = 0;
- }
- }
- }
-
modest_signal_mgr_disconnect_all_and_destroy (priv->sighandlers);
priv->sighandlers = NULL;
priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
priv->model_weak_ref = NULL;
- priv->sort_column_handler = 0;
}
static void
g_object_weak_unref ((GObject *) priv->model_weak_ref,
on_header_view_model_destroyed,
self);
- if (g_signal_handler_is_connected (G_OBJECT (priv->model_weak_ref),
- priv->sort_column_handler)) {
- g_signal_handler_disconnect (G_OBJECT (priv->model_weak_ref),
- priv->sort_column_handler);
- }
on_header_view_model_destroyed (self, (GObject *) priv->model_weak_ref);
}
if (!model)
return;
- /* Connect the signal. Listen to object destruction to disconnect it */
- priv->sort_column_handler = g_signal_connect ((GObject *) model,
- "sort-column-changed",
- G_CALLBACK (on_sort_column_changed),
- self);
priv->model_weak_ref = model;
g_object_weak_ref ((GObject *) model, on_header_view_model_destroyed, self);
}
update_progress_hint (self);
- update_sort_button (self);
return MODEST_WINDOW(self);
}
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));
- 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_after (G_OBJECT (priv->sort_button), "clicked",
- G_CALLBACK (modest_ui_actions_on_sort), (gpointer) self);
- hildon_button_set_style(HILDON_BUTTON (priv->sort_button), HILDON_BUTTON_STYLE_PICKER);
- hildon_button_set_title_alignment (HILDON_BUTTON (priv->sort_button), 0.5, 0.5);
- hildon_button_set_value_alignment (HILDON_BUTTON (priv->sort_button), 0.5, 0.5);
- modest_hildon2_window_add_button_to_menu (MODEST_HILDON2_WINDOW (self), GTK_BUTTON (priv->sort_button),
- modest_ui_dimming_rules_on_sort);
priv->show_more_button = hildon_button_new (MODEST_EDITABLE_SIZE, HILDON_BUTTON_ARRANGEMENT_VERTICAL);
hildon_button_set_title (HILDON_BUTTON (priv->show_more_button), _("mcen_va_more"));
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));
+#ifndef MODEST_TOOLKIT_HILDON2
modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _HL("wdgt_bd_search"), NULL,
APP_MENU_CALLBACK (toggle_isearch_toolbar), NULL);
+#endif
}
static void
}
}
-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);
-
- /* This could happen as the first time the model is set the
- header_view is still not assigned to priv->header_view */
- if (!priv->header_view)
- return;
-
- sortable = GTK_TREE_SORTABLE (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:"");
-}
-
static void
on_horizontal_movement (HildonPannableArea *hildonpannable,
gint direction,
}
}
+#ifndef MODEST_TOOLKIT_HILDON2
/* Used for the Ctrl+F accelerator */
static void
toggle_isearch_toolbar (GtkWidget *obj,
gtk_widget_show (priv->isearch_toolbar);
hildon_find_toolbar_highlight_entry (HILDON_FIND_TOOLBAR (priv->isearch_toolbar), TRUE);
}
+#endif
/* Handler for click on the "X" close button in isearch toolbar */
static void
projects / modest / blobdiff