From af7af90b9dab32ebb788a5b598ee8a61cdff5315 Mon Sep 17 00:00:00 2001
From: Rodrigo Linfati <rodrigo@linfati.cl>
Date: Fri, 1 Jan 2010 11:26:12 +0100
Subject: [PATCH] change statusbar to status lineedit

---
 src/latitude.cpp |   18 ++++++++++--------
 src/latitude.h   |    3 +++
 src/src.pro      |    7 +++++--
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/latitude.cpp b/src/latitude.cpp
index c782c2f..00e7243 100644
--- a/src/latitude.cpp
+++ b/src/latitude.cpp
@@ -16,15 +16,15 @@ 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"));
 }
 
 void LatitudeGUI::get_cell() {
-    statusBar()->showMessage(tr("Using cell... TODO"),2000);
+    status->setText(tr("Using cell... TODO"));
 }
 
 void LatitudeGUI::get_gps() {
-    statusBar()->showMessage(tr("Using gps... TODO"),2000);
+    status->setText(tr("Using gps... TODO"));
 }
 
 void LatitudeGUI::set() {
@@ -33,15 +33,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("Location Updated !"));
 }
 
 void LatitudeGUI::set_ERROR() {
-    statusBar()->showMessage(tr("Error in Authentification !"),5000);
+    status->setText(tr("Error in Authentification !"));
 }
 
 void LatitudeGUI::save() {
@@ -62,7 +62,6 @@ void LatitudeGUI::show_map() {
     // menu
     menuBar()->clear();
     menuBar()->addAction(tr("&Latitude") ,this, SLOT(show_lat()));
-    setStatusBar(0);
 }
 
 void LatitudeGUI::show_lat() {
@@ -113,7 +112,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 +127,6 @@ void LatitudeGUI::show_lat() {
     // menu
     menuBar()->clear();
     menuBar()->addAction(tr("&Maps") ,this, SLOT(show_map()));
-    statusBar()->showMessage(tr("Ready"));
 }
 
 void LatitudeGUI::maps_login() {
diff --git a/src/latitude.h b/src/latitude.h
index 68094f1..2225a64 100644
--- a/src/latitude.h
+++ b/src/latitude.h
@@ -4,6 +4,7 @@
 #include <QtGui>
 #include <QtWebKit>
 #include "glatitude.h"
+#include "gps.h"
 
 class LatitudeGUI : public QMainWindow {
     Q_OBJECT
@@ -37,6 +38,8 @@ private:
     QLineEdit *location_lat;
     QLineEdit *location_lon;
     QLineEdit *location_acc;
+
+    QLineEdit *status;
 };
 
 #endif // LATITUDE_H
diff --git a/src/src.pro b/src/src.pro
index 553e763..4daf92d 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -5,9 +5,12 @@ TARGET = GoogleLatitude
 TEMPLATE = app
 SOURCES += main.cpp \
     latitude.cpp \
-    glatitude.cpp
+    glatitude.cpp \
+    gps.cpp
 HEADERS += latitude.h \
-    glatitude.h
+    glatitude.h \
+    gps.h
+
 unix { 
     isEmpty(PREFIX):PREFIX = /usr/local
     BINDIR = $$PREFIX/bin
-- 
1.7.9.5