*******************************************************************************/
-//! \file MainWindow.cpp
-//! \author Mateusz Półrola <mateusz.polrola@comarch.pl>
+/*! \file MainWindow.cpp
+ \brief Implements interface for GUI
+
+ \author Mateusz Półrola <mateusz.polrola@comarch.pl>
+*/
#include "MainWindow.h"
#include <QtGui>
setExactSearch(false);
+ setMinimumSize(750, 400);
+
showMaximized();
+
+ searchBarWidget->setFocus();
}
MainWindow::~MainWindow() {
-
}
#endif
- setWindowIcon(QIcon(":/icons/64x64/mdictionary.png"));
- setWindowTitle("mDictionary");
-
/*translationWidget is another stacked window, so we don't add it to
- layout only create it with this widget as parent
+ layout, only create it with this widget as parent
it must be created as first object in main window, otherwise sometimes
- when app starts in maemo, when trying to set stacked window attribure
+ when app starts in maemo, when trying to set stacked window attribute
it segfaults*/
translationWidget = new TranslationWidget(this);
+
+
+
+ setWindowIcon(QIcon(":/icons/64x64/mdictionary.png"));
+ setWindowTitle("mDictionary");
+
mainLayout = new QVBoxLayout();
QWidget* w = new QWidget();
w->setLayout(mainLayout);
menuBar = new QMenuBar();
setMenuBar(menuBar);
+ notifyManager = new NotifyManager(this);
+
initializeSearchWidgets();
initializeMenu();
-
- notifyManager = new NotifyManager(this);
}
void MainWindow::initializeSearchWidgets() {
mainLayout->addWidget(searchBarWidget, 0, Qt::AlignBottom);
#else
translationWidget->hide();
- //we add to splitter word list and welcome screen
+ //we add word list and welcome screen to splitter
splitter = new QSplitter(Qt::Horizontal);
splitter->addWidget(wordListWidget);
splitter->addWidget(welcomeScreenWidget);
splitter->setStretchFactor(1, 150);
- mainLayout->addWidget(splitter);
- mainLayout->addWidget(searchBarWidget);
+ mainLayout->addWidget(splitter, 1);
+
+ mainLayout->addWidget(searchBarWidget,0, Qt::AlignBottom);
#endif
}
menuWidget->addSubMenu(tr("About"), aboutWidget);
menuBar->addAction(menuWidget);
+
+ 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()));
+
#endif
}
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* myWidget = qobject_cast<WordListWidget *>(wordListWidget);
+ myWidget->setFocusOnElement();
+// wordListWidget->setFocus();
}
bool MainWindow::checkExactSearch(
#ifndef Q_WS_MAEMO_5
hideWelcomeScreen();
#endif
-
- Q_EMIT showTranslation(backbone->htmls());
- notifyManager->screenChanged();
+ Q_EMIT showTranslation(backbone->xmls());
+ WordListWidget* myWidget = qobject_cast<WordListWidget *>(wordListWidget);
+ myWidget->setFocusOnElement();
+ #ifdef Q_WS_MAEMO_5
+ notifyManager->screenChanged();
+ #endif
}
return backbone->getDictionaries();
}
-
+/**/
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) {
}
void MainWindow::showHistory(QPoint p) {
-
- HistoryListDialog historyDialog(backbone->history()->list(), searchBarWidget);
-
+ HistoryListDialog historyDialog(backbone->history()->list(), this );// searchBarWidget);
#ifndef Q_WS_MAEMO_5
- QPoint newPos = mapFromGlobal(p);
- newPos.setY(searchBarWidget->pos().y() -
- historyDialog.sizeHint().height());
- newPos.setX(width() - historyDialog.sizeHint().width());
-
- historyDialog.move(newPos);
+ p.setX(p.x() - historyDialog.sizeHint().width() + 5);
+ p.setY(p.y() - historyDialog.sizeHint().height()- 10); //- 80);
+ historyDialog.move(p);
#endif
if(historyDialog.exec() == QDialog::Accepted) {
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(backbone, SIGNAL(bookmarkMode()),
+ this, SIGNAL(bookmarkMode()));
+
+
+ //connect(wordListWidget, SIGNAL(addBookmark(QList<Translation*>)),
+ // this, SIGNAL(setBusy()));
+
+ //connect(backbone, SIGNAL(bookmarkReady()),
+ // this, SIGNAL(setIdle()));
}
void MainWindow::connectSearchBar() {
connect(this, SIGNAL(setIdle()),
wordListWidget, SLOT(unlockList()));
+ connect(this, SIGNAL(bookmarkMode()),
+ wordListWidget, SLOT(bookmarkModeActive()));
+
connect(wordListWidget, SIGNAL(addBookmark(QList<Translation*>)),
backbone, SLOT(addBookmark(QList<Translation*>)));
#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 it 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)"),
- QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok) {
+ 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();
}
}
projects / mdictionary / blobdiff