From: Thad Hughes <thad.hughes@gmail.com>
Date: Tue, 8 Mar 2011 02:17:14 +0000 (-0800)
Subject: go
X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=commitdiff_plain;h=b8734478a4b5c46cdb260fadad9753cdc85809ae

go
---

diff --git a/.classpath b/.classpath
index 1232048..7f4fe45 100644
--- a/.classpath
+++ b/.classpath
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/Util"/>
 	<classpathentry exported="true" kind="lib" path="jars/icu4j-4_4_2-src/out/module/lib/icu4j-module.jar"/>
+	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 091a0b0..34f5f80 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -4,40 +4,43 @@
  
  package="com.hughes.android.dictionary"
  
- android:versionCode="9"
- android:versionName="2.0"
+ android:versionCode="13"
+ android:versionName="2.0.4"
  android:installLocation="auto">
 
  <uses-sdk android:minSdkVersion="4" />
 
  <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.VIBRATE" />
  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
  <application 
   android:icon="@drawable/icon"
   android:label="@string/app_name"
-  android:backupAgent="DictionaryBackupAgent"
-  android:theme="@style/Theme.QuickDic">
+  android:theme="@style/Theme.Light"
+  android:name=".DictionaryApplication" >
+  
+<!--   
+  android:backupAgent="DictionaryBackupAgent" -->
 
   <meta-data android:name="com.google.android.backup.api_key"
    android:value="AEdPqrEAAAAIUa0cU0ZHbBpYXJqm0vVUP5IAjr5D4iUeX7UwiQ" />
 
   <activity android:name=".DictionaryListActivity"
    android:label="@string/app_name">
-   
-   <intent-filter>
-    <action android:name="android.intent.action.MAIN" />
-    <category android:name="android.intent.category.LAUNCHER" />
-   </intent-filter>
+
+    <intent-filter>
+      <action android:name="android.intent.action.MAIN" />
+      <category android:name="android.intent.category.LAUNCHER" />
+    </intent-filter>
   </activity>
 
-  <activity android:name="DictionaryActivity" />
-  <activity android:name="DictionaryEditActivity" />
-  <activity android:name="AboutActivity" />
-  <activity android:name="PreferenceActivity" />
-  <activity android:name="DownloadActivity" />
+  <activity android:name=".DictionaryActivity" />
+  <activity android:name=".DictionaryEditActivity" />
+  <activity android:name=".AboutActivity" />
+  <activity android:name=".PreferenceActivity" />
+  <activity android:name=".DownloadActivity"
+      android:configChanges="keyboardHidden|orientation"/>
 
  </application>
 
diff --git a/images/german_fuenf.png b/images/german_fuenf.png
new file mode 100644
index 0000000..24a7e1d
Binary files /dev/null and b/images/german_fuenf.png differ
diff --git a/images/icon_big.png b/images/icon_big.png
index e7800b3..b3c3e90 100644
Binary files a/images/icon_big.png and b/images/icon_big.png differ
diff --git a/images/italian_sogni.png b/images/italian_sogni.png
new file mode 100644
index 0000000..41b5df1
Binary files /dev/null and b/images/italian_sogni.png differ
diff --git a/res/layout/edit_activity.xml b/res/layout/edit_activity.xml
index 8c42824..d1fb990 100755
--- a/res/layout/edit_activity.xml
+++ b/res/layout/edit_activity.xml
@@ -47,6 +47,27 @@
     android:layout_width="fill_parent" 
     android:layout_height="wrap_content" />
 
+ <LinearLayout 
+   android:id="@+id/LinearLayout03"
+   android:orientation="horizontal"
+   android:layout_width="wrap_content"
+   android:layout_height="wrap_content"
+   >
+
+  <Button
+    android:id="@+id/downloadButton"
+    android:text="@string/downloadButton"
+    android:layout_width="wrap_content" 
+    android:layout_height="wrap_content"
+   />
+  <Button
+    android:id="@+id/openButton"
+    android:text="@string/openButton"
+    android:layout_width="wrap_content" 
+    android:layout_height="wrap_content"
+   />
+ </LinearLayout>
+
   <TextView 
     android:id="@+id/dictionaryInfoTitle" 
     android:text="@string/dictionaryInfo"
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index dd4f356..d1670c4 100755
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -45,11 +45,8 @@
 	<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>
-	<string name="dictFileDefault">/sdcard/quickdic/de-en.dict</string>
 
-	<string name="dictFetchUrlKey">dictFetchUrl</string>
 	<string name="dictFetchUrlTitle">Wörterbuch URL</string>
 	<string name="dictFetchUrlSummary">Das URL, wovon das Wörterbuch heruntergeladen wird.</string>
-	<string name="dictFetchUrlDefault">http://www.stanford.edu/~egirard/dict/de-en_2.0.dict</string>
 	
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
new file mode 100644
index 0000000..b9dc345
--- /dev/null
+++ b/res/values/arrays.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+  <string-array name="themeKeys">
+    <item>themeLight</item>
+    <item>themeDefault</item>
+  </string-array>
+
+  <string-array name="themes">
+    <item>Light theme</item>
+    <item>Default theme</item>
+  </string-array>
+  
+</resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 03d9cc5..aca53c1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7,8 +7,9 @@
   <!-- DictionaryListActivity -->
   <string name="dictionaryList">Dictionary list</string>
   <string name="selectADictionary"><![CDATA[Select a dictionary.
-\nLong-press to edit the dictionary. Press "menu" to add a new dictionary.]]></string>
+\nLong-press to edit the dictionary config. Press "menu" to add a new dictionary.]]></string>
   <string name="addDictionary">Add dictionary</string>
+  <string name="addDefaultDictionaries">Add default dictionaries</string>
   <string name="editDictionary">Edit dictionary config</string>
   <string name="deleteDictionary">Delete dictionary</string>
   <string name="moveUp">Move up</string>
@@ -21,10 +22,8 @@
   <p> New features:
   <ul>
     <li> Easily work with multiple dictionaries.
-    <li> Wiktionary-based dictionaries for French, Italian, German, Spanish, Swedish.
-    <li> Create your own dictionaries.  Look in Menu...About for details.
   </ul>
-  <p>The new version requires you to re-download any dictionaries you want.<br/>
+  <p>The new version requires you to re-download dictionaries you want to use.<br/>
 </body>
 </html>
 ]]>
@@ -34,14 +33,16 @@
   <string name="dictionaryEdit">Edit dictionary config</string>
   <string name="dictionaryName">Dictionary name</string>
   <string name="downloadUrl">Dictionary download URL</string>
+  <string name="downloadButton">Download</string>
+  <string name="openButton">Open</string>
   <string name="dictionaryInfo">Dictionary info:</string>
   <string name="localFile">Dictionary file</string>
   <string name="wordListFile">Word list file</string>
   <string name="fileNotFound">File not found: \'%s\'</string>
   <string name="invalidDictionary">Invalid dictionary: file=%1$s, error=%2$s</string>
-  <string name="numPairEntries">Entries: %d</string>
-  <string name="numTokens">Tokens: %d</string>
-  <string name="numRows">Rows: %d</string>
+  <string name="numPairEntries">Entries: %,d</string>
+  <string name="numTokens">Tokens: %,d</string>
+  <string name="numRows">Rows: %,d</string>
 
  
 	<!-- Main -->
@@ -52,18 +53,22 @@
 	<string name="about">About...</string>
 	<string name="addToWordList">Add to word list: %s</string>
   <string name="failedAddingToWordList">Failure adding to word list: %s</string>
+  <string name="unzippingDictionary">Unzipping dictionary...</string>
+  <string name="failedToUnzipDictionary">Failed to unzip dictionary...</string>
 
 	<!-- About. -->
 	<string name="titleWithVersion">QuickDic 2.0</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="webPage">For more information, including how to make your own QuickDic dictionaries, see:</string>
