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 3948a18..8bf74a4 100644 (file)
--- a/trunk/src/base/gui/MainWindow.cpp
+++ b/trunk/src/base/gui/MainWindow.cpp
@@ -46,6 +46,8 @@ MainWindow::MainWindow(Backbone *backbone, QWidget *parent):
     setExactSearch(false);
 
     setWindowTitle("mDictionary");
+
+    showMaximized();
 }
 
 MainWindow::~MainWindow() {
@@ -69,19 +71,33 @@ void MainWindow::initializeUI() {
     //only create it with this widget as parent
     translationWidget = new TranslationWidget(this);
 
-    ui->centralWidget->layout()->addWidget(wordListWidget);
+    #ifdef Q_WS_MAEMO_5
+        ui->centralWidget->layout()->addWidget(wordListWidget);
+    #else
+        splitter = new QSplitter(Qt::Horizontal);
+        splitter->addWidget(wordListWidget);
+        splitter->addWidget(translationWidget);
+        splitter->setStretchFactor(1, 150);
+        ui->centralWidget->layout()->addWidget(splitter);
+    #endif
     ui->centralWidget->layout()->addWidget(searchBarWidget);
 
 
 
     dictManagerWidget = new DictManagerWidget(this);
+    dictManagerWidget->hide();
+    #ifdef Q_WS_MAEMO_5
+        menuWidget = new MenuWidget(this);
+        menuWidget->addSubMenu(tr("Dictionaries"), dictManagerWidget);
+        menuWidget->addSubMenu(tr("Settings"), new QPushButton("Settings"));
+        menuWidget->addSubMenu(tr("About"), new QPushButton("About"));
+        ui->menuBar->addAction(menuWidget);
+    #else
+        dictionariesAction = ui->menuBar->addAction(tr("Dictionaries"));
+        connect(dictionariesAction, SIGNAL(triggered()),
+                dictManagerWidget, SLOT(show()));
+    #endif
 
-    menuWidget = new MenuWidget(this);
-    menuWidget->addSubMenu(tr("Dictionaries"), dictManagerWidget);
-    menuWidget->addSubMenu(tr("Settings"), new QPushButton("Settings"));
-    menuWidget->addSubMenu(tr("About"), new QPushButton("About"));
-
-    ui->menuBar->addAction(menuWidget);
 }
 
 void MainWindow::closeEvent(QCloseEvent *event) {
@@ -204,15 +220,23 @@ void MainWindow::historyPrev() {
 }
 
 void MainWindow::disableMenu() {
-    if(ui->menuBar->actions().contains(menuWidget)) {
-        ui->menuBar->removeAction(menuWidget);
-    }
+    #ifdef Q_WS_MAEMO_5
+        if(ui->menuBar->actions().contains(menuWidget)) {
+              ui->menuBar->removeAction(menuWidget);
+        }
+    #else
+        ui->menuBar->setEnabled(false);
+    #endif
 }
 
 void MainWindow::enableMenu() {
-    if(!ui->menuBar->actions().contains(menuWidget)) {
-        ui->menuBar->addAction(menuWidget);
-    }
+    #ifdef Q_WS_MAEMO_5
+        if(!ui->menuBar->actions().contains(menuWidget)) {
+            ui->menuBar->addAction(menuWidget);
+        }
+    #else
+        ui->menuBar->setEnabled(true);
+    #endif
 }
 
 void MainWindow::showHistory() {