From 7fe13897bf2ba07ac553b3a47cb5cf66c766f67d Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Mon, 16 Jul 2012 22:48:23 +0200
Subject: Start work on clear setting for file dialog Add a quick start quide
 stating the obvious (*sigh*)

---
 res/layout/faq.xml              | 31 ++++++++++++++++---------------
 res/layout/file_dialog_main.xml |  7 +++++++
 res/values/strings.xml          |  6 +++---
 3 files changed, 26 insertions(+), 18 deletions(-)

(limited to 'res')

diff --git a/res/layout/faq.xml b/res/layout/faq.xml
index 4107ea7e..b18446c0 100644
--- a/res/layout/faq.xml
+++ b/res/layout/faq.xml
@@ -8,17 +8,22 @@
         android:layout_height="wrap_content"
         android:orientation="vertical" >
 
-        
+        <TextView
+            style="@style/faqhead"
+            android:text="@string/faq_howto_title" />
+
+        <TextView
+            android:id="@+id/faq_howto"
+            style="@style/faqitem" />
+
         <TextView
             style="@style/faqhead"
             android:text="@string/faq_system_dialogs_title" />
-        
-        
+
         <TextView
             style="@style/faqitem"
             android:text="@string/faq_system_dialogs" />
-        
-        
+
         <TextView
             style="@style/faqhead"
             android:text="@string/tap_mode" />
@@ -35,22 +40,18 @@
             style="@style/faqitem"
             android:text="@string/faq_security" />
 
-        
         <TextView
             style="@style/faqhead"
-            android:text="@string/broken_images" 
-            />
-        
+            android:text="@string/broken_images" />
+
         <TextView
-            style="@style/faqitem"
-            android:id="@+id/brokenimages" />
-        
-        
+            android:id="@+id/brokenimages"
+            style="@style/faqitem" />
+
         <TextView
             style="@style/faqhead"
             android:text="@string/faq_shortcut" />
-        
-        
+
         <TextView
             style="@style/faqitem"
             android:text="@string/faq_howto_shortcut" />
diff --git a/res/layout/file_dialog_main.xml b/res/layout/file_dialog_main.xml
index 68af9b18..2a623dc6 100644
--- a/res/layout/file_dialog_main.xml
+++ b/res/layout/file_dialog_main.xml
@@ -25,6 +25,13 @@
             android:layout_height="wrap_content"
             android:text="@string/select_file" >
         </Button>
+
+        <Button
+            android:id="@+id/fdClear"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/clear" >
+        </Button>
     </LinearLayout>
 
     <LinearLayout
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6e280c19..d3493fd2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -235,6 +235,6 @@
     <string name="export_config_title">ICS Openvpn Config</string>
     <string name="warn_no_dns">No DNS servers being used. Name resolution may not work. Consider setting custom DNS Servers</string>
     <string name="dns_add_error">Could not add DNS Server \"%1$s\", rejected by the system: %2$s</string>
-    
-
-</resources>
\ No newline at end of file
+    <string name="faq_howto">&lt;p>Get a working config (tested on your computer or download from your provider/organisation)&lt;/p>&lt;p>If it is a single file no with no extra pem/pks12 files you can email the file yourself and open the attachment. If you have multiple files put them on your sd card.&lt;/p>&lt;p>Click on the email attachment/Use the folder icon in the vpn list to import the config file&lt;/p>&lt;p>If there are errors about missing files put the missing files on your sd card.&lt;/p>&lt;p>Click on the save symbol to add the imported VPN to your VPN list&lt;/p>&lt;p>Connect the VPN by clicking on the name of the VPN&lt;/p>&lt;p>If there are error or warnings in the log try to understand the warnings/error and try to fix them&lt;/p> </string>
+    <string name="faq_howto_title">Quick Start</string>
+</resources>
-- 
cgit v1.2.3