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

Restore FB grayed out when disconnected

Browse source 
See https://github.com/Subsurface-divelog/subsurface/issues/253. The original
behaviour (greyed out when disconnected) is restored. Not sure where and when
got lost, but this simple change fixes it.

Fixes #253

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2017-04-16 11:41:29 +02:00 • committed by Dirk Hohndel
parent a5d54b04a7
commit f2d88619c5
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
desktop-widgets/mainwindow.cpp
View file

@ -340,13 +340,14 @@ void MainWindow::setupSocialNetworkMenu()
FacebookManager *fb = FacebookManager::instance(); FacebookManager *fb = FacebookManager::instance();
connect(fb, &FacebookManager::justLoggedIn, this, &MainWindow::facebookLoggedIn); connect(fb, &FacebookManager::justLoggedIn, this, &MainWindow::facebookLoggedIn);
connect(fb, &FacebookManager::justLoggedOut, this, &MainWindow::facebookLoggedOut); connect(fb, &FacebookManager::justLoggedOut, this, &MainWindow::facebookLoggedOut);
QAction *share_on = new QAction(this); share_on_fb = new QAction(this);
share_on->setText(facebookPlugin->socialNetworkName()); share_on_fb->setText(facebookPlugin->socialNetworkName());
share_on->setIcon(QIcon(facebookPlugin->socialNetworkIcon())); share_on_fb->setIcon(QIcon(facebookPlugin->socialNetworkIcon()));
share_on->setData(QVariant::fromValue(obj)); share_on_fb->setData(QVariant::fromValue(obj));
ui.menuShare_on->addAction(share_on); share_on_fb->setEnabled(false);
ui.menuShare_on->addAction(share_on_fb);
connections->addAction(toggle_connection); connections->addAction(toggle_connection);
connect(share_on, SIGNAL(triggered()), this, SLOT(socialNetworkRequestUpload())); connect(share_on_fb, SIGNAL(triggered()), this, SLOT(socialNetworkRequestUpload()));
ui.menuShare_on->addSeparator(); ui.menuShare_on->addSeparator();
ui.menuShare_on->addMenu(connections); ui.menuShare_on->addMenu(connections);
ui.menubar->show(); ui.menubar->show();
@ -356,11 +357,13 @@ void MainWindow::setupSocialNetworkMenu()
void MainWindow::facebookLoggedIn() void MainWindow::facebookLoggedIn()
{ {
connections->setTitle(tr("Disconnect from")); connections->setTitle(tr("Disconnect from"));
share_on_fb->setEnabled(true);
} }
void MainWindow::facebookLoggedOut() void MainWindow::facebookLoggedOut()
{ {
connections->setTitle(tr("Connect to")); connections->setTitle(tr("Connect to"));
share_on_fb->setEnabled(false);
} }
void MainWindow::socialNetworkRequestConnect() void MainWindow::socialNetworkRequestConnect()

1
desktop-widgets/mainwindow.h
View file

@ -245,6 +245,7 @@ private:
WindowTitleUpdate *wtu; WindowTitleUpdate *wtu;
GpsLocation *locationProvider; GpsLocation *locationProvider;
QMenu *connections; QMenu *connections;
QAction *share_on_fb;
}; };
#endif // MAINWINDOW_H #endif // MAINWINDOW_H