X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=UI%2FMailerUI%2FToolbars%2FSOGoMailObject.toolbar;h=a2ba2dbef9c6e83971cae7191b7e9d5125cca51e;hb=12135039e8259dcfde7c4be1fdb1af787e06fe87;hp=df7816b8c1048e955e2020b5f77ae394facaf739;hpb=9cd1ac40314d3684f7b716eca2212b4a6360ebd6;p=scalable-opengroupware.org

diff --git a/UI/MailerUI/Toolbars/SOGoMailObject.toolbar b/UI/MailerUI/Toolbars/SOGoMailObject.toolbar
index df7816b8..a2ba2dbe 100644
--- a/UI/MailerUI/Toolbars/SOGoMailObject.toolbar
+++ b/UI/MailerUI/Toolbars/SOGoMailObject.toolbar
@@ -1,50 +1,79 @@
-( /* the toolbar groups */
+( /* the toolbar groups -*-cperl-*- */
 
   ( /* first group */
-    { link  = "getMail";
-      cssClass = "tbicon_getmail"; label = "Get Mail"; },
-
-    { link     = "#"; // "compose"; // target = "_blank";
+    { link  = "#";
+      image = "tb-mail-getmail-flat-24x24.png";
+      cssClass = "tbicon_getmail";
+      label = "Get Mail";
+      onclick = "return refreshMailbox(this);";
+      tooltip = "Get new messages"; },
+    { link     = "#";
       isSafe   = NO;
-      onclick  = "clickedCompose(this);return false;";
-      cssClass = "tbicon_compose"; label = "Write";    },
+      image = "tb-mail-write-flat-24x24.png";
+      onclick  = "return onComposeMessage();";
+      cssClass = "tbicon_compose";
+      label = "Write";
+      tooltip = "Create a new message"; },
+    { link  = "#";
+      target = "addressbook";
+      onclick  = "openAddressbook(this);return false;";
+      image = "tb-mail-addressbook-flat-24x24.png";
+      cssClass = "tbicon_addressbook";
+      label = "Addressbook";
+      tooltip = "Go to address book"; },
   ),
 
   ( // second group
-    { link = "reply"; 
+    { link = "reply";
+      onclick = "return openMessageWindowsForSelection('reply');";
       isSafe   = NO;
-      cssClass = "tbicon_reply";    label = "Reply";     },
-
-    { link = "replyall"; 
+      image = "tb-mail-reply-flat-24x24.png";
+      cssClass = "tbicon_reply";
+      label = "Reply";
+      tooltip = "Reply to the message"; },
+    { link = "replyall";
+      onclick = "return openMessageWindowsForSelection('replyall');";
       isSafe   = NO;
-      cssClass = "tbicon_replyall"; label = "Reply All"; },
-
-    { link = "forward"; 
+      image = "tb-mail-replyall-flat-24x24.png";
+      cssClass = "tbicon_replyall";
+      label = "Reply All";
+      tooltip = "Reply to sender and all recipients"; },
+    { link = "forward";
+      onclick = "return openMessageWindowsForSelection('forward');";
       isSafe   = NO;
-      cssClass = "tbicon_forward";  label = "Forward";   },
+      image = "tb-mail-forward-flat-24x24.png";
+      cssClass = "tbicon_forward";
+      label = "Forward";
+      tooltip = "Forward selected message"; },
   ),
 
   ( // third group
-    { link     = "delete"; isSafe = NO;
-      enabled  = showMarkDeletedButton;
-      cssClass = "tbicon_delete"; label = "Delete"; },
-
-    { link     = "trash"; isSafe = NO;
-      enabled  = showTrashButton;
-      cssClass = "tbicon_delete"; label = "Delete"; },
-
-    /* TODO: enable when we know how to mark junk (#971)
-       => we could move the mail to the Junk folder?!
-              { link = "#"; 
-                isSafe   = NO;
-                cssClass = "tbicon_junk";   label = "Junk";   },
-     */
+    { link = "#";
+      isSafe = NO;
+      onclick = "onMenuDeleteMessage(event);";
+//       enabled  = showMarkDeletedButton;
+      image = "tb-mail-delete-flat-24x24.png";
+      cssClass = "tbicon_delete";
+      label = "Delete";
+      tooltip = "Delete selected message or folder"; },
+    { link = "#";
+      isSafe = NO;
+      image = "tb-mail-junk-flat-24x24.png";
+      cssClass = "tbicon_junk";
+      label = "Junk";
+      tooltip = "Mark the selected messages as junk"; },
   ),
-/*
-  ( // fourth group
-    // TODO: enable when we can print (#1207)
-    //  { link = "#"; cssClass = "tbicon_print"; label = "Print"; },
-    { link = "#"; cssClass = "tbicon_stop";  label = "Stop";  },
+  (
+   { link = "#";
+     onclick = "return onPrintCurrentMessage(event);";
+     cssClass = "tbicon_print";
+     image = "tb-mail-print-flat-24x24.png";
+     label = "Print"; 
+     tooltip = "Print this message"; },
+   { link = "#";
+     image = "tb-mail-stop-flat-24x24.png";
+     cssClass = "tbicon_stop";
+     label = "Stop";
+     tooltip = "Stop the current transfer"; },
   ),
-*/
-)
\ No newline at end of file
+)