moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-25 07:01:50 -05:00
Code Issues Releases Wiki Activity

Removed settings for scrolling buttons

Browse Source
This commit is contained in:
cketti 2012-02-21 15:16:36 +01:00
parent 309eeb72ac
commit 9f42ff61d3
30 changed files with 118 additions and 601 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
res/layout-land/message_view_scrolling_buttons.xml
View File

@ -1,75 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:id="@+id/scrolling_move_buttons"
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical">
<Button
android:id="@+id/archive_scrolling"
android:text="@string/message_view_archive_action"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_weight="1" />
<Button
android:id="@+id/move_scrolling"
android:text="@string/message_view_move_action"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_weight="1" />
<Button
android:id="@+id/spam_scrolling"
android:text="@string/message_view_spam_action"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_weight="1" />
</LinearLayout>
<LinearLayout
android:id="@+id/scrolling_buttons"
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="57dip"
android:background="@android:color/transparent"
android:gravity="center_vertical">
<Button
android:id="@+id/previous_scrolling"
android:text="@string/message_view_prev_action"
android:contentDescription="@string/previous_action"
android:textSize="35dip"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:padding="0dip"
android:layout_weight="1" />
<Button
android:id="@+id/reply_scrolling"
android:text="@string/reply_action"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_weight="1" />
<Button
android:id="@+id/delete_scrolling"
android:text="@string/delete_action"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_weight="1" />
<Button
android:id="@+id/forward_scrolling"
android:text="@string/forward_action"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_weight="1" />
<Button
android:id="@+id/next_scrolling"
android:text="@string/message_view_next_action"
android:contentDescription="@string/next_action"
android:textSize="35dip"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:padding="0dip"
android:layout_weight="1" />
</LinearLayout>
</merge>

88
res/layout/message_view_scrolling_buttons.xml
View File

@ -1,88 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:id="@+id/extra_buttons"
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingBottom="2dip"
android:gravity="center_vertical">
<Button
android:id="@+id/reply"
android:text="@string/reply_action"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_weight="1"/>
<Button
android:id="@+id/reply_all"
android:text="@string/reply_all_action"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_weight="1"/>
<Button
android:id="@+id/forward"
android:text="@string/forward_action"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_weight="1"/>
</LinearLayout>
<LinearLayout
android:id="@+id/scrolling_move_buttons"
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingBottom="2dip"
android:gravity="center_vertical">
<Button
android:id="@+id/archive_scrolling"
android:text="@string/message_view_archive_action"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_weight="1"/>
<Button
android:id="@+id/move_scrolling"
android:text="@string/message_view_move_action"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_weight="1"/>
<Button
android:id="@+id/spam_scrolling"
android:text="@string/message_view_spam_action"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_weight="1"/>
</LinearLayout>
<LinearLayout
android:id="@+id/scrolling_buttons"
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical">
<Button
android:id="@+id/previous_scrolling"
android:text="@string/message_view_prev_action"
android:contentDescription="@string/previous_action"
android:textSize="35dip"
android:padding="0dip"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_weight="1"/>
<ImageButton
android:id="@+id/delete_scrolling"
android:layout_height="wrap_content"
android:src="@drawable/ic_button_delete"
android:layout_width="0dip"
android:layout_weight="1"/>
<Button
android:id="@+id/next_scrolling"
android:padding="0dip"
android:text="@string/message_view_next_action"
android:textSize="35dip"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_weight="1"/>
</LinearLayout>
</merge>

6
res/values-ca/strings.xml
View File

@ -542,14 +542,8 @@ Benvingut a la configuració del K-9. El K-9 és un client de codi obert per An
<string name="account_settings_notification_unread_count_label">Mostra correu no llegit</string>
<string name="account_settings_notification_unread_count_summary">Mostra el nombre de missatges no llegits a la barra de notificació.</string>
<string name="account_settings_hide_buttons_label">Botons de desplaçament</string>
<string name="account_settings_hide_buttons_never">Mai</string>
<string name="account_settings_hide_buttons_keyboard_avail">Quan el teclat estigui disponible</string>
<string name="account_settings_hide_buttons_always">Sempre</string>
<string name="account_settings_enable_move_buttons_label">Habilita botons emplenat</string>
<string name="account_settings_enable_move_buttons_summary">Mostra els botons d’Arxiu, Mou, i Brossa.</string>
<string name="account_settings_hide_move_buttons_label">Navega botons emplenament</string>
<string name="account_settings_show_pictures_label">Sempre mostra imatges</string>
<string name="account_settings_show_pictures_never">No</string>

6
res/values-cs/strings.xml
View File

@ -549,14 +549,8 @@ Vítejte v nastavení pošty K-9 Mail. K-9 je open source poštovní klient pro
<!-- NEW: <string name="account_settings_notification_unread_count_label">Show unread count</string>-->
<!-- NEW: <string name="account_settings_notification_unread_count_summary">Show the number of unread messages in the notification bar.</string>-->
<string name="account_settings_hide_buttons_label">Posunovat navigační tlačítka</string>
<string name="account_settings_hide_buttons_never">Nikdy</string>
<string name="account_settings_hide_buttons_keyboard_avail">Je-li dostupná klávesnice</string>
<string name="account_settings_hide_buttons_always">Vždy</string>
<string name="account_settings_enable_move_buttons_label">Povolit přesměrovací tlačítka</string>
<string name="account_settings_enable_move_buttons_summary">Zobrazit tlačítka Archív, Přesunout a Nevyžádaná.</string>
<string name="account_settings_hide_move_buttons_label">Posunovat přesměrovací tlačítka</string>
<string name="account_settings_show_pictures_label">Vždy zobrazovat obrázky</string>
<string name="account_settings_show_pictures_never">Ne</string>

