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

Recover this lost commit:

Browse Source 
SVN_MERGE
------------------------------------------------------------------------
r1021989 | tnyblom | 2009-09-10 15:28:55 +0200 (Thu, 10 Sep 2009) | 3 lines

Migrate some settings to KConfigXT


------------------------------------------------------------------------

svn path=/trunk/KDE/kdepim/kmail/; revision=1104125
wilder-work
Thomas McGuire 16 years ago
parent 7a055aa2f9
commit 107deb912f
5 changed files with 14 additions and 50 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. 15
      configuredialog.cpp
  2. 35
      kmail.kcfg.cmake
  3. 4
      kmcomposewin.cpp
  4. 8
      kmmainwidget.cpp
  5. 2
      messageactions.cpp

15
configuredialog.cpp
Unescape View File

@ -3463,8 +3463,8 @@ void SecurityPage::GeneralTab::doLoadOther()
{
const KConfigGroup reader( KMKernel::config(), "Reader" );
mSGTab.mHtmlMailCheck->setChecked( GlobalSettings::self()->htmlMail() );
mSGTab.mExternalReferences->setChecked( GlobalSettings::self()->htmlLoadExternal() );
mSGTab.mHtmlMailCheck->setChecked( MessageViewer::GlobalSettings::self()->htmlMail() );
mSGTab.mExternalReferences->setChecked( MessageViewer::GlobalSettings::self()->htmlLoadExternal() );
mSGTab.mAutomaticallyImportAttachedKeysCheck->setChecked(
reader.readEntry( "AutoImportKeys", false ) );
@ -3478,7 +3478,7 @@ void SecurityPage::GeneralTab::doLoadOther()
num = mdn.readEntry( "quote-message", 0 );
if ( num < 0 || num >= mOrigQuoteGroup->buttons().count() ) num = 0;
mOrigQuoteGroup->button(num)->setChecked(true);
mSGTab.mNoMDNsWhenEncryptedCheck->setChecked( GlobalSettings::self()->notSendWhenEncrypted() );
mSGTab.mNoMDNsWhenEncryptedCheck->setChecked( MessageViewer::GlobalSettings::self()->notSendWhenEncrypted() );
}
void SecurityPage::GeneralTab::save()
@ -3486,14 +3486,13 @@ void SecurityPage::GeneralTab::save()
KConfigGroup reader( KMKernel::config(), "Reader" );
KConfigGroup mdn( KMKernel::config(), "MDN" );
if ( GlobalSettings::self()->htmlMail() != mSGTab.mHtmlMailCheck->isChecked())
if ( MessageViewer::GlobalSettings::self()->htmlMail() != mSGTab.mHtmlMailCheck->isChecked())
{
if (KMessageBox::warningContinueCancel(this, i18n("Changing the global "
"HTML setting will override all folder specific values."), QString(),
KStandardGuiItem::cont(), KStandardGuiItem::cancel(), "htmlMailOverride") == KMessageBox::Continue)
{
GlobalSettings::self()->setHtmlMail( mSGTab.mHtmlMailCheck->isChecked() );
QStringList names;
MessageViewer::GlobalSettings::self()->setHtmlMail( mSGTab.mHtmlMailCheck->isChecked() );
QList<Akonadi::Collection> collections = kmkernel->allFoldersCollection();
for (int i = 0; i < collections.size(); ++i)
{
@ -3503,11 +3502,11 @@ void SecurityPage::GeneralTab::save()
}
}
}
GlobalSettings::self()->setHtmlLoadExternal( mSGTab.mExternalReferences->isChecked() );
MessageViewer::GlobalSettings::self()->setHtmlLoadExternal( mSGTab.mExternalReferences->isChecked() );
reader.writeEntry( "AutoImportKeys", mSGTab.mAutomaticallyImportAttachedKeysCheck->isChecked() );
mdn.writeEntry( "default-policy", mMDNGroup->checkedId() );
mdn.writeEntry( "quote-message", mOrigQuoteGroup->checkedId() );
GlobalSettings::self()->setNotSendWhenEncrypted( mSGTab.mNoMDNsWhenEncryptedCheck->isChecked() );
MessageViewer::GlobalSettings::self()->setNotSendWhenEncrypted( mSGTab.mNoMDNsWhenEncryptedCheck->isChecked() );
MessageViewer::GlobalSettings::self()->setAlwaysDecrypt( mSGTab.mAlwaysDecrypt->isChecked() );
}

35
kmail.kcfg.cmake
Unescape View File

