From: Willem Liu Date: Tue, 26 Oct 2010 16:01:41 +0000 (+0200) Subject: Added some files. Message dialog pops up when clearing checked items. X-Git-Tag: easylist-0.3.23~2 X-Git-Url: http://vcs.maemo.org/git/?p=easylist;a=commitdiff_plain;h=d2aedf99fd548ef4bf4a0439b96508ab55e5bc70 Added some files. Message dialog pops up when clearing checked items. --- diff --git a/changelog.txt b/changelog.txt index 8c22fbb..5491497 100755 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ +easylist (0.3.18) unstable; urgency=low + + * Added warning message box when clear checked message is pressed. + + -- Willem Liu Thu, 26 Oct 2010 17:47:00 +0200 + easylist (0.3.17) unstable; urgency=low * Fixed bug when saving to a list template with empty name causes all lists to disappear. diff --git a/debian/changelog b/debian/changelog index 8c22fbb..5491497 100755 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +easylist (0.3.18) unstable; urgency=low + + * Added warning message box when clear checked message is pressed. + + -- Willem Liu Thu, 26 Oct 2010 17:47:00 +0200 + easylist (0.3.17) unstable; urgency=low * Fixed bug when saving to a list template with empty name causes all lists to disappear. diff --git a/easylist.pro.user b/easylist.pro.user index 64e46a0..104bccd 100755 --- a/easylist.pro.user +++ b/easylist.pro.user @@ -2,7 +2,7 @@ ProjectExplorer.Project.ActiveTarget - 1 + 0 ProjectExplorer.Project.EditorSettings @@ -48,7 +48,7 @@ Debug Qt4ProjectManager.Qt4BuildConfiguration 2 - C:/dev/cpp/easylist-0.3.17-build-desktop + C:/dev/cpp/easylist-0.3.18-build-desktop 20 2 true @@ -82,7 +82,7 @@ Release Qt4ProjectManager.Qt4BuildConfiguration 0 - C:/dev/cpp/easylist-0.3.17-build-desktop + C:/dev/cpp/easylist-0.3.18-build-desktop 20 2 true @@ -150,7 +150,7 @@ Debug Qt4ProjectManager.Qt4BuildConfiguration 2 - C:/dev/cpp/easylist-0.3.17 + C:/dev/cpp/easylist-0.3.18 27 9 false @@ -173,11 +173,11 @@ Qt4ProjectManager.MaemoPackageCreationStep - C:/dev/cpp/easylist-0.3.17/src/easylist.desktop - C:/dev/cpp/easylist-0.3.17/src/data/26x26/easylist.png - C:/dev/cpp/easylist-0.3.17/src/data/40x40/easylist.png - C:/dev/cpp/easylist-0.3.17/src/data/48x48/easylist.png - C:/dev/cpp/easylist-0.3.17/src/data/64x64/easylist.png + C:/dev/cpp/easylist-0.3.18/src/easylist.desktop + C:/dev/cpp/easylist-0.3.18/src/data/26x26/easylist.png + C:/dev/cpp/easylist-0.3.18/src/data/40x40/easylist.png + C:/dev/cpp/easylist-0.3.18/src/data/48x48/easylist.png + C:/dev/cpp/easylist-0.3.18/src/data/64x64/easylist.png false /opt/easylist/bin/easylist @@ -188,7 +188,7 @@ /usr/share/icons/hicolor/48x48/apps/easylist.png /usr/share/icons/hicolor/64x64/apps/easylist.png - 0.3.17 + 0.3.18 3 @@ -206,7 +206,7 @@ Release Qt4ProjectManager.Qt4BuildConfiguration 0 - C:/dev/cpp/easylist-0.3.17 + C:/dev/cpp/easylist-0.3.18 27 9 false diff --git a/src/globals.h b/src/globals.h new file mode 100755 index 0000000..5b5dd9c --- /dev/null +++ b/src/globals.h @@ -0,0 +1,19 @@ +#ifndef GLOBALS_H +#define GLOBALS_H + +#define WILLEM_LIU "WillemLiu" +#define EASY_LIST "easylist" +#define LIST_TEXT "ListText" +#define LIST_NAMES "ListName" +#define DBUS_KEYBOARD_SLIDE "/org/freedesktop/Hal/devices/platform_slide" +#define CHECKED_ITEMS_TO_BOTTOM "CheckedItemsToBottom" +#define LANDSCAPE "Landscape" +#define PORTRAIT "Portrait" +#define AUTO_ORIENTATION "AutoOrientation" +#define LIST_TEXT "ListText" +#define SORT_A_Z "SortAlphabetically" + +static const int BACK = 0; +static const int FORWARD = 1; + +#endif // GLOBALS_H diff --git a/src/listform.cpp b/src/listform.cpp index 0406b82..d73e362 100755 --- a/src/listform.cpp +++ b/src/listform.cpp @@ -55,6 +55,12 @@ void ListForm::on_uncheckAllPushButton_clicked() void ListForm::on_clearCheckedPushButton_clicked() { - MyCheckBoxContainer::getInstance()->removeChecked(); - settings->setValue(LIST_TEXT, MyCheckBoxContainer::getInstance()->getListText()); + int res = QMessageBox::warning(this, "Clear selected", "All checked items will be cleared.", QMessageBox::Ok, QMessageBox::Cancel); + + if(res == QMessageBox::Ok) + { + MyCheckBoxContainer::getInstance()->removeChecked(); + settings->setValue(LIST_TEXT, MyCheckBoxContainer::getInstance()->getListText()); + } } + diff --git a/src/listform.h b/src/listform.h index 62a00e1..2fdde5c 100755 --- a/src/listform.h +++ b/src/listform.h @@ -3,6 +3,7 @@ #include #include +#include #include "mycheckboxcontainer.h" #include "systemsettings.h" #include "slidewidget.h" diff --git a/src/mainform.cpp b/src/mainform.cpp index 55c7df4..d46c425 100755 --- a/src/mainform.cpp +++ b/src/mainform.cpp @@ -9,7 +9,6 @@ MainForm::MainForm(QWidget *parent) : settings = new QSettings(WILLEM_LIU, EASY_LIST); newIndex = 0; - connect(SystemSettings::getInstance(), SIGNAL(signalKeyboardClosed(bool)), this, SLOT(keyboardClosed(bool))); ui->actionAuto_Orientation->setChecked(settings->value(AUTO_ORIENTATION).toBool());