6
res/values-da/strings.xml
View File

@ -545,14 +545,8 @@ Velkommen til K-9 Mail opsætning. K-9 er en open source mail klient for Androi
<string name="account_settings_notification_unread_count_label">Vis antal ulæste mails</string>
<string name="account_settings_notification_unread_count_summary">Vis antallet af ulæste mails i statusbar.</string>
<string name="account_settings_hide_buttons_label">Scroll navigations knapper</string>
<string name="account_settings_hide_buttons_never">Aldrig</string>
<string name="account_settings_hide_buttons_keyboard_avail">Når tastatur er tilgængeligt</string>
<string name="account_settings_hide_buttons_always">Altid</string>
<string name="account_settings_enable_move_buttons_label">Aktiver Flyt knapper</string>
<string name="account_settings_enable_move_buttons_summary">Vis Arkiver, Flyt og Spam knapper.</string>
<string name="account_settings_hide_move_buttons_label">Scroll Flyt knapper</string>
<string name="account_settings_show_pictures_label">Vis altid billeder</string>
<string name="account_settings_show_pictures_never">Aldrig</string>

6
res/values-de/strings.xml
View File

@ -543,14 +543,8 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="account_settings_notification_unread_count_label">Anzahl ungelesener Nachrichten anzeigen</string>
<string name="account_settings_notification_unread_count_summary">Zeigt die Anzahl der ungelesenen Nachrichten in der Statuszeile.</string>
<string name="account_settings_hide_buttons_label">Scrolle Navigationsleiste</string>
<string name="account_settings_hide_buttons_never">Leiste bleibt eingeblendet</string>
<string name="account_settings_hide_buttons_keyboard_avail">Nur wenn Tastatur aktiv</string>
<string name="account_settings_hide_buttons_always">Immer</string>
<string name="account_settings_enable_move_buttons_label">Spam-Leiste</string>
<string name="account_settings_enable_move_buttons_summary">Zeige Archivieren-, Verschieben- und Spam-Schaltfläche.</string>
<string name="account_settings_hide_move_buttons_label">Scrolle Spam-Leiste</string>
<string name="account_settings_show_pictures_label">Bilder automatisch anzeigen</string>
<string name="account_settings_show_pictures_never">Niemals</string>

6
res/values-es/strings.xml
View File

@ -541,14 +541,8 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="account_settings_notification_unread_count_label">Mostrar contador de correos sin leer</string>
<string name="account_settings_notification_unread_count_summary">Mostrar el número de mensajes sin leer en la barra de notificaciones.</string>
<string name="account_settings_hide_buttons_label">Botones de desplazamiento</string>
<string name="account_settings_hide_buttons_never">Nunca</string>
<string name="account_settings_hide_buttons_keyboard_avail">Cuando el teclado está disponible</string>
<string name="account_settings_hide_buttons_always">Siempre</string>
<string name="account_settings_enable_move_buttons_label">Habilitar botones de copia</string>
<string name="account_settings_enable_move_buttons_summary">Mostrar botones de archivar, mover y SPAM</string>
<string name="account_settings_hide_move_buttons_label">Botones de copia</string>
<string name="account_settings_show_pictures_label">Mostrar imágenes</string>
<string name="account_settings_show_pictures_never">Nunca</string>

6
res/values-fi/strings.xml
View File

@ -537,14 +537,8 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
<string name="account_settings_notification_unread_count_label">Näytä lukemattomien viestien määrä</string>
<string name="account_settings_notification_unread_count_summary">Näytä lukemattomien viestien määrä osoiterivillä.</string>
<string name="account_settings_hide_buttons_label">Selauksen painikkeet</string>
<string name="account_settings_hide_buttons_never">Ei koskaan</string>
<string name="account_settings_hide_buttons_keyboard_avail">Kun näppäimistö on käytettävissä</string>
<string name="account_settings_hide_buttons_always">Aina</string>
<string name="account_settings_enable_move_buttons_label">Ota käyttöön Siirrä-painikkeet</string>
<string name="account_settings_enable_move_buttons_summary">Näytä Arkistoi-, Siirrä- ja Roskaposti-painikkeet.</string>
<string name="account_settings_hide_move_buttons_label">Vieritä Siirrä painikkeet</string>
<string name="account_settings_show_pictures_label">Näytä kuvat automaattisesti</string>
<string name="account_settings_show_pictures_never">Ei koskaan</string>

6
res/values-fr/strings.xml
View File

@ -567,14 +567,8 @@ Bienvenue dans la configuration de K-9 Mail. K-9 Mail est un client de messageri
<string name="account_settings_notification_unread_count_label">Afficher le nombre de messages non lus</string>
<string name="account_settings_notification_unread_count_summary">Afficher le nombre de messages non lus dans la barre de notification</string>
<string name="account_settings_hide_buttons_label">Défiler les boutons de navigation</string>
<string name="account_settings_hide_buttons_never">Jamais</string>
<string name="account_settings_hide_buttons_keyboard_avail">Lorsque le clavier est disponible</string>
<string name="account_settings_hide_buttons_always">Toujours</string>
<string name="account_settings_enable_move_buttons_label">Activer les boutons de déplacement</string>
<string name="account_settings_enable_move_buttons_summary">Afficher les boutons Archiver, Déplacer ou Spam</string>
<string name="account_settings_hide_move_buttons_label">Défiler les boutons de déplacement</string>
<string name="account_settings_show_pictures_label">Afficher automatiquement les images</string>
<string name="account_settings_show_pictures_never">Jamais</string>

6
res/values-gl/strings.xml
View File

@ -541,14 +541,8 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
<string name="account_settings_notification_unread_count_label">Amosar número de mensaxes non lidos</string>
<string name="account_settings_notification_unread_count_summary">Amosar número de mensaxen non lidos na barra de notificacións.</string>
<string name="account_settings_hide_buttons_label">Botóns de desprazamento</string>
<string name="account_settings_hide_buttons_never">Nunca</string>
<string name="account_settings_hide_buttons_keyboard_avail">Cando o teclado esté dispoñible</string>
<string name="account_settings_hide_buttons_always">Sempre</string>
<string name="account_settings_enable_move_buttons_label">Habilitar botóns de copia</string>
<string name="account_settings_enable_move_buttons_summary">Amosar botóns de arquivar, mover e SPAM</string>
<string name="account_settings_hide_move_buttons_label">Botóns de copia</string>
<string name="account_settings_show_pictures_label">Amosar imaxes</string>
<string name="account_settings_show_pictures_never">Nunca</string>

5
res/values-hu/strings.xml
View File

@ -450,13 +450,8 @@ Levelek letöltése…"</string>
<string name="account_settings_notification_opens_unread_summary">Értesítésre kattintva megnyitja az olvasatlan üzeneteket</string>
<string name="account_settings_notification_unread_count_label">Olvasatlanok kijelzése</string>
<string name="account_settings_notification_unread_count_summary">Olvasatlan levelek száma az állapotsoron.</string>
<string name="account_settings_hide_buttons_label">Görgetés iránygombokkal</string>
<string name="account_settings_hide_buttons_never">Soha</string>
<string name="account_settings_hide_buttons_keyboard_avail">Ha van billentyűzet</string>
<string name="account_settings_hide_buttons_always">Mindig</string>
<string name="account_settings_enable_move_buttons_label">Művelet gombok megjelenítése</string>
<string name="account_settings_enable_move_buttons_summary">Mutassa a Mozgatás, Archív és Levélszemét gombokat</string>
<string name="account_settings_hide_move_buttons_label">Művelet gombok görgetése</string>
<string name="account_settings_show_pictures_label">Képek megjelenítése</string>
<string name="account_settings_show_pictures_never">Soha</string>
<string name="account_settings_show_pictures_only_from_contacts">Csak az ismerősökét</string>

6
res/values-it/strings.xml
View File

@ -543,14 +543,8 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
<string name="account_settings_notification_unread_count_label">Vedi numero messaggi non letti</string>
<string name="account_settings_notification_unread_count_summary">Mostra il numero dei messaggi non letti nella barra di notifica.</string>
<string name="account_settings_hide_buttons_label">Scorri pulsanti navigazione</string>
<string name="account_settings_hide_buttons_never">Mai</string>
<string name="account_settings_hide_buttons_keyboard_avail">Quando la tastiera è disponibile</string>
<string name="account_settings_hide_buttons_always">Sempre</string>
<string name="account_settings_enable_move_buttons_label">Abilita pulsanti archiviazione</string>
<string name="account_settings_enable_move_buttons_summary">Mostra i pulsanti Archivia, Sposta e Spam.</string>
<string name="account_settings_hide_move_buttons_label">Scorri pulsanti archiviazione</string>
<string name="account_settings_show_pictures_label">Mostra sempre le immagini</string>
<string name="account_settings_show_pictures_never">No</string>

6
res/values-ja/strings.xml
View File

@ -545,14 +545,8 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
<string name="account_settings_notification_unread_count_label">未読件数の表示</string>
<string name="account_settings_notification_unread_count_summary">通知バーに未読メッセージの件数を表示する</string>
<string name="account_settings_hide_buttons_label">ナビゲーションボタンのスクロール</string>
<string name="account_settings_hide_buttons_never">しない</string>
<string name="account_settings_hide_buttons_keyboard_avail">キーボード利用時</string>
<string name="account_settings_hide_buttons_always">常に</string>
<string name="account_settings_enable_move_buttons_label">メール整理ボタンを有効にする</string>
<string name="account_settings_enable_move_buttons_summary">アーカイブ、移動、迷惑メールボタンを表示</string>
<string name="account_settings_hide_move_buttons_label">メール整理ボタンをスクロール</string>
<string name="account_settings_show_pictures_label">画像を自動で表示</string>
<string name="account_settings_show_pictures_never">しない</string>

6
res/values-ko/strings.xml
View File

@ -542,14 +542,8 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클
<string name="account_settings_notification_unread_count_label">읽지 않은 메일 수 세기</string>
<string name="account_settings_notification_unread_count_summary">읽지 않은 메시지의 수를 상태바에 보여줍니다.</string>
<string name="account_settings_hide_buttons_label">네비게이션 버튼을 스크롤</string>
<string name="account_settings_hide_buttons_never">하지않음</string>
<string name="account_settings_hide_buttons_keyboard_avail">키보드를 이용가능할 경우</string>
<string name="account_settings_hide_buttons_always">항상</string>
<string name="account_settings_enable_move_buttons_label">재정리(refile) 버튼 활성화</string>
<string name="account_settings_enable_move_buttons_summary">보관, 이동, 스팸 버튼을 보이기</string>
<string name="account_settings_hide_move_buttons_label">재정리(refile) 보튼을 스크롤</string>
<string name="account_settings_show_pictures_label">항상 그림 보기</string>
<string name="account_settings_show_pictures_never">아니오</string>

