setExactSearch(false);
+ setMinimumSize(750, 400);
+
showMaximized();
+
+ searchBarWidget->setFocus();
}
MainWindow::~MainWindow() {
-
}
splitter->addWidget(welcomeScreenWidget);
splitter->setStretchFactor(1, 150);
- mainLayout->addWidget(splitter);
- mainLayout->addWidget(searchBarWidget);
+ mainLayout->addWidget(splitter, 1);
+ mainLayout->addWidget(searchBarWidget, 0, Qt::AlignBottom);
#endif
}
connect(menuWidget, SIGNAL(setApplicationMenu(QWidget*)),
notifyManager, SLOT(setMenu(QWidget*)));
#else
- dictionariesAction = menuBar->addAction(tr("Dictionaries"));
+ dictionariesAction = menuBar->addAction(tr("&Dictionaries"));
connect(dictionariesAction, SIGNAL(triggered()),
dictManagerWidget, SLOT(show()));
- settingsAction = menuBar->addAction(tr("Settings"));
+ settingsAction = menuBar->addAction(tr("&Settings"));
connect(settingsAction, SIGNAL(triggered()),
settingsWidget, SLOT(show()));
- QMenu* m = menuBar->addMenu(tr("Bookmarks"));
+ QMenu* m = 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 = menuBar->addAction(tr("About"));
+ aboutAction = menuBar->addAction(tr("&About"));
connect(aboutAction, SIGNAL(triggered()),
aboutWidget, SLOT(show()));
settingsWidget = new SettingsWidget(this);
settingsWidget->hide();
+ connect(settingsWidget, SIGNAL(notify(Notify::NotifyType,QString)),
+ this, SLOT(showNotification(Notify::NotifyType,QString)));
+
bookmarksWidget = new BookmarksWidget(this);
bookmarksWidget->hide();
setExactSearch(false);
}
}
+
+ wordListWidget->setFocus();
}
bool MainWindow::checkExactSearch(
hideWelcomeScreen();
#endif
- Q_EMIT showTranslation(backbone->htmls());
- notifyManager->screenChanged();
+ Q_EMIT showTranslation(backbone->xmls());
+ wordListWidget->setFocus();
+ #ifdef Q_WS_MAEMO_5
+ notifyManager->screenChanged();
+ #endif
}
void MainWindow::search(QString word) {
setExactSearch(false);
searchBarWidget->search(word);
+ #ifdef Q_WS_MAEMO_5
+ if(translationWidget->isVisible()) {
+ translationWidget->hide();
+ update();
+ }
+ #endif
}
void MainWindow::searchExact(QString word) {
backbone, SLOT(search(QString)));
connect(this, SIGNAL(searchTranslations(QList<Translation*>)),
- backbone, SLOT(searchHtml(QList<Translation*>)));
+ backbone, SLOT(searchXml(QList<Translation*>)));
connect(this, SIGNAL(stopSearching()),
backbone, SLOT(stopSearching()));
connect(backbone, SIGNAL(ready()),
this, SIGNAL(setIdle()));
- connect(backbone, SIGNAL(htmlReady()),
+ connect(backbone, SIGNAL(xmlReady()),
this, SIGNAL(setIdle()));
connect(backbone, SIGNAL(ready()),
this, SLOT(wordListReady()));
- connect(backbone, SIGNAL(htmlReady()),
+ connect(backbone, SIGNAL(xmlReady()),
this, SLOT(translationsReady()));
connect(backbone, SIGNAL(searchCanceled()),
connect(backbone, SIGNAL(notify(Notify::NotifyType,QString)),
this, SLOT(showNotification(Notify::NotifyType,QString)));
+
+ connect(backbone, SIGNAL(closeOk()),
+ this, SLOT(close()));
+
+
+ //connect(wordListWidget, SIGNAL(addBookmark(QList<Translation*>)),
+ // this, SIGNAL(setBusy()));
+
+ //connect(backbone, SIGNAL(bookmarkReady()),
+ // this, SIGNAL(setIdle()));
}
void MainWindow::connectSearchBar() {
#ifdef Q_WS_MAEMO_5
connect(translationWidget, SIGNAL(search(QString)),
this, SLOT(search(QString)));
+
+ connect(translationWidget, SIGNAL(notify(Notify::NotifyType, QString)),
+ this, SLOT(showNotification(Notify::NotifyType,QString)));
#else
connect(translationWidget, SIGNAL(search(QString)),
this, SLOT(searchExact(QString)));
#endif
-
}
void MainWindow::connectDictManager() {
void MainWindow::connectBookmarksWidget() {
#ifdef Q_WS_MAEMO_5
- //after removing bookmarks we search for them once again to clear word list
+ //after removing bookmarks we search for them once again to clear the words list
connect(bookmarksWidget, SIGNAL(removeAllBookmarks()),
this, SLOT(removeBookmarks()));
par = this;
#endif
if(QMessageBox::question(par, tr("Delete all bookmarks"),
- tr("Do you want to delete all bookmarks? (This action cannot be revoked)"),
+ tr("Do you want to delete all bookmarks? (This action cannot be revoked, and will clear current word list)"),
QMessageBox::Yes, QMessageBox::Cancel) == QMessageBox::Yes) {
backbone->removeAllBookmarks();
- if(searchString.size())
- backbone->search(searchString);
-
+ ((WordListWidget*)wordListWidget)->clear();
}
+
+
}