From: thadh <thadh@THADH-LAPTOP.ad.corp.google.com>
Date: Thu, 29 Oct 2009 08:08:28 +0000 (-0700)
Subject: 1.6
X-Git-Url: http://gitweb.fperrin.net/?a=commitdiff_plain;h=2a44e23be1341d10761765f749788f335555d124;p=Dictionary.git

1.6
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4acdfe2..3107cf0 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="com.hughes.android.dictionary" android:versionName="1.2" android:versionCode="5">
+	package="com.hughes.android.dictionary" android:versionName="1.6" android:versionCode="6">
 
 	<uses-sdk android:minSdkVersion="2" />
 	<uses-permission android:name="android.permission.INTERNET"/>
diff --git a/res/layout/download.xml b/res/layout/download.xml
index a0edb5a..af67bd8 100755
--- a/res/layout/download.xml
+++ b/res/layout/download.xml
@@ -4,30 +4,31 @@
 	android:layout_height="wrap_content" xmlns:android="http://schemas.android.com/apk/res/android">
 
 	<TextView android:id="@+id/TextView01" android:layout_width="wrap_content"
-		android:layout_height="wrap_content" android:text="Downloading..."></TextView>
+		android:layout_height="wrap_content" android:text="Downloading..."/>
 
 	<LinearLayout android:id="@+id/sourceLayout"
 		android:orientation="horizontal" android:layout_width="fill_parent"
 		android:layout_height="wrap_content" xmlns:android="http://schemas.android.com/apk/res/android">
 		<TextView android:id="@+id/sourceTitle" android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:text="Source: "></TextView>
+			android:layout_height="wrap_content" android:text="Source: "/>
 		<TextView android:id="@+id/source" android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:text="source"></TextView>
+			android:layout_height="wrap_content" android:text="source"/>
 	</LinearLayout>
 
 	<LinearLayout android:id="@+id/destLayout"
 		android:orientation="horizontal" android:layout_width="fill_parent"
 		android:layout_height="wrap_content" xmlns:android="http://schemas.android.com/apk/res/android">
 		<TextView android:id="@+id/destTitle" android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:text="Destination: "></TextView>
+			android:layout_height="wrap_content" android:text="Destination: "/>
 		<TextView android:id="@+id/dest" android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:text="dest"></TextView>
+			android:layout_height="wrap_content" android:text="dest"/>
 	</LinearLayout>
 
-	<ProgressBar android:id="@+id/downloadProgressBar"
-		android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="false"></ProgressBar>
+	<ProgressBar android:id="@+id/downloadProgressBar" style="?android:attr/progressBarStyleHorizontal"
+    android:max="100" android:progress="50"
+		android:layout_width="fill_parent" android:layout_height="wrap_content" android:indeterminate="false"/>
 
 	<TextView android:id="@+id/downloadStatus" android:layout_width="wrap_content"
-		android:layout_height="wrap_content" android:visibility="visible" android:text="Download status."></TextView>
+		android:layout_height="wrap_content" android:visibility="visible" android:text="Download status."/>
 
 </LinearLayout>
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 2862dcd..c12bb0f 100755
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -18,6 +18,14 @@
 				android:inputType="text" 
 				android:layout_weight="1.0"/>
 				
+      <Button 
+        android:id="@+id/ClearSearchTextButton"
+        android:text="&lt;x"
+        android:minWidth="50dip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        />
+
 			<Button 
 				android:id="@+id/LangButton"
 				android:text="LANG"
diff --git a/res/layout/no_dictionary.xml b/res/layout/no_dictionary.xml
index 9ab0b85..abc1b86 100755
--- a/res/layout/no_dictionary.xml
+++ b/res/layout/no_dictionary.xml
@@ -15,6 +15,7 @@
 		android:layout_width="wrap_content" 
 		android:layout_height="wrap_content"
 		android:layout_gravity="center_vertical|fill_vertical"
+		android:layout_marginBottom="5dip"
 	/>
 
   <Button 
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a7662f6..c461463 100755
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -14,20 +14,30 @@
   <string name="failedAddingToWordList">Fehler bei Wortliste hinzufugen: %s</string>
 
 	<!-- About. -->
