Added prompt for deleting list.

diff --git a/changelog.txt b/changelog.txt
index 5691991..e82015e 100755 (executable)
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+easylist (0.3.27) unstable; urgency=low
+
+  * Added confirmation prompt when deleting List.
+
+ -- Willem Liu <willem.liu@gmail.com>  Thu, 05 May 2011 10:43:11 +0200
+
 easylist (0.3.26) unstable; urgency=low
 
   * Changed default sync website to http://easylist.willemliu.nl

diff --git a/debian/changelog b/debian/changelog
index 8b9869c..174ac1d 100755 (executable)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-easylist (0.3.27) unstable; urgency=low
+easylist (0.3.28) unstable; urgency=low
 
-  * Added confirmation prompt when deleting List.
+  * Added confirmation prompt when syncing List.
 
- -- Willem Liu <willem.liu@gmail.com>  Thu, 05 May 2011 10:43:11 +0200
+ -- Willem Liu <willem.liu@gmail.com>  Fri, 06 May 2011 10:42:28 +0200

diff --git a/debian/copyright b/debian/copyright
index d4df08b..393cd8e 100755 (executable)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
 This package was debianized by Willem Liu <willem.liu@gmail.com> on
-Thu, 05 May 2011 10:43:11 +0200.
+Fri, 06 May 2011 10:42:28 +0200.
 
 It was downloaded from <url://example.com>
 

diff --git a/mainform.cpp b/mainform.cpp
index 0c61735..1be0d42 100755 (executable)
--- a/mainform.cpp
+++ b/mainform.cpp
@@ -198,7 +198,7 @@ void MainForm::on_actionAuto_Orientation_triggered()
     qDebug() << "Auto orientation" << ui->actionAuto_Orientation->isChecked();\r
     if(ui->actionAuto_Orientation->isChecked())\r
     {\r
-#ifdef Q_WS_MAEMO_5\r
+#if defined(Q_WS_MAEMO_5) || defined(Q_WS_HILDON)\r
         setAttribute(Qt::WA_Maemo5PortraitOrientation, false);\r
         setAttribute(Qt::WA_Maemo5LandscapeOrientation, false);\r
         setAttribute(Qt::WA_Maemo5AutoOrientation, true);\r
@@ -224,14 +224,19 @@ void MainForm::on_actionLists_triggered()
 \r
 void MainForm::on_actionSync_triggered()\r
 {\r
-    QString username = settings->value(USERNAME, "").toString();\r
-    QString password = settings->value(PASSWORD, "").toString();\r
-    QString url = settings->value(SYNC_URL, DEFAULT_SYNC_URL).toString();\r
-    url.append("?username=" + username);\r
-    url.append("&password=" + password);\r
-    qDebug() << url;\r
-    requestWebpage->post(url,settings->value(LIST_TEXT,"").toString().toUtf8());\r
-    //requestWebpage->fetch(url);\r
+    int res = QMessageBox::warning(this, "Synchronize list", "If you haven't saved your current list under a list name other than SyncList then it will be overwritten by the items on the website.", QMessageBox::Ok, QMessageBox::Cancel);\r
+\r
+    if(res == QMessageBox::Ok)\r
+    {\r
+        QString username = settings->value(USERNAME, "").toString();\r
+        QString password = settings->value(PASSWORD, "").toString();\r
+        QString url = settings->value(SYNC_URL, DEFAULT_SYNC_URL).toString();\r
+        url.append("?username=" + username);\r
+        url.append("&password=" + password);\r
+        qDebug() << url;\r
+        requestWebpage->post(url,settings->value(LIST_TEXT,"").toString().toUtf8());\r
+        //requestWebpage->fetch(url);\r
+    }\r
 }\r
 \r
 void MainForm::slotSyncList(QNetworkReply* pReply)\r

diff --git a/qtc_packaging/debian_fremantle/changelog b/qtc_packaging/debian_fremantle/changelog
index 8b9869c..174ac1d 100755 (executable)
--- a/qtc_packaging/debian_fremantle/changelog
+++ b/qtc_packaging/debian_fremantle/changelog
@@ -1,5 +1,5 @@
-easylist (0.3.27) unstable; urgency=low
+easylist (0.3.28) unstable; urgency=low
 
-  * Added confirmation prompt when deleting List.
+  * Added confirmation prompt when syncing List.
 
- -- Willem Liu <willem.liu@gmail.com>  Thu, 05 May 2011 10:43:11 +0200
+ -- Willem Liu <willem.liu@gmail.com>  Fri, 06 May 2011 10:42:28 +0200

diff --git a/qtc_packaging/debian_fremantle/copyright b/qtc_packaging/debian_fremantle/copyright
index d4df08b..393cd8e 100755 (executable)
--- a/qtc_packaging/debian_fremantle/copyright
+++ b/qtc_packaging/debian_fremantle/copyright
@@ -1,5 +1,5 @@
 This package was debianized by Willem Liu <willem.liu@gmail.com> on
-Thu, 05 May 2011 10:43:11 +0200.
+Fri, 06 May 2011 10:42:28 +0200.
 
 It was downloaded from <url://example.com>
 

diff --git a/systemsettings.cpp b/systemsettings.cpp
index 5cd7d88..b8c1b4f 100755 (executable)
--- a/systemsettings.cpp
+++ b/systemsettings.cpp
@@ -7,7 +7,7 @@ SystemSettings::SystemSettings()
 {\r
     ++instances;\r
     settings = new QSettings(WILLEM_LIU, EASY_LIST);\r
-#ifdef Q_WS_MAEMO_5\r
+#if defined(Q_WS_MAEMO_5) || defined(Q_WS_HILDON) || defined(MEEGO_EDITION_HARMATTAN)\r
     // Connect to DBUS of keyboard slider.\r
     QDBusConnection::systemBus().connect(QString("org.freedesktop.Hal"),\r
                                          DBUS_KEYBOARD_SLIDE,\r
@@ -34,7 +34,7 @@ void SystemSettings::slotKeyboardSlide()
 bool SystemSettings::getKeyboardClosed()\r
 {\r
     bool closed = false;\r
-#ifdef Q_WS_MAEMO_5\r
+#if defined(Q_WS_MAEMO_5) || defined(Q_WS_HILDON) || defined(MEEGO_EDITION_HARMATTAN)\r
     QDBusInterface propertyInterface("org.freedesktop.Hal",\r
                     DBUS_KEYBOARD_SLIDE,\r
                     "org.freedesktop.Hal.Device",\r