Commit 89c3af4b authored by Laurent Montel's avatar Laurent Montel 😁

Remove unused code

parent 98a9d875
...@@ -1163,6 +1163,7 @@ void ViewerPrivate::readConfig() ...@@ -1163,6 +1163,7 @@ void ViewerPrivate::readConfig()
#ifdef MESSAGEVIEWER_USE_QTWEBENGINE #ifdef MESSAGEVIEWER_USE_QTWEBENGINE
mViewer->settings()->setFontSize(QWebEngineSettings::MinimumFontSize, MessageViewer::MessageViewerSettings::self()->minimumFontSize()); mViewer->settings()->setFontSize(QWebEngineSettings::MinimumFontSize, MessageViewer::MessageViewerSettings::self()->minimumFontSize());
mViewer->settings()->setFontSize(QWebEngineSettings::MinimumLogicalFontSize, MessageViewer::MessageViewerSettings::self()->minimumFontSize()); mViewer->settings()->setFontSize(QWebEngineSettings::MinimumLogicalFontSize, MessageViewer::MessageViewerSettings::self()->minimumFontSize());
//TODO verify Qt5.7
//FIXME mViewer->settings()->setAttribute(QWebEngineSettings::PrintElementBackgrounds, MessageViewer::MessageViewerSettings::self()->printBackgroundColorImages()); //FIXME mViewer->settings()->setAttribute(QWebEngineSettings::PrintElementBackgrounds, MessageViewer::MessageViewerSettings::self()->printBackgroundColorImages());
#else #else
mViewer->settings()->setFontSize(QWebSettings::MinimumFontSize, MessageViewer::MessageViewerSettings::self()->minimumFontSize()); mViewer->settings()->setFontSize(QWebSettings::MinimumFontSize, MessageViewer::MessageViewerSettings::self()->minimumFontSize());
...@@ -1568,7 +1569,6 @@ void ViewerPrivate::createActions() ...@@ -1568,7 +1569,6 @@ void ViewerPrivate::createActions()
mZoomActionMenu = new MessageViewer::ZoomActionMenu(this); mZoomActionMenu = new MessageViewer::ZoomActionMenu(this);
#ifdef MESSAGEVIEWER_USE_QTWEBENGINE #ifdef MESSAGEVIEWER_USE_QTWEBENGINE
connect(mZoomActionMenu, &ZoomActionMenu::zoomChanged, mViewer, &MailWebEngineView::slotZoomChanged); connect(mZoomActionMenu, &ZoomActionMenu::zoomChanged, mViewer, &MailWebEngineView::slotZoomChanged);
connect(mZoomActionMenu, &ZoomActionMenu::zoomTextOnlyChanged, mViewer, &MailWebEngineView::slotZoomTextOnlyChanged);
#else #else
connect(mZoomActionMenu, &ZoomActionMenu::zoomChanged, mViewer, &MailWebView::slotZoomChanged); connect(mZoomActionMenu, &ZoomActionMenu::zoomChanged, mViewer, &MailWebView::slotZoomChanged);
connect(mZoomActionMenu, &ZoomActionMenu::zoomTextOnlyChanged, mViewer, &MailWebView::slotZoomTextOnlyChanged); connect(mZoomActionMenu, &ZoomActionMenu::zoomTextOnlyChanged, mViewer, &MailWebView::slotZoomTextOnlyChanged);
...@@ -3066,7 +3066,11 @@ void ViewerPrivate::slotBlockImage() ...@@ -3066,7 +3066,11 @@ void ViewerPrivate::slotBlockImage()
void ViewerPrivate::slotOpenBlockableItems() void ViewerPrivate::slotOpenBlockableItems()
{ {
#ifdef MESSAGEVIEWER_USE_QTWEBENGINE
qDebug() << "void ViewerPrivate::slotOpenBlockableItems() unimplemented";
#else
mViewer->openBlockableItemsDialog(); mViewer->openBlockableItemsDialog();
#endif
} }
void ViewerPrivate::addHelpTextAction(QAction *act, const QString &text) void ViewerPrivate::addHelpTextAction(QAction *act, const QString &text)
......
...@@ -123,15 +123,10 @@ void MailWebEngineView::selectAll() ...@@ -123,15 +123,10 @@ void MailWebEngineView::selectAll()
void MailWebEngineView::slotZoomChanged(qreal zoom) void MailWebEngineView::slotZoomChanged(qreal zoom)
{ {
qDebug()<<" void MailWebEngineView::slotZoomChanged(qreal zoom)*******"<<zoom;
setZoomFactor(zoom); setZoomFactor(zoom);
} }
void MailWebEngineView::slotZoomTextOnlyChanged(bool b)
{
Q_UNUSED(b);
qDebug() << "MailWebEngineView::slotZoomTextOnlyChanged unimplemented";
}
void MailWebEngineView::scamCheck() void MailWebEngineView::scamCheck()
{ {
d->mScamDetection->scanPage(page()); d->mScamDetection->scanPage(page());
...@@ -325,13 +320,10 @@ QUrl MailWebEngineView::linkOrImageUrlAt(const QPoint &global) const ...@@ -325,13 +320,10 @@ QUrl MailWebEngineView::linkOrImageUrlAt(const QPoint &global) const
return {}; return {};
} }
void MailWebEngineView::openBlockableItemsDialog()
{
//TODO
}
void MailWebEngineView::setAllowExternalContent(bool b) void MailWebEngineView::setAllowExternalContent(bool b)
{ {
d->mExternalReference->setAllowExternalContent(b); if (d->mExternalReference->allowExternalContent() != b) {
reload(); d->mExternalReference->setAllowExternalContent(b);
reload();
}
} }
...@@ -57,13 +57,11 @@ public: ...@@ -57,13 +57,11 @@ public:
void scrollToRelativePosition(double pos); void scrollToRelativePosition(double pos);
double relativePosition() const; double relativePosition() const;
QUrl linkOrImageUrlAt(const QPoint &global) const; QUrl linkOrImageUrlAt(const QPoint &global) const;
void openBlockableItemsDialog();
void setAllowExternalContent(bool b); void setAllowExternalContent(bool b);
public Q_SLOTS: public Q_SLOTS:
void slotZoomChanged(qreal zoom); void slotZoomChanged(qreal zoom);
void slotZoomTextOnlyChanged(bool b);
void slotShowDetails(); void slotShowDetails();
protected: protected:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment