From 8ca8afd9323b74649e919afd2eaae2facec44a6a Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 16 May 2001 14:06:23 +0000 Subject: [PATCH] making use of indentities indepent of mailing lists svn path=/trunk/kdenetwork/kmail/; revision=97394 --- kmfolder.cpp | 6 ++++-- kmfolder.h | 14 +++++++------- kmfolderdia.cpp | 18 +++++++++--------- kmfolderdia.h | 2 +- kmfoldertree.cpp | 4 ++-- kmheaders.cpp | 31 +++++++++++++++---------------- kmmainwin.cpp | 28 ++++++++++++++-------------- kmmessage.cpp | 8 ++++---- 8 files changed, 56 insertions(+), 55 deletions(-) diff --git a/kmfolder.cpp b/kmfolder.cpp index 2b7825d7f..947d08a21 100644 --- a/kmfolder.cpp +++ b/kmfolder.cpp @@ -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); } //----------------------------------------------------------------------------- diff --git a/kmfolder.h b/kmfolder.h index 168bdf2cb..7d7e74e44 100644 --- a/kmfolder.h +++ b/kmfolder.h @@ -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; diff --git a/kmfolderdia.cpp b/kmfolderdia.cpp index fd0fd7f69..82fb2d936 100644 --- a/kmfolderdia.cpp +++ b/kmfolderdia.cpp @@ -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() ); } diff --git a/kmfolderdia.h b/kmfolderdia.h index 32e24e9dc..bdbe15b08 100644 --- a/kmfolderdia.h +++ b/kmfolderdia.h @@ -36,7 +36,7 @@ protected: QCheckBox *holdsMailingList, *markAnyMessage; QLineEdit *mailingListPostAddress; - QComboBox *mailingListIdentity; + QComboBox *identity; // QLineEdit *mailingListAdminAddress; }; diff --git a/kmfoldertree.cpp b/kmfoldertree.cpp index c3c4eec79..e39800b92 100644 --- a/kmfoldertree.cpp +++ b/kmfoldertree.cpp @@ -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(); } diff --git a/kmheaders.cpp b/kmheaders.cpp index 8a4735c2e..d5abf96f7 100644 --- a/kmheaders.cpp +++ b/kmheaders.cpp @@ -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(); diff --git a/kmmainwin.cpp b/kmmainwin.cpp index 0305a6527..e32249f38 100644 --- a/kmmainwin.cpp +++ b/kmmainwin.cpp @@ -690,17 +690,17 @@ void KMMainWin::slotCompose() KMComposeWin *win; KMMessage* msg = new KMMessage; - if (mFolder && mFolder->isMailingList()) { - kdDebug()<isMailingList() %1").arg( mFolder->mailingListPostAddress().latin1())<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()<isMailingList() %1").arg( mFolder->mailingListPostAddress().latin1())<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()); diff --git a/kmmessage.cpp b/kmmessage.cpp index 5e4970be0..37a54abd5 100644 --- a/kmmessage.cpp +++ b/kmmessage.cpp @@ -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) {