diff options
| author |  Tomaz Canabrava <tomaz.canabrava@intel.com> | 2015-11-08 10:51:50 -0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-11-08 09:44:40 -0800 |
| commit | 486857f2b4264295a078de5dad541122186d22ab (patch) | |
| tree | 75d4cd4b0f4e142f49765310e743f7a4a595d944 | |
| parent | 70e6840d51d876b4d906f3af0a4be71bd3233e48 (diff) | |
| download | subsurface-486857f2b4264295a078de5dad541122186d22ab.tar.gz | |
Make it possible to connect to facebook again
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | desktop-widgets/mainwindow.cpp | 1 | ||||
| -rw-r--r-- | desktop-widgets/plugins/facebook/facebook_integration.cpp | 6 | ||||
| -rw-r--r-- | desktop-widgets/plugins/facebook/facebookconnectwidget.cpp | 1 | ||||
| -rw-r--r-- | subsurface-core/pluginmanager.cpp | 4 |
4 files changed, 10 insertions, 2 deletions
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index b9112c11a..740b38f76 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -260,6 +260,7 @@ MainWindow::MainWindow() : QMainWindow(), toggle_connection->setText(plugin->socialNetworkName()); toggle_connection->setIcon(QIcon(plugin->socialNetworkIcon())); toggle_connection->setData(QVariant::fromValue(plugin)); + connect(toggle_connection, &QAction::triggered, [plugin](bool triggered){ plugin->requestLogin(); }); QAction *share_on = new QAction(this); share_on->setText(plugin->socialNetworkName()); diff --git a/desktop-widgets/plugins/facebook/facebook_integration.cpp b/desktop-widgets/plugins/facebook/facebook_integration.cpp index 700c8f624..28e65254a 100644 --- a/desktop-widgets/plugins/facebook/facebook_integration.cpp +++ b/desktop-widgets/plugins/facebook/facebook_integration.cpp @@ -1,4 +1,7 @@ #include "facebook_integration.h" +#include "facebookconnectwidget.h" + +#include <QDebug> FacebookPlugin::FacebookPlugin(QObject* parent): QObject(parent) { @@ -12,7 +15,8 @@ bool FacebookPlugin::isConnected() void FacebookPlugin::requestLogin() { - + FacebookConnectWidget connectDialog; + connectDialog.exec(); } void FacebookPlugin::requestLogoff() diff --git a/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp b/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp index 1f2e1b09d..b5e402617 100644 --- a/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp +++ b/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp @@ -275,6 +275,7 @@ void FacebookManager::sendDive() } FacebookConnectWidget::FacebookConnectWidget(QWidget *parent) : QDialog(parent), ui(new Ui::FacebookConnectWidget) { + ui->setupUi(this); FacebookManager *fb = FacebookManager::instance(); facebookWebView = new QWebView(this); ui->fbWebviewContainer->layout()->addWidget(facebookWebView); diff --git a/subsurface-core/pluginmanager.cpp b/subsurface-core/pluginmanager.cpp index 5c0f22525..28c978280 100644 --- a/subsurface-core/pluginmanager.cpp +++ b/subsurface-core/pluginmanager.cpp @@ -40,8 +40,10 @@ void PluginManager::loadPlugins() if(!plugin) continue; - if (ISocialNetworkIntegration *social = qobject_cast<ISocialNetworkIntegration*>(plugin)) + if (ISocialNetworkIntegration *social = qobject_cast<ISocialNetworkIntegration*>(plugin)) { + qDebug() << "Adding the plugin: " << social->socialNetworkName(); _socialNetworks.push_back(social); + } } } |