moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-24 01:32:16 -05:00
Code Issues Releases Wiki Activity

Rework menu items

Browse Source
This commit is contained in:
Dominik Schürmann 2014-04-05 23:07:49 +02:00
parent 5af4f6b63f
commit 8ce837dbe4
8 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_cloud.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 450 B

BIN
OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_cloud.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 335 B

BIN
OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_cloud.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 538 B

BIN
OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_cloud.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 760 B

4
OpenPGP-Keychain/src/main/res/menu/key_list.xml
View File

@ -2,7 +2,6 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/menu_key_list_search" android:id="@+id/menu_key_list_search"
android:title="@string/menu_search" android:title="@string/menu_search"
@ -37,7 +36,6 @@
android:id="@+id/menu_key_list_export" android:id="@+id/menu_key_list_export"
app:showAsAction="ifRoom|withText" app:showAsAction="ifRoom|withText"
android:icon="@drawable/ic_action_import_export" android:icon="@drawable/ic_action_import_export"
android:title="@string/menu_export_keys"> android:title="@string/menu_export_all_keys" />
</item>
</menu> </menu>

3
OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml
View File

@ -5,14 +5,17 @@
android:id="@+id/menu_key_list_multi_export" android:id="@+id/menu_key_list_multi_export"
android:icon="@drawable/ic_action_import_export" android:icon="@drawable/ic_action_import_export"
android:title="@string/menu_export_key" /> android:title="@string/menu_export_key" />
<item <item
android:id="@+id/menu_key_list_multi_encrypt" android:id="@+id/menu_key_list_multi_encrypt"
android:icon="@drawable/ic_action_secure" android:icon="@drawable/ic_action_secure"
android:title="@string/menu_encrypt_to" /> android:title="@string/menu_encrypt_to" />
<item <item
android:id="@+id/menu_key_list_multi_delete" android:id="@+id/menu_key_list_multi_delete"
android:icon="@drawable/ic_action_discard" android:icon="@drawable/ic_action_discard"
android:title="@string/menu_delete_key" /> android:title="@string/menu_delete_key" />
<item <item
android:id="@+id/menu_key_list_multi_select_all" android:id="@+id/menu_key_list_multi_select_all"
android:icon="@drawable/ic_action_select_all" android:icon="@drawable/ic_action_select_all"

13
OpenPGP-Keychain/src/main/res/menu/key_view.xml
View File

@ -5,7 +5,7 @@
<item <item
android:id="@+id/menu_key_view_share" android:id="@+id/menu_key_view_share"
android:icon="@drawable/ic_action_share" android:icon="@drawable/ic_action_share"
app:showAsAction="ifRoom" app:showAsAction="always"
android:title="@string/menu_share"> android:title="@string/menu_share">
<menu> <menu>
<item <item
@ -48,9 +48,10 @@
</item> </item>
</menu> </menu>
</item> </item>
<item <item
android:id="@+id/menu_key_keyserver" android:id="@+id/menu_key_keyserver"
android:icon="@drawable/ic_action_import_export" android:icon="@drawable/ic_action_cloud"
app:showAsAction="always" app:showAsAction="always"
android:title="@string/menu_key_server"> android:title="@string/menu_key_server">
<menu> <menu>
@ -64,13 +65,17 @@
android:title="@string/menu_export_key_to_server" /> android:title="@string/menu_export_key_to_server" />
</menu> </menu>
</item> </item>
<item <item
android:id="@+id/menu_key_view_export_file" android:id="@+id/menu_key_view_export_file"
app:showAsAction="never" android:icon="@drawable/ic_action_import_export"
app:showAsAction="ifRoom"
android:title="@string/menu_export_key" /> android:title="@string/menu_export_key" />
<item <item
android:id="@+id/menu_key_view_delete" android:id="@+id/menu_key_view_delete"
app:showAsAction="never" android:icon="@drawable/ic_action_discard"
app:showAsAction="ifRoom"
android:title="@string/menu_delete_key" /> android:title="@string/menu_delete_key" />
</menu> </menu>

4
OpenPGP-Keychain/src/main/res/values/strings.xml
View File

@ -78,8 +78,6 @@
<string name="menu_import_from_qr_code">Import from QR Code</string> <string name="menu_import_from_qr_code">Import from QR Code</string>
<string name="menu_import">Import</string> <string name="menu_import">Import</string>
<string name="menu_import_from_nfc">Import from NFC</string> <string name="menu_import_from_nfc">Import from NFC</string>
<string name="menu_export_public_keys">Export all public keys</string>
<string name="menu_export_secret_keys">Export all secret keys</string>
<string name="menu_export_key">Export to file</string> <string name="menu_export_key">Export to file</string>
<string name="menu_delete_key">Delete key</string> <string name="menu_delete_key">Delete key</string>
<string name="menu_create_key">Create key</string> <string name="menu_create_key">Create key</string>
@ -104,7 +102,7 @@
<string name="menu_encrypt_to">Encrypt to…</string> <string name="menu_encrypt_to">Encrypt to…</string>
<string name="menu_select_all">Select all</string> <string name="menu_select_all">Select all</string>
<string name="menu_add_keys">Add keys</string> <string name="menu_add_keys">Add keys</string>
<string name="menu_export_keys">Export keys</string> <string name="menu_export_all_keys">Export all keys</string>
<!-- label --> <!-- label -->
<string name="label_sign">Sign</string> <string name="label_sign">Sign</string>