Flag of Scotland, error message when directory is not available.

diff --git a/images/flags/flag_of_scotland.svg b/images/flags/flag_of_scotland.svg
new file mode 100644 (file)
index 0000000..de29448
--- /dev/null
+++ b/images/flags/flag_of_scotland.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>\r
+<svg xmlns="http://www.w3.org/2000/svg" width="1000" height="600" viewBox="0 0 5 3">\r
+<rect width="5" height="3" fill="#0065BD"/>\r
+<path d="M 0,0 L 5,3 M 0,3 L 5,0" stroke="#fff" stroke-width=".6"/>\r
+</svg>\r

diff --git a/res/drawable-xxhdpi/flag_of_scotland.png b/res/drawable-xxhdpi/flag_of_scotland.png
new file mode 100644 (file)
index 0000000..551836f
Binary files /dev/null and b/res/drawable-xxhdpi/flag_of_scotland.png differ

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6d06d6e7e0e0d61b0a5a3531f6290e8d500d1e11..f78b8c14b91bc57663eb757a50106723772b4688 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -97,7 +97,6 @@
   <string name="wordListFileKey">wordListFile</string>
   <string name="wordListFileTitle">Word list file</string>
   <string name="wordListFileSummary">The local file where the word list will be appended.</string>
-  <string name="wordListFileDefault">/sdcard/quickDic/wordList.txt</string>
 
   <string name="fontKey">font</string>
   <string name="fontTitle">Dictionary font</string>

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index f8dca37d5dbf03192cb842782c687e735204c652..4425a0b0f3d7cc2276ba5679d7df7e956b68ef20 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -403,7 +403,7 @@ public class DictionaryActivity extends SherlockListActivity {
 
         // Cache some prefs.
         wordList = new File(prefs.getString(getString(R.string.wordListFileKey),
-                getString(R.string.wordListFileDefault)));
+                new File(application.getDictDir(), "wordList.txt").getAbsolutePath()));
         saveOnlyFirstSubentry = prefs.getBoolean(getString(R.string.saveOnlyFirstSubentryKey),
                 false);
         clickOpensContextMenu = prefs.getBoolean(getString(R.string.clickOpensContextMenuKey),

diff --git a/src/com/hughes/android/dictionary/engine/Language.java b/src/com/hughes/android/dictionary/engine/Language.java
index 5af5496f5ed6ce3da33a1f476a64947db5bd5e88..36b74db412e3694abc49a7d9a92ae22e2efec2c5 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/Language.java
+++ b/src/com/hughes/android/dictionary/engine/Language.java
@@ -77,7 +77,7 @@ public class Language {
     isoCodeToResources.put("IS", new LanguageResources("Icelandic", R.string.IS, R.drawable.flag_of_iceland));\r
     isoCodeToResources.put("ID", new LanguageResources("Indonesian", R.string.ID, R.drawable.flag_of_indonesia));\r
     isoCodeToResources.put("GA", new LanguageResources("Irish", R.string.GA, R.drawable.flag_of_ireland));\r
-    isoCodeToResources.put("GD", new LanguageResources("Scottish Gaelic", R.string.GD));\r
+    isoCodeToResources.put("GD", new LanguageResources("Scottish Gaelic", R.string.GD, R.drawable.flag_of_scotland));\r
     isoCodeToResources.put("GV", new LanguageResources("Manx", R.string.GV, R.drawable.flag_of_the_isle_of_man));\r
     isoCodeToResources.put("IT", new LanguageResources("Italian", R.string.IT, R.drawable.flag_of_italy));\r
     isoCodeToResources.put("LA", new LanguageResources("Latin", R.string.LA));\r

diff --git a/todo.txt b/todo.txt
index 72f25ffc70c2e0102b3036a85708b7ed38e8266c..7bbc3c80a0d324ee88440c17a97f3888d1cf0db1 100644 (file)
--- a/todo.txt
+++ b/todo.txt
@@ -1,3 +1,2 @@
 * Contributions from:
-* Unable to read quickdic dir message.
 * HtmlEntries inline, expandable.
\ No newline at end of file