@ -267,10 +267,6 @@
<label>Word &amp;wrap at column:</label>
<default>true</default>
</entry>
<entry name="UseFixedFont" type="Bool" key="use-fixed-font">
<label>Use Fi&amp;xed Font</label>
<default>false</default>
</entry>
<entry name="LineWrapWidth" type="Int" key="break-at">
<label></label>
<default>78</default>
@ -502,40 +498,9 @@
<label>Close message window after replying or forwarding</label>
<default>false</default>
</entry>
<entry name="MimePaneHeight" type="Int">
<default>100</default>
</entry>
<entry name="MessagePaneHeight" type="Int">
<default>180</default>
</entry>
<entry name="headerStyle" type="String" key="header-style">
<label>What style of headers should be displayed</label>
<default>fancy</default>
</entry>
<entry name="headerSetDisplayed" type="String" key="header-set-displayed">
<label>How much of headers should be displayed</label>
<default>rich</default>
</entry>
<entry name="htmlMail" type="Bool">
<label>Prefer HTML to plain text</label>
<default>false</default>
</entry>
<entry name="htmlLoadExternal" type="Bool">
<label>Allow messages to load external references from the Internet</label>
<default>false</default>
</entry>
<entry name="attachmentStrategy" type="String" key="attachment-strategy">
<label>How attachments are shown</label>
<default>Smart</default>
</entry>
</group>
<group name="MDN">
<entry name="notSendWhenEncrypted" type="Bool" key="not-send-when-encrypted">
<label>Do not send MDNs in response to encrypted messages</label>
<default>true</default>
</entry>
<entry name="SendMDNsWithEmptySender" type="Bool">
<default>false</default>
<label>Send Message Disposition Notifications with an empty sender.</label>

4
kmcomposewin.cpp
Unescape View File

@ -641,7 +641,7 @@ void KMComposeWin::writeConfig( void )
GlobalSettings::self()->setPreviousFcc( QString::number(mFcc->currentCollection().id()) );
GlobalSettings::self()->setAutoSpellChecking(
mAutoSpellCheckingAction->isChecked() );
GlobalSettings::self()->setUseFixedFont( mFixedFontAction->isChecked() );
MessageViewer::GlobalSettings::self()->setUseFixedFont( mFixedFontAction->isChecked() );
if ( !mForceDisableHtml )
GlobalSettings::self()->setUseHtmlMarkup( mEditor->textMode() == KMeditor::Rich );
GlobalSettings::self()->setComposerSize( size() );
@ -1253,7 +1253,7 @@ void KMComposeWin::setupActions( void )
mFixedFontAction = new KToggleAction( i18n("Use Fi&xed Font"), this );
actionCollection()->addAction( "toggle_fixedfont", mFixedFontAction );
connect( mFixedFontAction, SIGNAL(triggered(bool) ), SLOT(slotUpdateFont()) );
mFixedFontAction->setChecked( GlobalSettings::self()->useFixedFont() );
mFixedFontAction->setChecked( MessageViewer::GlobalSettings::self()->useFixedFont() );
//these are checkable!!!
mUrgentAction = new KToggleAction(

8
kmmainwidget.cpp
Unescape View File

@ -490,8 +490,8 @@ void KMMainWidget::readPreConfig()
mReaderWindowActive = GlobalSettings::self()->readerWindowMode() != GlobalSettings::EnumReaderWindowMode::hide;
mReaderWindowBelow = GlobalSettings::self()->readerWindowMode() == GlobalSettings::EnumReaderWindowMode::below;
mHtmlPref = GlobalSettings::self()->htmlMail();
mHtmlLoadExtPref = GlobalSettings::self()->htmlLoadExternal();
mHtmlPref = MessageViewer::GlobalSettings::self()->htmlMail();
mHtmlLoadExtPref = MessageViewer::GlobalSettings::self()->htmlLoadExternal();
mEnableFavoriteFolderView = GlobalSettings::self()->enableFavoriteFolderView();
mEnableFolderQuickSearch = GlobalSettings::self()->enableFolderQuickSearch();
}
@ -2778,8 +2778,8 @@ void KMMainWidget::slotItemsFetchedForActivation( const Akonadi::Item::List &lis
Item msg = list.first();
KMReaderMainWin *win = new KMReaderMainWin( mFolderHtmlPref, mFolderHtmlLoadExtPref );
KConfigGroup reader( KMKernel::config(), "Reader" );
bool useFixedFont = mMsgView ? mMsgView->isFixedFont() : GlobalSettings::self()->useFixedFont();
const bool useFixedFont = mMsgView ? mMsgView->isFixedFont() :
MessageViewer::GlobalSettings::self()->useFixedFont();
win->setUseFixedFont( useFixedFont );
win->showMessage( overrideEncoding(), msg );
win->show();

2
messageactions.cpp
Unescape View File

@ -450,7 +450,7 @@ void MessageActions::slotPrintMsg()
const bool htmlOverride = mMessageView ? mMessageView->htmlOverride() : false;
const bool htmlLoadExtOverride = mMessageView ? mMessageView->htmlLoadExtOverride() : false;
const bool useFixedFont = mMessageView ? mMessageView->isFixedFont() :
GlobalSettings::self()->useFixedFont();
MessageViewer::GlobalSettings::self()->useFixedFont();
const QString overrideEncoding = mMessageView ? mMessageView->overrideEncoding() :
MessageViewer::GlobalSettings::self()->overrideCharacterEncoding();

Write Preview
Loading…
Cancel
Save