diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2022-10-09 20:33:10 +0200 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2022-10-13 05:54:25 +0200 |
commit | c8e1b254e243af4368f5430d8478f7a3a66d1fc6 (patch) | |
tree | 9d51f004212c45f9cc4c2a7c5e634b43630ae46d /kmail/kmreaderwin.h | |
parent | 746e02af07f7dc223940ad80a0a234c0aff85850 (diff) | |
download | tdepim-c8e1b254e243af4368f5430d8478f7a3a66d1fc6.tar.gz tdepim-c8e1b254e243af4368f5430d8478f7a3a66d1fc6.zip |
Distinguish between settings and explicit override for external content
Summary:
This will allow KMail to properly communicate the difference also when
using per-folder settings for loading external references. This in turn
makes 746e02af07f7dc223940ad80a0a234c0aff85850 also work in that case.
Taken from KDE patches and adapted to TDE.
See https://phabricator.kde.org/D12393 and https://phabricator.kde.org/D12394
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'kmail/kmreaderwin.h')
-rw-r--r-- | kmail/kmreaderwin.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h index dfc4490c2..91e1702ea 100644 --- a/kmail/kmreaderwin.h +++ b/kmail/kmreaderwin.h @@ -199,9 +199,22 @@ public: bool htmlOverride() const { return mHtmlOverride; } void setHtmlOverride( bool override ); - /** Override default load external references setting */ + /** Get the load external references override setting */ bool htmlLoadExtOverride() const { return mHtmlLoadExtOverride; } - void setHtmlLoadExtOverride( bool override ); + + /** Default behavior for loading external references. + * Use this for specifying the external reference loading behavior as + * specified in the user settings. + * @see setHtmlLoadExtOverride + */ + void setHtmlLoadExtDefault(bool loadExtDefault); + + /** Override default load external references setting + * @warning This must only be called when the user has explicitly + * been asked to retrieve external references! + * @see setHtmlLoadExtDefault + */ + void setHtmlLoadExtOverride(bool loadExtOverride); /** Is html mail to be supported? Takes into account override */ bool htmlMail(); @@ -544,7 +557,7 @@ private: TQString renderAttachments( partNode *node, const TQColor &bgColor ); private: - bool mHtmlMail, mHtmlLoadExternal, mHtmlOverride, mHtmlLoadExtOverride; + bool mHtmlMail, mHtmlLoadExtDefault, mHtmlOverride, mHtmlLoadExtOverride; int mAtmCurrent; TQString mAtmCurrentName; KMMessage *mMessage; |