From 0b6a01380b1a276c9e4b00b423dbc4c6fa8f7d2d Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 18 Sep 2015 05:11:33 -0400
Subject: [PATCH] Distinguish encryption toolbar buttons (Mailvelope and Enigma)

---
 program/localization/en_US/labels.inc       |    1 +
 skins/larry/images/buttons.png              |    0 
 plugins/enigma/skins/larry/enigma_icons.png |    0 
 skins/larry/templates/compose.html          |    2 +-
 4 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/plugins/enigma/skins/larry/enigma_icons.png b/plugins/enigma/skins/larry/enigma_icons.png
index ce4d76f..d6c5158 100644
--- a/plugins/enigma/skins/larry/enigma_icons.png
+++ b/plugins/enigma/skins/larry/enigma_icons.png
Binary files differ
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index b102041..08f6a60 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -249,6 +249,7 @@
 $labels['addmedia']       = 'Add movie';
 $labels['encrypt']        = 'Encrypt';
 $labels['encryptmessage'] = 'Encrypt message';
+$labels['encryptmessagemailvelope'] = 'Encrypt message with Mailvelope';
 $labels['importpubkeys']  = 'Import public keys';
 $labels['encryptedsendialog'] = 'Sending encrypted message';
 $labels['keyid']          = 'Key ID';
diff --git a/skins/larry/images/buttons.png b/skins/larry/images/buttons.png
index bd3e29d..ff2b27c 100644
--- a/skins/larry/images/buttons.png
+++ b/skins/larry/images/buttons.png
Binary files differ
diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html
index 0ee7339..77b9cfd 100644
--- a/skins/larry/templates/compose.html
+++ b/skins/larry/templates/compose.html
@@ -33,7 +33,7 @@
 	<roundcube:button name="addattachment" type="link" class="button attach" label="attach" title="addattachment" onclick="UI.show_uploadform(event);return false" aria-haspopup="true" aria-expanded="false"tabindex="2" />
 	<roundcube:button command="insert-sig" type="link" class="button insertsig disabled" classAct="button insertsig" label="signature" title="insertsignature" tabindex="2" />
 	<a href="#responses" class="button responses" label="responses" title="<roundcube:label name='insertresponse' />" id="responsesmenulink" unselectable="on" onmousedown="return false" onclick="UI.toggle_popup('responsesmenu',event);return false" tabindex="2" aria-haspopup="true" aria-expanded="false" aria-owns="textresponsesmenu"><roundcube:label name="responses" /></a>
-	<roundcube:button command="compose-encrypted" type="link" class="button encrypt hidden" classAct="button encrypt" classSel="button encrypt selected" label="encrypt" title="encryptmessage" tabindex="2" />
+	<roundcube:button command="compose-encrypted" type="link" class="button encrypt hidden" classAct="button encrypt" classSel="button encrypt selected" label="encrypt" title="encryptmessagemailvelope" tabindex="2" />
 	<roundcube:container name="toolbar" id="compose-toolbar" />
 </div>
 

--
Gitblit v1.9.1