Commit 991eadb4 authored by Laurent Montel's avatar Laurent Montel 😁

Remove adblock action

parent 02d68976
......@@ -18,7 +18,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(ECMQtDeclareLoggingCategory)
include(ECMAddTests)
set(MESSAGELIB_LIB_VERSION "5.2.57")
set(MESSAGELIB_LIB_VERSION "5.2.58")
set(KF5_VERSION "5.19.0")
set(KDEPIMLIBS_LIB_VERSION "5.2.40")
......
......@@ -80,8 +80,6 @@ void ViewerTest::shouldHaveDefaultValuesOnCreation()
QVERIFY(viewer.saveAsAction());
QVERIFY(viewer.saveMessageDisplayFormatAction());
QVERIFY(viewer.resetMessageDisplayFormatAction());
QVERIFY(viewer.blockImage());
QVERIFY(viewer.openBlockableItems());
QVERIFY(viewer.urlClicked().isEmpty());
QVERIFY(viewer.imageUrlClicked().isEmpty());
QCOMPARE(viewer.isFixedFont(), false);
......
......@@ -630,23 +630,6 @@ void Viewer::saveMainFrameScreenshotInFile(const QString &filename)
return d->saveMainFrameScreenshotInFile(filename);
}
QAction *Viewer::blockImage() const
{
Q_D(const Viewer);
return d->mBlockImage;
}
bool Viewer::adblockEnabled() const
{
return false;
}
QAction *Viewer::openBlockableItems() const
{
Q_D(const Viewer);
return d->mBlockableItems;
}
KActionMenu *Viewer::shareServiceUrlMenu() const
{
Q_D(const Viewer);
......
......@@ -292,8 +292,6 @@ public:
QAction *saveAsAction() const;
QAction *saveMessageDisplayFormatAction() const;
QAction *resetMessageDisplayFormatAction() const;
QAction *blockImage() const;
QAction *openBlockableItems() const;
KActionMenu *shareServiceUrlMenu() const;
HeaderStylePlugin *headerStylePlugin() const;
void setPluginName(const QString &pluginName);
......@@ -333,7 +331,6 @@ public:
void setExternalWindow(bool b);
void saveMainFrameScreenshotInFile(const QString &filename);
bool adblockEnabled() const;
bool mimePartTreeIsEmpty() const;
void showOpenAttachmentFolderWidget(const QUrl &url);
......
......@@ -1698,15 +1698,6 @@ void ViewerPrivate::createActions()
connect(mFindInMessageAction, &QAction::triggered, this, &ViewerPrivate::slotFind);
ac->setDefaultShortcut(mFindInMessageAction, KStandardShortcut::find().first());
mBlockImage = new QAction(i18n("Block image"), this);
ac->addAction(QStringLiteral("adblock_image"), mBlockImage);
ac->setShortcutsConfigurable(mBlockImage, false);
connect(mBlockImage, &QAction::triggered, this, &ViewerPrivate::slotBlockImage);
mBlockableItems = new QAction(i18n("Open Blockable Items..."), this);
ac->addAction(QStringLiteral("adblock_blockable_items"), mBlockableItems);
connect(mBlockableItems, &QAction::triggered, this, &ViewerPrivate::slotOpenBlockableItems);
mShareServiceUrlMenu = mShareServiceManager->menu();
ac->addAction(QStringLiteral("shareservice_menu"), mShareServiceUrlMenu);
connect(mShareServiceManager, &PimCommon::ShareServiceUrlManager::serviceUrlSelected, this, &ViewerPrivate::slotServiceUrlSelected);
......@@ -2937,19 +2928,6 @@ void ViewerPrivate::slotAddToWhiteList()
}
}
void ViewerPrivate::slotBlockImage()
{
if (mImageUrl.isEmpty()) {
return;
}
qDebug() << "void ViewerPrivate::slotBlockImage() unimplemented";
}
void ViewerPrivate::slotOpenBlockableItems()
{
qDebug() << "void ViewerPrivate::slotOpenBlockableItems() unimplemented";
}
void ViewerPrivate::addHelpTextAction(QAction *act, const QString &text)
{
act->setStatusTip(text);
......
......@@ -561,8 +561,6 @@ public Q_SLOTS:
void slotCopyImageLocation();
void slotSaveMessageDisplayFormat();
void slotResetMessageDisplayFormat();
void slotBlockImage();
void slotOpenBlockableItems();
void slotGeneralFontChanged();
......@@ -644,8 +642,6 @@ public:
KToggleAction *mToggleMimePartTreeAction;
QAction *mSpeakTextAction;
QAction *mCopyImageLocation;
QAction *mBlockImage;
QAction *mBlockableItems;
QUrl mHoveredUrl;
QUrl mClickedUrl;
QUrl mImageUrl;
......
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