Mercurial > 510Connectbot
changeset 238:bd803721f94a
remove unused update preference; add host preference for fixed screen size
line wrap: on
line diff
--- a/res/values-bg/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-bg/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -47,9 +47,6 @@ <string name="button_resize">Промяна на размера на екрана</string> <string name="alert_disconnect_msg">Връзката изгубена</string> <string name="list_keymode_none">Забраняване</string> - <string name="list_update_daily">Ежедневно</string> - <string name="list_update_weekly">Ежеседмично</string> - <string name="list_update_never">Никога</string> <string name="console_copy_done">Копирани %1$d байта в клипборда</string> <string name="console_menu_close">Затваряне</string> <string name="console_menu_copy">Копиране</string>
--- a/res/values-ca/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-ca/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -103,9 +103,6 @@ <string name="list_keymode_none">Deshabilita</string> <string name="list_pubkeyids_none">No usis claus</string> <string name="list_pubkeyids_any">Fes servir qualsevol clau desbloquejada</string> - <string name="list_update_daily">Diàriament</string> - <string name="list_update_weekly">Setmanalment</string> - <string name="list_update_never">Mai</string> <string name="hostpref_nickname_title">Sobrenom</string> <string name="hostpref_color_title">Color de la categoria</string> <string name="hostpref_fontsize_title">Mida de la lletra (pt)</string>
--- a/res/values-cs/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-cs/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -103,9 +103,6 @@ <string name="list_keymode_none">Vypnout</string> <string name="list_pubkeyids_none">Nepoužívat klíče</string> <string name="list_pubkeyids_any">Použít jakýkoliv odemčený klíč</string> - <string name="list_update_daily">Denně</string> - <string name="list_update_weekly">Týdně</string> - <string name="list_update_never">Nikdy</string> <string name="hostpref_nickname_title">Přezdívka</string> <string name="hostpref_color_title">Barevná kategorie</string> <string name="hostpref_fontsize_title">Velikost fontu (pt)</string>
--- a/res/values-da/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-da/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -103,9 +103,6 @@ <string name="list_keymode_none">Slå fra</string> <string name="list_pubkeyids_none">Brug ikke tasterne</string> <string name="list_pubkeyids_any">Anvend enhver ulåst nøgle</string> - <string name="list_update_daily">Dagligt</string> - <string name="list_update_weekly">Ugenligt</string> - <string name="list_update_never">Aldrig</string> <string name="hostpref_nickname_title">Kaldenavn</string> <string name="hostpref_color_title">Farvekategori</string> <string name="hostpref_fontsize_title">Skriftstørrelse (pt)</string>
--- a/res/values-de/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-de/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -112,9 +112,6 @@ <string name="list_keymode_none">Ausschalten</string> <string name="list_pubkeyids_none">Keine Schlüssel verwenden</string> <string name="list_pubkeyids_any">Beliebigen entsperrten Schlüssel verwenden</string> - <string name="list_update_daily">Täglich</string> - <string name="list_update_weekly">Wöchentlich</string> - <string name="list_update_never">Niemals</string> <string name="hostpref_nickname_title">Nutzername</string> <string name="hostpref_color_title">Farbkategorie</string> <string name="hostpref_fontsize_title">Fontgröße (pt)</string>
--- a/res/values-es/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-es/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -103,9 +103,6 @@ <string name="list_keymode_none">Desactivar</string> <string name="list_pubkeyids_none">No usar teclas</string> <string name="list_pubkeyids_any">Utilizar cualquier clave desbloqueada</string> - <string name="list_update_daily">Diariamente</string> - <string name="list_update_weekly">Semanalmente</string> - <string name="list_update_never">Nunca</string> <string name="hostpref_nickname_title">Apodo</string> <string name="hostpref_color_title">Categoria de colores</string> <string name="hostpref_fontsize_title">Tamaño de la fuente (pt)</string>
--- a/res/values-eu/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-eu/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -103,9 +103,6 @@ <string name="list_keymode_none">Desgaitu</string> <string name="list_pubkeyids_none">Ez erabili gakorik</string> <string name="list_pubkeyids_any">Erabili desblokeatutako edozein gako</string> - <string name="list_update_daily">Egunero</string> - <string name="list_update_weekly">Astero</string> - <string name="list_update_never">Inoiz ez</string> <string name="hostpref_nickname_title">Goitizena</string> <string name="hostpref_color_title">Kolore kategoria</string> <string name="hostpref_fontsize_title">Letra-tamaina (pt)</string>
--- a/res/values-fi/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-fi/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -102,9 +102,6 @@ <string name="list_keymode_none">Pois käytöstä</string> <string name="list_pubkeyids_none">Älä käytä avaimia</string> <string name="list_pubkeyids_any">Käytä mitä tahansa avattua avainta</string> - <string name="list_update_daily">Päivittäin</string> - <string name="list_update_weekly">Viikoittain</string> - <string name="list_update_never">Ei koskaan</string> <string name="hostpref_nickname_title">Lempinimi</string> <string name="hostpref_color_title">Väri</string> <string name="hostpref_fontsize_title">Kirjasimen koko (pistettä)</string>
--- a/res/values-fr/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-fr/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -103,9 +103,6 @@ <string name="list_keymode_none">Désactivé</string> <string name="list_pubkeyids_none">Ne pas utiliser les clés publiques</string> <string name="list_pubkeyids_any">Utiliser une clé pour l\'authentification</string> - <string name="list_update_daily">Journalière</string> - <string name="list_update_weekly">Hebdomadaire</string> - <string name="list_update_never">Jamais</string> <string name="hostpref_nickname_title">Surnom</string> <string name="hostpref_color_title">Catégorie de couleur</string> <string name="hostpref_fontsize_title">Taille de police (pt)</string>
--- a/res/values-gl/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-gl/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -90,9 +90,6 @@ <string name="list_keymode_none">Deshabilitar</string> <string name="list_pubkeyids_none">Non usar chaves</string> <string name="list_pubkeyids_any">Usar calquera chave desbloqueada</string> - <string name="list_update_daily">Diariamente</string> - <string name="list_update_weekly">Semanalmente</string> - <string name="list_update_never">Nunca</string> <string name="hostpref_fontsize_title">Tamaño da fonte (pt)</string> <string name="hostpref_postlogin_summary">Comandos a executar no servidor remoto unha vez autenticado</string> <string name="hostpref_compression_title">Compresión</string>
--- a/res/values-he/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-he/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -103,9 +103,6 @@ <string name="list_keymode_none">נטרול</string> <string name="list_pubkeyids_none">לא להשתמש במפתחות</string> <string name="list_pubkeyids_any">שימוש במפתח כלשהו שאינו נעול</string> - <string name="list_update_daily">יומי</string> - <string name="list_update_weekly">שבועי</string> - <string name="list_update_never">לעולם לא</string> <string name="hostpref_nickname_title">כינוי</string> <string name="hostpref_color_title">קטגוריית הצבע</string> <string name="hostpref_fontsize_title">גודל הגופן (נק׳)</string>
--- a/res/values-hu/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-hu/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -105,9 +105,6 @@ <string name="list_keymode_none">Tiltás</string> <string name="list_pubkeyids_none">Kulcsok használatának tiltása</string> <string name="list_pubkeyids_any">Bármely kinyitott privátkulcs használata</string> - <string name="list_update_daily">Naponta</string> - <string name="list_update_weekly">Hetente</string> - <string name="list_update_never">Soha</string> <string name="hostpref_nickname_title">Becenév</string> <string name="hostpref_color_title">Szín-kategória</string> <string name="hostpref_fontsize_title">Betűtipus mérete (pt)</string>
--- a/res/values-id/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-id/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -101,9 +101,6 @@ <string name="list_keymode_none">Tidak aktif</string> <string name="list_pubkeyids_none">Jangan gunakan kunci</string> <string name="list_pubkeyids_any">Gunakan kunci apapun yang tidak terkunci</string> - <string name="list_update_daily">Harian</string> - <string name="list_update_weekly">Mingguan</string> - <string name="list_update_never">Tidak pernah</string> <string name="hostpref_nickname_title">Nama panggilan</string> <string name="hostpref_color_title">Kategori warna</string> <string name="hostpref_fontsize_title">Ukuran huruf (pt)</string>
--- a/res/values-is/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-is/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -96,9 +96,6 @@ <string name="list_keymode_none">Afvirkja</string> <string name="list_pubkeyids_none">Ekki nota lykla</string> <string name="list_pubkeyids_any">Nota hvaða ólæsta lykil sem er</string> - <string name="list_update_daily">Daglega</string> - <string name="list_update_weekly">Vikulega</string> - <string name="list_update_never">Aldrei</string> <string name="hostpref_nickname_title">Gælunafn</string> <string name="hostpref_color_title">Lita flokk</string> <string name="hostpref_fontsize_title">Leturstærð (pt)</string>
--- a/res/values-it/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-it/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -103,9 +103,6 @@ <string name="list_keymode_none">Disabilita</string> <string name="list_pubkeyids_none">Non usare chiavi</string> <string name="list_pubkeyids_any">Usa qualsiasi chiave sbloccata</string> - <string name="list_update_daily">Ogni giorno</string> - <string name="list_update_weekly">Ogni settimana</string> - <string name="list_update_never">Mai</string> <string name="hostpref_nickname_title">Soprannome</string> <string name="hostpref_color_title">Categoria colore</string> <string name="hostpref_fontsize_title">Dimensione caratteri (pt)</string>
--- a/res/values-ja/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-ja/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -101,9 +101,6 @@ <string name="list_keymode_none">無効</string> <string name="list_pubkeyids_none">公開鍵を使わない</string> <string name="list_pubkeyids_any">アンロックされた鍵のいずれかを使う</string> - <string name="list_update_daily">毎日</string> - <string name="list_update_weekly">毎週</string> - <string name="list_update_never">しない</string> <string name="hostpref_nickname_title">ニックネーム</string> <string name="hostpref_color_title">色の系統</string> <string name="hostpref_fontsize_title">フォントのサイズ (pt)</string>
--- a/res/values-ko/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-ko/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -97,9 +97,6 @@ <string name="list_keymode_none">사용 안 함</string> <string name="list_pubkeyids_none">키 사용 안함</string> <string name="list_pubkeyids_any">잠금키 사용</string> - <string name="list_update_daily">매일</string> - <string name="list_update_weekly">매주</string> - <string name="list_update_never">하지 않음</string> <string name="hostpref_nickname_title">닉네임</string> <string name="hostpref_color_title">색상 카테고리</string> <string name="hostpref_fontsize_title">글꼴 크기 (pt)</string>
--- a/res/values-nb/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-nb/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -103,9 +103,6 @@ <string name="list_keymode_none">Deaktiver</string> <string name="list_pubkeyids_none">Ikke bruk nøkler</string> <string name="list_pubkeyids_any">Bruk en vilkårlig ulåst tast</string> - <string name="list_update_daily">Daglig</string> - <string name="list_update_weekly">Ukentlig</string> - <string name="list_update_never">Aldri</string> <string name="hostpref_nickname_title">Kallenavn</string> <string name="hostpref_color_title">Fargeinndeling</string> <string name="hostpref_fontsize_title">Skriftstørrelse (pt)</string>
--- a/res/values-nl/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-nl/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -103,9 +103,6 @@ <string name="list_keymode_none">Schakel uit</string> <string name="list_pubkeyids_none">Gebruik sleutels niet</string> <string name="list_pubkeyids_any">Gebruik een willekeurige ontgrendelde sleutel</string> - <string name="list_update_daily">Dagelijks</string> - <string name="list_update_weekly">Wekelijks</string> - <string name="list_update_never">Nooit</string> <string name="hostpref_nickname_title">Bijnaam</string> <string name="hostpref_color_title">Kleur catogorie</string> <string name="hostpref_fontsize_title">Lettergrootte</string>
--- a/res/values-oc/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-oc/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -47,9 +47,6 @@ <string name="pref_conn_persist_title">Connexions persistentas</string> <string name="pref_keymode_title">Acorchis de navigacion</string> <string name="list_keymode_none">Desactivar</string> - <string name="list_update_daily">Cada jorn</string> - <string name="list_update_weekly">Cada setmana</string> - <string name="list_update_never">Pas jamai</string> <string name="hostpref_nickname_title">Escais</string> <string name="hostpref_encoding_title">Encodatge</string> <string name="hostpref_connection_category">Paramètre de connexion</string>
--- a/res/values-pl/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-pl/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -103,9 +103,6 @@ <string name="list_keymode_none">Wyłącz</string> <string name="list_pubkeyids_none">Nie używaj kluczy</string> <string name="list_pubkeyids_any">Użyj dowolnego odblokowanego klucza</string> - <string name="list_update_daily">Dziennie</string> - <string name="list_update_weekly">Tygodniowo</string> - <string name="list_update_never">Nigdy</string> <string name="hostpref_nickname_title">Nazwa skrócona</string> <string name="hostpref_color_title">Kolor kategorii</string> <string name="hostpref_fontsize_title">Rozmiar czcionki</string>
--- a/res/values-pt-rBR/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-pt-rBR/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -103,9 +103,6 @@ <string name="list_keymode_none">Desabilitar</string> <string name="list_pubkeyids_none">Não usar chaves</string> <string name="list_pubkeyids_any">Usar qualquer chave pública</string> - <string name="list_update_daily">Diariamente</string> - <string name="list_update_weekly">Semanalmente</string> - <string name="list_update_never">Nunca</string> <string name="hostpref_nickname_title">Apelido</string> <string name="hostpref_color_title">Categoria de cor</string> <string name="hostpref_fontsize_title">Tamanho da fonte (pontos)</string>
--- a/res/values-pt/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-pt/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -103,9 +103,6 @@ <string name="list_keymode_none">Desactivar</string> <string name="list_pubkeyids_none">Não usar teclas</string> <string name="list_pubkeyids_any">Usar qualquer tecla não bloqueada</string> - <string name="list_update_daily">Diariamente</string> - <string name="list_update_weekly">Semanalmente</string> - <string name="list_update_never">Nunca</string> <string name="hostpref_nickname_title">Alcunha</string> <string name="hostpref_color_title">Categoria de cor</string> <string name="hostpref_fontsize_title">Tamanho da fonte (pt)</string>
--- a/res/values-ru/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-ru/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -103,9 +103,6 @@ <string name="list_keymode_none">Отключить</string> <string name="list_pubkeyids_none">Не использовать ключи</string> <string name="list_pubkeyids_any">Использовать любую свободную клавишу</string> - <string name="list_update_daily">Ежедневно</string> - <string name="list_update_weekly">Еженедельно</string> - <string name="list_update_never">Никогда</string> <string name="hostpref_nickname_title">Псевдоним</string> <string name="hostpref_color_title">Цвет для категории</string> <string name="hostpref_fontsize_title">Размер шрифта</string>
--- a/res/values-sk/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-sk/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -112,9 +112,6 @@ <string name="list_keymode_none">Vypnúť</string> <string name="list_pubkeyids_none">Nepoužívať kľúče</string> <string name="list_pubkeyids_any">Použiť ktorýkoľvek odomknutý kľúč</string> - <string name="list_update_daily">Denne</string> - <string name="list_update_weekly">Týždenne</string> - <string name="list_update_never">Nikdy</string> <string name="hostpref_nickname_title">Prezývka</string> <string name="hostpref_color_title">Farebná kategória</string> <string name="hostpref_fontsize_title">Veľkosť písma (bodov)</string>
--- a/res/values-sl/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-sl/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -100,9 +100,6 @@ <string name="list_keymode_none">Onemogoči</string> <string name="list_pubkeyids_none">Ne uporabljaj ključev</string> <string name="list_pubkeyids_any">Uporabi kateregakoli odklenjenega ključa</string> - <string name="list_update_daily">Dnevno</string> - <string name="list_update_weekly">Tedensko</string> - <string name="list_update_never">Nikoli</string> <string name="hostpref_nickname_title">Vzdevek</string> <string name="hostpref_color_title">Barvna kategorija</string> <string name="hostpref_fontsize_title">Velikost pisave (pt)</string>
--- a/res/values-sv/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-sv/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -103,9 +103,6 @@ <string name="list_keymode_none">Avaktivera</string> <string name="list_pubkeyids_none">Använd inte knapparna</string> <string name="list_pubkeyids_any">Använd valfri olåst nyckel</string> - <string name="list_update_daily">Varje dag</string> - <string name="list_update_weekly">Varje vecka</string> - <string name="list_update_never">Aldrig</string> <string name="hostpref_nickname_title">Smeknamn</string> <string name="hostpref_color_title">Färgkategori</string> <string name="hostpref_fontsize_title">Teckenstorlek</string>
--- a/res/values-tr/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-tr/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -103,9 +103,6 @@ <string name="list_keymode_none">Devre Dışı Bırak</string> <string name="list_pubkeyids_none">Tuşları kullanma</string> <string name="list_pubkeyids_any">Herhangi bir tuşu kullan</string> - <string name="list_update_daily">Günlük</string> - <string name="list_update_weekly">Haftalık</string> - <string name="list_update_never">Asla</string> <string name="hostpref_nickname_title">Rumuz</string> <string name="hostpref_color_title">Renk kategorisi</string> <string name="hostpref_fontsize_title">Yazıtipi boyutu (pt)</string>
--- a/res/values-zh-rCN/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-zh-rCN/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -103,9 +103,6 @@ <string name="list_keymode_none">禁用</string> <string name="list_pubkeyids_none">不使用密匙</string> <string name="list_pubkeyids_any">使用解锁密匙</string> - <string name="list_update_daily">每天</string> - <string name="list_update_weekly">每周</string> - <string name="list_update_never">永不</string> <string name="hostpref_nickname_title">昵称</string> <string name="hostpref_color_title">颜色类型</string> <string name="hostpref_fontsize_title">字型大小 (pt)</string>
--- a/res/values-zh-rTW/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values-zh-rTW/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -103,9 +103,6 @@ <string name="list_keymode_none">停用</string> <string name="list_pubkeyids_none">不使用公鑰</string> <string name="list_pubkeyids_any">使用解鎖金鑰</string> - <string name="list_update_daily">每天</string> - <string name="list_update_weekly">每週</string> - <string name="list_update_never">永不</string> <string name="hostpref_nickname_title">暱稱</string> <string name="hostpref_color_title">顏色類型</string> <string name="hostpref_fontsize_title">字型大小 (pt)</string>
--- a/res/values/arrays.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values/arrays.xml Mon Jul 14 09:42:20 2014 -0700 @@ -94,12 +94,8 @@ </string-array> <string-array name="list_update" translatable="false"> - <item>@string/list_update_daily</item> - <item>@string/list_update_weekly</item> - <item>@string/list_update_never</item> </string-array> - <string-array name="list_update_values" translatable="false"> <item>Daily</item> <item>Weekly</item> <item>Never</item>
--- a/res/values/strings.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/values/strings.xml Mon Jul 14 09:42:20 2014 -0700 @@ -272,13 +272,6 @@ <!-- Preference to use any pubkey to authenticate to this host. --> <string name="list_pubkeyids_any">"Use any unlocked key"</string> - <!-- Frequency for which to check for program updates. --> - <string name="list_update_daily">"Daily"</string> - <!-- Frequency for which to check for program updates. --> - <string name="list_update_weekly">"Weekly"</string> - <!-- Frequency for which to check for program updates. --> - <string name="list_update_never">"Never"</string> - <!-- Host nickname field preference title --> <string name="hostpref_nickname_title">"Nickname"</string> @@ -288,6 +281,12 @@ <!-- Host's default font size when opening the terminal in points (pt) --> <string name="hostpref_fontsize_title">"Font size (pt)"</string> + <!-- Host's use fixed size --> + <string name="hostpref_fixed_size_title">"Fixed screen size"</string> + <string name="hostpref_fixed_size_summary">"Compute font size from screen size"</string> + <string name="hostpref_fixed_width_title">"Screen width (columns)"</string> + <string name="hostpref_fixed_height_title">"Screen height (rows)"</string> + <!-- Host pubkey usage preference title --> <string name="hostpref_pubkeyid_title">"Use pubkey authentication"</string> @@ -601,12 +600,14 @@ <!-- Force screen size --> <string name="pref_default_size_category">Default sizing values</string> + <!-- <string name="pref_default_font_size">Default font size</string> <string name="pref_default_font_size_summary">Default start font size (0 = Auto)</string> <string name="pref_default_fsize_width">Default width (force size)</string> <string name="pref_default_fsize_width_summary">Default screen width in columns for force resize</string> <string name="pref_default_fsize_height">Default height (force size)</string> <string name="pref_default_fsize_height_summary">Default screen height in rows for force resize</string> + --> <string name="resize_error_title">Error resizing screen</string> <string name="resize_error_width_height">Width and height must be higher than 0</string> <string name="dia_resize_x">x</string>
--- a/res/xml/preferences.xml Mon Jul 14 08:46:06 2014 -0700 +++ b/res/xml/preferences.xml Mon Jul 14 09:42:20 2014 -0700 @@ -237,21 +237,6 @@ android:numeric="decimal" /> - <EditTextPreference - android:key="default_fsize_width" - android:title="@string/pref_default_fsize_width" - android:summary="@string/pref_default_fsize_width_summary" - android:defaultValue="80" - android:numeric="integer" - /> - - <EditTextPreference - android:key="default_fsize_height" - android:title="@string/pref_default_fsize_height" - android:summary="@string/pref_default_fsize_height_summary" - android:defaultValue="25" - android:numeric="integer" - /> </PreferenceCategory> <PreferenceCategory
--- a/src/com/five_ten_sg/connectbot/bean/HostBean.java Mon Jul 14 08:46:06 2014 -0700 +++ b/src/com/five_ten_sg/connectbot/bean/HostBean.java Mon Jul 14 09:42:20 2014 -0700 @@ -43,9 +43,12 @@ private String useAuthAgent = HostDatabase.AUTHAGENT_NO; private String postLogin = null; private long pubkeyId = -1; - private boolean wantSession = true; private String delKey = HostDatabase.DELKEY_DEL; private float fontSize = -1; + private boolean fizedSize = false; + private integer fixedWidth = 80; + private integer fixedHeight = 25; + private boolean wantSession = true; private boolean compression = false; private String httpproxy = null; private String encoding = HostDatabase.ENCODING_DEFAULT; @@ -203,6 +206,24 @@ public float getFontSize() { return fontSize; } + public void setFixedSize(boolean fixedSize) { + this.fixedSize = fixedSize; + } + public boolean getFixedSize() { + return fixedSize; + } + public void setFixedWidth(float fixedWidth) { + this.fixedWidth = fixedWidth; + } + public float getFixedWidth() { + return fixedWidth; + } + public void setFixedHeight(float fixedHeight) { + this.fixedHeight = fixedHeight; + } + public float getFixedHeight() { + return fixedHeight; + } public void setCompression(boolean compression) { this.compression = compression; } @@ -332,6 +353,9 @@ values.put(HostDatabase.FIELD_HOST_WANTSESSION, Boolean.toString(wantSession)); values.put(HostDatabase.FIELD_HOST_DELKEY, delKey); values.put(HostDatabase.FIELD_HOST_FONTSIZE, fontSize); + values.put(HostDatabase.FIELD_HOST_FIXEDSIZE, Boolean.toString(fixedSize)); + values.put(HostDatabase.FIELD_HOST_FIXEDWIDTH, fixedWidth); + values.put(HostDatabase.FIELD_HOST_FIXEDHEIGHT, fixedHeight); values.put(HostDatabase.FIELD_HOST_COMPRESSION, Boolean.toString(compression)); values.put(HostDatabase.FIELD_HOST_HTTPPROXY, httpproxy); values.put(HostDatabase.FIELD_HOST_ENCODING, encoding);
--- a/src/com/five_ten_sg/connectbot/util/HostDatabase.java Mon Jul 14 08:46:06 2014 -0700 +++ b/src/com/five_ten_sg/connectbot/util/HostDatabase.java Mon Jul 14 09:42:20 2014 -0700 @@ -46,7 +46,7 @@ public final static String TAG = "ConnectBot.HostDatabase"; public final static String DB_NAME = "hosts"; - public final static int DB_VERSION = 27; + public final static int DB_VERSION = 28; public final static String TABLE_HOSTS = "hosts"; public final static String FIELD_HOST_NICKNAME = "nickname"; @@ -65,6 +65,9 @@ public final static String FIELD_HOST_WANTSESSION = "wantsession"; public final static String FIELD_HOST_DELKEY = "delkey"; public final static String FIELD_HOST_FONTSIZE = "fontsize"; + public final static String FIELD_HOST_FIXEDSIZE = "fixed_size"; + public final static String FIELD_HOST_FIXEDWIDTH = "fixed_width"; + public final static String FIELD_HOST_FIXEDHEIGHT = "fixed_height"; public final static String FIELD_HOST_COMPRESSION = "compression"; public final static String FIELD_HOST_HTTPPROXY = "httpproxy"; public final static String FIELD_HOST_ENCODING = "encoding"; @@ -178,6 +181,9 @@ + FIELD_HOST_PUBKEYID + " INTEGER DEFAULT " + PUBKEYID_ANY + ", " + FIELD_HOST_DELKEY + " TEXT DEFAULT '" + DELKEY_DEL + "', " + FIELD_HOST_FONTSIZE + " REAL, " + + FIELD_HOST_FIXEDSIZE + " TEXT DEFAULT '" + Boolean.toString(false) + "', " + + FIELD_HOST_FIXEDWIDTH + " INTEGER, " + + FIELD_HOST_FIXEDHEIGHT + " INTEGER, " + FIELD_HOST_WANTSESSION + " TEXT DEFAULT '" + Boolean.toString(true) + "', " + FIELD_HOST_COMPRESSION + " TEXT DEFAULT '" + Boolean.toString(false) + "', " + FIELD_HOST_HTTPPROXY + " TEXT, " @@ -215,90 +221,14 @@ @Override public void onRobustUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) throws SQLiteException { - // Versions of the database before the Android Market release will be - // shot without warning. - if (oldVersion <= 9) { + // Versions of the database before 510ConnectBot will be shot without warning. + if (oldVersion < 24) { db.execSQL("DROP TABLE IF EXISTS " + TABLE_HOSTS); onCreate(db); return; } switch (oldVersion) { - case 10: - db.execSQL("ALTER TABLE " + TABLE_HOSTS - + " ADD COLUMN " + FIELD_HOST_PUBKEYID + " INTEGER DEFAULT " + PUBKEYID_ANY); - - case 11: - db.execSQL("CREATE TABLE " + TABLE_PORTFORWARDS - + " (_id INTEGER PRIMARY KEY, " - + FIELD_PORTFORWARD_HOSTID + " INTEGER, " - + FIELD_PORTFORWARD_NICKNAME + " TEXT, " - + FIELD_PORTFORWARD_TYPE + " TEXT NOT NULL DEFAULT " + PORTFORWARD_LOCAL + ", " - + FIELD_PORTFORWARD_SOURCEPORT + " INTEGER NOT NULL DEFAULT 8080, " - + FIELD_PORTFORWARD_DESTADDR + " TEXT, " - + FIELD_PORTFORWARD_DESTPORT + " INTEGER)"); - - case 12: - db.execSQL("ALTER TABLE " + TABLE_HOSTS - + " ADD COLUMN " + FIELD_HOST_WANTSESSION + " TEXT DEFAULT '" + Boolean.toString(true) + "'"); - - case 13: - db.execSQL("ALTER TABLE " + TABLE_HOSTS - + " ADD COLUMN " + FIELD_HOST_COMPRESSION + " TEXT DEFAULT '" + Boolean.toString(false) + "'"); - - case 14: - db.execSQL("ALTER TABLE " + TABLE_HOSTS - + " ADD COLUMN " + FIELD_HOST_ENCODING + " TEXT DEFAULT '" + ENCODING_DEFAULT + "'"); - - case 15: - db.execSQL("ALTER TABLE " + TABLE_HOSTS - + " ADD COLUMN " + FIELD_HOST_PROTOCOL + " TEXT DEFAULT 'ssh'"); - - case 16: - db.execSQL("ALTER TABLE " + TABLE_HOSTS - + " ADD COLUMN " + FIELD_HOST_DELKEY + " TEXT DEFAULT '" + DELKEY_DEL + "'"); - - case 17: - db.execSQL("CREATE INDEX " + TABLE_PORTFORWARDS + FIELD_PORTFORWARD_HOSTID + "index ON " - + TABLE_PORTFORWARDS + " (" + FIELD_PORTFORWARD_HOSTID + ");"); - // Add colors - db.execSQL("CREATE TABLE " + TABLE_COLORS - + " (_id INTEGER PRIMARY KEY, " - + FIELD_COLOR_NUMBER + " INTEGER, " - + FIELD_COLOR_VALUE + " INTEGER, " - + FIELD_COLOR_SCHEME + " INTEGER)"); - db.execSQL("CREATE INDEX " + TABLE_COLORS + FIELD_COLOR_SCHEME + "index ON " - + TABLE_COLORS + " (" + FIELD_COLOR_SCHEME + ");"); - - case 18: - db.execSQL("ALTER TABLE " + TABLE_HOSTS - + " ADD COLUMN " + FIELD_HOST_USEAUTHAGENT + " TEXT DEFAULT '" + AUTHAGENT_NO + "'"); - - case 19: - db.execSQL("ALTER TABLE " + TABLE_HOSTS - + " ADD COLUMN " + FIELD_HOST_STAYCONNECTED + " TEXT"); - - case 20: - db.execSQL("ALTER TABLE " + TABLE_HOSTS - + " ADD COLUMN " + FIELD_HOST_FONTSIZE + " REAL"); - - case 21: - db.execSQL("DROP TABLE " + TABLE_COLOR_DEFAULTS); - db.execSQL(CREATE_TABLE_COLOR_DEFAULTS); - db.execSQL(CREATE_TABLE_COLOR_DEFAULTS_INDEX); - - case 22: - db.execSQL("ALTER TABLE " + TABLE_HOSTS - + " ADD COLUMN " + FIELD_HOST_WANTX11FORWARD + " TEXT DEFAULT '" + Boolean.toString(false) + "'"); - db.execSQL("ALTER TABLE " + TABLE_HOSTS - + " ADD COLUMN " + FIELD_HOST_X11HOST + " TEXT DEFAULT '" + X11HOST_DEFAULT + "'"); - db.execSQL("ALTER TABLE " + TABLE_HOSTS - + " ADD COLUMN " + FIELD_HOST_X11PORT + " INTEGER DEFAULT " + X11PORT_DEFAULT); - - case 23: - db.execSQL("ALTER TABLE " + TABLE_HOSTS - + " ADD COLUMN " + FIELD_HOST_HTTPPROXY + " TEXT"); - case 24: db.execSQL("ALTER TABLE " + TABLE_HOSTS + " ADD COLUMN " + FIELD_HOST_MONITOR + " TEXT"); @@ -316,6 +246,14 @@ + " ADD COLUMN " + FIELD_HOST_MENU5250 + " TEXT"); db.execSQL("ALTER TABLE " + TABLE_HOSTS + " ADD COLUMN " + FIELD_HOST_PROGRAM5250 + " TEXT"); + + case 27: + db.execSQL("ALTER TABLE " + TABLE_HOSTS + + " ADD COLUMN " + FIELD_HOST_FIXEDSIZE + " TEXT DEFAULT '" + Boolean.toString(false) + "'"); + db.execSQL("ALTER TABLE " + TABLE_HOSTS + + " ADD COLUMN " + FIELD_HOST_FIXEDWIDTH + " INTEGER"); + db.execSQL("ALTER TABLE " + TABLE_HOSTS + + " ADD COLUMN " + FIELD_HOST_FIXEDHEIGHT + " INTEGER"); } } @@ -422,6 +360,9 @@ COL_WANTSESSION = c.getColumnIndexOrThrow(FIELD_HOST_WANTSESSION), COL_DELKEY = c.getColumnIndexOrThrow(FIELD_HOST_DELKEY), COL_FONTSIZE = c.getColumnIndexOrThrow(FIELD_HOST_FONTSIZE), + COL_FIXEDSIZE = c.getColumnIndexOrThrow(FIELD_HOST_FIXEDSIZE), + COL_FIXEDWIDTH = c.getColumnIndexOrThrow(FIELD_HOST_FIXEDWIDTH), + COL_FIXEDHEIGHT = c.getColumnIndexOrThrow(FIELD_HOST_FIXEDHEIGHT), COL_COMPRESSION = c.getColumnIndexOrThrow(FIELD_HOST_COMPRESSION), COL_HTTPPROXY = c.getColumnIndexOrThrow(FIELD_HOST_HTTPPROXY), COL_ENCODING = c.getColumnIndexOrThrow(FIELD_HOST_ENCODING), @@ -450,9 +391,12 @@ host.setUseAuthAgent(c.getString(COL_USEAUTHAGENT)); host.setPostLogin(c.getString(COL_POSTLOGIN)); host.setPubkeyId(c.getLong(COL_PUBKEYID)); - host.setWantSession(Boolean.valueOf(c.getString(COL_WANTSESSION))); host.setDelKey(c.getString(COL_DELKEY)); host.setFontSize(c.getFloat(COL_FONTSIZE)); + host.setFixedSize(Boolean.valueOf(c.getString(COL_FIXEDSIZE))); + host.setFixedWidth(c.getLong(COL_FIXEDWIDTH)); + host.setFixedHeight(c.getLong(COL_FIXEDHEIGHT)); + host.setWantSession(Boolean.valueOf(c.getString(COL_WANTSESSION))); host.setCompression(Boolean.valueOf(c.getString(COL_COMPRESSION))); host.setHttpproxy(c.getString(COL_HTTPPROXY)); host.setEncoding(c.getString(COL_ENCODING));
--- a/src/com/five_ten_sg/connectbot/util/PreferenceConstants.java Mon Jul 14 08:46:06 2014 -0700 +++ b/src/com/five_ten_sg/connectbot/util/PreferenceConstants.java Mon Jul 14 09:42:20 2014 -0700 @@ -96,8 +96,6 @@ public static final String EXTENDED_LONGPRESS = "extended_longpress"; public static final String SCREEN_CAPTURE_POPUP = "screen_capture_popup"; public static final String SCREEN_CAPTURE_FOLDER = "screen_capture_folder"; - public static final String DEFAULT_FONT_SIZE_HEIGHT = "default_fsize_height"; - public static final String DEFAULT_FONT_SIZE_WIDTH = "default_fsize_width"; public static final String DEFAULT_FONT_SIZE = "default_font_size"; public static final String FILE_DIALOG = "file_dialog"; public static final String DOWNLOAD_FOLDER = "download_folder";