m_routingService->requestRoute(m_mapEngine->centerGeoCoordinate(), endPointCoordinates);
}
+void SituareEngine::routeToCursor()
+{
+ qDebug() << __PRETTY_FUNCTION__;
+
+ routeTo(m_mapEngine->centerGeoCoordinate());
+}
+
void SituareEngine::setAutoCentering(bool enabled)
{
qDebug() << __PRETTY_FUNCTION__ << enabled;
connect(m_ui, SIGNAL(centerToCoordinates(GeoCoordinate)),
m_mapEngine, SLOT(centerToCoordinates(GeoCoordinate)));
- // signals from routing tab
+ // routing signal from friend list tab & search location tab
+ connect(m_ui, SIGNAL(routeTo(const GeoCoordinate&)),
+ this, SLOT(routeTo(const GeoCoordinate&)));
+
+ // signals from location search panel
connect(m_ui,
SIGNAL(locationItemClicked(const GeoCoordinate&, const GeoCoordinate&)),
m_mapEngine,
SLOT(showMapArea(const GeoCoordinate&, const GeoCoordinate&)));
+ // signals from routing tab
connect(m_ui, SIGNAL(clearRoute()),
m_mapEngine, SLOT(clearRoute()));
- // signals from distence indicator button
+ connect(m_ui, SIGNAL(routeToCursor()),
+ this, SLOT(routeToCursor()));
+
+ // signals from distance indicator button
connect(m_ui, SIGNAL(autoCenteringTriggered(bool)),
this, SLOT(changeAutoCenteringSetting(bool)));
- connect(m_ui, SIGNAL(searchForLocation(QString)),
- this, SLOT(locationSearch(QString)));
-
connect(m_ui, SIGNAL(draggingModeTriggered()),
this, SLOT(draggingModeTriggered()));
- connect(m_ui, SIGNAL(routeTo(const GeoCoordinate&)),
- this, SLOT(routeTo(const GeoCoordinate&)));
+ // signal from search location dialog
+ connect(m_ui, SIGNAL(searchForLocation(QString)),
+ this, SLOT(locationSearch(QString)));
}
void SituareEngine::signalsFromMapEngine()
void routeTo(const GeoCoordinate &endPointCoordinates);
/**
+ * @brief Route to current cursor position
+ */
+ void routeToCursor();
+
+ /**
* @brief Slot for setting auto centering state.
*
* Calls gps to send last known position
int marginVertical = 0;
if (useMargins) {
- marginHorizontal = 50;
+ marginHorizontal = 5;
marginVertical = 5;
}
// calculate the usable size of the view
- int viewUsableHeight = m_viewSize.height() - 2 * marginHorizontal;
- int viewUsableWidth = m_viewSize.width() - 2 * marginVertical;
+ int viewUsableHeight = m_viewSize.height() - 2 * marginVertical;
+ int viewUsableWidth = m_viewSize.width() - 2 * marginHorizontal;
// calculate how many levels must be zoomed out from the closest zoom level to get the rect
// fit inside the usable view area
ui/routewaypointlistitem.cpp \
ui/routewaypointlistview.cpp \
user/user.cpp \
+ ui/locationsearchpanel.cpp \
ui/textmodifier.cpp
HEADERS += application.h \
common.h \
ui/routewaypointlistitem.h \
ui/routewaypointlistview.h \
user/user.h \
+ ui/locationsearchpanel.h \
ui/textmodifier.h
QT += network \
webkit
--- /dev/null
+/*
+ Situare - A location system for Facebook
+ Copyright (C) 2010 Ixonos Plc. Authors:
+
+ Jussi Laitinen - jussi.laitinen@ixonos.com
+ Sami Rämö - sami.ramo@ixonos.com
+
+ Situare is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+
+ Situare is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Situare; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ USA.
+*/
+
+#include "extendedlistitemdelegate.h"
+#include "locationlistitem.h"
+#include "locationlistview.h"
+#include "imagebutton.h"
+#include "panelcommon.h"
+#include "routing/location.h"
+
+#include "locationsearchpanel.h"
+
+LocationSearchPanel::LocationSearchPanel(QWidget *parent)
+ : PanelBase(parent)
+{
+ qDebug() << __PRETTY_FUNCTION__;
+
+ // --- HEADER WIDGET ---
+ 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);
+ setHeaderText(0);
+
+ // --- SEARCH RESULTS 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 LAYOUT ---
+ QVBoxLayout *panelLayout = new QVBoxLayout;
+ panelLayout->setSpacing(0);
+ setLayout(panelLayout);
+
+ const int MARGIN_LEFT = 0;
+ panelLayout->setContentsMargins(MARGIN_LEFT, PANEL_MARGIN_TOP,
+ PANEL_MARGIN_RIGHT, PANEL_MARGIN_BOTTOM);
+
+ panelLayout->addWidget(resultsHeaderWidget);
+ panelLayout->addLayout(resultsListViewLayout);
+
+ // --- CONTEXT BUTTONS ---
+ ImageButton *searchLocationButton = new ImageButton(":/res/images/search.png",
+ ":/res/images/search_s.png", "", this);
+ connect(searchLocationButton, SIGNAL(clicked()),
+ this, SIGNAL(requestSearchLocation()));
+
+ m_routeButton = new ImageButton(":res/images/compass.png", "", "", this);
+ m_routeButton->setDisabled(true);
+ connect(m_routeButton, SIGNAL(clicked()),
+ this, SLOT(routeToSelectedLocation()));
+
+ m_contextButtonLayout->addWidget(searchLocationButton);
+ m_contextButtonLayout->addWidget(m_routeButton);
+}
+
+void LocationSearchPanel::clearListsSelections()
+{
+ qDebug() << __PRETTY_FUNCTION__;
+
+ m_locationListView->clearItemSelection();
+
+ setRouteButtonDisabled();
+}
+
+void LocationSearchPanel::hideEvent(QHideEvent *event)
+{
+ qDebug() << __PRETTY_FUNCTION__;
+
+ QWidget::hideEvent(event);
+
+ clearListsSelections();
+}
+
+void LocationSearchPanel::populateLocationListView(const QList<Location> &locations)
+{
+ qDebug() << __PRETTY_FUNCTION__;
+
+ setHeaderText(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 LocationSearchPanel::routeToSelectedLocation()
+{
+ qDebug() << __PRETTY_FUNCTION__;
+
+ LocationListItem *item = dynamic_cast<LocationListItem *>
+ (m_locationListView->selectedItem());
+
+ if (item)
+ emit routeToLocation(item->coordinates());
+}
+
+void LocationSearchPanel::setHeaderText(int count)
+{
+ qDebug() << __PRETTY_FUNCTION__;
+
+ m_resultsLabel->setText(tr("Search results: %1").arg(count));
+}
+
+void LocationSearchPanel::setRouteButtonDisabled()
+{
+ qDebug() << __PRETTY_FUNCTION__;
+
+ m_routeButton->setDisabled(m_locationListView->selectedItems().isEmpty());
+}
--- /dev/null
+/*
+ Situare - A location system for Facebook
+ Copyright (C) 2010 Ixonos Plc. Authors:
+
+ Jussi Laitinen - jussi.laitinen@ixonos.com
+ Sami Rämö - sami.ramo@ixonos.com
+
+ Situare is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+
+ Situare is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Situare; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ USA.
+*/
+
+#ifndef LOCATIONSEARCHPANEL_H
+#define LOCATIONSEARCHPANEL_H
+
+#include <QtGui>
+
+#include "panelbase.h"
+
+class ExtendedListItemDelegate;
+class GeoCoordinate;
+class ImageButton;
+class Location;
+class LocationListView;
+
+/**
+ * @brief Location search panel
+ *
+ * @author Jussi Laitinen - jussi.laitinen (at) ixonos.com
+ * @author Sami Rämö - sami.ramo (at) ixonos.com
+ */
+class LocationSearchPanel : public PanelBase
+{
+ Q_OBJECT
+
+public:
+ /**
+ * @brief Default constructor
+ *
+ * @param parent
+ */
+ LocationSearchPanel(QWidget *parent = 0);
+
+/*******************************************************************************
+ * BASE CLASS INHERITED AND REIMPLEMENTED MEMBER FUNCTIONS
+ ******************************************************************************/
+protected:
+ /**
+ * @brief Re-implemented from QWidget::hideEvent()
+ *
+ * Calls clearListsSelections()
+ *
+ * @param event
+ */
+ void hideEvent(QHideEvent *event);
+
+/*******************************************************************************
+ * MEMBER FUNCTIONS AND SLOTS
+ ******************************************************************************/
+private:
+ /**
+ * @brief Set text for header
+ *
+ * @param count Search result count
+ */
+ void setHeaderText(int count);
+
+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 Routes to selected location.
+ *
+ * Emits routeToLocation if location is selected from list.
+ */
+ void routeToSelectedLocation();
+
+ /**
+ * @brief Sets route button disabled.
+ *
+ * Disabled if there isn't any list item selected.
+ */
+ void setRouteButtonDisabled();
+
+/*******************************************************************************
+ * SIGNALS
+ ******************************************************************************/
+signals:
+ /**
+ * @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);
+
+ /**
+ * @brief Signal for route waypoint item clicked.
+ *
+ * @param coordinate waypoint item's coordinate
+ */
+ void routeWaypointItemClicked(const GeoCoordinate &coordinate);
+
+/*******************************************************************************
+ * DATA MEMBERS
+ ******************************************************************************/
+private:
+ QLabel *m_resultsLabel; ///< Location list label
+
+ ImageButton *m_routeButton; ///< Route to location button
+ LocationListView *m_locationListView; ///< Search results list view
+};
+
+#endif // LOCATIONSEARCHPANEL_H
#include "friendlistpanel.h"
#include "fullscreenbutton.h"
#include "indicatorbuttonpanel.h"
+#include "locationsearchpanel.h"
#include "logindialog.h"
#include "mapscale.h"
#include "panelcommon.h"
queueDialog(msgBox);
}
+void MainWindow::buildLocationSearchPanel()
+{
+ qDebug() << __PRETTY_FUNCTION__;
+
+ m_locationSearchPanel = new LocationSearchPanel(this);
+
+ connect(this, SIGNAL(locationDataParsed(const QList<Location>&)),
+ m_locationSearchPanel, SLOT(populateLocationListView(const QList<Location>&)));
+
+ connect(m_locationSearchPanel, SIGNAL(locationItemClicked(const GeoCoordinate&, const GeoCoordinate&)),
+ this, SIGNAL(locationItemClicked(const GeoCoordinate&, const GeoCoordinate&)));
+
+ connect(m_locationSearchPanel, SIGNAL(routeToLocation(const GeoCoordinate&)),
+ this, SIGNAL(routeTo(const GeoCoordinate&)));
+
+ connect(m_locationSearchPanel, SIGNAL(requestSearchLocation()),
+ this, SLOT(startLocationSearch()));
+}
+
void MainWindow::buildMap()
{
qDebug() << __PRETTY_FUNCTION__;
buildUserInfoPanel();
buildFriendListPanel();
+ buildLocationSearchPanel();
buildRoutingPanel();
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/compass.png"));
m_tabbedPanel->addTab(m_routingPanel, QIcon(":/res/images/routing.png"));
connect(m_mapView, SIGNAL(viewResized(QSize)),
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&)));
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()));
}
class QWebView;
class FacebookAuthentication;
-class FullScreenButton;
class FriendListPanel;
-class IndicatorButtonPanel;
+class FullScreenButton;
class GeoCoordinate;
+class IndicatorButtonPanel;
+class Location;
+class LocationSearchPanel;
class MapScale;
class MapScene;
class MapView;
class Route;
class RoutingPanel;
-class TabbedPanel;
-class SettingsDialog;
class SceneCoordinate;
+class SettingsDialog;
class SituareService;
class TabbedPanel;
class User;
class UserInfoPanel;
class ZoomButtonPanel;
-class Location;
/**
* @brief Main Window Class
public slots:
/**
- * @brief Build direction indicator button panel and connect signals
- */
- void buildIndicatorButtonPanel();
-
- /**
* @brief Builds information box with message.
*
* @param message Information message
void buildFullScreenButton();
/**
+ * @brief Build direction indicator button panel and connect signals
+ */
+ void buildIndicatorButtonPanel();
+
+
+ /**
+ * @brief Build location search panel and connect signals
+ */
+ void buildLocationSearchPanel();
+
+ /**
* @brief Build map and connect slots
*/
void buildMap();
void routeTo(const GeoCoordinate &coordinates);
/**
+ * @brief Request routing to current cursor position
+ */
+ void routeToCursor();
+
+ /**
* @brief Signal to save username to settings
*
* @param username Username
FriendListPanel *m_friendsListPanel; ///< Instance of friends list panel
FullScreenButton *m_fullScreenButton; ///< Instance of the fullscreen toggle button
- IndicatorButtonPanel *m_indicatorButtonPanel; ///< Instance of direction indicator button
+ IndicatorButtonPanel *m_indicatorButtonPanel; ///< Instance of direction indicator button
+ LocationSearchPanel *m_locationSearchPanel; ///< Location search panel
MapScale *m_mapScale; ///< Instance of the map scale
MapView *m_mapView; ///< Instance of the map view
NetworkCookieJar *m_cookieJar; ///< Placeholder for QNetworkCookies
+/*
+ Situare - A location system for Facebook
+ Copyright (C) 2010 Ixonos Plc. Authors:
+
+ Jussi Laitinen - jussi.laitinen@ixonos.com
+ Sami Rämö - sami.ramo@ixonos.com
+
+ Situare is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+
+ Situare is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Situare; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ USA.
+*/
+
#include "coordinates/geocoordinate.h"
#include "extendedlistitemdelegate.h"
-#include "locationlistitem.h"
-#include "locationlistview.h"
#include "imagebutton.h"
#include "panelcommon.h"
#include "routewaypointlistitem.h"
{
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);
-
- // 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);
+ QVBoxLayout *panelLayout = new QVBoxLayout;
+ panelLayout->setContentsMargins(PANEL_MARGIN_LEFT, PANEL_MARGIN_TOP,
+ PANEL_MARGIN_RIGHT, PANEL_MARGIN_BOTTOM);
+
+ 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()));
+ m_clearRouteButton->setDisabled(true);
+
+ 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);
+ m_routeWaypointListView->clearList();
+ 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)
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();
-}
Copyright (C) 2010 Ixonos Plc. Authors:
Jussi Laitinen - jussi.laitinen@ixonos.com
+ Sami Rämö - sami.ramo@ixonos.com
Situare is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
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
*/
class RoutingPanel : public PanelBase
{
/*******************************************************************************
* 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
+ * @brief Handler for clear route button clicks
*/
- 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
******************************************************************************/
void clearRoute();
/**
- * @brief Signal for location item clicked.
- *
- * @param swBound south-west bound GeoCoordinate
- * @param neBound north-east bound GeoCoordinate
+ * @brief Request routing to current cursor position
*/
- 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.
* DATA MEMBERS
******************************************************************************/
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
+ QLabel *m_resultsLabel; ///< Location list label
- 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
};