From aa78202b12abbedf7068e5e16ed666f1b5245358 Mon Sep 17 00:00:00 2001
From: Ingo Klcker <kloecker@kde.org>
Date: Thu, 28 Feb 2002 20:05:34 +0000
Subject: [PATCH] Add some more icons to the main menu and the folder RMB menus

svn path=/trunk/kdenetwork/kmail/; revision=139597
---
 kmfoldertree.cpp | 16 ++++++++++------
 kmmainwin.cpp    |  4 ++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/kmfoldertree.cpp b/kmfoldertree.cpp
index 996dd3f43..5f6a5e07b 100644
--- a/kmfoldertree.cpp
+++ b/kmfoldertree.cpp
@@ -789,7 +789,8 @@ void KMFolderTree::rightButtonPressed(QListViewItem *lvi, const QPoint &p, int)
   if ((!fti->folder || (fti->folder->noContent()
     && fti->parent() == firstChild())))
   {
-    folderMenu->insertItem(i18n("&Create Child Folder..."), this,
+    folderMenu->insertItem(SmallIcon("folder_new"),
+                           i18n("&Create Child Folder..."), this,
                            SLOT(addChildFolder()));
     if (!fti->folder) {
       folderMenu->insertItem(i18n("Compact All &Folders"),
@@ -797,16 +798,18 @@ void KMFolderTree::rightButtonPressed(QListViewItem *lvi, const QPoint &p, int)
       folderMenu->insertItem(i18n("Expire All Folders"),
 			     kernel->folderMgr(), SLOT(expireAll()));
     } else if (fti->folder->protocol() == "imap")
-      folderMenu->insertItem(i18n("Check &Mail"),
+      folderMenu->insertItem(SmallIcon("mail_get"), i18n("Check &Mail"),
         static_cast<KMFolderImap*>(fti->folder)->account(),
         SLOT(processNewMail()));
   } else {
     if ((fti->folder == kernel->outboxFolder()) && (fti->folder->count()) )
-        folderMenu->insertItem(i18n("Send Queued"), topLevelWidget(),
-                                     SLOT(slotSendQueued()));
+        folderMenu->insertItem(SmallIcon("mail_send"),
+                               i18n("Send Queued"), topLevelWidget(),
+                               SLOT(slotSendQueued()));
     if (!fti->folder->isSystemFolder() || fti->folder->protocol() == "imap")
     {
-      folderMenu->insertItem(i18n("&Create Child Folder..."), this,
+      folderMenu->insertItem(SmallIcon("folder_new"),
+                             i18n("&Create Child Folder..."), this,
                              SLOT(addChildFolder()));
     }
 
@@ -826,7 +829,8 @@ void KMFolderTree::rightButtonPressed(QListViewItem *lvi, const QPoint &p, int)
                              SLOT(slotCompactFolder()));
       folderMenu->insertSeparator();
       if (fti->folder->countUnread() > 0)
-        folderMenu->insertItem(i18n("&Mark All Messages as Read"), topLevelWidget(),
+        folderMenu->insertItem(SmallIcon("goto"),
+                               i18n("&Mark All Messages as Read"), topLevelWidget(),
                                SLOT(slotMarkAllAsRead()));
       folderMenu->insertItem(i18n("&Empty"), topLevelWidget(),
                              SLOT(slotEmptyFolder()));
diff --git a/kmmainwin.cpp b/kmmainwin.cpp
index f646b471c..8481dbcc1 100644
--- a/kmmainwin.cpp
+++ b/kmmainwin.cpp
@@ -1918,7 +1918,7 @@ void KMMainWin::setupMenuBar()
   connect(actMenu,SIGNAL(activated(int)),this,SLOT(slotCheckOneAccount(int)));
   connect(actMenu,SIGNAL(aboutToShow()),this,SLOT(getAccountMenu()));
 
-  (void) new KAction( i18n("&Send Queued"), 0, this,
+  (void) new KAction( i18n("&Send Queued"), "mail_send", 0, this,
 		     SLOT(slotSendQueued()), actionCollection(), "send_queued");
 
   (void) new KAction( i18n("Address &Book..."), "contents", 0, this,
@@ -1957,7 +1957,7 @@ void KMMainWin::setupMenuBar()
   modifyFolderAction = new KAction( i18n("&Properties..."), 0, this,
 		      SLOT(slotModifyFolder()), actionCollection(), "modify" );
 
-  markAllAsReadAction = new KAction( i18n("&Mark All Messages as Read"), 0, this,
+  markAllAsReadAction = new KAction( i18n("&Mark All Messages as Read"), "goto", 0, this,
 		      SLOT(slotMarkAllAsRead()), actionCollection(), "mark_all_as_read" );
 
   expireFolderAction = new KAction(i18n("E&xpire"), 0, this, SLOT(slotExpireFolder()),