Added standard menu for bookmarks in meego gui

diff --git a/trunk/src/base/gui/MainWindow.cpp b/trunk/src/base/gui/MainWindow.cpp
index cfe8306..8dc1f47 100644 (file)
--- a/trunk/src/base/gui/MainWindow.cpp
+++ b/trunk/src/base/gui/MainWindow.cpp
@@ -105,8 +105,6 @@ void MainWindow::initializeUI() {
     bookmarksWidget = new BookmarksWidget(this);
     bookmarksWidget->hide();
 
-    menu = new QMenu(this);
-    
     aboutWidget = new AboutWidget(this);
     aboutWidget->hide();
 
@@ -128,11 +126,15 @@ void MainWindow::initializeUI() {
         connect(settingsAction, SIGNAL(triggered()),
                 settingsWidget, SLOT(show()));
 
-        bookmarksAction = ui->menuBar->addAction(tr("Bookmarks"));
-        connect(bookmarksAction, SIGNAL(triggered()),
-                bookmarksWidget, SLOT(show()));
-        
-       aboutAction = ui->menuBar->addAction(tr("About"));
+        QMenu* m = ui->menuBar->addMenu(tr("Bookmarks"));
+        bookmarksShowAllAction = new QAction(tr("Show all"), m);
+
+        bookmarksRemoveAllAction = new QAction(tr("Remove all"), m);
+
+        m->addAction(bookmarksShowAllAction);
+        m->addAction(bookmarksRemoveAllAction);
+
+        aboutAction = ui->menuBar->addAction(tr("About"));
         connect(aboutAction, SIGNAL(triggered()),
                 aboutWidget, SLOT(show()));
     #endif
@@ -470,14 +472,30 @@ void MainWindow::connectMenu() {
 
 
 void MainWindow::showAllBookmarks() {
-    menuWidget->hideMenu();
+    #ifdef Q_WS_MAEMO_5
+        menuWidget->hideMenu();
+    #endif
     backbone->fetchBookmarks();
 }
 
 void MainWindow::connectBookmarksWidget() {
-    connect(bookmarksWidget, SIGNAL(removeAllBookmarks()),
-            backbone, SLOT(removeAllBookmark()));
+    #ifdef Q_WS_MAEMO_5
+        connect(bookmarksWidget, SIGNAL(removeAllBookmarks()),
+                backbone, SLOT(removeAllBookmark()));
 
-    connect(bookmarksWidget, SIGNAL(showAllBookmarks()),
-            this, SLOT(showAllBookmarks()));
+        connect(bookmarksWidget, SIGNAL(showAllBookmarks()),
+                this, SLOT(showAllBookmarks()));
+
+        connect(bookmarksWidget, SIGNAL(removeAllBookmarks()),
+                backbone, SLOT(fetchBookmarks()));
+    #else
+        connect(bookmarksShowAllAction, SIGNAL(triggered()),
+                backbone, SLOT(fetchBookmarks()));
+
+        connect(bookmarksRemoveAllAction, SIGNAL(triggered()),
+                backbone, SLOT(removeAllBookmark()));
+
+        connect(bookmarksRemoveAllAction, SIGNAL(triggered()),
+                backbone, SLOT(fetchBookmarks()));
+    #endif
 }

diff --git a/trunk/src/base/gui/MainWindow.h b/trunk/src/base/gui/MainWindow.h
index 449ac13..6032269 100644 (file)
--- a/trunk/src/base/gui/MainWindow.h
+++ b/trunk/src/base/gui/MainWindow.h
@@ -195,7 +195,6 @@ private:
     QWidget* translationWidget;
     QWidget* wordListWidget;
     MenuWidget* menuWidget;
-    QMenu* menu;
     DictManagerWidget* dictManagerWidget;
     SettingsWidget* settingsWidget;
     BookmarksWidget* bookmarksWidget;
@@ -205,7 +204,8 @@ private:
     #ifndef Q_WS_MAEMO_5
         QSplitter* splitter;
         QAction* dictionariesAction;
-        QAction* bookmarksAction;
+        QAction* bookmarksShowAllAction;
+        QAction* bookmarksRemoveAllAction;
         QAction* settingsAction;
         QAction* aboutAction;
     #endif