X-Git-Url: http://git.maemo.org/git/?p=colorflood;a=blobdiff_plain;f=colorflood%2Fsrc%2Fwindow.cpp;h=e0b64ea412c6e8249eba5b8cf84e30e5b78424ab;hp=ef4f63d9075f14c1fcbcd933b6620ebcb2bc92cd;hb=28227549a34ad895f59a94e4e0b65bbe72c48fbc;hpb=fa21544239a906286a6113ea442f84a23b247e13

diff --git a/colorflood/src/window.cpp b/colorflood/src/window.cpp
index ef4f63d..e0b64ea 100644
--- a/colorflood/src/window.cpp
+++ b/colorflood/src/window.cpp
@@ -27,8 +27,6 @@ Window::Window ()
     setWindowTitle("Color Flood");
     setWindowIcon(QIcon(":/images/icon_48x48.png"));
 
-    new FullScreenExitButton(this);
-
     int turns;
     field = new Field(this, &turns);
     colorButtons = new ColorButtons(this);
@@ -48,22 +46,16 @@ Window::Window ()
 
     updateTurns(turns);
 
-    QHBoxLayout *secondary = new QHBoxLayout;
-    QPushButton *toggleFS = new QPushButton(QPixmap("/usr/share/icons/hicolor/64x64/hildon/general_fullsize"), tr("Toggle fullscreen"), this);
-    QObject::connect(toggleFS, SIGNAL(pressed()), this, SLOT(toggleFullscreen()));
     QPushButton *newGame = new QPushButton(tr("New game"), this);
     QObject::connect(newGame, SIGNAL(pressed()), field, SLOT(randomize()));
 
-    secondary->addWidget(newGame);
-    secondary->addWidget(toggleFS);
-
     QVBoxLayout *vl = new QVBoxLayout;
     vl->addWidget(colorButtons);
     vl->setAlignment(colorButtons, Qt::AlignRight | Qt::AlignTop);
     vl->addWidget(turnsLabel);
-    vl->setAlignment(turnsLabel, Qt::AlignRight | Qt::AlignTop);
-    vl->addLayout(secondary);
-    vl->setAlignment(secondary, Qt::AlignRight | Qt::AlignBottom);
+    vl->setAlignment(turnsLabel, Qt::AlignRight | Qt::AlignBottom);
+    vl->addWidget(newGame);
+    vl->setAlignment(newGame, Qt::AlignRight | Qt::AlignTop);
 
     QHBoxLayout *hl = new QHBoxLayout;
     hl->addWidget(field);
@@ -76,25 +68,22 @@ Window::Window ()
 
     if (settings.value("fullscreen", true).toBool())
         showFullScreen();
-}
 
-void Window::updateTurns (int turns)
-{
-    /*: number of turns */
-    turnsLabel->setText(tr("<font size=\"16\">Turns: %1/%2</font>")
-                        .arg(turns)
-                        .arg(field->getNumTurnsOfSize(field->getSize())));
+    new FullScreenExitButton(this);
 }
 
-void Window::toggleFullscreen ()
+Window::~Window ()
 {
     bool isFullscreen = windowState() & Qt::WindowFullScreen;
 
     QSettings settings;
-    settings.setValue("fullscreen", !isFullscreen);
+    settings.setValue("fullscreen", isFullscreen);
+}
 
-    if (isFullscreen)
-        showNormal();
-    else
-        showFullScreen();
+void Window::updateTurns (int turns)
+{
+    /*: number of turns */
+    turnsLabel->setText(tr("<font size=\"16\">Turns: %1/%2</font>")
+                        .arg(turns)
+                        .arg(field->getNumTurnsOfSize(field->getSize())));
 }