Removed disabled button states, don't open panel without buttons
[situare] / src / ui / locationsearchpanel.cpp
index 224b550..c0d53a8 100644 (file)
     USA.
 */
 
-#include "coordinates/geocoordinate.h"
 #include "extendedlistitemdelegate.h"
 #include "locationlistitem.h"
 #include "locationlistview.h"
 #include "imagebutton.h"
 #include "panelcommon.h"
-#include "routewaypointlistitem.h"
-#include "routewaypointlistview.h"
 #include "routing/location.h"
-#include "routing/route.h"
 
 #include "locationsearchpanel.h"
 
@@ -38,24 +34,7 @@ LocationSearchPanel::LocationSearchPanel(QWidget *parent)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    // --- ROUTING INSTRUCTIONS WIDGET ---
-    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);
-
-    // main routing layout
-    m_routingView = new QWidget();
-    m_routingView->setLayout(routingViewLayout);
-    routingViewLayout->addWidget(m_routeWaypointListView);
-
-    // --- SEARCH RESULTS WIDGET ---
-    // header
+    // --- HEADER WIDGET ---
     QWidget *resultsHeaderWidget = new QWidget();
     resultsHeaderWidget->setAutoFillBackground(true);
     QPalette labelPalette = resultsHeaderWidget->palette();
@@ -69,8 +48,9 @@ LocationSearchPanel::LocationSearchPanel(QWidget *parent)
 
     m_resultsLabel = new QLabel(this);
     headerLayout->addWidget(m_resultsLabel, 0, Qt::AlignCenter);
+    setHeaderText(0);
 
-    // list view
+    // --- SEARCH RESULTS LIST VIEW ---
     m_locationListView = new LocationListView(this);
     m_locationListView->setItemDelegate(new ExtendedListItemDelegate(this));
 
@@ -80,54 +60,37 @@ LocationSearchPanel::LocationSearchPanel(QWidget *parent)
             SIGNAL(locationItemClicked(const GeoCoordinate&, const GeoCoordinate&)));
 
     connect(m_locationListView, SIGNAL(listItemSelectionChanged()),
-            this, SLOT(setRouteButtonDisabled()));
+            this, SLOT(onListItemSelectionChanged()));
 
     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 *LocationSearchPanelLayout = new QVBoxLayout;
-    LocationSearchPanelLayout->setMargin(0);
-    LocationSearchPanelLayout->setSpacing(0);
-    setLayout(LocationSearchPanelLayout);
+    QVBoxLayout *panelLayout = new QVBoxLayout;
+    panelLayout->setSpacing(0);
+    setLayout(panelLayout);
 
-    m_views = new QStackedLayout();
-    LocationSearchPanelLayout->addLayout(m_views);
-    m_views->setContentsMargins(PANEL_MARGIN_LEFT, PANEL_MARGIN_TOP,
-                                PANEL_MARGIN_RIGHT, PANEL_MARGIN_BOTTOM);
+    const int MARGIN_LEFT = 0;
+    panelLayout->setContentsMargins(MARGIN_LEFT, PANEL_MARGIN_TOP,
+                                    PANEL_MARGIN_RIGHT, PANEL_MARGIN_BOTTOM);
 
-    m_views->addWidget(m_routingView);
-    m_views->addWidget(m_resultsView);
+    panelLayout->addWidget(resultsHeaderWidget);
+    panelLayout->addLayout(resultsListViewLayout);
 
     // --- 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_routeButton = new ImageButton(":res/images/routing.png", "", "", this);
+    connect(m_routeButton, SIGNAL(clicked()),
+            this, SLOT(routeToSelectedLocation()));
+
+    ImageButton *searchLocationButton = new ImageButton(":/res/images/search.png",
+                                                        ":/res/images/search_s.png", "", this);
+    connect(searchLocationButton, SIGNAL(clicked()),
+            this, SIGNAL(requestSearchLocation()));
+
+    m_itemButtonsLayout->addWidget(m_routeButton);
+    m_genericButtonsLayout->addWidget(searchLocationButton);
 }
 
 void LocationSearchPanel::clearListsSelections()
@@ -135,9 +98,6 @@ void LocationSearchPanel::clearListsSelections()
     qDebug() << __PRETTY_FUNCTION__;
 
     m_locationListView->clearItemSelection();
-    m_routeWaypointListView->clearItemSelection();
-
-    setRouteButtonDisabled();
 }
 
 void LocationSearchPanel::hideEvent(QHideEvent *event)
@@ -153,7 +113,7 @@ void LocationSearchPanel::populateLocationListView(const QList<Location> &locati
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    m_resultsLabel->setText(tr("Search results: %1").arg(locations.count()));
+    setHeaderText(locations.count());
 
     m_locationListView->clearList();
 
@@ -176,20 +136,6 @@ void LocationSearchPanel::populateLocationListView(const QList<Location> &locati
     m_locationListView->scrollToTop();
 }
 
-void LocationSearchPanel::routeButtonToggled(bool checked)
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    if (checked) {
-        routeToSelectedLocation();
-        m_searchLocationButton->setChecked(false);
-    } else {
-        emit clearRoute();
-        m_routeWaypointListView->clearList();
-        setRouteButtonDisabled();
-    }
-}
-
 void LocationSearchPanel::routeToSelectedLocation()
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -201,73 +147,9 @@ void LocationSearchPanel::routeToSelectedLocation()
         emit routeToLocation(item->coordinates());
 }
 
-void LocationSearchPanel::searchLocationButtonToggled(bool checked)
+void LocationSearchPanel::setHeaderText(int count)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    if (checked) {
-        showResultsView();
-        emit requestSearchLocation();
-    } else {
-        showRoutingView();
-    }
-}
-
-void LocationSearchPanel::setRoute(Route &route)
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    m_routeWaypointListView->clearList();
-
-    QList<RouteSegment> segments = route.segments();
-    QList<GeoCoordinate> geometryPoints = route.geometryPoints();
-
-    for (int i = 0; i < segments.size(); ++i) {
-        RouteWaypointListItem *item = new RouteWaypointListItem();
-        RouteSegment routeSegment = segments.at(i);
-        item->setRouteWaypointData(routeSegment,
-                                   geometryPoints.at(routeSegment.positionIndex()));
-
-        m_routeWaypointListView->addListItem(QString::number(i), item);
-    }
-
-    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);
-
-    emit openPanelRequested(this);
-}
-
-void LocationSearchPanel::setRouteButtonDisabled()
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    m_routeButton->setDisabled(m_locationListView->selectedItems().isEmpty()
-                               && !m_routeButton->isChecked());
-}
-
-void LocationSearchPanel::showResultsView()
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    m_views->setCurrentWidget(m_resultsView);
-    m_routeWaypointListView->clearItemSelection();
-}
-
-void LocationSearchPanel::showRoutingView()
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    m_views->setCurrentWidget(m_routingView);
-    m_locationListView->clearItemSelection();
+    m_resultsLabel->setText(tr("Search results: %1").arg(count));
 }