Clean-up and re-factoring for RoutingPanel
authorSami Rämö <sami.ramo@ixonos.com>
Wed, 1 Sep 2010 09:33:15 +0000 (12:33 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Wed, 1 Sep 2010 09:33:15 +0000 (12:33 +0300)
 - Cleaned LocationSearchPanel related stuff from RoutingPanel

src/ui/mainwindow.cpp
src/ui/routingpanel.cpp
src/ui/routingpanel.h

index 34819c0..d67c56f 100644 (file)
@@ -387,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&)));
@@ -402,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()));
 }
index 97124d8..24a3aa2 100644 (file)
@@ -22,8 +22,6 @@
 
 #include "coordinates/geocoordinate.h"
 #include "extendedlistitemdelegate.h"
-#include "locationlistitem.h"
-#include "locationlistview.h"
 #include "imagebutton.h"
 #include "panelcommon.h"
 #include "routewaypointlistitem.h"
@@ -38,179 +36,57 @@ RoutingPanel::RoutingPanel(QWidget *parent)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    // --- ROUTING INSTRUCTIONS WIDGET ---
+    // --- LAYOUT & ROUTING INSTRUCTIONS VIEW ---
     m_routeWaypointListView = new RouteWaypointListView(this);
     m_routeWaypointListView->setItemDelegate(new ExtendedListItemDelegate(this));
 
     connect(m_routeWaypointListView, SIGNAL(routeWaypointItemClicked(GeoCoordinate)),
             this, SIGNAL(routeWaypointItemClicked(GeoCoordinate)));
 
-    QVBoxLayout *routingViewLayout = new QVBoxLayout;
-    routingViewLayout->setContentsMargins(PANEL_MARGIN_LEFT, PANEL_MARGIN_TOP,
-                                          PANEL_MARGIN_RIGHT, PANEL_MARGIN_BOTTOM);
+    QVBoxLayout *panelLayout = new QVBoxLayout;
+    panelLayout->setContentsMargins(PANEL_MARGIN_LEFT, PANEL_MARGIN_TOP,
+                                    PANEL_MARGIN_RIGHT, PANEL_MARGIN_BOTTOM);
 
-    // main routing layout
-    m_routingView = new QWidget();
-    m_routingView->setLayout(routingViewLayout);
-    routingViewLayout->addWidget(m_routeWaypointListView);
-
-    // --- SEARCH RESULTS WIDGET ---
-    // header
-    QWidget *resultsHeaderWidget = new QWidget();
-    resultsHeaderWidget->setAutoFillBackground(true);
-    QPalette labelPalette = resultsHeaderWidget->palette();
-    labelPalette.setColor(QPalette::Background, Qt::black);
-    resultsHeaderWidget->setPalette(labelPalette);
-
-    QHBoxLayout *headerLayout = new QHBoxLayout();
-    resultsHeaderWidget->setLayout(headerLayout);
-    headerLayout->setContentsMargins(PANEL_MARGIN_LEFT, PANEL_MARGIN_TOP,
-                                     PANEL_MARGIN_RIGHT, PANEL_MARGIN_BOTTOM);
-
-    m_resultsLabel = new QLabel(this);
-    headerLayout->addWidget(m_resultsLabel, 0, Qt::AlignCenter);
-
-    // list view
-    m_locationListView = new LocationListView(this);
-    m_locationListView->setItemDelegate(new ExtendedListItemDelegate(this));
-
-    connect(m_locationListView,
-            SIGNAL(locationItemClicked(const GeoCoordinate&, const GeoCoordinate&)),
-            this,
-            SIGNAL(locationItemClicked(const GeoCoordinate&, const GeoCoordinate&)));
-
-    connect(m_locationListView, SIGNAL(listItemSelectionChanged()),
-            this, SLOT(setRouteButtonDisabled()));
-
-    QVBoxLayout *resultsListViewLayout = new QVBoxLayout;
-    resultsListViewLayout->setContentsMargins(PANEL_MARGIN_LEFT, PANEL_MARGIN_TOP,
-                                       PANEL_MARGIN_RIGHT, PANEL_MARGIN_BOTTOM);
-    resultsListViewLayout->addWidget(m_locationListView);
-
-    // main results layout
-    m_resultsView = new QWidget();
-    QVBoxLayout *resultsViewLayout = new QVBoxLayout;
-    const int CONTENTS_MARGIN_LEFT = 0;
-    resultsViewLayout->setContentsMargins(CONTENTS_MARGIN_LEFT, PANEL_MARGIN_TOP,
-                                          PANEL_MARGIN_RIGHT, PANEL_MARGIN_BOTTOM);
-    m_resultsView->setLayout(resultsViewLayout);
-
-    resultsViewLayout->addWidget(resultsHeaderWidget);
-    resultsViewLayout->addLayout(resultsListViewLayout);
-
-    // --- MAIN LAYOUT ---
-    QVBoxLayout *routingPanelLayout = new QVBoxLayout;
-    routingPanelLayout->setMargin(0);
-    routingPanelLayout->setSpacing(0);
-    setLayout(routingPanelLayout);
-
-    m_views = new QStackedLayout();
-    routingPanelLayout->addLayout(m_views);
-    m_views->setContentsMargins(PANEL_MARGIN_LEFT, PANEL_MARGIN_TOP,
-                                PANEL_MARGIN_RIGHT, PANEL_MARGIN_BOTTOM);
-
-    m_views->addWidget(m_routingView);
-    m_views->addWidget(m_resultsView);
+    panelLayout->addWidget(m_routeWaypointListView);
+    setLayout(panelLayout);
 
     // --- CONTEXT BUTTONS ---
