X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-platform.c;h=6e95fd67f87daed2e29508a44978884b03daca70;hb=e775c695e470de6330436162edb78ea9bef32987;hp=1f9c1eae3792bd5c3e882d9c1f36079592f13ea7;hpb=79065e3542cc84ea332a8e342aeb0072ea2248e6;p=modest diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c index 1f9c1ea..6e95fd6 100644 --- a/src/maemo/modest-platform.c +++ b/src/maemo/modest-platform.c @@ -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, @@ -241,8 +246,7 @@ modest_platform_activate_uri (const gchar *uri) for (iter = actions; iter; iter = g_slist_next (iter)) { action = (OssoURIAction*) iter->data; - const gchar* service = NULL; /* TODO: hildon_uri_action_get_service (action); */ - if (action && service && strcmp (service, "com.nokia.modest") == 0) { + 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) { @@ -259,7 +263,7 @@ modest_platform_activate_uri (const gchar *uri) return result; } -#else /* MODEST_HILDON_VERSION_0*/ +#else /* !MODEST_HILDON_VERSION_0*/ gboolean @@ -428,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), @@ -446,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); @@ -537,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 */ @@ -597,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)) { @@ -606,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); @@ -643,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; @@ -651,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); @@ -672,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, @@ -701,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 */ @@ -743,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) { @@ -897,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. */ #ifndef MODEST_HILDON_VERSION_0 HildonNotification *not; @@ -909,7 +974,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-new_email.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); @@ -958,7 +1023,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__); } } @@ -970,7 +1035,7 @@ 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__); } } @@ -990,3 +1055,11 @@ modest_platform_create_folder_view (TnyFolderStoreQuery *query) return widget; } + +void +modest_platform_information_banner (GtkWidget *widget, + const gchar *icon_name, + const gchar *text) +{ + hildon_banner_show_information (widget, icon_name, text); +}