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

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

diff --git a/trunk/src/base/gui/MainWindow.cpp b/trunk/src/base/gui/MainWindow.cpp
index a13f93c..c04dec4 100644 (file)
--- a/trunk/src/base/gui/MainWindow.cpp
+++ b/trunk/src/base/gui/MainWindow.cpp
@@ -104,14 +104,19 @@ void MainWindow::initializeUI() {
     bookmarksWidget->hide();
 
     menu = new QMenu(this);
+    
+    aboutWidget = new AboutWidget(this);
+    aboutWidget->hide();
+
+
+
     #ifdef Q_WS_MAEMO_5
         menuWidget = new MenuWidget(this);
         menuWidget->addSubMenu(tr("Settings"), settingsWidget);
         menuWidget->addSubMenu(tr("Dictionaries"), dictManagerWidget);
         menuWidget->addSubMenu(tr("Bookmarks"), bookmarksWidget);
-        menuWidget->addSubMenu(tr("About"), new QPushButton("About"));
-        menu->addAction(menuWidget);
-        ui->menuBar->addMenu(menu);
+        menuWidget->addSubMenu(tr("About"), aboutWidget);
+        ui->menuBar->addAction(menuWidget);
     #else
         dictionariesAction = ui->menuBar->addAction(tr("Dictionaries"));
         connect(dictionariesAction, SIGNAL(triggered()),
@@ -124,6 +129,10 @@ void MainWindow::initializeUI() {
         bookmarksAction = ui->menuBar->addAction(tr("Bookmarks"));
         connect(bookmarksAction, SIGNAL(triggered()),
                 bookmarksWidget, SLOT(show()));
+        
+       aboutAction = ui->menuBar->addAction(tr("About"));
+        connect(aboutAction, SIGNAL(triggered()),
+                aboutWidget, SLOT(show()));
     #endif
 
 }