-    m_searchLocationButton = new ImageButton(":/res/images/search.png",
-                                             ":/res/images/search_s.png", "", this);
-    m_searchLocationButton->setCheckable(true);
-    connect(m_searchLocationButton, SIGNAL(toggled(bool)),
-            this, SLOT(searchLocationButtonToggled(bool)));
-
-    m_routeButton = new ImageButton(":res/images/route_to_location.png",
-                                    ":res/images/route_to_location_s.png", "", this);
-    m_routeButton->setCheckable(true);
-    m_routeButton->setDisabled(true);
-    connect(m_routeButton, SIGNAL(toggled(bool)),
-            this, SLOT(routeButtonToggled(bool)));
-
-    m_contextButtonLayout->addWidget(m_searchLocationButton);
-    m_contextButtonLayout->addWidget(m_routeButton);
+    m_clearRouteButton = new ImageButton(":/res/images/gps_position.png",
+                                         "", "", this);
+    connect(m_clearRouteButton, SIGNAL(clicked()),
+            this, SLOT(clearRouteButtonClicked()));
+
+    ImageButton *routeToCursorButton = new ImageButton(":res/images/sight.png",
+                                                       "", "", this);
+    connect(routeToCursorButton, SIGNAL(clicked()),
+            this, SIGNAL(routeToCursor()));
+
+    m_contextButtonLayout->addWidget(m_clearRouteButton);
+    m_contextButtonLayout->addWidget(routeToCursorButton);
 }
 
 void RoutingPanel::clearListsSelections()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    m_locationListView->clearItemSelection();
     m_routeWaypointListView->clearItemSelection();
-
-    setRouteButtonDisabled();
-}
-
-void RoutingPanel::hideEvent(QHideEvent *event)
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    QWidget::hideEvent(event);
-
-    clearListsSelections();
-}
-
-void RoutingPanel::populateLocationListView(const QList<Location> &locations)
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    m_resultsLabel->setText(tr("Search results: %1").arg(locations.count()));
-
-    m_locationListView->clearList();
-
-    for (int i = 0; i < locations.size(); ++i) {
-        LocationListItem *item = new LocationListItem();
-        item->setLocationData(locations.at(i));
-        m_locationListView->addListItem(QString::number(i), item);
-    }
-
-    const int FIRST_LOCATION_ITEM_INDEX = 0;
-    const int ONE_LOCATION_ITEM = 1;
-
-    if (locations.size() == ONE_LOCATION_ITEM) {
-        ListItem *item = m_locationListView->listItemAt(FIRST_LOCATION_ITEM_INDEX);
-
-        if (item)
-            m_locationListView->setSelectedItem(item);
-    }
-
-    m_locationListView->scrollToTop();
 }
 
-void RoutingPanel::routeButtonToggled(bool checked)
+void RoutingPanel::clearRouteButtonClicked()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    if (checked) {
-        routeToSelectedLocation();
-        m_searchLocationButton->setChecked(false);
-    } else {
-        emit clearRoute();
-        m_routeWaypointListView->clearList();
-        setRouteButtonDisabled();
-    }
+    m_clearRouteButton->setDisabled(true);
+    emit clearRoute();
 }
 
-void RoutingPanel::routeToSelectedLocation()
+void RoutingPanel::hideEvent(QHideEvent *event)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    LocationListItem *item = dynamic_cast<LocationListItem *>
-                             (m_locationListView->selectedItem());
-
-    if (item)
-        emit routeToLocation(item->coordinates());
-}
-
-void RoutingPanel::searchLocationButtonToggled(bool checked)
-{
-    qDebug() << __PRETTY_FUNCTION__;
+    QWidget::hideEvent(event);
 
-    if (checked) {
-        showResultsView();
-        emit requestSearchLocation();
-    } else {
-        showRoutingView();
-    }
+    clearListsSelections();
 }
 
 void RoutingPanel::setRoute(Route &route)
