Merge branch 'master' into backbone

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

diff --git a/trunk/src/base/gui/MainWindow.cpp b/trunk/src/base/gui/MainWindow.cpp
index 850d625..c01f20d 100644 (file)
--- a/trunk/src/base/gui/MainWindow.cpp
+++ b/trunk/src/base/gui/MainWindow.cpp
@@ -40,6 +40,8 @@ MainWindow::MainWindow(Backbone *backbone, QWidget *parent):
     searchBarWidget = new SearchBarWidget(backbone);
     wordListWidget = new WordListWidget(backbone);
     translationWidget = new TranslationWidget(backbone, this);
+
+    searchBarWidget->setFocus();
     menuWidget = new MenuWidget(this);
 
 
@@ -50,6 +52,7 @@ MainWindow::MainWindow(Backbone *backbone, QWidget *parent):
 
     ui->menuBar->addAction(menuWidget);
 
+
     connect(this, SIGNAL(searchWordList(QStringList)),
             searchBarWidget, SLOT(searchWordList(QStringList)));
 
@@ -62,6 +65,10 @@ MainWindow::MainWindow(Backbone *backbone, QWidget *parent):
     connect(wordListWidget, SIGNAL(clicked(QModelIndex)),
             searchBarWidget, SLOT(showBusy()));
 
+    connect(searchBarWidget, SIGNAL(enableMenu(bool)),
+            this, SLOT(enableMenu(bool)));
+
+
     ui->centralWidget->layout()->addWidget(wordListWidget);
     ui->centralWidget->layout()->addWidget(searchBarWidget);
 
@@ -96,3 +103,8 @@ void MainWindow::closeOk() {
 void MainWindow::search(QStringList words) {
     emit searchWordList(words);
 }
+
+void MainWindow::enableMenu(bool enabled) {
+    ui->menuBar->setVisible(enabled);
+    qDebug()<<enabled;
+}