rearrange controls

[colorflood] / colorflood / src / window.cpp

diff --git a/colorflood/src/window.cpp b/colorflood/src/window.cpp
index 99fa9cc..affafdc 100644 (file)
--- a/colorflood/src/window.cpp
+++ b/colorflood/src/window.cpp
@@ -18,14 +18,19 @@
 #include "window.hpp"
 #include "colorbuttons.hpp"
 #include "field.hpp"
-#include "fullscreenexitbutton.hpp"
+//#include "fullscreenexitbutton.hpp"
 
 Window::Window ()
     : QWidget()
 {
     setWindowTitle("Color Flood");
+    setWindowIcon(QIcon(":/images/icon_48x48.png"));
 
+#if defined(Q_WS_HILDON) || defined(Q_WS_MAEMO_5)
     setWindowState(windowState() | Qt::WindowFullScreen);
+#else
+    setFixedSize(800, 480);
+#endif
 
     //new FullScreenExitButton(this);
 
@@ -48,17 +53,17 @@ Window::Window ()
     updateTurns(turns);
 
     QVBoxLayout *vl = new QVBoxLayout;
+    vl->addWidget(colorButtons);
+    vl->setAlignment(colorButtons, Qt::AlignRight | Qt::AlignTop);
     vl->addWidget(turnsLabel);
-    vl->setAlignment(turnsLabel, Qt::AlignTop);
+    vl->setAlignment(turnsLabel, Qt::AlignRight | Qt::AlignTop);
 
     QHBoxLayout *hl = new QHBoxLayout;
-    hl->addWidget(colorButtons);
-    hl->setAlignment(colorButtons, Qt::AlignLeft);
     hl->addWidget(field);
-    hl->setAlignment(field, Qt::AlignRight);
+    hl->setAlignment(field, Qt::AlignLeft);
+    hl->addLayout(vl);
 
-    vl->addLayout(hl);
-    setLayout(vl);
+    setLayout(hl);
 }
 
 void Window::updateTurns (int turns)