package="com.hughes.android.dictionary"
- android:versionCode="20"
- android:versionName="3.2.2"
+ android:versionCode="21"
+ android:versionName="3.3"
android:installLocation="auto">
<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="4"/>
<activity android:name=".DictionaryActivity" />
<activity android:name=".DictionaryEditActivity" />
<activity android:name=".AboutActivity" />
- <activity android:name=".HelpActivity" />
+ <activity android:name=".HtmlDisplayActivity" />
<activity android:name=".PreferenceActivity" />
<activity android:name=".DownloadActivity"
android:configChanges="keyboardHidden|orientation"/>
android:orientation="vertical" >
<WebView
- android:id="@+id/helpWebView"
+ android:id="@+id/webView"
android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_height="0dip"
+ android:layout_weight="1.0" />
+
+ <Button
+ android:id="@+id/okButton"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:text="@android:string/ok" />
</LinearLayout>
\ No newline at end of file
Vielen Dank für die Aktualisierung auf QuickDic 3.2.2.
<p>Neue Funktionen:</p>
<ul>
-<li>Fixed font bug on Sony Ericsson devices.</li>
+<li>Wenn QuickDic Abstürze auf Ihrem Gerät (vor allem Sony Ericsson-Geräte),
+versuchen Sie es mit QuickDic-Einstellungen, um zum "System default" Schriftart zu ändern.</li>
+
+<li>Aktualisiert alle Wörterbücher mit neuen enwiktionary Daten.</li>
+
+<li>Neue Wörterbücher, besonders zwischen Deutsch und anderen Sprachen.</li>
</ul>
</body>
</html>
+AR-DE_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/AR-DE_enwiktionary_BETA.quickdic.v005.zip 1336777324744 2897730 1095259 2 AR 20761 7242 DE 33739 9046 (EN)Wikitionary-based AR-DE dictionary.
+AR-ES_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/AR-ES_enwiktionary_BETA.quickdic.v005.zip 1336777417278 2318931 898725 2 AR 20761 6787 ES 25833 6955 (EN)Wikitionary-based AR-ES dictionary.
+AR-FR_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/AR-FR_enwiktionary_BETA.quickdic.v005.zip 1336777513501 2474910 955469 2 AR 20761 7163 FR 27100 7221 (EN)Wikitionary-based AR-FR dictionary.
+AR-HE_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/AR-HE_enwiktionary_BETA.quickdic.v005.zip 1336950239647 1646554 652193 2 AR 20761 4191 HE 12645 3490 (EN)Wikitionary-based AR-HE dictionary.
+AR-IT_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/AR-IT_enwiktionary_BETA.quickdic.v005.zip 1336777609298 2005012 767463 2 AR 20761 5942 IT 22200 5673 (EN)Wikitionary-based AR-IT dictionary.
+AR-JA_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/AR-JA_enwiktionary_BETA.quickdic.v005.zip 1336777701782 3918933 1558631 2 AR 20761 7263 JA 48223 11317 (EN)Wikitionary-based AR-JA dictionary.
+AR-RU_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/AR-RU_enwiktionary_BETA.quickdic.v005.zip 1336777889661 4953637 1778272 2 AR 20761 7839 RU 64566 10204 (EN)Wikitionary-based AR-RU dictionary.
+AR-ZH_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/AR-ZH_enwiktionary_BETA.quickdic.v005.zip 1336778022278 1925200 731106 2 AR 20761 2856 ZH 21639 5599 (EN)Wikitionary-based AR-ZH dictionary.
+BG-FR_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/BG-FR_enwiktionary_BETA.quickdic.v005.zip 1336774408357 2342844 858914 2 BG 17077 7703 FR 27100 7858 (EN)Wikitionary-based BG-FR dictionary.
+CA-DE_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/CA-DE_enwiktionary_BETA.quickdic.v005.zip 1336773205343 2041131 732223 2 CA 8863 5729 DE 33739 8218 (EN)Wikitionary-based CA-DE dictionary.
+CS-DE_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/CS-DE_enwiktionary_BETA.quickdic.v005.zip 1336773311120 2965348 1115667 2 CS 18702 12136 DE 33739 15246 (EN)Wikitionary-based CS-DE dictionary.
+CS-FR_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/CS-FR_enwiktionary_BETA.quickdic.v005.zip 1336774508802 2510113 964540 2 CS 18702 12100 FR 27100 11689 (EN)Wikitionary-based CS-FR dictionary.
DE-EN_chemnitz_enwiktionary.quickdic http://quickdic-dictionary.googlecode.com/files/DE-EN_chemnitz_enwiktionary.quickdic.v005.zip 1336630394961 51359097 18598004 2 DE 264259 146580 EN 119562 52113 German-English dictionary dedicated to my parents Bob and Judy Hughes, my German teachers, Suzanne Blount and Steven Sidore, my friends Max Haeberlin, Severin Obertuefer, and Ben Keck, and all my friends and students at Munich International School. Und Die Toten Hosen.\n\nGerman-English dictionary contains information from:\nde-en.txt - a German-English dictionary\nVersion: devel 2011-06-21\nSource: http://dict.tu-chemnitz.de/\nThanks to Frank Richter.\nAnd from:\n(EN)Wiktionary\n
+DE-EO_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/DE-EO_enwiktionary_BETA.quickdic.v005.zip 1336773405498 2038083 738610 2 DE 33739 8844 EO 9553 6965 (EN)Wikitionary-based DE-EO dictionary.
+DE-ES_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/DE-ES_enwiktionary_BETA.quickdic.v005.zip 1336773494388 3612485 1372894 2 DE 33739 20256 ES 25833 16146 (EN)Wikitionary-based DE-ES dictionary.
+DE-FR_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/DE-FR_enwiktionary_BETA.quickdic.v005.zip 1336773079040 3907335 1482491 2 DE 33739 22565 FR 27100 16733 (EN)Wikitionary-based DE-FR dictionary.
+DE-HU_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/DE-HU_enwiktionary_BETA.quickdic.v005.zip 1336773601032 2610165 987859 2 DE 33739 12334 HU 15358 10545 (EN)Wikitionary-based DE-HU dictionary.
+DE-IT_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/DE-IT_enwiktionary_BETA.quickdic.v005.zip 1336773690362 3090125 1151569 2 DE 33739 16167 IT 22200 12888 (EN)Wikitionary-based DE-IT dictionary.
+DE-JA_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/DE-JA_enwiktionary_BETA.quickdic.v005.zip 1336773783395 4887287 1925285 2 DE 33739 14425 JA 48223 17498 (EN)Wikitionary-based DE-JA dictionary.
+DE-LA_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/DE-LA_enwiktionary_BETA.quickdic.v005.zip 1336773975220 1849631 650763 2 DE 33739 5459 LA 7445 5277 (EN)Wikitionary-based DE-LA dictionary.
+DE-PL_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/DE-PL_enwiktionary_BETA.quickdic.v005.zip 1336774062757 2628918 978880 2 DE 33739 12998 PL 15004 10154 (EN)Wikitionary-based DE-PL dictionary.
+DE-RU_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/DE-RU_enwiktionary_BETA.quickdic.v005.zip 1336777179745 6878609 2489544 2 DE 33739 21067 RU 64566 20154 (EN)Wikitionary-based DE-RU dictionary.
+DE-SV_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/DE-SV_enwiktionary_BETA.quickdic.v005.zip 1336774152445 2887950 1086107 2 DE 33739 14727 SV 18366 12901 (EN)Wikitionary-based DE-SV dictionary.
+DE-ZH_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/DE-ZH_enwiktionary_BETA.quickdic.v005.zip 1336778459876 2743179 1020230 2 DE 33739 6467 ZH 21639 11152 (EN)Wikitionary-based DE-ZH dictionary.
+EL-IT_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/EL-IT_enwiktionary_BETA.quickdic.v005.zip 1336775487501 2729326 988363 2 EL 27754 8055 IT 22200 7846 (EN)Wikitionary-based EL-IT dictionary.
EN-AF_enwiktionary.quickdic http://quickdic-dictionary.googlecode.com/files/EN-AF_enwiktionary.quickdic.v005.zip 1336623747241 549248 228757 2 EN 5006 1599 AF 2835 1867 (EN)Wikitionary-based EN-AF dictionary.\n\nAfrikaans dictionary dedicated to Heiko and Mariëtte Horn.
EN-AR_enwiktionary.quickdic http://quickdic-dictionary.googlecode.com/files/EN-AR_enwiktionary.quickdic.v005.zip 1336623852439 4429772 1754881 2 EN 16988 7472 AR 27962 9705 (EN)Wikitionary-based EN-AR dictionary.\n\n
EN-AZ_enwiktionary.quickdic http://quickdic-dictionary.googlecode.com/files/EN-AZ_enwiktionary.quickdic.v005.zip 1336629876791 549161 209293 2 EN 3689 1289 AZ 2965 2460 (EN)Wikitionary-based EN-AZ dictionary.\n\n
EN-ZH_enwiktionary.quickdic http://quickdic-dictionary.googlecode.com/files/EN-ZH_enwiktionary.quickdic.v005.zip 1336624540434 13568972 5139361 2 EN 28714 12135 ZH 74867 50367 (EN)Wikitionary-based EN-ZH dictionary.\n\n
EN-ZU_enwiktionary.quickdic http://quickdic-dictionary.googlecode.com/files/EN-ZU_enwiktionary.quickdic.v005.zip 1336629831581 51043 21011 2 EN 550 152 ZU 276 170 (EN)Wikitionary-based EN-ZU dictionary.\n\n
EN-haw_enwiktionary.quickdic http://quickdic-dictionary.googlecode.com/files/EN-haw_enwiktionary.quickdic.v005.zip 1336625906449 252317 92840 2 EN 2002 493 haw 1016 807 (EN)Wikitionary-based EN-haw dictionary.\n\n
+ES-FR_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/ES-FR_enwiktionary_BETA.quickdic.v005.zip 1336774606491 3257616 1247866 2 ES 25833 17191 FR 27100 16332 (EN)Wikitionary-based ES-FR dictionary.
+ES-IT_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/ES-IT_enwiktionary_BETA.quickdic.v005.zip 1336775599666 2608229 984350 2 ES 25833 13907 IT 22200 13378 (EN)Wikitionary-based ES-IT dictionary.
+ES-ZH_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/ES-ZH_enwiktionary_BETA.quickdic.v005.zip 1336778621317 2118405 801150 2 ES 25833 4536 ZH 21639 8863 (EN)Wikitionary-based ES-ZH dictionary.
+FI-NO_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/FI-NO_enwiktionary_BETA.quickdic.v005.zip 1336950041011 2054591 765095 2 FI 37802 8606 NO 10235 7472 (EN)Wikitionary-based FI-NO dictionary.
+FI-SV_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/FI-SV_enwiktionary_BETA.quickdic.v005.zip 1336950140478 2841808 1092328 2 FI 37802 14617 SV 18366 13394 (EN)Wikitionary-based FI-SV dictionary.
+FR-IT_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/FR-IT_enwiktionary_BETA.quickdic.v005.zip 1336774708138 2773699 1043813 2 FR 27100 13882 IT 22200 14204 (EN)Wikitionary-based FR-IT dictionary.
+FR-JA_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/FR-JA_enwiktionary_BETA.quickdic.v005.zip 1336774806302 4461536 1784434 2 FR 27100 10938 JA 48223 17607 (EN)Wikitionary-based FR-JA dictionary.
+FR-LA_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/FR-LA_enwiktionary_BETA.quickdic.v005.zip 1336775003398 1445057 522206 2 FR 27100 4618 LA 7445 5433 (EN)Wikitionary-based FR-LA dictionary.
+FR-NL_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/FR-NL_enwiktionary_BETA.quickdic.v005.zip 1336775094452 2681696 1033525 2 FR 27100 12665 NL 21604 15008 (EN)Wikitionary-based FR-NL dictionary.
+FR-RU_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/FR-RU_enwiktionary_BETA.quickdic.v005.zip 1336775191096 6419781 2336994 2 FR 27100 15944 RU 64566 20387 (EN)Wikitionary-based FR-RU dictionary.
+FR-ZH_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/FR-ZH_enwiktionary_BETA.quickdic.v005.zip 1336775322582 2325726 889458 2 FR 27100 5225 ZH 21639 11066 (EN)Wikitionary-based FR-ZH dictionary.
+HU-IT_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/HU-IT_enwiktionary_BETA.quickdic.v005.zip 1336775697404 1790899 692334 2 HU 15358 8610 IT 22200 8147 (EN)Wikitionary-based HU-IT dictionary.
+IT-JA_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/IT-JA_enwiktionary_BETA.quickdic.v005.zip 1336775789379 3648670 1432461 2 IT 22200 8345 JA 48223 12604 (EN)Wikitionary-based IT-JA dictionary.
+IT-LA_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/IT-LA_enwiktionary_BETA.quickdic.v005.zip 1336775982094 1192962 429638 2 IT 22200 4447 LA 7445 5070 (EN)Wikitionary-based IT-LA dictionary.
+IT-LV_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/IT-LV_enwiktionary_BETA.quickdic.v005.zip 1336776071179 916840 321813 2 IT 22200 2723 LV 3346 2383 (EN)Wikitionary-based IT-LV dictionary.
+IT-NL_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/IT-NL_enwiktionary_BETA.quickdic.v005.zip 1336776157449 2152981 820889 2 IT 22200 10440 NL 21604 11763 (EN)Wikitionary-based IT-NL dictionary.
+IT-PL_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/IT-PL_enwiktionary_BETA.quickdic.v005.zip 1336776251671 1776692 671460 2 IT 22200 8486 PL 15004 8150 (EN)Wikitionary-based IT-PL dictionary.
+IT-RU_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/IT-RU_enwiktionary_BETA.quickdic.v005.zip 1336777051891 5241933 1864642 2 IT 22200 12315 RU 64566 15299 (EN)Wikitionary-based IT-RU dictionary.
+IT-SV_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/IT-SV_enwiktionary_BETA.quickdic.v005.zip 1336776342385 2003184 767899 2 IT 22200 9526 SV 18366 10510 (EN)Wikitionary-based IT-SV dictionary.
+IT-ZH_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/IT-ZH_enwiktionary_BETA.quickdic.v005.zip 1336776877512 1847176 678185 2 IT 22200 3535 ZH 21639 6972 (EN)Wikitionary-based IT-ZH dictionary.
+JA-ZH_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/JA-ZH_enwiktionary_BETA.quickdic.v005.zip 1336778202752 3571476 1382499 2 JA 48223 7226 ZH 21639 11004 (EN)Wikitionary-based JA-ZH dictionary.
+JP-KO_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/JP-KO_enwiktionary_BETA.quickdic.v005.zip 1336950359987 613149 197529 2 JP 0 0 KO 18223 0 (EN)Wikitionary-based JP-KO dictionary.
+KO-ZH_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/KO-ZH_enwiktionary_BETA.quickdic.v005.zip 1336950470111 1833673 717080 2 KO 18223 3652 ZH 21639 5874 (EN)Wikitionary-based KO-ZH dictionary.
+NO-SV_enwiktionary_BETA.quickdic http://quickdic-dictionary.googlecode.com/files/NO-SV_enwiktionary_BETA.quickdic.v005.zip 1336949914324 1342543 528673 2 NO 10235 6576 SV 18366 7082 (EN)Wikitionary-based NO-SV dictionary.
Most dictionary data comes from http://wiktionary.org (mostly from
en.wiktionary.org). If you want to add or fix an entry, please do
it there.
+<h2>Important notes</h2>
+<ul><li>If QuickDic seems to crash when opening a dictionary (especially on
+Sony Ericcson devices), it's probably a problem loading the embedded font.
+Try opening QuickDic's preferences and changing the font to "System default."</li>
+</ul>
<h2>Dictionary manager</h2>
This screen lists all the available and installed dictionaries.
<ul>
<html>
<head>
<meta name="generator" content=
-"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 15.6), see www.w3.org">
+"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 15.6), see www.w3.org">
<meta http-equiv="Content-Type" content=
"text/html; charset=us-ascii">
<title></title>
</head>
<body>
-<!-- Don't use links in the text below, it crashes the app. -->
-Thanks for updating to QuickDic 3.2.2.
+<!-- Don't use links in the text below, it crashes the app. -->
+Thanks for updating to QuickDic 3.3.
<p>New features:</p>
<ul>
-<li>Fixed font bug on Sony Ericsson devices.</li>
-</ul>
+<li>If QuickDic crashes on your device (especially Sony Ericsson devices),
+try using QuickDic's preferences to change to the "System default" font.</li>
+
+<li>Updated all dictionaries with new enwiktionary data.</li>
+
+<li>Several non-English dictionaries available for download
+(probably lower quality but perhaps useful, in beta):
+<ul><li>Arabic-Chinese|Mandarin|Cantonese </li><li>Arabic-French </li><li>Arabic-German </li><li>Arabic-Hebrew </li><li>Arabic-Italian </li><li>Arabic-Japanese </li><li>Arabic-Russian </li><li>Arabic-Spanish </li><li>Bulgarian-French </li><li>Catalan-German </li><li>Czech-French </li><li>Czech-German </li><li>English-Afrikaans </li><li>English-Albanian </li><li>English-Arabic </li><li>English-Armenian </li><li>English-Azeri </li><li>English-Basque </li><li>English-Belarusian </li><li>English-Bengali </li><li>English-Bosnian </li><li>English-Breton </li><li>English-Bulgarian </li><li>English-Burmese </li><li>English-Catalan </li><li>English-Chinese|Mandarin|Cantonese </li><li>English-Croatian </li><li>English-Czech </li><li>English-Danish </li><li>English-Dutch </li><li>English-Esperanto </li><li>English-Estonian </li><li>English-Faroese </li><li>English-Finnish </li><li>English-French </li><li>English-Gaelic </li><li>English-Galician </li><li>English-Georgian </li><li>English-Greek </li><li>English-Haitian Creole </li><li>English-Hawaiian </li><li>English-Hebrew </li><li>English-Hindi </li><li>English-Hungarian </li><li>English-Icelandic </li><li>English-Indonesian </li><li>English-Irish </li><li>English-Italian </li><li>English-Japanese </li><li>English-Korean </li><li>English-Kurdish </li><li>English-Latin </li><li>English-Latvian </li><li>English-Lithuanian </li><li>English-Luxembourgish </li><li>English-Macedonian </li><li>English-Malay </li><li>English-Maori </li><li>English-Mongolian </li><li>English-Nepali </li><li>English-Norwegian </li><li>English-Persian </li><li>English-Polish </li><li>English-Portuguese </li><li>English-Punjabi </li><li>English-Romanian </li><li>English-Russian </li><li>English-Sanskrit </li><li>English-Serbian </li><li>English-Slovak </li><li>English-Somali </li><li>English-Spanish </li><li>English-Swahili </li><li>English-Swedish </li><li>English-Tagalog </li><li>English-Tajik </li><li>English-Thai </li><li>English-Tibetan </li><li>English-Turkish </li><li>English-Ukrainian </li><li>English-Urdu </li><li>English-Vietnamese </li><li>English-Welsh </li><li>English-Yiddish </li><li>English-Zulu </li><li>Finnish-Norwegian </li><li>Finnish-Swedish </li><li>French-Chinese|Mandarin|Cantonese </li><li>French-Dutch </li><li>French-Italian </li><li>French-Japanese </li><li>French-Latin </li><li>French-Russian </li><li>German-Chinese|Mandarin|Cantonese </li><li>German-English </li><li>German-Esperanto </li><li>German-French </li><li>German-Hungarian </li><li>German-Italian </li><li>German-Japanese </li><li>German-Latin </li><li>German-Polish </li><li>German-Russian </li><li>German-Spanish </li><li>German-Swedish </li><li>Greek-Italian </li><li>Hungarian-Italian </li><li>Italian-Chinese|Mandarin|Cantonese </li><li>Italian-Dutch </li><li>Italian-Japanese </li><li>Italian-Latin </li><li>Italian-Latvian </li><li>Italian-Polish </li><li>Italian-Russian </li><li>Italian-Swedish </li><li>Japanese-Chinese|Mandarin|Cantonese </li><li>Korean-Chinese|Mandarin|Cantonese </li><li>Norwegian-Swedish </li><li>Spanish-Chinese|Mandarin|Cantonese </li><li>Spanish-French </li><li>Spanish-Italian </li></ul></ul>
</body>
</html>
<string-array name="fontKeys">
<item>FreeSerif.ttf.jpg</item>
- <item>FreeSans.ttf.jpg</item>
<item>SYSTEM</item>
</string-array>
<string-array name="fonts">
<item>FreeSerif</item>
- <item>FreeSans</item>
<item>System Default</item>
</string-array>
<string name="app_name">QuickDic</string>
- <string name="titleWithVersion">QuickDic 3.2.2</string>
+ <string name="titleWithVersion">QuickDic 3.3</string>
<!-- Global. -->
<string name="about">Über QuickDic…</string>
<string name="managerFilterText">Filter</string>
<string name="managerFilterCheckbox">Nur SD-Karte</string>
- <string name="thanksForUpdatingVersion">3.2.2_de_a</string>
+ <string name="thanksForUpdatingVersion">3.3_de_a</string>
<!-- DictionaryActivity -->
<string name="searchText">Suchtext</string>
<string-array name="fontKeys">
<item>FreeSerif.ttf.jpg</item>
- <item>FreeSans.ttf.jpg</item>
<item>SYSTEM</item>
</string-array>
<string-array name="fonts">
<item>FreeSerif</item>
- <item>FreeSans</item>
<item>System default</item>
</string-array>
<string name="app_name">QuickDic</string>
- <string name="titleWithVersion">QuickDic 3.2.2</string>
+ <string name="titleWithVersion">QuickDic 3.3</string>
<!-- Global. -->
<string name="about">About QuickDic…</string>
<string name="managerFilterCheckbox">Local only</string>
- <string name="thanksForUpdatingVersion">3.2.2_en_e</string>
+ <string name="thanksForUpdatingVersion">3.3_en_e</string>
<!-- DictionaryActivity -->
<string name="searchText">Search Text</string>
public static final String THANKS_FOR_UPDATING_VERSION = "thanksForUpdatingVersion";
- public static final String FONT_WORKAROUND = "fontWorkaround";
-
-
enum Theme {
DEFAULT(R.style.Theme_Default, R.style.Theme_Default_TokenRow_Fg,
R.drawable.theme_default_token_row_main_bg,
}).start();\r
\r
\r
- final int fontWorkAround = prefs.getInt(C.FONT_WORKAROUND, 1);\r
- if (fontWorkAround == 0) {\r
- Log.w(LOG, "Loading font seemed to fail last time, trying with default font.");\r
- Toast.makeText(this, getString(R.string.fontWorkaround), Toast.LENGTH_LONG).show();\r
- prefs.edit().putString(getString(R.string.fontKey), "SYSTEM").commit();\r
- }\r
- prefs.edit().putInt(C.FONT_WORKAROUND, 0).commit();\r
String fontName = prefs.getString(getString(R.string.fontKey), "FreeSerif.ttf.jpg");\r
- if (fontWorkAround == 0 || "SYSTEM".equals(fontName)) {\r
+ if ("SYSTEM".equals(fontName)) {\r
typeface = Typeface.DEFAULT;\r
} else {\r
try {\r
@Override\r
protected void onPause() {\r
super.onPause();\r
- \r
- // If the app exits normally, this will happen.\r
- final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);\r
- Log.d(LOG, "Loading font seemed to work.");\r
- prefs.edit().putInt(C.FONT_WORKAROUND, 1).commit();\r
}\r
\r
private static void setDictionaryPrefs(final Context context,\r
final SharedPreferences.Editor prefs = PreferenceManager.getDefaultSharedPreferences(context).edit();\r
prefs.putString(C.DICT_FILE, dictFile.getPath());\r
prefs.putInt(C.INDEX_INDEX, indexIndex);\r
- prefs.putString(C.SEARCH_TOKEN, searchToken);\r
+ prefs.putString(C.SEARCH_TOKEN, ""); // Don't need to save search token.\r
prefs.commit();\r
}\r
\r
import android.view.MenuItem;
import android.view.MenuItem.OnMenuItemClickListener;
-import com.hughes.android.dictionary.DictionaryInfo.IndexInfo;
import com.hughes.android.dictionary.engine.Dictionary;
import com.hughes.android.dictionary.engine.Language;
import com.hughes.android.dictionary.engine.TransliteratorManager;
final MenuItem help = menu.add(getString(R.string.help));
help.setOnMenuItemClickListener(new OnMenuItemClickListener() {
public boolean onMenuItemClick(final MenuItem menuItem) {
- context.startActivity(HelpActivity.getLaunchIntent());
+ context.startActivity(HtmlDisplayActivity.getHelpLaunchIntent());
return false;
}
});
String defaultLangISO2 = Locale.getDefault().getLanguage().toLowerCase();
+ String defaultLangName = null;
final Map<String, String> fileToNameCache = new LinkedHashMap<String, String>();
public String getLanguageName(final String isoCode) {
if (!currentLocale.equals(defaultLangISO2)) {
defaultLangISO2 = currentLocale;
fileToNameCache.clear();
+ defaultLangName = null;
+ }
+ if (defaultLangName == null) {
+ defaultLangName = getLanguageName(defaultLangISO2);
}
String name = fileToNameCache.get(uncompressedFilename);
final Comparator<String> uncompressedFilenameComparator = new Comparator<String>() {
@Override
public int compare(String uncompressedFilename1, String uncompressedFilename2) {
- return collator.compare(getDictionaryName(uncompressedFilename1), getDictionaryName(uncompressedFilename2));
+ final String name1 = getDictionaryName(uncompressedFilename1);
+ final String name2 = getDictionaryName(uncompressedFilename2);
+ if (defaultLangName.length() > 0) {
+ if (name1.startsWith(defaultLangName) && !name2.startsWith(defaultLangName)) {
+ return -1;
+ } else if (name2.startsWith(defaultLangName) && !name1.startsWith(defaultLangName)) {
+ return 1;
+ }
+ }
+ return collator.compare(name1, name2);
}
};
final Comparator<DictionaryInfo> dictionaryInfoComparator = new Comparator<DictionaryInfo>() {
final String thanksForUpdatingLatestVersion = getString(R.string.thanksForUpdatingVersion);
if (!prefs.getString(C.THANKS_FOR_UPDATING_VERSION, "").equals(thanksForUpdatingLatestVersion)) {
blockAutoLaunch = true;
- final AlertDialog.Builder builder = new AlertDialog.Builder(this);
- builder.setCancelable(false);
- final WebView webView = new WebView(getApplicationContext());
- webView.loadData(StringUtil.readToString(getResources().openRawResource(R.raw.whats_new)), "text/html", "utf-8");
- builder.setNegativeButton(android.R.string.ok, new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
- dialog.cancel();
- }
- });
- WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams();
- layoutParams.width = WindowManager.LayoutParams.FILL_PARENT;
- layoutParams.height = WindowManager.LayoutParams.FILL_PARENT;
- webView.setLayoutParams(layoutParams);
- builder.setView(webView);
- final AlertDialog alert = builder.create();
- alert.getWindow().setLayout(WindowManager.LayoutParams.FILL_PARENT, WindowManager.LayoutParams.FILL_PARENT);
- alert.show();
+ startActivity(HtmlDisplayActivity.getWhatsNewLaunchIntent());
prefs.edit().putString(C.THANKS_FOR_UPDATING_VERSION, thanksForUpdatingLatestVersion).commit();
}
}
\r
package com.hughes.android.dictionary;\r
\r
-import com.hughes.util.StringUtil;\r
-\r
import android.app.Activity;\r
import android.content.Intent;\r
import android.os.Bundle;\r
+import android.view.View;\r
+import android.view.View.OnClickListener;\r
import android.webkit.WebView;\r
+import android.widget.Button;\r
\r
-public final class HelpActivity extends Activity {\r
+import com.hughes.util.StringUtil;\r
+\r
+public final class HtmlDisplayActivity extends Activity {\r
+ \r
+ static final String HTML_RES = "html_res";\r
\r
- public static Intent getLaunchIntent() {\r
+ public static Intent getHelpLaunchIntent() {\r
+ final Intent intent = new Intent();\r
+ intent.setClassName(HtmlDisplayActivity.class.getPackage().getName(), HtmlDisplayActivity.class.getName());\r
+ intent.putExtra(HTML_RES, R.raw.help);\r
+ return intent;\r
+ }\r
+\r
+ public static Intent getWhatsNewLaunchIntent() {\r
final Intent intent = new Intent();\r
- intent.setClassName(HelpActivity.class.getPackage().getName(), HelpActivity.class.getName());\r
+ intent.setClassName(HtmlDisplayActivity.class.getPackage().getName(), HtmlDisplayActivity.class.getName());\r
+ intent.putExtra(HTML_RES, R.raw.whats_new);\r
return intent;\r
}\r
\r
\r
super.onCreate(savedInstanceState);\r
setContentView(R.layout.help_activity);\r
- final String html = StringUtil.readToString(getResources().openRawResource(R.raw.help));\r
- final WebView webView = (WebView) findViewById(R.id.helpWebView);\r
+ final int htmlRes = getIntent().getIntExtra(HTML_RES, -1);\r
+ final String html = StringUtil.readToString(getResources().openRawResource(htmlRes));\r
+ final WebView webView = (WebView) findViewById(R.id.webView);\r
webView.loadData(html, "text/html", "utf-8");\r
+ \r
+ final Button okButton = (Button) findViewById(R.id.okButton);\r
+ okButton.setOnClickListener(new OnClickListener() {\r
+ @Override\r
+ public void onClick(View v) {\r
+ finish();\r
+ }\r
+ });\r
}\r
\r
}\r
projects / Dictionary.git / commitdiff
