X-Git-Url: http://git.maemo.org/git/?p=mverbiste;a=blobdiff_plain;f=mainwindow.cpp;h=54b2d50a2eac7878ede1b6b773be5fde659fded9;hp=35db3e562ed3927e23aa6c95610a4d20e696dc28;hb=020dbb01b0536d7566016c6f8e0a7f7bae3f0752;hpb=075c0d8be4a72e813c4c81e147af317aad129119 diff --git a/mainwindow.cpp b/mainwindow.cpp index 35db3e5..54b2d50 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -13,29 +13,27 @@ MainWindow::MainWindow(QWidget *parent) #endif ui->setupUi(this); setupcodedUI(); - initverbiste(); } void MainWindow::setupcodedUI() { cent = centralWidget(); - //mlayout = qobject_cast(cent->layout()); mlayout = new QVBoxLayout; btlayout = new QHBoxLayout; - QScrollArea *scrollArea = new QScrollArea; - scrollArea->setBackgroundRole(QPalette::Dark); - mlayout->addWidget(scrollArea); + resultPages = new QTabWidget; + resultPages->setStyleSheet("QTabBar::tab { height: 50px }"); + mlayout->addWidget(resultPages); - btnClear = new QPushButton; + btnPron = new QCheckBox(); + btnPron->setIcon(QIcon("/usr/share/icons/hicolor/48x48/hildon/general_conference_avatar.png")); + btnClear = new QPushButton; /* Clearbutton */ btnClear->setIcon(QIcon("/usr/share/icons/hicolor/64x64/hildon/general_delete.png")); - wordinput = new QLineEdit; - labVerb = new QLabel(); - labVerb->setMinimumWidth(250); + wordinput = new QLineEdit; /* Word input */ + btlayout->addWidget(btnPron); btlayout->addWidget(btnClear); - btlayout->addWidget(labVerb); btlayout->addWidget(wordinput); - btnLookup = new QPushButton; // Lookup button + btnLookup = new QPushButton; /* Lookup button */ btnLookup->setIcon(QIcon("/usr/share/icons/hicolor/64x64/hildon/general_search.png")); btlayout->addWidget(btnLookup); @@ -43,17 +41,44 @@ void MainWindow::setupcodedUI() cent->setLayout(mlayout); // Clear the word input when Clear button is tapped - QObject::connect(btnClear, SIGNAL(clicked()), wordinput, SLOT(clear())); - QObject::connect(btnClear, SIGNAL(clicked()), labVerb, SLOT(clear())); - QObject::connect(btnClear, SIGNAL(clicked()), wordinput, SLOT(setFocus())); + connect(btnClear, SIGNAL(clicked()), this, SLOT(startAgain())); + + connect(wordinput, SIGNAL(returnPressed()), this, SLOT(startLookup())); + connect(btnLookup, SIGNAL(clicked()), this, SLOT(startLookup())); + connect(btnPron, SIGNAL(clicked()), this, SLOT(startLookup())); + + /* Icon */ + QIcon *icon = new QIcon(); + icon->addFile(ICONFILE); + setWindowIcon(*icon); + + /* About Dialog */ + aboutDialog = new AboutDialog(ICONFILE, QString("MVerbiste v%1").arg(VERSTR)); + aboutDialog->setIntro(trUtf8("A French conjugation utility for Maemo and MeeGo")); + aboutDialog->addAuthor(QString::fromUtf8("Nguyễn Hồng Quân \nPierre Sarrazin ")); - QObject::connect(wordinput, SIGNAL(returnPressed()), this, SLOT(startLookup())); - QObject::connect(btnLookup, SIGNAL(clicked()), this, SLOT(startLookup())); + /* Menu */ + QMenu *menu = ui->menuBar->addMenu(tr("Top menu")); + QAction *act_about = menu->addAction(tr("About")); + connect(act_about, SIGNAL(triggered()), aboutDialog, SLOT(show())); + /* Menu filters */ + QActionGroup *filterGroup = new QActionGroup(this); + filterGroup->setExclusive(true); + filFrench = new QAction(tr("Search French"), filterGroup); + filFrench->setCheckable(true); + filFrench->setChecked(true); + filItalian = new QAction(tr("Search Italian"), filterGroup); + filItalian->setCheckable(true); + menu->addActions(filterGroup->actions()); + connect(filItalian, SIGNAL(changed()), this, SLOT(switchLang())); + connect(filFrench, SIGNAL(changed()), this, SLOT(switchLang())); } MainWindow::~MainWindow() { delete ui; + delete freVerbDic; + delete aboutDialog; } void MainWindow::setOrientation(ScreenOrientation orientation) @@ -108,12 +133,13 @@ void MainWindow::showExpanded() #else show(); #endif + initverbiste(); wordinput->setFocus(); } -void MainWindow::startLookup() +void MainWindow::initverbiste() { - QString input = wordinput->text(); + langCode = "fr"; FrenchVerbDictionary::Language lang = FrenchVerbDictionary::parseLanguageCode(langCode); if (lang != FrenchVerbDictionary::FRENCH) @@ -123,6 +149,35 @@ void MainWindow::startLookup() /* Create verb dictionary, accept non-accent input */ freVerbDic = new FrenchVerbDictionary(true); +} + +void MainWindow::switchLang() +{ + FrenchVerbDictionary::Language curlang = freVerbDic->getLanguage(); + FrenchVerbDictionary::Language targetlang = filItalian->isChecked() ? FrenchVerbDictionary::ITALIAN + : FrenchVerbDictionary::FRENCH; + if (curlang == targetlang) { + return; + } + /* If lang change */ + std::string conjFN, verbsFN; + FrenchVerbDictionary::getXMLFilenames(conjFN, verbsFN, targetlang); + delete freVerbDic; + freVerbDic = new FrenchVerbDictionary(conjFN, verbsFN, true, targetlang); +} + +void MainWindow::startLookup() +{ + QString input = wordinput->text().trimmed(); + if (input.isEmpty()) { + return; + } + + btnLookup->setText(tr("Please wait...")); + btnLookup->setEnabled(false); + clearResults(); + /* Pending the lookup job to the next event loop (redraw the button right now) */ + QApplication::processEvents(QEventLoop::ExcludeUserInputEvents); /* Get input word to look up */ const std::string word = input.toLower().toUtf8().constData(); @@ -131,18 +186,28 @@ void MainWindow::startLookup() * For each possible deconjugation, take the infinitive form and * obtain its complete conjugation. */ - std::vector v; - bool includePronouns = FALSE; // TODO: Will get this value from external + std::vector infles; + bool includePronouns = btnPron->isChecked(); + bool isItalian = filItalian->isChecked(); // TODO: Will get this value from external - freVerbDic->deconjugate(word, v); + freVerbDic->deconjugate(word, infles); - std::string prevUTF8Infinitive, prevTemplateName; - for (std::vector::const_iterator it = v.begin(); - it != v.end(); it++) + resultPages->setUpdatesEnabled(false); + std::string prevUTF8Infinitive, prevTemplateName; /* Remember found word + to avoid conjugating again */ + + for (std::vector::const_iterator it = infles.begin(); + it != infles.end(); it++) { const InflectionDesc &d = *it; + + /* If this infinitive has been conjugated, we skip to the next infinitive */ + if (d.infinitive == prevUTF8Infinitive && d.templateName == prevTemplateName) { + continue; + } + VVVS conjug; - getConjugation(freVerbDic, d.infinitive, d.templateName, conjug, includePronouns); + getConjugation(*freVerbDic, d.infinitive, d.templateName, conjug, includePronouns); if (conjug.size() == 0 // if no tenses || conjug[0].size() == 0 // if no infinitive tense @@ -153,16 +218,103 @@ void MainWindow::startLookup() } std::string utf8Infinitive = conjug[0][0][0]; - if (utf8Infinitive == prevUTF8Infinitive && d.templateName == prevTemplateName) - // This result is duplicated - continue; - /* Show on GUI */ - labVerb->setText(QString::fromUtf8(utf8Infinitive.c_str())); + /* Add result to GUI (not show yet) */ + ResultPage *rsp = addResultPage(utf8Infinitive); + + /* Get modes and tenses of the verb */ + int i = 0; + for (VVVS::const_iterator t = conjug.begin(); + t != conjug.end(); t++, i++) { + if (i == 1) + i = 4; + else if (i == 11) + i = 12; + assert(i >= 0 && i < 16); + + int row = i / 4; + int col = i % 4; + + std::string utf8TenseName = getTenseNameForTableCell(row, col, isItalian); + if (utf8TenseName.empty()) + continue; + + QVBoxLayout *cell = makeResultCell(*t, utf8TenseName, word, freVerbDic); + rsp->grid->addLayout(cell, row, col); + } + + /* Show the result on GUI */ + rsp->packContent(); + prevUTF8Infinitive = utf8Infinitive; + prevTemplateName = d.templateName; } + + /* Enable the button again */ + btnLookup->setEnabled(true); + btnLookup->setText(""); + resultPages->setUpdatesEnabled(true); } -void MainWindow::initverbiste() +ResultPage* MainWindow::addResultPage(const std::string &labelText) { - langCode = "fr"; + ResultPage *rp = new ResultPage(); + QString label = QString::fromUtf8(labelText.c_str()); + resultPages->addTab(rp->page, label); + return rp; +} + +void MainWindow::clearResults() +{ + while (resultPages->count()) { + int lastIndex = resultPages->count() - 1; + resultPages->widget(lastIndex)->deleteLater(); + resultPages->removeTab(lastIndex); + } +} + +void MainWindow::startAgain() +{ + wordinput->clear(); + clearResults(); + wordinput->setFocus(); + btnLookup->setEnabled(true); } + +QVBoxLayout* MainWindow::makeResultCell(const VVS &tenseIterator, + const std::string &tenseName, + const std::string &inputWord, + FrenchVerbDictionary *verbDict) +{ + /* Mode & Tense name */ + QLabel *tenseLabel = new QLabel(); + tenseLabel->setText(QString::fromUtf8(tenseName.c_str())); + tenseLabel->setStyleSheet("QLabel {background-color: #44A51C; " + "padding-left: 10px; padding-right: 10px}"); + + /* Conjugaison */ + QVBoxLayout *vbox = new QVBoxLayout(); + vbox->addWidget(tenseLabel); + QVector persons = qgetConjugates(*verbDict, tenseIterator,inputWord, + "", ""); + for (int i = 0; i < persons.size(); ++i) { + QLabel *lb = new QLabel(persons.at(i)); + lb->setMargin(4); + vbox->addWidget(lb, 1); + } + return vbox; +} + +/**** For ResultPage class ****/ +ResultPage::ResultPage() + : page(new QScrollArea), + grid(new QGridLayout) +{ +} + +void ResultPage::packContent() +{ + QWidget *immediate = new QWidget(); + immediate->setLayout(grid); + page->setWidget(immediate); +} +