+	<string name="myEmail" formatted="false">thad.hughes@gmail.com</string>
+  <string name="webPage">For more information, see:</string>
   <string name="webPageUrl">http://sites.google.com/site/quickdic/home</string>
  
 	<!-- Download. -->
-	<string name="downloading">Downloading, %1$d of %2$d bytes.</string>
-	<string name="downloadFinished">Download finished, %d bytes downloaded.</string>
+  <string name="openingConnection">Opening connection...</string>
+	<string name="downloading">Downloading: %1$,d of %2$,d bytes.</string>
+  <string name="unzipping">Unzipping: %1$,d of %2$,d bytes.</string>
+	<string name="downloadFinished">Finished: %,d bytes.</string>
 	<string name="errorDownloadingFile">"Error downloading file: \n%s"</string>
 
   <!-- NoDictionary. -->
@@ -84,9 +89,9 @@
   <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="vibrateOnFailedSearchKey">vibrateOnFailedSearch</string>
-  <string name="vibrateOnFailedSearchTitle">Vibrate on failed search.</string>
-  <string name="vibrateOnFailedSearchSummary">Vibrate the phone when invalid search text is entered.</string>
 
+  <string name="themeKey">theme</string>
+  <string name="themeTitle">UI theme</string>
+  <string name="themeSummary">User-interface color theme (restart required).</string>
+  
 </resources>
diff --git a/res/values/themeDefault.xml b/res/values/themeDefault.xml
new file mode 100644
index 0000000..dfdb04a
--- /dev/null
+++ b/res/values/themeDefault.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <style name="Theme.Default" parent="@android:style/Theme">
+<!-- 
+  <item name="android:layout_width">fill_parent</item>
+  <item name="android:layout_height">wrap_content</item>
+  
+  <item name="android:colorForeground">#FFFFFF</item>
+  <item name="android:colorBackground">#000000</item>
+
+  <item name="android:textColorPrimary">#FFFFFF</item>
+ -->
+ 
+ </style>
+</resources>
diff --git a/res/values/theme.xml b/res/values/themeLight.xml
similarity index 82%
rename from res/values/theme.xml
rename to res/values/themeLight.xml
index 720baa9..59f3d41 100644
--- a/res/values/theme.xml
+++ b/res/values/themeLight.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
- <style name="Theme.QuickDic" parent="@android:style/Theme.Light">
+ <style name="Theme.Light" parent="@android:style/Theme.Light">
+<!-- 
   <item name="android:layout_width">fill_parent</item>
   <item name="android:layout_height">wrap_content</item>
   
@@ -8,6 +9,7 @@
   <item name="android:colorBackground">#FFFFFF</item>
 
   <item name="android:textColorPrimary">#000000</item>
-
+ -->
+ 
  </style>
 </resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 7cf7652..52cea01 100755
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -24,4 +24,14 @@
     android:persistent="true"
   />
 
+  <ListPreference 
+    android:key="@string/themeKey"
+    android:title="@string/themeTitle"
+    android:summary="@string/themeSummary"
+    android:persistent="true"
+    android:defaultValue=""
+    android:entries="@array/themes"
+    android:entryValues="@array/themeKeys"
+  />
+
 </PreferenceScreen>  
\ No newline at end of file
diff --git a/src/com/hughes/android/dictionary/AboutActivity.java b/src/com/hughes/android/dictionary/AboutActivity.java
index e3880f5..b23a01a 100755
--- a/src/com/hughes/android/dictionary/AboutActivity.java
+++ b/src/com/hughes/android/dictionary/AboutActivity.java
@@ -10,6 +10,8 @@ public final class AboutActivity extends Activity {
   /** Called when the activity is first created. */
   @Override
   public void onCreate(final Bundle savedInstanceState) {
+    ((DictionaryApplication)getApplication()).applyTheme(this);
+
     super.onCreate(savedInstanceState);
     setContentView(R.layout.about_activity);
   }
diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 10b3cf6..922b972 100644
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -119,10 +119,13 @@ public class DictionaryActivity extends ListActivity {
     prefs.remove(C.INDEX_INDEX);
     prefs.remove(C.SEARCH_TOKEN);
     prefs.commit();
+    Log.d(LOG, "Removed default dictionary prefs.");
   }
 
   @Override
   public void onCreate(Bundle savedInstanceState) {
+    ((DictionaryApplication)getApplication()).applyTheme(this);
+    
     super.onCreate(savedInstanceState);
     Log.d(LOG, "onCreate:" + this);
     
@@ -195,8 +198,10 @@ public class DictionaryActivity extends ListActivity {
     
     searchText.requestFocus();
     searchText.addTextChangedListener(searchTextWatcher);
-    searchText.setText(prefs.getString(C.SEARCH_TOKEN, ""));
-    Log.d(LOG, "Trying to restore searchText=" + searchText.getText());
+    final String search = prefs.getString(C.SEARCH_TOKEN, "");
+    searchText.setText(search);
+    searchText.setSelection(0, search.length());
+    Log.d(LOG, "Trying to restore searchText=" + search);
     
     final Button clearSearchTextButton = (Button) findViewById(R.id.ClearSearchTextButton);
     clearSearchTextButton.setOnClickListener(new OnClickListener() {
@@ -254,18 +259,17 @@ public class DictionaryActivity extends ListActivity {
     wordList = new File(prefs.getString(getString(R.string.wordListFileKey),
         getString(R.string.wordListFileDefault)));
     saveOnlyFirstSubentry = prefs.getBoolean(getString(R.string.saveOnlyFirstSubentryKey), false);
-    if (prefs.getBoolean(getString(R.string.vibrateOnFailedSearchKey), true)) {
+    //if (prefs.getBoolean(getString(R.string.vibrateOnFailedSearchKey), true)) {
       // vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
-    }
+    //}
     Log.d(LOG, "wordList=" + wordList + ", saveOnlyFirstSubentry=" + saveOnlyFirstSubentry);
   }
   
-  
   @Override
   protected void onResume() {
     super.onResume();
   }
-
+  
   @Override
   protected void onPause() {
     super.onPause();
@@ -278,11 +282,31 @@ public class DictionaryActivity extends ListActivity {
       return;
     }
     setDictionaryPrefs(this, dictIndex, indexIndex, searchText.getText().toString());
+    
+    // Before we close the RAF, we have to wind the current search down.
+    if (currentSearchOperation != null) {
+      Log.d(LOG, "Interrupting search to shut down.");
+      final SearchOperation searchOperation = currentSearchOperation;
+      currentSearchOperation = null;
+      searchOperation.interrupted.set(true);
+      synchronized (searchOperation) {
+        while (!searchOperation.done) {
+          try {
+            searchOperation.wait();
+          } catch (InterruptedException e) {
+            Log.d(LOG, "Interrupted.", e);
+          }
+        }
+      }
+    }
+    
     try {
+      Log.d(LOG, "Closing RAF.");
       dictRaf.close();
     } catch (IOException e) {
       Log.e(LOG, "Failed to close dictionary", e);
     }
+    dictRaf = null;
   }
 
   // --------------------------------------------------------------------------
@@ -348,37 +372,37 @@ public class DictionaryActivity extends ListActivity {
   public boolean onCreateOptionsMenu(final Menu menu) {
     
     {
-    final MenuItem preferences = menu.add(getString(R.string.preferences));
-    preferences.setOnMenuItemClickListener(new OnMenuItemClickListener() {
-      public boolean onMenuItemClick(final MenuItem menuItem) {
-        startActivity(new Intent(DictionaryActivity.this,
-            PreferenceActivity.class));
-        return false;
-      }
-    });
+      final MenuItem preferences = menu.add(getString(R.string.preferences));
+      preferences.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+        public boolean onMenuItemClick(final MenuItem menuItem) {
+          startActivity(new Intent(DictionaryActivity.this,
+              PreferenceActivity.class));
+          return false;
+        }
+      });
     }
 
     {
-    final MenuItem dictionaryList = menu.add(getString(R.string.dictionaryList));
-    dictionaryList.setOnMenuItemClickListener(new OnMenuItemClickListener() {
-      public boolean onMenuItemClick(final MenuItem menuItem) {
-        startActivity(DictionaryListActivity.getIntent(DictionaryActivity.this));
-        startActivity(DictionaryListActivity.getIntent(DictionaryActivity.this));
-        return false;
-      }
-    });
+      final MenuItem dictionaryList = menu.add(getString(R.string.dictionaryList));
+      dictionaryList.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+        public boolean onMenuItemClick(final MenuItem menuItem) {
+          startActivity(DictionaryListActivity.getIntent(DictionaryActivity.this));
+          finish();
+          return false;
+        }
+      });
     }
 
     {
-      final MenuItem dictionaryList = menu.add(getString(R.string.editDictionary));
-      dictionaryList.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+      final MenuItem dictionaryEdit = menu.add(getString(R.string.editDictionary));
+      dictionaryEdit.setOnMenuItemClickListener(new OnMenuItemClickListener() {
         public boolean onMenuItemClick(final MenuItem menuItem) {
           final Intent intent = DictionaryEditActivity.getIntent(dictIndex);
           startActivity(intent);
           return false;
         }
       });
-      }
+    }
 
     return true;
   }
@@ -458,6 +482,10 @@ public class DictionaryActivity extends ListActivity {
       }
       return true;
     }
