Fixed add to wordlist on fresh install.

diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644 (file)
index f91507a..0000000
--- a/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Feb 16 14:09:53 PST 2012
-eclipse.preferences.version=1
-encoding//res/raw-de/whats_new.html=UTF-8

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fe91208d0a2a4ff5dd3a4fc109008d6d8e0aae46..a303ab17c9b7ad34c5115eaf825f3eaf73e4b1d3 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.hughes.android.dictionary"
     android:installLocation="auto"
-    android:versionCode="24"
-    android:versionName="5.0.0" >
+    android:versionCode="25"
+    android:versionName="5.0.1" >
 
     <uses-sdk
         android:minSdkVersion="10"

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 22a215c3485aef535bbfca728593dba73ca1527f..2c4a2ba296fc16136a8722a218f0913306c202ac 100644 (file)
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -2,8 +2,8 @@
 <resources>
 
     <string name="app_name">QuickDic</string>
-    <string name="titleWithVersion">QuickDic 5.0.0</string>
-    <string name="thanksForUpdatingVersion">5.0.0</string>
+    <string name="titleWithVersion">QuickDic 5.0.1</string>
+    <string name="thanksForUpdatingVersion">5.0.1</string>
     
     <!-- Global. -->
     <string name="about">Über QuickDic…</string>
@@ -14,15 +14,15 @@
 
     <!-- DictionaryManagerActivity -->
     <string name="dictionaryManager">Wörterbuch-Liste</string>
-    <string name="dictionariesOnDevice">Dictionaries on device</string>
-    <string name="downloadableDictionaries">Downloadable dictionaries</string>
+    <string name="dictionariesOnDevice">Verfügbare Wörterbücher</string>
+    <string name="downloadableDictionaries">Wörterbücher zum herunterladen</string>
     <string name="downloadButton">%.1fMB</string>
-    <string name="updateAvailable">UPDATE!</string>
+    <string name="updateAvailable">Aktualisierung!</string>
     <string name="moveToTop">Nach Anfang ziehen</string>
     <string name="deleteDictionary">Wörterbuch entfernen</string>
     <string name="indexInfo">%1$s: %2$,d Wörter</string>
-    <string name="managerShow">Show</string>
-    <string name="managerHide">Hide</string>
+    <string name="managerShow">Zeigen</string>
+    <string name="managerHide">Verstecken</string>
     <string name="error">Error</string>
     <string name="unableToReadDictionaryDir">Unable to read dictionary directory: \n%1$s\n\nAndroid external storage directory: \n%2$s</string>
 

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index a341a2dd1b8bc00d8167566b3043c6c48eabcc80..e77134aeff614ff36c1f6d584f27d093b76e5973 100644 (file)
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -2,8 +2,8 @@
 <resources>
 
     <string name="app_name">QuickDic</string>
-    <string name="titleWithVersion">QuickDic 5.0.0</string>
-    <string name="thanksForUpdatingVersion">5.0.0</string>
+    <string name="titleWithVersion">QuickDic 5.0.1</string>
+    <string name="thanksForUpdatingVersion">5.0.1</string>
     
     <!-- Global. -->
     <string name="about">Acerca de QuickDic…</string>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 0d68bb4aa3f5a90a7f708b7c80be150052ede9f0..b1062eaadb65c44b54ed4d20413886788320f536 100644 (file)
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -2,8 +2,8 @@
 <resources>
 
     <string name="app_name">QuickDic</string>
-    <string name="titleWithVersion">QuickDic 5.0.0</string>
-    <string name="thanksForUpdatingVersion">5.0.0</string>
+    <string name="titleWithVersion">QuickDic 5.0.1</string>
+    <string name="thanksForUpdatingVersion">5.0.1</string>
     
     <!-- Global. -->
     <string name="about">About QuickDic…</string>
@@ -13,17 +13,17 @@
     <string name="no_dict_file">Please specify a default directory in the settings.</string>
     
     <!-- DictionaryManagerActivity -->
