Changed routing panel to use PanelBase as a base class, removed old search location...

instead (that uses the panel context button bar)

diff --git a/src/ui/routingpanel.cpp b/src/ui/routingpanel.cpp
index ebd75c6..7ad9016 100644 (file)
--- a/src/ui/routingpanel.cpp
+++ b/src/ui/routingpanel.cpp
@@ -2,6 +2,7 @@
 #include "locationlistitem.h"
 #include "locationlistview.h"
 #include "extendedlistitemdelegate.h"
+#include "imagebutton.h"
 #include "routing/location.h"
 #include "routing/route.h"
 #include "routewaypointlistview.h"
@@ -11,7 +12,7 @@
 #include "routingpanel.h"
 
 RoutingPanel::RoutingPanel(QWidget *parent)
-    : QWidget(parent)
+    : PanelBase(parent)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
@@ -27,7 +28,10 @@ RoutingPanel::RoutingPanel(QWidget *parent)
     QVBoxLayout *listViewLayout = new QVBoxLayout;
     listViewLayout->setContentsMargins(PANEL_MARGIN_LEFT, 0, PANEL_MARGIN_RIGHT, 0);
 
-    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->hide();
@@ -55,7 +59,6 @@ RoutingPanel::RoutingPanel(QWidget *parent)
     listViewLayout->addWidget(m_locationListView);
     listViewLayout->addWidget(m_routeWaypointListView);
 
-    routingLayout->addWidget(m_searchLocationButton);
     routingLayout->addWidget(m_routeButton);
     routingLayout->addWidget(m_locationListHeaderWidget);
     routingLayout->addLayout(listViewLayout);
@@ -71,7 +74,7 @@ RoutingPanel::RoutingPanel(QWidget *parent)
     connect(m_routeWaypointListView, SIGNAL(routeWaypointItemClicked(GeoCoordinate)),
             this, SIGNAL(routeWaypointItemClicked(GeoCoordinate)));
 
-    connect(m_searchLocationButton, SIGNAL(clicked()),
+    connect(searchLocationButton, SIGNAL(clicked()),
             this, SIGNAL(requestSearchLocation()));
 }
 

diff --git a/src/ui/routingpanel.h b/src/ui/routingpanel.h
index d329f1e..29b56a9 100644 (file)
--- a/src/ui/routingpanel.h
+++ b/src/ui/routingpanel.h
@@ -24,6 +24,8 @@
 
 #include <QtGui>
 
+#include "panelbase.h"
+
 class ExtendedListItemDelegate;
 class GeoCoordinate;
 class LocationListView;
@@ -36,7 +38,7 @@ class RouteWaypointListView;
  *
  * @author Jussi Laitinen - jussi.laitinen (at) ixonos.com
  */
-class RoutingPanel : public QWidget
+class RoutingPanel : public PanelBase
 {
     Q_OBJECT