6
res/values-nl/strings.xml
View File

@ -541,14 +541,8 @@ Welkom bij K-9 Mail setup. K-9 is een open source mail cliënt voor Android, ge
<string name="account_settings_notification_unread_count_label">Toon aantal ongelezen</string>
<string name="account_settings_notification_unread_count_summary">Toon het aantal ongelezen berichten in de \'notification bar\'.</string>
<string name="account_settings_hide_buttons_label">Scroll navigatie knoppen</string>
<string name="account_settings_hide_buttons_never">Nooit</string>
<string name="account_settings_hide_buttons_keyboard_avail">Wanneer toetsenbord beschikbaar is</string>
<string name="account_settings_hide_buttons_always">Altijd</string>
<string name="account_settings_enable_move_buttons_label">Inschakelen verplaats knoppen</string>
<string name="account_settings_enable_move_buttons_summary">Laat de Archief, Verplaats, en Spam knoppen zien.</string>
<string name="account_settings_hide_move_buttons_label">Scroll verplaats knoppen</string>
<string name="account_settings_show_pictures_label">Laat afbeeldingen automatisch zien</string>
<string name="account_settings_show_pictures_never">Nooit</string>

6
res/values-pl/strings.xml
View File

@ -553,14 +553,8 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="account_settings_notification_unread_count_label">Pokaż liczbę nieprzeczytanych</string>
<string name="account_settings_notification_unread_count_summary">Pokaż liczbę nieprzeczytanych wiadomości w pasku powiadomień.</string>
<string name="account_settings_hide_buttons_label">Przyciski nawigacyjne</string>
<string name="account_settings_hide_buttons_never">Przyciski nie są nigdy przesuwalne</string>
<string name="account_settings_hide_buttons_keyboard_avail">Przesuwalne, gdy jest klawiatura</string>
<string name="account_settings_hide_buttons_always">Przyciski są zawsze przesuwalne</string>
<string name="account_settings_enable_move_buttons_label">Użyj przycisków refile </string> <!-- FIXME -->
<string name="account_settings_enable_move_buttons_summary">Pokaż przyciski Archiwum, Przenieś, Spam.</string>
<string name="account_settings_hide_move_buttons_label">Przewijaj przyciski refile </string> <!-- FIXME -->
<string name="account_settings_show_pictures_label">Zawsze pokazuj obrazki</string>
<string name="account_settings_show_pictures_never">Nie</string>

6
res/values-pt-rBR/strings.xml
View File

@ -539,14 +539,8 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
<string name="account_settings_notification_unread_count_label">Mostrar contagem de não lidas</string>
<string name="account_settings_notification_unread_count_summary">Mostrar o número de mensagens não lidas na barra de notificação.</string>
<string name="account_settings_hide_buttons_label">Navegação com botões de scroll</string>
<string name="account_settings_hide_buttons_never">Nunca</string>
<string name="account_settings_hide_buttons_keyboard_avail">Quando teclado estiver disponível</string>
<string name="account_settings_hide_buttons_always">Sempre</string>
<string name="account_settings_enable_move_buttons_label">Habilitar botão de ações</string>
<string name="account_settings_enable_move_buttons_summary">Mostrar botões de Arquivar, Mover e Span.</string>
<string name="account_settings_hide_move_buttons_label">Scroll para botões de ação </string>
<string name="account_settings_show_pictures_label">Sempre mostrar imagens</string>
<string name="account_settings_show_pictures_never">Não</string>

6
res/values-ru/strings.xml
View File

@ -533,14 +533,8 @@
<string name="account_settings_notification_unread_count_label">Показать количество непрочитанных</string>
<string name="account_settings_notification_unread_count_summary">Показать количество непрочитанных в строке уведомлений.</string>
<string name="account_settings_hide_buttons_label">Прокрутка навигационных кнопок</string>
<string name="account_settings_hide_buttons_never">Никогда</string>
<string name="account_settings_hide_buttons_keyboard_avail">Когда присутствует клавиатура</string>
<string name="account_settings_hide_buttons_always">Всегда</string>
<string name="account_settings_enable_move_buttons_label">Разрешить кнопки переноса сообщений</string>
<string name="account_settings_enable_move_buttons_summary">Показывает кнопки: Архив, Переместить, Спам.</string>
<string name="account_settings_hide_move_buttons_label">Спрятать кнопки перемещения</string>
<string name="account_settings_show_pictures_label">Показывать изображения</string>
<string name="account_settings_show_pictures_never">Никогда</string>

6
res/values-sv/strings.xml
View File

@ -543,14 +543,8 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
<string name="account_settings_notification_unread_count_label">Visa antal olästa</string>
<string name="account_settings_notification_unread_count_summary">Visar antalet olästa brev i notifieringsytan.</string>
<string name="account_settings_hide_buttons_label">Scrolla navigationsknappar</string>
<string name="account_settings_hide_buttons_never">Aldrig</string>
<string name="account_settings_hide_buttons_keyboard_avail">När ett tangentbord är tillgängligt</string>
<string name="account_settings_hide_buttons_always">Alltid</string>
<string name="account_settings_enable_move_buttons_label">Aktivera flyttknappar</string>
<string name="account_settings_enable_move_buttons_summary">Visa knappar för att arkivera, flytta och spam-markera e-post.</string>
<string name="account_settings_hide_move_buttons_label">Scrolla flyttknappar</string>
<string name="account_settings_show_pictures_label">Visa bilder automatiskt</string>
<string name="account_settings_show_pictures_never">Aldrig</string>