-    <string name="dictionaryManager">Gestione Dizionari</string>
-    <string name="dictionariesOnDevice">Dictionaries on device</string>
-    <string name="downloadableDictionaries">Downloadable dictionaries</string>
+    <string name="dictionaryManager">Gestione dizionari</string>
+    <string name="dictionariesOnDevice">Dizionari sul dispositivo</string>
+    <string name="downloadableDictionaries">Dizionari scaricabili</string>
     <string name="downloadButton">%.1fMB</string>
-    <string name="updateAvailable">UPDATE!</string>
+    <string name="updateAvailable">Aggiornare!</string>
     <string name="moveToTop">Sposta in alto</string>
     <string name="deleteDictionary">Cancella dizionario</string>
     <string name="indexInfo">%1$s: %2$,d parole</string>
-    <string name="managerShow">Show</string>
-    <string name="managerHide">Hide</string>
-    <string name="error">Error</string>
+    <string name="managerShow">Mostra</string>
+    <string name="managerHide">Nascondi</string>
+    <string name="error">Errore</string>
     <string name="unableToReadDictionaryDir">Unable to read dictionary directory: \n%1$s\n\nAndroid external storage directory: \n%2$s</string>
 
     <!-- Download. -->

diff --git a/res/values/strings.xml b/res/values/strings.xml
index bbaf797e3f6a78291bc6271dcaef9ff66af6e466..a2910730fd788cb6db428c23b0fcca6924428b4f 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2,8 +2,8 @@
 <resources>
 
     <string name="app_name">QuickDic</string>
-    <string name="titleWithVersion">QuickDic 5.0.0</string>
-    <string name="thanksForUpdatingVersion">5.0.0</string>
+    <string name="titleWithVersion">QuickDic 5.0.1</string>
+    <string name="thanksForUpdatingVersion">5.0.1</string>
 
     <!-- Global. -->
     <string name="about">About QuickDic…</string>
@@ -17,7 +17,7 @@
     <string name="dictionariesOnDevice">Dictionaries on device</string>
     <string name="downloadableDictionaries">Downloadable dictionaries</string>
     <string name="downloadButton">%.1fMB</string>
-    <string name="updateAvailable">UPDATE!</string>
+    <string name="updateAvailable">Update!</string>
     <string name="moveToTop">Move to top</string>
     <string name="deleteDictionary">Delete dictionary</string>
     <string name="indexInfo">%1$s: %2$,d words</string>

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index f15a186869c1c1deb01f69b9fbdb022ce1ec0a6e..999a4f0b783b4662b8cb185cb6bf75718bdd8447 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -413,8 +413,7 @@ public class DictionaryActivity extends SherlockListActivity {
         registerForContextMenu(getListView());
 
         // Cache some prefs.
-        wordList = new File(prefs.getString(getString(R.string.wordListFileKey),
-                new File(application.getDictDir(), "wordList.txt").getAbsolutePath()));
+        wordList = application.getWordListFile();
         saveOnlyFirstSubentry = prefs.getBoolean(getString(R.string.saveOnlyFirstSubentryKey),
                 false);
         clickOpensContextMenu = prefs.getBoolean(getString(R.string.clickOpensContextMenuKey),
@@ -920,6 +919,8 @@ public class DictionaryActivity extends SherlockListActivity {
                             return false;
                         }
                     });
