From 164045a780638b1e64ccfb45e4b47091d5bf845c Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 10 Feb 2009 21:55:17 -0700
Subject: [PATCH] Add Answered/Not Answered flagging to DIMP

Improve CSS definitions of context menu images.
Fix draft context menu generation.
Make flag names more consistent with IMP.
---
 imp/js/src/DimpBase.js                          |  25 +++++--
 imp/templates/index/index-dimp.inc              |  88 +++++++++++------------
 imp/themes/graphics/mail_notanswered.png        | Bin 0 -> 308 bytes
 imp/themes/graphics/undelete.png                | Bin 0 -> 408 bytes
 imp/themes/screen-dimp.css                      |  90 ++++++++++++++----------
 imp/themes/silver/graphics/mail_notanswered.png | Bin 0 -> 439 bytes
 imp/themes/silver/graphics/undelete.png         | Bin 0 -> 421 bytes
 imp/themes/silver/screen-dimp.css               |  87 +++++++++++++----------
 8 files changed, 164 insertions(+), 126 deletions(-)
 create mode 100644 imp/themes/graphics/mail_notanswered.png
 create mode 100644 imp/themes/graphics/undelete.png
 create mode 100644 imp/themes/silver/graphics/mail_notanswered.png
 create mode 100644 imp/themes/silver/graphics/undelete.png

