- new Icon :)

- Obscure settings
- version 0.4.5
- quick launch

7 files changed, 87 insertions, 37 deletions

diff --git a/res/drawable/icon.png b/res/drawable/icon.png
index 15a39dae..badc6da5 100644
--- a/res/drawable/icon.png
+++ b/res/drawable/icon.png
diff --git a/res/drawable/openvpnlogo.png b/res/drawable/openvpnlogo.png
deleted file mode 100644
index 74afd1db..00000000
--- a/res/drawable/openvpnlogo.png
+++ /dev/null
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index f4651fd2..98f244bc 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1,32 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string-array name="vpn_types">
-    		<item>Certificates</item>
-    		<item>PKCS12 File</item>
-    		<item>Android Certficate</item>
-    		<item>Username/Password</item>
-    		<item>Static Keys</item>
+        <item>Certificates</item>
+        <item>PKCS12 File</item>
+        <item>Android Certficate</item>
+        <item>Username/Password</item>
+        <item>Static Keys</item>
     </string-array>
-   
-        <string-array name="vpn_entry_types">
-    		<item>certs</item>
-    		<item>pkcs12</item>
-    		<item>keystore</item>
-    		<item>userpw</item>
-    		<item>statickeys</item>
+    <string-array name="vpn_entry_types">
+        <item>certs</item>
+        <item>pkcs12</item>
+        <item>keystore</item>
+        <item>userpw</item>
+        <item>statickeys</item>
     </string-array>
-   
-    
     <string-array name="tls_directions_entries">
         <item>0</item>
         <item>1</item>
-        <item>Unspecified</item>        
+        <item>Unspecified</item>
     </string-array>
-    
     <string-array name="tls_directions_values">
         <item>0</item>
         <item>1</item>
-        <item></item>        
+        <item></item>
     </string-array>
-        
+    <string-array name="verb_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+    </string-array>
+    <string-array name="verb_entries">
+        <item>0 - No Logging</item>
+        <item>1 - Default logging</item>
+        <item>2 - More verbose logging</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5 - Debug logging</item>
+    </string-array>
+
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2a2135a3..58137810 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -104,4 +104,11 @@
     <string name="ipv4_format_error">Cannot parse the IPv4 address</string>
     <string name="custom_route_format_error">Cannot parse the custom routes</string>
     <string name="pw_query_hint">Leave empty to query on demand</string>
+    <string name="vpn_shortcut">OpenVPN Shortcut</string>
+    <string name="vpn_launch_title">Connect to VPN</string>
+    <string name="shortcut_profile_notfound">Profile specified in shortcut not found</string>
+    <string name="random_host_prefix">Random Host Prefix</string>
+    <string name="random_host_summary">adds 6 random chars in front of hostname</string>
+    <string name="custom_config_title">Enable Custom Options</string>
+    <string name="custom_config_summary">Specify custom options. Use with care!</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 59010fd4..7ae97cd1 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -32,4 +32,8 @@
         <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
     </style>
 
+     <style name="Theme.CreateShortCut" parent="android:Theme.Holo.DialogWhenLarge">
+    </style>
+
+    
 </resources>
\ No newline at end of file
diff --git a/res/xml/vpn_headers.xml b/res/xml/vpn_headers.xml
index dd942832..f755dc8c 100644
--- a/res/xml/vpn_headers.xml
+++ b/res/xml/vpn_headers.xml
@@ -19,13 +19,12 @@
         android:title="Authentication" />
 
     <!-- android:icon="@drawable/ic_settings_display" -->
-    <!--
      <header
         android:fragment="de.blinkt.openvpn.Settings_Obscure"
-        android:summary="Obscure OpenVPN Settings. Normaly not needed."
+        android:summary="Obscure OpenVPN Settings. Normally not needed."
         android:title="Obscure" >
     </header>
-    -->
+
     <header
         android:fragment="de.blinkt.openvpn.ShowConfigFragment"
         android:summary="Shows the generated openvpn Configuration File"
diff --git a/res/xml/vpn_obscure.xml b/res/xml/vpn_obscure.xml
index 09b237f2..718f1920 100644
--- a/res/xml/vpn_obscure.xml
+++ b/res/xml/vpn_obscure.xml
@@ -2,41 +2,68 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="Obscure Settings" >
 
+    <ListPreference
+        android:entries="@array/verb_entries"
+        android:entryValues="@array/verb_values"
+        android:key="verblevel"
+        android:persistent="false"
+        android:summary="%s"
+        android:title="Log verbosity level" />
+
     <CheckBoxPreference
         android:key="useRandomHostname"
-        android:summary="adds 6 random chars in front of hostname"
-        android:title="Random Host Prefix" />
+        android:persistent="false"
+        android:summary="@string/random_host_summary"
+        android:title="@string/random_host_prefix" />
     <CheckBoxPreference
         android:key="useFloat"
-        android:summary="Allows authenticated packets from any IP" />
+        android:persistent="false"
+        android:summary="Allows authenticated packets from any IP"
+        android:title="Allow floating server" />
 
+    <!--
     <CheckBoxPreference android:key="setmtu" android:title="Set custom MTU" />
-    <EditTextPreference
+      <EditTextPreference
         android:dependency="setmtu"
         android:defaultValue="1500"
         android:title="MTU" />
+    -->
 
+
+    <!--
+	Shaping works only on outgoing packet, so it is rather uninteresting :(
     <CheckBoxPreference
+       android:persistent="false"
         android:key="useBWShaping"
-        android:title="Use bandwidth shaping" />
+        android:title="bandwidth shaping" 
+        android:summary="Limit Bandwidth of the VPN"/>
 
     <EditTextPreference
         android:key="shaperLimit"
-        android:title="Bandwidth in byte/s" />
+        android:dependency="useBWShaping"
+        android:title="Bandwidth in KByte/s" />
+    -->
 
-    <CheckBoxPreference
+
+    <!--
+         <CheckBoxPreference
         android:defaultValue="true"
         android:key="enableReplayProtection"
         android:title="Replay Protection" />
-    <CheckBoxPreference
-        android:summary="Specify custom options. Use with care!"
-        android:title="Enable Custom Options" 
-        android:key="enableCustomOptions"/>
+    -->
+    <PreferenceCategory android:title="@string/custom_config_title" >
+        <CheckBoxPreference
+            android:key="enableCustomOptions"
+            android:persistent="false"
+            android:summary="@string/custom_config_summary"
+            android:title="@string/custom_config_title" />
 
-    <EditTextPreference
-        android:dependency="enableCustomOptions"
-        android:dialogMessage="@string/custom_option_warning" />
-        android:key="customOptions"
-        android:title="Custom Options" />
+        <EditTextPreference
+            android:dependency="enableCustomOptions"
+            android:dialogMessage="@string/custom_option_warning"
+            android:key="customOptions"
+            android:persistent="false"
+            android:title="Custom Options" />
+    </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file