Merge branch 'new_panels' into locationlistview

Conflicts:
	src/src.pro
	src/ui/friendlistpanel.h

diff --cc src/src.pro
index 81399d9,c5e3962..bb9d204
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -69,20 -59,24 +69,23 @@@ SOURCES += main.cpp 
      ui/userinfopanel.cpp \
      ui/zoombutton.cpp \
      ui/zoombuttonpanel.cpp \
 -    ui/listview.cpp \
 -    ui/listitem.cpp \
 -    ui/listitemdelegate.cpp \
 -    ui/friendlistitemdelegate.cpp \
      ui/searchdialog.cpp \
-     ui/paneltab.cpp \
-     ui/tabbedpanel.cpp \
+     ui/panelbase.cpp \    
      ui/panelbar.cpp \
      ui/panelcontent.cpp \
-     ui/panelbase.cpp \
+     ui/paneltab.cpp \
      ui/paneltabbar.cpp \
-     user/user.cpp \
+     ui/tabbedpanel.cpp \
 +    ui/routingpanel.cpp \
++    ui/routewaypointlistitem.cpp \
 +    ui/routewaypointlistview.cpp \
-     ui/routewaypointlistitem.cpp
+     user/user.cpp
  HEADERS += application.h \
      common.h \
+     coordinates/geocoordinate.h \
+     coordinates/scenecoordinate.h \
      engine/engine.h \
+     engine/mce.h \
      error.h \
      facebookservice/facebookauthentication.h \
      facebookservice/facebookcommon.h \
@@@ -114,12 -116,15 +125,17 @@@
      ui/updatelocation/updatelocationdialog.h \
      ui/avatarimage.h \
      ui/friendlistitem.h \
+     ui/friendlistitemdelegate.h \
      ui/friendlistpanel.h \
++    ui/friendlistview.h \
+     ui/fullscreenbutton.h \
      ui/imagebutton.h \
+     ui/indicatorbutton.h \
+     ui/indicatorbuttonpanel.h \
      ui/logindialog.h \
++    ui/locationlistview.h \
      ui/mainwindow.h \
      ui/mapscale.h \
-     ui/panelcommon.h \
      ui/settingsdialog.h \
      ui/userinfo.h \
      ui/userinfopanel.h \
@@@ -143,25 -134,15 +145,18 @@@
      ui/listview.h \
      ui/listitem.h \
      ui/listitemdelegate.h \
-     ui/friendlistitemdelegate.h \
-     ui/listcommon.h \
      ui/searchdialog.h \
-     ui/locationlistitem.h \
-     ui/extendedlistitem.h \
-     ui/extendedlistitemstore.h \
-     ui/extendedlistitemdelegate.h \
-     ui/locationlistview.h \
-     ui/friendlistview.h \
-     error.h \
-     ui/paneltab.h \
-     ui/tabbedpanel.h \
+     ui/panelbase.h \    
      ui/panelbar.h \
      ui/panelcontent.h \
-     ui/panelbase.h \
+     ui/panelcommon.h \
+     ui/paneltab.h \
      ui/paneltabbar.h \
+     ui/tabbedpanel.h \
 +    ui/routingpanel.h \
++    ui/routewaypointlistitem.h \
 +    ui/routewaypointlistview.h \
-     ui/routewaypointlistitem.h
+     user/user.h
  QT += network \
      webkit
  

diff --cc src/ui/friendlistpanel.cpp
Simple merge

diff --cc src/ui/friendlistpanel.h
index dc83e0b,5b7f3bc..855bb9c
--- 1/src/ui/friendlistpanel.h
--- 2/src/ui/friendlistpanel.h
+++ b/src/ui/friendlistpanel.h
@@@ -80,16 -78,9 +80,16 @@@ private slots
      void clearFriendListFilter();
  
      /**
 +    * @brief Routes to selected friend.
 +    *
 +    * Emits routeToFriend if friend is selected from list.
 +    */
 +    void routeToSelectedFriend();
 +
 +    /**
-      * @brief Slot to show friends in list.
+      * @brief Slot to show friends in list
       *
-      * Shows only friends that are on userIDs list.
+      * Shows only friends that are on userIDs list
       * @param userIDs list of user ID's
       */
      void showFriendsInList(const QList<QString> &userIDs);
@@@ -106,12 -97,12 +106,19 @@@ signals
      void findFriend(const GeoCoordinate &coordinates);
  
      /**
 +    * @brief Signal for routing to friend.
 +    *
 +    * @param coordinates friend's geo coordinates
 +    */
 +    void routeToFriend(const GeoCoordinate &coordinates);
 +
++    /**
+      * @brief Signal for requesting a panel to be opened
+      *
+      * @param widget Pointer to the widget that emitted the signal
+      */
+     void showPanelRequested(QWidget *widget);
+ 
  /*******************************************************************************
   * DATA MEMBERS
   ******************************************************************************/

diff --cc src/ui/mainwindow.cpp
index 2b7acce,1d9fde4..120a47e
--- 1/src/ui/mainwindow.cpp
--- 2/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@@ -333,35 -327,11 +333,38 @@@ void MainWindow::buildPanels(
  
      connect(m_mapView, SIGNAL(viewResized(QSize)),
              m_tabbedPanel, SLOT(resizePanel(QSize)));
+ 
+     connect(m_friendsListPanel, SIGNAL(showPanelRequested(QWidget*)),
+             m_tabbedPanel, SLOT(showPanel(QWidget*)));
  }
  
 +void MainWindow::buildRoutingPanel()
 +{
 +    qDebug() << __PRETTY_FUNCTION__;
 +
 +    m_routingPanel = new RoutingPanel(this);
 +
 +    connect(this, SIGNAL(locationDataParsed(const QList<Location>&)),
 +            m_routingPanel, SLOT(populateLocationListView(const QList<Location>&)));
 +
 +    connect(m_routingPanel,
 +            SIGNAL(locationItemClicked(const GeoCoordinate&, const GeoCoordinate&)),
 +            this,
 +            SIGNAL(locationItemClicked(const GeoCoordinate&, const GeoCoordinate&)));
 +
 +    connect(m_routingPanel, SIGNAL(routeToLocation(const GeoCoordinate&)),
 +            this, SIGNAL(routeTo(const GeoCoordinate&)));
 +
 +    connect(this, SIGNAL(routeParsed(Route&)),
 +            m_routingPanel, SLOT(setRoute(Route&)));
 +
 +    connect(m_routingPanel, SIGNAL(routeWaypointItemClicked(GeoCoordinate)),
 +            this, SIGNAL(centerToCoordinates(GeoCoordinate)));
 +
 +    connect(m_routingPanel, SIGNAL(requestSearchLocation()),
 +            this, SLOT(startLocationSearch()));
 +}
 +
  void MainWindow::buildUserInfoPanel()
  {
      qDebug() << __PRETTY_FUNCTION__;