diff --git a/imp/js/src/DimpBase.js b/imp/js/src/DimpBase.js
index 02dd43547..2d97cb684 100644
--- a/imp/js/src/DimpBase.js
+++ b/imp/js/src/DimpBase.js
@@ -635,7 +635,6 @@ var DimpBase = {
             DimpCore.DMenu.addSubMenu('ctx_message_reply', 'ctx_reply');
             DimpCore.DMenu.addSubMenu('ctx_message_forward', 'ctx_forward');
             DimpCore.DMenu.addSubMenu('ctx_message_setflag', 'ctx_flag');
-            DimpCore.DMenu.addSubMenu('ctx_message_clearflag', 'ctx_clearflag');
             break;
 
         case 'ctx_reply':
@@ -647,9 +646,12 @@ var DimpBase = {
             break;
 
         case 'ctx_otheractions':
-            $('oa_setflag', 'oa_clearflag', 'oa_sep1', 'oa_blacklist', 'oa_whitelist', 'oa_sep2', 'oa_undeleted').compact().invoke(this.viewport.getSelected().size() ? 'show' : 'hide');
+            $('oa_setflag', 'oa_sep1', 'oa_blacklist', 'oa_whitelist', 'oa_sep2', 'oa_undeleted').compact().invoke(this.viewport.getSelected().size() ? 'show' : 'hide');
             DimpCore.DMenu.addSubMenu('oa_setflag', 'ctx_flag');
-            DimpCore.DMenu.addSubMenu('oa_clearflag', 'ctx_clearflag');
+            break;
+
+        case 'ctx_draft':
+            DimpCore.DMenu.addSubMenu('ctx_draft_setflag', 'ctx_flag');
             break;
         }
         return true;
@@ -1555,10 +1557,15 @@ var DimpBase = {
                 this.togglePreviewPane();
                 break;
 
-            case 'oa_seen':
-            case 'oa_unseen':
-            case 'oa_flagged':
-            case 'oa_clear':
+            case 'flag_seen':
+            case 'flag_unseen':
+            case 'flag_flagged':
+            case 'flag_clear':
+            case 'flag_answered':
+            case 'flag_unanswered':
+                this.flag(id.substring(5));
+                break;
+
             case 'oa_blacklist':
             case 'oa_whitelist':
             case 'oa_undeleted':
@@ -2122,6 +2129,10 @@ var DimpBase = {
             this.viewport.updateFlag(vs, 'flagged', false);
             break;
 
+        case 'unanswered':
+            this.viewport.updateFlag(vs, 'answered', false);
+            break;
+
         case 'forwarded':
             this.viewport.updateFlag(vs, 'forwarded', true);
             break;
diff --git a/imp/templates/index/index-dimp.inc b/imp/templates/index/index-dimp.inc
index e7f1c66c3..45e937f58 100644
--- a/imp/templates/index/index-dimp.inc
+++ b/imp/templates/index/index-dimp.inc
@@ -340,103 +340,99 @@ function _simpleButton($id, $text, $image, $imagedir = null)
 </div>
 
 <div class="context" id="ctx_folder" style="display:none">
- <a id="ctx_folder_create"><span class="contextImg createfolderImg"></span><?php echo _("Create subfolder") ?></a>
- <a id="ctx_folder_rename"><span class="contextImg editfolderImg"></span><?php echo _("Rename Folder") ?></a>
- <a id="ctx_folder_empty"><span class="contextImg deleteImg"></span><?php echo _("Empty Folder") ?></a>
- <a id="ctx_folder_delete"><span class="contextImg folderdeleteImg"></span><?php echo _("Delete Folder") ?></a>
+ <a id="ctx_folder_create"><span class="contextImg"></span><?php echo _("Create subfolder") ?></a>
+ <a id="ctx_folder_rename"><span class="contextImg"></span><?php echo _("Rename Folder") ?></a>
+ <a id="ctx_folder_empty"><span class="contextImg"></span><?php echo _("Empty Folder") ?></a>
+ <a id="ctx_folder_delete"><span class="contextImg"></span><?php echo _("Delete Folder") ?></a>
  <div id="ctx_folder_seen_sep" class="sep"></div>
- <a id="ctx_folder_seen"><span class="contextImg mailseenImg"></span><?php echo _("Mark all as Read") ?></a>
- <a id="ctx_folder_unseen"><span class="contextImg mailunseenImg"></span><?php echo _("Mark all as New") ?></a>
+ <a id="ctx_folder_seen"><span class="contextImg"></span><?php echo _("Mark all as Read") ?></a>
+ <a id="ctx_folder_unseen"><span class="contextImg"></span><?php echo _("Mark all as New") ?></a>
  <div id="ctx_folder_poll_sep" class="sep"></div>
- <a id="ctx_folder_poll"><span class="contextImg mailseenImg"></span><?php echo _("Check for New Mail") ?></a>
- <a id="ctx_folder_nopoll"><span class="contextImg mailseenImg"></span><?php echo _("Do Not Check for New Mail") ?></a>
+ <a id="ctx_folder_poll"><span class="contextImg"></span><?php echo _("Check for New Mail") ?></a>
+ <a id="ctx_folder_nopoll"><span class="contextImg"></span><?php echo _("Do Not Check for New Mail") ?></a>
 </div>
 
 <div class="context" id="ctx_container" style="display:none">
- <a id="ctx_container_create"><span class="contextImg createfolderImg"></span><?php echo _("Create subfolder") ?></a>
- <a id="ctx_container_rename"><span class="contextImg editfolderImg"></span><?php echo _("Rename Folder") ?></a>
+ <a id="ctx_container_create"><span class="contextImg"></span><?php echo _("Create subfolder") ?></a>
+ <a id="ctx_container_rename"><span class="contextImg"></span><?php echo _("Rename Folder") ?></a>
 </div>
 
 <div class="context" id="ctx_message" style="display:none">
- <a id="ctx_message_reply"><span class="contextImg replyImg"></span><?php echo _("Reply") ?></a>
- <a id="ctx_message_forward"><span class="contextImg forwardImg"></span><?php echo _("Forward") ?></a>
+ <a id="ctx_message_reply"><span class="contextImg"></span><?php echo _("Reply") ?></a>
+ <a id="ctx_message_forward"><span class="contextImg"></span><?php echo _("Forward") ?></a>
  <div class="sep"></div>
- <a id="ctx_message_setflag"><span class="contextImg mailflaggedImg"></span><?php echo _("Set Flag") ?></a>
- <a id="ctx_message_clearflag"><span class="contextImg clearflagImg"></span><?php echo _("Clear Flag") ?></a>
+ <a id="ctx_message_setflag"><span class="contextImg"></span><?php echo _("Mark as") ?></a>
  <div class="sep"></div>
 <?php if (!empty($conf['spam']['reporting'])): ?>
- <a id="ctx_message_spam"><span class="contextImg spamImg"></span><?php echo _("Mark as Spam") ?></a>
+ <a id="ctx_message_spam"><span class="contextImg"></span><?php echo _("Mark as Spam") ?></a>
 <?php endif; ?>
 <?php if (!empty($conf['notspam']['reporting'])): ?>
- <a id="ctx_message_ham"><span class="contextImg hamImg"></span><?php echo _("Mark as Innocent") ?></a>
+ <a id="ctx_message_ham"><span class="contextImg"></span><?php echo _("Mark as Innocent") ?></a>
 <?php endif; ?>
 <?php if ($has_blacklist): ?>
- <a id="ctx_message_blacklist"><span class="contextImg blacklistImg"></span><?php echo _("Blacklist") ?></a>
+ <a id="ctx_message_blacklist"><span class="contextImg"></span><?php echo _("Blacklist") ?></a>
 <?php endif; ?>
 <?php if ($has_whitelist): ?>
- <a id="ctx_message_whitelist"><span class="contextImg whitelistImg"></span><?php echo _("Whitelist") ?></a>
+ <a id="ctx_message_whitelist"><span class="contextImg"></span><?php echo _("Whitelist") ?></a>
 <?php endif; ?>
- <a id="ctx_message_deleted"><span class="contextImg deleteImg"></span><?php echo _("Delete") ?></a>
+ <a id="ctx_message_deleted"><span class="contextImg"></span><?php echo _("Delete") ?></a>
 <?php if (!$usetrash): ?>
- <a id="ctx_message_undeleted"><span class="contextImg deleteImg"></span><?php echo _("Undelete") ?></a>
+ <a id="ctx_message_undeleted"><span class="contextImg"></span><?php echo _("Undelete") ?></a>
 <?php endif; ?>
 </div>
 
 <div class="context" id="ctx_draft" style="display:none">
- <a id="ctx_draft_resume"><span class="contextImg draftImg"></span><?php echo _("Resume Draft") ?></a>
+ <a id="ctx_draft_resume"><span class="contextImg"></span><?php echo _("Resume Draft") ?></a>
  <div class="sep"></div>
- <a id="ctx_draft_flagged"><span class="contextImg mailflaggedImg"></span><?php echo _("Flag Message") ?></a>
- <a id="ctx_draft_clear"><span class="contextImg clearflagImg"></span><?php echo _("Clear Flag") ?></a>
+ <a id="ctx_draft_setflag"><span class="contextImg"></span><?php echo _("Mark as") ?></a>
  <div class="sep"></div>
- <a id="ctx_draft_deleted"><span class="contextImg deleteImg"></span><?php echo _("Delete") ?></a>
+ <a id="ctx_draft_deleted"><span class="contextImg"></span><?php echo _("Delete") ?></a>
 <?php if (!$usetrash): ?>
- <a id="ctx_draft_undeleted"><span class="contextImg deleteImg"></span><?php echo _("Undelete") ?></a>
+ <a id="ctx_draft_undeleted"><span class="contextImg"></span><?php echo _("Undelete") ?></a>
 <?php endif; ?>
 </div>
 
 <div class="context" id="ctx_reply" style="display:none;">
- <a id="ctx_reply_reply"><span class="contextImg replyallImg"></span><?php echo _("To Sender") ?></a>
- <a id="ctx_reply_reply_all"><span class="contextImg replyallImg"></span><?php echo _("To All") ?></a>
- <a id="ctx_reply_reply_list"><span class="contextImg replyallImg"></span><?php echo _("To List") ?></a>
+ <a id="ctx_reply_reply"><span class="contextImg"></span><?php echo _("To Sender") ?></a>
+ <a id="ctx_reply_reply_all"><span class="contextImg"></span><?php echo _("To All") ?></a>
+ <a id="ctx_reply_reply_list"><span class="contextImg"></span><?php echo _("To List") ?></a>
 </div>
 
 <div class="context" id="ctx_forward" style="display:none">
- <a id="ctx_forward_forward_all"><span class="contextImg forwardImg"></span><?php echo _("Entire Message") ?></a>
- <a id="ctx_forward_forward_body"><span class="contextImg forwardImg"></span><?php echo _("Body Text Only") ?></a>
- <a id="ctx_forward_forward_attachments"><span class="contextImg forwardImg"></span><?php echo _("Attachments Only") ?></a>
+ <a id="ctx_forward_forward_all"><span class="contextImg"></span><?php echo _("Entire Message") ?></a>
+ <a id="ctx_forward_forward_body"><span class="contextImg"></span><?php echo _("Body Text Only") ?></a>
+ <a id="ctx_forward_forward_attachments"><span class="contextImg"></span><?php echo _("Attachments Only") ?></a>
 </div>
 
 <div class="context" id="ctx_otheractions" style="display:none">
- <a id="previewtoggle"><span class="contextImg previewImg"></span><?php echo ($prefs->getValue('dimp_show_preview') ? _("Hide Preview") : _("Show Preview")); ?></a>
+ <a id="previewtoggle"><span class="contextImg"></span><?php echo ($prefs->getValue('dimp_show_preview') ? _("Hide Preview") : _("Show Preview")); ?></a>
  <div class="sep"></div>
- <a id="oa_setflag"><span class="contextImg mailflaggedImg"></span><?php echo _("Set Flag") ?></a>
- <a id="oa_clearflag"><span class="contextImg clearflagImg"></span><?php echo _("Clear Flag") ?></a>
+ <a id="oa_setflag"><span class="contextImg"></span><?php echo _("Mark as") ?></a>
  <div class="sep" id="oa_sep1"></div>
 <?php if ($has_blacklist || $has_whitelist): ?>
 <?php if ($has_blacklist): ?>
- <a id="oa_blacklist"><span class="contextImg blacklistImg"></span><?php echo _("Blacklist") ?></a>
+ <a id="oa_blacklist"><span class="contextImg"></span><?php echo _("Blacklist") ?></a>
 <?php endif; ?>
 <?php if ($has_whitelist): ?>
- <a id="oa_whitelist"><span class="contextImg whitelistImg"></span><?php echo _("Whitelist") ?></a>
+ <a id="oa_whitelist"><span class="contextImg"></span><?php echo _("Whitelist") ?></a>
 <?php endif; ?>
  <div class="sep" id="oa_sep2"></div>
 <?php endif; ?>
- <a id="oa_selectall"><span class="contextImg tickImg"></span><?php echo _("Select All") ?></a>
+ <a id="oa_selectall"><span class="contextImg"></span><?php echo _("Select All") ?></a>
 <?php if (!$usetrash): ?>
  <div class="sep"></div>
- <a id="oa_purge_deleted"><span class="contextImg deleteImg"></span><?php echo _("Purge Deleted") ?></a>
- <a id="oa_undeleted"><span class="contextImg deleteImg"></span><?php echo _("Undelete") ?></a>
+ <a id="oa_purge_deleted"><span class="contextImg"></span><?php echo _("Purge Deleted") ?></a>
+ <a id="oa_undeleted"><span class="contextImg"></span><?php echo _("Undelete") ?></a>
 <?php endif; ?>
 </div>
 
 <div class="context" id="ctx_flag" style="display:none">
- <a id="oa_unseen"><span class="contextImg mailunseenImg"></span><?php echo _("Mark as New") ?></a>
- <a id="oa_flagged"><span class="contextImg mailflaggedImg"></span><?php echo _("Flag Message") ?></a>
-</div>
-
-<div class="context" id="ctx_clearflag" style="display:none">
- <a id="oa_seen"><span class="contextImg mailseenImg"></span><?php echo _("Mark as Read") ?></a>
- <a id="oa_clear"><span class="contextImg clearflagImg"></span><?php echo _("Clear Flag") ?></a>
+ <a id="flag_seen"><span class="contextImg"></span><?php echo _("Seen") ?></a>
+ <a id="flag_unseen"><span class="contextImg"></span><?php echo _("Unseen") ?></a>
+ <a id="flag_flagged"><span class="contextImg"></span><?php echo _("Flagged For Followup") ?></a>
+ <a id="flag_clear"><span class="contextImg"></span><?php echo _("Not Flagged") ?></a>
+ <a id="flag_answered"><span class="contextImg"></span><?php echo _("Answered") ?></a>
+ <a id="flag_unanswered"><span class="contextImg"></span><?php echo _("Not Answered") ?></a>
 </div>
 
 <div class="context" id="ctx_contacts" style="display:none">
diff --git a/imp/themes/graphics/mail_notanswered.png b/imp/themes/graphics/mail_notanswered.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e86548c30d4504dabd7ec5b002476c4748145c7
GIT binary patch
literal 308
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf67>k44ofy`glX(f`FeQ1ryD<E3
z??1C2$m1;Vh%9Dc;1&j9Muu5)B!GhKC7!;n>^GUXS){}hE<bq&6x!kG;uxZFe(eNX
zzrzUvtj8a;9ad1`3VO;`pd@v_fhlidpIR!{^+2g8Ev^@jBUYcErq(+5h`r{`@HJu9
zyDwFL(4YD<q0II9*XeIXbNxKhUhnQr%$86)+`RrDZ{vr<DKmW9rnXMCPgbbeY{<he
z*7jR7;CH5CajC=GQwB#06Yp6@es(&n%kX{g?n(Iy>^DB1c&{>h(|gMqwwC<)H<is9
zrhjO=-py@L9~U&)s(<p@O|m`bHy3}*n{rq%A#9K5hK{ympdT1KUHx3vIVCg!00tFx
A;Q#;t

literal 0
HcmV?d00001

diff --git a/imp/themes/graphics/undelete.png b/imp/themes/graphics/undelete.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee9d4d27d0df169f44db0ef5ff81898559e683f7
GIT binary patch
literal 408
zcmV;J0cZY+P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00001b5ch_0Itp)
z=>Px#0%A)?L;(MXkIcUS000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXD(1T_i~
z$*@uY00A6HL_t(2&t1_kPaJU&#_`XOT-ZAdcZYy&Fvvxfss@L}wbhkXmAnLA3c;dC
zRfB4KqRll`)R0qT!LUn1fHOB0d;h|iNoKy2d1jszX3>d#ZI#-kNb_<CL5Sn1;xX>x
zd%O!FnobJz;@sF*KV4b(!7HoyC=xAp<D0gQv0D!q+0?~}6p>n7+OUqdUb|B(^=0n;
z0WCQ3NynNseG|_r7Y6QUK&1C^qi|@&MD2^xKO?0`8j*SAwrtBxaO>J%nWRk96<tS8
z{qiIkA+zgAz0d%kU3g>Yx5Ch#q2^aBO}nj-+mq`n^mOI2WnhNwSk+rD&48hoQ7;2y
z17~xn!bs^E(=(fN;810t@WXiSXj<5vg7$Q7VfTMp5^6`c(jtHW0000<MNUMnLSTZ$
Cs;&J1

literal 0
HcmV?d00001

diff --git a/imp/themes/screen-dimp.css b/imp/themes/screen-dimp.css
index 6ccea5ad0..e87809213 100644
--- a/imp/themes/screen-dimp.css
+++ b/imp/themes/screen-dimp.css
@@ -253,7 +253,7 @@ div.msgSize {
 .msglist .statusForwarded {
     background-image: url("graphics/mail_forwarded.png");
 }
-.msglist .statusDraft, span.draftImg {
+.msglist .statusDraft {
     background-image: url("graphics/mail_draft.png");
 }
 
@@ -1045,36 +1045,73 @@ span.iconImg, span.contextImg, span.spellcheckPopdownImg {
     margin-right: 4px;
     vertical-align: top;
 }
-span.mailseenImg {
-    background-image: url("graphics/mail_seen.png");
+
+/* Context menu images */
+#ctx_message_reply span.contextImg {
+    background-image: url("graphics/reply.png");
 }
-span.mailunseenImg {
-    background-image: url("graphics/mail_unseen.png");
+#ctx_reply_reply span.contextImg, #ctx_reply_reply_all span.contextImg, #ctx_reply_reply_list span.contextImg {
+    background-image: url("graphics/replyall.png");
+}
+#ctx_message_forward span.contextImg, #ctx_forward_forward_all span.contextImg, #ctx_forward_forward_body span.contextImg, #ctx_forward_forward_attachments span.contextImg {
+    background-image: url("graphics/forward.png");
 }
-span.deleteImg {
+#ctx_folder_empty span.contextImg, #ctx_message_deleted span.contextImg, #ctx_draft_deleted span.contextImg, #oa_purge_deleted span.contextImg {
     background-image: url("graphics/delete.png");
 }
-span.createfolderImg {
-    background-image: url("graphics/folders/folder_create.png");
+#ctx_message_undeleted span.contextImg, #ctx_draft_undeleted span.contextImg, #oa_undeleted span.contextImg {
+    background-image: url("graphics/undelete.png");
 }
-span.editfolderImg {
-    background-image: url("graphics/folders/folder_edit.png");
+#flag_seen span.contextImg, #ctx_folder_seen span.contextImg {
+    background-image: url("graphics/mail_seen.png");
 }
-span.forwardImg {
-    background-image: url("graphics/forward.png");
+#flag_unseen span.contextImg, #ctx_folder_unseen span.contextImg, #ctx_folder_poll span.contextImg, #ctx_folder_nopoll span.contextImg {
+    background-image: url("graphics/mail_unseen.png");
 }
-span.mailflaggedImg {
+#ctx_message_setflag span.contextImg, #ctx_draft_setflag span.contextImg, #oa_setflag span.contextImg, #flag_flagged span.contextImg {
     background-image: url("graphics/mail_flagged.png");
 }
-span.clearflagImg {
+#flag_clear span.contextImg {
     background-image: url("graphics/mail_clearflag.png");
 }
-span.previewImg {
+#flag_answered span.contextImg {
+    background-image: url("graphics/mail_answered.png");
+}
+#flag_unanswered span.contextImg {
+    background-image: url("graphics/mail_notanswered.png");
+}
+#ctx_draft_resume span.contextImg {
+    background-image: url("graphics/mail_draft.png");
+}
+#previewtoggle span.contextImg {
     background-image: url("graphics/preview.png");
 }
-span.tickImg {
+#oa_selectall span.contextImg {
     background-image: url("graphics/tick.png");
 }
+#ctx_folder_create span.contextImg, #ctx_container_create span.contextImg {
+    background-image: url("graphics/folders/folder_create.png");
+}
+#ctx_folder_rename span.contextImg, #ctx_container_rename span.contextImg {
+    background-image: url("graphics/folders/folder_edit.png");
+}
+#ctx_folder_delete span.contextImg {
+    background-image: url("graphics/folders/folder_delete.png");
+}
+#ctx_message_spam span.contextImg {
+    background-image: url("graphics/spam.png");
+}
+#ctx_message_ham span.contextImg {
+    background-image: url("graphics/ham.png");
+}
+#ctx_message_blacklist span.contextImg, #oa_blacklist span.contextImg {
+    background-image: url("graphics/blacklist.png");
+}
+#ctx_message_whitelist span.contextImg, #oa_whitelist span.contextImg {
+    background-image: url("graphics/whitelist.png");
+}
+
+/* Other images */
 span.newwinImg {
     background-image: url("graphics/newwin.png");
 }
@@ -1106,27 +1143,6 @@ span.attachmentImg {
 span.msgsourceImg {
     background-image: url("graphics/message_source.png");
 }
-span.folderdeleteImg {
-    background-image: url("graphics/folders/folder_delete.png");
-}
-span.replyImg {
-    background-image: url("graphics/reply.png");
-}
-span.replyallImg {
-    background-image: url("graphics/replyall.png");
-}
-span.spamImg {
-    background-image: url("graphics/spam.png");
-}
-span.hamImg {
-    background-image: url("graphics/ham.png");
-}
-span.blacklistImg {
-    background-image: url("graphics/blacklist.png");
-}
-span.whitelistImg {
-    background-image: url("graphics/whitelist.png");
-}
 span.popdownImg, span.spellcheckPopdownImg {
     background-image: url("graphics/popdown.png");
     margin-right: 0px;
diff --git a/imp/themes/silver/graphics/mail_notanswered.png b/imp/themes/silver/graphics/mail_notanswered.png
new file mode 100644
index 0000000000000000000000000000000000000000..2277b9168b0214382262370faaf308a9e161a99e
GIT binary patch
literal 439
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf67>k44ofy`glX(f`a29w(7Bet#
z3xhBt!>l<HKtc8rPhVH|n@rp+V#24n^FITHn3BBRT^Rni_n+AhG{M@_#W6%elJ(%;
ztjU2A3=f{qnX^r8<F$;9xk;KY7A@|cJz2qmtIzKoUtCj@_(Rzj8Wy5|GR1Vex)uH@
zgqknpU7D$Sa{80%+Ib>CqZ@dDM8Ld#xv|pQ+${~noz{lUcAwS9SNBKfx!L<UGnc6{
zI2>AH_|i^p`eN_RUrv>t?o*ANma5wxw|io^{`1194G$L!Yj-Wui0b=NI!E=Xq1l?B
z4{mH)v@mnU`#s%El|60q`pnyA&1&1W_C+K^WlPGc7q_<N-?xtSc4AEJIdx!{D|5U`
z{av%71<C<xhW^aiew?fIDjv>X^mb>w)|A8duU<>bTGsPqX4FTQ)YGx|Yo(@5w&%B6
ze!F|+39-|=R%eA@IW+J4)eL=BhKe0`cbk3>O-;Kt-?nO}a*Kcy$HRZ;_MTS+ve+1A
f+*z}a@j!jk-tto`luWh(J<Z_h>gTe~DWM4fy)?4a

literal 0
HcmV?d00001

diff --git a/imp/themes/silver/graphics/undelete.png b/imp/themes/silver/graphics/undelete.png
new file mode 100644
index 0000000000000000000000000000000000000000..78252f5018befe0dd9cd930e057c7d698ebdb71c
GIT binary patch
literal 421
zcmV;W0b2fvP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00001b5ch_0Itp)
z=>Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RU0t*Bv7#$p~1^@s60%A)?L;(MX
zkIcUS00AjUL_t(2Q+<(3O9EjOK)>IjKWWx68I>lICFYpTOw8Cwn?i%2?14ShHYSu5
zDFqSKE(qFvt%{jHFoWCEV$24i?%7<p2kuKC{%4$2;$_2@hHv<~Tr*1X3BggyUW->G
z?>w?e!OJTV!BOmBz!xv{=yJy!JLH0_G7_Aa?cVZ9hjUK3pv4JKR9JK~F@!+a<{lq(
zX>-iMh#C(pkTyd>-ZP+q9-+z^yQCySAgtjtZR$ir!{L&-AwnSZVV@)RCj{$PD9Hv*
zw$LIJsZ%8pwkVp*^s%tU<rOq~BvHd5wV38^FhFM&jRJY{TvJ4K)o@KjPFV^}Za8F}
z5_PU9pa$yCp%93ylJU~iXwqbxSyV49N1m0ACykVx_Y?k%oHnK=pY=E2BbQG<=ku0}
P00000NkvXXu0mjfA2+BL

literal 0
HcmV?d00001

diff --git a/imp/themes/silver/screen-dimp.css b/imp/themes/silver/screen-dimp.css
index 4e9ad2dfe..1a7f048c2 100644
--- a/imp/themes/silver/screen-dimp.css
+++ b/imp/themes/silver/screen-dimp.css
@@ -93,36 +93,72 @@
     margin-top: -1px;
 }
 
-span.mailseenImg {
-    background-image: url("graphics/mail_seen.png");
+/* Context menu images */
+#ctx_message_reply span.contextImg {
+    background-image: url("graphics/reply.png");
 }
-span.mailunseenImg {
-    background-image: url("graphics/mail_unseen.png");
+#ctx_reply_reply span.contextImg, #ctx_reply_reply_all span.contextImg, #ctx_reply_reply_list span.contextImg {
+    background-image: url("graphics/replyall.png");
+}
+#ctx_message_forward span.contextImg, #ctx_forward_forward_all span.contextImg, #ctx_forward_forward_body span.contextImg, #ctx_forward_forward_attachments span.contextImg {
+    background-image: url("graphics/forward.png");
 }
-span.deleteImg {
+#ctx_folder_empty span.contextImg, #ctx_message_deleted span.contextImg, #ctx_draft_deleted span.contextImg, #oa_purge_deleted span.contextImg {
     background-image: url("graphics/delete.png");
 }
-span.createfolderImg {
-    background-image: url("graphics/folders/folder_create.png");
+#ctx_message_undeleted span.contextImg, #ctx_draft_undeleted span.contextImg, #oa_undeleted span.contextImg {
+    background-image: url("graphics/undelete.png");
 }
-span.editfolderImg {
-    background-image: url("graphics/folders/folder_edit.png");
+#flag_seen span.contextImg, #ctx_folder_seen span.contextImg {
+    background-image: url("graphics/mail_seen.png");
 }
-span.forwardImg {
-    background-image: url("graphics/forward.png");
+#flag_unseen span.contextImg, #ctx_folder_unseen span.contextImg, #ctx_folder_poll span.contextImg, #ctx_folder_nopoll span.contextImg {
+    background-image: url("graphics/mail_unseen.png");
 }
-span.mailflaggedImg {
+#ctx_message_setflag span.contextImg, #ctx_draft_setflag span.contextImg, #oa_setflag span.contextImg, #flag_flagged span.contextImg {
     background-image: url("graphics/mail_flagged.png");
 }
-span.clearflagImg {
+#flag_clear span.contextImg {
     background-image: url("graphics/mail_clearflag.png");
 }
-span.previewImg {
+#flag_answered span.contextImg {
+    background-image: url("graphics/mail_answered.png");
+}
+#flag_unanswered span.contextImg {
+    background-image: url("graphics/mail_notanswered.png");
+}
+#ctx_draft_resume span.contextImg {
+    background-image: url("graphics/mail_draft.png");
+}
+#previewtoggle span.contextImg {
     background-image: url("graphics/preview.png");
 }
-span.tickImg {
+#oa_selectall span.contextImg {
     background-image: url("graphics/tick.png");
 }
+#ctx_folder_create span.contextImg, #ctx_container_create span.contextImg {
+    background-image: url("graphics/folders/folder_create.png");
+}
+#ctx_folder_rename span.contextImg, #ctx_container_rename span.contextImg {
+    background-image: url("graphics/folders/folder_edit.png");
+}
+#ctx_folder_delete span.contextImg {
+    background-image: url("graphics/folders/folder_delete.png");
+}
+#ctx_message_spam span.contextImg {
+    background-image: url("graphics/spam.png");
+}
+#ctx_message_ham span.contextImg {
+    background-image: url("graphics/ham.png");
+}
+#ctx_message_blacklist span.contextImg, #oa_blacklist span.contextImg {
+    background-image: url("graphics/blacklist.png");
+}
+#ctx_message_whitelist span.contextImg, #oa_whitelist span.contextImg {
+    background-image: url("graphics/whitelist.png");
+}
+
+/* Other images */
 span.newwinImg {
     background-image: url("graphics/newwin.png");
 }
@@ -147,27 +183,6 @@ span.attachmentImg {
 span.msgsourceImg {
     background-image: url("graphics/message_source.png");
 }
-span.folderdeleteImg {
-    background-image: url("graphics/folders/folder_delete.png");
-}
-span.replyImg {
-    background-image: url("graphics/reply.png");
-}
-span.replyallImg {
-    background-image: url("graphics/replyall.png");
-}
-span.spamImg {
-    background-image: url("graphics/spam.png");
-}
-span.hamImg {
-    background-image: url("graphics/ham.png");
-}
-span.blacklistImg {
-    background-image: url("graphics/blacklist.png");
-}
-span.whitelistImg {
-    background-image: url("graphics/whitelist.png");
-}
 span.popdownImg, span.spellcheckPopdownImg {
     background-image: url("graphics/popdown.png");
 }
-- 
2.11.0