From 2f73ef1dda56ba7ae588091e0c0e8f71c02bbf32 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Mon, 30 Apr 2012 02:53:12 +0200
Subject: version 0.4.2

---
 res/layout/basic_settings.xml | 4 +++-
 res/menu/logmenu.xml          | 9 +++++++++
 res/xml/vpn_headers.xml       | 2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 res/menu/logmenu.xml

(limited to 'res')

diff --git a/res/layout/basic_settings.xml b/res/layout/basic_settings.xml
index 37d2c73..e19ec14 100644
--- a/res/layout/basic_settings.xml
+++ b/res/layout/basic_settings.xml
@@ -167,6 +167,8 @@
                 style="@style/item"
                 android:layout_marginLeft="8dip"
                 android:layout_marginRight="8dip"
+                android:hint="@string/pw_query_hint"
+                
                 android:inputType="textPassword" />
         </LinearLayout>
 
@@ -203,8 +205,8 @@
                 style="@style/item"
                 android:layout_marginLeft="8dip"
                 android:layout_marginRight="8dip"
+                android:hint="@string/pw_query_hint"
                 android:inputType="textPassword" />
-            <!-- android:hint="@string/pw_query_hint" -->
         </LinearLayout>
 
         <LinearLayout
diff --git a/res/menu/logmenu.xml b/res/menu/logmenu.xml
new file mode 100644
index 0000000..f97418a
--- /dev/null
+++ b/res/menu/logmenu.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<item android:id="@+id/clearlog"
+    android:icon="@android:drawable/ic_delete"
+    android:title="clear log"
+    android:showAsAction="ifRoom"
+    />
+
+</menu>
\ No newline at end of file
diff --git a/res/xml/vpn_headers.xml b/res/xml/vpn_headers.xml
index faaa6cd..dd94283 100644
--- a/res/xml/vpn_headers.xml
+++ b/res/xml/vpn_headers.xml
@@ -3,7 +3,7 @@
 
     <header
         android:tag="BasicSettings"
-        android:fragment="de.blinkt.openvpn.BasicSettings"
+        android:fragment="de.blinkt.openvpn.Settings_Basic"
         android:summary="Server, port and authentication method. Normally you should only settings specified here."
         android:title="Basic Settings" 
         android:id="@+id/basicsettingsid"/>
-- 
cgit v1.2.3