Add confirmation dialog when deleting all bookmarks

diff --git a/trunk/src/base/backbone/backbone.h b/trunk/src/base/backbone/backbone.h
index 36d344b..6ca7ff2 100644 (file)
--- a/trunk/src/base/backbone/backbone.h
+++ b/trunk/src/base/backbone/backbone.h
@@ -210,7 +210,7 @@ public Q_SLOTS:
 
     /*! Remove all bookmarks
       */
-    void removeAllBookmark(){
+    void removeAllBookmarks(){
         _bookmarks.clear();
     }
 

diff --git a/trunk/src/base/gui/BookmarksWidget.cpp b/trunk/src/base/gui/BookmarksWidget.cpp
index 047bad7..60ad592 100644 (file)
--- a/trunk/src/base/gui/BookmarksWidget.cpp
+++ b/trunk/src/base/gui/BookmarksWidget.cpp
@@ -46,3 +46,5 @@ BookmarksWidget::BookmarksWidget(GUIInterface *parent) :
     connect(removeAllBookmarksPushButton, SIGNAL(clicked()),
             this, SIGNAL(removeAllBookmarks()));
 }
+
+

diff --git a/trunk/src/base/gui/BookmarksWidget.h b/trunk/src/base/gui/BookmarksWidget.h
index fcc0c97..a095f3e 100644 (file)
--- a/trunk/src/base/gui/BookmarksWidget.h
+++ b/trunk/src/base/gui/BookmarksWidget.h
@@ -40,10 +40,12 @@ class BookmarksWidget : public QDialog
 public:
     explicit BookmarksWidget(GUIInterface *parent = 0);
 
+
 Q_SIGNALS:
     void showAllBookmarks();
     void removeAllBookmarks();
 
+
 private:
     QPushButton* showAllBookmarksPushButton;
     QPushButton* removeAllBookmarksPushButton;

diff --git a/trunk/src/base/gui/DictManagerWidget.h b/trunk/src/base/gui/DictManagerWidget.h
index 1af98e4..ba9dc7a 100644 (file)
--- a/trunk/src/base/gui/DictManagerWidget.h
+++ b/trunk/src/base/gui/DictManagerWidget.h
@@ -101,7 +101,6 @@ private:
     void refreshDictsList();
     #ifndef Q_WS_MAEMO_5
         QPushButton* closeButton;
-        QHBoxLayout* footerLayout;
         bool _save;
 
         public Q_SLOTS:

diff --git a/trunk/src/base/gui/MainWindow.cpp b/trunk/src/base/gui/MainWindow.cpp
index eebe0ea..01840f9 100644 (file)
--- a/trunk/src/base/gui/MainWindow.cpp
+++ b/trunk/src/base/gui/MainWindow.cpp
@@ -521,10 +521,7 @@ void MainWindow::connectBookmarksWidget() {
     #ifdef Q_WS_MAEMO_5
         //after removing bookmarks we search for it once again to clear word list
         connect(bookmarksWidget, SIGNAL(removeAllBookmarks()),
-                backbone, SLOT(removeAllBookmark()));
-
-        connect(bookmarksWidget, SIGNAL(removeAllBookmarks()),
-                backbone, SLOT(fetchBookmarks()));
+                this, SLOT(removeBookmarks()));
 
 
         connect(bookmarksWidget, SIGNAL(showAllBookmarks()),
@@ -535,13 +532,25 @@ void MainWindow::connectBookmarksWidget() {
 
 
     #else
-        connect(bookmarksShowAllAction, SIGNAL(triggered()),
-                backbone, SLOT(fetchBookmarks()));
-
         connect(bookmarksRemoveAllAction, SIGNAL(triggered()),
-                backbone, SLOT(removeAllBookmark()));
+                this, SLOT(removeBookmarks()));
 
-        connect(bookmarksRemoveAllAction, SIGNAL(triggered()),
-                backbone, SLOT(fetchBookmarks()));
     #endif
 }
+
+
+void MainWindow::removeBookmarks() {
+    QWidget* par;
+    #ifdef Q_WS_MAEMO_5
+        par = bookmarksWidget;
+    #else
+        par = this;
+    #endif
+    if(QMessageBox::question(par, "Delete all bookmarks",
+             "Do you want to delete all bookmarks? (This action cannot be revoked)",
+             QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok) {
+        backbone->removeAllBookmarks();
+        backbone->search(searchString);
+
+    }
+}

diff --git a/trunk/src/base/gui/MainWindow.h b/trunk/src/base/gui/MainWindow.h
index 6e8e44f..2a5ae66 100644 (file)
--- a/trunk/src/base/gui/MainWindow.h
+++ b/trunk/src/base/gui/MainWindow.h
@@ -191,6 +191,9 @@ private Q_SLOTS:
     //! disabled
     void breakSearching();
 
+    //! Asks for confirmation when user click on "delete all bookmarks"
+    void removeBookmarks();
+
 
 protected:
     /*! When user wants to close application, we first sends signal to stop all