From: Thad Hughes <thadh@google.com>
Date: Wed, 25 Dec 2013 22:05:23 +0000 (-0800)
Subject: Flag of Scotland, error message when directory is not available.
X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=commitdiff_plain;h=ff02b5a75fbda3571ec0f632e2d046db915a02fc

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
index 0000000..de29448
--- /dev/null
+++ b/images/flags/flag_of_scotland.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="1000" height="600" viewBox="0 0 5 3">
+<rect width="5" height="3" fill="#0065BD"/>
+<path d="M 0,0 L 5,3 M 0,3 L 5,0" stroke="#fff" stroke-width=".6"/>
+</svg>
diff --git a/res/drawable-xxhdpi/flag_of_scotland.png b/res/drawable-xxhdpi/flag_of_scotland.png
new file mode 100644
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 6d06d6e..f78b8c1 100644
--- 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 f8dca37..4425a0b 100644
--- 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 5af5496..36b74db 100644
--- 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));
     isoCodeToResources.put("ID", new LanguageResources("Indonesian", R.string.ID, R.drawable.flag_of_indonesia));
     isoCodeToResources.put("GA", new LanguageResources("Irish", R.string.GA, R.drawable.flag_of_ireland));
-    isoCodeToResources.put("GD", new LanguageResources("Scottish Gaelic", R.string.GD));
+    isoCodeToResources.put("GD", new LanguageResources("Scottish Gaelic", R.string.GD, R.drawable.flag_of_scotland));
     isoCodeToResources.put("GV", new LanguageResources("Manx", R.string.GV, R.drawable.flag_of_the_isle_of_man));
     isoCodeToResources.put("IT", new LanguageResources("Italian", R.string.IT, R.drawable.flag_of_italy));
     isoCodeToResources.put("LA", new LanguageResources("Latin", R.string.LA));
diff --git a/todo.txt b/todo.txt
index 72f25ff..7bbc3c8 100644
--- 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