Moved creating the FacebookLoginBrowser to FacebookAuthentication.

[situare] / src / ui / mainwindow.cpp

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 4ec70c4..7defcf4 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -35,7 +35,6 @@
 #include "common.h"
 #include "error.h"
 #include "facebookloginbrowser.h"
-#include "facebookservice/facebookauthentication.h"
 #include "friendlistpanel.h"
 #include "fullscreenbutton.h"
 #include "indicatorbuttonpanel.h"
@@ -74,10 +73,10 @@ MainWindow::MainWindow(QWidget *parent)
       m_refresh(false),
       m_mapCenterHorizontalShifting(0),
       m_progressIndicatorCount(0),
+      m_loginDialog(0),
       m_crosshair(0),
       m_email(), ///< @todo WTF?!?!?!?
       m_password(),
-      m_facebookLoginBrowser(0),
       m_fullScreenButton(0),
       m_indicatorButtonPanel(0),
       m_mapScale(0)
@@ -164,16 +163,6 @@ void MainWindow::buildCrosshair()
             this, SLOT(mapCenterHorizontalShiftingChanged(int)));
 }
 
-void MainWindow::buildFacebookLoginBrowser()
-{
-    qWarning() << __PRETTY_FUNCTION__;
-
-    if (!m_facebookLoginBrowser)
-        m_facebookLoginBrowser = new FacebookLoginBrowser(this);
-
-    emit loginBrowserCreated(m_facebookLoginBrowser);
-}
-
 void MainWindow::buildFriendListPanel()
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -292,6 +281,25 @@ void MainWindow::buildLocationSearchPanel()
             this, SIGNAL(searchHistoryItemClicked(QString)));
 }
 
+void MainWindow::buildLoginDialog(FacebookLoginBrowser *browser)
+{
+    qWarning() << __PRETTY_FUNCTION__;
+
+    if (!m_loginDialog) {
+        m_loginDialog = new QDialog(this);
+        if (m_loginDialog) {
+            m_loginDialog->setWindowTitle(tr("Login"));
+            m_loginDialog->setLayout(new QVBoxLayout());
+            m_loginDialog->layout()->addWidget(browser);
+            m_loginDialog->layout()->setContentsMargins(QMargins()); // zero margins
+            connect(m_loginDialog, SIGNAL(rejected()), this, SLOT(destroyLoginDialog()));
+        }
+    }
+
+    if (m_loginDialog)
+        m_loginDialog->show();
+}
+
 void MainWindow::buildMap()
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -524,13 +532,15 @@ void MainWindow::createMenus()
     m_viewMenu->setObjectName(tr("Menu"));
 }
 
-void MainWindow::destroyFacebookLoginBrowser()
+void MainWindow::destroyLoginDialog()
 {
     qWarning() << __PRETTY_FUNCTION__;
 
-    m_facebookLoginBrowser->hide();
-    m_facebookLoginBrowser->deleteLater();
-    m_facebookLoginBrowser = 0;
+    if (m_loginDialog) {
+        m_loginDialog->hide();
+        m_loginDialog->deleteLater();
+        m_loginDialog = 0;
+    }
 }
 
 void MainWindow::dialogFinished(int status)