Added sync functionality

diff --git a/Makefile b/Makefile
index 2e0312d..38ca0fc 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #############################################################################\r
 # Makefile for building: easylist\r
-# Generated by qmake (2.01a) (Qt 4.7.0) on: vr 29. apr 21:46:48 2011\r
+# Generated by qmake (2.01a) (Qt 4.7.0) on: vr 29. apr 22:10:26 2011\r
 # Project:  easylist.pro\r
 # Template: app\r
 # Command: c:/qtsdk/maemo/4.6.2/targets/fremantle-pr13/bin/qmake.exe -spec ../../../QtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/default -unix QMLJSDEBUGGER_PATH=C:/QtSDK/QtCreator/share/qtcreator/qml/qmljsdebugger -o Makefile easylist.pro\r

diff --git a/debian/changelog b/debian/changelog
index a4fba97..a87618d 100755 (executable)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 easylist (0.3.24) unstable; urgency=low
 
-  * 
+       * Added Sync functionality with http://www.willemliu.nl/qt/maemo/easylist/
+  * Added donation plug in about box.
 
  -- Willem Liu <willem.liu@gmail.com>  Sat, 26 Mar 2011 11:17:23 +0100
 

diff --git a/debian/rules b/debian/rules
index b262521..9e7897d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ build-stamp: configure-stamp
        dh_testdir
 
        # Add here commands to compile the package.
-       # qmake
+       qmake
        $(MAKE)
        #docbook-to-man debian/easylist.sgml > easylist.1
 
@@ -39,7 +39,7 @@ clean:
        rm -f build-stamp configure-stamp
 
        # Add here commands to clean up after the build process.
-       $(MAKE) clean
+       # $(MAKE) clean
 
        dh_clean 
 

diff --git a/easylist.pro.user b/easylist.pro.user
index 7e7dcb6..9aed9f6 100755 (executable)
--- a/easylist.pro.user
+++ b/easylist.pro.user
@@ -2,7 +2,7 @@
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
-  <value type="int">2</value>
+  <value type="int">1</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.EditorSettings</variable>
@@ -206,7 +206,7 @@
        <value type="QString">-us</value>
       </valuelist>
       <value key="ProjectExplorer.ProcessStep.Command" type="QString">C:/QtSDK/Maemo/4.6.2/wbin/mad.cmd</value>
-      <value key="ProjectExplorer.ProcessStep.Enabled" type="bool">false</value>
+      <value key="ProjectExplorer.ProcessStep.Enabled" type="bool">true</value>
       <value key="ProjectExplorer.ProcessStep.WorkingDirectory" type="QString">$BUILDDIR</value>
       <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Custom Process Step</value>
       <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
@@ -273,7 +273,7 @@
        <value type="QString"></value>
       </valuelist>
       <valuelist key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes" type="QVariantList">
-       <value type="QDateTime">2011-04-29T21:34:26</value>
+       <value type="QDateTime">2011-04-29T22:06:16</value>
        <value type="QDateTime">2011-03-26T11:43:07</value>
       </valuelist>
      </valuemap>

diff --git a/qtc_packaging/debian_fremantle/changelog b/qtc_packaging/debian_fremantle/changelog
index a4fba97..a87618d 100755 (executable)
--- a/qtc_packaging/debian_fremantle/changelog
+++ b/qtc_packaging/debian_fremantle/changelog
@@ -1,6 +1,7 @@
 easylist (0.3.24) unstable; urgency=low
 
-  * 
+       * Added Sync functionality with http://www.willemliu.nl/qt/maemo/easylist/
+  * Added donation plug in about box.
 
  -- Willem Liu <willem.liu@gmail.com>  Sat, 26 Mar 2011 11:17:23 +0100
 

diff --git a/qtc_packaging/debian_fremantle/rules b/qtc_packaging/debian_fremantle/rules
index b262521..9e7897d 100755 (executable)
--- a/qtc_packaging/debian_fremantle/rules
+++ b/qtc_packaging/debian_fremantle/rules
@@ -27,7 +27,7 @@ build-stamp: configure-stamp
        dh_testdir
 
        # Add here commands to compile the package.
-       # qmake
+       qmake
        $(MAKE)
        #docbook-to-man debian/easylist.sgml > easylist.1
 
@@ -39,7 +39,7 @@ clean:
        rm -f build-stamp configure-stamp
 
        # Add here commands to clean up after the build process.
-       $(MAKE) clean
+       # $(MAKE) clean
 
        dh_clean 
 

diff --git a/settingsform.ui b/settingsform.ui
index bc412d8..ab632dc 100755 (executable)
--- a/settingsform.ui
+++ b/settingsform.ui
@@ -13,122 +13,94 @@
   <property name="windowTitle">\r
    <string>Form</string>\r
   </property>\r
-  <layout class="QVBoxLayout" name="verticalLayout_3">\r
-   <property name="spacing">\r
-    <number>0</number>\r
-   </property>\r
+  <layout class="QGridLayout" name="gridLayout">\r
    <property name="margin">\r
     <number>0</number>\r
    </property>\r
-   <item>\r
-    <widget class="QTabWidget" name="tabWidget">\r
-     <property name="currentIndex">\r
-      <number>0</number>\r
-     </property>\r
-     <widget class="QWidget" name="tab">\r
-      <attribute name="title">\r
-       <string>Sync</string>\r
-      </attribute>\r
-      <layout class="QVBoxLayout" name="verticalLayout">\r
-       <property name="spacing">\r
-        <number>0</number>\r
-       </property>\r
-       <property name="margin">\r
-        <number>0</number>\r
-       </property>\r
-       <item>\r
-        <layout class="QVBoxLayout" name="verticalLayout_2">\r
-         <property name="spacing">\r
-          <number>0</number>\r
+   <item row="0" column="0">\r
+    <layout class="QVBoxLayout" name="verticalLayout">\r
+     <item>\r
+      <layout class="QGridLayout" name="gridLayout_4">\r
+       <item row="0" column="0">\r
+        <widget class="QGroupBox" name="groupBox">\r
+         <property name="title">\r
+          <string>Sync settings:</string>\r
          </property>\r
