mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove Facebook from Plugins

Browse source 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2015-11-09 18:05:30 -02:00 • committed by Dirk Hohndel
parent 7b1950ca03
commit 66091ff853
4 changed files with 31 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -384,6 +384,7 @@ else()
${SUBSURFACE_TARGET} ${SUBSURFACE_TARGET}
subsurface_generated_ui subsurface_generated_ui
subsurface_interface subsurface_interface
facebook_integration
subsurface_profile subsurface_profile
subsurface_statistics subsurface_statistics
subsurface_models subsurface_models

51
desktop-widgets/mainwindow.cpp
View file

@ -55,6 +55,8 @@
#include "subsurface-core/isocialnetworkintegration.h" #include "subsurface-core/isocialnetworkintegration.h"
#include "subsurface-core/pluginmanager.h" #include "subsurface-core/pluginmanager.h"
#include "plugins/facebook/facebook_integration.h"
#if defined(FBSUPPORT) #if defined(FBSUPPORT)
#include "socialnetworks.h" #include "socialnetworks.h"
#endif #endif
@ -243,30 +245,7 @@ MainWindow::MainWindow() : QMainWindow(),
find_all_templates(); find_all_templates();
#endif #endif
if(PluginManager::instance().socialNetworkIntegrationPlugins().count()) { setupSocialNetworkMenu();
QMenu *connections = new QMenu(tr("Connect to"));
Q_FOREACH(ISocialNetworkIntegration *plugin, PluginManager::instance().socialNetworkIntegrationPlugins()){
QAction *toggle_connection = new QAction(this);
toggle_connection->setText(plugin->socialNetworkName());
toggle_connection->setIcon(QIcon(plugin->socialNetworkIcon()));
toggle_connection->setData(QVariant::fromValue(plugin));
connect(toggle_connection, SIGNAL(triggered()), this, SLOT(socialNetworkRequestConnect()));
QAction *share_on = new QAction(this);
share_on->setText(plugin->socialNetworkName());
share_on->setIcon(QIcon(plugin->socialNetworkIcon()));
share_on->setData(QVariant::fromValue(plugin));
ui.menuShare_on->addAction(share_on);
connections->addAction(toggle_connection);
connect(share_on, SIGNAL(triggered()), this, SLOT(socialNetworkRequestUpload()));
}
ui.menuShare_on->addSeparator();
ui.menuShare_on->addMenu(connections);
} else {
ui.menubar->removeAction(ui.menuShare_on->menuAction());
}
ui.menubar->show();
set_git_update_cb(&updateProgress); set_git_update_cb(&updateProgress);
} }
@ -276,10 +255,32 @@ MainWindow::~MainWindow()
m_Instance = NULL; m_Instance = NULL;
} }
void MainWindow::setupSocialNetworkMenu()
{
QMenu *connections = new QMenu(tr("Connect to"));
FacebookPlugin *facebookPlugin = new FacebookPlugin();
QAction *toggle_connection = new QAction(this);
toggle_connection->setText(facebookPlugin->socialNetworkName());
toggle_connection->setIcon(QIcon(facebookPlugin->socialNetworkIcon()));
toggle_connection->setData(QVariant::fromValue(facebookPlugin));
connect(toggle_connection, SIGNAL(triggered()), this, SLOT(socialNetworkRequestConnect()));
QAction *share_on = new QAction(this);
share_on->setText(facebookPlugin->socialNetworkName());
share_on->setIcon(QIcon(facebookPlugin->socialNetworkIcon()));
share_on->setData(QVariant::fromValue(facebookPlugin));
ui.menuShare_on->addAction(share_on);
connections->addAction(toggle_connection);
connect(share_on, SIGNAL(triggered()), this, SLOT(socialNetworkRequestUpload()));
ui.menuShare_on->addSeparator();
ui.menuShare_on->addMenu(connections);
ui.menubar->show();
}
void MainWindow::socialNetworkRequestConnect() void MainWindow::socialNetworkRequestConnect()
{ {
QAction *action = qobject_cast<QAction*>(sender()); QAction *action = qobject_cast<QAction*>(sender());
ISocialNetworkIntegration *plugin = action->data().value<ISocialNetworkIntegration*>(); FacebookPlugin *plugin = action->data().value<FacebookPlugin*>();
if (plugin->isConnected()) if (plugin->isConnected())
plugin->requestLogoff(); plugin->requestLogoff();
else else

1
desktop-widgets/mainwindow.h
View file

@ -225,6 +225,7 @@ private:
bool plannerStateClean(); bool plannerStateClean();
void setupForAddAndPlan(const char *model); void setupForAddAndPlan(const char *model);
void configureToolbar(); void configureToolbar();
void setupSocialNetworkMenu();
QDialog *survey; QDialog *survey;
struct dive copyPasteDive; struct dive copyPasteDive;
struct dive_components what; struct dive_components what;

6
desktop-widgets/plugins/facebook/CMakeLists.txt
View file

@ -1,7 +1,7 @@
set(FACEBOOK_PLUGIN_SRCS facebook_integration.cpp facebookconnectwidget.cpp) set(FACEBOOK_PLUGIN_SRCS facebook_integration.cpp facebookconnectwidget.cpp)
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_library(facebook_integration SHARED ${FACEBOOK_PLUGIN_SRCS}) add_library(facebook_integration STATIC ${FACEBOOK_PLUGIN_SRCS})
target_link_libraries(facebook_integration subsurface_corelib subsurface_interface ${QT_LIBRARIES}) target_link_libraries(facebook_integration ${QT_LIBRARIES})
add_dependencies(facebook_integration subsurface_corelib subsurface_interface) add_dependencies(facebook_integration subsurface_corelib)