From acd5a08855185f4c821d147ec2e1df116ab1fb86 Mon Sep 17 00:00:00 2001 From: Willem Liu Date: Thu, 30 Sep 2010 00:09:40 +0200 Subject: [PATCH] Fixed sort a-z bug which caused list to disappear when option Checked to Bottom was turned off. --- changelog.txt | 6 ++++++ debian/changelog | 29 +++++++++++++++++++++++++++++ easylist.pro.user | 22 +++++++++++----------- src/mycheckboxcontainer.cpp | 7 +++++-- 4 files changed, 51 insertions(+), 13 deletions(-) diff --git a/changelog.txt b/changelog.txt index 185cd33..17bb152 100755 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ +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 Tue, 07 Sep 2010 13:56:12 +0200 + easylist (0.3.10) unstable; urgency=low * Alphabetical sorting now ignores case. diff --git a/debian/changelog b/debian/changelog index feac10f..ef61dde 100755 --- 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 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 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 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 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 Tue, 07 Sep 2010 13:56:12 +0200 diff --git a/easylist.pro.user b/easylist.pro.user index a5f26a6..f130066 100755 --- a/easylist.pro.user +++ b/easylist.pro.user @@ -2,7 +2,7 @@ ProjectExplorer.Project.ActiveTarget - 0 + 1 ProjectExplorer.Project.EditorSettings @@ -46,7 +46,7 @@ Debug Qt4ProjectManager.Qt4BuildConfiguration 2 - C:/dev/cpp/easylist-0.3.10-build-desktop + C:/dev/cpp/easylist-0.3.11-build-desktop 20 2 true @@ -80,7 +80,7 @@ Release Qt4ProjectManager.Qt4BuildConfiguration 0 - C:/dev/cpp/easylist-0.3.10-build-desktop + C:/dev/cpp/easylist-0.3.11-build-desktop 20 2 true @@ -148,7 +148,7 @@ Debug Qt4ProjectManager.Qt4BuildConfiguration 2 - C:/dev/cpp/easylist-0.3.10 + C:/dev/cpp/easylist-0.3.11 27 9 false @@ -171,11 +171,11 @@ Qt4ProjectManager.MaemoPackageCreationStep - C:/dev/cpp/easylist-0.3.10/src/easylist.desktop - C:/dev/cpp/easylist-0.3.10/src/data/26x26/easylist.png - C:/dev/cpp/easylist-0.3.10/src/data/40x40/easylist.png - C:/dev/cpp/easylist-0.3.10/src/data/48x48/easylist.png - C:/dev/cpp/easylist-0.3.10/src/data/64x64/easylist.png + C:/dev/cpp/easylist-0.3.11/src/easylist.desktop + C:/dev/cpp/easylist-0.3.11/src/data/26x26/easylist.png + C:/dev/cpp/easylist-0.3.11/src/data/40x40/easylist.png + C:/dev/cpp/easylist-0.3.11/src/data/48x48/easylist.png + C:/dev/cpp/easylist-0.3.11/src/data/64x64/easylist.png false /opt/easylist/bin/easylist @@ -186,7 +186,7 @@ /usr/share/icons/hicolor/48x48/apps/easylist.png /usr/share/icons/hicolor/64x64/apps/easylist.png - 0.3.10 + 0.3.11 3 @@ -204,7 +204,7 @@ Release Qt4ProjectManager.Qt4BuildConfiguration 0 - C:/dev/cpp/easylist-0.3.10 + C:/dev/cpp/easylist-0.3.11 27 9 false diff --git a/src/mycheckboxcontainer.cpp b/src/mycheckboxcontainer.cpp index aaa719d..915d277 100755 --- a/src/mycheckboxcontainer.cpp +++ b/src/mycheckboxcontainer.cpp @@ -30,6 +30,7 @@ MyCheckBoxContainer * MyCheckBoxContainer::getInstance() void MyCheckBoxContainer::add(QString item) { QStringList list = item.split("\n"); + qDebug() << "add" << item; QStringList list2; if(sortAlphabetically) { @@ -46,10 +47,12 @@ void MyCheckBoxContainer::add(QString item) break; } } + qDebug() << "append" << list[i]; list2.append(list[i]); } list = list2; } + qDebug() << "list" << list; foreach(QString item, list) { if(item.length() > 0) @@ -73,8 +76,8 @@ void MyCheckBoxContainer::add(QString item) void MyCheckBoxContainer::set(QString item) { - qDebug() << item; clear(); + qDebug() << "set" << item; add(item); } @@ -141,8 +144,8 @@ void MyCheckBoxContainer::sortCheckedToBottom() checkBoxes.clear(); checkBoxes.append(tempList); checkBoxes.append(tempListChecked); - emit signalSorted(); } + emit signalSorted(); } QList const & MyCheckBoxContainer::getCheckBoxes() -- 1.7.9.5