From 99e354bc9f1a8fcd13ce5acdc2ac485d976e667c Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Fri, 16 Aug 2013 16:16:09 -0400 Subject: [PATCH] Add back select/deselect action to return it to the context menu where users keep looking --- res/menu/message_list_item_context.xml | 5 +++++ res/values-ca/strings.xml | 2 ++ res/values-cs/strings.xml | 2 ++ res/values-da/strings.xml | 2 ++ res/values-de/strings.xml | 2 ++ res/values-el/strings.xml | 2 ++ res/values-es/strings.xml | 2 ++ res/values-fi/strings.xml | 2 ++ res/values-gl/strings.xml | 2 ++ res/values-hu/strings.xml | 2 ++ res/values-iw/strings.xml | 2 ++ res/values-ja/strings.xml | 2 ++ res/values-ko/strings.xml | 2 ++ res/values-nl/strings.xml | 2 ++ res/values-pl/strings.xml | 2 ++ res/values-pt-rBR/strings.xml | 2 ++ res/values-ru/strings.xml | 2 ++ res/values-sv/strings.xml | 2 ++ res/values-tr/strings.xml | 2 ++ res/values-uk/strings.xml | 2 ++ res/values-zh-rCN/strings.xml | 2 ++ res/values-zh-rTW/strings.xml | 2 ++ res/values/strings.xml | 2 ++ src/com/fsck/k9/fragment/MessageListFragment.java | 11 +++++++++++ 24 files changed, 60 insertions(+) diff --git a/res/menu/message_list_item_context.xml b/res/menu/message_list_item_context.xml index 24b48bd97..4de1f886d 100644 --- a/res/menu/message_list_item_context.xml +++ b/res/menu/message_list_item_context.xml @@ -1,6 +1,11 @@ + + Cancel·la Envia Torna a enviar + Selecciona + Desselecciona Respon Respon a tothom Esborra diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 17cbe380b..9e03a860e 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -122,6 +122,8 @@ Posílejte prosím chybová hlášení, přispívejte novými funkcemi a ptejte Zrušit Odeslat Odeslat znovu + Vybrat + Zrušit výběr Odpovědět Odpovědět všem Smazat diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index c92a34e46..664277160 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -118,6 +118,8 @@ Vær venlig at sende fejlrapporter, anmodning om nye funktioner, og spørgsmål Fortryd Send Send igen + Vælg + Fravælg Svar Svar alle Slet diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 0bbd6e9f3..3e94ef028 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -117,6 +117,8 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc Abbrechen Senden Erneut senden + Auswählen + Abwählen Antworten Allen antworten Löschen diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 92863b7c3..5c333b305 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -117,6 +117,8 @@ Άκυρο Αποστολή Αποστολή πάλι + Επιλογή + Απο-επιλογή Απάντηση Απάντηση σε όλους Διαγραφή diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index ad753109f..09f02569c 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -118,6 +118,8 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades Cancelar Enviar Reenviar al remitente + Seleccionar + Deseleccionar Responder Responder a todos Borrar diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 57424f5d8..9e1388a94 100755 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -119,6 +119,8 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen Peruuta Lähetä Lähetä uudelleen + Valitse + Poista valinta Vastaa Vastaa kaikille Poista diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index 22a4fe229..3ac6e03e6 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -118,6 +118,8 @@ Por favor, envía os erros detectados, contribúe con novas funcionalidas e preg Cancelar Enviar Volver a enviar + Seleccionar + Deseleccionar Responder Responder a todos Borrar diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index d19a7673d..8a0f813a8 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -119,6 +119,8 @@ Hibajelentéseivel hozzájárul az újabb verziók tökéletesítéséhez, kérd Mégse Küldés Újraküldés + Megjelöl + Nem jelöl Válasz Válasz mindenkinek Törlés diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 40579864f..4dd40c8d1 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -118,6 +118,8 @@ ביטול שלח שלח שוב + בחר + בטל בחירה השב השב על הכל מחק diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 5f2160f22..e97170e9f 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -118,6 +118,8 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ キャンセル 送信 再編集 + 選択 + 選択解除 返信 全員に返信 削除 diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 63c838021..a804c7ff3 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -117,6 +117,8 @@ K-9 메일은 대부분의 무료 hotmail 계정을 지원하지 않으며, 다 취소 전송 재전송 + 선택 + 선택 해제 회신 전체회신 지우기 diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index d0827bf83..23dcd2317 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -118,6 +118,8 @@ Graag foutrapporten, bijdrage nieuwe functies en vragen stellen op Annuleren Verzenden Opnieuw Verzenden + Selecteren + Annuleer selectie Antwoorden Iedereen antwoorden Verwijderen diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 410cfa1ba..5545e1be2 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -128,6 +128,8 @@ Wszelkie zgłoszenia usterek, zapytania oraz nowe pomysły prosimy przesyłać z Anuluj Wyślij Prześlij ponownie + Zaznacz + Odznacz Odpowiedz Odpowiedz wszystkim Usuń diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index 4ad8a2d0d..26141ee30 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -118,6 +118,8 @@ Por favor, nos envie relatórios de bugs, contribua para novas melhorias e faça Cancelar Enviar Reenviar + Selecionar + Desselecionar Responder Responder a todos Excluir diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index a05390a03..60f340d37 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -119,6 +119,8 @@ K-9 Mail — почтовый клиент для Android. Отмена Отправить Редактировать + Выбрать + Сброс выбора Ответить Ответить всем Удалить diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index e4d27cefa..d7b2b1300 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -118,6 +118,8 @@ Vänligen skicka felrapporter, hjälp till med nya funktioner och ställ frågor Avbryt Skicka Skicka igen + Markera + Avmarkera Svara Svara alla Radera diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index e83262e26..1412c1d7f 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -118,6 +118,8 @@ Lütfen hata raporlarınızı, istediğiniz yeni özellikleri ve sorularınızı İptal Gönder Tekrar Gönder + Seç + Kaldır Cevap Hepsini Cevapla Sil diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index b43ae62f3..52c0256cb 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -118,6 +118,8 @@ K-9 Mail це поштовий клієнт з відкритим вихідни Відмінити Надіслати Надіслати знову + Вибрати + Скасувати вибір Відповісти Відповісти всім Видалити diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index abe220f57..1ad1d1f60 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -117,6 +117,8 @@ K-9改进的功能包括： 取消 发送 重新发送 + 选择 + 取消选择 回复 全部回复 删除 diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 53f535cb4..49c37c061 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -91,6 +91,8 @@ 取消 寄送 再次寄送 + 選擇 + 取消選擇 回覆 全部回覆 刪除 diff --git a/res/values/strings.xml b/res/values/strings.xml index 5d92b2860..946cdb45f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -123,6 +123,8 @@ Please submit bug reports, contribute new features and ask questions at Cancel Send Send Again + Select + Deselect Reply Reply all Delete diff --git a/src/com/fsck/k9/fragment/MessageListFragment.java b/src/com/fsck/k9/fragment/MessageListFragment.java index f369d8988..54302e61f 100644 --- a/src/com/fsck/k9/fragment/MessageListFragment.java +++ b/src/com/fsck/k9/fragment/MessageListFragment.java @@ -1474,6 +1474,11 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick } switch (item.getItemId()) { + case R.id.deselect: + case R.id.select: { + toggleMessageSelectWithAdapterPosition(adapterPosition); + break; + } case R.id.reply: { Message message = getMessageAtPosition(adapterPosition); onReply(message); @@ -1581,6 +1586,12 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick menu.setHeaderTitle(subject); + if( mSelected.contains(mContextMenuUniqueId)) { + menu.findItem(R.id.select).setVisible(false); + } else { + menu.findItem(R.id.deselect).setVisible(false); + } + if (read) { menu.findItem(R.id.mark_as_read).setVisible(false); } else {