From: Willem Liu <willem.liu@gmail.com>
Date: Fri, 29 Apr 2011 20:11:53 +0000 (+0200)
Subject: Added sync functionality
X-Git-Tag: easylist-0.3.24~2
X-Git-Url: https://vcs.maemo.org/git/?p=easylist;a=commitdiff_plain;h=b5e7516b0b46a171282ac5f6635d563cd8d2570f

Added sync functionality
---

diff --git a/Makefile b/Makefile
index 2e0312d..38ca0fc 100755
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: easylist
-# Generated by qmake (2.01a) (Qt 4.7.0) on: vr 29. apr 21:46:48 2011
+# Generated by qmake (2.01a) (Qt 4.7.0) on: vr 29. apr 22:10:26 2011
 # Project:  easylist.pro
 # Template: app
 # 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
diff --git a/debian/changelog b/debian/changelog
index a4fba97..a87618d 100755
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/settingsform.ui
+++ b/settingsform.ui
@@ -13,122 +13,94 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3">
-   <property name="spacing">
-    <number>0</number>
-   </property>
+  <layout class="QGridLayout" name="gridLayout">
    <property name="margin">
     <number>0</number>
    </property>
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tab">
-      <attribute name="title">
-       <string>Sync</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <property name="spacing">
-        <number>0</number>
-       </property>
-       <property name="margin">
-        <number>0</number>
-       </property>
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_2">
-         <property name="spacing">
-          <number>0</number>
+   <item row="0" column="0">
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <layout class="QGridLayout" name="gridLayout_4">
+       <item row="0" column="0">
+        <widget class="QGroupBox" name="groupBox">
+         <property name="title">
+          <string>Sync settings:</string>
          </property>
-         <item>
-          <layout class="QGridLayout" name="gridLayout">
-           <property name="spacing">
-            <number>0</number>
-           </property>
-           <item row="0" column="0">
-            <widget class="QGroupBox" name="groupBox">
-             <property name="title">
-              <string>Sync settings:</string>
-             </property>
-             <layout class="QGridLayout" name="gridLayout_2">
-              <property name="spacing">
-               <number>0</number>
-              </property>
-              <item row="0" column="0">
-               <widget class="QLabel" name="label">
-                <property name="text">
-                 <string>Username:</string>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="1">
-               <widget class="QLineEdit" name="syncUsernameLineEdit"/>
-              </item>
-              <item row="1" column="0">
-               <widget class="QLabel" name="label_2">
-                <property name="text">
-                 <string>Password:</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="1">
-               <widget class="QLineEdit" name="syncPasswordLineEdit"/>
-              </item>
-              <item row="2" column="0">
-               <widget class="QLabel" name="label_3">
-                <property name="text">
-                 <string>Sync url:</string>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="1">
-               <widget class="QLineEdit" name="syncUrlLineEdit">
-                <property name="text">
-                 <string>http://www.willemliu.nl/qt/maemo/easylist/getList.php</string>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="1">
-               <widget class="QPushButton" name="restoreSyncPushButton">
-                <property name="text">
-                 <string>Restore Sync url</string>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-          </layout>
-         </item>
-        </layout>
+         <layout class="QFormLayout" name="formLayout">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label">
+            <property name="text">
+             <string>Username:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QLineEdit" name="syncUsernameLineEdit"/>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_2">
+            <property name="text">
+             <string>Password:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QLineEdit" name="syncPasswordLineEdit">
+            <property name="echoMode">
+             <enum>QLineEdit::Password</enum>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_3">
+            <property name="text">
+             <string>Sync url:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QLineEdit" name="syncUrlLineEdit">
+            <property name="text">
+             <string>http://www.willemliu.nl/qt/maemo/easylist/getList.php</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QPushButton" name="restoreSyncPushButton">
+            <property name="text">
+             <string>Restore Sync url</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
        </item>
       </layout>
-     </widget>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QPushButton" name="cancelPushButton">
-       <property name="text">
-        <string>Cancel</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="applyPushButton">
-       <property name="text">
-        <string>Apply</string>
-       </property>
-      </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="savePushButton">
-       <property name="text">
-        <string>Save</string>
-       </property>
-      </widget>
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <widget class="QPushButton" name="cancelPushButton">
+         <property name="text">
+          <string>Cancel</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="applyPushButton">
+         <property name="text">
+          <string>Apply</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="savePushButton">
+         <property name="text">
+          <string>Save</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
     </layout>
    </item>