[Facebook] Use statusbar instead of popup messages

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

3 files changed, 13 insertions, 11 deletions

diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp
index 8a5b21a57..3408104de 100644
--- a/desktop-widgets/mainwindow.cpp
+++ b/desktop-widgets/mainwindow.cpp
@@ -12,6 +12,7 @@
 #include <QSettings>
 #include <QShortcut>
 #include <QToolBar>
+#include <QStatusBar>
 
 #include "core/version.h"
 #include "desktop-widgets/divelistview.h"
@@ -334,6 +335,9 @@ void MainWindow::setupSocialNetworkMenu()
 	FacebookManager *fb = FacebookManager::instance();
 	connect(fb, &FacebookManager::justLoggedIn, this, &MainWindow::facebookLoggedIn);
 	connect(fb, &FacebookManager::justLoggedOut, this, &MainWindow::facebookLoggedOut);
+	connect(fb, &FacebookManager::sendMessage, [this](const QString& msg) {
+		statusBar()->showMessage(msg, 10000); // show message for 10 secs on the statusbar.
+	});
 	share_on_fb = new QAction(this);
 	share_on_fb->setText(facebookPlugin->socialNetworkName());
 	share_on_fb->setIcon(QIcon(facebookPlugin->socialNetworkIcon()));
diff --git a/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp b/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp
index d4c3cab68..54c02ff3e 100644
--- a/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp
+++ b/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp
@@ -182,9 +182,11 @@ void FacebookManager::userIdReceived()
 	if (obj.keys().contains("id")) {
 		qCDebug(lcFacebook) << "User id requested successfully:" << obj.value("id").toString();
 		SettingsObjectWrapper::instance()->facebook->setUserId(obj.value("id").toString());
+		emit sendMessage(tr("Facebook logged in successfully"));
 		emit justLoggedIn(true);
 	} else {
-		qCDebug(lcFacebook) << "Error, user id unknown, cannot login.";
+		emit sendMessage(tr("Error, unknown user id, cannot login."));
+		qCDebug(lcFacebook) << "Error, unknown user id, cannot login.";
 	}
 	reply->deleteLater();
 }
@@ -281,17 +283,10 @@ void FacebookManager::uploadFinished()
 	reply->deleteLater();
 
 	if (obj.keys().contains("id")){
-		QMessageBox::information(qApp->activeWindow(),
-					 tr("Photo upload sucessfull"),
-					 tr("Your dive profile was updated to Facebook."),
-		QMessageBox::Ok);
+		emit sendMessage(tr("Dive uploaded successfully to Facebook"));
 	} else {
-		QMessageBox::information(qApp->activeWindow(),
-					 tr("Photo upload failed"),
-					 tr("Your dive profile was not updated to Facebook, \n "
-					    "please send the following to the developer. \n"
-					    + response),
-		QMessageBox::Ok);
+		emit sendMessage(tr("Dive upload failed. Please see debug output and send to Subsurface mailing list"));
+		qCDebug(lcFacebook) << "Dive upload failed" << response;
 	}
 
 	emit sendDiveFinished();
@@ -325,6 +320,7 @@ void FacebookConnectWidget::facebookLoggedIn()
 	ui->fbWebviewContainer->hide();
 	ui->fbWebviewContainer->setEnabled(false);
 	ui->FBLabel->setText(tr("To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry."));
+	close();
 }
 
 void FacebookConnectWidget::facebookDisconnect()
diff --git a/desktop-widgets/plugins/facebook/facebookconnectwidget.h b/desktop-widgets/plugins/facebook/facebookconnectwidget.h
index 1c9e56f76..3a442d4c9 100644
--- a/desktop-widgets/plugins/facebook/facebookconnectwidget.h
+++ b/desktop-widgets/plugins/facebook/facebookconnectwidget.h
@@ -38,11 +38,13 @@ public:
 	QUrl albumListUrl();
 	bool loggedIn();
 	QPixmap grabProfilePixmap();
+
 signals:
 	void justLoggedIn(bool triggererd);
 	void justLoggedOut(bool triggered);
 	void albumIdReceived(const QString& albumId);
 	void sendDiveFinished();
+	void sendMessage(const QString& message);
 
 public slots:
 	void tryLogin(const QUrl& loginResponse);