6
res/values-tr/strings.xml
View File

@ -516,14 +516,8 @@
<string name="account_settings_notification_unread_count_label">Okunmamış sayısını göster</string>
<string name="account_settings_notification_unread_count_summary">Bildirim çubuğunda okunmamış mesaj numarasını göster.</string>
<string name="account_settings_hide_buttons_label">Gezinme tuşlarını kaydırma</string>
<string name="account_settings_hide_buttons_never">Asla</string>
<string name="account_settings_hide_buttons_keyboard_avail">Klavye olduğu zaman</string>
<string name="account_settings_hide_buttons_always">Daima</string>
<string name="account_settings_enable_move_buttons_label">İşaretleme düğmelerini etkinleştir</string>
<string name="account_settings_enable_move_buttons_summary">Arşiv, Taşıma ve Spam düğmelerini göster.</string>
<string name="account_settings_hide_move_buttons_label">İşaretleme düğmelerini kaydır</string>
<string name="account_settings_show_pictures_label">Daima imajları göster</string>
<string name="account_settings_show_pictures_never">Hayır</string>

6
res/values-zh-rCN/strings.xml
View File

@ -530,14 +530,8 @@
<!-- NEW: <string name="account_settings_notification_unread_count_label">Show unread count</string>-->
<!-- NEW: <string name="account_settings_notification_unread_count_summary">Show the number of unread messages in the notification bar.</string>-->
<string name="account_settings_hide_buttons_label">滚动导航按钮</string>
<string name="account_settings_hide_buttons_never">从不</string>
<string name="account_settings_hide_buttons_keyboard_avail">使用键盘时</string>
<string name="account_settings_hide_buttons_always">总是</string>
<string name="account_settings_enable_move_buttons_label">启用整理按钮</string>
<string name="account_settings_enable_move_buttons_summary">显示归档、移动和标记为垃圾按钮</string>
<string name="account_settings_hide_move_buttons_label">滚动整理按钮</string>
<string name="account_settings_show_pictures_label">显示图片</string>
<string name="account_settings_show_pictures_never">从不</string>

6
res/values-zh-rTW/strings.xml
View File

@ -539,14 +539,8 @@
<string name="account_settings_notification_unread_count_label">顯示未讀郵件數</string>
<string name="account_settings_notification_unread_count_summary">在通知欄上顯示未讀郵件數</string>
<string name="account_settings_hide_buttons_label">滾動導航按鈕</string>
<string name="account_settings_hide_buttons_never">從不</string>
<string name="account_settings_hide_buttons_keyboard_avail">使用鍵盤時</string>
<string name="account_settings_hide_buttons_always">總是</string>
<string name="account_settings_enable_move_buttons_label">啟用整理按鈕</string>
<string name="account_settings_enable_move_buttons_summary">顯示歸檔、移動和標記為垃圾按鈕</string>
<string name="account_settings_hide_move_buttons_label">滾動整理按鈕</string>
<string name="account_settings_show_pictures_label">顯示圖片</string>
<string name="account_settings_show_pictures_never">從不</string>

24
res/values/arrays.xml
View File

@ -149,30 +149,6 @@
<item>NOT_SECOND_CLASS</item>
</string-array>
<string-array name="account_settings_hide_buttons_entries">
<item>@string/account_settings_hide_buttons_never</item>
<item>@string/account_settings_hide_buttons_keyboard_avail</item>
<item>@string/account_settings_hide_buttons_always</item>
</string-array>
<string-array name="account_settings_hide_buttons_values">
<item>NEVER</item>
<item>KEYBOARD_AVAILABLE</item>
<item>ALWAYS</item>
</string-array>
<string-array name="account_settings_hide_move_buttons_entries">
<item>@string/account_settings_hide_buttons_never</item>
<item>@string/account_settings_hide_buttons_keyboard_avail</item>
<item>@string/account_settings_hide_buttons_always</item>
</string-array>
<string-array name="account_settings_hide_move_buttons_values">
<item>NEVER</item>
<item>KEYBOARD_AVAILABLE</item>
<item>ALWAYS</item>
</string-array>
<string-array name="account_settings_show_pictures_entries">
<item>@string/account_settings_show_pictures_never</item>
<item>@string/account_settings_show_pictures_only_from_contacts</item>

6
res/values/strings.xml
View File

@ -550,14 +550,8 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="account_settings_notification_unread_count_label">Show unread count</string>
<string name="account_settings_notification_unread_count_summary">Show the number of unread messages in the notification bar.</string>
<string name="account_settings_hide_buttons_label">Scroll navigation buttons</string>
<string name="account_settings_hide_buttons_never">Never</string>
<string name="account_settings_hide_buttons_keyboard_avail">When keyboard is available</string>
<string name="account_settings_hide_buttons_always">Always</string>
<string name="account_settings_enable_move_buttons_label">Enable refile buttons</string>
<string name="account_settings_enable_move_buttons_summary">Show the Archive, Move, and Spam buttons.</string>
<string name="account_settings_hide_move_buttons_label">Scroll refile buttons</string>
<string name="account_settings_show_pictures_label">Always show images</string>
<string name="account_settings_show_pictures_never">No</string>

