Alphabetical sorting now ignores case. Checked items now have grey text instead of...

diff --git a/debian/changelog b/debian/changelog
index d132f6b..feac10f 100755 (executable)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
-easylist (0.3.9) unstable; urgency=low
+easylist (0.3.10) unstable; urgency=low
 
-  * Alphabetical sorting now possible.
-  * Label "Checked bottom" changed to "Checked to bottom".
-  * Automatic display orientation detection now possible.
+  * 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

diff --git a/easylist.pro.user b/easylist.pro.user
index 7ad3617..a5f26a6 100755 (executable)
--- a/easylist.pro.user
+++ b/easylist.pro.user
@@ -46,10 +46,10 @@
     <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.9-build-desktop</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">C:/dev/cpp/easylist-0.3.10-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">false</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
    </valuemap>
    <valuemap key="ProjectExplorer.Target.BuildConfiguration.1" type="QVariantMap">
     <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap">
@@ -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.9-build-desktop</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">C:/dev/cpp/easylist-0.3.10-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.9</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">C:/dev/cpp/easylist-0.3.10</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.9/src/easylist.desktop</value>
-      <value type="QString">C:/dev/cpp/easylist-0.3.9/src/data/26x26/easylist.png</value>
-      <value type="QString">C:/dev/cpp/easylist-0.3.9/src/data/40x40/easylist.png</value>
-      <value type="QString">C:/dev/cpp/easylist-0.3.9/src/data/48x48/easylist.png</value>
-      <value type="QString">C:/dev/cpp/easylist-0.3.9/src/data/64x64/easylist.png</value>
+      <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>
      </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.9</value>
+     <value key="Version Number" type="QString">0.3.10</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.9</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">C:/dev/cpp/easylist-0.3.10</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/mycheckbox.cpp b/src/mycheckbox.cpp
index a71b303..303f73c 100755 (executable)
--- a/src/mycheckbox.cpp
+++ b/src/mycheckbox.cpp
@@ -7,8 +7,12 @@ MyCheckBox::MyCheckBox(QWidget *parent) :
 {\r
     ++instances;\r
     qDebug() << "MyCheckBox instances:" << instances;\r
+    uncheckedColor = palette();\r
+    checkedColor.setColor(QPalette::WindowText, Qt::gray);\r
+\r
     setContextMenuPolicy(Qt::CustomContextMenu);\r
     connect(this, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(slotContextMenuActivated(QPoint)));\r
+    connect(this, SIGNAL(toggled(bool)), this, SLOT(slotTriggered(bool)));\r
 }\r
 \r
 MyCheckBox::MyCheckBox(const QString & text, QWidget *parent) :\r
@@ -16,8 +20,13 @@ MyCheckBox::MyCheckBox(const QString & text, QWidget *parent) :
 {\r
     ++instances;\r
     qDebug() << "MyCheckBox instances:" << instances;\r
+\r
+    uncheckedColor = palette();\r
+    checkedColor.setColor(QPalette::WindowText, Qt::gray);\r
+\r
     setContextMenuPolicy(Qt::CustomContextMenu);\r
     connect(this, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(slotContextMenuActivated(QPoint)));\r
+    connect(this, SIGNAL(toggled(bool)), this, SLOT(slotTriggered(bool)));\r
 }\r
 \r
 MyCheckBox::~MyCheckBox()\r
@@ -39,3 +48,18 @@ void MyCheckBox::slotContextMenuActivated(QPoint point)
     menu.addAction(tr("Delete"), this, SLOT(slotDeleteClicked()));\r
     menu.exec(this->mapToGlobal(point));\r
 }\r
+\r
+void MyCheckBox::slotTriggered(bool checked)\r
+{\r
+    if(checked)\r
+    {\r
+        setPalette(checkedColor);\r
+    }\r
+    else\r
+    {\r
+        setPalette(uncheckedColor);\r
+    }\r
+    QFont f(font());\r
+    f.setStrikeOut(checked);\r
+    setFont(f);\r
+}\r

diff --git a/src/mycheckbox.h b/src/mycheckbox.h
index cfdea07..6eac640 100755 (executable)
--- a/src/mycheckbox.h
+++ b/src/mycheckbox.h
@@ -15,11 +15,15 @@ public:
     virtual ~MyCheckBox();
 private:
     static int instances;
+
+    QPalette checkedColor;
+    QPalette uncheckedColor;
 signals:
     void signalDeleteClicked(MyCheckBox * myCheckBox);
 public slots:
     void slotContextMenuActivated(QPoint point);
     void slotDeleteClicked();
+    void slotTriggered(bool checked);
 };
 
 #endif // MYCHECKBOX_H

diff --git a/src/mycheckboxcontainer.cpp b/src/mycheckboxcontainer.cpp
index edcab32..aaa719d 100755 (executable)
--- a/src/mycheckboxcontainer.cpp
+++ b/src/mycheckboxcontainer.cpp
@@ -30,9 +30,25 @@ MyCheckBoxContainer * MyCheckBoxContainer::getInstance()
 void MyCheckBoxContainer::add(QString item)\r
 {\r
     QStringList list = item.split("\n");\r
+    QStringList list2;\r
     if(sortAlphabetically)\r
     {\r
-        list.sort();\r
+        int listSize = list.size();\r
+        int pos = 0;\r
+        for(int i = 0; i < listSize; ++i)\r
+        {\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
+                {\r
+                    break;\r
+                }\r
+            }\r
+            list2.append(list[i]);\r
+        }\r
+        list = list2;\r
     }\r
     foreach(QString item, list)\r
     {\r
@@ -89,7 +105,7 @@ void MyCheckBoxContainer::sortCheckedToBottom()
                     int pos = 0;\r
                     for(pos = 0; pos < size; ++pos)\r
                     {\r
-                        if(tempListChecked[pos]->text() > item->text())\r
+                        if(tempListChecked[pos]->text().toUpper() > item->text().toUpper())\r
                         {\r
                             break;\r
                         }\r
@@ -109,7 +125,7 @@ void MyCheckBoxContainer::sortCheckedToBottom()
                     int pos = 0;\r
                     for(pos = 0; pos < size; ++pos)\r
                     {\r
-                        if(tempList[pos]->text() > item->text())\r
+                        if(tempList[pos]->text().toUpper() > item->text().toUpper())\r
                         {\r
                             break;\r
                         }\r