diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2016-02-22 22:22:45 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2016-02-22 22:22:45 +0100 |
| commit | 4df63ccdeb8bd26f507c88980b360bdc367faa0f (patch) | |
| tree | f0589226486a5f34acdcb005381d4e04f7e4b209 /OpenKeychain/src/main/res | |
| parent | f61de278b4ca452678c1d791a9e0944cc6e93001 (diff) | |
| download | open-keychain-4df63ccdeb8bd26f507c88980b360bdc367faa0f.tar.gz open-keychain-4df63ccdeb8bd26f507c88980b360bdc367faa0f.tar.bz2 open-keychain-4df63ccdeb8bd26f507c88980b360bdc367faa0f.zip | |
displaytext: add "View Log" option, move "Copy to clipboard" into overflow menu
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/menu/decrypt_menu.xml | 15 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/res/menu/decrypt_menu.xml b/OpenKeychain/src/main/res/menu/decrypt_menu.xml index 0b81ea1db..4e31fb6a6 100644 --- a/OpenKeychain/src/main/res/menu/decrypt_menu.xml +++ b/OpenKeychain/src/main/res/menu/decrypt_menu.xml @@ -3,15 +3,20 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> <item + android:id="@+id/decrypt_share" + android:title="@string/btn_share_decrypted_text" + android:icon="@drawable/ic_share_black_24dp" + app:showAsAction="ifRoom" /> + + <item android:id="@+id/decrypt_copy" android:title="@string/btn_copy_decrypted_text" android:icon="@drawable/ic_content_copy_black_24dp" - app:showAsAction="ifRoom" /> + app:showAsAction="never" /> <item - android:id="@+id/decrypt_share" - android:title="@string/btn_share_decrypted_text" - android:icon="@drawable/ic_share_black_24dp" - app:showAsAction="ifRoom" /> + android:id="@+id/decrypt_view_log" + android:title="@string/btn_view_log" + app:showAsAction="never" /> </menu> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 7d66c06a1..9920d8057 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -95,7 +95,7 @@ <string name="btn_add_files">"Add file(s)"</string> <string name="btn_share_decrypted_text">"Share"</string> <string name="btn_open_with">"Open with…"</string> - <string name="btn_copy_decrypted_text">"Copy decrypted text"</string> + <string name="btn_copy_decrypted_text">"Copy to clipboard"</string> <string name="btn_decrypt_clipboard">"Read from clipboard"</string> <string name="btn_decrypt_files">"Select input file"</string> <string name="btn_encrypt_files">"Encrypt files"</string> |