Enable Daemon Option, submit for testing

[googlelatitude] / latitudewidget.cpp

diff --git a/latitudewidget.cpp b/latitudewidget.cpp
index f81b786..6b754d9 100644 (file)
--- a/latitudewidget.cpp
+++ b/latitudewidget.cpp
@@ -3,7 +3,12 @@
 LatitudeGUI::LatitudeGUI(QWidget *parent) :
     QWidget(parent),
     latitude(this),
-    gps(this) {
+    gps(this),
+    demonioOpt("/opt/LatitudeUpdaterDaemon/bin/LatitudeUpdaterDaemon"),
+    demonioSdk(QCoreApplication::applicationDirPath()+
+        QDir::separator()+
+        "LatitudeUpdaterDaemon"),
+    cli(this) {
     qDebug() << "* LatitudeGUI::LatitudeGUI";
     setWindowTitle(tr("LatitudeUpdater"));
 
@@ -28,32 +33,10 @@ LatitudeGUI::LatitudeGUI(QWidget *parent) :
     connect(&latitude, SIGNAL(notToken()), this, SLOT(gl_NotToken()) );
     connect(&latitude, SIGNAL(needAuth()), this, SLOT(gl_needAuth()) );
 
-    latitude.getAccess();
+    connect(&gps, SIGNAL(gotFix()), this, SLOT(set_latitude()) );
 
     // row 2
     layout_row2 = new QHBoxLayout();
-    pos_label = new QLabel("Position");
-    pos_lat = new QLineEdit("lat");
-    pos_lon = new QLineEdit("lon");
-    pos_acc = new QLineEdit("acc");
-    pos_tis = new QLineEdit("tis");
-
-    pos_lat->setReadOnly(true);
-    pos_lon->setReadOnly(true);
-    pos_acc->setReadOnly(true);
-    pos_tis->setReadOnly(true);
-
-    layout_row2->addWidget(pos_label);
-    layout_row2->addWidget(pos_lat);
-    layout_row2->addWidget(pos_lon);
-    layout_row2->addWidget(pos_acc);
-    layout_row2->addWidget(pos_tis);
-
-    connect(&gps, SIGNAL(gotUpdate()), this, SLOT(get_gps()) );
-    connect(&gps, SIGNAL(gotFix()), this, SLOT(set_latitude()) );
-
-    // row 3
-    layout_row3 = new QHBoxLayout();
     gps_group = new QButtonGroup();
     gps_method = new QLabel("Method");
     gps_cell = new QRadioButton("Cell Tower");
@@ -62,10 +45,10 @@ LatitudeGUI::LatitudeGUI(QWidget *parent) :
     gps_group->addButton(gps_cell);
     gps_group->addButton(gps_both);
     gps_group->addButton(gps_agps);
-    layout_row3->addWidget(gps_method);
-    layout_row3->addWidget(gps_cell);
-    layout_row3->addWidget(gps_both);
-    layout_row3->addWidget(gps_agps);
+    layout_row2->addWidget(gps_method);
+    layout_row2->addWidget(gps_cell);
+    layout_row2->addWidget(gps_both);
+    layout_row2->addWidget(gps_agps);
 
     if ( gps.getPositioningMethod() == "gps" ) gps_agps->setChecked(true);
     if ( gps.getPositioningMethod() == "cell" ) gps_cell->setChecked(true);
@@ -75,22 +58,22 @@ LatitudeGUI::LatitudeGUI(QWidget *parent) :
     connect(gps_both, SIGNAL(clicked()), this, SLOT(set_method()) );
     connect(gps_agps, SIGNAL(clicked()), this, SLOT(set_method()) );
 
-    // row 4
-    layout_row4 = new QHBoxLayout();
+    // row 3
+    layout_row3 = new QHBoxLayout();
     gps_to_label = new QLabel("Time Out");
     gps_to_slider = new QSlider(Qt::Horizontal);
     gps_to_slider->setSingleStep(5);
     gps_to_slider->setRange(5, 120);
     gps_to_slider->setValue(gps.getTimeOut());
     gps_to_slider_value = new QLabel(QString("%1 sec.").arg(gps_to_slider->value()));
-    layout_row4->addWidget(gps_to_label);
-    layout_row4->addWidget(gps_to_slider);
-    layout_row4->addWidget(gps_to_slider_value);
+    layout_row3->addWidget(gps_to_label);
+    layout_row3->addWidget(gps_to_slider);
+    layout_row3->addWidget(gps_to_slider_value);
 
     connect(gps_to_slider, SIGNAL(valueChanged(int)), this, SLOT(set_to(int)) );
 
-    // row 5
-    layout_row5 = new QHBoxLayout();
+    // row 4
+    layout_row4 = new QHBoxLayout();
     gps_i_label = new QLabel("Interval");
 
     gps_i_slider = new QSlider(Qt::Horizontal);
@@ -98,23 +81,23 @@ LatitudeGUI::LatitudeGUI(QWidget *parent) :
     gps_i_slider->setRange(5, 60);
     gps_i_slider->setValue(gps.getInterval()/60);
     gps_i_slider_value = new QLabel(QString("%1 min.").arg(gps_i_slider->value()));
-    layout_row5->addWidget(gps_i_label);
-    layout_row5->addWidget(gps_i_slider);
-    layout_row5->addWidget(gps_i_slider_value);
+    layout_row4->addWidget(gps_i_label);
+    layout_row4->addWidget(gps_i_slider);
+    layout_row4->addWidget(gps_i_slider_value);
 
     connect(gps_i_slider, SIGNAL(valueChanged(int)), this, SLOT(set_i(int)) );
 
-    // row 6
-    layout_row6 = new QHBoxLayout();
+    // row 5
+    layout_row5 = new QHBoxLayout();
     gps_ac_group = new QButtonGroup();
     gps_ac_label = new QLabel("Auto Connect");
     gps_ac_yes = new QRadioButton("Yes");
     gps_ac_not = new QRadioButton("No");
     gps_ac_group->addButton(gps_ac_yes);
     gps_ac_group->addButton(gps_ac_not);
-    layout_row6->addWidget(gps_ac_label);
-    layout_row6->addWidget(gps_ac_yes);
-    layout_row6->addWidget(gps_ac_not);
+    layout_row5->addWidget(gps_ac_label);
+    layout_row5->addWidget(gps_ac_yes);
+    layout_row5->addWidget(gps_ac_not);
 
     if ( latitude.getAutoConnect() == true ) gps_ac_yes->setChecked(true);
     if ( latitude.getAutoConnect() == false ) gps_ac_not->setChecked(true);
@@ -129,8 +112,8 @@ LatitudeGUI::LatitudeGUI(QWidget *parent) :
     layout_gui->addLayout(layout_row3);
     layout_gui->addLayout(layout_row4);
     layout_gui->addLayout(layout_row5);
-    layout_gui->addLayout(layout_row6);
 
     setLayout(layout_gui);
+    latitude.getAccess();
 }