@@ -233,41 +109,7 @@ void RoutingPanel::setRoute(Route &route)
 
     m_routeWaypointListView->scrollToTop();
 
-    // route might come from FriendListPanel's route to friend button, so we have to
-    // check the routing button without emitting new routing request
-    blockSignals(true);
-    m_routeButton->setEnabled(true);
-    m_routeButton->setChecked(true);
-    blockSignals(false);
-    m_searchLocationButton->setChecked(false);
-
-    // search location button might be already false, so we have to make sure the
-    // toggle action handler is called every time
-    searchLocationButtonToggled(false);
+    m_clearRouteButton->setDisabled(false);
 
     emit openPanelRequested(this);
 }
-
-void RoutingPanel::setRouteButtonDisabled()
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    m_routeButton->setDisabled(m_locationListView->selectedItems().isEmpty()
-                               && !m_routeButton->isChecked());
-}
-
-void RoutingPanel::showResultsView()
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    m_views->setCurrentWidget(m_resultsView);
-    m_routeWaypointListView->clearItemSelection();
-}
-
-void RoutingPanel::showRoutingView()
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    m_views->setCurrentWidget(m_routingView);
-    m_locationListView->clearItemSelection();
-}
index 9bd7b99..40d68d9 100644 (file)
 class ExtendedListItemDelegate;
 class GeoCoordinate;
 class ImageButton;
-class Location;
-class LocationListView;
 class Route;
 class RouteWaypointListView;
 
 /**
- * @brief Class for sliding routing panel
+ * @brief Routing panel
  *
  * @author Jussi Laitinen - jussi.laitinen (at) ixonos.com
  * @author Sami Rämö - sami.ramo (at) ixonos.com
@@ -69,64 +67,23 @@ protected:
 /*******************************************************************************
  * MEMBER FUNCTIONS AND SLOTS
  ******************************************************************************/
-private:
-    /**
-    * @brief Switch to search results view mode
-    */
-    void showResultsView();
-
-    /**
-    * @brief Switch to routing instructions view mode
-    */
-    void showRoutingView();
-
 private slots:
     /**
     * @brief Clears lists' selections.
-    *
-    * Does call setRouteButtonDisabled().
     */
     void clearListsSelections();
 
-    /**
-    * @brief Populates location list view.
-    *
-    * @param locations list of Location objects
-    */
-    void populateLocationListView(const QList<Location> &locations);
-
-    /**
-    * @brief Handler for route button toggling actions
-    */
-    void routeButtonToggled(bool checked);
-
-    /**
-    * @brief Routes to selected location.
-    *
-    * Emits routeToLocation if location is selected from list.
-    */
-    void routeToSelectedLocation();
-
-    /**
-    * @brief Handler for search button toggling actions
-    */
-    void searchLocationButtonToggled(bool checked);
+    void clearRouteButtonClicked();
 
     /**
     * @brief Sets route to the panel.
     *
     * Appends route waypoint list with route segments.
+    *
     * @param route Route item containing parsed route details
     */
     void setRoute(Route &route);
 
-    /**
-    * @brief Sets route button disabled.
-    *
-    * Disabled if there isn't any list item selected.
-    */
-    void setRouteButtonDisabled();
-
 /*******************************************************************************
  * SIGNALS
  ******************************************************************************/
@@ -136,25 +93,7 @@ signals:
     */
     void clearRoute();
 
-    /**
-    * @brief Signal for location item clicked.
-    *
-    * @param swBound south-west bound GeoCoordinate
-    * @param neBound north-east bound GeoCoordinate
-    */
-    void locationItemClicked(const GeoCoordinate &swBound, const GeoCoordinate &neBound);
-
-    /**
-    * @brief Signal for requesting searching location.
-    */
-    void requestSearchLocation();
-
-    /**
-    * @brief Signal for routing to location.
-    *
-    * @param coordinates location's geo coordinates
-    */
-    void routeToLocation(const GeoCoordinate &coordinates);
+    void routeToCursor();
 
     /**
     * @brief Signal for route waypoint item clicked.
@@ -176,14 +115,7 @@ signals:
 private:
     QLabel *m_resultsLabel;                 ///< Location list label
 
-    QStackedLayout *m_views;                ///< Views
-
-    QWidget *m_resultsView;                 ///< Search results view widget
-    QWidget *m_routingView;                 ///< Routing instructions view widget
-
-    ImageButton *m_routeButton;             ///< Route to location button
-    ImageButton *m_searchLocationButton;    ///< Search location button
-    LocationListView *m_locationListView;   ///< Search results list view
+    ImageButton *m_clearRouteButton;    ///< Search location button
     RouteWaypointListView *m_routeWaypointListView;     ///< Route instructions list view
 };