Rework menu items

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 450 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 335 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 538 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 760 B

View File

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

View File

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

View File

@ -5,7 +5,7 @@
<item
android:id="@+id/menu_key_view_share"
android:icon="@drawable/ic_action_share"
app:showAsAction="ifRoom"
app:showAsAction="always"
android:title="@string/menu_share">
<menu>
<item
@ -48,9 +48,10 @@
</item>
</menu>
</item>
<item
android:id="@+id/menu_key_keyserver"
android:icon="@drawable/ic_action_import_export"
android:icon="@drawable/ic_action_cloud"
app:showAsAction="always"
android:title="@string/menu_key_server">
<menu>
@ -64,13 +65,17 @@
android:title="@string/menu_export_key_to_server" />
</menu>
</item>
<item
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" />
<item
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" />
</menu>

View File

@ -78,8 +78,6 @@
<string name="menu_import_from_qr_code">Import from QR Code</string>
<string name="menu_import">Import</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_delete_key">Delete 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_select_all">Select all</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 -->
<string name="label_sign">Sign</string>