projects
/
mverbiste
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add About Dialog.
[mverbiste]
/
mainwindow.h
diff --git
a/mainwindow.h
b/mainwindow.h
index
e3d5502
..
49aa76f
100644
(file)
--- a/
mainwindow.h
+++ b/
mainwindow.h
@@
-9,6
+9,7
@@
#include <QtGui/QScrollArea>
#include <QtGui/QLabel>
#include <QtGui/QTableWidget>
#include <QtGui/QScrollArea>
#include <QtGui/QLabel>
#include <QtGui/QTableWidget>
+#include <QtGui/QMessageBox>
/* Verbiste */
#include <iostream>
/* Verbiste */
#include <iostream>
@@
-16,6
+17,13
@@
#include <string.h>
#include <verbiste/FrenchVerbDictionary.h>
#include "gui/conjugation.h"
#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 {
using namespace verbiste;
namespace Ui {
@@
-27,10
+35,14
@@
class ResultPage
{
public:
QScrollArea *page;
{
public:
QScrollArea *page;
- QTableWidget *table;
+ QGridLayout *grid;
ResultPage();
// No destructor because this object does not own the two widgets.
ResultPage();
// No destructor because this object does not own the two widgets.
+ void packContent();
+
+private:
+ QWidget *immediate;
};
class MainWindow : public QMainWindow
};
class MainWindow : public QMainWindow
@@
-54,6
+66,10
@@
public:
void showExpanded();
void initverbiste();
void showExpanded();
void initverbiste();
+ QVBoxLayout* makeResultCell(const VVS &tenseIterator,
+ const std::string &tenseName,
+ const std::string &inputWord,
+ FrenchVerbDictionary *verbDict);
public slots:
void startLookup();
public slots:
void startLookup();
@@
-67,14
+83,19
@@
private:
QPushButton *btnClear; // Clear button
QLineEdit *wordinput; // Word input
QPushButton *btnLookup; // Lookup button
QPushButton *btnClear; // Clear button
QLineEdit *wordinput; // Word input
QPushButton *btnLookup; // Lookup button
- QLabel *labVerb;
+ QMessageBox *msgbox;
std::string langCode;
FrenchVerbDictionary *freVerbDic;
std::string langCode;
FrenchVerbDictionary *freVerbDic;
+ AboutDialog *aboutDialog;
ResultPage* addResultPage(const std::string &labelText);
ResultPage* addResultPage(const std::string &labelText);
+#ifndef QT_NO_DEBUG
+ QElapsedTimer timer;
+#endif
private slots:
void clearResults();
private slots:
void clearResults();
+ void startAgain();
};
};