Changed changelog.txt

[easylist] / settingsform.cpp

diff --git a/settingsform.cpp b/settingsform.cpp
index 910e3d1..6ca1b03 100755 (executable)
--- a/settingsform.cpp
+++ b/settingsform.cpp
@@ -24,11 +24,19 @@ void SettingsForm::shown()
     ui->syncUsernameLineEdit->setText(settings->value(USERNAME,"").toString());\r
     ui->syncPasswordLineEdit->setText(settings->value(PASSWORD,"").toString());\r
     if(settings->contains(PASSWORD))\r
+    {\r
         ui->syncPasswordLineEdit->setReadOnly(true);\r
+    }\r
 \r
-    ui->syncUrlLineEdit->setText(settings->value(SYNC_URL, DEFAULT_SYNC_URL).toString());\r
+    QString syncUrl = settings->value(SYNC_URL, DEFAULT_SYNC_URL).toString();\r
+    if(syncUrl.compare("http://www.willemliu.nl/qt/maemo/easylist/getList.php") == 0)\r
+    {\r
+        syncUrl = "http://easylist.willemliu.nl/getList.php";\r
+    }\r
+    ui->syncUrlLineEdit->setText(syncUrl);\r
     ui->syncUsernameLineEdit->setFocus(Qt::ActiveWindowFocusReason);\r
 }\r
+\r
 bool SettingsForm::eventFilter(QObject *obj, QEvent *e)\r
 {\r
     if(obj == ui->syncPasswordLineEdit && ui->syncPasswordLineEdit->isReadOnly() && e->type() == QEvent::MouseButtonRelease)\r
@@ -46,6 +54,7 @@ bool SettingsForm::eventFilter(QObject *obj, QEvent *e)
         return QWidget::eventFilter(obj,e);\r
     return true;\r
 }\r
+\r
 void SettingsForm::on_restoreSyncPushButton_clicked()\r
 {\r
     ui->syncUrlLineEdit->setText(DEFAULT_SYNC_URL);\r
@@ -54,6 +63,7 @@ void SettingsForm::on_restoreSyncPushButton_clicked()
 void SettingsForm::on_applyPushButton_clicked()\r
 {\r
     saveSync();\r
+    shown();\r
 }\r
 \r
 void SettingsForm::on_savePushButton_clicked()\r
@@ -69,7 +79,7 @@ void SettingsForm::saveSync()
 \r
     if(ui->syncPasswordLineEdit->isReadOnly()) //Password is already a hash\r
     {\r
-        settings->setValue(PASSWORD,passString);\r
+        settings->setValue(PASSWORD, passString);\r
     }\r
     else\r
     {\r