+    if (keyCode == KeyEvent.KEYCODE_BACK) {
+      Log.d(LOG, "Clearing dictionary prefs.");
+      DictionaryActivity.clearDictionaryPrefs(this);
+    }
     return super.onKeyDown(keyCode, event);
   }
 
@@ -518,6 +546,8 @@ public class DictionaryActivity extends ListActivity {
 
     Index.IndexEntry searchResult;
     
+    boolean done = false;
+    
     SearchOperation(final String searchText, final Index index) {
       this.searchText = searchText.trim();
       this.index = index;
@@ -529,18 +559,25 @@ public class DictionaryActivity extends ListActivity {
 
     @Override
     public void run() {
-      searchStartMillis = System.currentTimeMillis();
-      searchResult = index.findInsertionPoint(searchText, interrupted);
-      Log.d(LOG, "searchText=" + searchText + ", searchDuration="
-          + (System.currentTimeMillis() - searchStartMillis) + ", interrupted="
-          + interrupted.get());
-      if (!interrupted.get()) {
-        uiHandler.post(new Runnable() {
-          @Override
-          public void run() {            
-            searchFinished(SearchOperation.this);
-          }
-        });
+      try {
+        searchStartMillis = System.currentTimeMillis();
+        searchResult = index.findInsertionPoint(searchText, interrupted);
+        Log.d(LOG, "searchText=" + searchText + ", searchDuration="
+            + (System.currentTimeMillis() - searchStartMillis) + ", interrupted="
+            + interrupted.get());
+        if (!interrupted.get()) {
+          uiHandler.post(new Runnable() {
+            @Override
+            public void run() {            
+              searchFinished(SearchOperation.this);
+            }
+          });
+        }
+      } finally {
+        synchronized (this) {
+          done = true;
+          this.notifyAll();
+        }
       }
     }
   }
@@ -650,6 +687,10 @@ public class DictionaryActivity extends ListActivity {
   // --------------------------------------------------------------------------
 
   void onSearchTextChange(final String text) {
+    if (dictRaf == null) {
+      Log.d(LOG, "searchText changed during shutdown, doing nothing.");
+      return;
+    }
     if (!searchText.isFocused()) {
       Log.d(LOG, "searchText changed without focus, doing nothing.");
       return;
diff --git a/src/com/hughes/android/dictionary/DictionaryActivityOld.java.old b/src/com/hughes/android/dictionary/DictionaryActivityOld.java.old
deleted file mode 100644
index 662ed15..0000000
--- a/src/com/hughes/android/dictionary/DictionaryActivityOld.java.old
+++ /dev/null
@@ -1,739 +0,0 @@
-package com.hughes.android.dictionary;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.RandomAccessFile;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import android.app.ListActivity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.graphics.Typeface;
-import android.os.Bundle;
-import android.os.Handler;
-import android.preference.PreferenceManager;
-import android.text.ClipboardManager;
-import android.text.Editable;
-import android.text.Spannable;
-import android.text.TextWatcher;
-import android.text.style.StyleSpan;
-import android.util.Log;
-import android.view.ContextMenu;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.MenuItem.OnMenuItemClickListener;
-import android.view.View.OnClickListener;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ListView;
-import android.widget.TableLayout;
-import android.widget.TableRow;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.hughes.android.dictionary.engine.Dictionary;
-import com.hughes.android.dictionary.engine.Language;
-import com.ibm.icu.text.Collator;
-
-public class DictionaryActivityOld extends ListActivity {
-  
-  // TO DO:
-  // * Easy reverse lookup.
-  // * 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).
-
-  static final String LOG = "QuickDic";
-  static final String PREF_DICT_ACTIVE_LANG = "DICT_DIR_PREF";
-  static final String PREF_ACTIVE_SEARCH_TEXT = "ACTIVE_WORD_PREF";
-
-  // package for test.
-  final Handler uiHandler = new Handler();
-  private final Executor searchExecutor = Executors.newSingleThreadExecutor();
-
-  EditText searchText;
-  Button langButton;
-  int lastSelectedRow = 0;  // TODO: I'm evil.
-
-  private boolean prefsMightHaveChanged = true;
-
-  // Never null.
-  private File wordList = null;
-  private RandomAccessFile dictRaf = null;
-  private Dictionary dictionary = null;
-  private boolean saveOnlyFirstSubentry = false;
-
-  // Visible for testing.
-  IndexAdapter indexAdapter = null;
-  private SearchOperation searchOperation = null;
-  
-  public DictionaryActivity() {
-
-    searchExecutor.execute(new Runnable() {
-      public void run() {
-        final long startMillis = System.currentTimeMillis();
-        for (final String lang : Arrays.asList("EN", "DE")) {
-          Language.lookup(lang).getFindCollator(); 
-          final Collator c = Language.lookup(lang).getSortCollator(); 
-          if (c.compare("pre-print", "preppy") >= 0) {
-            Log.e(LOG, c.getClass() + " is buggy, lookups may not work properly.");
-          }
-        }
-        Log.d(LOG, "Loading collators took:" + (System.currentTimeMillis() - startMillis));
-      }
-    });
-
-  }
-
-  /** Called when the activity is first created. */
-  @Override
-  public void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    Log.d(LOG, "onCreate:" + this);
-
-    try {
-      initDictionaryAndPrefs();
-    } catch (Exception e) {
-      return;
-    }
-
-    // UI init.
-
-    setContentView(R.layout.dictionary_activity);
-    searchText = (EditText) findViewById(R.id.SearchText);
-    langButton = (Button) findViewById(R.id.LangButton);
-    
-    searchText.addTextChangedListener(new SearchTextWatcher());
-    
-    getListView().setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-      public void onItemSelected(AdapterView<?> arg0, View arg1, int row,
-          long arg3) {
-        setSelectedRow(row);
-      }
-      public void onNothingSelected(AdapterView<?> arg0) {
-      }
-    });
-    
-    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) {
-        onClearSearchTextButton(clearSearchTextButton);
-      }
-    });
-    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) {
-        onUpButton();
-      }
-    });
-    final Button downButton = (Button) findViewById(R.id.DownButton);
-    downButton.setOnClickListener(new OnClickListener() {
-      public void onClick(View v) {
-        onDownButton();
-      }
-    });
-
-    // ContextMenu.
-    registerForContextMenu(getListView());
-
-    updateLangButton();
-  }
-  
-  private void initDictionaryAndPrefs() throws Exception {
-    if (!prefsMightHaveChanged) {
-      return;
-    }
-    closeCurrentDictionary();
-    
-    final SharedPreferences prefs = PreferenceManager
-        .getDefaultSharedPreferences(this);
-    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()) {
-        throw new IOException("Unable to read dictionary file.");
-      }
-      
-      dictRaf = new RandomAccessFile(dictFile, "r");
-      final long startMillis = System.currentTimeMillis();
-      dictionary = new Dictionary(dictRaf);
-      Log.d(LOG, "Read dictionary millis: " + (System.currentTimeMillis() - startMillis));
-    } catch (IOException e) {
-      Log.e(LOG, "Couldn't open dictionary.", e);
-      
-      this.startActivity(new asdfIntent(this, DictionaryEditActivity.class));
-      finish();
-    }
-    
-    final byte lang = prefs.getInt(PREF_DICT_ACTIVE_LANG, SimpleEntry.LANG1) == SimpleEntry.LANG1 ? SimpleEntry.LANG1
-        : SimpleEntry.LANG2;
-    
-    indexAdapter = new IndexAdapter(dictionary.languageDatas[lang]);
-    setListAdapter(indexAdapter);
-    prefsMightHaveChanged = false;
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-    Log.d(LOG, "onResume:" + this);
-
-    try {
-      initDictionaryAndPrefs();
-    } catch (Exception e) {
-      return;
-    }
-    
-    final SharedPreferences prefs = PreferenceManager
-        .getDefaultSharedPreferences(this);
-    final String searchTextString = prefs
-        .getString(PREF_ACTIVE_SEARCH_TEXT, "");
-    searchText.setText(searchTextString);
-    getListView().requestFocus();
-    onSearchTextChange(searchTextString);
-  }
-
-  @Override
-  public void onPause() {
-    super.onPause();
-    Log.d(LOG, "onPause:" + this);
-    final Editor prefs = PreferenceManager.getDefaultSharedPreferences(this)
-        .edit();
-    prefs.putInt(PREF_DICT_ACTIVE_LANG, indexAdapter.languageData.lang);
-    prefs.putString(PREF_ACTIVE_SEARCH_TEXT, searchText.getText().toString());
-    prefs.commit();
-  }
-
-  @Override
-  public void onStop() {
-    super.onStop();
-    Log.d(LOG, "onStop:" + this);
-    if (isFinishing()) {
-      Log.i(LOG, "isFinishing()==true, closing dictionary.");
-      closeCurrentDictionary();
-    }
-  }
-
-  private void closeCurrentDictionary() {
-    Log.i(LOG, "closeCurrentDictionary");
-    if (dictionary == null) {
-      return;
-    }
-    waitForSearchEnd();
-    indexAdapter = null;
-    setListAdapter(null);
-    Log.d(LOG, "setListAdapter finished.");
-    dictionary = null;
-    try {
-      if (dictRaf != null) {
-        dictRaf.close();
-      }
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-    dictRaf = null;
-  }
-
-  public String getSelectedRowRawText(final boolean onlyFirstSubentry) {
-    final Row row = indexAdapter.languageData.rows.get(getSelectedRow());
-    return indexAdapter.languageData.rowToString(row, onlyFirstSubentry);
-  }
-
-  // ----------------------------------------------------------------
-  // OptionsMenu
-  // ----------------------------------------------------------------
-
-  private MenuItem switchLanguageMenuItem = null;
-
-  @Override
-  public boolean onCreateOptionsMenu(final Menu menu) {
-    switchLanguageMenuItem = menu.add(getString(R.string.switchToLanguage));
-    switchLanguageMenuItem
-        .setOnMenuItemClickListener(new OnMenuItemClickListener() {
-          public boolean onMenuItemClick(final MenuItem menuItem) {
-            onLanguageButton();
-            return false;
-          }
-        });
-
-    final MenuItem preferences = menu.add(getString(R.string.preferences));
-    preferences.setOnMenuItemClickListener(new OnMenuItemClickListener() {
-      public boolean onMenuItemClick(final MenuItem menuItem) {
-        prefsMightHaveChanged = true;
-        startActivity(new Intent(DictionaryActivity.this,
-            PreferenceActivity.class));
-        return false;
-      }
-    });
-
-    final MenuItem about = menu.add(getString(R.string.about));
-    about.setOnMenuItemClickListener(new OnMenuItemClickListener() {
-      public boolean onMenuItemClick(final MenuItem menuItem) {
-        final Intent intent = new Intent().setClassName(AboutActivity.class
-            .getPackage().getName(), AboutActivity.class.getCanonicalName());
-        final String currentDictInfo;
-        if (dictionary == null) {
-          currentDictInfo = getString(R.string.noDictLoaded);
-        } else {
-          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());
-        startActivity(intent);
-        return false;
-      }
-    });
-
-    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;
-      }
-    });
-
-    return true;
-  }
-
-  @Override
-  public boolean onPrepareOptionsMenu(final Menu menu) {
-    switchLanguageMenuItem.setTitle(getString(R.string.switchToLanguage,
-        dictionary.languageDatas[SimpleEntry
-            .otherLang(indexAdapter.languageData.lang)].language.symbol));
-    return super.onPrepareOptionsMenu(menu);
-  }
-  
-  void updateLangButton() {
-    langButton.setText(indexAdapter.languageData.language.symbol);
-  }
-
-  // ----------------------------------------------------------------
-  // Event handlers.
-  // ----------------------------------------------------------------
-  
-  void onLanguageButton() {
-    waitForSearchEnd();
-    indexAdapter = new IndexAdapter(
-        dictionary.languageDatas[(indexAdapter.languageData == dictionary.languageDatas[0]) ? 1
-            : 0]);
-    Log.d(LOG, "onLanguageButton, newLang=" + indexAdapter.languageData.language.symbol);
-    setListAdapter(indexAdapter);
-    updateLangButton();
-    onSearchTextChange(searchText.getText().toString());
-  }
-
-  void onUpButton() {
-    final int destRowIndex = indexAdapter.languageData.getPrevTokenRow(getSelectedRow());
-    Log.d(LOG, "onUpButton, destRowIndex=" + destRowIndex);
-    jumpToRow(indexAdapter, destRowIndex);
-  }
-
-  void onDownButton() {
-    final int destRowIndex = indexAdapter.languageData.getNextTokenRow(getSelectedRow());
-    Log.d(LOG, "onDownButton, destRowIndex=" + destRowIndex);
-    jumpToRow(indexAdapter, destRowIndex);
-  }
-
-  void onAppendToWordList() {
-    final int row = getSelectedRow();
-    if (row < 0) {
-      return;
-    }
-    final StringBuilder rawText = new StringBuilder();
-    final String word = indexAdapter.languageData.getIndexEntryForRow(row).word;
-    rawText.append(
-        new SimpleDateFormat("yyyy.MM.dd HH:mm:ss").format(new Date()))
-        .append("\t");
-    rawText.append(word).append("\t");
-    rawText.append(getSelectedRowRawText(saveOnlyFirstSubentry));
-    Log.d(LOG, "Writing : " + rawText);
-    try {
-      wordList.getParentFile().mkdirs();
-      final PrintWriter out = new PrintWriter(
-          new FileWriter(wordList, true));
-      out.println(rawText.toString());
-      out.close();
-    } catch (IOException e) {
-      Log.e(LOG, "Unable to append to " + wordList.getAbsolutePath(), e);
-      Toast.makeText(this, getString(R.string.failedAddingToWordList, wordList.getAbsolutePath()), Toast.LENGTH_LONG);
-    }
-    return;
-  }
-
-  void onCopy() {
-    final int row = getSelectedRow();
-    if (row < 0) {
-      return;
-    }
-    Log.d(LOG, "Copy." + DictionaryActivity.this.getSelectedRow());
-    final StringBuilder result = new StringBuilder();
-    result.append(getSelectedRowRawText(false));
-    final ClipboardManager clipboardManager = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-    clipboardManager.setText(result.toString());
-    Log.d(LOG, "Copied: " + result);
-  }
-
-  @Override
-  public boolean onKeyDown(int keyCode, KeyEvent event) {
-    if (event.getUnicodeChar() != 0) {
-      if (!searchText.hasFocus()) {
-        searchText.setText("" + (char) event.getUnicodeChar());
-        onSearchTextChange(searchText.getText().toString());
-        searchText.requestFocus();
-      }
-      return true;
-    }
-    return super.onKeyDown(keyCode, event);
-  }
-
-  @Override
-  protected void onListItemClick(ListView l, View v, int row, long id) {
-    setSelectedRow(row);
-    openContextMenu(getListView());
-  }
-
-  void onSearchTextChange(final String searchText) {
-    Log.d(LOG, "onSearchTextChange: " + searchText);
-    synchronized (this) {
-      searchOperation = new SearchOperation(indexAdapter, searchText.trim(), searchOperation);
-      searchExecutor.execute(searchOperation);
-    }
-  }
-
-  private void onClearSearchTextButton(final Button clearSearchTextButton) {
-    clearSearchTextButton.requestFocus();
-    searchText.setText("");
-    searchText.requestFocus();
-    Log.d(LOG, "Trying to show soft keyboard.");
-    final InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-    manager.showSoftInput(searchText, InputMethodManager.SHOW_IMPLICIT);
-  }
-
-  // ----------------------------------------------------------------
-  // ContextMenu
-  // ----------------------------------------------------------------
-
-  @Override
-  public void onCreateContextMenu(ContextMenu menu, View v,
-      ContextMenuInfo menuInfo) {
-    final int row = getSelectedRow();
-    if (row < 0) {
-      return;
-    }
-
-    final MenuItem addToWordlist = menu.add(getString(R.string.addToWordList, wordList.getName()));
-    addToWordlist.setOnMenuItemClickListener(new OnMenuItemClickListener() {
-      public boolean onMenuItemClick(MenuItem item) {
-        onAppendToWordList();
-        return false;
-      }
-    });
-
-    final MenuItem copy = menu.add(android.R.string.copy);
-    copy.setOnMenuItemClickListener(new OnMenuItemClickListener() {
-      public boolean onMenuItemClick(MenuItem item) {
-        onCopy();
-        return false;
-      }
-    });
-
-  }
-
-  private void jumpToRow(final IndexAdapter dictionaryListAdapter,
-      final int rowIndex) {
-    Log.d(LOG, "jumpToRow: " + rowIndex);
-    if (dictionaryListAdapter != this.indexAdapter) {
-      Log.w(LOG, "skipping jumpToRow for old list adapter: " + rowIndex);
-      return;
-    }
-    setSelection(rowIndex);
-    setSelectedRow(rowIndex);
-    getListView().setSelected(true);
-  }
-  
-  // TODO: delete me somehow.
-  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");
-    final int selectedRowIndex = getSelectedRow();
-    if (!searchText.hasFocus()) {
-      if (selectedRowIndex >= 0) {
-        final String word = indexAdapter.languageData
-            .getIndexEntryForRow(selectedRowIndex).word;
-        if (!word.equals(searchText.getText().toString())) {
-          Log.d(LOG, "updateSearchText: setText: " + word);
-          searchText.setText(word);
-        }
-      } else {
-        Log.w(LOG, "updateSearchText: nothing selected.");
-      }
-    }
-  }
-
-  static void startDownloadDictActivity(final Context context) {
-    final Intent intent = new Intent(context, DownloadActivity.class);
-    final SharedPreferences prefs = PreferenceManager
-        .getDefaultSharedPreferences(context);
-    final String dictFetchUrl = prefs.getString(context
-        .getString(R.string.dictFetchUrlKey), context
-        .getString(R.string.dictFetchUrlDefault));
-    final String dictFileName = prefs.getString(context
-        .getString(R.string.dictFileKey), context
-        .getString(R.string.dictFileDefault));
-    intent.putExtra(DownloadActivity.SOURCE, dictFetchUrl);
-    intent.putExtra(DownloadActivity.DEST, dictFileName);
-    context.startActivity(intent);
-  }
-
-  class IndexAdapter extends BaseAdapter {
-
-    // Visible for testing.
-    final LanguageData languageData;
-
-    IndexAdapter(final LanguageData languageData) {
-      this.languageData = languageData;
-    }
-
-    public int getCount() {
-      return languageData.rows.size();
-    }
-
-    public Dictionary.Row getItem(int rowIndex) {
-      assert rowIndex < languageData.rows.size();
-      return languageData.rows.get(rowIndex);
-    }
-
-    public long getItemId(int rowIndex) {
-      return rowIndex;
-    }
-
-    public View getView(final int rowIndex, final View convertView,
-        final ViewGroup parent) {
-      final Row row = getItem(rowIndex);
-
-      // Token row.
-      if (row.isToken()) {
-        TextView result = null;
-        if (convertView instanceof TextView) {
-          result = (TextView) convertView;
-        } else {
-          result = new TextView(parent.getContext());
-        }
-        if (row == null) {
-          return result;
-        }
-        result.setText(languageData.rowToString(row, false));
-        result.setTextAppearance(parent.getContext(),
-            android.R.style.TextAppearance_Large);
-        result.setClickable(false);
-        return result;
-      }
-
-      // Entry row(s).
-      final TableLayout result = new TableLayout(parent.getContext());
-
-      final SimpleEntry entry = new SimpleEntry(null, null);//.entries.get(row.getIndex());
-      final int rowCount = entry.getRowCount();
-      for (int r = 0; r < rowCount; ++r) {
-        final TableRow tableRow = new TableRow(result.getContext());
-
-        TextView column1 = new TextView(tableRow.getContext());
-        TextView column2 = new TextView(tableRow.getContext());
-        final TableRow.LayoutParams layoutParams = new TableRow.LayoutParams();
-        layoutParams.weight = 0.5f;
-
-        if (r > 0) {
-          final TextView spacer = new TextView(tableRow.getContext());
-          spacer.setText(r == 0 ? "� " : " � ");
-          tableRow.addView(spacer);
-        }
-        tableRow.addView(column1, layoutParams);
-        if (r > 0) {
-          final TextView spacer = new TextView(tableRow.getContext());
-          spacer.setText(r == 0 ? "� " : " � ");
-          tableRow.addView(spacer);
-        }
-        tableRow.addView(column2, layoutParams);
-
-        column1.setWidth(1);
-        column2.setWidth(1);
-        // column1.setTextAppearance(parent.getContext(), android.R.style.Text);
-
-        // TODO: color words by gender
-        final String col1Text = entry.getAllText(languageData.lang)[r];
-        column1.setText(col1Text, TextView.BufferType.SPANNABLE);
-        final Spannable col1Spannable = (Spannable) column1.getText();
-        int startPos = 0;
-        final String token = languageData.getIndexEntryForRow(rowIndex).word;
-        while ((startPos = col1Text.indexOf(token, startPos)) != -1) {
-          col1Spannable.setSpan(new StyleSpan(Typeface.BOLD), startPos,
-              startPos + token.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
-          startPos += token.length();
-        }
-
-        column2.setText(
-            entry.getAllText(SimpleEntry.otherLang(languageData.lang))[r],
-            TextView.BufferType.NORMAL);
-
-        result.addView(tableRow);
-      }
-
-      return result;
-    }
-
-  } // DictionaryListAdapter
-
-  private final class SearchOperation implements Runnable {
-    SearchOperation previousSearchOperation;
-    
-    final IndexAdapter listAdapter;
-    final LanguageData languageData;
-    final String searchText;
-    final AtomicBoolean interrupted = new AtomicBoolean(false);
-    boolean searchFinished = false;
-
-    SearchOperation(final IndexAdapter listAdapter,
-        final String searchText, final SearchOperation previousSearchOperation) {
-      this.listAdapter = listAdapter;
-      this.languageData = listAdapter.languageData;
-      this.searchText = searchText;
-      this.previousSearchOperation = previousSearchOperation;
-    }
-
-    public void run() {
-      if (previousSearchOperation != null) {
-        previousSearchOperation.stopAndWait();
-      }
-      previousSearchOperation = null;
-      
-      Log.d(LOG, "SearchOperation: " + searchText);
-      final int indexLocation = languageData.lookup(searchText, interrupted);
-      if (!interrupted.get()) {
-        final IndexEntry indexEntry = languageData.sortedIndex.get(indexLocation);
-        
-        Log.d(LOG, "SearchOperation completed: " + indexEntry.toString());
-        uiHandler.post(new Runnable() {
-          public void run() {
-            // Check is just a performance operation.
-            if (!interrupted.get()) {
-              // This is safe, because it checks that the listAdapter hasn't changed.
-              jumpToRow(listAdapter, indexEntry.startRow);
-            }
-            synchronized (DictionaryActivity.this) {
-              searchOperation = null;
-              DictionaryActivity.this.notifyAll();
-            }
-          }
-        });
-      }      
-      synchronized (this) {
-        searchFinished = true;
-        this.notifyAll();
-      }
-    }
-    
-    private void stopAndWait() {
-      interrupted.set(true);
-      synchronized (this) {
-        while (!searchFinished) {
-          Log.d(LOG, "stopAndWait: " + searchText);
-          try {
-            this.wait();
-          } catch (InterruptedException e) {
-            Log.e(LOG, "Interrupted", e);
-          }
-        }
-      }
-    }
-  }  // SearchOperation
-
-  void waitForSearchEnd() {
-    synchronized (this) {
-      while (searchOperation != null) {
-        Log.d(LOG, "waitForSearchEnd");
-        try {
-          this.wait();
-        } catch (InterruptedException e) {
-          Log.e(LOG, "Interrupted.", e);
-        }
-      }
-    }
-  }
-
-  private class SearchTextWatcher implements TextWatcher {
-    public void afterTextChanged(final Editable searchTextEditable) {
-      Log.d(LOG, "Search text changed: " + searchText.getText().toString());
-      if (searchText.hasFocus()) {
-        // If they were typing to cause the change, update the UI.
-        onSearchTextChange(searchText.getText().toString());
-      }
-    }
-
-    public void beforeTextChanged(CharSequence arg0, int arg1, int arg2,
-        int arg3) {
-    }
-
-    public void onTextChanged(CharSequence arg0, int arg1, int arg2, int arg3) {
-    }
-  }
-
-}
\ No newline at end of file
diff --git a/src/com/hughes/android/dictionary/DictionaryConfig.java b/src/com/hughes/android/dictionary/DictionaryConfig.java
index 3ef6333..8577e14 100644
--- a/src/com/hughes/android/dictionary/DictionaryConfig.java
+++ b/src/com/hughes/android/dictionary/DictionaryConfig.java
@@ -13,12 +13,4 @@ public class DictionaryConfig implements Serializable {
   int openIndex = 0;
   String openWord = "";
   
-  static DictionaryConfig defaultConfig() {
-    final DictionaryConfig result = new DictionaryConfig();
-    result.name = "DE<->EN";
-    result.downloadUrl = "http://www.stanford.edu/~egirard/dict/de-en.2.dict";
-    result.localFile = "/sdcard/quickDic/de-en.dict";
-    return result;
-  }
-  
 }
