Add some more icons to the main menu and the folder RMB menus

svn path=/trunk/kdenetwork/kmail/; revision=139597
wilder-work
Ingo Klcker 24 years ago
parent 720b1fc8d4
commit aa78202b12
  1. 16
      kmfoldertree.cpp
  2. 4
      kmmainwin.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()));

@ -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()),

Loading…
Cancel
Save