GpsMaemo5::GpsMaemo5(QObject *parent) :
QObject(parent),
latitude(0), longitude(0), accuracy(0),
- interval(1800), wait(30), usegps(false),
+ interval(1800), wait(30), method("cell"),
emitfix(false), stopgps(true) {
#ifdef Q_WS_MAEMO_5
control = location_gpsd_control_get_default();
#endif
#ifdef Q_WS_MAEMO_5
- g_object_set(G_OBJECT(control), "preferred-method", LOCATION_METHOD_ACWP, NULL);
- if (usegps) {
+ if ( method == QString("cell") ) {
+ g_object_set(G_OBJECT(control), "preferred-method", LOCATION_METHOD_ACWP, NULL);
+ } else if ( method == QString("both") ) {
+ g_object_set(G_OBJECT(control), "preferred-method", LOCATION_METHOD_USER_SELECTED, NULL);
+ } else if ( method == QString("agps") ) {
g_object_set(G_OBJECT(control), "preferred-method", LOCATION_METHOD_AGNSS, NULL);
+ } else {
+ g_object_set(G_OBJECT(control), "preferred-method", LOCATION_METHOD_ACWP, NULL);
}
location_gpsd_control_start(control);
#else
stop();
}
-int GpsMaemo5::config(int i, int w, bool g) {
+int GpsMaemo5::config(int i, int w, QString m) {
qDebug() << "GpsMaemo5: config";
stopgps = false;
interval = i;
wait = w;
- usegps = g;
+ method = m;
return 0;
}
gps->config(setting->value("interval",1800).toInt(),
setting->value("wait",30).toInt(),
- setting->value("usegps",false).toBool());
+ setting->value("method","cell").toString());
}
void LatitudeGUI::latitude_ok() {
demonio->setText(tr("&Start Daemon"));
} else {
QProcess *cli = new QProcess(this);
- cli->start(QCoreApplication::applicationDirPath()+QDir::separator()+"GoogleLatitudeDaemon");
- qDebug() << "LatitudeGUI: demonio" << QCoreApplication::applicationDirPath()+"/GoogleLatitudeDaemon";
+ cli->startDetached(QCoreApplication::applicationDirPath()+QDir::separator()+"GoogleLatitudeDaemon");
+ qDebug() << "LatitudeGUI: demonio" << QCoreApplication::applicationDirPath()+QDir::separator()+"GoogleLatitudeDaemon";
if ( ! system("killall -0 GoogleLatitudeDaemon 2> /dev/null" ) ) {
demonio->setText(tr("&Stop Daemon"));
}
QLineEdit *gps_interval = new QLineEdit(setting->value("interval",1800).toString());
QLineEdit *gps_wait = new QLineEdit(setting->value("wait",30).toString());
- QCheckBox *gps_use = new QCheckBox();
- if ( setting->value("usegps",false).toBool() ) {
- gps_use->setCheckState(Qt::Checked);
- } else {
- gps_use->setCheckState(Qt::Unchecked);
- }
QCheckBox *daemon_use = new QCheckBox();
if ( setting->value("daemon",false).toBool() ) {
daemon_use->setCheckState(Qt::Unchecked);
}
- QFormLayout *layout_config = new QFormLayout();
- layout_config->addRow(tr("&Username"), login_user);
- layout_config->addRow(tr("&Password"), login_pass);
- layout_config->addRow(tr("&Interval for Updates"), gps_interval);
- layout_config->addRow(tr("&Wait for a Fix"), gps_wait);
- layout_config->addRow(tr("&Use Gps"), gps_use);
- layout_config->addRow(tr("&Daemon at Boot"), daemon_use);
+ QRadioButton *gps_cell = new QRadioButton(tr("&Cell Tower"));
+ QRadioButton *gps_both = new QRadioButton(tr("&Both"));
+ QRadioButton *gps_agps = new QRadioButton(tr("Only &Gps"));
+
+ QString gps_setting = setting->value("method","cell").toString();
+ if ( gps_setting == QString("cell") ) {
+ gps_cell->setChecked(true);
+ } else if ( gps_setting == QString("both") ) {
+ gps_both->setChecked(true);
+ } else if ( gps_setting == QString("agps") ) {
+ gps_agps->setChecked(true);
+ } else {
+ gps_cell->setChecked(true);
+ }
+
+ QFormLayout *layout_form = new QFormLayout();
+ layout_form->addRow(tr("&Username"), login_user);
+ layout_form->addRow(tr("&Password"), login_pass);
connect(login_user, SIGNAL(textEdited(QString)), this, SLOT(save_user(QString)));
connect(login_user, SIGNAL(returnPressed()), login_pass, SLOT(setFocus()));
connect(login_pass, SIGNAL(textEdited(QString)), this, SLOT(save_pass(QString)));
connect(login_pass, SIGNAL(returnPressed()), dialoglogin, SLOT(accept()));
+ layout_form->addRow(tr("&Interval for Updates"), gps_interval);
+ layout_form->addRow(tr("&Wait for a Fix"), gps_wait);
+ layout_form->addRow(tr("&Daemon at Boot"), daemon_use);
connect(gps_interval, SIGNAL(textEdited(QString)), this, SLOT(save_interval(QString)));
connect(gps_wait, SIGNAL(textEdited(QString)), this, SLOT(save_wait(QString)));
- connect(gps_use, SIGNAL(stateChanged(int)), this, SLOT(save_gps(int)));
connect(daemon_use, SIGNAL(stateChanged(int)), this, SLOT(save_daemon(int)));
- dialoglogin->setLayout(layout_config);
+ QHBoxLayout *layout_gps = new QHBoxLayout;
+ layout_gps->addWidget(gps_cell);
+ layout_gps->addWidget(gps_both);
+ layout_gps->addWidget(gps_agps);
+ layout_form->addRow(layout_gps);
+ connect(gps_cell, SIGNAL(clicked()), this, SLOT(save_gps_cell()));
+ connect(gps_both, SIGNAL(clicked()), this, SLOT(save_gps_both()));
+ connect(gps_agps, SIGNAL(clicked()), this, SLOT(save_gps_agps()));
+
+ dialoglogin->setLayout(layout_form);
dialoglogin->exec();
if ( setting->value("interval",1800).toInt() < 300 )
if ( setting->value("interval",1800).toInt() > 3600 )
setting->setValue("interval", 3600);
- if ( setting->value("usegps",false).toBool() ) {
+ if ( QString("agps") == setting->value("method","cell").toString() ) {
if ( setting->value("wait",30).toInt() < 15 )
setting->setValue("wait", 15);
} else {