-	<string name="titleWithVersion">QuickDic 1.2</string>
+	<string name="titleWithVersion">QuickDic 1.6</string>
 	<string name="thadHughes">Thad Hughes</string>
 	<string name="contactMe">Wenn QuickDic dir gefällt, würde ich gern von dir hören.  Bitte schicke Bemerkungen, Aufforderungen, oder Programmfehler an:</string>
 	<string name="myEmail">thad.hughes+quickdic@gmail.com</string>
 	<string name="currentDictInfo">Wörterbuch Info:</string>
 	<string name="noDictLoaded">Kein Wörterbuch geöffnet.</string>
+  <string name="aboutText"><![CDATA[%s\n
+\n
+Einträgezahl: %d\n
+%s:\n
+  Wörterzahl: %d\n
+  Reihezahl: %d\n
+%s:\n
+  Wörterzahl: %d\n
+  Reihezahl: %d\n
+]]></string>
 	
 	<!-- Download. -->
-	<string name="downloading">%d Bytes heruntergeladen...</string>
+	<string name="downloading">%d von %d Bytes heruntergeladen...</string>
 	<string name="downloadFinished">Herunterladen fertig, %d Bytes heruntergeladen.</string>
 	<string name="errorDownloadingFile">"Fehler während des Herunterladens: \n%s"</string>
 
   <!-- NoDictionary. -->
-  <string name="unableToReadDictionaryFile">Wörterbuch Datei existiert nicht: %s</string>
+  <string name="unableToReadDictionaryFile">Wörterbuch Datei existiert nicht (oder ist eine alte Version): %s</string>
   <string name="DictionaryFileExists">Wörterbuch Datei existiert: %s</string>
   <string name="launchDict">"Launch dictionary."</string>
 
@@ -37,6 +47,14 @@
 	<string name="wordListFileSummary">Die Datei, in der neue Worte hinzugefügt werden.</string>
 	<string name="wordListFileDefault">/sdcard/wordList.txt</string>
 
+  <string name="saveOnlyFirstSubentryKey">saveOnlyFirstSubentry</string>
+  <string name="saveOnlyFirstSubentryTitle">Save only first sub-entry</string>
+  <string name="saveOnlyFirstSubentrySummary">For entries with multiple sub-entries, only write the first to the word list.</string>
+
+  <string name="showClearSearchTextButtonKey">showClearSearchTextButton</string>
+  <string name="showClearSearchTextButtonTitle">Show 'clear search text' button</string>
+  <string name="showClearSearchTextButtonSummary">Show the button to clear the search text. You can also just move focus away from search text and start typing.</string>
+  
 	<string name="dictFileKey">dictFile</string>
 	<string name="dictFileTitle">Wörterbuch Datei</string>
 	<string name="dictFileSummary">Die Datei, die das Wörterbuch enthält (und worein das Wörterbuch heruntergeladen wird).</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1a8a8f4..6ffc831 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -14,20 +14,30 @@
   <string name="failedAddingToWordList">Failure adding to word list: %s</string>
 
 	<!-- About. -->
-	<string name="titleWithVersion">QuickDic 1.2</string>
+	<string name="titleWithVersion">QuickDic 1.6</string>
 	<string name="thadHughes">Thad Hughes</string>
 	<string name="contactMe">If you're using QuickDic, I'd love to hear from you.  Please send comments, suggestions, bug reports, or just a quick hello to:</string>
 	<string name="myEmail">thad.hughes+quickdic@gmail.com</string>
 	<string name="currentDictInfo">Current dictionary info:</string>
 	<string name="noDictLoaded">No dictionary loaded.</string>
+  <string name="aboutText"><![CDATA[%s\n
+\n
+Entry count: %d\n
+%s:\n
+  Unique token count: %d\n
+  Row count: %d\n
+%s:\n
+  Unique token count: %d\n
+  Row count: %d\n
+]]></string>
 	
 	<!-- Download. -->
-	<string name="downloading">Downloading, %d bytes so far</string>
+	<string name="downloading">Downloading, %d of %d bytes.</string>
 	<string name="downloadFinished">Download finished, %d bytes downloaded.</string>
 	<string name="errorDownloadingFile">"Error downloading file: \n%s"</string>
 
   <!-- NoDictionary. -->
