#include "map/mapview.h"
#include "common.h"
#include "friendlistpanel.h"
+#include "fullscreenbutton.h"
+#include "indicatorbutton.h"
#include "logindialog.h"
#include "mapscale.h"
+#include "searchdialog.h"
#include "settingsdialog.h"
#include "userinfopanel.h"
#include "zoombuttonpanel.h"
m_errorShown(false),
m_loggedIn(false),
m_refresh(false),
+ m_progressIndicatorCount(0),
m_ownLocationCrosshair(0),
- m_email(),
+ m_email(),
m_password(),
- m_fullScreenButton(0),
m_webView(0),
+ m_fullScreenButton(0),
+ m_indicatorButton(0),
m_mapScale(0),
m_cookieJar(0)
{
m_osmLicense->stackUnder(m_zoomButtonPanel);
}
m_ownLocationCrosshair->stackUnder(m_osmLicense);
- m_mapScale->stackUnder(m_ownLocationCrosshair);
+ m_indicatorButton->stackUnder(m_ownLocationCrosshair);
+ m_mapScale->stackUnder(m_indicatorButton);
m_mapView->stackUnder(m_mapScale);
- this->toggleProgressIndicator(true);
-
grabZoomKeys(true);
// Set default screen size
if (result == QMessageBox::Yes) {
readAutomaticLocationUpdateSettings();
- } else if (result == QMessageBox::No) {
+ } else {
QSettings settings(DIRECTORY_NAME, FILE_NAME);
settings.setValue(SETTINGS_AUTOMATIC_UPDATE_ENABLED, false);
readAutomaticLocationUpdateSettings();
{
qDebug() << __PRETTY_FUNCTION__;
#ifdef Q_WS_MAEMO_5
- m_fullScreenButton = new QToolButton(this);
- m_fullScreenButton->setIcon(QIcon::fromTheme(QLatin1String("general_fullsize")));
- m_fullScreenButton->setFixedSize(m_fullScreenButton->sizeHint());
+ m_fullScreenButton = new FullScreenButton(this);
connect(m_fullScreenButton, SIGNAL(clicked()),
this, SLOT(toggleFullScreen()));
#endif // Q_WS_MAEMO_5
connect(m_mapView, SIGNAL(viewResized(QSize)),
m_friendsListPanelSidebar, SLOT(resizeSideBar(QSize)));
- connect(m_friendsListPanel, SIGNAL(findFriend(QPointF)),
- this, SIGNAL(findFriend(QPointF)));
+ connect(m_friendsListPanel, SIGNAL(findFriend(GeoCoordinate)),
+ this, SIGNAL(findFriend(GeoCoordinate)));
+
+ connect(this, SIGNAL(friendImageReady(User*)),
+ m_friendsListPanel, SLOT(friendImageReady(User*)));
+
+ connect(this, SIGNAL(locationDataParsed(QList<Location>&)),
+ m_friendsListPanel, SLOT(locationDataReady(QList<Location>&)));
+
+ connect(m_friendsListPanel, SIGNAL(locationItemClicked(GeoCoordinate&,GeoCoordinate&)),
+ this, SIGNAL(locationItemClicked(GeoCoordinate&,GeoCoordinate&)));
+}
+
+void MainWindow::buildIndicatorButton()
+{
+ qDebug() << __PRETTY_FUNCTION__;
+
+ m_indicatorButton = new IndicatorButton(this);
+
+ connect(m_indicatorButton, SIGNAL(autoCenteringTriggered(bool)),
+ this, SIGNAL(autoCenteringTriggered(bool)));
+
+ connect(m_mapView, SIGNAL(viewResized(QSize)),
+ m_indicatorButton, SLOT(screenResized(QSize)));
}
void MainWindow::buildInformationBox(const QString &message, bool modal)
buildOsmLicense();
buildManualLocationCrosshair();
buildFullScreenButton();
+ buildIndicatorButton();
buildMapScale();
- connect(m_mapView, SIGNAL(viewScrolled(QPoint)),
- this, SIGNAL(mapViewScrolled(QPoint)));
+ connect(m_mapView, SIGNAL(viewScrolled(SceneCoordinate)),
+ this, SIGNAL(mapViewScrolled(SceneCoordinate)));
- connect(this, SIGNAL(centerToSceneCoordinates(QPoint)),
- m_mapView, SLOT(centerToSceneCoordinates(QPoint)));
+ connect(this, SIGNAL(centerToSceneCoordinates(SceneCoordinate)),
+ m_mapView, SLOT(centerToSceneCoordinates(SceneCoordinate)));
connect(m_mapView, SIGNAL(viewResized(QSize)),
this, SIGNAL(mapViewResized(QSize)));
connect(m_mapView, SIGNAL(viewZoomFinished()),
this, SIGNAL(viewZoomFinished()));
+
+ connect(m_mapView, SIGNAL(zoomIn()),
+ this, SIGNAL(zoomIn()));
}
void MainWindow::buildMapScale()
connect(this, SIGNAL(clearUpdateLocationDialogData()),
m_userPanel, SIGNAL(clearUpdateLocationDialogData()));
- connect(this, SIGNAL(messageSendingFailed(int)),
- m_userPanel, SIGNAL(messageSendingFailed(int)));
-
connect(m_mapView, SIGNAL(viewResized(QSize)),
m_userPanel, SLOT(resizePanel(QSize)));
connect(m_mapView, SIGNAL(viewResized(QSize)),
m_userPanelSidebar, SLOT(resizeSideBar(QSize)));
- connect(m_userPanel, SIGNAL(findUser(QPointF)),
- this, SIGNAL(findUser(QPointF)));
+ connect(m_userPanel, SIGNAL(findUser(GeoCoordinate)),
+ this, SIGNAL(findUser(GeoCoordinate)));
connect(m_userPanel, SIGNAL(requestReverseGeo()),
this, SIGNAL(requestReverseGeo()));
connect(m_mapView, SIGNAL(viewResized(QSize)),
m_zoomButtonPanel, SLOT(screenResized(QSize)));
+
}
void MainWindow::clearCookieJar()
connect(m_gpsToggleAct, SIGNAL(triggered(bool)),
this, SIGNAL(gpsTriggered(bool)));
- // automatic centering
- m_autoCenteringAct = new QAction(tr("Auto centering"), this);
- m_autoCenteringAct->setCheckable(true);
- connect(m_autoCenteringAct, SIGNAL(triggered(bool)),
- this, SIGNAL(autoCenteringTriggered(bool)));
+ /// @todo remove when not needed!
+ m_searchLocationAct = new QAction(tr("Location search"), this);
+ connect(m_searchLocationAct, SIGNAL(triggered()),
+ this, SLOT(startLocationSearch()));
// build the actual menu
m_viewMenu = menuBar()->addMenu(tr("Main"));
m_viewMenu->addAction(m_loginAct);
m_viewMenu->addAction(m_toSettingsAct);
m_viewMenu->addAction(m_gpsToggleAct);
- m_viewMenu->addAction(m_autoCenteringAct);
+ m_viewMenu->addAction(m_searchLocationAct); /// @todo remove when not needed!
m_viewMenu->setObjectName(tr("Menu"));
}
QDialog *dialog = m_queue.takeFirst();
LoginDialog *loginDialog = qobject_cast<LoginDialog *>(dialog);
+ SearchDialog *searchDialog = qobject_cast<SearchDialog *>(dialog);
if(loginDialog) {
if(status != 0) {
buildWebView();
} else {
emit cancelLoginProcess();
}
+ } else if(searchDialog) {
+ if(status != 0) {
+ emit searchForLocation(searchDialog->input());
+ }
}
dialog->deleteLater();
qDebug() << __PRETTY_FUNCTION__ << size.width() << "x" << size.height();
if(m_fullScreenButton) {
- m_fullScreenButton->move(size.width() - m_fullScreenButton->size().width()
- - PANEL_PEEK_AMOUNT,
- size.height() - m_fullScreenButton->size().height());
+ if(m_loggedIn) {
+ m_fullScreenButton->move(size.width() - m_fullScreenButton->size().width()
+ - PANEL_PEEK_AMOUNT,
+ size.height() - m_fullScreenButton->size().height());
+ } else {
+ m_fullScreenButton->move(size.width() - m_fullScreenButton->size().width(),
+ size.height() - m_fullScreenButton->size().height());
+ }
}
}
void MainWindow::drawMapScale(const QSize &size)
{
+ qDebug() << __PRETTY_FUNCTION__;
+
const int LEFT_SCALE_MARGIN = 10;
const int BOTTOM_SCALE_MARGIN = 2;
qDebug() << __PRETTY_FUNCTION__ << size.width() << "x" << size.height();
m_cookieJar->setAllCookies(cookieList);
m_webView->page()->networkAccessManager()->setCookieJar(m_cookieJar);
-
}
}
qDebug() << __PRETTY_FUNCTION__;
clearCookieJar();
-
- toggleProgressIndicator(false);
-
startLoginProcess();
}
{
qDebug() << __PRETTY_FUNCTION__;
+ toggleProgressIndicator(true);
+
buildWebView();
loadCookies();
-
+
QStringList urlParts;
urlParts.append(FACEBOOK_LOGINBASE);
urlParts.append(SITUARE_PUBLIC_FACEBOOKAPI_KEY);
settings.setValue(COOKIES, list);
}
-void MainWindow::setAutoCenteringButtonEnabled(bool enabled)
+void MainWindow::setGPSButtonEnabled(bool enabled)
{
qDebug() << __PRETTY_FUNCTION__;
- m_autoCenteringAct->setChecked(enabled);
+ m_gpsToggleAct->setChecked(enabled);
+
+ setOwnLocationCrosshairVisibility(!enabled);
}
-void MainWindow::setGPSButtonEnabled(bool enabled)
+void MainWindow::setIndicatorButtonEnabled(bool enabled)
{
qDebug() << __PRETTY_FUNCTION__;
- m_gpsToggleAct->setChecked(enabled);
-
- setOwnLocationCrosshairVisibility(!enabled);
+ m_indicatorButton->setChecked(enabled);
- m_autoCenteringAct->setVisible(enabled);
}
void MainWindow::setMapViewScene(QGraphicsScene *scene)
if (visibility && m_loggedIn) {
m_ownLocationCrosshair->show();
m_drawOwnLocationCrosshair = true;
- drawOwnLocationCrosshair(QSize(m_viewPortWidth, m_viewPortHeight));
+ drawOwnLocationCrosshair(m_viewPortSize);
} else {
m_ownLocationCrosshair->hide();
m_drawOwnLocationCrosshair = false;
{
qDebug() << __PRETTY_FUNCTION__;
- m_viewPortWidth = size.width();
- m_viewPortHeight = size.height();
+ m_viewPortSize = size;
}
void MainWindow::showEnableAutomaticUpdateLocationDialog(const QString &text)
}
}
+void MainWindow::showPanels()
+{
+ qDebug() << __PRETTY_FUNCTION__;
+
+ drawFullScreenButton(m_viewPortSize);
+
+ if(m_loggedIn) {
+ if(!m_friendsListPanel->isVisible()) {
+ m_friendsListPanel->show();
+ m_friendsListPanelSidebar->show();
+ }
+
+ if(!m_userPanel->isVisible()) {
+ m_userPanel->show();
+ m_userPanelSidebar->show();
+ }
+ }
+}
+
+void MainWindow::startLocationSearch()
+{
+ qDebug() << __PRETTY_FUNCTION__;
+
+ SearchDialog *searchDialog = new SearchDialog();
+ queueDialog(searchDialog);
+}
+
void MainWindow::startLoginProcess()
{
qDebug() << __PRETTY_FUNCTION__;
qDebug() << __PRETTY_FUNCTION__;
#ifdef Q_WS_MAEMO_5
- setAttribute(Qt::WA_Maemo5ShowProgressIndicator, value);
+ if(value) {
+ m_progressIndicatorCount++;
+ setAttribute(Qt::WA_Maemo5ShowProgressIndicator, true);
+ } else {
+ if(m_progressIndicatorCount > 0)
+ m_progressIndicatorCount--;
+
+ if(m_progressIndicatorCount == 0)
+ setAttribute(Qt::WA_Maemo5ShowProgressIndicator, false);
+ }
#else
Q_UNUSED(value);
#endif // Q_WS_MAEMO_5
void MainWindow::updateItemVisibility()
{
qDebug() << __PRETTY_FUNCTION__;
-
+
if(m_loggedIn) {
- m_friendsListPanel->show();
- m_friendsListPanelSidebar->show();
- m_userPanel->show();
- m_userPanelSidebar->show();
if(!m_gpsToggleAct->isChecked())
setOwnLocationCrosshairVisibility(true);
const QString MainWindow::username()
{
qDebug() << __PRETTY_FUNCTION__;
-
+
return m_email;
}
// qwebview starts to load a new page while the current page loading is not finished
if(reply->error() != QNetworkReply::OperationCanceledError &&
reply->error() != QNetworkReply::NoError) {
- emit error(reply->error());
- toggleProgressIndicator(false);
+ emit error(ErrorContext::NETWORK, reply->error());
}
}
-
projects / situare / blobdiff