diff --git a/src/com/hughes/android/dictionary/DictionaryEditActivity.java b/src/com/hughes/android/dictionary/DictionaryEditActivity.java
index cc21132..9a450ee 100644
--- a/src/com/hughes/android/dictionary/DictionaryEditActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryEditActivity.java
@@ -8,12 +8,17 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Handler;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
 import android.view.MenuItem.OnMenuItemClickListener;
+import android.view.View.OnClickListener;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
@@ -27,6 +32,8 @@ public class DictionaryEditActivity extends Activity {
 
   QuickDicConfig quickDicConfig;
   private DictionaryConfig dictionaryConfig;
+  
+  final Handler uiHandler = new Handler();
 
   public static Intent getIntent(final int dictIndex) {
     final Intent intent = new Intent();
@@ -39,17 +46,20 @@ public class DictionaryEditActivity extends Activity {
   /** Called when the activity is first created. */
   @Override
   public void onCreate(final Bundle savedInstanceState) {
+    ((DictionaryApplication)getApplication()).applyTheme(this);
+
     super.onCreate(savedInstanceState);
     setContentView(R.layout.edit_activity);
 
     final Intent intent = getIntent();
 
+    final int dictIndex = intent.getIntExtra(C.DICT_INDEX, 0);
+      
     PersistentObjectCache.init(this);
     try {
       quickDicConfig = PersistentObjectCache.init(this).read(
           C.DICTIONARY_CONFIGS, QuickDicConfig.class);
-      dictionaryConfig = quickDicConfig.dictionaryConfigs.get(intent
-          .getIntExtra(C.DICT_INDEX, 0));
+      dictionaryConfig = quickDicConfig.dictionaryConfigs.get(dictIndex);
     } catch (Exception e) {
       Log.e(LOG, "Failed to read QuickDicConfig.", e);
       quickDicConfig = new QuickDicConfig();
@@ -62,29 +72,55 @@ public class DictionaryEditActivity extends Activity {
         .setText(dictionaryConfig.name);
     ((EditText) findViewById(R.id.localFile))
         .setText(dictionaryConfig.localFile);
-    ((EditText) findViewById(R.id.downloadUrl))
-        .setText(dictionaryConfig.downloadUrl);
 
-    updateDictInfo();
-    ((EditText) findViewById(R.id.localFile))
-        .addTextChangedListener(new TextWatcher() {
-          @Override
-          public void onTextChanged(CharSequence s, int start, int before,
-              int count) {
-          }
+    final TextWatcher textWatcher = new TextWatcher() {
+      @Override
+      public void onTextChanged(CharSequence s, int start, int before,
+          int count) {
+      }
 
-          @Override
-          public void beforeTextChanged(CharSequence s, int start, int count,
-              int after) {
-          }
+      @Override
+      public void beforeTextChanged(CharSequence s, int start, int count,
+          int after) {
+      }
 
-          @Override
-          public void afterTextChanged(Editable s) {
-            updateDictInfo();
-          }
-        });
+      @Override
+      public void afterTextChanged(Editable s) {
+        updateDictInfo();
+      }
+    };
+
+    ((EditText) findViewById(R.id.localFile)).addTextChangedListener(textWatcher);
+
+    final EditText downloadUrl = (EditText) findViewById(R.id.downloadUrl);
+    downloadUrl.setText(dictionaryConfig.downloadUrl);
+    downloadUrl.addTextChangedListener(textWatcher);
+    
+    final Button downloadButton = (Button) findViewById(R.id.downloadButton);
+    downloadButton.setOnClickListener(new OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        startDownloadDictActivity(DictionaryEditActivity.this,
+            dictionaryConfig);
+      }
+    });
+
+    final Button openButton = (Button) findViewById(R.id.openButton);
+    openButton.setOnClickListener(new OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        final Intent intent = DictionaryActivity.getIntent(DictionaryEditActivity.this, dictIndex, 0, "");
+        startActivity(intent);
+      }
+    });
 
   }
+  
+  protected void onResume() {
+    super.onResume();
+    
+    updateDictInfo();
+  }
 
   @Override
   protected void onPause() {
@@ -105,23 +141,39 @@ public class DictionaryEditActivity extends Activity {
   public boolean onCreateOptionsMenu(final Menu menu) {
     final MenuItem newDictionaryMenuItem = menu
         .add(R.string.downloadDictionary);
-    newDictionaryMenuItem
-        .setOnMenuItemClickListener(new OnMenuItemClickListener() {
+    newDictionaryMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
           public boolean onMenuItemClick(final MenuItem menuItem) {
             startDownloadDictActivity(DictionaryEditActivity.this,
                 dictionaryConfig);
             return false;
           }
         });
+    
+    final MenuItem dictionaryList = menu.add(getString(R.string.dictionaryList));
+    dictionaryList.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+      public boolean onMenuItemClick(final MenuItem menuItem) {
+        startActivity(DictionaryListActivity.getIntent(DictionaryEditActivity.this));
+        return false;
+      }
+    });
+
 
     return true;
   }
 
   void updateDictInfo() {
-    final TextView dictInfo = (TextView) findViewById(R.id.dictionaryInfo);
+    final String downloadUrl = ((EditText) findViewById(R.id.downloadUrl))
+        .getText().toString();
     final String localFile = ((EditText) findViewById(R.id.localFile))
         .getText().toString();
 
+    final Button downloadButton = (Button) findViewById(R.id.downloadButton);
+    downloadButton.setEnabled(downloadUrl.length() > 0 && localFile.length() > 0);
+
+    final Button openButton = (Button) findViewById(R.id.openButton);
+    openButton.setEnabled(false);
+
+    final TextView dictInfo = (TextView) findViewById(R.id.dictionaryInfo);
     if (!new File(localFile).canRead()) {
       dictInfo.setText(getString(R.string.fileNotFound, localFile));
       return;
@@ -146,6 +198,8 @@ public class DictionaryEditActivity extends Activity {
       }
       raf.close();
       dictInfo.setText(builder.toString());
+      openButton.setEnabled(true);
+      
     } catch (IOException e) {
       dictInfo.setText(getString(R.string.invalidDictionary, localFile, e
           .toString()));
@@ -156,8 +210,17 @@ public class DictionaryEditActivity extends Activity {
       final DictionaryConfig dictionaryConfig) {
     final Intent intent = new Intent(context, DownloadActivity.class);
     intent.putExtra(DownloadActivity.SOURCE, dictionaryConfig.downloadUrl);
-    intent.putExtra(DownloadActivity.DEST, dictionaryConfig.localFile);
+    intent.putExtra(DownloadActivity.DEST, dictionaryConfig.localFile + ".zip");
     context.startActivity(intent);
   }
+  
+  @Override
+  public boolean onKeyDown(final int keyCode, final KeyEvent event) {
+    if (keyCode == KeyEvent.KEYCODE_BACK) {
+      Log.d(LOG, "Clearing dictionary prefs.");
+      DictionaryActivity.clearDictionaryPrefs(this);
+    }
+    return super.onKeyDown(keyCode, event);
+  }
 
 }
diff --git a/src/com/hughes/android/dictionary/DictionaryListActivity.java b/src/com/hughes/android/dictionary/DictionaryListActivity.java
index 29ec4b8..286f249 100644
--- a/src/com/hughes/android/dictionary/DictionaryListActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryListActivity.java
@@ -34,6 +34,8 @@ public class DictionaryListActivity extends ListActivity {
   
   
   public void onCreate(Bundle savedInstanceState) {
+    ((DictionaryApplication)getApplication()).applyTheme(this);
+
     super.onCreate(savedInstanceState);
     Log.d(LOG, "onCreate:" + this);
 
@@ -52,7 +54,7 @@ public class DictionaryListActivity extends ListActivity {
     registerForContextMenu(getListView());
 
     final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-    final int introMessageId = 0;
+    final int introMessageId = -1;
     if (prefs.getInt(C.INTRO_MESSAGE_SHOWN, 0) < introMessageId) {
       final AlertDialog.Builder builder = new AlertDialog.Builder(this);
       builder.setCancelable(false);
@@ -81,8 +83,9 @@ public class DictionaryListActivity extends ListActivity {
     
     final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
     if (prefs.contains(C.DICT_INDEX) && prefs.contains(C.INDEX_INDEX)) {
+      Log.d(LOG, "Skipping Dictionary List, going straight to dictionary.");
       startActivity(DictionaryActivity.getIntent(this, prefs.getInt(C.DICT_INDEX, 0), prefs.getInt(C.INDEX_INDEX, 0), prefs.getString(C.SEARCH_TOKEN, "")));
-      finish();
+      //finish();
       return;
     }
 
@@ -91,6 +94,11 @@ public class DictionaryListActivity extends ListActivity {
       quickDicConfig = new QuickDicConfig();
       PersistentObjectCache.getInstance().write(C.DICTIONARY_CONFIGS, quickDicConfig);
     }
+    if (quickDicConfig.currentVersion < QuickDicConfig.LATEST_VERSION) {
+      Log.d(LOG, "Dictionary list is old, updating it.");
+      quickDicConfig.addDefaultDictionaries();
+      quickDicConfig.currentVersion = QuickDicConfig.LATEST_VERSION;
+    }
 
     setListAdapter(new Adapter());
     
@@ -107,6 +115,34 @@ public class DictionaryListActivity extends ListActivity {
             return false;
           }
         });
+
+    final MenuItem addDefaultDictionariesMenuItem = menu.add(R.string.addDefaultDictionaries);
+    addDefaultDictionariesMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+          public boolean onMenuItemClick(final MenuItem menuItem) {
+            quickDicConfig.addDefaultDictionaries();
+            dictionaryConfigsChanged();
+            return false;
+          }
+        });
+
+    final MenuItem about = menu.add(getString(R.string.about));
+    about.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+      public boolean onMenuItemClick(final MenuItem menuItem) {
+        final Intent intent = new Intent().setClassName(AboutActivity.class
+            .getPackage().getName(), AboutActivity.class.getCanonicalName());
+        startActivity(intent);
+        return false;
+      }
+    });
+    
+    final MenuItem preferences = menu.add(getString(R.string.preferences));
+    preferences.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+      public boolean onMenuItemClick(final MenuItem menuItem) {
+        startActivity(new Intent(DictionaryListActivity.this,
+            PreferenceActivity.class));
+        return false;
+      }
+    });
     
     return true;
   }
