remove old stuff

diff --git a/colorflood/src/colorflood.qm b/colorflood/src/colorflood.qm
index 4282c75..aa3a687 100644 (file)
Binary files a/colorflood/src/colorflood.qm and b/colorflood/src/colorflood.qm differ

diff --git a/colorflood/src/colorflood.ts b/colorflood/src/colorflood.ts
index 0672e6c..d940f0a 100644 (file)
--- a/colorflood/src/colorflood.ts
+++ b/colorflood/src/colorflood.ts
@@ -7,7 +7,7 @@
         <location filename="field.cpp" line="262"/>
         <source>You won!</source>
         <extracomment>win message</extracomment>
-        <translation type="unfinished">Вы победили!</translation>
+        <translation type="unfinished">Вы выиграли!</translation>
     </message>
     <message>
         <location filename="field.cpp" line="268"/>
@@ -34,21 +34,15 @@
 <context>
     <name>Window</name>
     <message>
-        <location filename="window.cpp" line="52"/>
-        <source>Toggle fullscreen</source>
-        <translation type="unfinished">Полноэкранный режим</translation>
-    </message>
-    <message>
-        <location filename="window.cpp" line="54"/>
+        <location filename="window.cpp" line="49"/>
         <source>New game</source>
-        <oldsource>New Game</oldsource>
         <translation type="unfinished">Новая игра</translation>
     </message>
     <message>
-        <location filename="window.cpp" line="84"/>
-        <source>&lt;font size=&quot;24&quot;&gt;Turns: %1/%2&lt;/font&gt;</source>
+        <location filename="window.cpp" line="86"/>
+        <source>&lt;font size=&quot;16&quot;&gt;Turns: %1/%2&lt;/font&gt;</source>
         <extracomment>number of turns</extracomment>
-        <translation type="unfinished">&lt;font size=&quot;24&quot;&gt;Шагов: %1/%2&lt;/font&gt;</translation>
+        <translation type="unfinished">&lt;font size=&quot;16&quot;&gt;Шагов: %1/%2&lt;/font&gt;</translation>
     </message>
 </context>
 </TS>

diff --git a/colorflood/src/window.cpp b/colorflood/src/window.cpp
index ef4f63d..e0b64ea 100644 (file)
--- 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())));
 }

diff --git a/colorflood/src/window.hpp b/colorflood/src/window.hpp
index dd1f4a1..6429eae 100644 (file)
--- a/colorflood/src/window.hpp
+++ b/colorflood/src/window.hpp
@@ -26,10 +26,10 @@ class Window : public QWidget
 
 public:
     Window ();
+    ~Window ();
 
 private slots:
     void updateTurns (int turns);
-    void toggleFullscreen ();
 
 private:
     ColorButtons *colorButtons;