version 0.3, initial support to liblocation

[googlelatitude] / src / latitude.cpp

diff --git a/src/latitude.cpp b/src/latitude.cpp
index c782c2f..2661345 100644 (file)
--- a/src/latitude.cpp
+++ b/src/latitude.cpp
@@ -2,29 +2,47 @@
 
 LatitudeGUI::LatitudeGUI(QMainWindow *parent) : QMainWindow(parent) {
     glatitude = new GoogleLatitude(this);
+    gps = new GpsMaemo5(this);
     setting = new QSettings();
     urllogin = QUrl::fromEncoded("https://www.google.com/accounts/ServiceLogin?service=friendview&continue=http://www.google.com/maps/m?mode=latitude");
 
     show_lat();
 
     connect(glatitude, SIGNAL(getOK()), this, SLOT(get_loc()));
+    connect(gps, SIGNAL(getOK()), this, SLOT(get_maemo5()));
+    connect(gps, SIGNAL(getOK_acwp()), this, SLOT(get_acwp()));
+    connect(gps, SIGNAL(getOK_agnss()), this, SLOT(get_agnss()));
     connect(glatitude, SIGNAL(setOK()), this, SLOT(set_OK()));
     connect(glatitude, SIGNAL(setERROR()), this, SLOT(set_ERROR()));
+
 }
 
 void LatitudeGUI::get_loc() {
     location_lat->setText(QString::number(glatitude->get_lat()));
     location_lon->setText(QString::number(glatitude->get_lon()));
     location_acc->setText(QString::number(glatitude->get_acc()));
-    statusBar()->showMessage(tr("Using google.com/loc"),2000);
+    status->setText(tr("Using google.com/loc, ip-based"));
+}
+
+void LatitudeGUI::get_maemo5() {
+    location_lat->setText(QString::number(gps->get_lat()));
+    location_lon->setText(QString::number(gps->get_lon()));
+    location_acc->setText(QString::number(gps->get_acc()));
+    status->setText(tr("Using liblocation"));
 }
 
-void LatitudeGUI::get_cell() {
-    statusBar()->showMessage(tr("Using cell... TODO"),2000);
+void LatitudeGUI::get_acwp() {
+    location_lat->setText(QString::number(gps->get_lat()));
+    location_lon->setText(QString::number(gps->get_lon()));
+    location_acc->setText(QString::number(gps->get_acc()));
+    status->setText(tr("Using acwp, cell-based "));
 }
 
-void LatitudeGUI::get_gps() {
-    statusBar()->showMessage(tr("Using gps... TODO"),2000);
+void LatitudeGUI::get_agnss() {
+    location_lat->setText(QString::number(gps->get_lat()));
+    location_lon->setText(QString::number(gps->get_lon()));
+    location_acc->setText(QString::number(gps->get_acc()));
+    status->setText(tr("Using agnss, gps-based "));
 }
 
 void LatitudeGUI::set() {
@@ -33,15 +51,15 @@ void LatitudeGUI::set() {
     glatitude->set(location_lat->text().toDouble(),
                    location_lon->text().toDouble(),
                    location_acc->text().toDouble());
-    statusBar()->showMessage(tr("Setting location..."),2000);
+    status->setText(tr("Setting location..."));
 }
 
 void LatitudeGUI::set_OK() {
-    statusBar()->showMessage(tr("Location Updated !"),5000);
+    status->setText(tr("Updated Location !"));
 }
 
 void LatitudeGUI::set_ERROR() {
-    statusBar()->showMessage(tr("Error in Authentification !"),5000);
+    status->setText(tr("Error in Authentification !"));
 }
 
 void LatitudeGUI::save() {
@@ -62,7 +80,6 @@ void LatitudeGUI::show_map() {
     // menu
     menuBar()->clear();
     menuBar()->addAction(tr("&Latitude") ,this, SLOT(show_lat()));
-    setStatusBar(0);
 }
 
 void LatitudeGUI::show_lat() {
@@ -104,8 +121,8 @@ void LatitudeGUI::show_lat() {
     layout_source->addWidget(source_gps);
     // source connect
     connect(source_loc, SIGNAL(clicked()), glatitude, SLOT(get()));
-    connect(source_cell, SIGNAL(clicked()), this, SLOT(get_cell()));
-    connect(source_gps, SIGNAL(clicked()), this, SLOT(get_gps()));
+    connect(source_cell, SIGNAL(clicked()), gps, SLOT(get_acwp()));
+    connect(source_gps, SIGNAL(clicked()), gps, SLOT(get_agnss()));
 
     // main layout
     location = new QWidget();
@@ -113,7 +130,11 @@ void LatitudeGUI::show_lat() {
     layout_form->addLayout(layout_login);
     layout_form->addLayout(layout_location);
     QVBoxLayout *layout = new QVBoxLayout();
+    status = new QLineEdit("Ready");
+    status->setReadOnly(true);
+    status->setDisabled(true);
     layout->addLayout(layout_form);
+    layout->addWidget(status);
     layout->addLayout(layout_source);
     location->setLayout(layout);
 
@@ -124,7 +145,6 @@ void LatitudeGUI::show_lat() {
     // menu
     menuBar()->clear();
     menuBar()->addAction(tr("&Maps") ,this, SLOT(show_map()));
-    statusBar()->showMessage(tr("Ready"));
 }
 
 void LatitudeGUI::maps_login() {