Added return values to ListItem::itemClicked and added routing panel

route button disabling.

diff --git a/src/ui/extendedlistitem.cpp b/src/ui/extendedlistitem.cpp
index 7e0b859..e215a74 100644 (file)
--- a/src/ui/extendedlistitem.cpp
+++ b/src/ui/extendedlistitem.cpp
@@ -130,7 +130,7 @@ bool ExtendedListItem::toggleSelection()
 
 void ExtendedListItem::setSelected(bool selected)
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    qDebug() << __PRETTY_FUNCTION__ << selected;
 
     QListWidgetItem::setSelected(selected);
     m_selected = selected;

diff --git a/src/ui/friendlistpanel.cpp b/src/ui/friendlistpanel.cpp
index bc9d87c..efa5a0b 100644 (file)
--- a/src/ui/friendlistpanel.cpp
+++ b/src/ui/friendlistpanel.cpp
@@ -140,6 +140,9 @@ void FriendListPanel::anyPanelClosed()
     updateKeyboardGrabbing();
 
     clearFiltering();
+
+    m_friendListView->clearItemSelection();
+    setRouteButtonDisabled();
 }
 
 void FriendListPanel::anyPanelOpened()
@@ -225,7 +228,8 @@ void FriendListPanel::hideEvent(QHideEvent *event)
     updateKeyboardGrabbing();
     clearFiltering();
 
-    m_friendListView->clearSelection();
+    m_friendListView->clearItemSelection();
+    setRouteButtonDisabled();
 }
 
 void FriendListPanel::routeToSelectedFriend()

diff --git a/src/ui/friendlistview.cpp b/src/ui/friendlistview.cpp
index c91d172..cebff3b 100644 (file)
--- a/src/ui/friendlistview.cpp
+++ b/src/ui/friendlistview.cpp
@@ -39,4 +39,6 @@ bool FriendListView::listItemClicked(ListItem *item)
 
     if (friendListItem && selected)
         emit friendItemClicked(friendListItem->coordinates());
+
+    return selected;
 }

diff --git a/src/ui/friendlistview.h b/src/ui/friendlistview.h
index 3fa7ac3..efcd072 100644 (file)
--- a/src/ui/friendlistview.h
+++ b/src/ui/friendlistview.h
@@ -50,6 +50,7 @@ public slots:
     * @brief Slot for list item clicked.
     *
     * @param item ListItem
+    * @return true if item was selected, false otherwise
     */
     bool listItemClicked(ListItem *item);
 

diff --git a/src/ui/listview.cpp b/src/ui/listview.cpp
index b1d93fd..bf01d5c 100644 (file)
--- a/src/ui/listview.cpp
+++ b/src/ui/listview.cpp
@@ -56,6 +56,14 @@ void ListView::addListItemToView(ListItem *item)
     addItem(item);
 }
 
+void ListView::clearItemSelection()
+{
+    clearSelection();
+
+    if (m_previousItem)
+        m_previousItem->setSelected(false);
+}
+
 void ListView::clearList()
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -90,9 +98,6 @@ void ListView::clearFilter()
 
     m_filteredItemIDs.clear();
 
-    if (m_previousItem)
-        m_previousItem->setSelected(false);
-
     foreach (ListItem *item, m_listItems)
         setItemHidden(item, false);
 }
@@ -155,21 +160,17 @@ bool ListView::listItemClicked(ListItem *item)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    bool selected = false;
-
     if (m_previousItem == item) {
-        selected = item->toggleSelection();
-
+        item->toggleSelection();
     } else {
         if (m_previousItem)
             m_previousItem->setSelected(false);
 
         item->setSelected(true);
-        selected = true;
     }
     m_previousItem = item;
 
-    return selected;
+    return item->isSelected();
 }
 
 void ListView::listItemClicked(QListWidgetItem *item)

diff --git a/src/ui/listview.h b/src/ui/listview.h
index dbbc405..dc04d2f 100644 (file)
--- a/src/ui/listview.h
+++ b/src/ui/listview.h
@@ -89,6 +89,8 @@ public:
     */
     void clearFilter();
 
+    void clearItemSelection();
+
     /**
     * @brief Clears list.
     *
@@ -167,6 +169,7 @@ protected slots:
     * @brief Slot for list item clicked.
     *
     * Toggles items selection state and emits listItemClicked signal.
+    * @return true if item was selected, false otherwise
     */
     virtual bool listItemClicked(ListItem *item);
 
@@ -174,7 +177,7 @@ private slots:
     /**
     * @brief Slot for list item clicked.
     *
-    * Toggles items selection state and emits listItemClicked signal.
+    * Calls listItemClicked(ListItem *item)
     */
     void listItemClicked(QListWidgetItem *item);
 

diff --git a/src/ui/locationlistview.cpp b/src/ui/locationlistview.cpp
index 5bfe2cd..50a429a 100644 (file)
--- a/src/ui/locationlistview.cpp
+++ b/src/ui/locationlistview.cpp
@@ -43,4 +43,6 @@ bool LocationListView::listItemClicked(ListItem *item)
         locationItem->bounds(swBound, neBound);
         emit locationItemClicked(swBound, neBound);
     }
+
+    return selected;
 }

diff --git a/src/ui/locationlistview.h b/src/ui/locationlistview.h
index 8691cd1..4bd6770 100644 (file)
--- a/src/ui/locationlistview.h
+++ b/src/ui/locationlistview.h
@@ -46,6 +46,7 @@ public slots:
     * @brief Slot for list item clicked.
     *
     * @param item ListItem
