New Layout for main screen

7 files changed, 48 insertions, 61 deletions

diff --git a/res/layout/file_dialog_main.xml b/res/layout/file_dialog_main.xml
index db791663..b50ef8a6 100644
--- a/res/layout/file_dialog_main.xml
+++ b/res/layout/file_dialog_main.xml
@@ -13,23 +13,29 @@
         android:orientation="horizontal" >
 
         <Button
-            android:id="@+id/importfile"
+            android:id="@+id/fdButtonSelect"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/import_file" >
+            android:text="@string/select_file" >
         </Button>
 
-        <Button
-            android:id="@+id/fdButtonSelect"
+        <CheckBox
+            android:id="@+id/doinline"
+            android:checked="true"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/select_file" >
-        </Button>
-	
+            android:text="@string/make_selection_inline" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
         <Button
             android:id="@+id/fdClear"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="right"
             android:text="@string/clear" >
         </Button>
     </LinearLayout>
diff --git a/res/layout/fragment_senddump.xml b/res/layout/fragment_senddump.xml
new file mode 100644
index 00000000..2f573de5
--- /dev/null
+++ b/res/layout/fragment_senddump.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/RelativeLayout1"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:orientation="vertical" >
+
+    <Button
+        android:id="@+id/senddump"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:text="@string/send_minidump" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/senddump"
+        android:layout_centerHorizontal="true"
+        android:text="@string/send_minidump_summary" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/menu/configmenu.xml b/res/menu/configmenu.xml
index 1d47e26b..41130970 100644
--- a/res/menu/configmenu.xml
+++ b/res/menu/configmenu.xml
@@ -5,7 +5,7 @@
         android:id="@+id/sendConfig"

         android:icon="@android:drawable/ic_menu_share"

         android:showAsAction="ifRoom|withText"

-        android:title="Send config file"

+        android:title="@string/send_config"

         android:titleCondensed="@string/send"/>

 

 </menu>
\ No newline at end of file
diff --git a/res/menu/logmenu.xml b/res/menu/logmenu.xml
index 0cc95b69..ee0f86de 100644
--- a/res/menu/logmenu.xml
+++ b/res/menu/logmenu.xml
@@ -33,7 +33,7 @@
         android:title="@string/edit_vpn"/>

     <item

         android:id="@+id/toggle_time"

-        android:alphabeticShortcut="e"

+        android:alphabeticShortcut="t"

         android:icon="@android:drawable/ic_menu_week"

         android:showAsAction="withText|ifRoom"

         android:title="@string/toggle_timestamps"/>

