aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorThialfihar <thialfihar@gmail.com>2010-05-09 13:29:30 +0000
committerThialfihar <thialfihar@gmail.com>2010-05-09 13:29:30 +0000
commit73888622f4d4d73c80cf877444dade3cf9470831 (patch)
treeff9cf653f1e7962e033b09c385768b7dcce5ef58 /res
parent2e1aad0f81c1511c741b391b4d8254f92ba56271 (diff)
downloadopen-keychain-73888622f4d4d73c80cf877444dade3cf9470831.tar.gz
open-keychain-73888622f4d4d73c80cf877444dade3cf9470831.tar.bz2
open-keychain-73888622f4d4d73c80cf877444dade3cf9470831.zip
added a button to encrypt to clipboard, change log and about window got their own layout now with proper linkification
Diffstat (limited to 'res')
-rw-r--r--res/layout/encrypt_message.xml12
-rw-r--r--res/layout/info.xml15
-rw-r--r--res/values/strings.xml3
3 files changed, 27 insertions, 3 deletions
diff --git a/res/layout/encrypt_message.xml b/res/layout/encrypt_message.xml
index 3f0b7c2d6..4fc804dda 100644
--- a/res/layout/encrypt_message.xml
+++ b/res/layout/encrypt_message.xml
@@ -107,10 +107,18 @@
style="@android:style/ButtonBar">
<Button
+ android:id="@+id/btn_encrypt_to_clipboard"
+ android:text="@string/btn_encrypt_to_clipboard"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"/>
+
+ <Button
android:id="@+id/btn_send"
android:text="@string/btn_send"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"/>
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"/>
</LinearLayout>
diff --git a/res/layout/info.xml b/res/layout/info.xml
new file mode 100644
index 000000000..ab9e99a5b
--- /dev/null
+++ b/res/layout/info.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fillViewport="true"
+ android:padding="5dip">
+
+ <TextView
+ android:id="@+id/message"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:textColor="#ffffffff"
+ android:autoLink="all"/>
+</ScrollView>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ab5b08ab6..d8365f2e6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -33,7 +33,8 @@
<string name="section_userIds">User IDs</string>
<string name="section_keys">Keys</string>
- <string name="btn_send">Send via Email</string>
+ <string name="btn_encrypt_to_clipboard">Encrypt To Clipboard</string>
+ <string name="btn_send">Encrypt And Email</string>
<string name="btn_encrypt">Encrypt</string>
<string name="btn_decrypt">Decrypt</string>
<string name="btn_verify">Verify</string>