cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use the key server preference to fill a Spinner in the key server query activity, allowing to query each server, also moved some previously static labels into strings.xml

Browse Source 
Update issue 9
Key server preferences are now used in key server query activity.
This commit is contained in:
Thialfihar
2010-08-17 23:05:41 +00:00
parent fc0ae774cd
commit c57c36b3a5
7 changed files with 52 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/create_key.xml
View File

@@ -29,7 +29,7 @@
<TableRow>
<TextView android:id="@+id/label_algorithm"
android:text="Algorithm"
android:text="@string/label_algorithm"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
@@ -45,7 +45,7 @@
<TableRow>
<TextView android:id="@+id/label_size"
android:text="Key Size"
android:text="@string/label_keySize"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"

10
res/layout/edit_key_key_item.xml
View File

@@ -43,7 +43,7 @@
<TextView
android:id="@+id/label_keyId"
android:text="Key ID"
android:text="@string/label_keyId"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
@@ -63,7 +63,7 @@
<TextView
android:id="@+id/label_algorithm"
android:text="Algorithm"
android:text="@string/label_algorithm"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
@@ -82,7 +82,7 @@
<TextView
android:id="@+id/label_creation"
android:text="Creation"
android:text="@string/label_creation"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
@@ -99,7 +99,7 @@
<TextView
android:id="@+id/label_expiry"
android:text="Expiry"
android:text="@string/label_expiry"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
@@ -116,7 +116,7 @@
<TextView
android:id="@+id/label_usage"
android:text="Usage"
android:text="@string/label_usage"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"

8
res/layout/edit_key_user_id_item.xml
View File

@@ -29,7 +29,7 @@
<RadioButton
android:id="@+id/isMainUserId"
android:text="Main User ID"
android:text="@string/label_mainUserId"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginLeft="20dip"/>
@@ -49,7 +49,7 @@
<TextView
android:id="@+id/label_name"
android:text="Name"
android:text="@string/label_name"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
@@ -68,7 +68,7 @@
<TextView
android:id="@+id/label_email"
android:text="Email"
android:text="@string/label_email"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
@@ -87,7 +87,7 @@
<TextView
android:id="@+id/label_comment"
android:text="Comment"
android:text="@string/label_comment"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="wrap_content"

5
res/layout/key_server_query_layout.xml
View File

@@ -20,6 +20,11 @@
android:layout_height="fill_parent"
android:orientation="vertical">
<Spinner
android:id="@+id/keyServer"
android:layout_width="fill_parent"
android:layout_height="wrap_content"/>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"

10
res/values/strings.xml
View File

@@ -113,6 +113,15 @@
<string name="label_language">Language</string>
<string name="label_forceV3Signature">Force V3 Signatures</string>
<string name="label_keyServers">Key Servers</string>
<string name="label_keyId">Key ID</string>
<string name="label_creation">Creation</string>
<string name="label_expiry">Expiry</string>
<string name="label_usage">Usage</string>
<string name="label_keySize">Key Size</string>
<string name="label_mainUserId">Main User ID</string>
<string name="label_name">Name</string>
<string name="label_comment">Comment</string>
<string name="label_email">Email</string>
<string name="noKeysSelected">Select</string>
<string name="oneKeySelected">1 Selected</string>
@@ -263,6 +272,7 @@
<string name="progress_verifyingIntegrity">verifying integrity...</string>
<string name="progress_deletingSecurely">deleting \'%s\' securely...</string>
<string name="progress_querying">querying...</string>
<string name="progress_queryingServer">querying %s...</string>
<!-- permission strings -->
<string name="permission_read_key_details_label">Read key details from APG.</string>