diff --git a/res/menu/vpn_context.xml b/res/menu/vpn_context.xml
deleted file mode 100644
index 239f1577..00000000
--- a/res/menu/vpn_context.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/edit_vpn"
-        android:alphabeticShortcut="e"
-        android:icon="@android:drawable/ic_menu_edit"
-        android:showAsAction="withText|ifRoom"
-        android:title="@string/edit_vpn"/>
-    <item
-        android:id="@+id/remove_vpn"
-        android:alphabeticShortcut="d"
-        android:icon="@android:drawable/ic_menu_delete"
-        android:showAsAction="withText|ifRoom"
-        android:title="@string/remove_vpn"/>
-    
-    <!--  does not look good on phone portrait with 3 items :( -->
-    <!--  <item
-        android:id="@+id/connect_vpn"
-        android:alphabeticShortcut="c"
-        android:icon="@android:drawable/ic_media_play"
-        android:showAsAction="ifRoom|withText"
-        android:title="@string/connect"/>
-	-->
-</menu>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6588a69b..ed8e3b1d 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -22,7 +22,7 @@
     <string name="about">About</string>
     <string name="about_summary">About OpenVPN for Android</string>
     <string name="vpn_list_summary">List of all configured VPNs</string>
-    <string name="vpn_list_title">VPN Profiles</string>
+    <string name="vpn_list_title">Profiles</string>
     <string name="vpn_type">Type</string>
     <string name="pkcs12pwquery">PKCS12 Password</string>
     <string name="file_select">Select…</string>
@@ -167,7 +167,7 @@
     <string name="file_icon">file icon</string>
     <string name="tls_authentication">TLS Authentication</string>
     <string name="generated_config">Generated Config</string>
-    <string name="generalsettings">General Settings</string>
+    <string name="generalsettings">Settings</string>
     <string name="owner_fix_summary">Tries to set the owner of /dev/tun to system. Some CM9 images need this to make the VPNService API work. Requires root.</string>
     <string name="owner_fix">Fix ownership of /dev/tun</string>
     <string name="generated_config_summary">Shows the generated OpenVPN Configuration File</string>
@@ -223,7 +223,6 @@
     <string name="faq_routing">The Routing and interface configuration is not done via traditionell ifconfig/route command but by using the VPNService API. This results in a different routing configuration than on other OSes. The configuration only consists of the IP of the tunnel interface and the networks that should be routed over this interface. Especially no peer partner address or gateway address is needed. Special routes to reach the VPN Server (for example added when using redirect-gateway) are not needed either. The application will consequently ignore these settings when importing a configuration. The app ensures with the VPNService API that the connection to the server is not routed through the VPN tunnel. Since only specifing networks to be routed via tunnel is supported extra routes not pointing to the tunnel cannot be supported either. (e.g. route x.x.x.x y.y.y.y net_gateway). The show information button in the log windows show the current configuration of the VPNService network configuration.</string>
     <string name="persisttun_summary">Do not fallback to no VPN connection when OpenVPN is reconnecting.</string>
     <string name="persistent_tun_title">Persistent tun</string>
-    <string name="translation">Translation</string>
     <string name="openvpn_log">OpenVPN Log</string>
     <string name="import_config">Import OpenVPN configuration</string>
     <string name="battery_consumption_title">Battery consumption</string>
@@ -236,7 +235,7 @@
     <string name="connectretrywait">Seconds between connections</string>
     <string name="minidump_generated">OpenVPN crashed unexpectedly. Please consider using the send Minidump option in the main menu</string>
     <string name="send_minidump">Send Minidump to developer</string>
-    <string name="send_minidump_summary">Send debugging information about last crash to developer</string>
+    <string name="send_minidump_summary">Sends debugging information about last crash to developer</string>
     <string name="notifcation_title">OpenVPN - %s</string>
     <string name="session_ipv4string">%1$s - %2$s</string>
     <string name="session_ipv6string">%1$s - %3$s, %2$s</string>
@@ -259,7 +258,6 @@
     <string name="notifcation_title_notconnect">Not connected</string>
     <string name="start_vpn_title">Connecting to VPN %s</string>
     <string name="start_vpn_ticker">Connecting to VPN %s</string>
-
     <string name="jelly_keystore_alphanumeric_bug">Some versions of Android 4.1 have problems if the name of the keystore certificate contains non alphanumeric characters (like spaces, underscores or dashes). Try to reimport the certificate without special characters</string>
     <string name="encryption_cipher">Encryption cipher</string>
     <string name="packet_auth">Packets authentication</string>
@@ -269,5 +267,9 @@
     <string name="built_by">built by %s</string>
     <string name="debug_build">debug build</string>
     <string name="official_build">official build</string>
-    
-</resources>
+    <string name="make_selection_inline">Copy into profile</string>
+    <string name="crashdump">Crashdump</string>
+    <string name="add">Add</string>
+    <string name="send_config">Send config file</string>
+
+</resources>
\ No newline at end of file
diff --git a/res/xml/main_headers.xml b/res/xml/main_headers.xml
deleted file mode 100644
index 92740382..00000000
--- a/res/xml/main_headers.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<preference-headers xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <header
-        android:fragment="de.blinkt.openvpn.VPNProfileList"
-        android:summary="@string/vpn_list_summary"
-        android:title="@string/vpn_list_title" />
-    <header
-        android:fragment="de.blinkt.openvpn.GeneralSettings"
-        android:title="@string/generalsettings" />
-    <header
-        android:fragment="de.blinkt.openvpn.FaqFragment"
-        android:summary="@string/faq_summary"
-        android:title="@string/faq" />
-    <header
-        android:fragment="de.blinkt.openvpn.AboutFragment"
-        android:summary="@string/about_summary"
-        android:title="@string/about" />
-
-</preference-headers>
\ No newline at end of file