X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-platform.c;h=4b8ebbd9e82029eced37a612106ce1075005d08f;hb=f08416bf2e881b413225817ac310afa895bddd9d;hp=f2f87452a598dce37629a9f6bc062e19eccfd0b5;hpb=053fa7cef33664606a5620f7358c31027beac425;p=modest diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c index f2f8745..4b8ebbd 100644 --- a/src/maemo/modest-platform.c +++ b/src/maemo/modest-platform.c @@ -34,7 +34,7 @@ #include #include #include "maemo/modest-maemo-global-settings-dialog.h" - +#include "modest-widget-memory.h" #include #include #include @@ -47,9 +47,9 @@ #include #include #include -#include #define HILDON_OSSO_URI_ACTION "uri-action" +#define URI_ACTION_COPY "copy:" static osso_context_t *osso_context = NULL; @@ -83,16 +83,21 @@ modest_platform_init (void) } + /* Add a D-Bus handler to be used when the main osso-rpc + * D-Bus handler has not handled something. + * We use this for D-Bus methods that need to use more complex types + * than osso-rpc supports. + */ if (!dbus_connection_add_filter (con, modest_dbus_req_filter, NULL, NULL)) { - g_printerr ("Could not add dbus filter\n"); + g_printerr ("Could not add D-Bus filter\n"); return FALSE; } - /* Register our D-Bus callbacks, via the osso API: */ + /* Register our simple D-Bus callbacks, via the osso API: */ osso_return_t result = osso_rpc_set_cb_f(osso_context, MODEST_DBUS_SERVICE, MODEST_DBUS_OBJECT, @@ -218,22 +223,87 @@ modest_platform_get_file_icon_name (const gchar* name, const gchar* mime_type, return icon_name; } + + + +#ifdef MODEST_HILDON_VERSION_0 + gboolean modest_platform_activate_uri (const gchar *uri) { - gboolean result; + OssoURIAction *action; + gboolean result = FALSE; + GSList *actions, *iter = NULL; + const gchar *scheme; + + g_return_val_if_fail (uri, FALSE); + if (!uri) + return FALSE; + + /* the default action should be email */ + scheme = osso_uri_get_scheme_from_uri (uri, NULL); + actions = osso_uri_get_actions (scheme, NULL); + + for (iter = actions; iter; iter = g_slist_next (iter)) { + action = (OssoURIAction*) iter->data; + if (action && strcmp (osso_uri_action_get_name (action), "uri_link_compose_email") == 0) { + GError *err = NULL; + result = osso_uri_open (uri, action, &err); + if (!result && err) { + g_printerr ("modest: modest_platform_activate_uri : %s", + err->message ? err->message : "unknown error"); + g_error_free (err); + } + break; + } + } + + if (!result) + hildon_banner_show_information (NULL, NULL, _("mcen_ib_unsupported_link")); + return result; +} + +#else /* !MODEST_HILDON_VERSION_0*/ -#ifdef MODEST_HILDON_VERSION_0 - result = osso_uri_open (uri, NULL, NULL); -#else - result = hildon_uri_open (uri, NULL, NULL); -#endif +gboolean +modest_platform_activate_uri (const gchar *uri) +{ + HildonURIAction *action; + gboolean result = FALSE; + GSList *actions, *iter = NULL; + const gchar *scheme; + + g_return_val_if_fail (uri, FALSE); + if (!uri) + return FALSE; + + /* the default action should be email */ + scheme = hildon_uri_get_scheme_from_uri (uri, NULL); + actions = hildon_uri_get_actions (scheme, NULL); + + for (iter = actions; iter; iter = g_slist_next (iter)) { + action = (HildonURIAction*) iter->data; + if (action && strcmp (hildon_uri_action_get_service (action), "com.nokia.modest") == 0) { + GError *err = NULL; + result = hildon_uri_open (uri, action, &err); + if (!result && err) { + g_printerr ("modest: modest_platform_activate_uri : %s", + err->message ? err->message : "unknown error"); + g_error_free (err); + } + break; + } + } + if (!result) hildon_banner_show_information (NULL, NULL, _("mcen_ib_unsupported_link")); return result; } + +#endif /* MODEST_HILDON_VERSION_0*/ + gboolean modest_platform_activate_file (const gchar *path, const gchar *mime_type) { @@ -271,8 +341,8 @@ modest_platform_activate_file (const gchar *path, const gchar *mime_type) } typedef struct { - GSList * actions; - gchar *uri; + GSList *actions; + gchar *uri; } ModestPlatformPopupInfo; static gboolean @@ -304,7 +374,21 @@ activate_uri_popup_item (GtkMenuItem *menu_item, g_printerr ("modest: no action name defined\n"); return; } + + /* special handling for the copy menu item -- copy the uri to the clipboard */ + /* if it's a copy thingy, the uri will look like 'copy:http://slashdot.org' */ + if (g_str_has_prefix (action_name, URI_ACTION_COPY)) { + GtkClipboard *clipboard = gtk_clipboard_get (GDK_NONE); + action_name += strlen(URI_ACTION_COPY); /* jump past the prefix */ + + if (g_str_has_prefix (action_name, "mailto:")) /* ignore mailto: prefixes */ + action_name += strlen ("mailto:"); + + gtk_clipboard_set_text (clipboard, action_name, strlen (action_name)); + return; /* we're done */ + } + /* now, the real uri-actions... */ for (node = popup_info->actions; node != NULL; node = g_slist_next (node)) { #ifdef MODEST_HILDON_VERSION_0 OssoURIAction *action = (OssoURIAction *) node->data; @@ -330,6 +414,7 @@ modest_platform_show_uri_popup (const gchar *uri) if (uri == NULL) return FALSE; + #ifdef MODEST_HILDON_VERSION_0 scheme = osso_uri_get_scheme_from_uri (uri, NULL); actions_list = osso_uri_get_actions (scheme, NULL); @@ -347,11 +432,13 @@ modest_platform_show_uri_popup (const gchar *uri) for (node = actions_list; node != NULL; node = g_slist_next (node)) { GtkWidget *menu_item; - const gchar* action_name; + const gchar *action_name; + const gchar *translation_domain; #ifdef MODEST_HILDON_VERSION_0 OssoURIAction *action = (OssoURIAction *) node->data; - action_name = osso_uri_action_get_name (action); - menu_item = gtk_menu_item_new_with_label (dgettext("osso-uri",action_name)); + action_name = osso_uri_action_get_name (action); + translation_domain = osso_uri_action_get_translation_domain (action); + menu_item = gtk_menu_item_new_with_label (dgettext(translation_domain,action_name)); g_object_set_data (G_OBJECT(menu_item), HILDON_OSSO_URI_ACTION, (gpointer)action_name); /* hack, we add it as a gobject property*/ g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (activate_uri_popup_item), @@ -365,7 +452,8 @@ modest_platform_show_uri_popup (const gchar *uri) #else HildonURIAction *action = (HildonURIAction *) node->data; action_name = hildon_uri_action_get_name (action); - menu_item = gtk_menu_item_new_with_label (dgettext("osso-uri", action_name)); + translation_domain = hildon_uri_action_get_translation_domain (action); + menu_item = gtk_menu_item_new_with_label (dgettext(translation_domain, action_name)); g_object_set_data (G_OBJECT(menu_item), HILDON_OSSO_URI_ACTION, (gpointer)action_name); /* hack */ g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (activate_uri_popup_item), popup_info); @@ -378,7 +466,18 @@ modest_platform_show_uri_popup (const gchar *uri) #endif gtk_widget_show (menu_item); } + + /* always add the copy item */ + GtkWidget* menu_item = gtk_menu_item_new_with_label (dgettext("osso-uri", "uri_link_copy_link_location")); + g_object_set_data_full (G_OBJECT(menu_item), HILDON_OSSO_URI_ACTION, + g_strconcat (URI_ACTION_COPY, uri, NULL), + g_free); + g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (activate_uri_popup_item),NULL); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); + gtk_widget_show (menu_item); + + /* and what to do when the link is deleted */ g_signal_connect (G_OBJECT (menu), "delete-event", G_CALLBACK (delete_uri_popup), popup_info); gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, 1, gtk_get_current_event_time ()); @@ -445,7 +544,7 @@ entry_insert_text (GtkEditable *editable, /* Show WID-INF036 */ if (chars_length == 20) { hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (data)), NULL, - _("mcen_ib_maxchar_reached")); + dgettext("hildon-common-strings", "ckdg_ib_maximum_characters_reached")); } else { if (chars_length == 0) { /* A blank space is not valid as first character */ @@ -505,6 +604,11 @@ launch_sort_headers_dialog (GtkWindow *parent_window, gint default_key = 0; gint result; gboolean outgoing = FALSE; + gint current_sort_colid = -1; + GtkSortType current_sort_type; + gint attachments_sort_id; + gint priority_sort_id; + GtkTreeSortable *sortable; /* Get header window */ if (MODEST_IS_MAIN_WINDOW (parent_window)) { @@ -514,11 +618,12 @@ launch_sort_headers_dialog (GtkWindow *parent_window, if (!header_view) return; /* Add sorting keys */ - cols = modest_header_view_get_columns (header_view); + cols = modest_header_view_get_columns (header_view); if (cols == NULL) return; int sort_model_ids[6]; int sort_ids[6]; + outgoing = (GPOINTER_TO_INT (g_object_get_data(G_OBJECT(cols->data), MODEST_HEADER_VIEW_COLUMN))== MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT); @@ -551,6 +656,7 @@ launch_sort_headers_dialog (GtkWindow *parent_window, sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_attachment")); sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN; sort_ids[sort_key] = TNY_HEADER_FLAG_ATTACHMENTS; + attachments_sort_id = sort_key; sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_size")); sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN; @@ -559,10 +665,34 @@ launch_sort_headers_dialog (GtkWindow *parent_window, sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_priority")); sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN; sort_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY; + priority_sort_id = sort_key; + sortable = GTK_TREE_SORTABLE (gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view))))); /* Launch dialogs */ - hildon_sort_dialog_set_sort_key (dialog, default_key); - hildon_sort_dialog_set_sort_order (dialog, GTK_SORT_DESCENDING); + if (!gtk_tree_sortable_get_sort_column_id (sortable, + ¤t_sort_colid, ¤t_sort_type)) { + hildon_sort_dialog_set_sort_key (dialog, default_key); + hildon_sort_dialog_set_sort_order (dialog, GTK_SORT_DESCENDING); + } else { + hildon_sort_dialog_set_sort_order (dialog, current_sort_type); + if (current_sort_colid == TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN) { + 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) + hildon_sort_dialog_set_sort_key (dialog, priority_sort_id); + else + hildon_sort_dialog_set_sort_key (dialog, attachments_sort_id); + } else { + gint current_sort_keyid = 0; + while (current_sort_keyid < 6) { + if (sort_model_ids[current_sort_keyid] == current_sort_colid) + break; + else + current_sort_keyid++; + } + hildon_sort_dialog_set_sort_key (dialog, current_sort_keyid); + } + } result = gtk_dialog_run (GTK_DIALOG (dialog)); if (result == GTK_RESPONSE_OK) { sort_key = hildon_sort_dialog_get_sort_key (dialog); @@ -580,26 +710,28 @@ launch_sort_headers_dialog (GtkWindow *parent_window, } modest_header_view_sort_by_column_id (header_view, sort_model_ids[sort_key], sort_type); - gtk_tree_sortable_sort_column_changed (GTK_TREE_SORTABLE (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)))); + gtk_tree_sortable_sort_column_changed (sortable); } + + modest_widget_memory_save (modest_runtime_get_conf (), + G_OBJECT (header_view), MODEST_CONF_HEADER_VIEW_KEY); /* free */ g_list_free(cols); } - - -gint -modest_platform_run_new_folder_dialog (GtkWindow *parent_window, - TnyFolderStore *parent_folder, - gchar *suggested_name, - gchar **folder_name) +static gint +modest_platform_run_folder_name_dialog (GtkWindow *parent_window, + const gchar *dialog_title, + const gchar *label_text, + const gchar *suggested_name, + gchar **folder_name) { GtkWidget *dialog, *entry, *label, *hbox; gint result; /* Ask the user for the folder name */ - dialog = gtk_dialog_new_with_buttons (_("mcen_ti_new_folder"), + dialog = gtk_dialog_new_with_buttons (dialog_title, parent_window, GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_OK, @@ -609,7 +741,7 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window, NULL); /* Create label and entry */ - label = gtk_label_new (_("mcen_fi_new_folder_name")); + label = gtk_label_new (label_text); /* TODO: check that the suggested name does not exist */ /* We set 21 as maximum because we want to show WID-INF036 when the user inputs more that 20 */ @@ -651,6 +783,32 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window, } gint +modest_platform_run_new_folder_dialog (GtkWindow *parent_window, + TnyFolderStore *parent_folder, + gchar *suggested_name, + gchar **folder_name) +{ + return modest_platform_run_folder_name_dialog (parent_window, + _("mcen_ti_new_folder"), + _("mcen_fi_new_folder_name"), + suggested_name, + folder_name); +} + +gint +modest_platform_run_rename_folder_dialog (GtkWindow *parent_window, + TnyFolderStore *parent_folder, + const gchar *suggested_name, + gchar **folder_name) +{ + return modest_platform_run_folder_name_dialog (parent_window, + _("New folder name"), + _("Enter new folder name:"), + suggested_name, + folder_name); +} + +gint modest_platform_run_confirmation_dialog (GtkWindow *parent_window, const gchar *message) { @@ -805,7 +963,6 @@ modest_platform_get_global_settings_dialog () void modest_platform_on_new_msg (void) { - return; /* TODO: Reenable this later. I disabled it to avoid having one notification per email. */ HildonNotification *not; /* Create a new notification. FIXME put the right values, need @@ -816,7 +973,7 @@ modest_platform_on_new_msg (void) "system.note.dialog"); /* Play sound SR-SND-18. TODO: play the right file */ -/* hildon_notification_set_sound (not, "/usr/share/sounds/ui-battery_low.wav"); */ + /* TODO: Where is this declared? hildon_notification_set_sound (not, "/usr/share/sounds/ui-new_email.wav"); */ /* Set the led pattern */ notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (not), "led-pattern", 3); @@ -825,7 +982,7 @@ modest_platform_on_new_msg (void) could be called from a thread */ if (!notify_notification_show (NOTIFY_NOTIFICATION (not), NULL)) g_error ("Failed to send notification"); - + g_object_unref (not); } @@ -864,7 +1021,7 @@ modest_platform_show_search_messages (GtkWindow *parent_window) result = osso_rpc_run_with_defaults (osso_context, "osso_global_search", "search_email", NULL, DBUS_TYPE_INVALID); if (result != OSSO_OK) { - /* TODO: warning about error showing dialog */ + g_warning ("%s: osso_rpc_run_with_defaults() failed.\n", __FUNCTION__); } } @@ -876,6 +1033,31 @@ modest_platform_show_addressbook (GtkWindow *parent_window) result = osso_rpc_run_with_defaults (osso_context, "osso_addressbook", "top_application", NULL, DBUS_TYPE_INVALID); if (result != OSSO_OK) { - /* TODO: warning about error showing dialog */ + g_warning ("%s: osso_rpc_run_with_defaults() failed.\n", __FUNCTION__); } } + +GtkWidget * +modest_platform_create_folder_view (TnyFolderStoreQuery *query) +{ + GtkWidget *widget = modest_folder_view_new (query); + + /* Show all accounts by default */ + modest_folder_view_set_style (MODEST_FOLDER_VIEW (widget), + MODEST_FOLDER_VIEW_STYLE_SHOW_ONE); + + /* Restore settings */ + modest_widget_memory_restore (modest_runtime_get_conf(), + G_OBJECT (widget), + MODEST_CONF_FOLDER_VIEW_KEY); + + return widget; +} + +void +modest_platform_information_banner (GtkWidget *widget, + const gchar *icon_name, + const gchar *text) +{ + hildon_banner_show_information (widget, icon_name, text); +}