From 287977b04c876cea73491d902a9f7353785730ec Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Sun, 8 Nov 2015 10:58:59 -0200 Subject: Change from uploadCurrentDive to requestUpload call Since we can't forbit the plugins to upload more than just the current dive, it's better to change the name of the call. also add a stub to make sure it's calling the right method inside the plugin. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- desktop-widgets/mainwindow.cpp | 1 + desktop-widgets/plugins/facebook/facebook_integration.cpp | 4 ++-- desktop-widgets/plugins/facebook/facebook_integration.h | 2 +- subsurface-core/isocialnetworkintegration.h | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 740b38f76..e727fce6c 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -268,6 +268,7 @@ MainWindow::MainWindow() : QMainWindow(), share_on->setData(QVariant::fromValue(plugin)); ui.menuShare_on->addAction(share_on); connections->addAction(toggle_connection); + connect(share_on, &QAction::triggered, [plugin](bool triggered) { plugin->requestUpload(); } } ui.menuShare_on->addSeparator(); ui.menuShare_on->addMenu(connections); diff --git a/desktop-widgets/plugins/facebook/facebook_integration.cpp b/desktop-widgets/plugins/facebook/facebook_integration.cpp index 28e65254a..43f74b8f9 100644 --- a/desktop-widgets/plugins/facebook/facebook_integration.cpp +++ b/desktop-widgets/plugins/facebook/facebook_integration.cpp @@ -34,7 +34,7 @@ QString FacebookPlugin::socialNetworkName() const return tr("Facebook"); } -void FacebookPlugin::uploadCurrentDive() +void FacebookPlugin::requestUpload() { - + qDebug() << "Upload Requested"; } diff --git a/desktop-widgets/plugins/facebook/facebook_integration.h b/desktop-widgets/plugins/facebook/facebook_integration.h index a9d212e7e..99362e747 100644 --- a/desktop-widgets/plugins/facebook/facebook_integration.h +++ b/desktop-widgets/plugins/facebook/facebook_integration.h @@ -15,7 +15,7 @@ public: virtual void requestLogoff(); virtual QString socialNetworkIcon() const; virtual QString socialNetworkName() const; - virtual void uploadCurrentDive(); + virtual void requestUpload(); }; #endif \ No newline at end of file diff --git a/subsurface-core/isocialnetworkintegration.h b/subsurface-core/isocialnetworkintegration.h index 778a171b3..0a38f951f 100644 --- a/subsurface-core/isocialnetworkintegration.h +++ b/subsurface-core/isocialnetworkintegration.h @@ -64,7 +64,7 @@ public: * to update to the social network. All widget stuff related to sendint * dive information should be executed inside this function. */ - virtual void uploadCurrentDive() = 0; + virtual void requestUpload() = 0; }; Q_DECLARE_INTERFACE(ISocialNetworkIntegration, "org.subsurface.ISocialNetworkIntegration.v1") -- cgit v1.2.3-70-g09d2