Changeset View
Changeset View
Standalone View
Standalone View
messageviewer/src/viewer/viewer_p.cpp
| Show First 20 Lines • Show All 2796 Lines • ▼ Show 20 Line(s) | 2796 | if (mDisplayFormatMessageOverwrite == Viewer::UseGlobalSetting) { | |||
|---|---|---|---|---|---|
| 2797 | return mHtmlMailGlobalSetting; | 2797 | return mHtmlMailGlobalSetting; | ||
| 2798 | } else { | 2798 | } else { | ||
| 2799 | return mDisplayFormatMessageOverwrite == Viewer::Html; | 2799 | return mDisplayFormatMessageOverwrite == Viewer::Html; | ||
| 2800 | } | 2800 | } | ||
| 2801 | } | 2801 | } | ||
| 2802 | 2802 | | |||
| 2803 | bool ViewerPrivate::htmlLoadExternal() const | 2803 | bool ViewerPrivate::htmlLoadExternal() const | ||
| 2804 | { | 2804 | { | ||
| 2805 | if (!mNodeHelper || !mMessage) { | ||||
| 2806 | return mHtmlLoadExtOverride; | ||||
| 2807 | } | ||||
| 2808 | | ||||
| 2809 | // when displaying an encrypted message, only load external resources on explicit request | ||||
| 2810 | if (mNodeHelper->overallEncryptionState(mMessage.data()) != MimeTreeParser::KMMsgNotEncrypted) { | ||||
| 2811 | return mHtmlLoadExtOverride; | ||||
| 2812 | } | ||||
| 2813 | | ||||
| 2805 | return (mHtmlLoadExternalGlobalSetting && !mHtmlLoadExtOverride) | 2814 | return (mHtmlLoadExternalGlobalSetting && !mHtmlLoadExtOverride) | ||
| 2806 | || (!mHtmlLoadExternalGlobalSetting && mHtmlLoadExtOverride); | 2815 | || (!mHtmlLoadExternalGlobalSetting && mHtmlLoadExtOverride); | ||
| 2807 | } | 2816 | } | ||
| 2808 | 2817 | | |||
| 2809 | void ViewerPrivate::setDisplayFormatMessageOverwrite(Viewer::DisplayFormatMessage format) | 2818 | void ViewerPrivate::setDisplayFormatMessageOverwrite(Viewer::DisplayFormatMessage format) | ||
| 2810 | { | 2819 | { | ||
| 2811 | mDisplayFormatMessageOverwrite = format; | 2820 | mDisplayFormatMessageOverwrite = format; | ||
| 2812 | // keep toggle display mode action state in sync. | 2821 | // keep toggle display mode action state in sync. | ||
| ▲ Show 20 Lines • Show All 303 Lines • Show Last 20 Lines | |||||