[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-devel
Subject: kmail 1.2 (kdenetwork 2.1.1) - patch for "flag" message status
From: Cristi Dumitrescu <cristid () chip ! ro>
Date: 2001-04-05 18:48:08
[Download RAW message or body]
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Apply the patch as usual and copy kmmsgflag.png to
kdenetwork-2.1.1/kmail/pics.
Good luck having your messages flagged! :)
Cristi
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.4 (GNU/Linux)
Comment: For info see http://www.gnupg.org
iD8DBQE6zL3oqlE04vVf7AURAgOjAJ9jF1LjHXnviDMcopE1B+bmHUrt0QCeIW05
PxqlEK3nXOL2ZoOEq7RiuEs=
=saCg
-----END PGP SIGNATURE-----
["kmmsgflag.png" (image/png)]
["patch-kmail-1.2-from-kde-2.1.1-flagstatus" (text/plain)]
diff -u --recursive kdenetwork-2.1.1/kmail-old/configuredialog.cpp \
kdenetwork-2.1.1/kmail/configuredialog.cpp
--- kdenetwork-2.1.1/kmail-old/configuredialog.cpp Thu Feb 15 02:28:45 2001
+++ kdenetwork-2.1.1/kmail/configuredialog.cpp Thu Apr 5 21:31:59 2001
@@ -823,6 +823,7 @@
modeList.append( i18n("Followed URL Link") );
modeList.append( i18n("New Message") );
modeList.append( i18n("Unread Message") );
+ modeList.append( i18n("Flag Message") );
mAppearance.colorList = new ColorListBox( page2 );
vlay->addWidget( mAppearance.colorList, 10 );
@@ -1484,6 +1485,10 @@
defaultColor = QColor("blue");
mAppearance.colorList->setColor(
8, config.readColorEntry("UnreadMessage",&defaultColor ) );
+
+ defaultColor = QColor(0,0x7F,0);
+ mAppearance.colorList->setColor(
+ 9, config.readColorEntry("FlagMessage",&defaultColor ) );
state = config.readBoolEntry("defaultColors", true );
mAppearance.customColorCheck->setChecked( state == false ? true : false );
diff -u --recursive kdenetwork-2.1.1/kmail-old/kmheaders.cpp \
kdenetwork-2.1.1/kmail/kmheaders.cpp
--- kdenetwork-2.1.1/kmail-old/kmheaders.cpp Fri Feb 23 23:32:05 2001
+++ kdenetwork-2.1.1/kmail/kmheaders.cpp Thu Apr 5 21:31:41 2001
@@ -52,6 +52,7 @@
QPixmap* KMHeaders::pixQueued = 0;
QPixmap* KMHeaders::pixSent = 0;
QPixmap* KMHeaders::pixFwd = 0;
+QPixmap* KMHeaders::pixFlag = 0;
QIconSet* KMHeaders::up = 0;
QIconSet* KMHeaders::down = 0;
bool KMHeaders::mTrue = true;
@@ -172,6 +173,10 @@
case KMMsgStatusSent:
setPixmap( 0, *KMHeaders::pixSent );
break;
+ case KMMsgStatusFlag:
+ setPixmap( 0, *KMHeaders::pixFlag );
+ mColor = &mPaintInfo->colFlag;
+ break;
default:
setPixmap( 0, *KMHeaders::pixOld );
break;
@@ -315,6 +320,7 @@
pixQueued= new QPixmap( UserIcon("kmmsgqueued") );
pixSent = new QPixmap( UserIcon("kmmsgsent") );
pixFwd = new QPixmap( UserIcon("kmmsgforwarded") );
+ pixFlag = new QPixmap( UserIcon("kmmsgflag") );
up = new QIconSet( UserIcon("abup" ), QIconSet::Small );
down = new QIconSet( UserIcon("abdown" ), QIconSet::Small );
}
@@ -374,6 +380,7 @@
QColor c2=QColor("red");
QColor c3=QColor("blue");
QColor c4=QColor(kapp->palette().normal().base());
+ QColor c5=QColor(0,0x7F,0);
if (!config->readBoolEntry("defaultColors",TRUE)) {
mPaintInfo.colFore = config->readColorEntry("ForegroundColor",&c1);
@@ -383,6 +390,7 @@
setPalette( newPal );
mPaintInfo.colNew = config->readColorEntry("NewMessage",&c2);
mPaintInfo.colUnread = config->readColorEntry("UnreadMessage",&c3);
+ mPaintInfo.colFlag = config->readColorEntry("FlagMessage",&c5);
}
else {
mPaintInfo.colFore = c1;
@@ -392,6 +400,7 @@
setPalette( newPal );
mPaintInfo.colNew = c2;
mPaintInfo.colUnread = c3;
+ mPaintInfo.colFlag = c5;
}
}
@@ -2067,6 +2076,7 @@
menu->insertItem(i18n("Replied"), (int)KMMsgStatusReplied);
menu->insertItem(i18n("Queued"), (int)KMMsgStatusQueued);
menu->insertItem(i18n("Sent"), (int)KMMsgStatusSent);
+ menu->insertItem(i18n("Flag"), (int)KMMsgStatusFlag);
}
*/
@@ -2095,6 +2105,7 @@
mOwner->repliedAction->plug(setStatusMenu);
mOwner->queueAction->plug(setStatusMenu);
mOwner->sentAction->plug(setStatusMenu);
+ mOwner->flagAction->plug(setStatusMenu);
mOwner->deleteAction->plug(menu);
menu->exec (QCursor::pos(), 0);
delete menu;
diff -u --recursive kdenetwork-2.1.1/kmail-old/kmheaders.h \
kdenetwork-2.1.1/kmail/kmheaders.h
--- kdenetwork-2.1.1/kmail-old/kmheaders.h Wed Jan 17 00:42:12 2001
+++ kdenetwork-2.1.1/kmail/kmheaders.h Thu Apr 5 21:07:14 2001
@@ -40,6 +40,7 @@
QColor colBack;
QColor colNew;
QColor colUnread;
+ QColor colFlag;
bool showSize; // Do we display the message size?
bool orderOfArrival;
bool status;
@@ -184,7 +185,7 @@
protected:
static QPixmap *pixNew, *pixUns, *pixDel, *pixOld, *pixRep, *pixSent,
- *pixQueued, *pixFwd;
+ *pixQueued, *pixFwd, *pixFlag;
// Look for color changes
virtual bool event(QEvent *e);
diff -u --recursive kdenetwork-2.1.1/kmail-old/kmmainwin.cpp \
kdenetwork-2.1.1/kmail/kmmainwin.cpp
--- kdenetwork-2.1.1/kmail-old/kmmainwin.cpp Fri Feb 9 20:44:26 2001
+++ kdenetwork-2.1.1/kmail/kmmainwin.cpp Thu Apr 5 21:23:38 2001
@@ -1101,6 +1101,12 @@
}
//-----------------------------------------------------------------------------
+void KMMainWin::slotSetMsgStatusFlag()
+{
+ mHeaders->setMsgStatus(KMMsgStatusFlag);
+}
+
+//-----------------------------------------------------------------------------
void KMMainWin::slotSetMsgStatusRead()
{
mHeaders->setMsgStatus(KMMsgStatusRead);
@@ -1549,6 +1555,9 @@
SLOT(slotSetMsgStatusQueued()), actionCollection(), "status_queued");
sentAction=new KAction( i18n("Sent"), 0, this,
SLOT(slotSetMsgStatusSent()), actionCollection(), "status_sent");
+ flagAction=new KAction( i18n("Flag"), 0, this,
+ SLOT(slotSetMsgStatusFlag()), actionCollection(), "status_flag");
+
KActionMenu *moveActionMenu = new KActionMenu( i18n("&Move to" ),
actionCollection(), "move_to" );
diff -u --recursive kdenetwork-2.1.1/kmail-old/kmmainwin.h \
kdenetwork-2.1.1/kmail/kmmainwin.h
--- kdenetwork-2.1.1/kmail-old/kmmainwin.h Thu Dec 14 16:19:13 2000
+++ kdenetwork-2.1.1/kmail/kmmainwin.h Thu Apr 5 21:22:53 2001
@@ -78,7 +78,8 @@
KAction *replyAction, *replyAllAction, *replyListAction,
*forwardAction, *redirectAction,
*deleteAction, *saveAsAction, *bounceAction, *editAction,
- *newAction,*unreadAction,*readAction,*repliedAction,*queueAction,*sentAction;
+ *newAction,*unreadAction,*readAction,*repliedAction,
+ *queueAction,*sentAction,*flagAction;
public slots:
virtual void show();
@@ -147,6 +148,7 @@
void slotSetMsgStatusReplied();
void slotSetMsgStatusQueued();
void slotSetMsgStatusSent();
+ void slotSetMsgStatusFlag();
void slotShowMsgSrc();
void slotSetHeaderStyle(int);
void slotSetEncoding();
diff -u --recursive kdenetwork-2.1.1/kmail-old/kmmainwin.rc \
kdenetwork-2.1.1/kmail/kmmainwin.rc
--- kdenetwork-2.1.1/kmail-old/kmmainwin.rc Mon Dec 11 11:08:02 2000
+++ kdenetwork-2.1.1/kmail/kmmainwin.rc Thu Apr 5 21:20:29 2001
@@ -68,6 +68,7 @@
<Action name="status_replied" />
<Action name="status_queued" />
<Action name="status_sent" />
+ <Action name="status_flag" />
</Menu>
<Action name="set_status" />
<Action name="move_to" />
diff -u --recursive kdenetwork-2.1.1/kmail-old/kmmsgbase.h \
kdenetwork-2.1.1/kmail/kmmsgbase.h
--- kdenetwork-2.1.1/kmail-old/kmmsgbase.h Wed Mar 7 23:25:02 2001
+++ kdenetwork-2.1.1/kmail/kmmsgbase.h Thu Apr 5 20:30:26 2001
@@ -20,7 +20,8 @@
KMMsgStatusReplied='A',
KMMsgStatusForwarded='F',
KMMsgStatusQueued='Q',
- KMMsgStatusSent='S'
+ KMMsgStatusSent='S',
+ KMMsgStatusFlag='G'
} KMMsgStatus;
class KMFolder;
diff -u --recursive kdenetwork-2.1.1/kmail-old/pics/Makefile.am \
kdenetwork-2.1.1/kmail/pics/Makefile.am
--- kdenetwork-2.1.1/kmail-old/pics/Makefile.am Mon Feb 28 21:10:42 2000
+++ kdenetwork-2.1.1/kmail/pics/Makefile.am Thu Apr 5 21:03:33 2001
@@ -5,7 +5,7 @@
kminsorgmsg.png kmmsgdel.png kmmsgnew.png kmmsgunseen.png \
kmmsgold.png kmmsgreplied.png kmtrash.png red-bullet.png \
kmmsgforwarded.png kmmsgqueued.png kmmsgsent.png \
- kmfldsent.png closed.png green-bullet.png \
+ kmmsgflag.png kmfldsent.png closed.png green-bullet.png \
stopwatch.xbm stopwatchMask.xbm kdelogo.xpm \
feather_white.png pub_key_red.png pgp-keys.png \
kmfolderfull.png abup.png abdown.png
diff -u --recursive kdenetwork-2.1.1/kmail-old/pics/Makefile.in \
kdenetwork-2.1.1/kmail/pics/Makefile.in
--- kdenetwork-2.1.1/kmail-old/pics/Makefile.in Tue Mar 20 18:28:58 2001
+++ kdenetwork-2.1.1/kmail/pics/Makefile.in Thu Apr 5 21:03:57 2001
@@ -205,7 +205,7 @@
SUBDIRS = toolbar
-data_DATA = green-bullet.png kmfldin.png kmfldout.png kmfolder.png kminsorgmsg.png \
kmmsgdel.png kmmsgnew.png kmmsgunseen.png kmmsgold.png kmmsgreplied.png kmtrash.png \
red-bullet.png kmmsgforwarded.png kmmsgqueued.png kmmsgsent.png kmfldsent.png \
closed.png green-bullet.png stopwatch.xbm stopwatchMask.xbm kdelogo.xpm \
feather_white.png pub_key_red.png pgp-keys.png kmfolderfull.png abup.png abdown.png \
+data_DATA = green-bullet.png kmfldin.png kmfldout.png kmfolder.png kminsorgmsg.png \
kmmsgdel.png kmmsgnew.png kmmsgunseen.png kmmsgold.png kmmsgreplied.png kmtrash.png \
red-bullet.png kmmsgforwarded.png kmmsgqueued.png kmmsgflag.png kmmsgsent.png \
kmfldsent.png closed.png green-bullet.png stopwatch.xbm stopwatchMask.xbm \
kdelogo.xpm feather_white.png pub_key_red.png pgp-keys.png kmfolderfull.png \
abup.png abdown.png
datadir = $(kde_datadir)/kmail/pics
@@ -221,7 +221,7 @@
#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=kmmsgqueued.png kmtrash.png kmmsgold.png red-bullet.png abdown.png \
kmmsgunseen.png kminsorgmsg.png kmmsgreplied.png kmfldsent.png kmfolder.png \
kmmsgnew.png kmmsgdel.png kmfolderfull.png kmmsgforwarded.png pub_key_red.png \
feather_white.png kmmsgsent.png green-bullet.png pgp-keys.png closed.png \
stopwatch.xbm abup.png kmfldin.png kmfldout.png stopwatchMask.xbm kdelogo.xpm \
+KDE_DIST=kmmsgqueued.png kmtrash.png kmmsgold.png red-bullet.png abdown.png \
kmmsgunseen.png kminsorgmsg.png kmmsgreplied.png kmfldsent.png kmfolder.png \
kmmsgnew.png kmmsgdel.png kmfolderfull.png kmmsgforwarded.png pub_key_red.png \
feather_white.png kmmsgflag.png kmmsgsent.png green-bullet.png pgp-keys.png \
closed.png stopwatch.xbm abup.png kmfldin.png kmfldout.png stopwatchMask.xbm \
kdelogo.xpm
DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) \
$(KDE_DIST)
Only in kdenetwork-2.1.1/kmail/pics: kmmsgflag.png
>> Visit http://master.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic