X-Git-Url: http://git.maemo.org/git/?p=mverbiste;a=blobdiff_plain;f=mainwindow.h;h=49aa76f5d48f7d11e8cc7cff6662f1b8d15804d6;hp=e3d55029462f0b767788bced9deb28ef79151673;hb=e2b4937b435d4973f9151b07503ef1fb869b43a4;hpb=6b71b328a4ed0cc4e8236fc27f4dd0dc392e1c34

diff --git a/mainwindow.h b/mainwindow.h
index e3d5502..49aa76f 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -9,6 +9,7 @@
 #include <QtGui/QScrollArea>
 #include <QtGui/QLabel>
 #include <QtGui/QTableWidget>
+#include <QtGui/QMessageBox>
 
 /* Verbiste */
 #include <iostream>
@@ -16,6 +17,13 @@
 #include <string.h>
 #include <verbiste/FrenchVerbDictionary.h>
 #include "gui/conjugation.h"
+#include "about.h"
+
+#ifndef QT_NO_DEBUG
+#include <QtCore/QDebug>
+#include <QtCore/QElapsedTimer>
+#endif
+
 using namespace verbiste;
 
 namespace Ui {
@@ -27,10 +35,14 @@ class ResultPage
 {
 public:
     QScrollArea *page;
-    QTableWidget *table;
+    QGridLayout *grid;
 
     ResultPage();
     // No destructor because this object does not own the two widgets.
+    void packContent();
+
+private:
+    QWidget *immediate;
 };
 
 class MainWindow : public QMainWindow
@@ -54,6 +66,10 @@ public:
 
     void showExpanded();
     void initverbiste();
+    QVBoxLayout* makeResultCell(const VVS &tenseIterator,
+                                const std::string &tenseName,
+                                const std::string &inputWord,
+                                FrenchVerbDictionary *verbDict);
 
 public slots:
     void startLookup();
@@ -67,14 +83,19 @@ private:
     QPushButton *btnClear;           // Clear button
     QLineEdit   *wordinput;          //  Word input
     QPushButton *btnLookup;          // Lookup button
-    QLabel      *labVerb;
+    QMessageBox *msgbox;
     std::string langCode;
     FrenchVerbDictionary *freVerbDic;
+    AboutDialog *aboutDialog;
 
     ResultPage* addResultPage(const std::string &labelText);
+#ifndef QT_NO_DEBUG
+    QElapsedTimer timer;
+#endif
 
 private slots:
     void clearResults();
+    void startAgain();
 };