-  <string name="unableToReadDictionaryFile">Unable to read dictionary file: %s</string>
+  <string name="unableToReadDictionaryFile">Unable to read dictionary file (or version is old, try downloading again): %s</string>
   <string name="dictionaryFileExists">Dictionary file exists: %s</string>
   <string name="launchDict">Launch dictionary.</string>
 
@@ -37,6 +47,14 @@
 	<string name="wordListFileSummary">The local file where the word list will be appended.</string>
 	<string name="wordListFileDefault">/sdcard/wordList.txt</string>
 
+  <string name="saveOnlyFirstSubentryKey">saveOnlyFirstSubentry</string>
+  <string name="saveOnlyFirstSubentryTitle">Save only first sub-entry</string>
+  <string name="saveOnlyFirstSubentrySummary">For entries with multiple sub-entries, only write the first to the word list.</string>
+
+  <string name="showClearSearchTextButtonKey">showClearSearchTextButton</string>
+  <string name="showClearSearchTextButtonTitle">Show 'clear search text' button</string>
+  <string name="showClearSearchTextButtonSummary">Show the button to clear the search text. You can also just move focus away from search text and start typing.</string>
+  
 	<string name="dictFileKey">dictFile</string>
 	<string name="dictFileTitle">Dictionary file</string>
 	<string name="dictFileSummary">The local filename where the dictionary is stored (and downloaded to).</string>
@@ -46,5 +64,5 @@
 	<string name="dictFetchUrlTitle">Dictionary fetch URL</string>
 	<string name="dictFetchUrlSummary">URL to use to download the dictionary from the Internet.</string>
 	<string name="dictFetchUrlDefault">http://www.stanford.edu/~egirard/dict/de-en.dict</string>
-	
+
 </resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index b43d391..91784be 100755
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -1,27 +1,43 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
 	<EditTextPreference
-	    android:key="@string/wordListFileKey"
-		android:title="@string/wordListFileTitle" 
-		android:summary="@string/wordListFileSummary"
+	  android:key="@string/wordListFileKey"
+    android:title="@string/wordListFileTitle" 
+    android:summary="@string/wordListFileSummary"
 		android:defaultValue="@string/wordListFileDefault"
-		android:persistent="true"
+    android:persistent="true"
 	/>
-		
+
+  <CheckBoxPreference 
+    android:key="@string/saveOnlyFirstSubentryKey"
+    android:title="@string/saveOnlyFirstSubentryTitle"
+    android:summary="@string/saveOnlyFirstSubentrySummary"
+    android:defaultValue="false"
+    android:persistent="true"
+  />
+
+  <CheckBoxPreference 
+    android:key="@string/showClearSearchTextButtonKey"
+    android:title="@string/showClearSearchTextButtonTitle"
+    android:summary="@string/showClearSearchTextButtonSummary"
+    android:defaultValue="true"
+    android:persistent="true"
+  />
+
 	<EditTextPreference 
-		android:key="@string/dictFileKey"
-		android:title="@string/dictFileTitle"
-		android:summary="@string/dictFileSummary"
-		android:defaultValue="@string/dictFileDefault"
-		android:persistent="true" 
-		/>
-		
+    android:key="@string/dictFileKey"
+    android:title="@string/dictFileTitle"
+    android:summary="@string/dictFileSummary"
+    android:defaultValue="@string/dictFileDefault"
+    android:persistent="true" 
+    />
+    
 	<EditTextPreference 
-	    android:key="@string/dictFetchUrlKey"
-	    android:title="@string/dictFetchUrlTitle"
-		android:summary="@string/dictFetchUrlSummary"
-		android:defaultValue="@string/dictFetchUrlDefault"
-		android:persistent="true"
+	  android:key="@string/dictFetchUrlKey"
+	  android:title="@string/dictFetchUrlTitle"
+    android:summary="@string/dictFetchUrlSummary"
+    android:defaultValue="@string/dictFetchUrlDefault"
+    android:persistent="true"
 	/>
-
+
 </PreferenceScreen>  