-         <item>\r
-          <layout class="QGridLayout" name="gridLayout">\r
-           <property name="spacing">\r
-            <number>0</number>\r
-           </property>\r
-           <item row="0" column="0">\r
-            <widget class="QGroupBox" name="groupBox">\r
-             <property name="title">\r
-              <string>Sync settings:</string>\r
-             </property>\r
-             <layout class="QGridLayout" name="gridLayout_2">\r
-              <property name="spacing">\r
-               <number>0</number>\r
-              </property>\r
-              <item row="0" column="0">\r
-               <widget class="QLabel" name="label">\r
-                <property name="text">\r
-                 <string>Username:</string>\r
-                </property>\r
-               </widget>\r
-              </item>\r
-              <item row="0" column="1">\r
-               <widget class="QLineEdit" name="syncUsernameLineEdit"/>\r
-              </item>\r
-              <item row="1" column="0">\r
-               <widget class="QLabel" name="label_2">\r
-                <property name="text">\r
-                 <string>Password:</string>\r
-                </property>\r
-               </widget>\r
-              </item>\r
-              <item row="1" column="1">\r
-               <widget class="QLineEdit" name="syncPasswordLineEdit"/>\r
-              </item>\r
-              <item row="2" column="0">\r
-               <widget class="QLabel" name="label_3">\r
-                <property name="text">\r
-                 <string>Sync url:</string>\r
-                </property>\r
-               </widget>\r
-              </item>\r
-              <item row="2" column="1">\r
-               <widget class="QLineEdit" name="syncUrlLineEdit">\r
-                <property name="text">\r
-                 <string>http://www.willemliu.nl/qt/maemo/easylist/getList.php</string>\r
-                </property>\r
-               </widget>\r
-              </item>\r
-              <item row="3" column="1">\r
-               <widget class="QPushButton" name="restoreSyncPushButton">\r
-                <property name="text">\r
-                 <string>Restore Sync url</string>\r
-                </property>\r
-               </widget>\r
-              </item>\r
-             </layout>\r
-            </widget>\r
-           </item>\r
-          </layout>\r
-         </item>\r
-        </layout>\r
+         <layout class="QFormLayout" name="formLayout">\r
+          <item row="0" column="0">\r
+           <widget class="QLabel" name="label">\r
+            <property name="text">\r
+             <string>Username:</string>\r
+            </property>\r
+           </widget>\r
+          </item>\r
+          <item row="0" column="1">\r
+           <widget class="QLineEdit" name="syncUsernameLineEdit"/>\r
+          </item>\r
+          <item row="1" column="0">\r
+           <widget class="QLabel" name="label_2">\r
+            <property name="text">\r
+             <string>Password:</string>\r
+            </property>\r
+           </widget>\r
+          </item>\r
+          <item row="1" column="1">\r
+           <widget class="QLineEdit" name="syncPasswordLineEdit">\r
+            <property name="echoMode">\r
+             <enum>QLineEdit::Password</enum>\r
+            </property>\r
+           </widget>\r
+          </item>\r
+          <item row="2" column="0">\r
+           <widget class="QLabel" name="label_3">\r
+            <property name="text">\r
+             <string>Sync url:</string>\r
+            </property>\r
+           </widget>\r
+          </item>\r
+          <item row="2" column="1">\r
+           <widget class="QLineEdit" name="syncUrlLineEdit">\r
+            <property name="text">\r
+             <string>http://www.willemliu.nl/qt/maemo/easylist/getList.php</string>\r
+            </property>\r
+           </widget>\r
+          </item>\r
+          <item row="3" column="1">\r
+           <widget class="QPushButton" name="restoreSyncPushButton">\r
+            <property name="text">\r
+             <string>Restore Sync url</string>\r
+            </property>\r
+           </widget>\r
+          </item>\r
+         </layout>\r
+        </widget>\r
        </item>\r
       </layout>\r
-     </widget>\r
-    </widget>\r
-   </item>\r
-   <item>\r
-    <layout class="QHBoxLayout" name="horizontalLayout">\r
-     <item>\r
-      <widget class="QPushButton" name="cancelPushButton">\r
-       <property name="text">\r
-        <string>Cancel</string>\r
-       </property>\r
-      </widget>\r
-     </item>\r
-     <item>\r
-      <widget class="QPushButton" name="applyPushButton">\r
-       <property name="text">\r
-        <string>Apply</string>\r
-       </property>\r
-      </widget>\r
      </item>\r
      <item>\r
-      <widget class="QPushButton" name="savePushButton">\r
-       <property name="text">\r
-        <string>Save</string>\r
-       </property>\r
-      </widget>\r
+      <layout class="QHBoxLayout" name="horizontalLayout">\r
+       <item>\r
+        <widget class="QPushButton" name="cancelPushButton">\r
+         <property name="text">\r
+          <string>Cancel</string>\r
+         </property>\r
+        </widget>\r
+       </item>\r
+       <item>\r
+        <widget class="QPushButton" name="applyPushButton">\r
+         <property name="text">\r
+          <string>Apply</string>\r
+         </property>\r
+        </widget>\r
+       </item>\r
+       <item>\r
+        <widget class="QPushButton" name="savePushButton">\r
+         <property name="text">\r
+          <string>Save</string>\r
+         </property>\r
+        </widget>\r
+       </item>\r
+      </layout>\r
      </item>\r
     </layout>\r
    </item>\r