Connection handling improved again. Added ability to bybass general Maemo connectivit...

[jenirok] / src / gui / settingsdialog.cpp

diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index f9dd623..11f0649 100644 (file)
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -108,18 +108,9 @@ autostartSelector_(0)
     autostartSelector_->addItem(tr("Disabled"), "0");
     autostartSelector_->setCurrentIndex(autostart == "1" ? 0 : 1);
 
-    autoconnectCheck_ = new QCheckBox(tr("Allow daemon to connect automatically"));
-    QString autoconnect = Settings::instance()->get("autoconnect");
-    autoconnectCheck_->setChecked(autoconnect == "1");
-
-    connectionSelector_ = new ConnectionSelector(tr("Connection to use"), this);
+    connectionSelector_ = new ConnectionSelector(tr("Connect automatically on"), this);
     QString selectedConnection = Settings::instance()->get("connection");
-
-    if(selectedConnection != "0")
-    {
-        connectionSelector_->addItem(Settings::instance()->get("connection_name"), selectedConnection);
-        connectionSelector_->selectByValue(selectedConnection);
-    }
+    connectionSelector_->selectByValue(selectedConnection);
 
     QPushButton* submitButton = new QPushButton(tr("Save"), this);
     connect(submitButton, SIGNAL(pressed()), this, SLOT(saveSettings()));
@@ -137,7 +128,6 @@ autostartSelector_(0)
     general->addWidget(siteSelector_);
 
     daemon->addWidget(autostartSelector_);
-    daemon->addWidget(autoconnectCheck_);
     daemon->addWidget(connectionSelector_);
 
     QDialogButtonBox* buttons = new QDialogButtonBox;
@@ -176,17 +166,13 @@ void SettingsDialog::saveSettings()
     Settings::instance()->set("site", site);
     QString autostart = autostartSelector_->value().toString();
     Settings::instance()->set("autostart", autostart);
-    bool autoconnect = autoconnectCheck_->isChecked();
-    Settings::instance()->set("autoconnect", autoconnect ? "1" : "0");
     QString connection = connectionSelector_->value().toString();
     Settings::instance()->set("connection", connection);
     Settings::instance()->set("connection_name", connectionSelector_->text());
 
     DB::disconnect();
 
-    if((site != currentSite_ ||
-        autoconnect != currentAutoconnect_ ||
-        connection != currentConnection_) && Daemon::isRunning())
+    if(site != currentSite_ && Daemon::isRunning())
     {
         QMaemo5InformationBox::information(this, tr("Restarting daemon..."));
         Daemon::restart();
@@ -203,7 +189,6 @@ void SettingsDialog::setVisible(bool visible)
     {
         currentSite_ = siteSelector_->value().toString();
         currentConnection_ = connectionSelector_->value().toString();
-        currentAutoconnect_ = autoconnectCheck_->isChecked();
     }
 
 }