From 8866b9b3c170d020774e2af258b876ddf2f872a3 Mon Sep 17 00:00:00 2001 From: Willem Liu Date: Tue, 5 Oct 2010 18:46:54 +0200 Subject: [PATCH] Changed changelog. --- changelog.txt | 106 +++++++++++++++++++++++++++++-------------- debian/changelog | 52 +++++++++++++++++++-- easylist.pro.user | 20 ++++---- src/mycheckboxcontainer.cpp | 15 ++++-- 4 files changed, 138 insertions(+), 55 deletions(-) diff --git a/changelog.txt b/changelog.txt index 17bb152..c858c35 100755 --- a/changelog.txt +++ b/changelog.txt @@ -1,35 +1,71 @@ -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 +easylist (0.3.12) unstable; urgency=low + + * Fixed sorting problem. + + -- Willem Liu 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 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 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 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 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 Thu, 16 Sep 2010 13:43:00 +0200 + +easylist (0.3.1) unstable; urgency=low + + * Initial Release. + + -- Willem Liu Tue, 07 Sep 2010 11:56:00 +0200 + +easylist (0.3.0) unstable; urgency=low + + * Changed binary version number. + + -- Willem Liu Tue, 07 Sep 2010 11:56:00 +0200 + +easylist (0.2) unstable; urgency=low + + * Added optify file. + + -- Willem Liu Tue, 07 Sep 2010 11:56:00 +0200 + +easylist (0.1) unstable; urgency=low + + * Initial Release. + + -- Willem Liu Tue, 07 Sep 2010 11:56:00 +0200 + +easylist (0.0.1) unstable; urgency=low + + * Initial Release. + + -- Willem Liu Tue, 07 Sep 2010 11:56:00 +0200 diff --git a/debian/changelog b/debian/changelog index ef61dde..6489ecb 100755 --- 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 Tue, 07 Sep 2010 13:56:12 +0200 + +easylist (0.3.12) unstable; urgency=low + + * Fixed sorting problem. + + -- Willem Liu 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 Tue, 07 Sep 2010 13:56:12 +0200 + -- Willem Liu 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 Tue, 07 Sep 2010 13:56:12 +0200 + -- Willem Liu 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 Tue, 07 Sep 2010 13:56:12 +0200 + -- Willem Liu 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 Tue, 07 Sep 2010 13:56:12 +0200 + -- Willem Liu 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 Tue, 07 Sep 2010 13:56:12 +0200 + -- Willem Liu Thu, 16 Sep 2010 13:43:00 +0200 + +easylist (0.3.1) unstable; urgency=low + + * Initial Release. + + -- Willem Liu Tue, 07 Sep 2010 11:56:00 +0200 + +easylist (0.3.0) unstable; urgency=low + + * Changed binary version number. + + -- Willem Liu Tue, 07 Sep 2010 11:56:00 +0200 + +easylist (0.2) unstable; urgency=low + + * Added optify file. + + -- Willem Liu Tue, 07 Sep 2010 11:56:00 +0200 + +easylist (0.1) unstable; urgency=low + + * Initial Release. + + -- Willem Liu Tue, 07 Sep 2010 11:56:00 +0200 + +easylist (0.0.1) unstable; urgency=low + + * Initial Release. + + -- Willem Liu Tue, 07 Sep 2010 11:56:00 +0200 diff --git a/easylist.pro.user b/easylist.pro.user index f130066..a7c57d9 100755 --- a/easylist.pro.user +++ b/easylist.pro.user @@ -46,7 +46,7 @@ Debug Qt4ProjectManager.Qt4BuildConfiguration 2 - C:/dev/cpp/easylist-0.3.11-build-desktop + C:/dev/cpp/easylist-0.3.13-build-desktop 20 2 true @@ -80,7 +80,7 @@ Release Qt4ProjectManager.Qt4BuildConfiguration 0 - C:/dev/cpp/easylist-0.3.11-build-desktop + C:/dev/cpp/easylist-0.3.13-build-desktop 20 2 true @@ -148,7 +148,7 @@ Debug Qt4ProjectManager.Qt4BuildConfiguration 2 - C:/dev/cpp/easylist-0.3.11 + C:/dev/cpp/easylist-0.3.13 27 9 false @@ -171,11 +171,11 @@ Qt4ProjectManager.MaemoPackageCreationStep - 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 + C:/dev/cpp/easylist-0.3.13/src/easylist.desktop + C:/dev/cpp/easylist-0.3.13/src/data/26x26/easylist.png + C:/dev/cpp/easylist-0.3.13/src/data/40x40/easylist.png + C:/dev/cpp/easylist-0.3.13/src/data/48x48/easylist.png + C:/dev/cpp/easylist-0.3.13/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.11 + 0.3.13 3 @@ -204,7 +204,7 @@ Release Qt4ProjectManager.Qt4BuildConfiguration 0 - C:/dev/cpp/easylist-0.3.11 + C:/dev/cpp/easylist-0.3.13 27 9 false diff --git a/src/mycheckboxcontainer.cpp b/src/mycheckboxcontainer.cpp index 915d277..130cd0a 100755 --- a/src/mycheckboxcontainer.cpp +++ b/src/mycheckboxcontainer.cpp @@ -30,25 +30,31 @@ MyCheckBoxContainer * MyCheckBoxContainer::getInstance() void MyCheckBoxContainer::add(QString item) { QStringList list = item.split("\n"); - qDebug() << "add" << item; QStringList list2; if(sortAlphabetically) { + list2.append(list.takeFirst()); int listSize = list.size(); int pos = 0; + bool inserted = false; for(int i = 0; i < listSize; ++i) { + inserted = false; int list2Size = list2.size(); for(int j = 0; j < list2Size; ++j) { pos = j; - if(list[i].toUpper() > list2[j].toUpper()) + if(list[i].toUpper() < list2[j].toUpper()) { + list2.insert(pos, list[i]); + inserted = true; break; } } - qDebug() << "append" << list[i]; - list2.append(list[i]); + if(inserted == false) + { + list2.append(list[i]); + } } list = list2; } @@ -77,7 +83,6 @@ void MyCheckBoxContainer::add(QString item) void MyCheckBoxContainer::set(QString item) { clear(); - qDebug() << "set" << item; add(item); } -- 1.7.9.5