Merge branch 'bookmarks' of ssh://drop.maemo.org/git/mdictionary into bookmarks

[mdictionary] / trunk / src / base / gui / MainWindow.h

diff --git a/trunk/src/base/gui/MainWindow.h b/trunk/src/base/gui/MainWindow.h
index 5f0c987..449ac13 100644 (file)
--- a/trunk/src/base/gui/MainWindow.h
+++ b/trunk/src/base/gui/MainWindow.h
@@ -36,6 +36,8 @@
 #include "DictManagerWidget.h"
 #include "SettingsWidget.h"
 #include "HistoryListDialog.h"
+#include "BookmarksWidget.h"
+#include "WelcomeScreenWidget.h"
 #include "AboutWidget.h"
 
 namespace Ui {
@@ -172,6 +174,9 @@ private Q_SLOTS:
     void breakSearching();
 
 
+    void showAllBookmarks();
+
+
 protected:
     /*! When user wants to close application, we first sends signal to stop all
         ongoing searches.
@@ -187,17 +192,20 @@ private:
 
 
     SearchBarWidget* searchBarWidget;
-    TranslationWidget* translationWidget;
-    WordListWidget* wordListWidget;
+    QWidget* translationWidget;
+    QWidget* wordListWidget;
     MenuWidget* menuWidget;
+    QMenu* menu;
     DictManagerWidget* dictManagerWidget;
     SettingsWidget* settingsWidget;
+    BookmarksWidget* bookmarksWidget;
+    QWidget* welcomeScreenWidget;
     AboutWidget* aboutWidget;
 
     #ifndef Q_WS_MAEMO_5
         QSplitter* splitter;
         QAction* dictionariesAction;
-        //QAction* edit;
+        QAction* bookmarksAction;
         QAction* settingsAction;
         QAction* aboutAction;
     #endif
@@ -212,6 +220,7 @@ private:
     void connectTranslationWidget();
     void connectDictManager();
     void connectMenu();
+    void connectBookmarksWidget();
 };
 
 #endif // MAINWINDOW_H