Changeset View
Changeset View
Standalone View
Standalone View
src/kmmainwidget.cpp
Show First 20 Lines • Show All 511 Lines • ▼ Show 20 Line(s) | 499 | #endif | |||
---|---|---|---|---|---|
512 | } | 512 | } | ||
513 | 513 | | |||
514 | mCurrentFolderSettings = FolderSettings::forCollection(col); | 514 | mCurrentFolderSettings = FolderSettings::forCollection(col); | ||
515 | mCurrentCollection = col; | 515 | mCurrentCollection = col; | ||
516 | 516 | | |||
517 | readFolderConfig(); | 517 | readFolderConfig(); | ||
518 | if (mMsgView) { | 518 | if (mMsgView) { | ||
519 | mMsgView->setDisplayFormatMessageOverwrite(mFolderDisplayFormatPreference); | 519 | mMsgView->setDisplayFormatMessageOverwrite(mFolderDisplayFormatPreference); | ||
520 | mMsgView->setHtmlLoadExtOverride(mFolderHtmlLoadExtPreference); | 520 | mMsgView->setHtmlLoadExtDefault(mFolderHtmlLoadExtPreference); | ||
521 | } | 521 | } | ||
522 | 522 | | |||
523 | if (!mCurrentFolderSettings->isValid() && (mMessagePane->count() < 2)) { | 523 | if (!mCurrentFolderSettings->isValid() && (mMessagePane->count() < 2)) { | ||
524 | slotIntro(); | 524 | slotIntro(); | ||
525 | } else { | 525 | } else { | ||
526 | if (mMessagePane->isHidden()) { | 526 | if (mMessagePane->isHidden()) { | ||
527 | mMessagePane->show(); | 527 | mMessagePane->show(); | ||
528 | } | 528 | } | ||
▲ Show 20 Lines • Show All 1034 Lines • ▼ Show 20 Line(s) | 1553 | if (mHtmlLoadExtGlobalSetting == mFolderHtmlLoadExtPreference) { | |||
1563 | if (result == KMessageBox::Cancel) { | 1563 | if (result == KMessageBox::Cancel) { | ||
1564 | mPreferHtmlLoadExtAction->setChecked(false); | 1564 | mPreferHtmlLoadExtAction->setChecked(false); | ||
1565 | return; | 1565 | return; | ||
1566 | } | 1566 | } | ||
1567 | } | 1567 | } | ||
1568 | mFolderHtmlLoadExtPreference = !mFolderHtmlLoadExtPreference; | 1568 | mFolderHtmlLoadExtPreference = !mFolderHtmlLoadExtPreference; | ||
1569 | 1569 | | |||
1570 | if (mMsgView) { | 1570 | if (mMsgView) { | ||
1571 | mMsgView->setHtmlLoadExtOverride(mFolderHtmlLoadExtPreference); | 1571 | mMsgView->setHtmlLoadExtDefault(mFolderHtmlLoadExtPreference); | ||
1572 | mMsgView->update(true); | 1572 | mMsgView->update(true); | ||
1573 | } | 1573 | } | ||
1574 | } | 1574 | } | ||
1575 | 1575 | | |||
1576 | //----------------------------------------------------------------------------- | 1576 | //----------------------------------------------------------------------------- | ||
1577 | void KMMainWidget::slotForwardInlineMsg() | 1577 | void KMMainWidget::slotForwardInlineMsg() | ||
1578 | { | 1578 | { | ||
1579 | if (!mCurrentFolderSettings) { | 1579 | if (!mCurrentFolderSettings) { | ||
▲ Show 20 Lines • Show All 2839 Lines • ▼ Show 20 Line(s) | 4391 | { | |||
4419 | Akonadi::Item copyItem(item); | 4419 | Akonadi::Item copyItem(item); | ||
4420 | if (mCurrentCollection.isValid()) { | 4420 | if (mCurrentCollection.isValid()) { | ||
4421 | copyItem.setParentCollection(mCurrentCollection); | 4421 | copyItem.setParentCollection(mCurrentCollection); | ||
4422 | } | 4422 | } | ||
4423 | 4423 | | |||
4424 | mMsgView->setMessage(copyItem); | 4424 | mMsgView->setMessage(copyItem); | ||
4425 | // reset HTML override to the folder setting | 4425 | // reset HTML override to the folder setting | ||
4426 | mMsgView->setDisplayFormatMessageOverwrite(mFolderDisplayFormatPreference); | 4426 | mMsgView->setDisplayFormatMessageOverwrite(mFolderDisplayFormatPreference); | ||
4427 | mMsgView->setHtmlLoadExtOverride(mFolderHtmlLoadExtPreference); | 4427 | mMsgView->setHtmlLoadExtDefault(mFolderHtmlLoadExtPreference); | ||
4428 | mMsgView->setDecryptMessageOverwrite(false); | 4428 | mMsgView->setDecryptMessageOverwrite(false); | ||
4429 | mMsgActions->setCurrentMessage(copyItem); | 4429 | mMsgActions->setCurrentMessage(copyItem); | ||
4430 | } | 4430 | } | ||
4431 | 4431 | | |||
4432 | void KMMainWidget::itemsFetchDone(KJob *job) | 4432 | void KMMainWidget::itemsFetchDone(KJob *job) | ||
4433 | { | 4433 | { | ||
4434 | delete mShowBusySplashTimer; | 4434 | delete mShowBusySplashTimer; | ||
4435 | mShowBusySplashTimer = nullptr; | 4435 | mShowBusySplashTimer = nullptr; | ||
▲ Show 20 Lines • Show All 255 Lines • Show Last 20 Lines |