From 991a25ab5df66752d8bdb460d1b622b9f52358b1 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 29 May 2009 09:37:32 +0000
Subject: [PATCH] Better icon for deleting folders + remove hard-coded icon
 path

---
 program/steps/mail/attachments.inc                |   2 +-
 program/steps/mail/compose.inc                    |   6 ++++--
 .../icons/{remove-attachment.png => delete.png}   | Bin
 skins/default/images/icons/trash.png              | Bin 775 -> 0 bytes
 skins/default/templates/compose.html              |   2 +-
 skins/default/templates/managefolders.html        |   2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)
 rename skins/default/images/icons/{remove-attachment.png => delete.png} (100%)
 delete mode 100644 skins/default/images/icons/trash.png

diff --git a/program/steps/mail/attachments.inc b/program/steps/mail/attachments.inc
index 81ac2fe5c..7cd089e04 100644
--- a/program/steps/mail/attachments.inc
+++ b/program/steps/mail/attachments.inc
@@ -91,7 +91,7 @@ if (is_array($_FILES['_attachments']['tmp_name'])) {
       unset($attachment['status']);
       $_SESSION['compose']['attachments'][$id] = $attachment;
       
-      if (is_file($icon = $CONFIG['skin_path'] . '/images/icons/remove-attachment.png')) {
+      if (($icon = $_SESSION['compose']['deleteicon']) && is_file($icon)) {
         $button = html::img(array(
           'src' => $icon,
           'alt' => rcube_label('delete')
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 8d43de050..f753b35dd 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -716,11 +716,13 @@ function rcmail_compose_attachment_list($attrib)
   
   if (is_array($_SESSION['compose']['attachments']))
   {
-    if ($attrib['deleteicon'])
+    if ($attrib['deleteicon']) {
       $button = html::img(array(
         'src' => $CONFIG['skin_path'] . $attrib['deleteicon'],
         'alt' => rcube_label('delete')
-	));
+      ));
+      $_SESSION['compose']['deleteicon'] = $CONFIG['skin_path'] . $attrib['deleteicon'];
+    }
     else
       $button = Q(rcube_label('delete'));
 
diff --git a/skins/default/images/icons/remove-attachment.png b/skins/default/images/icons/delete.png
similarity index 100%
rename from skins/default/images/icons/remove-attachment.png
rename to skins/default/images/icons/delete.png
diff --git a/skins/default/images/icons/trash.png b/skins/default/images/icons/trash.png
deleted file mode 100644
index 0712aaa71f1a35c6a5711feaed42938530e2ec1d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 775
zcmV+i1Ni)jP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!nMp)JR5;6}
zl21(1VHn5Vyn1NMn_jy)T_@w{!4A%o`KNV2H#XgJ%z=_C90mx6AcFi2<d3K*PQYY|
zn4*+h!a|n@VW>2hIjyaE;E>e5Jup4ApPhQQ@8131z0c?OeZKEg1fb}D^w$TQ-OA(h
zyZ!C$?HQR&c5buTemR}a-&U(Ns~T2+QK{4+QGfrVYXQy8Eqg63_tDhU42Q#kKp=oj
zCWDKM3#9k=5e~0GtJUF&un!MAxk(0~q2b<7HoFb%);6$MEY#NCMP+3rs;a6`Utf>9
zx;pT9e2^0YbmkZUvV8JtWfen1!yq?kY-~hLO--SY!{HR<bh&VFn8~~Q!2l=}ibOOP
z$Nu4G>?Tu4BtPQ#_ykugm&+lW&0;kihQ(q{GXP4Z>b1#i!Q0Ik<nlqx%y_W06vCX(
z51)S?@8VlXruMM5whpt|9Af}RMl@cx#{;j|huPUVD29{}iw6*m#_%DLAaIm|48v}B
zz+f;gFaV>YI=xPBz}EJAD3waM-P3rvxCp0n0+Vhx;#=EDr9Qzwzkso^F&hJ5GMR*S
zyAyu0>mdiC{-@~f?kThpUXS3#LIBg#Gt{0u{{sO7pwVa_NF-7$FR!4t_c64iIylE&
zP^wf=k7y7Kg|JEa7>y<h(Zabd#A=CjAfGVCT@wXJR~HY#U<hwEHmIE-Jd}}GEP-0B
zzQX`eTQ>~`6VmAe$YgRnC(z`S8#KPq8;sbDMsfD-JACviUaz;D0iabb6!v8X2cKbQ
zXBTmLw)}p2dPei`6_H2;dJ0)25*_95UJEEGDXHf3`BNPo9fve|SuU50o*n@N0>Qad
zDm|iNUukJ6>tBFk(hX7>=@zMibo){jmuF>{cZ#p-{s1l!qLRS4ZxsLl002ovPDHLk
FV1l4SUR?kH

diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index d5abd47cc..3225b2895 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -93,7 +93,7 @@
 
 <div id="compose-attachments">
 <div id="attachment-title"><roundcube:label name="attachments" /></div>
-<roundcube:object name="composeAttachmentList" deleteIcon="/images/icons/remove-attachment.png"/ >
+<roundcube:object name="composeAttachmentList" deleteIcon="/images/icons/delete.png"/ >
 <p><roundcube:button command="add-attachment" imagePas="/images/buttons/add_pas.png" imageSel="/images/buttons/add_sel.png" imageAct="/images/buttons/add_act.png" width="23" height="18" title="addattachment" /></p>
 </div>
 
diff --git a/skins/default/templates/managefolders.html b/skins/default/templates/managefolders.html
index b886cf6fc..80f5df279 100644
--- a/skins/default/templates/managefolders.html
+++ b/skins/default/templates/managefolders.html
@@ -16,7 +16,7 @@
 <div id="folder-manager">
 <roundcube:object name="foldersubscription" form="subscriptionform" id="subscription-table"
   cellpadding="1" cellspacing="0" summary="Folder subscription table" class="records-table"
-  deleteIcon="/images/icons/trash.png"
+  deleteIcon="/images/icons/delete.png"
   renameIcon="/images/icons/rename.png" />
 </div>