X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmain.cpp;h=d0441eb6b36e3ad1b31e4fc505cfeb3acf7137ed;hb=a49895600730aa913f4b4c74e5bd48d2acf774fa;hp=043a30461099c3b53b5907898e9a9a424dfe13d0;hpb=ad539de7d11c92202714dde12a33e15d49e60a84;p=evilplumber

diff --git a/src/main.cpp b/src/main.cpp
index 043a304..d0441eb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,7 @@
 #include "ui_main.h"
 #include "ui_startlevel.h"
 #include "ui_collections.h"
+#include "ui_game.h"
 #include "game.h"
 
 #include <QDebug>
@@ -13,9 +14,6 @@ int main(int argc, char** argv)
 {
     QApplication app(argc, argv);
 
-    qDebug() << "Reading levels from" << LEVDIR;
-    qDebug() << "Reading images from" << IMGDIR;
-
     QWidget mainWindow;
 
     Ui::Main ui;
@@ -29,16 +27,19 @@ int main(int argc, char** argv)
     levelUi.setupUi(ui.collectionWidget);
     QObject::connect(levelUi.quitButton, SIGNAL(clicked()), &app, SLOT(quit()));
 
-    GameField field(ui.gameTable);
-    AvailablePieces pieces(ui.pieceTable);
+    Ui::Game gameUi;
+    gameUi.setupUi(ui.gameWidget);
+
+    GameField field(gameUi.gameTable);
+    AvailablePieces pieces(gameUi.pieceTable);
     QStringList levelCollections;
     levelCollections << "intro" << "basic"; // TODO: read from fs
-    GameController controller(&pieces, &field, ui.timeLabel, ui.doneButton);
+    GameController controller(&pieces, &field, gameUi.timeLabel, gameUi.doneButton);
     LevelSwitcher switcher(&controller,
                            ui.collectionWidget, levelUi.levelList, levelUi.startButton,
                            ui.startWidget, startUi.startTitle,
                            startUi.startLabel, startUi.startButton,
-                           ui.levelLabel, ui.scoreLabel, levelCollections);
+                           ui.gameWidget, gameUi.levelLabel, gameUi.scoreLabel, levelCollections);
 
     mainWindow.show();