17
res/xml/account_settings_preferences.xml
View File

@ -70,14 +70,6 @@
android:entryValues="@array/account_settings_show_pictures_values"
android:dialogTitle="@string/account_settings_show_pictures_label" />
<ListPreference
android:persistent="false"
android:key="hide_buttons_enum"
android:title="@string/account_settings_hide_buttons_label"
android:entries="@array/account_settings_hide_buttons_entries"
android:entryValues="@array/account_settings_hide_buttons_values"
android:dialogTitle="@string/account_settings_hide_buttons_label" />
<CheckBoxPreference
android:persistent="false"
android:key="enable_move_buttons"
@ -85,15 +77,6 @@
android:defaultValue="true"
android:summary="@string/account_settings_enable_move_buttons_summary" />
<ListPreference
android:persistent="false"
android:key="hide_move_buttons_enum"
android:dependency="enable_move_buttons"
android:title="@string/account_settings_hide_move_buttons_label"
android:entries="@array/account_settings_hide_move_buttons_entries"
android:entryValues="@array/account_settings_hide_move_buttons_values"
android:dialogTitle="@string/account_settings_hide_move_buttons_label" />
</PreferenceCategory>
</PreferenceScreen>

40
src/com/fsck/k9/Account.java
View File

@ -121,8 +121,6 @@ public class Account implements BaseAccount {
private boolean mSaveAllHeaders;
private boolean mPushPollOnConnect;
private boolean mNotifySync;
private ScrollButtons mScrollMessageViewButtons;
private ScrollButtons mScrollMessageViewMoveButtons;
private ShowPictures mShowPictures;
private boolean mEnableMoveButtons;
private boolean mIsSignatureBeforeQuotedText;
@ -180,10 +178,6 @@ public class Account implements BaseAccount {
NONE, ALL, FIRST_CLASS, FIRST_AND_SECOND_CLASS, NOT_SECOND_CLASS
}
public enum ScrollButtons {
NEVER, ALWAYS, KEYBOARD_AVAILABLE
}
public enum ShowPictures {
NEVER, ALWAYS, ONLY_FROM_CONTACTS
}
@ -216,8 +210,6 @@ public class Account implements BaseAccount {
mFolderSyncMode = FolderMode.FIRST_CLASS;
mFolderPushMode = FolderMode.FIRST_CLASS;
mFolderTargetMode = FolderMode.NOT_SECOND_CLASS;
mScrollMessageViewButtons = ScrollButtons.NEVER;
mScrollMessageViewMoveButtons = ScrollButtons.NEVER;
mShowPictures = ShowPictures.NEVER;
mEnableMoveButtons = false;
mIsSignatureBeforeQuotedText = false;
@ -339,20 +331,6 @@ public class Account implements BaseAccount {
(random.nextInt(0x70) * 0xffff) +
0xff000000);
try {
mScrollMessageViewButtons = ScrollButtons.valueOf(prefs.getString(mUuid + ".hideButtonsEnum",
ScrollButtons.NEVER.name()));
} catch (Exception e) {
mScrollMessageViewButtons = ScrollButtons.NEVER;
}
try {
mScrollMessageViewMoveButtons = ScrollButtons.valueOf(prefs.getString(mUuid + ".hideMoveButtonsEnum",
ScrollButtons.NEVER.name()));
} catch (Exception e) {
mScrollMessageViewMoveButtons = ScrollButtons.NEVER;
}
try {
mShowPictures = ShowPictures.valueOf(prefs.getString(mUuid + ".showPicturesEnum",
ShowPictures.NEVER.name()));
@ -617,8 +595,6 @@ public class Account implements BaseAccount {
editor.putString(mUuid + ".spamFolderName", mSpamFolderName);
editor.putString(mUuid + ".autoExpandFolderName", mAutoExpandFolderName);
editor.putInt(mUuid + ".accountNumber", mAccountNumber);
editor.putString(mUuid + ".hideButtonsEnum", mScrollMessageViewButtons.name());
editor.putString(mUuid + ".hideMoveButtonsEnum", mScrollMessageViewMoveButtons.name());
editor.putString(mUuid + ".showPicturesEnum", mShowPictures.name());
editor.putBoolean(mUuid + ".enableMoveButtons", mEnableMoveButtons);
editor.putString(mUuid + ".folderDisplayMode", mFolderDisplayMode.name());
@ -1024,22 +1000,6 @@ public class Account implements BaseAccount {
this.mNotifySync = showOngoing;
}
public synchronized ScrollButtons getScrollMessageViewButtons() {
return mScrollMessageViewButtons;
}
public synchronized void setScrollMessageViewButtons(ScrollButtons scrollMessageViewButtons) {
mScrollMessageViewButtons = scrollMessageViewButtons;
}
public synchronized ScrollButtons getScrollMessageViewMoveButtons() {
return mScrollMessageViewMoveButtons;
}
public synchronized void setScrollMessageViewMoveButtons(ScrollButtons scrollMessageViewButtons) {
mScrollMessageViewMoveButtons = scrollMessageViewButtons;
}
public synchronized ShowPictures getShowPictures() {
return mShowPictures;
}

88
src/com/fsck/k9/activity/MessageView.java
View File

@ -4,7 +4,6 @@ import android.app.Dialog;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
@ -400,46 +399,22 @@ public class MessageView extends K9Activity implements OnClickListener {
setOnClickListener(R.id.spam);
// To show full header
setOnClickListener(R.id.header_container);
setOnClickListener(R.id.reply_scrolling);
// setOnClickListener(R.id.reply_all_scrolling);
setOnClickListener(R.id.delete_scrolling);
setOnClickListener(R.id.forward_scrolling);
setOnClickListener(R.id.next_scrolling);
setOnClickListener(R.id.previous_scrolling);
setOnClickListener(R.id.archive_scrolling);
setOnClickListener(R.id.move_scrolling);
setOnClickListener(R.id.spam_scrolling);
setOnClickListener(R.id.show_pictures);
setOnClickListener(R.id.download_remainder);
// Perhaps the ScrollButtons should be global, instead of account-specific
Account.ScrollButtons scrollButtons = mAccount.getScrollMessageViewButtons();
if ((Account.ScrollButtons.ALWAYS == scrollButtons)
|| (Account.ScrollButtons.KEYBOARD_AVAILABLE == scrollButtons &&
(this.getResources().getConfiguration().hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO))) {
scrollButtons();
} else { // never or the keyboard is open
staticButtons();
}
Account.ScrollButtons scrollMoveButtons = mAccount.getScrollMessageViewMoveButtons();
if ((Account.ScrollButtons.ALWAYS == scrollMoveButtons)
|| (Account.ScrollButtons.KEYBOARD_AVAILABLE == scrollMoveButtons &&
(this.getResources().getConfiguration().hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO))) {
scrollMoveButtons();
} else {
staticMoveButtons();
}
mNext = findViewById(R.id.next);
mPrevious = findViewById(R.id.previous);
mDelete = findViewById(R.id.delete);
mArchive = findViewById(R.id.archive);
mMove = findViewById(R.id.move);
mSpam = findViewById(R.id.spam);
if (!mAccount.getEnableMoveButtons()) {
View buttons = findViewById(R.id.move_buttons);
if (buttons != null) {
buttons.setVisibility(View.GONE);
}
buttons = findViewById(R.id.scrolling_move_buttons);
if (buttons != null) {
buttons.setVisibility(View.GONE);
}
}
}
@Override
@ -488,45 +463,6 @@ public class MessageView extends K9Activity implements OnClickListener {
disableMoveButtons();
}
}
private void staticButtons() {
View buttons = findViewById(R.id.scrolling_buttons);
if (buttons != null) {
buttons.setVisibility(View.GONE);
}
mNext = findViewById(R.id.next);
mPrevious = findViewById(R.id.previous);
mDelete = findViewById(R.id.delete);
}
private void scrollButtons() {
View buttons = findViewById(R.id.bottom_buttons);
if (buttons != null) {
buttons.setVisibility(View.GONE);
}
mNext = findViewById(R.id.next_scrolling);
mPrevious = findViewById(R.id.previous_scrolling);
mDelete = findViewById(R.id.delete_scrolling);
}
private void staticMoveButtons() {
View buttons = findViewById(R.id.scrolling_move_buttons);
if (buttons != null) {
buttons.setVisibility(View.GONE);
}
mArchive = findViewById(R.id.archive);
mMove = findViewById(R.id.move);
mSpam = findViewById(R.id.spam);
}
private void scrollMoveButtons() {
View buttons = findViewById(R.id.move_buttons);
if (buttons != null) {
buttons.setVisibility(View.GONE);
}
mArchive = findViewById(R.id.archive_scrolling);
mMove = findViewById(R.id.move_scrolling);
mSpam = findViewById(R.id.spam_scrolling);
}
private void disableButtons() {
mMessageView.setLoadPictures(false);
@ -850,38 +786,30 @@ public class MessageView extends K9Activity implements OnClickListener {
public void onClick(View view) {
switch (view.getId()) {
case R.id.reply:
case R.id.reply_scrolling:
onReply();
break;
case R.id.reply_all:
onReplyAll();
break;
case R.id.delete:
case R.id.delete_scrolling:
onDelete();
break;
case R.id.forward:
case R.id.forward_scrolling:
onForward();
break;
case R.id.archive:
case R.id.archive_scrolling:
onRefile(mAccount.getArchiveFolderName());
break;
case R.id.spam:
case R.id.spam_scrolling:
onRefile(mAccount.getSpamFolderName());
break;
case R.id.move:
case R.id.move_scrolling:
onMove();
break;
case R.id.next:
case R.id.next_scrolling:
onNext();
break;
case R.id.previous:
case R.id.previous_scrolling:
onPrevious();
break;
case R.id.download:

35
src/com/fsck/k9/activity/setup/AccountSettings.java
View File

@ -18,7 +18,6 @@ import java.util.List;
import com.fsck.k9.Account;
import com.fsck.k9.Account.FolderMode;
import com.fsck.k9.Account.QuoteStyle;
import com.fsck.k9.Account.ScrollButtons;
import com.fsck.k9.K9;
import com.fsck.k9.NotificationSetting;
import com.fsck.k9.Preferences;
@ -54,8 +53,6 @@ public class AccountSettings extends K9PreferenceActivity {
private static final String PREFERENCE_FREQUENCY = "account_check_frequency";
private static final String PREFERENCE_DISPLAY_COUNT = "account_display_count";
private static final String PREFERENCE_DEFAULT = "account_default";
private static final String PREFERENCE_HIDE_BUTTONS = "hide_buttons_enum";
private static final String PREFERENCE_HIDE_MOVE_BUTTONS = "hide_move_buttons_enum";
private static final String PREFERENCE_SHOW_PICTURES = "show_pictures_enum";
private static final String PREFERENCE_ENABLE_MOVE_BUTTONS = "enable_move_buttons";
private static final String PREFERENCE_NOTIFY = "account_notify";
@ -124,8 +121,6 @@ public class AccountSettings extends K9PreferenceActivity {
private CheckBoxPreference mAccountDefault;
private CheckBoxPreference mAccountNotify;
private CheckBoxPreference mAccountNotifySelf;
private ListPreference mAccountScrollButtons;
private ListPreference mAccountScrollMoveButtons;
private ListPreference mAccountShowPictures;
private CheckBoxPreference mAccountEnableMoveButtons;
private CheckBoxPreference mAccountNotifySync;
@ -428,37 +423,10 @@ public class AccountSettings extends K9PreferenceActivity {
mAccountDefault.setChecked(
mAccount.equals(Preferences.getPreferences(this).getDefaultAccount()));
mAccountScrollButtons = (ListPreference) findPreference(PREFERENCE_HIDE_BUTTONS);
mAccountScrollButtons.setValue("" + mAccount.getScrollMessageViewButtons());
mAccountScrollButtons.setSummary(mAccountScrollButtons.getEntry());
mAccountScrollButtons.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
public boolean onPreferenceChange(Preference preference, Object newValue) {
final String summary = newValue.toString();
int index = mAccountScrollButtons.findIndexOfValue(summary);
mAccountScrollButtons.setSummary(mAccountScrollButtons.getEntries()[index]);
mAccountScrollButtons.setValue(summary);
return false;
}
});
mAccountEnableMoveButtons = (CheckBoxPreference) findPreference(PREFERENCE_ENABLE_MOVE_BUTTONS);
mAccountEnableMoveButtons.setEnabled(mIsMoveCapable);
mAccountEnableMoveButtons.setChecked(mAccount.getEnableMoveButtons());
mAccountScrollMoveButtons = (ListPreference) findPreference(PREFERENCE_HIDE_MOVE_BUTTONS);
mAccountScrollMoveButtons.setEnabled(mIsMoveCapable);
mAccountScrollMoveButtons.setValue("" + mAccount.getScrollMessageViewMoveButtons());
mAccountScrollMoveButtons.setSummary(mAccountScrollMoveButtons.getEntry());
mAccountScrollMoveButtons.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
public boolean onPreferenceChange(Preference preference, Object newValue) {
final String summary = newValue.toString();
int index = mAccountScrollMoveButtons.findIndexOfValue(summary);
mAccountScrollMoveButtons.setSummary(mAccountScrollMoveButtons.getEntries()[index]);
mAccountScrollMoveButtons.setValue(summary);
return false;
}
});
mAccountShowPictures = (ListPreference) findPreference(PREFERENCE_SHOW_PICTURES);
mAccountShowPictures.setValue("" + mAccount.getShowPictures());
mAccountShowPictures.setSummary(mAccountShowPictures.getEntry());
@ -760,10 +728,8 @@ public class AccountSettings extends K9PreferenceActivity {
if (!mIsMoveCapable) {
mAccount.setEnableMoveButtons(false);
mAccount.setScrollMessageViewMoveButtons(ScrollButtons.NEVER);
} else {
mAccount.setEnableMoveButtons(mAccountEnableMoveButtons.isChecked());
mAccount.setScrollMessageViewMoveButtons(Account.ScrollButtons.valueOf(mAccountScrollMoveButtons.getValue()));
}
boolean needsRefresh = mAccount.setAutomaticCheckIntervalMinutes(Integer.parseInt(mCheckFrequency.getValue()));
@ -782,7 +748,6 @@ public class AccountSettings extends K9PreferenceActivity {
}
}
mAccount.setScrollMessageViewButtons(Account.ScrollButtons.valueOf(mAccountScrollButtons.getValue()));
mAccount.setShowPictures(Account.ShowPictures.valueOf(mAccountShowPictures.getValue()));
if (mIsPushCapable) {

7
src/com/fsck/k9/preferences/AccountSettings.java
View File

@ -12,7 +12,6 @@ import com.fsck.k9.Account;
import com.fsck.k9.K9;
import com.fsck.k9.R;
import com.fsck.k9.Account.FolderMode;
import com.fsck.k9.Account.ScrollButtons;
import com.fsck.k9.crypto.Apg;
import com.fsck.k9.mail.store.StorageManager;
import com.fsck.k9.preferences.Settings.*;
@ -82,12 +81,6 @@ public class AccountSettings {
s.put("goToUnreadMessageSearch", Settings.versions(
new V(1, new BooleanSetting(false))
));
s.put("hideButtonsEnum", Settings.versions(
new V(1, new EnumSetting(ScrollButtons.class, ScrollButtons.NEVER))
));
s.put("hideMoveButtonsEnum", Settings.versions(
new V(1, new EnumSetting(ScrollButtons.class, ScrollButtons.NEVER))
));
s.put("idleRefreshMinutes", Settings.versions(
new V(1, new IntegerResourceSetting(24, R.array.idle_refresh_period_values))
));

2
src/com/fsck/k9/preferences/Settings.java
View File

@ -35,7 +35,7 @@ public class Settings {
*
* @see SettingsExporter
*/
public static final int VERSION = 5;
public static final int VERSION = 6;
public static Map<String, Object> validate(int version, Map<String,
TreeMap<Integer, SettingsDescription>> settings,