+            // Rats, this won't be shown:
+            searchForSelection.setIcon(R.drawable.abs__ic_search);
         }
 
         if (row instanceof TokenRow && ttsReady) {
@@ -1008,7 +1009,7 @@ public class DictionaryActivity extends SherlockListActivity {
             final PrintWriter out = new PrintWriter(new FileWriter(wordList, true));
             out.println(rawText.toString());
             out.close();
-        } catch (IOException e) {
+        } catch (Exception e) {
             Log.e(LOG, "Unable to append to " + wordList.getAbsolutePath(), e);
             Toast.makeText(this,
                     getString(R.string.failedAddingToWordList, wordList.getAbsolutePath()),

diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java
index 5c3b25027c586117e98d4be3c210f75ed6bcac41..a4e0afe20af21b31d53b3aa165949379ab47a9cf 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryApplication.java
+++ b/src/com/hughes/android/dictionary/DictionaryApplication.java
@@ -193,12 +193,10 @@ public class DictionaryApplication extends Application {
     public synchronized File getDictDir() {
         // This metaphor doesn't work, because we've already reset
         // prefsMightHaveChanged.
-        // if (dictDir == null || PreferenceActivity.prefsMightHaveChanged) {
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        final File defaultDictDir = new File(Environment.getExternalStorageDirectory(), "quickDic");
-        String dir = prefs.getString(getString(R.string.quickdicDirectoryKey),
-                defaultDictDir.getAbsolutePath());
+        String dir = prefs.getString(getString(R.string.quickdicDirectoryKey), "");
         if (dir.isEmpty()) {
+            final File defaultDictDir = new File(Environment.getExternalStorageDirectory(), "quickDic");
             dir = defaultDictDir.getAbsolutePath();
         }
         dictDir = new File(dir);
@@ -206,6 +204,15 @@ public class DictionaryApplication extends Application {
         return dictDir;
     }
 
+    public File getWordListFile() {
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        String file = prefs.getString(getString(R.string.wordListFileKey), "");
+        if (file.isEmpty()) {
+            return new File(getDictDir(), "wordList.txt");
+        }
+        return new File(file);
+    }
+
     public C.Theme getSelectedTheme() {
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         final String theme = prefs.getString(getString(R.string.themeKey), "themeLight");

diff --git a/src/com/hughes/android/dictionary/PreferenceActivity.java b/src/com/hughes/android/dictionary/PreferenceActivity.java
index 8b1e2f773a955add5a847707a33e08d3df0a1412..ac41a864afb86e1d25a3f90a73f34e5e37b5995a 100644 (file)
--- a/src/com/hughes/android/dictionary/PreferenceActivity.java
+++ b/src/com/hughes/android/dictionary/PreferenceActivity.java
@@ -16,8 +16,10 @@ package com.hughes.android.dictionary;
 
 import java.util.List;
 
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.ListPreference;
+import android.preference.PreferenceManager;
 
 public class PreferenceActivity extends android.preference.PreferenceActivity {
 
@@ -26,7 +28,16 @@ public class PreferenceActivity extends android.preference.PreferenceActivity {
     @SuppressWarnings("deprecation")
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        setTheme(((DictionaryApplication) getApplication()).getSelectedTheme().themeId);
+        final DictionaryApplication application = (DictionaryApplication) getApplication();
+        setTheme(application.getSelectedTheme().themeId);
+        
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        if (prefs.getString(getString(R.string.quickdicDirectoryKey), "").equals("")) {
+            prefs.edit().putString(getString(R.string.quickdicDirectoryKey), application.getDictDir().getAbsolutePath()).commit();
+        }
+        if (prefs.getString(getString(R.string.wordListFileKey), "").equals("")) {
+            prefs.edit().putString(getString(R.string.wordListFileKey), application.getWordListFile().getAbsolutePath()).commit();
+        }
 
         /**
          * @author Dominik Köppl Preference: select default dictionary As this
@@ -37,7 +48,6 @@ public class PreferenceActivity extends android.preference.PreferenceActivity {
         addPreferencesFromResource(R.xml.preferences);
         ListPreference defaultDic = (ListPreference) findPreference(getResources().getString(
                 R.string.defaultDicKey));
-        DictionaryApplication application = (DictionaryApplication) getApplication();
         List<DictionaryInfo> dicts = application.getDictionariesOnDevice(null);
 
         final CharSequence[] entries = new CharSequence[dicts.size()];