diff options
| author | Thialfihar <thialfihar@gmail.com> | 2010-07-26 21:57:28 +0000 |
|---|---|---|
| committer | Thialfihar <thialfihar@gmail.com> | 2010-07-26 21:57:28 +0000 |
| commit | 368f0a122f242e5de75dd48c245e480a928384e1 (patch) | |
| tree | f023fb0ad9502b146113fa17c0fdd20c9758b72b /res | |
| parent | c1d9bbc644bf7657c586c64994f198f3c589884f (diff) | |
| download | open-keychain-368f0a122f242e5de75dd48c245e480a928384e1.tar.gz open-keychain-368f0a122f242e5de75dd48c245e480a928384e1.tar.bz2 open-keychain-368f0a122f242e5de75dd48c245e480a928384e1.zip | |
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>
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/file_dialog.xml | 29 | ||||
| -rw-r--r-- | res/values/strings.xml | 1 |
2 files changed, 22 insertions, 8 deletions
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> |