#include <modest-osso-autosave-callbacks.h>
#include <libosso.h>
#include <tny-maemo-conic-device.h>
+#include <tny-camel-folder.h>
#include <tny-simple-list.h>
#include <tny-merge-folder.h>
#include <tny-error.h>
#include <osso-mem.h>
#include "hildon2/modest-hildon2-details-dialog.h"
#include "hildon2/modest-hildon2-window-mgr.h"
+#ifdef MODEST_USE_PROFILE
#include <keys_nokia.h>
#include <libprofile.h>
+#endif
#include <canberra.h>
#include <modest-datetime-formatter.h>
#include "modest-header-window.h"
#define URI_ACTION_COPY "copy:"
#define MODEST_NOTIFICATION_CATEGORY "email-message"
#define MODEST_NEW_MAIL_LIGHTING_PATTERN "PatternCommunicationEmail"
+#ifdef MODEST_USE_PROFILE
#define PROFILE_MAIL_TONE PROFILEKEY_EMAIL_ALERT_TONE
#define PROFILE_MAIL_VOLUME PROFILEKEY_EMAIL_ALERT_VOLUME
+#else
+#define MAIL_TONE "message-new-email"
+#endif
#define COMMON_FOLDER_DIALOG_ENTRY "entry"
#define COMMON_FOLDER_DIALOG_ACCOUNT_PICKER "account-picker"
}
}
+GtkWidget *
+get_image_for_folder_store (TnyFolderStore *store,
+ gint size)
+{
+ GdkPixbuf *pixbuf;
+ const gchar *icon_name = NULL;
+ GtkWidget *image = NULL;
+
+ if (TNY_IS_ACCOUNT (store)) {
+ if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (store)))
+ icon_name = MODEST_FOLDER_ICON_LOCAL_FOLDERS;
+ else if (modest_tny_account_is_memory_card_account (TNY_ACCOUNT (store)))
+ icon_name = MODEST_FOLDER_ICON_MMC;
+ else
+ icon_name = MODEST_FOLDER_ICON_ACCOUNT;
+ } else {
+ TnyFolderType type = modest_tny_folder_guess_folder_type (TNY_FOLDER (store));
+ if (modest_tny_folder_is_remote_folder (TNY_FOLDER (store))) {
+ switch (type) {
+ case TNY_FOLDER_TYPE_INBOX:
+ icon_name = MODEST_FOLDER_ICON_INBOX;
+ break;
+ default:
+ icon_name = MODEST_FOLDER_ICON_ACCOUNT;
+ }
+ } else if (modest_tny_folder_is_local_folder (TNY_FOLDER (store))) {
+ switch (type) {
+ case TNY_FOLDER_TYPE_OUTBOX:
+ icon_name = MODEST_FOLDER_ICON_OUTBOX;
+ break;
+ case TNY_FOLDER_TYPE_DRAFTS:
+ icon_name = MODEST_FOLDER_ICON_DRAFTS;
+ break;
+ case TNY_FOLDER_TYPE_SENT:
+ icon_name = MODEST_FOLDER_ICON_SENT;
+ break;
+ default:
+ icon_name = MODEST_FOLDER_ICON_NORMAL;
+ }
+ } else if (modest_tny_folder_is_memory_card_folder (TNY_FOLDER (store))) {
+ icon_name = MODEST_FOLDER_ICON_MMC_FOLDER;
+ }
+ }
+
+ /* Set icon */
+ pixbuf = modest_platform_get_icon (icon_name, size);
+
+ if (pixbuf) {
+ image = gtk_image_new_from_pixbuf (pixbuf);
+ g_object_unref (pixbuf);
+ }
+
+ return image;
+}
+
static void
folder_picker_set_store (GtkButton *button, TnyFolderStore *store)
{
if (store == NULL) {
g_object_set_data (G_OBJECT (button), FOLDER_PICKER_CURRENT_FOLDER, NULL);
} else {
- GdkPixbuf *pixbuf;
- const gchar *icon_name = NULL;
+ GtkWidget *image;
g_object_ref (store);
g_object_set_data_full (G_OBJECT (button), FOLDER_PICKER_CURRENT_FOLDER,
g_free (name);
/* Select icon */
- if (TNY_IS_ACCOUNT (store)) {
- if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (store)))
- icon_name = MODEST_FOLDER_ICON_LOCAL_FOLDERS;
- else if (modest_tny_account_is_memory_card_account (TNY_ACCOUNT (store)))
- icon_name = MODEST_FOLDER_ICON_MMC;
- else
- icon_name = MODEST_FOLDER_ICON_ACCOUNT;
- } else {
- TnyFolderType type = modest_tny_folder_guess_folder_type (TNY_FOLDER (store));
- if (modest_tny_folder_is_remote_folder (TNY_FOLDER (store))) {
- switch (type) {
- case TNY_FOLDER_TYPE_INBOX:
- icon_name = MODEST_FOLDER_ICON_INBOX;
- break;
- default:
- icon_name = MODEST_FOLDER_ICON_ACCOUNT;
- }
- } else if (modest_tny_folder_is_local_folder (TNY_FOLDER (store))) {
- switch (type) {
- case TNY_FOLDER_TYPE_OUTBOX:
- icon_name = MODEST_FOLDER_ICON_OUTBOX;
- break;
- case TNY_FOLDER_TYPE_DRAFTS:
- icon_name = MODEST_FOLDER_ICON_DRAFTS;
- break;
- case TNY_FOLDER_TYPE_SENT:
- icon_name = MODEST_FOLDER_ICON_SENT;
- break;
- default:
- icon_name = MODEST_FOLDER_ICON_NORMAL;
- }
- } else if (modest_tny_folder_is_memory_card_folder (TNY_FOLDER (store))) {
- icon_name = MODEST_FOLDER_ICON_MMC_FOLDER;
- }
- }
-
- /* Set icon */
- pixbuf = modest_platform_get_icon (icon_name, MODEST_ICON_SIZE_SMALL);
-
- if (pixbuf) {
- hildon_button_set_image (HILDON_BUTTON (button),
- gtk_image_new_from_pixbuf (pixbuf));
- g_object_unref (pixbuf);
- }
+ image = get_image_for_folder_store (store, MODEST_ICON_SIZE_SMALL);
+ if (image)
+ hildon_button_set_image (HILDON_BUTTON (button), image);
}
}
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;
/* Notify. We need to do this in an idle because this function
could be called from a thread */
- notify_notification_show (NOTIFY_NOTIFICATION (notification), NULL);
+ if (!notify_notification_show (NOTIFY_NOTIFICATION (notification), NULL)) {
+ g_warning ("Failed to send notification");
+ }
/* Save id in the list */
g_object_get(G_OBJECT(notification), "id", ¬if_id, NULL);
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)
static void
_modest_platform_play_email_tone (void)
{
- gchar *active_profile;
gchar *mail_tone;
- gchar *mail_volume;
gint mail_volume_int;
int ret;
ca_context *ca_con = NULL;
ca_proplist *pl = NULL;
+#ifdef MODEST_USE_PROFILE
+ gchar *active_profile;
+ gchar *mail_volume;
+
active_profile = profile_get_profile ();
mail_tone = profile_get_value (active_profile, PROFILE_MAIL_TONE);
mail_volume = profile_get_value (active_profile, PROFILE_MAIL_VOLUME);
mail_volume_int = profile_parse_int (mail_volume);
+ g_free (mail_volume);
+ g_free (active_profile);
+#else
+ mail_tone = MAIL_TONE;
+ mail_volume_int = 100;
+#endif
if (mail_tone && !strstr (mail_tone, "/")) {
gchar *tmp;
ca_context_destroy(ca_con);
}
- g_free (mail_volume);
g_free (mail_tone);
- g_free (active_profile);
}
#define MOVE_TO_DIALOG_FOLDER_VIEW "folder-view"
#define MOVE_TO_DIALOG_BACK_BUTTON "back-button"
-#define MOVE_TO_DIALOG_SELECTION_LABEL "selection-label"
+#define MOVE_TO_DIALOG_ACTION_BUTTON "action-button"
#define MOVE_TO_DIALOG_SHOWING_FOLDERS "showing-folders"
#define MOVE_TO_DIALOG_PANNABLE "pannable"
+#define MOVE_TO_FOLDER_SEPARATOR "/"
+
+static void
+move_to_dialog_set_selected_folder_store (GtkWidget *dialog,
+ TnyFolderStore *folder_store)
+{
+ GtkWidget *action_button;
+ GtkWidget *image = NULL;
+ TnyAccount *account;
+ gchar *account_name = NULL;
+
+ action_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON));
+
+ /* Get account name */
+ if (TNY_IS_FOLDER (folder_store))
+ account = tny_folder_get_account (TNY_FOLDER (folder_store));
+ else
+ account = g_object_ref (folder_store);
+
+ if (modest_tny_account_is_virtual_local_folders (account))
+ account_name = modest_conf_get_string (modest_runtime_get_conf(),
+ MODEST_CONF_DEVICE_NAME, NULL);
+
+ if (!account_name)
+ account_name = g_strdup (tny_account_get_name (account));
+
+ g_object_unref (account);
+
+ /* Set title of button: account or folder name */
+ if (TNY_IS_FOLDER (folder_store)) {
+ hildon_button_set_title (HILDON_BUTTON (action_button),
+ tny_folder_get_name (TNY_FOLDER (folder_store)));
+ } else {
+ hildon_button_set_title (HILDON_BUTTON (action_button), account_name);
+ }
+
+ /* Set value of button, folder full name */
+ if (TNY_IS_CAMEL_FOLDER (folder_store)) {
+ gchar *full_name = g_strconcat (account_name, MOVE_TO_FOLDER_SEPARATOR,
+ tny_camel_folder_get_full_name (TNY_CAMEL_FOLDER (folder_store)),
+ NULL);
+ hildon_button_set_value (HILDON_BUTTON (action_button), full_name);
+ g_free (full_name);
+ }
+ g_free (account_name);
+
+ /* Set image for the button */
+ image = get_image_for_folder_store (folder_store, MODEST_ICON_SIZE_BIG);
+ if (image)
+ hildon_button_set_image (HILDON_BUTTON (action_button), image);
+}
static void
move_to_dialog_show_accounts (GtkWidget *dialog)
{
- GtkWidget *selection_label;
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));
+
+ /* Reset action button */
+ hildon_button_set_title (HILDON_BUTTON (action_button), NULL);
+ hildon_button_set_value (HILDON_BUTTON (action_button), NULL);
+ hildon_button_set_image (HILDON_BUTTON (action_button), NULL);
- gtk_label_set_text (GTK_LABEL (selection_label), "");
+ modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (folder_view), NULL);
modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (folder_view), TRUE);
modest_folder_view_set_style (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_STYLE_SHOW_ALL);
- modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_FILTER_HIDE_FOLDERS);
+ modest_folder_view_unset_filter (MODEST_FOLDER_VIEW (folder_view),
+ MODEST_FOLDER_VIEW_FILTER_HIDE_MCC_FOLDERS);
+ modest_folder_view_unset_filter (MODEST_FOLDER_VIEW (folder_view),
+ MODEST_FOLDER_VIEW_FILTER_HIDE_LOCAL_FOLDERS);
+ modest_folder_view_unset_filter (MODEST_FOLDER_VIEW (folder_view),
+ MODEST_FOLDER_VIEW_FILTER_HIDE_ACCOUNTS);
+ 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));
}
static void
move_to_dialog_show_folders (GtkWidget *dialog, TnyFolderStore *folder_store)
{
- GtkWidget *selection_label;
GtkWidget *back_button;
GtkWidget *folder_view;
TnyAccount *account;
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));
- 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));
+ 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, TRUE);
+
+ /* 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));
account = TNY_ACCOUNT (folder_store);
if (modest_tny_account_is_virtual_local_folders (account)) {
- gchar *device_name;
account_id = tny_account_get_id (account);
- device_name = modest_conf_get_string (modest_runtime_get_conf(),
- MODEST_CONF_DEVICE_NAME, NULL);
- if (device_name) {
- selection_label_text = g_strconcat (device_name, "/", NULL);
- g_free (device_name);
- } else {
- selection_label_text = g_strconcat (tny_account_get_name (account), "/", NULL);
- }
modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view),
MODEST_FOLDER_VIEW_FILTER_HIDE_MCC_FOLDERS);
} else if (modest_tny_account_is_memory_card_account (account)) {
account_id = tny_account_get_id (account);
- selection_label_text = g_strconcat (tny_account_get_name (account), "/", NULL);
modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view),
MODEST_FOLDER_VIEW_FILTER_HIDE_LOCAL_FOLDERS);
} else {
account_id = tny_account_get_id (account);
-
- selection_label_text = g_strconcat (tny_account_get_name (account), "/", NULL);
modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view),
MODEST_FOLDER_VIEW_FILTER_HIDE_LOCAL_FOLDERS);
modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view),
MODEST_FOLDER_VIEW_FILTER_HIDE_MCC_FOLDERS);
}
- gtk_label_set_text (GTK_LABEL (selection_label), selection_label_text);
- g_free (selection_label_text);
+ move_to_dialog_set_selected_folder_store (dialog, folder_store);
modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (folder_view),
account_id);
modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (folder_view), FALSE);
modest_folder_view_set_style (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_STYLE_SHOW_ONE);
+ modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_FILTER_HIDE_ACCOUNTS);
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);
-
- g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SHOWING_FOLDERS, GINT_TO_POINTER (TRUE));
}
static void
gpointer userdata)
{
GtkWidget *dialog = (GtkWidget *) userdata;
- ModestFolderView *folder_view;
-
- /* Revert the effect of show_folders filters */
- folder_view = MODEST_FOLDER_VIEW (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
- modest_folder_view_set_account_id_of_visible_server_account (folder_view, NULL);
- modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (folder_view), TRUE);
- modest_folder_view_unset_filter (folder_view, MODEST_FOLDER_VIEW_FILTER_HIDE_LOCAL_FOLDERS);
- modest_folder_view_unset_filter (folder_view, MODEST_FOLDER_VIEW_FILTER_HIDE_MCC_FOLDERS);
/* Back to show accounts */
move_to_dialog_show_accounts (dialog);
}
static void
-on_move_to_dialog_folder_activated (GtkTreeView *tree_view,
+on_move_to_dialog_row_activated (GtkTreeView *tree_view,
GtkTreePath *path,
GtkTreeViewColumn *column,
gpointer user_data)
{
- TnyFolderStore *selected;
+ TnyFolderStore *selected = NULL;
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));
+
+ 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)
+ return;
+
+ if (!showing_folders) {
+ gboolean valid = TRUE;
+
+ if (TNY_IS_ACCOUNT (selected) &&
+ modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (selected))) {
+ ModestProtocolType protocol_type;
+
+ protocol_type = modest_tny_account_get_protocol_type (TNY_ACCOUNT (selected));
+ valid = !modest_protocol_registry_protocol_type_has_tag
+ (modest_runtime_get_protocol_registry (),
+ protocol_type,
+ MODEST_PROTOCOL_REGISTRY_STORE_FORBID_MESSAGE_ADD);
+ }
+ if (valid)
+ move_to_dialog_show_folders (dialog, selected);
+ } else {
+ move_to_dialog_set_selected_folder_store (dialog, selected);
+ }
+}
+
+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) {
- gtk_dialog_response (GTK_DIALOG (user_data), GTK_RESPONSE_OK);
- } else {
- folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
+ 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_show_folders (dialog, selected);
+ move_to_dialog_set_selected_folder_store (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 *dialog, *folder_view_container;
GtkWidget *align;
GtkWidget *buttons_hbox;
- GtkWidget *back_button, *selection_label;
+ GtkWidget *back_button;
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 */
gtk_button_set_image (GTK_BUTTON (back_button), gtk_image_new_from_pixbuf (back_pixbuf));
g_object_unref (back_pixbuf);
}
- selection_label = gtk_label_new ("");
- gtk_misc_set_alignment (GTK_MISC (selection_label), 0.0, 0.5);
+
+ action_button = hildon_button_new (HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_FINGER_HEIGHT,
+ HILDON_BUTTON_ARRANGEMENT_VERTICAL);
+ gtk_button_set_alignment (GTK_BUTTON (action_button), 0.0, 0.5);
+
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 (top_vbox);
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);
+ gtk_widget_show (dialog);
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_SELECTION_LABEL, selection_label);
+ g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON, action_button);
g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_PANNABLE, folder_view_container);
/* Simulate the behaviour of a HildonPickerDialog by emitting
a response when a folder is selected */
g_signal_connect (*folder_view, "row-activated",
- G_CALLBACK (on_move_to_dialog_folder_activated),
+ G_CALLBACK (on_move_to_dialog_row_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