The first "kind of" working version of the new panels

[situare] / src / ui / mainwindow.h

diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h
index 126c929..52b1404 100644 (file)
--- a/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@ -29,7 +29,6 @@
 #include <QUrl>
 
 #include "network/networkcookiejar.h"
-#include "panelsidebar.h"
 
 class QGraphicsScene;
 class QLabel;
@@ -46,6 +45,7 @@ class GeoCoordinate;
 class MapScale;
 class MapScene;
 class MapView;
+class TabbedPanel;
 class SettingsDialog;
 class SceneCoordinate;
 class SituareService;
@@ -53,7 +53,6 @@ class User;
 class UserInfoPanel;
 class ZoomButtonPanel;
 
-
 /**
 * @brief Main Window Class
 */
@@ -113,13 +112,6 @@ public:
      */
     void readAutomaticLocationUpdateSettings();
 
-//    /**
-//     * @brief Enable / disable auto centering button.
-//     *
-//     * @param enabled true if shoud be enabled, false otherwise
-//     */
-//    void setAutoCenteringButtonEnabled(bool enabled);
-
     /**
      * @brief Enable / disable GPS button.
      *
@@ -158,7 +150,6 @@ public:
     const QString username();
 
 public slots:
-
     /**
      * @brief Build direction indicator button and connect slots
      */
@@ -585,6 +576,11 @@ signals:
     void clearUpdateLocationDialogData();
 
     /**
+    * @brief Dragging mode triggered.
+    */
+    void draggingModeTriggered();
+
+    /**
      * @brief MapView has finished zooming
      */
     void viewZoomFinished();
@@ -615,14 +611,12 @@ signals:
  * DATA MEMBERS
  ******************************************************************************/
 private:
-    bool m_drawOwnLocationCrosshair;        ///< Flag for making ownLocationCrosshair visible or not
     bool m_errorShown;                      ///< Indicates if error dialog/note is shown
     bool m_loggedIn;                        ///< Indicates login state
     bool m_refresh;                         ///< Indicates when webpage is refreshed
 
     int m_progressIndicatorCount;           ///< Indicates the number of progress indicator calls
 
-    QAction *m_autoCenteringAct;            ///< Action to auto center map using gps position
     QAction *m_gpsToggleAct;                ///< Action to trigger gps toggle
     QAction *m_loginAct;                    ///< Action to Login/Logout
     QAction *m_toSettingsAct;               ///< Action to trigger switch to settings dialog
@@ -647,13 +641,12 @@ private:
 
     FriendListPanel *m_friendsListPanel;    ///< Instance of friends list panel
     FullScreenButton *m_fullScreenButton;   ///< Instance of the fullscreen toggle button
-    IndicatorButton *m_indicatorButton;    ///< Instance of direction indicator button
+    IndicatorButton *m_indicatorButton;     ///< Instance of direction indicator button
     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
+    TabbedPanel *m_tabbedPanel;             ///< Widget for tabbed panels
+    UserInfoPanel *m_userInfoPanel;         ///< Instance of the user information panel
     ZoomButtonPanel *m_zoomButtonPanel;     ///< Instance of zoom button panel
 };