\ No newline at end of file
diff --git a/src/com/hughes/android/dictionary/Dictionary.java b/src/com/hughes/android/dictionary/Dictionary.java
index 0588129..dfca946 100755
--- a/src/com/hughes/android/dictionary/Dictionary.java
+++ b/src/com/hughes/android/dictionary/Dictionary.java
@@ -15,6 +15,8 @@ import com.hughes.util.raf.RAFSerializer;
 import com.hughes.util.raf.UniformFileList;
 
 public final class Dictionary implements RAFSerializable<Dictionary> {
+  
+  private static final String VERSION_CODE = "DictionaryVersion=1.5";
 
   static final RAFSerializer<Entry> ENTRY_SERIALIZER = new RAFSerializableSerializer<Entry>(
       Entry.RAF_FACTORY);
@@ -40,6 +42,9 @@ public final class Dictionary implements RAFSerializable<Dictionary> {
         .getFilePointer()), 10000);
     languageDatas[0] = new LanguageData(this, raf, Entry.LANG1);
     languageDatas[1] = new LanguageData(this, raf, Entry.LANG2);
+    if (!VERSION_CODE.equals(raf.readUTF())) {
+      throw new IOException("Invalid dictionary version, expected: " + VERSION_CODE);
+    }
   }
 
   public void write(RandomAccessFile raf) throws IOException {
@@ -47,6 +52,7 @@ public final class Dictionary implements RAFSerializable<Dictionary> {
     FileList.write(raf, entries, ENTRY_SERIALIZER);
     languageDatas[0].write(raf);
     languageDatas[1].write(raf);
+    raf.writeUTF(VERSION_CODE);
   }
 
   final class LanguageData implements RAFSerializable<LanguageData> {
@@ -83,9 +89,9 @@ public final class Dictionary implements RAFSerializable<Dictionary> {
       FileList.write(raf, sortedIndex, INDEX_ENTRY_SERIALIZER);
     }
 
-    String rowToString(final Row row) {
+    String rowToString(final Row row, final boolean onlyFirstSubentry) {
       return row.isToken() ? sortedIndex.get(row.getIndex()).word : entries
-          .get(row.getIndex()).toString();
+          .get(row.getIndex()).getRawText(onlyFirstSubentry);
     }
 
     int lookup(String word, final AtomicBoolean interrupted) {
diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index f1d529d..76a7997 100755
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -52,9 +52,9 @@ import com.hughes.android.dictionary.Dictionary.Row;
 public class DictionaryActivity extends ListActivity {
   
   // TODO:
-  // * Version magic number at end of dictionary, checked for correctness. (Throw exception in ctor, remember to check for it).
-  // * Localize "about" string if % codes
-  // * Toast when word gets added to word list.
+  // * Download latest dicts.
+  //   * http://ftp.tu-chemnitz.de/pub/Local/urz/ding/de-en-devel/
+  //   * http://www1.dict.cc/translation_file_request.php?l=e
   // * Compress all the strings everywhere, put compression table in file.
   // Done:
   // * Only one way to way for current search to end. (won't do).
@@ -69,7 +69,7 @@ public class DictionaryActivity extends ListActivity {
 
   EditText searchText;
   Button langButton;
-  int lastSelectedRow = 0;
+  int lastSelectedRow = 0;  // TODO: I'm evil.
 
   private boolean prefsMightHaveChanged = true;
 
@@ -77,6 +77,7 @@ public class DictionaryActivity extends ListActivity {
   private File wordList;
   private RandomAccessFile dictRaf = null;
   private Dictionary dictionary = null;
+  private boolean saveOnlyFirstSubentry = false;
 
   // Visible for testing.
   LanguageListAdapter languageList = null;
@@ -91,11 +92,12 @@ public class DictionaryActivity extends ListActivity {
     if (Language.EN.sortCollator.compare("pre-print", "preppy") >= 0) {
       Log
           .e(LOG,
-              "Android java.text.Collator is buggy, lookups may not work properly.");
+              Language.EN.sortCollator.getClass() + " is buggy, lookups may not work properly.");
     }
 
-    initDictionaryAndPrefs();
-    if (dictRaf == null) {
+    try {
+      initDictionaryAndPrefs();
+    } catch (Exception e) {
       return;
     }
 
@@ -109,22 +111,41 @@ public class DictionaryActivity extends ListActivity {
     searchText.addTextChangedListener(new SearchTextWatcher());
     
     getListView().setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-      public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2,
+      public void onItemSelected(AdapterView<?> arg0, View arg1, int row,
           long arg3) {
-        lastSelectedRow = arg2;
-        updateSearchText();
+        setSelectedRow(row);
       }
       public void onNothingSelected(AdapterView<?> arg0) {
       }
     });
-
-    // Language button.
+    
+    getListView().setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
+      public boolean onItemLongClick(AdapterView<?> arg0, View arg1, int row,
+          long arg3) {
+        setSelectedRow(row);
+        return false;
+      }
+    });
+    
+    final Button clearSearchTextButton = (Button) findViewById(R.id.ClearSearchTextButton);
+    clearSearchTextButton.setOnClickListener(new OnClickListener() {
+      public void onClick(View v) {
+        clearSearchTextButton.requestFocus();
+        searchText.setText("");
+        searchText.requestFocus();
+      }
+    });
+    clearSearchTextButton.setVisibility(PreferenceManager.getDefaultSharedPreferences(this).getBoolean(
+        getString(R.string.showClearSearchTextButtonKey), true) ? View.VISIBLE
+        : View.GONE);
+    
     final Button langButton = (Button) findViewById(R.id.LangButton);
     langButton.setOnClickListener(new OnClickListener() {
       public void onClick(View v) {
         onLanguageButton();
       }
     });
+    
     final Button upButton = (Button) findViewById(R.id.UpButton);
     upButton.setOnClickListener(new OnClickListener() {
       public void onClick(View v) {
@@ -144,7 +165,7 @@ public class DictionaryActivity extends ListActivity {
     updateLangButton();
   }
   
-  private void initDictionaryAndPrefs() {
+  private void initDictionaryAndPrefs() throws Exception {
     if (!prefsMightHaveChanged) {
       return;
     }
@@ -155,27 +176,30 @@ public class DictionaryActivity extends ListActivity {
     wordList = new File(prefs.getString(getString(R.string.wordListFileKey),
         getString(R.string.wordListFileDefault)));
     Log.d(LOG, "wordList=" + wordList);
+    
+    saveOnlyFirstSubentry = prefs.getBoolean(getString(R.string.saveOnlyFirstSubentryKey), false);
 
     final File dictFile = new File(prefs.getString(getString(R.string.dictFileKey),
         getString(R.string.dictFileDefault)));
     Log.d(LOG, "dictFile=" + dictFile);
+    
+    try {
     if (!dictFile.canRead()) {
-      Log.w(LOG, "Unable to read dictionary file.");
-      this.startActivity(new Intent(this, NoDictionaryActivity.class));
-      finish();
+      throw new IOException("Unable to read dictionary file.");
     }
-
-    try {
-      dictRaf = new RandomAccessFile(dictFile, "r");
-      dictionary = new Dictionary(dictRaf);
-    } catch (Exception e) {
+    
+    dictRaf = new RandomAccessFile(dictFile, "r");
+    dictionary = new Dictionary(dictRaf);
+    } catch (IOException e) {
       Log.e(LOG, "Couldn't open dictionary.", e);
-      return;
+      this.startActivity(new Intent(this, NoDictionaryActivity.class));
+      finish();
+      throw new Exception(e);
     }
-
+    
     final byte lang = prefs.getInt(PREF_DICT_ACTIVE_LANG, Entry.LANG1) == Entry.LANG1 ? Entry.LANG1
         : Entry.LANG2;
-
+    
     languageList = new LanguageListAdapter(dictionary.languageDatas[lang]);
     setListAdapter(languageList);
     prefsMightHaveChanged = false;
@@ -186,15 +210,19 @@ public class DictionaryActivity extends ListActivity {
     super.onResume();
     Log.d(LOG, "onResume:" + this);
 
-    initDictionaryAndPrefs();
+    try {
+      initDictionaryAndPrefs();
+    } catch (Exception e) {
+      return;
+    }
     
     final SharedPreferences prefs = PreferenceManager
         .getDefaultSharedPreferences(this);
     final String searchTextString = prefs
         .getString(PREF_ACTIVE_SEARCH_TEXT, "");
     searchText.setText(searchTextString);
-    onSearchTextChange(searchTextString);
     getListView().requestFocus();
+    onSearchTextChange(searchTextString);
   }
 
   @Override
@@ -234,10 +262,9 @@ public class DictionaryActivity extends ListActivity {
     dictRaf = null;
   }
 
-  public String getSelectedRowRawText() {
-    final int row = getSelectedRow();
-    return row < 0 ? "" : languageList.languageData
-        .rowToString(languageList.languageData.rows.get(row));
+  public String getSelectedRowRawText(final boolean onlyFirstSubentry) {
+    final Row row = languageList.languageData.rows.get(getSelectedRow());
+    return languageList.languageData.rowToString(row, onlyFirstSubentry);
   }
 
   // ----------------------------------------------------------------
@@ -272,22 +299,15 @@ public class DictionaryActivity extends ListActivity {
       public boolean onMenuItemClick(final MenuItem menuItem) {
         final Intent intent = new Intent().setClassName(AboutActivity.class
             .getPackage().getName(), AboutActivity.class.getCanonicalName());
-        final StringBuilder currentDictInfo = new StringBuilder();
+        final String currentDictInfo;
         if (dictionary == null) {
-          currentDictInfo.append(getString(R.string.noDictLoaded));
+          currentDictInfo = getString(R.string.noDictLoaded);
         } else {
-          currentDictInfo.append(dictionary.dictionaryInfo).append("\n\n");
-          currentDictInfo.append("Entry count: " + dictionary.entries.size())
-              .append("\n");
-          for (int i = 0; i < 2; ++i) {
-            final LanguageData languageData = dictionary.languageDatas[i];
-            currentDictInfo.append(languageData.language.symbol).append(":\n");
-            currentDictInfo.append(
-                "  Unique token count: " + languageData.sortedIndex.size())
-                .append("\n");
-            currentDictInfo.append("  Row count: " + languageData.rows.size())
-                .append("\n");
-          }
+          final LanguageData lang0 = dictionary.languageDatas[0];
+          final LanguageData lang1 = dictionary.languageDatas[1];
+          currentDictInfo = getString(R.string.aboutText, dictionary.dictionaryInfo, dictionary.entries.size(), 
+              lang0.language.symbol, lang0.sortedIndex.size(), lang0.rows.size(),
+              lang1.language.symbol, lang1.sortedIndex.size(), lang1.rows.size());
         }
         intent.putExtra(AboutActivity.CURRENT_DICT_INFO, currentDictInfo
             .toString());
@@ -299,6 +319,7 @@ public class DictionaryActivity extends ListActivity {
     final MenuItem download = menu.add(getString(R.string.downloadDictionary));
     download.setOnMenuItemClickListener(new OnMenuItemClickListener() {
       public boolean onMenuItemClick(final MenuItem menuItem) {
+        prefsMightHaveChanged = true;
         startDownloadDictActivity(DictionaryActivity.this);
         return false;
       }
@@ -335,13 +356,13 @@ public class DictionaryActivity extends ListActivity {
   }
 
   void onUpButton() {
-    final int destRowIndex = languageList.languageData.getPrevTokenRow(lastSelectedRow);
+    final int destRowIndex = languageList.languageData.getPrevTokenRow(getSelectedRow());
     Log.d(LOG, "onUpButton, destRowIndex=" + destRowIndex);
     jumpToRow(languageList, destRowIndex);
   }
 
   void onDownButton() {
-    final int destRowIndex = languageList.languageData.getNextTokenRow(lastSelectedRow);
+    final int destRowIndex = languageList.languageData.getNextTokenRow(getSelectedRow());
     Log.d(LOG, "onDownButton, destRowIndex=" + destRowIndex);
     jumpToRow(languageList, destRowIndex);
   }
@@ -357,7 +378,7 @@ public class DictionaryActivity extends ListActivity {
         new SimpleDateFormat("yyyy.MM.dd HH:mm:ss").format(new Date()))
         .append("\t");
     rawText.append(word).append("\t");
-    rawText.append(getSelectedRowRawText());
+    rawText.append(getSelectedRowRawText(saveOnlyFirstSubentry));
     Log.d(LOG, "Writing : " + rawText);
     try {
       wordList.getParentFile().mkdirs();
@@ -379,7 +400,7 @@ public class DictionaryActivity extends ListActivity {
     }
     Log.d(LOG, "Copy." + DictionaryActivity.this.getSelectedRow());
     final StringBuilder result = new StringBuilder();
-    result.append(getSelectedRowRawText());
+    result.append(getSelectedRowRawText(false));
     final ClipboardManager clipboardManager = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
     clipboardManager.setText(result.toString());
     Log.d(LOG, "Copied: " + result);
@@ -400,7 +421,7 @@ public class DictionaryActivity extends ListActivity {
 
   @Override
   protected void onListItemClick(ListView l, View v, int row, long id) {
-    Log.d(LOG, "Clicked: " + getSelectedRowRawText());
+    setSelectedRow(row);
     openContextMenu(getListView());
   }
 
@@ -452,8 +473,7 @@ public class DictionaryActivity extends ListActivity {
       return;
     }
     setSelection(rowIndex);
-    lastSelectedRow = rowIndex;  // TODO: find a way to delete this.
-    updateSearchText();
+    setSelectedRow(rowIndex);
     getListView().setSelected(true);
   }
   
@@ -461,6 +481,11 @@ public class DictionaryActivity extends ListActivity {
   private int getSelectedRow() {
     return lastSelectedRow;
   }
+  private void setSelectedRow(final int row) {
+    lastSelectedRow = row;
+    Log.d(LOG, "Selected: " + getSelectedRowRawText(true));
+    updateSearchText();
+  }
 
   private void updateSearchText() {
     Log.d(LOG, "updateSearchText");
@@ -531,7 +556,7 @@ public class DictionaryActivity extends ListActivity {
         if (row == null) {
           return result;
         }
-        result.setText(languageData.rowToString(row));
+        result.setText(languageData.rowToString(row, false));
         result.setTextAppearance(parent.getContext(),
             android.R.style.TextAppearance_Large);
         result.setClickable(false);
diff --git a/src/com/hughes/android/dictionary/DownloadActivity.java b/src/com/hughes/android/dictionary/DownloadActivity.java
index 5723eef..cff7463 100755
--- a/src/com/hughes/android/dictionary/DownloadActivity.java
+++ b/src/com/hughes/android/dictionary/DownloadActivity.java
@@ -5,6 +5,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.net.URLConnection;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -24,6 +25,8 @@ public class DownloadActivity extends Activity {
 
   String source;
   String dest;
+  long bytesDownloaded = 0;
+  long contentLength = -1;
 
   private final Executor downloadExecutor = Executors.newSingleThreadExecutor();
   private final Handler uiHandler = new Handler();
@@ -61,7 +64,9 @@ public class DownloadActivity extends Activity {
       destTmpFile = File.createTempFile("dictionaryDownload", "tmp", destFile
           .getParentFile());
       final URL uri = new URL(source);
-      in = uri.openStream();
+      final URLConnection connection = uri.openConnection();
+      contentLength = connection.getContentLength();
+      in = connection.getInputStream();
       out = new FileOutputStream(destTmpFile);
     } catch (Exception e) {
       Log.e("THAD", "Error downloading file", e);
@@ -72,16 +77,16 @@ public class DownloadActivity extends Activity {
     final Runnable runnable = new Runnable() {
       public void run() {
         try {
-          long byteCount = 0;
+          bytesDownloaded = 0;
           int bytesRead;
           final byte[] bytes = new byte[1024 * 8];
           int count = 0;
           while ((bytesRead = in.read(bytes)) != -1 && !stop.get()) {
             out.write(bytes, 0, bytesRead);
-            byteCount += bytesRead;
+            bytesDownloaded += bytesRead;
             if (count++ % 20 == 0) {
-              setDownloadStatus(String.format(getString(R.string.downloading),
-                  byteCount));
+              setDownloadStatus(getString(R.string.downloading,
+                  bytesDownloaded, contentLength));
             }
           }
           in.close();
@@ -90,10 +95,10 @@ public class DownloadActivity extends Activity {
             destFile.delete();
             destTmpFile.renameTo(destFile);
           } else {
-            Log.d("THAD", "Stopped downloading file.");
+           Log.d("THAD", "Stopped downloading file.");
           }
           setDownloadStatus(String.format(getString(R.string.downloadFinished),
-              byteCount));
+              bytesDownloaded));
         } catch (IOException e) {
           Log.e("THAD", "Error downloading file", e);
           setDownloadStatus(String.format(getString(R.string.errorDownloadingFile), e.getLocalizedMessage()));
@@ -111,10 +116,14 @@ public class DownloadActivity extends Activity {
   }
 
   private void setDownloadStatus(final String status) {
-    final TextView downloadStatus = (TextView) findViewById(R.id.downloadStatus);
-//    final ProgressBar progressBar = (ProgressBar) findViewById(R.id.downloadProgressBar);
     uiHandler.post(new Runnable() {
       public void run() {
+        final ProgressBar progressBar = (ProgressBar) findViewById(R.id.downloadProgressBar);
+        if (contentLength > 0) {
+          progressBar.setProgress((int) (bytesDownloaded * 100 / contentLength));
+        }
+        
+        final TextView downloadStatus = (TextView) findViewById(R.id.downloadStatus);
         downloadStatus.setText(status);
       }
     });
diff --git a/src/com/hughes/android/dictionary/Entry.java b/src/com/hughes/android/dictionary/Entry.java
index 87e87a3..5d1a2d9 100755
--- a/src/com/hughes/android/dictionary/Entry.java
+++ b/src/com/hughes/android/dictionary/Entry.java
@@ -72,7 +72,7 @@ public final class Entry implements RAFSerializable<Entry> {
 
   @Override
   public String toString() {
-    return getRawText();
+    return getRawText(false);
   }
 
   public int getRowCount() {
@@ -88,13 +88,13 @@ public final class Entry implements RAFSerializable<Entry> {
     return lang2;
   }
   
-  String getRawText() {
+  String getRawText(boolean onlyFirstSubentry) {
     final StringBuilder result = new StringBuilder();
-    for (int i = 0; i < lang1.length; ++i) {
+    for (int i = 0; i < (onlyFirstSubentry ? 1 : lang1.length); ++i) {
       result.append(i == 0 ? "" : " | ").append(lang1[i]);
     }
     result.append("\t");
-    for (int i = 0; i < lang2.length; ++i) {
+    for (int i = 0; i < (onlyFirstSubentry ? 1 : lang2.length); ++i) {
       result.append(i == 0 ? "" : " | ").append(lang2[i]);
     }
     return result.toString();
diff --git a/src/com/hughes/android/dictionary/NoDictionaryActivity.java b/src/com/hughes/android/dictionary/NoDictionaryActivity.java
index c2093c6..bc8499f 100755
--- a/src/com/hughes/android/dictionary/NoDictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/NoDictionaryActivity.java
@@ -18,21 +18,8 @@ public class NoDictionaryActivity extends Activity {
   @Override
   public void onCreate(final Bundle savedInstanceState) {
       super.onCreate(savedInstanceState);
-
       setContentView(R.layout.no_dictionary);
       
-      final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-      final String dictFile = prefs.getString(getString(R.string.dictFileKey), getString(R.string.dictFileDefault));
-
-      final boolean canReadDict = new File(dictFile).canRead();
-        
-      final TextView statusText = (TextView) findViewById(R.id.statusTextId);
-      if (!canReadDict) {
-        statusText.setText(String.format(getString(R.string.unableToReadDictionaryFile), dictFile));
-      } else {
-        statusText.setText(String.format(getString(R.string.unableToReadDictionaryFile), dictFile));
-      }
-
       final Button downloadButton = (Button) findViewById(R.id.downloadDict);
       downloadButton.setOnClickListener(new OnClickListener() {
         public void onClick(View arg0) {
@@ -46,11 +33,30 @@ public class NoDictionaryActivity extends Activity {
         }});
 
       final Button launchButton = (Button) findViewById(R.id.launchDict);
-      launchButton.setEnabled(canReadDict);
       launchButton.setOnClickListener(new OnClickListener() {
         public void onClick(View arg0) {
           startActivity(new Intent(NoDictionaryActivity.this, DictionaryActivity.class));
         }});
-}
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
 
+    final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+    final String dictFile = prefs.getString(getString(R.string.dictFileKey), getString(R.string.dictFileDefault));
+    final boolean canReadDict = new File(dictFile).canRead();
+
+    final TextView statusText = (TextView) findViewById(R.id.statusTextId);
+    if (!canReadDict) {
+      statusText.setText(String.format(getString(R.string.unableToReadDictionaryFile), dictFile));
+    } else {
+      statusText.setText(String.format(getString(R.string.unableToReadDictionaryFile), dictFile));
+    }
+
+    final Button launchButton = (Button) findViewById(R.id.launchDict);
+    launchButton.setEnabled(canReadDict);
+
+  }
+  
 }