From 368f0a122f242e5de75dd48c245e480a928384e1 Mon Sep 17 00:00:00 2001
From: Thialfihar <thialfihar@gmail.com>
Date: Mon, 26 Jul 2010 21:57:28 +0000
Subject: added an optional checkbox to the file dialog, can be used for
 instance to optionally delete files after importing them, and is used for
 that, also rearranged the option menu items for the main activity a little

Update issue 39
Added a new string:
<string name="label_deleteAfterImport">Delete After Import</string>
---
 res/layout/file_dialog.xml | 29 +++++++++++++++++++++--------
 res/values/strings.xml     |  1 +
 2 files changed, 22 insertions(+), 8 deletions(-)

(limited to 'res')

diff --git a/res/layout/file_dialog.xml b/res/layout/file_dialog.xml
index c42d2636e..bc5a2a214 100644
--- a/res/layout/file_dialog.xml
+++ b/res/layout/file_dialog.xml
@@ -18,19 +18,32 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
+    android:orientation="vertical"
     android:paddingLeft="5dip"
     android:paddingRight="5dip">
 
-    <EditText
-        android:id="@+id/input"
-        android:layout_width="0dip"
+    <LinearLayout
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_weight="1"/>
+        android:orientation="horizontal">
 
-    <ImageButton
-        android:id="@+id/btn_browse"
-        android:src="@drawable/ic_launcher_folder_small"
+        <EditText
+            android:id="@+id/input"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"/>
+
+        <ImageButton
+            android:id="@+id/btn_browse"
+            android:src="@drawable/ic_launcher_folder_small"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_gravity="center_vertical"/>
+
+    </LinearLayout>
+
+    <CheckBox
+        android:id="@+id/checkbox"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"/>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8c08b7ec3..c9f35824c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -97,6 +97,7 @@
     <string name="label_selectPublicKeys">Public Key(s)</string>
     <string name="label_deleteAfterEncryption">Delete After Encryption</string>
     <string name="label_deleteAfterDecryption">Delete After Decryption</string>
+    <string name="label_deleteAfterImport">Delete After Import</string>
     <string name="label_encryptionAlgorithm">Encryption Algorithm</string>
     <string name="label_hashAlgorithm">Hash Algorithm</string>
     <string name="label_asymmetric">Public Key</string>
-- 
cgit v1.2.3