diff --git a/src/com/hughes/android/dictionary/DownloadActivity.java b/src/com/hughes/android/dictionary/DownloadActivity.java
index 9ad663a..a783402 100755
--- a/src/com/hughes/android/dictionary/DownloadActivity.java
+++ b/src/com/hughes/android/dictionary/DownloadActivity.java
@@ -4,11 +4,14 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -25,7 +28,7 @@ public class DownloadActivity extends Activity {
 
   String source;
   String dest;
-  long bytesDownloaded = 0;
+  long bytesProcessed = 0;
   long contentLength = -1;
 
   private final Executor downloadExecutor = Executors.newSingleThreadExecutor();
@@ -36,6 +39,8 @@ public class DownloadActivity extends Activity {
   /** Called when the activity is first created. */
   @Override
   public void onCreate(final Bundle savedInstanceState) {
+    ((DictionaryApplication)getApplication()).applyTheme(this);
+
     super.onCreate(savedInstanceState);
     final Intent intent = getIntent();
     source = intent.getStringExtra(SOURCE);
@@ -54,57 +59,75 @@ public class DownloadActivity extends Activity {
     final ProgressBar progressBar = (ProgressBar) findViewById(R.id.downloadProgressBar);
     progressBar.setIndeterminate(false);
     progressBar.setMax(100);
-
-    final InputStream in;
-    final FileOutputStream out;
-
-    final File destFile = new File(dest);
-    final File destTmpFile;
-    try {
-      destTmpFile = File.createTempFile("dictionaryDownload", "tmp", destFile
-          .getParentFile());
-      destTmpFile.deleteOnExit();
-      final URL uri = new URL(source);
-      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);
-      setDownloadStatus(String.format(getString(R.string.errorDownloadingFile), e.getLocalizedMessage()));
-      return;
-    }
+    
+    bytesProcessed = 0;
+    contentLength = 100;
+    setDownloadStatus(getString(R.string.openingConnection));
 
     final Runnable runnable = new Runnable() {
       public void run() {
+
         try {
-          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);
-            bytesDownloaded += bytesRead;
-            if (count++ % 20 == 0) {
-              setDownloadStatus(getString(R.string.downloading,
-                  bytesDownloaded, contentLength));
-            }
-          }
-          in.close();
-          out.close();
+          final File destFile = new File(dest);
+          destFile.getParentFile().mkdirs();
+
+          final File destTmpFile = File.createTempFile("dictionaryDownload", "tmp", destFile
+              .getParentFile());
+          destTmpFile.deleteOnExit();
+
+          final URL uri = new URL(source);
+          final URLConnection connection = uri.openConnection();
+          contentLength = connection.getContentLength();
+          final InputStream in = connection.getInputStream();
+          final FileOutputStream out = new FileOutputStream(destTmpFile); 
+          int bytesRead = copyStream(in, out, R.string.downloading);
+          
           if (bytesRead == -1 && !stop.get()) {
             destFile.delete();
             destTmpFile.renameTo(destFile);
           } else {
            Log.d("THAD", "Stopped downloading file.");
           }
+          
+          if (dest.toLowerCase().endsWith(".zip")) {
+            final ZipFile zipFile = new ZipFile(destFile);
+            final File destUnzipped = new File(dest.substring(0, dest.length() - 4));
+            final ZipEntry zipEntry = zipFile.getEntry(destUnzipped.getName());
+            if (zipEntry != null) {
+              destUnzipped.delete();
+              Log.d("THAD", "Unzipping entry: " + zipEntry.getName() + " to " + destUnzipped);
+              final InputStream zipIn = zipFile.getInputStream(zipEntry);
+              final OutputStream zipOut = new FileOutputStream(destUnzipped);
+              contentLength = zipEntry.getSize();
+              bytesRead = copyStream(zipIn, zipOut, R.string.unzipping);
+            }
+          }
+          
           setDownloadStatus(String.format(getString(R.string.downloadFinished),
-              bytesDownloaded));
+              bytesProcessed));
         } catch (IOException e) {
           Log.e("THAD", "Error downloading file", e);
           setDownloadStatus(String.format(getString(R.string.errorDownloadingFile), e.getLocalizedMessage()));
         }
       }
