Fix a bug that makes an object re-initial.

[mverbiste] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 9ed6d6c..9e227d4 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -42,12 +42,28 @@ void MainWindow::setupcodedUI()
 
     connect(wordinput, SIGNAL(returnPressed()), this, SLOT(startLookup()));
     connect(btnLookup, 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 <ng.hong.quan@gmail.com>\nPierre Sarrazin <sarrazip@sarrazip.com>"));
+
+    /* Menu */
+    QMenu *menu = ui->menuBar->addMenu(tr("Top menu"));
+    QAction *act_about = menu->addAction(tr("About"));
+    connect(act_about, SIGNAL(triggered()), aboutDialog, SLOT(show()));
 }
 
 MainWindow::~MainWindow()
 {
     delete ui;
     delete freVerbDic;
+    delete aboutDialog;
 }
 
 void MainWindow::setOrientation(ScreenOrientation orientation)
@@ -178,7 +194,7 @@ void MainWindow::startLookup()
 #ifndef QT_NO_DEBUG
         qDebug() << "   START getConjugation " << timer.elapsed();
 #endif
-        getConjugation(freVerbDic, d.infinitive, d.templateName, conjug,
+        getConjugation(*freVerbDic, d.infinitive, d.templateName, conjug,
                #ifndef QT_NO_DEBUG
                        timer,
                #endif