Merge branch 'master' into new_panels_with_context_buttons

Conflicts:
	src/ui/routingpanel.cpp

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

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

diff --cc src/ui/routingpanel.cpp
index 7ad9016,f730136..017c10e
--- 1/src/ui/routingpanel.cpp
--- 2/src/ui/routingpanel.cpp
+++ b/src/ui/routingpanel.cpp
@@@ -22,18 -21,17 +22,20 @@@ RoutingPanel::RoutingPanel(QWidget *par
      setLayout(routingLayout);
  
      QHBoxLayout *headerLayout = new QHBoxLayout();
-     headerLayout->setContentsMargins(PANEL_MARGIN_LEFT, 0,
-                                      PANEL_MARGIN_RIGHT, 0);
+     headerLayout->setContentsMargins(PANEL_MARGIN_LEFT, PANEL_MARGIN_TOP,
+                                      PANEL_MARGIN_RIGHT, PANEL_MARGIN_BOTTOM);
  
      QVBoxLayout *listViewLayout = new QVBoxLayout;
-     listViewLayout->setContentsMargins(PANEL_MARGIN_LEFT, 0, PANEL_MARGIN_RIGHT, 0);
+     listViewLayout->setContentsMargins(PANEL_MARGIN_LEFT, PANEL_MARGIN_TOP,
+                                        PANEL_MARGIN_RIGHT, PANEL_MARGIN_BOTTOM);
  
 -    m_searchLocationButton = new QPushButton(tr("Search location"));
 +    ImageButton *searchLocationButton = new ImageButton(0, ":/res/images/search.png",
 +                                                             ":/res/images/search_s.png");
 +
 +    m_contextButtonList.append(searchLocationButton);
  
      m_routeButton = new QPushButton(tr("Route to location"));
+     m_routeButton->setDisabled(true);
      m_routeButton->hide();
  
      m_locationListHeaderWidget = new QWidget();
@@@ -74,7 -73,10 +76,10 @@@
      connect(m_routeWaypointListView, SIGNAL(routeWaypointItemClicked(GeoCoordinate)),
              this, SIGNAL(routeWaypointItemClicked(GeoCoordinate)));
  
+     connect(m_routeButton, SIGNAL(clicked()),
+             this, SLOT(routeToSelectedLocation()));
+ 
 -    connect(m_searchLocationButton, SIGNAL(clicked()),
 +    connect(searchLocationButton, SIGNAL(clicked()),
              this, SIGNAL(requestSearchLocation()));
  }
  

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