+
+      private int copyStream(final InputStream in, final OutputStream out, final int messageId)
+          throws IOException {
+        bytesProcessed = 0;
+        int bytesRead;
+        final byte[] bytes = new byte[1024 * 16];
+        int count = 0;
+        while ((bytesRead = in.read(bytes)) != -1 && !stop.get()) {
+          out.write(bytes, 0, bytesRead);
+          bytesProcessed += bytesRead;
+          if (count++ % 20 == 0) {
+            setDownloadStatus(getString(messageId, bytesProcessed, contentLength));
+          }
+        }
+        in.close();
+        out.close();
+        return bytesRead;
+      }
     };
 
     downloadExecutor.execute(runnable);
@@ -121,7 +144,7 @@ public class DownloadActivity extends Activity {
       public void run() {
         final ProgressBar progressBar = (ProgressBar) findViewById(R.id.downloadProgressBar);
         if (contentLength > 0) {
-          progressBar.setProgress((int) (bytesDownloaded * 100 / contentLength));
+          progressBar.setProgress((int) (bytesProcessed * 100 / contentLength));
         }
         
         final TextView downloadStatus = (TextView) findViewById(R.id.downloadStatus);
diff --git a/src/com/hughes/android/dictionary/PreferenceActivity.java b/src/com/hughes/android/dictionary/PreferenceActivity.java
index 4863eaf..eae1497 100755
--- a/src/com/hughes/android/dictionary/PreferenceActivity.java
+++ b/src/com/hughes/android/dictionary/PreferenceActivity.java
@@ -5,7 +5,10 @@ import android.os.Bundle;
 public class PreferenceActivity extends android.preference.PreferenceActivity {
   @Override
   public void onCreate(Bundle savedInstanceState) {
+    ((DictionaryApplication)getApplication()).applyTheme(this);
+
     super.onCreate(savedInstanceState);
     addPreferencesFromResource(R.xml.preferences);
   }
+
 }
diff --git a/src/com/hughes/android/dictionary/QuickDicConfig.java b/src/com/hughes/android/dictionary/QuickDicConfig.java
index 79f88ec..602fc24 100644
--- a/src/com/hughes/android/dictionary/QuickDicConfig.java
+++ b/src/com/hughes/android/dictionary/QuickDicConfig.java
@@ -8,10 +8,41 @@ public final class QuickDicConfig implements Serializable {
   
   private static final long serialVersionUID = 6711617368780900979L;
   
+  static final int LATEST_VERSION = 1;
+  
   final List<DictionaryConfig> dictionaryConfigs = new ArrayList<DictionaryConfig>();
+  int currentVersion = LATEST_VERSION;
   
   public QuickDicConfig() {
-    dictionaryConfigs.add(DictionaryConfig.defaultConfig());
+    addDefaultDictionaries();
+  }
+
+  public void addDefaultDictionaries() {
+    {
+      final DictionaryConfig de_en_chemnitz = new DictionaryConfig();
+      de_en_chemnitz.name = "DE<->EN (Chemnitz)";
+      de_en_chemnitz.downloadUrl = "https://sites.google.com/site/quickdic/dictionaries-1/DE-EN_chemnitz.quickdic.zip?attredirects=0&d=1";
+      de_en_chemnitz.localFile = "/sdcard/quickDic/DE-EN_chemnitz.quickdic";
+      addOrReplace(de_en_chemnitz);
+    }
+
+    {
+      final DictionaryConfig en_it_wiktionary = new DictionaryConfig();
+      en_it_wiktionary.name = "EN<->IT (EN Wiktionary)";
+      en_it_wiktionary.downloadUrl = "https://sites.google.com/site/quickdic/dictionaries-1/EN-IT_enwiktionary.quickdic.zip?attredirects=0&d=1";
+      en_it_wiktionary.localFile = "/sdcard/quickDic/EN-IT_enwiktionary.quickdic";
+      addOrReplace(en_it_wiktionary);
+    }
+  }
+
+  private void addOrReplace(final DictionaryConfig dictionaryConfig) {
+    for (int i = 0; i < dictionaryConfigs.size(); ++i) {
+      if (dictionaryConfigs.get(i).name.equals(dictionaryConfig.name)) {
+        dictionaryConfigs.set(i, dictionaryConfig);
+        return;
+      }
+    }
+    dictionaryConfigs.add(dictionaryConfig);
   }
 
 }
diff --git a/src/com/hughes/android/dictionary/engine/Index.java b/src/com/hughes/android/dictionary/engine/Index.java
index f05c0dc..6284f18 100644
--- a/src/com/hughes/android/dictionary/engine/Index.java
+++ b/src/com/hughes/android/dictionary/engine/Index.java
@@ -157,6 +157,9 @@ public final class Index implements RAFSerializable<Index> {
     final Transliterator normalizer = normalizer();
     if (TransliteratorManager.init(null)) {
       token = normalizer.transliterate(token);
+    } else {
+      // Do our best since the Transliterators aren't up yet.
+      token = token.toLowerCase();
     }
 
     int start = 0;
diff --git a/src/com/hughes/android/dictionary/engine/TransliteratorManager.java b/src/com/hughes/android/dictionary/engine/TransliteratorManager.java
index 50a7ca6..cbe6b89 100644
--- a/src/com/hughes/android/dictionary/engine/TransliteratorManager.java
+++ b/src/com/hughes/android/dictionary/engine/TransliteratorManager.java
@@ -3,8 +3,6 @@ package com.hughes.android.dictionary.engine;
 import java.util.ArrayList;
 import java.util.List;
 
-import android.util.Log;
-
 import com.ibm.icu.text.Transliterator;
 
 public class TransliteratorManager {
diff --git a/todo.txt b/todo.txt
index 31a41ff..01ef3c9 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,10 +1,11 @@
+new version requires re-download of ~25MB dictionary file.
+
 * wiktionary
 * multi word search
 * source in context menu
 * quiz
 * link to leo, dict.cc
 * colorize things
-* better Row/Entry classes?
 * better tokenization?
 * test email
 * dict manager
@@ -13,3 +14,4 @@
 
 done:
 * sorting of entries
+* better Row/Entry classes?