Removed FacebookLoginBrowser class, replaced with QWebView.

[situare] / src / ui / mainwindow.h

diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h
index 2d2293c..14f5402 100644 (file)
--- a/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@ -28,10 +28,12 @@
 #define MAINWINDOW_H
 
 #include <QtGui/QMainWindow>
+#include <QSslError>
 #include <QUrl>
 
 #include "network/networkcookiejar.h"
 
+class QDialog;
 class QGraphicsScene;
 class QLabel;
 class QMessageBox;
@@ -39,8 +41,6 @@ class QNetworkReply;
 class QToolButton;
 class QWebView;
 
-class FacebookAuthentication;
-class FacebookLoginBrowser;
 class FriendListPanel;
 class FullScreenButton;
 class GeoCoordinate;
@@ -93,13 +93,7 @@ private:
  * MEMBER FUNCTIONS AND SLOTS
  ******************************************************************************/
 public:
-    FacebookLoginBrowser* buildFacebookLoginBrowser();
-
-    /**
-     * @brief Clears cookie jar
-     *
-     */
-    void clearCookieJar();
+    void buildLoginDialog(QWebView *browser);
 
     /**
      * @brief
@@ -166,17 +160,14 @@ public slots:
      */
     void buildInformationBox(const QString &message, bool modal=false);
 
+    void destroyLoginDialog();
+
     /**
      * @brief Slot for failed login
      */
     void loginFailed();
 
     /**
-     * @brief Slot to intercept signal when login with cookies is requested
-     */
-    void loginUsingCookies();
-
-    /**
      * @brief Public slot, which open settings dialog
      */
     void openSettingsDialog();
@@ -189,13 +180,6 @@ public slots:
     void setCrosshairVisibility(bool visible);
 
     /**
-     * @brief Sets username to member variable for login dialog
-     *
-     * @param username Username to be set
-     */
-    void setUsername(const QString &username);
-
-    /**
     * @brief Shows contact dialog.
     *
     * Shows contact dialog with contact's information.
@@ -280,11 +264,6 @@ private:
     void buildUserInfoPanel();
 
     /**
-     * @brief Build webview and connect slots
-     */
-    void buildWebView();
-
-    /**
      * @brief Build zoom button panel and connect slots
      */
     void buildZoomButtonPanel();
@@ -372,18 +351,6 @@ private slots:
     void gpsTimeout();
 
     /**
-     * @brief Slot to load cookies from settings
-     */
-    void loadCookies();
-
-    /**
-     * @brief Slot to intercept signal when webview has finished loading webpage
-     *
-     * @param done Status of the loading
-     */
-    void loadDone(bool done);
-
-    /**
     * @brief Called when map center point horizontal shifting is changed
     *
     * @param shifting New shifting value
@@ -396,14 +363,14 @@ private slots:
     void moveCrosshair();
 
     /**
-     * @brief Slot to save cookies to settings
+     * @brief Slot for settings dialog accepted.
      */
-    void saveCookies();
+    void settingsDialogAccepted();
 
     /**
-     * @brief Slot for settings dialog accepted.
+     * @brief Ignore SSL error from the reply
      */
-    void settingsDialogAccepted();
+    void sslErrors(QNetworkReply *reply, const QList<QSslError> &errors);
 
     /**
      * @brief Start location search (open search dialog)
@@ -415,13 +382,6 @@ private slots:
      */
     void toggleFullScreen();
 
-    /**
-     * @brief Slot to intercept signal from webview's networkaccessmanager
-     *
-     * @param reply Network reply (contains errors)
-     */
-    void webViewRequestFinished(QNetworkReply* reply);
-
 /*******************************************************************************
  * SIGNALS
  ******************************************************************************/
@@ -614,13 +574,6 @@ signals:
     void routeToCursor();
 
     /**
-     * @brief Signal to save username to settings
-     *
-     * @param username Username
-     */
-    void saveUsername(const QString &username);
-
-    /**
      * @brief Signal for location search
      *
      * @param location QString location
@@ -643,13 +596,6 @@ signals:
     void statusUpdate(const QString &status, const bool &publish);
 
     /**
-     * @brief Signals when webview's urlChanged signal is emitted
-     *
-     * @param url New url
-     */
-    void updateCredentials(const QUrl &url);
-
-    /**
      * @brief Signals when updateLocationDialog's data must be cleared
      *
      */
@@ -702,6 +648,8 @@ private:
     QAction *m_loginAct;                    ///< Action to Login/Logout
     QAction *m_toSettingsAct;               ///< Action to trigger switch to settings dialog
 
+    QDialog *m_loginDialog;                 ///< Login dialog
+
     QLabel *m_crosshair;                    ///< Label for center point crosshair
     QLabel *m_osmLicense;                   ///< Label for Open Street Map license
 
@@ -716,16 +664,12 @@ private:
     QString m_email;                        ///< Placeholder for email
     QString m_password;                     ///< Placeholder for password
 
-    QWebView *m_webView;                    ///< Shows facebook login page
-
-    FacebookLoginBrowser *m_facebookLoginBrowser;
     FriendListPanel *m_friendsListPanel;    ///< Instance of friends list panel
     FullScreenButton *m_fullScreenButton;   ///< Instance of the fullscreen toggle button
     IndicatorButtonPanel *m_indicatorButtonPanel;   ///< Instance of direction indicator button
     LocationSearchPanel *m_locationSearchPanel;     ///< Location search panel
     MapScale *m_mapScale;                   ///< Instance of the map scale
     MapView *m_mapView;                     ///< Instance of the map view
-    NetworkCookieJar *m_cookieJar;          ///< Placeholder for QNetworkCookies
     RoutingPanel *m_routingPanel;           ///< Instance of routing panel
     TabbedPanel *m_tabbedPanel;             ///< Widget for tabbed panels
     UserInfoPanel *m_userInfoPanel;         ///< Instance of the user information panel