From 9f2137a8ff1c2c37de919640aa047109693b0409 Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Thu, 13 Dec 2012 11:56:29 +0000
Subject: [PATCH] Add an 'Update voices' button to manually trigger an update.

---
 res/layout/main.xml                           | 24 +++++++++++++++++--
 res/values/strings.xml                        |  1 +
 .../eyesfree/espeak/eSpeakActivity.java       |  4 ++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/res/layout/main.xml b/res/layout/main.xml
index c0b09721..5ca1ad47 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -88,8 +88,30 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
+            android:layout_marginLeft="-4dp"
             android:orientation="vertical" >
 
+            <LinearLayout
+                android:id="@+id/updateVoicesLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+
+                <Button
+                    android:id="@+id/updateVoices"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/update_voices" />
+
+                <TextView
+                    android:id="@+id/textView3"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:textAppearance="?android:attr/textAppearanceLarge" />
+
+            </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/engineSettingsLayout"
                 android:layout_width="match_parent"
@@ -99,7 +121,6 @@
                     android:id="@+id/engineSettings"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="-4dp"
                     android:layout_weight="0.5"
                     android:text="@string/engine_settings" />
 
@@ -120,7 +141,6 @@
                     android:id="@+id/ttsSettings"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="-4dp"
                     android:layout_weight="0.5"
                     android:text="@string/tts_settings" />
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0a619c23..d7a43a9f 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -127,5 +127,6 @@
         <item>4x</item>
         <item>5x</item>
     </string-array>
+        <string name="update_voices">Update voices</string>
 
 </resources>
\ No newline at end of file
diff --git a/src/com/googlecode/eyesfree/espeak/eSpeakActivity.java b/src/com/googlecode/eyesfree/espeak/eSpeakActivity.java
index 7692232c..547d0368 100644
--- a/src/com/googlecode/eyesfree/espeak/eSpeakActivity.java
+++ b/src/com/googlecode/eyesfree/espeak/eSpeakActivity.java
@@ -192,6 +192,7 @@ public class eSpeakActivity extends Activity {
         final TextView availableVoices = (TextView) findViewById(R.id.availableVoices);
         availableVoices.setText(Integer.toString(mVoices.size()));
 
+        findViewById(R.id.updateVoices).setOnClickListener(mOnClickListener);
         findViewById(R.id.ttsSettings).setOnClickListener(mOnClickListener);
         findViewById(R.id.engineSettings).setOnClickListener(mOnClickListener);
 
@@ -301,6 +302,9 @@ public class eSpeakActivity extends Activity {
         @Override
         public void onClick(View v) {
             switch (v.getId()) {
+                case R.id.updateVoices:
+                    downloadVoiceData();
+                    break;
                 case R.id.engineSettings:
                     startActivityForResult(
                             new Intent(eSpeakActivity.this, TtsSettingsActivity.class),