Merge branch 'new_panels' into locationlistview

Conflicts:
	src/map/mapengine.cpp
	src/src.pro
	src/ui/friendlistpanel.cpp

diff --cc src/engine/engine.cpp
Simple merge

diff --cc src/engine/engine.h
Simple merge

diff --cc src/map/mapengine.cpp
index 6ec3f04,98a9504..d6bdbd9
--- 1/src/map/mapengine.cpp
--- 2/src/map/mapengine.cpp
+++ b/src/map/mapengine.cpp
@@@ -484,17 -502,23 +509,34 @@@ void MapEngine::setTilesGridSize(const 
      m_tilesGridSize.setWidth(gridWidth);
  }
  
 +void MapEngine::showMapArea(const GeoCoordinate &swBound, const GeoCoordinate &neBound)
 +{
 +    qDebug() << __PRETTY_FUNCTION__;
 +
 +    QRect area;
 +    area.setTopRight(SceneCoordinate(neBound).toPointF().toPoint());
 +    area.setBottomLeft(SceneCoordinate(swBound).toPointF().toPoint());
 +
 +    centerAndZoomTo(area, false);
 +}
 +
+ void MapEngine::updateDirectionIndicator()
+ {
+     qDebug() << __PRETTY_FUNCTION__;
+ 
+     qreal distance = m_gpsPosition.distanceTo(m_sceneCoordinate);
+ 
+     qreal direction = m_sceneCoordinate.azimuthTo(SceneCoordinate(m_gpsPosition));
+ 
+     // direction indicator triangle should be drawn only if the gps location item is not currently
+     // visible on the view
+     bool drawDirectionIndicatorTriangle = true;
+     if (currentViewSceneRect().contains(m_gpsLocationItem->pos()))
+         drawDirectionIndicatorTriangle = false;
+ 
+     emit directionIndicatorValuesUpdate(direction, distance, drawDirectionIndicatorTriangle);
+ }
+ 
  void MapEngine::updateViewTilesSceneRect()
  {
      qDebug() << __PRETTY_FUNCTION__;

diff --cc src/map/mapengine.h
index fae035c,f05254e..846abef
--- 1/src/map/mapengine.h
--- 2/src/map/mapengine.h
+++ b/src/map/mapengine.h
@@@ -185,11 -185,17 +185,18 @@@ private
      * as big as possible.
      *
      * @param rect Target rect
 +    * @param useMargins true if margins should be added to rect, false otherwise
      */
 -    void centerAndZoomTo(QRect rect);
 +    void centerAndZoomTo(QRect rect, bool useMargins = true);
  
      /**
+     * @brief Returns the rect of the current scene area drawn on the view
+     *
+     * @returns Rect of the current scene area drawn on the view
+     */
+     QRectF currentViewSceneRect() const;
+ 
+     /**
       * @brief Request disabling of auto centering if centered too far from the real location.
       *
       * @param coordinate scene's center coordinate

diff --cc src/src.pro
index ae1a7bf,c880fed..6adbdef
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -55,11 -50,7 +55,12 @@@ SOURCES += main.cpp 
      ui/fullscreenbutton.cpp \
      ui/imagebutton.cpp \
      ui/indicatorbutton.cpp \
 +    ui/listitem.cpp \
 +    ui/listitemdelegate.cpp \
 +    ui/listview.cpp \
 +    ui/locationlistitem.cpp \
 +    ui/locationlistview.cpp \
+     ui/indicatorbuttonpanel.cpp \
      ui/logindialog.cpp \
      ui/mainwindow.cpp \
      ui/mapscale.cpp \

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

diff --cc src/ui/mainwindow.cpp
index 137a783,d40e185..327c643
--- 1/src/ui/mainwindow.cpp
--- 2/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@@ -308,8 -310,10 +312,11 @@@ void MainWindow::buildPanels(
      m_tabbedPanel = new TabbedPanel(this);
      m_tabbedPanel->addTab(m_userInfoPanel, QIcon(":/res/images/user_info.png"));
      m_tabbedPanel->addTab(m_friendsListPanel, QIcon(":/res/images/friend_list.png"));
 +    m_tabbedPanel->addTab(m_routingPanel, QIcon(":/res/images/routing.png"));
  
+     connect(m_tabbedPanel, SIGNAL(panelOpened()),
+             m_friendsListPanel, SLOT(clearFriendListFilter()));
+ 
      connect(m_mapView, SIGNAL(viewResized(QSize)),
              m_tabbedPanel, SLOT(resizePanel(QSize)));
  }

diff --cc src/ui/mainwindow.h
Simple merge