+    * @return true if item was selected, false otherwise
     */
     bool listItemClicked(ListItem *item);
 

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index dbd1e64..a224ddd 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -342,6 +342,9 @@ void MainWindow::buildPanels()
 
     connect(m_tabbedPanel, SIGNAL(panelOpened()),
             m_friendsListPanel, SLOT(anyPanelOpened()));
+
+    connect(m_tabbedPanel, SIGNAL(panelClosed()),
+            m_routingPanel, SLOT(anyPanelClosed()));
 }
 
 void MainWindow::buildRoutingPanel()

diff --git a/src/ui/routewaypointlistview.cpp b/src/ui/routewaypointlistview.cpp
index 5a5d1c4..c18577d 100644 (file)
--- a/src/ui/routewaypointlistview.cpp
+++ b/src/ui/routewaypointlistview.cpp
@@ -20,4 +20,6 @@ bool RouteWaypointListView::listItemClicked(ListItem *item)
 
     if (routeWaypointItem && selected)
         emit routeWaypointItemClicked(routeWaypointItem->coordinates());
+
+    return selected;
 }

diff --git a/src/ui/routewaypointlistview.h b/src/ui/routewaypointlistview.h
index f7ba508..90cfafb 100644 (file)
--- a/src/ui/routewaypointlistview.h
+++ b/src/ui/routewaypointlistview.h
@@ -50,6 +50,7 @@ public slots:
     * @brief Slot for list item clicked.
     *
     * @param item ListItem
+    * @return true if item was selected, false otherwise
     */
     bool listItemClicked(ListItem *item);
 

diff --git a/src/ui/routingpanel.cpp b/src/ui/routingpanel.cpp
index 7607972..d94370f 100644 (file)
--- a/src/ui/routingpanel.cpp
+++ b/src/ui/routingpanel.cpp
@@ -21,15 +21,17 @@ RoutingPanel::RoutingPanel(QWidget *parent)
     setLayout(routingLayout);
 
     QHBoxLayout *headerLayout = new QHBoxLayout();
-    headerLayout->setContentsMargins(PANEL_MARGIN_LEFT, 0,
-                                     PANEL_MARGIN_RIGHT, 0);
+    headerLayout->setContentsMargins(PANEL_MARGIN_LEFT, PANEL_MARGIN_TOP,
+                                     PANEL_MARGIN_RIGHT, PANEL_MARGIN_BOTTOM);
 
     QVBoxLayout *listViewLayout = new QVBoxLayout;
-    listViewLayout->setContentsMargins(PANEL_MARGIN_LEFT, 0, PANEL_MARGIN_RIGHT, 0);
+    listViewLayout->setContentsMargins(PANEL_MARGIN_LEFT, PANEL_MARGIN_TOP,
+                                       PANEL_MARGIN_RIGHT, PANEL_MARGIN_BOTTOM);
 
     m_searchLocationButton = new QPushButton(tr("Search location"));
 
     m_routeButton = new QPushButton(tr("Route to location"));
+    m_routeButton->setDisabled(true);
     m_routeButton->hide();
 
     m_locationListHeaderWidget = new QWidget();
@@ -68,24 +70,35 @@ RoutingPanel::RoutingPanel(QWidget *parent)
     connect(m_locationListView, SIGNAL(clicked(QModelIndex)),
             this, SLOT(setRouteButtonDisabled()));
 
-    connect(m_routeButton, SIGNAL(clicked()),
-            this, SLOT(routeToSelectedLocation()));
-
     connect(m_routeWaypointListView, SIGNAL(routeWaypointItemClicked(GeoCoordinate)),
             this, SIGNAL(routeWaypointItemClicked(GeoCoordinate)));
 
+    connect(m_routeButton, SIGNAL(clicked()),
+            this, SLOT(routeToSelectedLocation()));
+
     connect(m_searchLocationButton, SIGNAL(clicked()),
             this, SIGNAL(requestSearchLocation()));
 }
 
+void RoutingPanel::anyPanelClosed()
+{
+    qDebug() << __PRETTY_FUNCTION__;
+
+    m_locationListView->clearItemSelection();
+    m_routeWaypointListView->clearItemSelection();
+
+    setRouteButtonDisabled();
+}
+
 void RoutingPanel::hideEvent(QHideEvent *event)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    Q_UNUSED(event);
+    QWidget::hideEvent(event);
 
-    m_locationListView->clearSelection();
-    m_routeWaypointListView->clearSelection();
+    m_locationListView->clearItemSelection();
+    m_routeWaypointListView->clearItemSelection();
+    setRouteButtonDisabled();
 }
 
 void RoutingPanel::populateLocationListView(const QList<Location> &locations)

diff --git a/src/ui/routingpanel.h b/src/ui/routingpanel.h
index 73bd829..6167168 100644 (file)
--- a/src/ui/routingpanel.h
+++ b/src/ui/routingpanel.h
@@ -66,6 +66,13 @@ protected:
  ******************************************************************************/
 private slots:
     /**
+    * @brief Called when any of the panel tabs is closed
+    *
+    * Does call setRouteButtonDisabled().
+    */
+    void anyPanelClosed();
+
+    /**
     * @brief Populates location list view.
     *
     * @param locations list of Location objects