Commit 6dabb1b2 authored by Laurent Montel's avatar Laurent Montel 😁

Use new api

parent 909890ca
......@@ -136,7 +136,7 @@ else()
set(LIBMAILIMPORTER_VERSION_LIB "5.2.40")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.40")
set(KDEPIM_APPS_LIB_VERSION_LIB "5.2.42")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.64")
set(LIBKLEO_LIB_VERSION_LIB "5.2.40")
set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.2.40")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
......
......@@ -44,7 +44,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${accountwizard_SOURCE_DIR})
option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Xml DBus Test)
set(MAILCOMMON_LIB_VERSION_LIB "5.2.40")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.64")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
......
......@@ -42,7 +42,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${akonadiconsole_SOURCE_DIR})
set(QT_REQUIRED_VERSION "5.6.0")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Sql)
set(LIBMAILIMPORTER_VERSION_LIB "5.2.40")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.64")
set(LIBKLEO_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
set(KCALENDARCORE_LIB_VERSION "5.2.40")
......
......@@ -32,7 +32,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${akregator_SOURCE_DIR})
find_package(Grantlee5 "5.0" CONFIG REQUIRED)
set(LIBKLEO_LIB_VERSION_LIB "5.2.40")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.64")
set(KDEPIMLIBS_LIB_VERSION "5.2.40")
set(KPIMTEXTEDIT_LIB_VERSION "5.2.40")
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
......
......@@ -57,7 +57,6 @@ using namespace Akregator;
ArticleViewerWebEngine::ArticleViewerWebEngine(KActionCollection *ac, QWidget *parent)
: WebEngineViewer::WebEngineView(parent),
mActionCollection(ac),
mCurrentPosition(0),
mLastButtonClicked(LeftButton),
mViewerPluginToolManager(Q_NULLPTR)
{
......@@ -229,7 +228,7 @@ void ArticleViewerWebEngine::slotLoadFinished()
void ArticleViewerWebEngine::slotLoadStarted()
{
mWebEngineViewAccessKey->hideAccessKeys();
mCurrentPosition = 0;
clearRelativePosition();
setCursor(Qt::WaitCursor);
}
......@@ -346,19 +345,10 @@ void ArticleViewerWebEngine::setArticleAction(ArticleViewerWebEngine::ArticleAct
Q_EMIT articleAction(type, articleId, feed);
}
void ArticleViewerWebEngine::saveCurrentPosition()
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
mCurrentPosition = page()->scrollPosition().y();
qDebug() << "void ArticleViewerWebEngine::saveCurrentPosition()"<<mCurrentPosition;
#endif
}
void ArticleViewerWebEngine::restoreCurrentPosition()
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
qDebug()<<" void ArticleViewerWebEngine::restoreCurrentPosition()" << mCurrentPosition;
mPageEngine->runJavaScript(WebEngineViewer::WebEngineScript::scrollToRelativePosition(mCurrentPosition));
mPageEngine->runJavaScript(WebEngineViewer::WebEngineScript::scrollToRelativePosition(relativePosition()));
#endif
//TODO
}
......
......@@ -68,7 +68,6 @@ public:
void disableIntroduction();
void setArticleAction(ArticleViewerWebEngine::ArticleAction type, const QString &articleId, const QString &feed);
void saveCurrentPosition();
void restoreCurrentPosition();
void createViewerPluginToolManager(KActionCollection *ac, QWidget *parent);
......@@ -134,7 +133,6 @@ protected:
QList<QAction *> viewerPluginActionList(MessageViewer::ViewerPluginInterface::SpecificFeatureTypes features);
WebEngineViewer::NetworkAccessManagerWebEngine *mNetworkAccessManager;
private:
qreal mCurrentPosition;
MousePressedButtonType mLastButtonClicked;
MessageViewer::ViewerPluginToolManager *mViewerPluginToolManager;
WebEngineViewer::WebEngineAccessKey *mWebEngineViewAccessKey;
......
......@@ -101,7 +101,7 @@ void ArticleViewerWebEngineWidgetNg::slotSpeakText()
void ArticleViewerWebEngineWidgetNg::saveCurrentPosition()
{
mArticleViewerNg->saveCurrentPosition();
mArticleViewerNg->saveRelativePosition();
}
void ArticleViewerWebEngineWidgetNg::restoreCurrentPosition()
......
......@@ -39,7 +39,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${blogilo_SOURCE_DIR})
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Sql WebEngine WebEngineWidgets)
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.64")
# Find KF5 package
find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5DocTools ${KF5_VERSION} REQUIRED)
......
......@@ -29,7 +29,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${grantleeditor_SOURCE_DIR})
set(KDEPIM_VERSION_NUMBER "5.2.46")
set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.64")
set(KDEPIMLIBS_LIB_VERSION "5.2.40")
set(KPIMTEXTEDIT_LIB_VERSION "5.2.40")
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
......
......@@ -41,7 +41,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${importwizard_SOURCE_DIR})
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Gui)
set(LIBMAILIMPORTER_VERSION_LIB "5.2.40")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.40")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.64")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
set(IDENTITYMANAGEMENT_LIB_VERSION "5.2.40")
......
......@@ -63,7 +63,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${kmail_SOURCE_DIR})
set(LIBGRAVATAR_VERSION_LIB "5.2.40")
set(MAILCOMMON_LIB_VERSION_LIB "5.2.40")
set(KDEPIM_APPS_LIB_VERSION_LIB "5.2.42")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.64")
set(LIBKLEO_LIB_VERSION_LIB "5.2.40")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.2.40")
......
......@@ -34,7 +34,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${sieveeditor_SOURCE_DIR})
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
set(KDEPIM_LIB_SOVERSION "5")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.60")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.64")
set(PIMCOMMON_LIB_VERSION_LIB "5.2.40")
set(LIBKSIEVE_LIB_VERSION_LIB "5.2.41")
......
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