summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-11-09 05:47:25 (GMT)
committerMontel Laurent <montel@kde.org>2016-11-09 05:47:25 (GMT)
commitc2b0b2d8db3f1af755bd7eb986c8eec3048af74b (patch)
treec65aed2c3229920c8fbc951abdd668fd454f731f
parent42a5c00667e6440fcf3879a1dfdc9f31088f78d2 (diff)
We can't implement as it. => remove it for the moment
-rw-r--r--messageviewer/src/viewer/viewer_p.cpp2
-rw-r--r--messageviewer/src/viewer/webengine/mailwebengineview.cpp15
-rw-r--r--messageviewer/src/viewer/webengine/mailwebengineview.h2
3 files changed, 2 insertions, 17 deletions
diff --git a/messageviewer/src/viewer/viewer_p.cpp b/messageviewer/src/viewer/viewer_p.cpp
index 906d061..8c7f87a 100644
--- a/messageviewer/src/viewer/viewer_p.cpp
+++ b/messageviewer/src/viewer/viewer_p.cpp
@@ -603,6 +603,7 @@ void ViewerPrivate::showAttachmentPopup(KMime::Content *node, const QString &nam
}
}
+#if 0 //Reimplement in the future
const bool attachmentInHeader = mViewer->isAttachmentInjectionPoint(globalPos);
const bool hasScrollbar = mViewer->hasVerticalScrollBar();
if (attachmentInHeader && hasScrollbar) {
@@ -610,6 +611,7 @@ void ViewerPrivate::showAttachmentPopup(KMime::Content *node, const QString &nam
connect(action, SIGNAL(triggered(bool)), attachmentMapper, SLOT(map()));
attachmentMapper->setMapping(action, Viewer::ScrollTo);
}
+#endif
action = menu->addAction(QIcon::fromTheme(QStringLiteral("document-save-as")), i18n("Save As..."));
action->setEnabled(!deletedAttachment);
diff --git a/messageviewer/src/viewer/webengine/mailwebengineview.cpp b/messageviewer/src/viewer/webengine/mailwebengineview.cpp
index df6fc91..0378561 100644
--- a/messageviewer/src/viewer/webengine/mailwebengineview.cpp
+++ b/messageviewer/src/viewer/webengine/mailwebengineview.cpp
@@ -391,21 +391,6 @@ void MailWebEngineView::toggleFullAddressList(const QString &field, const boost:
runJavaScriptInWordId(MessageViewer::MailWebEngineScript::replaceInnerHtml(field, html));
}
-bool MailWebEngineView::hasVerticalScrollBar() const
-{
- qDebug() << "bool MailWebEngineView::hasVerticalScrollBar() const not implemented";
- //TODO
- return false;
-}
-
-bool MailWebEngineView::isAttachmentInjectionPoint(const QPoint &globalPos) const
-{
- Q_UNUSED(globalPos);
- qDebug() << "bool MailWebEngineView::isAttachmentInjectionPoint(const QPoint &globalPos) const not implemented";
- //TODO
- return false;
-}
-
void MailWebEngineView::scrollToRelativePosition(qreal pos)
{
runJavaScriptInWordId(WebEngineViewer::WebEngineScript::scrollToRelativePosition(pos));
diff --git a/messageviewer/src/viewer/webengine/mailwebengineview.h b/messageviewer/src/viewer/webengine/mailwebengineview.h
index babb573..f1556e1 100644
--- a/messageviewer/src/viewer/webengine/mailwebengineview.h
+++ b/messageviewer/src/viewer/webengine/mailwebengineview.h
@@ -57,8 +57,6 @@ public:
void scrollPageUp(int percent);
void injectAttachments(const boost::function<QString()> &delayedHtml);
- bool hasVerticalScrollBar() const;
- bool isAttachmentInjectionPoint(const QPoint &globalPos) const;
void scrollToRelativePosition(qreal pos);
void setAllowExternalContent(bool b);