Changed changelog.

diff --git a/changelog.txt b/changelog.txt
index 17bb152..c858c35 100755 (executable)
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,35 +1,71 @@
-easylist (0.3.11) unstable; urgency=low\r
-\r
-  * Fixed Sort A-Z bug. Caused list to disappear when turned on with option "Checked To Bottom" turned off.\r
-\r
- -- Willem Liu <willem.liu@gmail.com>  Tue, 07 Sep 2010 13:56:12 +0200\r
-\r
-easylist (0.3.10) unstable; urgency=low\r
-\r
-  * Alphabetical sorting now ignores case.\r
-  * Checked items now have grey text instead of white and are striked through.\r
-\r
- -- Willem Liu <willem.liu@gmail.com>  Tue, 07 Sep 2010 13:56:12 +0200\r
-\r
-easylist (0.3.9) unstable; urgency=low\r
-\r
-  * Alphabetical sorting now possible.\r
-  * Label "Checked bottom" changed to "Checked to bottom".\r
-  * Automatic display orientation detection now possible.\r
-\r
- -- Willem Liu <willem.liu@gmail.com>  Tue, 07 Sep 2010 13:56:12 +0200\r
-\r
-easylist (0.3.5) unstable; urgency=low\r
-\r
-  * Significantly changed the source code.\r
-  * Divided in multiple classes.\r
-  * Using QStackedWidget now for the multiple views.\r
-  * Added uncheck all button.\r
-\r
- -- Willem Liu <willem.liu@gmail.com>  Tue, 07 Sep 2010 13:56:12 +0200\r
-\r
-easylist (0.3.4) unstable; urgency=low\r
-\r
-  * Now supports sorting checked items to bottom of the list.\r
-\r
- -- Willem Liu <willem.liu@gmail.com>  Tue, 07 Sep 2010 13:56:12 +0200\r
+easylist (0.3.12) unstable; urgency=low
+
+  * Fixed sorting problem.
+
+ -- Willem Liu <willem.liu@gmail.com>  Thu, 29 Sep 2010 03:12:00 +0200
+
+easylist (0.3.11) unstable; urgency=low
+
+  * Fixed Sort A-Z bug. Caused list to disappear when turned on with option "Checked To Bottom" turned off.
+
+ -- Willem Liu <willem.liu@gmail.com>  Thu, 29 Sep 2010 03:11:00 +0200
+
+easylist (0.3.10) unstable; urgency=low
+
+  * Alphabetical sorting now ignores case.
+  * Checked items now have grey text instead of white and are striked through.
+
+ -- Willem Liu <willem.liu@gmail.com>  Tue, 28 Sep 2010 17:12:00 +0200
+
+easylist (0.3.9) unstable; urgency=low
+
+  * Alphabetical sorting now possible.
+  * Label "Checked bottom" changed to "Checked to bottom".
+  * Automatic display orientation detection now possible.
+
+ -- Willem Liu <willem.liu@gmail.com>  Sun, 26 Sep 2010 17:43:00 +0200
+
+easylist (0.3.5) unstable; urgency=low
+
+  * Significantly changed the source code.
+  * Divided in multiple classes.
+  * Using QStackedWidget now for the multiple views.
+  * Added uncheck all button.
+
+ -- Willem Liu <willem.liu@gmail.com>  Wed, 22 Sep 2010 22:46:00 +0200
+
+easylist (0.3.4) unstable; urgency=low
+
+  * Now supports sorting checked items to bottom of the list.
+
+ -- Willem Liu <willem.liu@gmail.com>  Thu, 16 Sep 2010 13:43:00 +0200
+
+easylist (0.3.1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Willem Liu <willem.liu@gmail.com>  Tue, 07 Sep 2010 11:56:00 +0200
+
+easylist (0.3.0) unstable; urgency=low
+
+  * Changed binary version number.
+
+ -- Willem Liu <willem.liu@gmail.com>  Tue, 07 Sep 2010 11:56:00 +0200
+
+easylist (0.2) unstable; urgency=low
+
+  * Added optify file.
+
+ -- Willem Liu <willem.liu@gmail.com>  Tue, 07 Sep 2010 11:56:00 +0200
+
+easylist (0.1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Willem Liu <willem.liu@gmail.com>  Tue, 07 Sep 2010 11:56:00 +0200
+
+easylist (0.0.1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Willem Liu <willem.liu@gmail.com>  Tue, 07 Sep 2010 11:56:00 +0200

diff --git a/debian/changelog b/debian/changelog
index ef61dde..6489ecb 100755 (executable)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,27 @@
+easylist (0.3.13) unstable; urgency=low
+
+  * Changed changelog to include all previous version changes.
+
+ -- Willem Liu <willem.liu@gmail.com>  Tue, 07 Sep 2010 13:56:12 +0200
+
+easylist (0.3.12) unstable; urgency=low
+
+  * Fixed sorting problem.
+
+ -- Willem Liu <willem.liu@gmail.com>  Thu, 29 Sep 2010 03:12:00 +0200
+
 easylist (0.3.11) unstable; urgency=low
 
   * Fixed Sort A-Z bug. Caused list to disappear when turned on with option "Checked To Bottom" turned off.
 
- -- Willem Liu <willem.liu@gmail.com>  Tue, 07 Sep 2010 13:56:12 +0200
+ -- Willem Liu <willem.liu@gmail.com>  Thu, 29 Sep 2010 03:11:00 +0200
 
 easylist (0.3.10) unstable; urgency=low
 
   * Alphabetical sorting now ignores case.
   * Checked items now have grey text instead of white and are striked through.
 
- -- Willem Liu <willem.liu@gmail.com>  Tue, 07 Sep 2010 13:56:12 +0200
+ -- Willem Liu <willem.liu@gmail.com>  Tue, 28 Sep 2010 17:12:00 +0200
 
 easylist (0.3.9) unstable; urgency=low
 
@@ -17,7 +29,7 @@ easylist (0.3.9) unstable; urgency=low
   * Label "Checked bottom" changed to "Checked to bottom".
   * Automatic display orientation detection now possible.
 
- -- Willem Liu <willem.liu@gmail.com>  Tue, 07 Sep 2010 13:56:12 +0200
+ -- Willem Liu <willem.liu@gmail.com>  Sun, 26 Sep 2010 17:43:00 +0200
 
 easylist (0.3.5) unstable; urgency=low
 
@@ -26,10 +38,40 @@ easylist (0.3.5) unstable; urgency=low
   * Using QStackedWidget now for the multiple views.
   * Added uncheck all button.
 
- -- Willem Liu <willem.liu@gmail.com>  Tue, 07 Sep 2010 13:56:12 +0200
+ -- Willem Liu <willem.liu@gmail.com>  Wed, 22 Sep 2010 22:46:00 +0200
 
 easylist (0.3.4) unstable; urgency=low
 
   * Now supports sorting checked items to bottom of the list.
 
- -- Willem Liu <willem.liu@gmail.com>  Tue, 07 Sep 2010 13:56:12 +0200
+ -- Willem Liu <willem.liu@gmail.com>  Thu, 16 Sep 2010 13:43:00 +0200
+
+easylist (0.3.1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Willem Liu <willem.liu@gmail.com>  Tue, 07 Sep 2010 11:56:00 +0200
+
+easylist (0.3.0) unstable; urgency=low
+
+  * Changed binary version number.
+
+ -- Willem Liu <willem.liu@gmail.com>  Tue, 07 Sep 2010 11:56:00 +0200
+
+easylist (0.2) unstable; urgency=low
+
+  * Added optify file.
+
+ -- Willem Liu <willem.liu@gmail.com>  Tue, 07 Sep 2010 11:56:00 +0200
+
+easylist (0.1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Willem Liu <willem.liu@gmail.com>  Tue, 07 Sep 2010 11:56:00 +0200
+
+easylist (0.0.1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Willem Liu <willem.liu@gmail.com>  Tue, 07 Sep 2010 11:56:00 +0200

diff --git a/easylist.pro.user b/easylist.pro.user
index f130066..a7c57d9 100755 (executable)
--- a/easylist.pro.user
+++ b/easylist.pro.user
@@ -46,7 +46,7 @@
     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Debug</value>
     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">C:/dev/cpp/easylist-0.3.11-build-desktop</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">C:/dev/cpp/easylist-0.3.13-build-desktop</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">20</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">2</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
@@ -80,7 +80,7 @@
     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Release</value>
     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">C:/dev/cpp/easylist-0.3.11-build-desktop</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">C:/dev/cpp/easylist-0.3.13-build-desktop</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">20</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">2</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
@@ -148,7 +148,7 @@
     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Debug</value>
     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">C:/dev/cpp/easylist-0.3.11</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">C:/dev/cpp/easylist-0.3.13</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">27</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">9</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">false</value>
@@ -171,11 +171,11 @@
      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MaemoPackageCreationStep</value>
      <valuelist key="Qt4ProjectManager.BuildStep.MaemoPackage.LocalFiles" type="QVariantList">
-      <value type="QString">C:/dev/cpp/easylist-0.3.11/src/easylist.desktop</value>
-      <value type="QString">C:/dev/cpp/easylist-0.3.11/src/data/26x26/easylist.png</value>
-      <value type="QString">C:/dev/cpp/easylist-0.3.11/src/data/40x40/easylist.png</value>
-      <value type="QString">C:/dev/cpp/easylist-0.3.11/src/data/48x48/easylist.png</value>
-      <value type="QString">C:/dev/cpp/easylist-0.3.11/src/data/64x64/easylist.png</value>
+      <value type="QString">C:/dev/cpp/easylist-0.3.13/src/easylist.desktop</value>
+      <value type="QString">C:/dev/cpp/easylist-0.3.13/src/data/26x26/easylist.png</value>
+      <value type="QString">C:/dev/cpp/easylist-0.3.13/src/data/40x40/easylist.png</value>
+      <value type="QString">C:/dev/cpp/easylist-0.3.13/src/data/48x48/easylist.png</value>
+      <value type="QString">C:/dev/cpp/easylist-0.3.13/src/data/64x64/easylist.png</value>
      </valuelist>
      <value key="Qt4ProjectManager.BuildStep.MaemoPackage.Modified" type="bool">false</value>
      <value key="Qt4ProjectManager.BuildStep.MaemoPackage.RemoteExe" type="QString">/opt/easylist/bin/easylist</value>
@@ -186,7 +186,7 @@
       <value type="QString">/usr/share/icons/hicolor/48x48/apps/easylist.png</value>
       <value type="QString">/usr/share/icons/hicolor/64x64/apps/easylist.png</value>
      </valuelist>
-     <value key="Version Number" type="QString">0.3.11</value>
+     <value key="Version Number" type="QString">0.3.13</value>
     </valuemap>
     <value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" type="int">3</value>
     <valuemap key="ProjectExplorer.BuildConfiguration.CleanStep.0" type="QVariantMap">
@@ -204,7 +204,7 @@
     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Release</value>
     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">C:/dev/cpp/easylist-0.3.11</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">C:/dev/cpp/easylist-0.3.13</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">27</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">9</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">false</value>

diff --git a/src/mycheckboxcontainer.cpp b/src/mycheckboxcontainer.cpp
index 915d277..130cd0a 100755 (executable)
--- a/src/mycheckboxcontainer.cpp
+++ b/src/mycheckboxcontainer.cpp
@@ -30,25 +30,31 @@ MyCheckBoxContainer * MyCheckBoxContainer::getInstance()
 void MyCheckBoxContainer::add(QString item)\r
 {\r
     QStringList list = item.split("\n");\r
-    qDebug() << "add" << item;\r
     QStringList list2;\r
     if(sortAlphabetically)\r
     {\r
+        list2.append(list.takeFirst());\r
         int listSize = list.size();\r
         int pos = 0;\r
+        bool inserted = false;\r
         for(int i = 0; i < listSize; ++i)\r
         {\r
+            inserted = false;\r
             int list2Size = list2.size();\r
             for(int j = 0; j < list2Size; ++j)\r
             {\r
                 pos = j;\r
-                if(list[i].toUpper() > list2[j].toUpper())\r
+                if(list[i].toUpper() < list2[j].toUpper())\r
                 {\r
+                    list2.insert(pos, list[i]);\r
+                    inserted = true;\r
                     break;\r
                 }\r
             }\r
-            qDebug() << "append" << list[i];\r
-            list2.append(list[i]);\r
+            if(inserted == false)\r
+            {\r
+                list2.append(list[i]);\r
+            }\r
         }\r
         list = list2;\r
     }\r
@@ -77,7 +83,6 @@ void MyCheckBoxContainer::add(QString item)
 void MyCheckBoxContainer::set(QString item)\r
 {\r
     clear();\r
-    qDebug() << "set" << item;\r
     add(item);\r
 }\r
 \r