Changed icons of location search panel and route to search result button

[situare] / src / ui / mainwindow.cpp

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 0358547..d6ce628 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -267,17 +267,8 @@ void MainWindow::buildLocationSearchPanel()
     connect(m_locationSearchPanel, SIGNAL(routeToLocation(const GeoCoordinate&)),
             this, SIGNAL(routeTo(const GeoCoordinate&)));
 
-    connect(this, SIGNAL(routeParsed(Route&)),
-            m_locationSearchPanel, SLOT(setRoute(Route&)));
-
-    connect(m_locationSearchPanel, SIGNAL(routeWaypointItemClicked(GeoCoordinate)),
-            this, SIGNAL(centerToCoordinates(GeoCoordinate)));
-
     connect(m_locationSearchPanel, SIGNAL(requestSearchLocation()),
             this, SLOT(startLocationSearch()));
-
-    connect(m_locationSearchPanel, SIGNAL(clearRoute()),
-            this, SIGNAL(clearRoute()));
 }
 
 void MainWindow::buildMap()
@@ -356,7 +347,7 @@ 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_locationSearchPanel, QIcon(":/res/images/search.png"));
+    m_tabbedPanel->addTab(m_locationSearchPanel, QIcon(":/res/images/compass.png"));
     m_tabbedPanel->addTab(m_routingPanel, QIcon(":/res/images/routing.png"));
 
     connect(m_mapView, SIGNAL(viewResized(QSize)),
@@ -396,14 +387,8 @@ void MainWindow::buildRoutingPanel()
 
     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(m_routingPanel, SIGNAL(routeToCursor()),
+            this, SIGNAL(routeToCursor()));
 
     connect(this, SIGNAL(routeParsed(Route&)),
             m_routingPanel, SLOT(setRoute(Route&)));
@@ -411,9 +396,6 @@ void MainWindow::buildRoutingPanel()
     connect(m_routingPanel, SIGNAL(routeWaypointItemClicked(GeoCoordinate)),
             this, SIGNAL(centerToCoordinates(GeoCoordinate)));
 
-    connect(m_routingPanel, SIGNAL(requestSearchLocation()),
-            this, SLOT(startLocationSearch()));
-
     connect(m_routingPanel, SIGNAL(clearRoute()),
             this, SIGNAL(clearRoute()));
 }