X-Git-Url: http://git.maemo.org/git/?p=mverbiste;a=blobdiff_plain;f=mainwindow.cpp;h=43f6e297aa562b816d88d5afb4c1d0fb475898c4;hp=35db3e562ed3927e23aa6c95610a4d20e696dc28;hb=c25153fb17c4f0782b9ffc7206427a63ce096903;hpb=075c0d8be4a72e813c4c81e147af317aad129119

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 35db3e5..43f6e29 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -3,6 +3,9 @@
 #include "gui/conjugation.h"
 
 #include <QtCore/QCoreApplication>
+#ifdef DEBUG
+#include <QDebug>
+#endif
 
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent), ui(new Ui::MainWindow)
@@ -19,21 +22,17 @@ MainWindow::MainWindow(QWidget *parent)
 void MainWindow::setupcodedUI()
 {
     cent = centralWidget();
-    //mlayout = qobject_cast<QVBoxLayout *>(cent->layout());
     mlayout = new QVBoxLayout;
     btlayout = new QHBoxLayout;
 
-    QScrollArea *scrollArea = new QScrollArea;
-    scrollArea->setBackgroundRole(QPalette::Dark);
-    mlayout->addWidget(scrollArea);
+    resultPages = new QTabWidget;
+    resultPages->setTabPosition(QTabWidget::West);
+    mlayout->addWidget(resultPages);
 
     btnClear = new QPushButton;
     btnClear->setIcon(QIcon("/usr/share/icons/hicolor/64x64/hildon/general_delete.png"));
     wordinput = new QLineEdit;
-    labVerb = new QLabel();
-    labVerb->setMinimumWidth(250);
     btlayout->addWidget(btnClear);
-    btlayout->addWidget(labVerb);
     btlayout->addWidget(wordinput);
     btnLookup = new QPushButton;  // Lookup button
     btnLookup->setIcon(QIcon("/usr/share/icons/hicolor/64x64/hildon/general_search.png"));
@@ -43,17 +42,16 @@ 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()));
 
-    QObject::connect(wordinput, SIGNAL(returnPressed()), this, SLOT(startLookup()));
-    QObject::connect(btnLookup, SIGNAL(clicked()), this, SLOT(startLookup()));
+    connect(wordinput, SIGNAL(returnPressed()), this, SLOT(startLookup()));
+    connect(btnLookup, SIGNAL(clicked()), this, SLOT(startLookup()));
 }
 
 MainWindow::~MainWindow()
 {
     delete ui;
+    delete freVerbDic;
 }
 
 void MainWindow::setOrientation(ScreenOrientation orientation)
@@ -111,8 +109,18 @@ void MainWindow::showExpanded()
     wordinput->setFocus();
 }
 
+void  MainWindow::initverbiste()
+{
+    langCode = "fr";
+}
+
 void MainWindow::startLookup()
 {
+    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);
     QString input = wordinput->text();
 
     FrenchVerbDictionary::Language lang = FrenchVerbDictionary::parseLanguageCode(langCode);
@@ -131,14 +139,16 @@ void MainWindow::startLookup()
      *  For each possible deconjugation, take the infinitive form and
      *  obtain its complete conjugation.
      */
-    std::vector<InflectionDesc> v;
+    std::vector<InflectionDesc> infles;
     bool includePronouns = FALSE;    // TODO: Will get this value from external
+    bool isItalian = FALSE;          // TODO: Will get this value from external
 
-    freVerbDic->deconjugate(word, v);
+    freVerbDic->deconjugate(word, infles);
 
+    resultPages->setUpdatesEnabled(false);
     std::string prevUTF8Infinitive, prevTemplateName;
-    for (std::vector<InflectionDesc>::const_iterator it = v.begin();
-         it != v.end(); it++)
+    for (std::vector<InflectionDesc>::const_iterator it = infles.begin();
+         it != infles.end(); it++)
     {
         const InflectionDesc &d = *it;
         VVVS conjug;
@@ -158,11 +168,98 @@ void MainWindow::startLookup()
             continue;
 
         /* Show on GUI */
-        labVerb->setText(QString::fromUtf8(utf8Infinitive.c_str()));
+        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);
+        }
+        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<QString> persons = qgetConjugates(*verbDict, tenseIterator,inputWord,
+                                              "<font color='#D20020'>", "</font>");
+    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);
+}
+