Fixed sort a-z bug which caused list to disappear when option Checked to Bottom was...

diff --git a/changelog.txt b/changelog.txt
index 185cd33..17bb152 100755 (executable)
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+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

diff --git a/debian/changelog b/debian/changelog
index feac10f..ef61dde 100755 (executable)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,35 @@
+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
+
 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
+
+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>  Tue, 07 Sep 2010 13:56:12 +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>  Tue, 07 Sep 2010 13:56:12 +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

diff --git a/easylist.pro.user b/easylist.pro.user
index a5f26a6..f130066 100755 (executable)
--- a/easylist.pro.user
+++ b/easylist.pro.user
@@ -2,7 +2,7 @@
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
-  <value type="int">0</value>
+  <value type="int">1</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.EditorSettings</variable>
@@ -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.10-build-desktop</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">C:/dev/cpp/easylist-0.3.11-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.10-build-desktop</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">C:/dev/cpp/easylist-0.3.11-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.10</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">C:/dev/cpp/easylist-0.3.11</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.10/src/easylist.desktop</value>
-      <value type="QString">C:/dev/cpp/easylist-0.3.10/src/data/26x26/easylist.png</value>
-      <value type="QString">C:/dev/cpp/easylist-0.3.10/src/data/40x40/easylist.png</value>
-      <value type="QString">C:/dev/cpp/easylist-0.3.10/src/data/48x48/easylist.png</value>
-      <value type="QString">C:/dev/cpp/easylist-0.3.10/src/data/64x64/easylist.png</value>
+      <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>
      </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.10</value>
+     <value key="Version Number" type="QString">0.3.11</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.10</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">C:/dev/cpp/easylist-0.3.11</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 aaa719d..915d277 100755 (executable)
--- a/src/mycheckboxcontainer.cpp
+++ b/src/mycheckboxcontainer.cpp
@@ -30,6 +30,7 @@ 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
@@ -46,10 +47,12 @@ void MyCheckBoxContainer::add(QString item)
                     break;\r
                 }\r
             }\r
+            qDebug() << "append" << list[i];\r
             list2.append(list[i]);\r
         }\r
         list = list2;\r
     }\r
+    qDebug() << "list" << list;\r
     foreach(QString item, list)\r
     {\r
         if(item.length() > 0)\r
@@ -73,8 +76,8 @@ void MyCheckBoxContainer::add(QString item)
 \r
 void MyCheckBoxContainer::set(QString item)\r
 {\r
-    qDebug() << item;\r
     clear();\r
+    qDebug() << "set" << item;\r
     add(item);\r
 }\r
 \r
@@ -141,8 +144,8 @@ void MyCheckBoxContainer::sortCheckedToBottom()
         checkBoxes.clear();\r
         checkBoxes.append(tempList);\r
         checkBoxes.append(tempListChecked);\r
-        emit signalSorted();\r
     }\r
+    emit signalSorted();\r
 }\r
 \r
 QList<MyCheckBox * > const & MyCheckBoxContainer::getCheckBoxes()\r