[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim] /: Fix headers
From: Montel Laurent <montel () kde ! org>
Date: 2015-10-01 5:57:08
Message-ID: E1ZhWrc-00014x-11 () scm ! kde ! org
[Download RAW message or body]
Git commit ebf084aab1d668889ccca57552acafa608cdddeb by Montel Laurent.
Committed on 01/10/2015 at 05:31.
Pushed by mlaurent into branch 'master'.
Fix headers
M +5 -0 kontact/src/kcmkontact.cpp
M +1 -4 kontact/src/kcmkontact.h
M +28 -7 messageviewer/src/viewer/csshelperbase.h
M +5 -0 messageviewer/src/viewer/objecttreeparser.cpp
M +1 -4 messageviewer/src/viewer/objecttreeparser.h
M +8 -0 messageviewer/src/viewer/urlhandlermanager.cpp
M +1 -7 messageviewer/src/viewer/urlhandlermanager.h
M +35 -0 messageviewer/src/viewer/viewer_p.cpp
M +28 -35 messageviewer/src/viewer/viewer_p.h
http://commits.kde.org/kdepim/ebf084aab1d668889ccca57552acafa608cdddeb
diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index 46533fa..6e3b15e 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@@ -109,6 +109,11 @@ PluginSelection::~PluginSelection()
{
}
+KComboBox *PluginSelection::comboBox() const
+{
+ return mPluginCombo;
+}
+
void PluginSelection::readConfig()
{
const KService::List offers = KServiceTypeTrader::self()->query(
diff --git a/kontact/src/kcmkontact.h b/kontact/src/kcmkontact.h
index 1062a2d..ae2b374 100644
--- a/kontact/src/kcmkontact.h
+++ b/kontact/src/kcmkontact.h
@@ -55,10 +55,7 @@ public:
void writeConfig() Q_DECL_OVERRIDE;
QList<QWidget *> widgets() const Q_DECL_OVERRIDE;
- KComboBox *comboBox() const
- {
- return mPluginCombo;
- }
+ KComboBox *comboBox() const;
private:
KComboBox *mPluginCombo;
diff --git a/messageviewer/src/viewer/csshelperbase.h \
b/messageviewer/src/viewer/csshelperbase.h index 7bbf086..47b8d79 100644
--- a/messageviewer/src/viewer/csshelperbase.h
+++ b/messageviewer/src/viewer/csshelperbase.h
@@ -81,20 +81,41 @@ protected:
void recalculatePGPColors();
protected:
- QFont mBodyFont, mPrintFont, mFixedFont, mFixedPrintFont;
+ QFont mBodyFont;
+ QFont mPrintFont;
+ QFont mFixedFont;
+ QFont mFixedPrintFont;
QFont mQuoteFont[3];
QColor mQuoteColor[3];
bool mRecycleQuoteColors;
bool mBackingPixmapOn;
bool mShrinkQuotes;
QString mBackingPixmapStr;
- QColor mForegroundColor, mLinkColor, mVisitedLinkColor, mBackgroundColor;
+ QColor mForegroundColor;
+ QColor mLinkColor;
+ QColor mVisitedLinkColor;
+ QColor mBackgroundColor;
// colors for PGP (Frame, Header, HeaderText, Body)
- QColor cPgpOk1F, cPgpOk1H, cPgpOk1HT, cPgpOk1B,
- cPgpOk0F, cPgpOk0H, cPgpOk0HT, cPgpOk0B,
- cPgpWarnF, cPgpWarnH, cPgpWarnHT, cPgpWarnB,
- cPgpErrF, cPgpErrH, cPgpErrHT, cPgpErrB,
- cPgpEncrF, cPgpEncrH, cPgpEncrHT, cPgpEncrB;
+ QColor cPgpOk1F;
+ QColor cPgpOk1H;
+ QColor cPgpOk1HT;
+ QColor cPgpOk1B;
+ QColor cPgpOk0F;
+ QColor cPgpOk0H;
+ QColor cPgpOk0HT;
+ QColor cPgpOk0B;
+ QColor cPgpWarnF;
+ QColor cPgpWarnH;
+ QColor cPgpWarnHT;
+ QColor cPgpWarnB;
+ QColor cPgpErrF;
+ QColor cPgpErrH;
+ QColor cPgpErrHT;
+ QColor cPgpErrB;
+ QColor cPgpEncrF;
+ QColor cPgpEncrH;
+ QColor cPgpEncrHT;
+ QColor cPgpEncrB;
// color of frame of warning preceding the source of HTML messages
QColor cHtmlWarning;
diff --git a/messageviewer/src/viewer/objecttreeparser.cpp \
b/messageviewer/src/viewer/objecttreeparser.cpp index dfb2bb2..b221e4d 100644
--- a/messageviewer/src/viewer/objecttreeparser.cpp
+++ b/messageviewer/src/viewer/objecttreeparser.cpp
@@ -243,6 +243,11 @@ bool ObjectTreeParser::hasPendingAsyncJobs() const
return mHasPendingAsyncJobs;
}
+QString ObjectTreeParser::plainTextContent() const
+{
+ return mPlainTextContent;
+}
+
QString ObjectTreeParser::htmlContent() const
{
return mHtmlContent;
diff --git a/messageviewer/src/viewer/objecttreeparser.h \
b/messageviewer/src/viewer/objecttreeparser.h index be575c2..ee9e7ab 100644
--- a/messageviewer/src/viewer/objecttreeparser.h
+++ b/messageviewer/src/viewer/objecttreeparser.h
@@ -332,10 +332,7 @@ public:
* composer's text editor if this was edited or replied to.
* This is usually the content of the first text/plain MIME part.
*/
- QString plainTextContent() const
- {
- return mPlainTextContent;
- }
+ QString plainTextContent() const;
/**
* Similar to plainTextContent(), but returns the HTML source of the first \
text/html MIME part.
diff --git a/messageviewer/src/viewer/urlhandlermanager.cpp \
b/messageviewer/src/viewer/urlhandlermanager.cpp index 7db7df3..8e074c8 100644
--- a/messageviewer/src/viewer/urlhandlermanager.cpp
+++ b/messageviewer/src/viewer/urlhandlermanager.cpp
@@ -397,6 +397,14 @@ URLHandlerManager::~URLHandlerManager()
DeleteAndSetToZero<URLHandler>());
}
+URLHandlerManager *URLHandlerManager::instance()
+{
+ if (!self) {
+ self = new URLHandlerManager();
+ }
+ return self;
+}
+
void URLHandlerManager::registerHandler(const URLHandler *handler)
{
if (!handler) {
diff --git a/messageviewer/src/viewer/urlhandlermanager.h \
b/messageviewer/src/viewer/urlhandlermanager.h index 2623cce..d207cce 100644
--- a/messageviewer/src/viewer/urlhandlermanager.h
+++ b/messageviewer/src/viewer/urlhandlermanager.h
@@ -66,13 +66,7 @@ class URLHandlerManager
public:
~URLHandlerManager();
- static URLHandlerManager *instance()
- {
- if (!self) {
- self = new URLHandlerManager();
- }
- return self;
- }
+ static URLHandlerManager *instance();
void registerHandler(const URLHandler *handler);
void unregisterHandler(const URLHandler *handler);
diff --git a/messageviewer/src/viewer/viewer_p.cpp \
b/messageviewer/src/viewer/viewer_p.cpp index de587c2..63f029e 100644
--- a/messageviewer/src/viewer/viewer_p.cpp
+++ b/messageviewer/src/viewer/viewer_p.cpp
@@ -456,6 +456,11 @@ void ViewerPrivate::editAttachment(KMime::Content *node, bool \
showWarning) job->canDeleteJob();
}
+MailWebView *ViewerPrivate::htmlPart() const
+{
+ return mViewer;
+}
+
void ViewerPrivate::createOpenWithMenu(QMenu *topMenu, const QString \
&contentTypeStr, bool fromCurrentContent) {
const KService::List offers = \
KFileItemActions::associatedApplications(QStringList() << contentTypeStr, QString()); \
@@ -726,11 +731,36 @@ void ViewerPrivate::attachmentOpen(KMime::Content *node) \
attachmentOpenWith(node, offer); }
+HtmlWriter *ViewerPrivate::htmlWriter() const
+{
+ return mHtmlWriter;
+}
+
CSSHelper *ViewerPrivate::cssHelper() const
{
return mCSSHelper;
}
+MessageViewer::NodeHelper *ViewerPrivate::nodeHelper() const
+{
+ return mNodeHelper;
+}
+
+Viewer *ViewerPrivate::viewer() const
+{
+ return q;
+}
+
+Akonadi::Item ViewerPrivate::messageItem() const
+{
+ return mMessageItem;
+}
+
+KMime::Message::Ptr ViewerPrivate::message() const
+{
+ return mMessage;
+}
+
bool ViewerPrivate::decryptMessage() const
{
if (!GlobalSettings::self()->alwaysDecrypt()) {
@@ -1155,6 +1185,11 @@ void ViewerPrivate::writeConfig(bool sync)
}
}
+const AttachmentStrategy *ViewerPrivate::attachmentStrategy() const
+{
+ return mAttachmentStrategy;
+}
+
void ViewerPrivate::setAttachmentStrategy(const AttachmentStrategy *strategy)
{
if (mAttachmentStrategy == strategy) {
diff --git a/messageviewer/src/viewer/viewer_p.h \
b/messageviewer/src/viewer/viewer_p.h index 6a2ac1a..98d3c46 100644
--- a/messageviewer/src/viewer/viewer_p.h
+++ b/messageviewer/src/viewer/viewer_p.h
@@ -207,10 +207,7 @@ public:
/** Access to the MailWebView used for the viewer. Use with
care! */
- MailWebView *htmlPart() const
- {
- return mViewer;
- }
+ MailWebView *htmlPart() const;
void showAttachmentPopup(KMime::Content *node, const QString &name, const QPoint \
&p);
@@ -230,34 +227,19 @@ public:
void attachmentOpen(KMime::Content *node);
/** Return the HtmlWriter connected to the MailWebView we use */
- HtmlWriter *htmlWriter() const
- {
- return mHtmlWriter;
- }
+ HtmlWriter *htmlWriter() const;
HeaderStylePlugin *headerStylePlugin() const;
CSSHelper *cssHelper() const;
- NodeHelper *nodeHelper() const
- {
- return mNodeHelper;
- }
+ NodeHelper *nodeHelper() const;
- Viewer *viewer() const
- {
- return q;
- }
+ Viewer *viewer() const;
- Akonadi::Item messageItem() const
- {
- return mMessageItem;
- }
+ Akonadi::Item messageItem() const;
- KMime::Message::Ptr message() const
- {
- return mMessage;
- }
+ KMime::Message::Ptr message() const;
/** Returns whether the message should be decryted. */
bool decryptMessage() const;
@@ -307,10 +289,7 @@ public:
void writeConfig(bool withSync = true);
/** Get/set the message attachment strategy. */
- const AttachmentStrategy *attachmentStrategy() const
- {
- return mAttachmentStrategy;
- }
+ const AttachmentStrategy *attachmentStrategy() const;
void setAttachmentStrategy(const AttachmentStrategy *strategy);
/** Get selected override character encoding.
@@ -612,7 +591,9 @@ private:
QString picsPath();
public:
NodeHelper *mNodeHelper;
- bool mHtmlMailGlobalSetting, mHtmlLoadExternalGlobalSetting, \
mHtmlLoadExtOverride; + bool mHtmlMailGlobalSetting;
+ bool mHtmlLoadExternalGlobalSetting;
+ bool mHtmlLoadExtOverride;
KMime::Message::Ptr mMessage; //the current message, if it was set manually
Akonadi::Item mMessageItem; //the message item from Akonadi
// widgets:
@@ -643,18 +624,30 @@ public:
QString mIdOfLastViewedMessage;
QWidget *mMainWindow;
KActionCollection *mActionCollection;
- QAction *mCopyAction, *mCopyURLAction,
- *mUrlOpenAction, *mSelectAllAction,
- *mScrollUpAction, *mScrollDownAction, *mScrollUpMoreAction, \
*mScrollDownMoreAction,
- *mViewSourceAction, *mSaveMessageAction, *mFindInMessageAction, \
*mSaveMessageDisplayFormat, *mResetMessageDisplayFormat; + QAction *mCopyAction;
+ QAction *mCopyURLAction;
+ QAction *mUrlOpenAction;
+ QAction *mSelectAllAction;
+ QAction *mScrollUpAction;
+ QAction *mScrollDownAction;
+ QAction *mScrollUpMoreAction;
+ QAction *mScrollDownMoreAction;
+ QAction *mViewSourceAction;
+ QAction *mSaveMessageAction;
+ QAction *mFindInMessageAction;
+ QAction *mSaveMessageDisplayFormat;
+ QAction *mResetMessageDisplayFormat;
KToggleAction *mHeaderOnlyAttachmentsAction;
KSelectAction *mSelectEncodingAction;
- KToggleAction *mToggleFixFontAction, *mToggleDisplayModeAction;
+ KToggleAction *mToggleFixFontAction;
+ KToggleAction *mToggleDisplayModeAction;
#ifndef KDEPIM_NO_WEBKIT
KToggleAction *mCaretBrowsing;
#endif
KToggleAction *mZoomTextOnlyAction;
- QAction *mZoomInAction, *mZoomOutAction, *mZoomResetAction;
+ QAction *mZoomInAction;
+ QAction *mZoomOutAction;
+ QAction *mZoomResetAction;
KToggleAction *mToggleMimePartTreeAction;
QAction *mSpeakTextAction;
QAction *mCopyImageLocation;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic