summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-05-11 00:46:33 +0200
committerArne Schwabe <arne@rfc2549.org>2012-05-11 00:46:33 +0200
commit480535d1de23e30780b3ae5a166cdc59a22a2adc (patch)
treeaf278c4a7243807df6cf0e7774fd7cc810f7d1a9 /res
parent7ecb6349023b144d485bf44a9e7a7149016930f7 (diff)
Rework FIle selection dialog.
Include possibility to include file content in VPN Profile. Allows safer storage of Certifcates and keys. (closes issue #13)
Diffstat (limited to 'res')
-rw-r--r--res/layout/file_dialog.xml13
-rw-r--r--res/layout/file_dialog_inline.xml22
-rw-r--r--res/layout/file_dialog_main.xml117
-rw-r--r--res/values/strings.xml8
4 files changed, 94 insertions, 66 deletions
diff --git a/res/layout/file_dialog.xml b/res/layout/file_dialog.xml
new file mode 100644
index 0000000..8e07ce3
--- /dev/null
+++ b/res/layout/file_dialog.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical" >
+
+ <LinearLayout
+ android:id="@+id/fragment_place"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" >
+ </LinearLayout>
+
+</LinearLayout> \ No newline at end of file
diff --git a/res/layout/file_dialog_inline.xml b/res/layout/file_dialog_inline.xml
new file mode 100644
index 0000000..61e3913
--- /dev/null
+++ b/res/layout/file_dialog_inline.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical" >
+<!-- The header already states Inline File
+ <TextView
+ android:id="@+id/textView1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="Inline File Data"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+ -->
+ <EditText
+ android:id="@+id/inlineFileData"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="textMultiLine|textNoSuggestions"
+ android:textAppearance="?android:attr/textAppearanceSmall" />
+
+
+</LinearLayout> \ No newline at end of file
diff --git a/res/layout/file_dialog_main.xml b/res/layout/file_dialog_main.xml
index c803522..2f88ffb 100644
--- a/res/layout/file_dialog_main.xml
+++ b/res/layout/file_dialog_main.xml
@@ -1,66 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:id="@+id/relativeLayout01"
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical" android:layout_width="fill_parent"
- android:layout_height="fill_parent">
-
- <LinearLayout android:id="@+id/fdLinearLayoutList"
- android:orientation="vertical" android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:layout_alignParentBottom="true">
-
- <LinearLayout android:id="@+id/fdLinearLayoutSelect"
- android:orientation="vertical" android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true" android:paddingLeft="10dp"
- android:paddingRight="10dp" android:paddingBottom="5dp">
-
- <LinearLayout android:orientation="horizontal"
- android:layout_width="fill_parent" android:layout_height="fill_parent">
- <Button android:id="@+id/fdButtonNew" android:layout_height="wrap_content"
- android:layout_width="0dip" android:layout_weight=".3"
- android:text="@string/nnew"></Button>
- <Button android:id="@+id/fdButtonSelect" android:layout_height="wrap_content"
- android:layout_width="0dip" android:layout_weight=".7"
- android:text="@string/select"></Button>
- </LinearLayout>
- </LinearLayout>
-
- <LinearLayout android:id="@+id/fdLinearLayoutCreate"
- android:orientation="vertical" android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true" android:paddingLeft="10dp"
- android:paddingRight="10dp" android:paddingBottom="5dp">
- <TextView android:id="@+id/textViewFilename" android:text="@string/file_name"
- android:layout_width="fill_parent" android:layout_height="wrap_content" />
- <EditText android:text="" android:id="@+id/fdEditTextFile"
- android:layout_width="fill_parent" android:layout_height="wrap_content"></EditText>
-
- <LinearLayout android:orientation="horizontal"
- android:layout_width="fill_parent" android:layout_height="fill_parent">
- <Button android:id="@+id/fdButtonCancel" android:layout_height="wrap_content"
- android:layout_width="0dip" android:layout_weight=".3"
- android:text="@string/cancel"></Button>
- <Button android:id="@+id/fdButtonCreate" android:layout_height="wrap_content"
- android:layout_width="0dip" android:layout_weight=".7"
- android:text="@string/create"></Button>
- </LinearLayout>
- </LinearLayout>
-
- </LinearLayout>
-
- <LinearLayout android:orientation="vertical"
- android:layout_width="fill_parent" android:layout_height="fill_parent"
- android:layout_above="@+id/fdLinearLayoutList">
- <TextView android:id="@+id/path" android:layout_width="fill_parent"
- android:layout_height="wrap_content" />
- <ListView android:id="@android:id/list" android:layout_width="fill_parent"
- android:layout_height="fill_parent" />
- <TextView android:id="@android:id/empty"
- android:layout_width="fill_parent" android:layout_height="fill_parent"
- android:text="@string/no_data" />
- </LinearLayout>
-
-
-
-
-</RelativeLayout>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/relativeLayout01"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical" >
+
+ <LinearLayout
+ android:id="@+id/fdLinearLayoutList"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:orientation="horizontal" >
+
+ <Button
+ android:id="@+id/importfile"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/import_file" >
+ </Button>
+
+ <Button
+ android:id="@+id/fdButtonSelect"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/select" >
+ </Button>
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:layout_above="@+id/fdLinearLayoutList"
+ android:orientation="vertical" >
+
+ <TextView
+ android:id="@+id/path"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content" />
+
+ <ListView
+ android:id="@android:id/list"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent" />
+
+ <TextView
+ android:id="@android:id/empty"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:text="@string/no_data" />
+ </LinearLayout>
+
+</RelativeLayout> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9073c0b..2b7c82f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -188,5 +188,11 @@
<string name="encryption">Encryption</string>
<string name="cipher_dialog_title">Enter Encryption method</string>
<string name="chipher_dialog_message">Enter the cipher key for openvpn. Leave empty to use default cipher</string>
- <string name="settings_auth">Authentication/Encryption</string>
+ <string name="settings_auth">Authentication/Encryption</string>
+ <string name="file_explorer_tab">File Explorer</string>
+ <string name="inline_file_tab">Inline File</string>
+ <string name="import_file">Import</string>
+ <string name="error_importing_file">Error importing File</string>
+ <string name="import_error_message">Could not import File from Filesystem</string>
+ <string name="inline_file_data">[[Inline file data]]</string>
</resources>