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

making use of indentities indepent of mailing lists

Browse Source 
svn path=/trunk/kdenetwork/kmail/; revision=97394
wilder-work
Stephan Kulow 25 years ago
parent 84eeb6eb0e
commit 8ca8afd932
8 changed files with 56 additions and 55 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. 6
      kmfolder.cpp
  2. 14
      kmfolder.h
  3. 18
      kmfolderdia.cpp
  4. 2
      kmfolderdia.h
  5. 4
      kmfoldertree.cpp
  6. 31
      kmheaders.cpp
  7. 28
      kmmainwin.cpp
  8. 8
      kmmessage.cpp

6
kmfolder.cpp
Unescape View File

@ -1784,7 +1784,9 @@ void KMFolder::readConfig()
mMailingListEnabled = config->readBoolEntry("MailingListEnabled");
mMailingListPostingAddress = config->readEntry("MailingListPostingAddress");
mMailingListAdminAddress = config->readEntry("MailingListAdminAddress");
mMailingListIdentity = config->readEntry("MailingListIdentity");
mIdentity = config->readEntry("Identity");
if ( mIdentity.isEmpty() ) // backward compatiblity
mIdentity = config->readEntry("MailingListIdentity");
}
//-----------------------------------------------------------------------------
@ -1796,7 +1798,7 @@ void KMFolder::writeConfig()
config->writeEntry("MailingListEnabled", mMailingListEnabled);
config->writeEntry("MailingListPostingAddress", mMailingListPostingAddress);
config->writeEntry("MailingListAdminAddress", mMailingListAdminAddress);
config->writeEntry("MailingListIdentity", mMailingListIdentity);
config->writeEntry("Identity", mIdentity);
}
//-----------------------------------------------------------------------------

14
kmfolder.h
Unescape View File

@ -248,18 +248,18 @@ public:
void setMailingListPostAddress(const QString &address)
{ mMailingListPostingAddress = address; writeConfig(); }
const QString& mailingListPostAddress() const
QString mailingListPostAddress() const
{ return mMailingListPostingAddress; }
void setMailingListAdminAddress(const QString &address)
{ mMailingListAdminAddress = address; writeConfig(); }
const QString& mailingListAdminAddress() const
QString mailingListAdminAddress() const
{ return mMailingListAdminAddress; }
void setMailingListIdentity(const QString &identity)
{ mMailingListIdentity = identity; writeConfig(); }
const QString& mailingListIdentity() const
{ return mMailingListIdentity; }
void setIdentity(const QString &identity)
{ mIdentity = identity; writeConfig(); }
QString identity() const
{ return mIdentity; }
/** Tell the folder that a header field that is usually used for
the index (subject, from, ...) has changed of given message.
@ -384,7 +384,7 @@ protected:
bool mMailingListEnabled;
QString mMailingListPostingAddress;
QString mMailingListAdminAddress;
QString mMailingListIdentity;
QString mIdentity;
QString mImapPath;
QString mUidValidity;

18
kmfolderdia.cpp
Unescape View File

@ -130,10 +130,10 @@ KMFolderDialog::KMFolderDialog(KMFolder* aFolder, KMFolderDir *aFolderDir,
label = new QLabel( i18n("&Sender:"), idGroup );
idLayout->addWidget( label );
mailingListIdentity = new QComboBox( idGroup );
mailingListIdentity->insertStringList( KMIdentity::identities() );
label->setBuddy( mailingListIdentity );
idLayout->addWidget( mailingListIdentity, 3 );
identity = new QComboBox( idGroup );
identity->insertStringList( KMIdentity::identities() );
label->setBuddy( identity );
idLayout->addWidget( identity, 3 );
QGroupBox *mcGroup = new QGroupBox( i18n("Misc" ), page );
mcGroup->setColumnLayout( 0, Qt::Vertical );
@ -163,10 +163,10 @@ KMFolderDialog::KMFolderDialog(KMFolder* aFolder, KMFolderDir *aFolderDir,
holdsMailingList->setChecked(folder->isMailingList());
// markAnyMessage->setChecked( folder->isAnyMessageMarked() );
for (int i=0; i < mailingListIdentity->count(); ++i)
if (mailingListIdentity->text(i) == folder->mailingListIdentity()) {
mailingListIdentity->setCurrentItem(i);
break;
for (int i=0; i < identity->count(); ++i)
if (identity->text(i) == folder->identity()) {
identity->setCurrentItem(i);
break;
}
}
@ -248,7 +248,7 @@ void KMFolderDialog::slotOk()
folder->setMailingListPostAddress( mailingListPostAddress->text() );
// folder->setMailingListAdminAddress( mailingListAdminAddress->text() );
folder->setMailingListAdminAddress( QString::null );
folder->setMailingListIdentity( mailingListIdentity->currentText() );
folder->setIdentity( identity->currentText() );
// folder->setMarkAnyMessage( markAnyMessage->isChecked() );
}

2
kmfolderdia.h
Unescape View File

@ -36,7 +36,7 @@ protected:
QCheckBox *holdsMailingList, *markAnyMessage;
QLineEdit *mailingListPostAddress;
QComboBox *mailingListIdentity;
QComboBox *identity;
// QLineEdit *mailingListAdminAddress;
};

4
kmfoldertree.cpp
Unescape View File

@ -878,9 +878,9 @@ void KMFolderTree::mouseButtonPressed(int btn, QListViewItem *lvi, const QPoint
return;
KMMessage *msg = new KMMessage;
msg->initHeader(fti->folder->mailingListIdentity());
msg->initHeader(fti->folder->identity());
msg->setTo(fti->folder->mailingListPostAddress());
KMComposeWin *win = new KMComposeWin(msg,fti->folder->mailingListIdentity());
KMComposeWin *win = new KMComposeWin(msg,fti->folder->identity());
win->show();
}

31
kmheaders.cpp
Unescape View File

@ -1255,8 +1255,8 @@ void KMHeaders::forwardMsg ()
if (!msg) return;
QString id = msg->headerField( "X-KMail-Identity" );
if (id.isEmpty() && mFolder->isMailingList())
id = mFolder->mailingListIdentity();
if ( id.isEmpty() )
id = mFolder->identity();
kernel->kbp()->busy();
win = new KMComposeWin(msg->createForward(), id);
win->setCharset(msg->codec()->name(), TRUE);
@ -1275,16 +1275,15 @@ void KMHeaders::forwardAttachedMsg ()
if (msgList->count() >= 2) {
// don't respect X-KMail-Identity headers because they might differ for
// the selected mails
if (mFolder->isMailingList())
id = mFolder->mailingListIdentity();
id = mFolder->identity();
}
else if (msgList->count() == 1) {
KMMessage *msg = currentMsg();
id = msg->headerField( "X-KMail-Identity" );
if (id.isEmpty() && mFolder->isMailingList())
id = mFolder->mailingListIdentity();
if ( id.isEmpty() )
id = mFolder->identity();
}
KMMessage *fwdMsg = new KMMessage;
fwdMsg->initHeader(id);
@ -1312,7 +1311,7 @@ void KMHeaders::forwardAttachedMsg ()
// THIS HAS TO BE AFTER setCte()!!!!
msgPart->setBodyEncoded(QCString(thisMsg->asString()));
msgPart->setCharset("");
thisMsg->setStatus(KMMsgStatusForwarded);
win->addAttach(msgPart);
@ -1352,8 +1351,8 @@ void KMHeaders::noQuoteReplyToMsg()
kernel->kbp()->busy();
id = msg->headerField( "X-KMail-Identity" );
if (id.isEmpty() && mFolder->isMailingList())
id = mFolder->mailingListIdentity();
if ( id.isEmpty() )
id = mFolder->identity();
win = new KMComposeWin(msg->createReply(FALSE, FALSE, "", TRUE),id);
win->setCharset(msg->codec()->name(), TRUE);
win->setReplyFocus(false);
@ -1373,8 +1372,8 @@ void KMHeaders::replyToMsg (QString selection)
kernel->kbp()->busy();
id = msg->headerField( "X-KMail-Identity" );
if (id.isEmpty() && mFolder->isMailingList())
id = mFolder->mailingListIdentity();
if ( id.isEmpty() )
id = mFolder->identity();
win = new KMComposeWin(msg->createReply(FALSE, FALSE, selection),id);
win->setCharset(msg->codec()->name(), TRUE);
win->setReplyFocus();
@ -1394,8 +1393,8 @@ void KMHeaders::replyAllToMsg (QString selection)
kernel->kbp()->busy();
id = msg->headerField( "X-KMail-Identity" );
if (id.isEmpty() && mFolder->isMailingList())
id = mFolder->mailingListIdentity();
if ( id.isEmpty() )
id = mFolder->identity();
win = new KMComposeWin(msg->createReply(TRUE, FALSE, selection),id);
win->setCharset(msg->codec()->name(), TRUE);
win->setReplyFocus();
@ -1414,8 +1413,8 @@ void KMHeaders::replyListToMsg (QString selection)
kernel->kbp()->busy();
id = msg->headerField( "X-KMail-Identity" );
if (id.isEmpty() && mFolder->isMailingList())
id = mFolder->mailingListIdentity();
if ( id.isEmpty() )
id = mFolder->identity();
win = new KMComposeWin(msg->createReply(true, true, selection),id);
win->setCharset(msg->codec()->name(), TRUE);
win->setReplyFocus();

28
kmmainwin.cpp
Unescape View File

@ -690,17 +690,17 @@ void KMMainWin::slotCompose()
KMComposeWin *win;
KMMessage* msg = new KMMessage;
if (mFolder && mFolder->isMailingList()) {
kdDebug()<<QString("mFolder->isMailingList() %1").arg( mFolder->mailingListPostAddress().latin1())<<endl;;
msg->initHeader(mFolder->mailingListIdentity());
msg->setTo(mFolder->mailingListPostAddress());
if ( mFolder ) {
msg->initHeader( mFolder->identity() );
win = new KMComposeWin(msg,mFolder->mailingListIdentity());
}
else {
msg->initHeader();
win = new KMComposeWin(msg);
}
if (mFolder->isMailingList()) {
kdDebug()<<QString("mFolder->isMailingList() %1").arg( mFolder->mailingListPostAddress().latin1())<<endl;;
msg->setTo(mFolder->mailingListPostAddress());
}
win = new KMComposeWin(msg, mFolder->identity());
} else
win = new KMComposeWin(msg);
win->show();
@ -1364,8 +1364,8 @@ void KMMainWin::slotUrlClicked(const KURL &aUrl, int)
if (aUrl.protocol() == "mailto")
{
QString id = "";
if (mFolder && mFolder->isMailingList())
id = mFolder->mailingListIdentity();
if ( mFolder )
id = mFolder->identity();
msg = new KMMessage;
msg->initHeader(id);
@ -1421,8 +1421,8 @@ void KMMainWin::slotMailtoCompose()
KMMessage *msg = new KMMessage;
QString id = "";
if (mFolder && mFolder->isMailingList())
id = mFolder->mailingListIdentity();
if ( mFolder )
id = mFolder->identity();
msg->initHeader(id);
msg->setTo(mUrlCurrent.path());

8
kmmessage.cpp
Unescape View File

@ -647,8 +647,8 @@ KMMessage* KMMessage::createReply(bool replyToAll, bool replyToList, QString sel
QString id;
id = headerField("X-KMail-Identity");
if (id.isEmpty() && parent()->isMailingList())
id = parent()->mailingListIdentity();
if ( id.isEmpty() )
id = parent()->identity();
msg->initHeader(id);
if (!headerField("X-KMail-Transport").isEmpty())
msg->setHeaderField("X-KMail-Transport", headerField("X-KMail-Transport"));
@ -948,8 +948,8 @@ KMMessage* KMMessage::createForward(void)
int i;
id = headerField("X-KMail-Identity");
if (id.isEmpty() && parent() && parent()->isMailingList())
id = parent()->mailingListIdentity();
if ( id.isEmpty() && parent() )
id = parent()->identity();
msg->initHeader(id);
if (sHdrStyle == KMReaderWin::HdrAll) {

Write Preview
Loading…
Cancel
Save