g_mutex_unlock (data->mutex);
frees:
- if (data) {
- if (g_signal_handler_is_connected (account, data->handler))
- g_signal_handler_disconnect (account, data->handler);
- g_mutex_free (data->mutex);
- g_main_loop_unref (data->wait_loop);
- g_slice_free (ConnectAndWaitData, data);
- }
+ if (g_signal_handler_is_connected (account, data->handler))
+ g_signal_handler_disconnect (account, data->handler);
+ g_mutex_free (data->mutex);
+ g_main_loop_unref (data->wait_loop);
+ g_slice_free (ConnectAndWaitData, data);
conn_status = tny_account_get_connection_status (account);
return (conn_status == TNY_CONNECTION_STATUS_CONNECTED) ? TRUE: FALSE;
account = TNY_ACCOUNT (g_object_ref (folder_store));
}
- if (tny_account_get_account_type (account) == TNY_ACCOUNT_TYPE_STORE) {
+ if (account && (tny_account_get_account_type (account) == TNY_ACCOUNT_TYPE_STORE)) {
if (!modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (account))) {
/* No need to connect a local account */
if (callback)
#define MOVE_TO_DIALOG_FOLDER_VIEW "folder-view"
#define MOVE_TO_DIALOG_BACK_BUTTON "back-button"
+#define MOVE_TO_DIALOG_ACTION_BUTTON "action-button"
#define MOVE_TO_DIALOG_SELECTION_LABEL "selection-label"
#define MOVE_TO_DIALOG_SHOWING_FOLDERS "showing-folders"
#define MOVE_TO_DIALOG_PANNABLE "pannable"
GtkWidget *back_button;
GtkWidget *folder_view;
GtkWidget *pannable;
+ GtkWidget *action_button;
selection_label = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SELECTION_LABEL));
back_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_BACK_BUTTON));
+ action_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON));
folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
pannable = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_PANNABLE));
gtk_widget_set_sensitive (back_button, FALSE);
+ gtk_widget_set_sensitive (action_button, FALSE);
+
+ /* Need to set this here, otherwise callbacks called because
+ of filtering won't perform correctly */
+ g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS, GINT_TO_POINTER (FALSE));
gtk_label_set_text (GTK_LABEL (selection_label), "");
modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (folder_view), TRUE);
modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_FILTER_HIDE_FOLDERS);
hildon_pannable_area_jump_to (HILDON_PANNABLE_AREA (pannable), 0, 0);
- g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS, GINT_TO_POINTER (FALSE));
+ g_object_set (G_OBJECT (folder_view),
+ "hildon-ui-mode", HILDON_UI_MODE_NORMAL,
+ NULL);
}
static void
const gchar *account_id;
gchar *selection_label_text;
GtkWidget *pannable;
+ GtkWidget *action_button;
selection_label = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SELECTION_LABEL));
back_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_BACK_BUTTON));
+ action_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON));
folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
pannable = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_PANNABLE));
gtk_widget_set_sensitive (back_button, TRUE);
+ gtk_widget_set_sensitive (action_button, FALSE);
+
+ /* Need to set this here, otherwise callbacks called because
+ of filtering won't perform correctly */
+ g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS, GINT_TO_POINTER (TRUE));
+
+ g_object_set (G_OBJECT (folder_view),
+ "hildon-ui-mode", HILDON_UI_MODE_EDIT,
+ NULL);
account = TNY_ACCOUNT (folder_store);
if (modest_tny_account_is_virtual_local_folders (account)) {
modest_folder_view_set_style (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_STYLE_SHOW_ONE);
modest_folder_view_unset_filter (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_FILTER_HIDE_FOLDERS);
hildon_pannable_area_jump_to (HILDON_PANNABLE_AREA (pannable), 0, 0);
+}
+
+static void
+move_to_dialog_set_selected_folder (GtkWidget *dialog, TnyFolderStore *folder_store)
+{
+ GtkWidget *selection_label;
+ GtkWidget *action_button;
+ gchar *folder_name;
+
+ selection_label = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SELECTION_LABEL));
+ action_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON));
+
+ gtk_widget_set_sensitive (action_button, TRUE);
+
+ if (TNY_IS_FOLDER (folder_store)) {
+ folder_name = modest_tny_folder_get_display_name (TNY_FOLDER (folder_store));
+ } else if (TNY_IS_ACCOUNT (folder_store)) {
+ folder_name = g_strdup (tny_account_get_name (TNY_ACCOUNT (folder_store)));
+ } else {
+ folder_name = g_strdup ("");
+ }
+
+ gtk_label_set_text (GTK_LABEL (selection_label), folder_name);
+ g_free (folder_name);
- g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS, GINT_TO_POINTER (TRUE));
}
static void
dialog = (GtkWidget *) user_data;
showing_folders = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS));
- if (showing_folders) {
- gtk_dialog_response (GTK_DIALOG (user_data), GTK_RESPONSE_OK);
- } else {
+ if (!showing_folders) {
folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
selected = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
}
}
+static void
+on_move_to_dialog_selection_changed (GtkTreeSelection *selection,
+ gpointer user_data)
+{
+ gboolean showing_folders;
+ GtkWidget *dialog;
+
+ dialog = (GtkWidget *) user_data;
+ showing_folders = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS));
+ if (showing_folders) {
+ TnyFolderStore *selected;
+ GtkWidget *folder_view;
+
+ folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
+ selected = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+
+ if (selected) {
+ move_to_dialog_set_selected_folder (dialog, selected);
+ g_object_unref (selected);
+ }
+ }
+}
+
+static void
+on_move_to_dialog_action_clicked (GtkButton *selection,
+ gpointer user_data)
+{
+ TnyFolderStore *selected;
+ GtkWidget *dialog;
+ GtkWidget *folder_view;
+ gboolean showing_folders;
+
+ dialog = (GtkWidget *) user_data;
+ showing_folders = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS));
+ if (showing_folders) {
+ folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
+ selected = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+
+ if (selected)
+ gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+ }
+}
+
GtkWidget *
modest_platform_create_move_to_dialog (GtkWindow *parent_window,
GtkWidget **folder_view)
GtkWidget *back_button, *selection_label;
GdkPixbuf *back_pixbuf;
GtkWidget *top_vbox;
+ GtkWidget *action_button;
+ GtkTreeSelection *selection;
/* Create dialog. We cannot use a touch selector because we
need to use here the folder view widget directly */
modest_folder_view_set_cell_style (MODEST_FOLDER_VIEW (*folder_view),
MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT);
+ modest_folder_view_show_message_count (MODEST_FOLDER_VIEW (*folder_view),
+ FALSE);
tny_account_store_view_set_account_store (TNY_ACCOUNT_STORE_VIEW (*folder_view),
(TnyAccountStore *) modest_runtime_get_account_store ());
}
selection_label = gtk_label_new ("");
gtk_misc_set_alignment (GTK_MISC (selection_label), 0.0, 0.5);
+
+ action_button = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER (action_button), selection_label);
+
gtk_box_pack_start (GTK_BOX (buttons_hbox), back_button, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (buttons_hbox), selection_label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (buttons_hbox), action_button, TRUE, TRUE, 0);
gtk_widget_set_sensitive (GTK_WIDGET (back_button), FALSE);
+ gtk_widget_set_sensitive (GTK_WIDGET (action_button), FALSE);
gtk_box_pack_start (GTK_BOX (top_vbox), buttons_hbox, FALSE, FALSE, 0);
/* Create pannable and add it to the dialog */
gtk_widget_show (*folder_view);
gtk_widget_show_all (back_button);
gtk_widget_show (selection_label);
+ gtk_widget_show (action_button);
gtk_widget_show (buttons_hbox);
g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW, *folder_view);
g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_BACK_BUTTON, back_button);
+ g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON, action_button);
g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SELECTION_LABEL, selection_label);
g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_PANNABLE, folder_view_container);
G_CALLBACK (on_move_to_dialog_folder_activated),
dialog);
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (*folder_view));
+ g_signal_connect (selection, "changed",
+ G_CALLBACK (on_move_to_dialog_selection_changed),
+ dialog);
+
+ g_signal_connect (action_button, "clicked",
+ G_CALLBACK (on_move_to_dialog_action_clicked),
+ dialog);
+
g_signal_connect (back_button, "clicked",
G_CALLBACK (on_move_to_dialog_back_clicked),
dialog);
projects / modest / blobdiff