Moved "route to" button in routing panel to context button area

diff --git a/src/ui/friendlistpanel.cpp b/src/ui/friendlistpanel.cpp
index 5e5e802..8d7a0d4 100644 (file)
--- a/src/ui/friendlistpanel.cpp
+++ b/src/ui/friendlistpanel.cpp
@@ -133,7 +133,6 @@ FriendListPanel::FriendListPanel(QWidget *parent)
     connect(qApp, SIGNAL(topmostWindowChanged(bool)),
             this, SLOT(topmostWindowChanged(bool)));
 
-
     // CONTEXT BUTTONS
     m_contextButtonList.append(m_routeButton);
     m_contextButtonList.append(clearFilterButton);

diff --git a/src/ui/routingpanel.cpp b/src/ui/routingpanel.cpp
index 017c10e..58d0c37 100644 (file)
--- a/src/ui/routingpanel.cpp
+++ b/src/ui/routingpanel.cpp
@@ -1,13 +1,13 @@
 #include "coordinates/geocoordinate.h"
+#include "extendedlistitemdelegate.h"
 #include "locationlistitem.h"
 #include "locationlistview.h"
-#include "extendedlistitemdelegate.h"
 #include "imagebutton.h"
+#include "panelcommon.h"
 #include "routing/location.h"
 #include "routing/route.h"
-#include "routewaypointlistview.h"
 #include "routewaypointlistitem.h"
-#include "panelcommon.h"
+#include "routewaypointlistview.h"
 
 #include "routingpanel.h"
 
@@ -34,7 +34,7 @@ RoutingPanel::RoutingPanel(QWidget *parent)
 
     m_contextButtonList.append(searchLocationButton);
 
-    m_routeButton = new QPushButton(tr("Route to location"));
+    m_routeButton = new ImageButton(this, ":res/images/routing.png");
     m_routeButton->setDisabled(true);
     m_routeButton->hide();
 
@@ -81,6 +81,9 @@ RoutingPanel::RoutingPanel(QWidget *parent)
 
     connect(searchLocationButton, SIGNAL(clicked()),
             this, SIGNAL(requestSearchLocation()));
+
+    // CONTEXT BUTTONS
+    m_contextButtonList.append(m_routeButton);
 }
 
 void RoutingPanel::clearListsSelections()

diff --git a/src/ui/routingpanel.h b/src/ui/routingpanel.h
index 55fe2a4..bb433f5 100644 (file)
--- a/src/ui/routingpanel.h
+++ b/src/ui/routingpanel.h
@@ -28,8 +28,9 @@
 
 class ExtendedListItemDelegate;
 class GeoCoordinate;
-class LocationListView;
+class ImageButton;
 class Location;
+class LocationListView;
 class Route;
 class RouteWaypointListView;
 
@@ -147,11 +148,11 @@ signals:
 private:
     QLabel *m_locationListLabel;            ///< Location list label
 
-    QPushButton *m_routeButton;             ///< Route to location button
     QPushButton *m_searchLocationButton;    ///< Search location button
 
     QWidget *m_locationListHeaderWidget;    ///< Location list header widget
 
+    ImageButton *m_routeButton;             ///< Route to location button
     LocationListView *m_locationListView;   ///< Location list view
     RouteWaypointListView *m_routeWaypointListView; ///< Route waypoint list view
 };