Finished basic map scale feature

[situare] / src / ui / mainwindow.h

diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h
index c8b1231..d703912 100644 (file)
--- a/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@ -36,12 +36,15 @@ class QWebView;
 
 class FacebookAuthentication;
 class FriendListPanel;
+class MapScale;
 class MapScene;
 class MapView;
 class SituareService;
 class User;
 class UserInfoPanel;
 class ZoomButtonPanel;
+class SettingsDialog;
+class QToolButton;
 
 /**
 * @brief Main Window Class
@@ -129,7 +132,6 @@ public:
     const QString username();
 
 public slots:
-
     /**
     * @brief Slot to intercept signal when login has failed (loginFailure signal)
     *
@@ -178,6 +180,11 @@ public slots:
 
 private:
     /**
+      * @brief Build fullscreen toggle button and connect slots
+      */
+    void buildFullScreenButton();
+
+    /**
       * @brief Build friend list panel and connect slots
       */
     void buildFriendListPanel();
@@ -193,6 +200,11 @@ private:
     void buildMap();
 
     /**
+     * @brief Build map scale and connect slots
+     */
+    void buildMapScale();
+
+    /**
       * @brief Build OSM license and connect slots
       */
     void buildOsmLicense();
@@ -234,6 +246,20 @@ private:
 
 private slots:
     /**
+    * @brief Slot for drawing the fullscreen toggle button
+    *
+    * @param size Size of the screen
+    */
+    void drawFullScreenButton(const QSize &size);
+
+    /**
+    * @brief Slot for drawing the map distance scale
+    *
+    * @param size Size of the screen
+    */
+    void drawMapScale(const QSize &size);
+
+    /**
     * @brief Slot for drawing the Open Street Map license text
     *
     * @param size Size of the screen
@@ -249,13 +275,6 @@ private slots:
     void drawOwnLocationCrosshair(int width, int height);
 
     /**
-    * @brief Slot for gps error.
-    *
-    * @param message error message
-    */
-    void gpsError(const QString &message);
-
-    /**
     * @brief Slot for gps timeout.
     *
     * Called when request timeout occurs.
@@ -289,6 +308,11 @@ private slots:
     */
     void setViewPortSize(const int width, const int height);
 
+    /**
+    * @brief Toggle between fullscreen and normal window mode
+    */
+    void toggleFullScreen();
+
 /*******************************************************************************
  * SIGNALS
  ******************************************************************************/
@@ -314,6 +338,14 @@ signals:
     void centerToSceneCoordinates(QPoint sceneCoordinate);
 
     /**
+    * @brief Signal for enabling automatic location update.
+    *
+    * @param enabled true if enabled, false otherwise
+    * @param updateIntervalMsecs update interval in milliseconds
+    */
+    void enableAutomaticLocationUpdate(bool enabled, int updateIntervalMsecs);
+
+    /**
     * @brief Signal for requesting username from settings
     *
     */
@@ -385,6 +417,11 @@ signals:
     void minZoomLevelReached();
 
     /**
+     * @brief Forwarding signal from MapEngine to MapScale
+     */
+    void newMapResolution(qreal scale);
+
+    /**
     * @brief Signal for refreshing user data.
     *
     */
@@ -404,6 +441,13 @@ signals:
     void reverseGeoReady(const QString &address);
 
     /**
+    * @brief Signal to save username to settings
+    *
+    * @param username Username
+    */
+    void saveUsername(const QString &username);
+
+    /**
     * @brief Signal for requestLocationUpdate from SituareEngine
     *
     * @param status Status message
@@ -449,7 +493,6 @@ signals:
  * DATA MEMBERS
  ******************************************************************************/
 private:
-
     bool m_drawOwnLocationCrosshair;        ///< Flag for making ownLocationCrosshair visible or not
     bool m_loggedIn;                        ///< Indicates login state
     bool m_refresh;                         ///< Indicates when webpage is refreshed
@@ -470,15 +513,20 @@ private:
     QString m_email;                        ///< Placeholder for email
     QString m_password;                     ///< Placeholder for password
 
+    QToolButton *m_fullScreenButton;        ///< Instance of the fullscreen toggle button
+
     QWebView *m_webView;                    ///< Shows facebook login page
 
     FriendListPanel *m_friendsListPanel;    ///< Instance of friends list panel
+    MapScale *m_mapScale;                   ///< Instance of the map scale
     MapView *m_mapView;                     ///< Instance of the map view
     NetworkCookieJar *m_cookieJar;          ///< Placeholder for QNetworkCookies
     PanelSideBar *m_userPanelSidebar;       ///< User panel side bar
     PanelSideBar *m_friendsListPanelSidebar;///< Friends panel side bar
     UserInfoPanel *m_userPanel;             ///< Instance of the user information panel
     ZoomButtonPanel *m_zoomButtonPanel;     ///< Instance of zoom button panel
+
+    SettingsDialog *m_settingsDialog;       ///< Settings dialog
 };
 
 #endif // MAINWINDOW_H