wilderjds
/
kmail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the mail-[mark-]unread-new and emblem-important

Browse Source 
icons in KMail, and also shrink the large
KIconLoader call to a less extensive SmallIcon("...").

svn path=/trunk/KDE/kdepim/; revision=754504
wilder-work
Jakob Petsovits 18 years ago
parent af5824856c
commit d9625d1c20
3 changed files with 12 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      kmheaders.cpp
  2. 4
      kmmainwidget.cpp
  3. 4
      kmsearchpattern.h

14
kmheaders.cpp
Unescape View File

@ -176,23 +176,25 @@ KMHeaders::KMHeaders( KMMainWidget *aOwner, QWidget *parent ) :
setShowSortIndicator(true);
setFocusPolicy( Qt::WheelFocus );
kDebug() << "Loading the important mail icon?";
if (!pixmapsLoaded)
{
pixmapsLoaded = true;
pixNew = new QPixmap( UserIcon( "mail-new" ) );
pixUns = new QPixmap( KIconLoader().loadIcon( "mail-unread", KIconLoader::Small ) );
pixNew = new QPixmap( SmallIcon( "mail-unread-new" ) );
pixUns = new QPixmap( SmallIcon( "mail-unread" ) );
pixDel = new QPixmap( UserIcon( "mail-deleted" ) );
pixRead = new QPixmap( KIconLoader().loadIcon( "mail-read", KIconLoader::Small ) );
pixRead = new QPixmap( SmallIcon( "mail-read" ) );
pixRep = new QPixmap( UserIcon( "mail-replied" ) );
pixQueued = new QPixmap( UserIcon( "mail-queued" ) );
pixTodo = new QPixmap( UserIcon( "mail-task" ) );
pixSent = new QPixmap( UserIcon( "mail-sent" ) );
pixFwd = new QPixmap( UserIcon( "mail-forwarded" ) );
pixFlag = new QPixmap( UserIcon( "mail-important" ) );
kDebug() << "Loading the important mail icon!!";
pixFlag = new QPixmap( SmallIcon( "mail-read", 0, KIconLoader::DefaultState, QStringList(QString()) << QString() << "emblem-important" ) );
pixWatched = new QPixmap( UserIcon( "mail-thread-watch" ) );
pixIgnored = new QPixmap( UserIcon( "mail-thread-ignored" ) );
pixSpam = new QPixmap( UserIcon( "mail-mark-junk" ) );
pixHam = new QPixmap( KIconLoader().loadIcon( "mail-mark-notjunk", KIconLoader::Small ) );
pixHam = new QPixmap( SmallIcon( "mail-mark-notjunk" ) );
pixFullySigned = new QPixmap( UserIcon( "mail-signed-verified" ) );
pixPartiallySigned = new QPixmap( UserIcon( "mail-signed-partially" ) );
pixUndefinedSigned = new QPixmap( UserIcon( "mail-signed" ) );
@ -201,7 +203,7 @@ KMHeaders::KMHeaders( KMMainWidget *aOwner, QWidget *parent ) :
pixUndefinedEncrypted = new QPixmap( UserIcon( "kmmsgundefinedencrypted" ) );
pixEncryptionProblematic = new QPixmap( UserIcon( "kmmsgencryptionproblematic" ) );
pixSignatureProblematic = new QPixmap( UserIcon( "kmmsgsignatureproblematic" ) );
pixAttachment = new QPixmap( KIconLoader().loadIcon( "mail-attachment", KIconLoader::Small ) );
pixAttachment = new QPixmap( SmallIcon( "mail-attachment" ) );
pixReadFwd = new QPixmap( UserIcon( "mail-forwarded" ) );
pixReadReplied = new QPixmap( UserIcon( "mail-replied" ) );
pixReadFwdReplied = new QPixmap( UserIcon( "mail-forwarded-replied" ) );

4
kmmainwidget.cpp
Unescape View File

@ -3117,7 +3117,7 @@ void KMMainWidget::setupActions()
mStatusMenu->addAction(action);
}
{
QAction *action = new KAction(KIcon("mail-mark-new"), i18n("Mark Message as &New"), this);
QAction *action = new KAction(KIcon("mail-mark-unread-new"), i18n("Mark Message as &New"), this);
actionCollection()->addAction("status_new", action );
action->setToolTip(i18n("Mark selected messages as new"));
connect(action, SIGNAL(triggered(bool)), SLOT(slotSetMsgStatusNew()));
@ -3165,7 +3165,7 @@ void KMMainWidget::setupActions()
mMarkThreadAsReadAction->setToolTip(i18n("Mark all messages in the selected thread as read"));
mThreadStatusMenu->addAction( mMarkThreadAsReadAction );
mMarkThreadAsNewAction = new KAction(KIcon("mail-mark-new"), i18n("Mark Thread as &New"), this);
mMarkThreadAsNewAction = new KAction(KIcon("mail-mark-unread-new"), i18n("Mark Thread as &New"), this);
actionCollection()->addAction("thread_new", mMarkThreadAsNewAction );
connect(mMarkThreadAsNewAction, SIGNAL(triggered(bool) ), SLOT(slotSetThreadStatusNew()));
mMarkThreadAsNewAction->setToolTip( i18n("Mark all messages in the selected thread as new"));

4
kmsearchpattern.h
Unescape View File

@ -232,8 +232,8 @@ namespace KMail {
// If you change the ordering here; also do it in the enum below
static const MessageStatus StatusValues[] = {
{ I18N_NOOP( "Important" ), "mail-important" },
{ I18N_NOOP( "New" ), "mail-new" },
{ I18N_NOOP( "Important" ), "emblem-important" },
{ I18N_NOOP( "New" ), "mail-unread-new" },
{ I18N_NOOP( "Unread" ), "mail-unread" },
{ I18N_NOOP( "Read" ), "mail-read" },
{ I18N_NOOP( "Old" ), 0 },

Write Preview
Loading…
Cancel
Save