diff options
Diffstat (limited to 'desktop-widgets/plugins')
-rw-r--r-- | desktop-widgets/plugins/facebook/facebookconnectwidget.cpp | 17 | ||||
-rw-r--r-- | desktop-widgets/plugins/facebook/facebookconnectwidget.h | 8 |
2 files changed, 24 insertions, 1 deletions
diff --git a/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp b/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp index e0d2aab67..40d598229 100644 --- a/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp +++ b/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp @@ -16,8 +16,11 @@ #include <QDebug> #include <QMessageBox> #include <QInputDialog> +#ifdef USE_WEBENGINE +#include <QWebEngineView> +#else #include <QWebView> - +#endif #include "mainwindow.h" #include "profile-widget/profilewidget2.h" @@ -224,14 +227,22 @@ void FacebookManager::sendDive() FacebookConnectWidget::FacebookConnectWidget(QWidget *parent) : QDialog(parent), ui(new Ui::FacebookConnectWidget) { ui->setupUi(this); FacebookManager *fb = FacebookManager::instance(); +#ifdef USE_WEBENGINE + facebookWebView = new QWebEngineView(this); +#else facebookWebView = new QWebView(this); +#endif ui->fbWebviewContainer->layout()->addWidget(facebookWebView); if (fb->loggedIn()) { facebookLoggedIn(); } else { facebookDisconnect(); } +#ifdef USE_WEBENGINE + connect(facebookWebView, &QWebEngineView::urlChanged, fb, &FacebookManager::tryLogin); +#else connect(facebookWebView, &QWebView::urlChanged, fb, &FacebookManager::tryLogin); +#endif connect(fb, &FacebookManager::justLoggedIn, this, &FacebookConnectWidget::facebookLoggedIn); } @@ -250,7 +261,11 @@ void FacebookConnectWidget::facebookDisconnect() ui->fbWebviewContainer->setEnabled(true); ui->FBLabel->setText(tr("To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline")); if (facebookWebView) { +#ifdef USE_WEBENGINE + //FIX ME +#else facebookWebView->page()->networkAccessManager()->setCookieJar(new QNetworkCookieJar()); +#endif facebookWebView->setUrl(FacebookManager::instance()->connectUrl()); } } diff --git a/desktop-widgets/plugins/facebook/facebookconnectwidget.h b/desktop-widgets/plugins/facebook/facebookconnectwidget.h index e97097806..8fbf249e2 100644 --- a/desktop-widgets/plugins/facebook/facebookconnectwidget.h +++ b/desktop-widgets/plugins/facebook/facebookconnectwidget.h @@ -2,7 +2,11 @@ #define FACEBOOKCONNECTWIDGET_H #include <QDialog> +#ifdef USE_WEBENGINE +class QWebEngineView; +#else class QWebView; +#endif namespace Ui { class FacebookConnectWidget; class SocialnetworksDialog; @@ -41,7 +45,11 @@ public: void facebookDisconnect(); private: Ui::FacebookConnectWidget *ui; +#ifdef USE_WEBENGINE + QWebEngineView *facebookWebView; +#else QWebView *facebookWebView; +#endif }; class SocialNetworkDialog : public QDialog { |