size/scheme options; better translation

diff --git a/colorflood/src/colorflood.ts b/colorflood/src/colorflood.ts
index d940f0a..b928848 100644 (file)
--- a/colorflood/src/colorflood.ts
+++ b/colorflood/src/colorflood.ts
@@ -4,13 +4,13 @@
 <context>
     <name>Field</name>
     <message>
 <context>
     <name>Field</name>
     <message>

-        <location filename="field.cpp" line="262"/>
+        <location filename="field.cpp" line="273"/>

         <source>You won!</source>
         <extracomment>win message</extracomment>
         <translation type="unfinished">Вы выиграли!</translation>
     </message>
     <message>
         <source>You won!</source>
         <extracomment>win message</extracomment>
         <translation type="unfinished">Вы выиграли!</translation>
     </message>
     <message>

-        <location filename="field.cpp" line="268"/>
+        <location filename="field.cpp" line="279"/>

         <source>You lost!</source>
         <extracomment>fail message</extracomment>
         <translation type="unfinished">Вы проиграли!</translation>
         <source>You lost!</source>
         <extracomment>fail message</extracomment>
         <translation type="unfinished">Вы проиграли!</translation>

@@ -20,29 +20,47 @@
     <name>QObject</name>
     <message>
         <location filename="colorscheme.cpp" line="33"/>
     <name>QObject</name>
     <message>
         <location filename="colorscheme.cpp" line="33"/>

-        <source>Default</source>
+        <source>Default scheme</source>
+        <oldsource>Default</oldsource>

         <extracomment>default color scheme name</extracomment>
         <extracomment>default color scheme name</extracomment>

-        <translation type="unfinished">Стандартная</translation>
+        <translation type="unfinished">Стандартная схема</translation>

     </message>
     <message>
         <location filename="colorscheme.cpp" line="43"/>
     </message>
     <message>
         <location filename="colorscheme.cpp" line="43"/>

-        <source>Black-and-white</source>
+        <source>Black-and-white scheme</source>
+        <oldsource>Black-and-white</oldsource>

         <extracomment>black-and-white color scheme name</extracomment>
         <extracomment>black-and-white color scheme name</extracomment>

-        <translation type="unfinished">Чёрно-белая</translation>
+        <translation type="unfinished">Чёрно-белая схема</translation>

     </message>
 </context>
 <context>
     <name>Window</name>
     <message>
     </message>
 </context>
 <context>
     <name>Window</name>
     <message>

-        <location filename="window.cpp" line="49"/>
+        <location filename="window.cpp" line="51"/>

         <source>New game</source>
         <translation type="unfinished">Новая игра</translation>
     </message>
     <message>
         <source>New game</source>
         <translation type="unfinished">Новая игра</translation>
     </message>
     <message>

-        <location filename="window.cpp" line="86"/>
-        <source>&lt;font size=&quot;16&quot;&gt;Turns: %1/%2&lt;/font&gt;</source>
+        <location filename="window.cpp" line="72"/>
+        <source>Fullscreen mode</source>
+        <translation type="unfinished">Полноэкранный режим</translation>
+    </message>
+    <message>
+        <location filename="window.cpp" line="84"/>
+        <source>Less cells</source>
+        <translation type="unfinished">Меньше клеток</translation>
+    </message>
+    <message>
+        <location filename="window.cpp" line="96"/>
+        <source>More cells</source>
+        <translation type="unfinished">Больше клеток</translation>
+    </message>
+    <message>
+        <location filename="window.cpp" line="110"/>
+        <source>&lt;font size=&quot;12&quot;&gt;Turns: %1/%2&lt;/font&gt;</source>
+        <oldsource>&lt;font size=&quot;16&quot;&gt;Turns: %1/%2&lt;/font&gt;</oldsource>

         <extracomment>number of turns</extracomment>
         <extracomment>number of turns</extracomment>

-        <translation type="unfinished">&lt;font size=&quot;16&quot;&gt;Шагов: %1/%2&lt;/font&gt;</translation>
+        <translation type="unfinished">&lt;font size=&quot;12&quot;&gt;Шагов: %1/%2&lt;/font&gt;</translation>

     </message>
 </context>
 </TS>
     </message>
 </context>
 </TS>

diff --git a/colorflood/src/colorscheme.cpp b/colorflood/src/colorscheme.cpp
index bb7af78..096cd33 100644 (file)
--- a/colorflood/src/colorscheme.cpp
+++ b/colorflood/src/colorscheme.cpp
@@ -30,17 +30,17 @@ ColorScheme::ColorScheme ()
     s << QColor(0xf0, 0x70, 0xa0);
     s << QColor(0xdc, 0x4a, 0x20);
     /*: default color scheme name */
     s << QColor(0xf0, 0x70, 0xa0);
     s << QColor(0xdc, 0x4a, 0x20);
     /*: default color scheme name */

-    schemes << QPair<QString, QVector<QBrush> >(QObject::tr("Default"), s);
+    schemes << QPair<QString, QVector<QBrush> >(QObject::tr("Default scheme"), s);

 
     s.clear();
     s << QBrush(QColor(0x00, 0x00, 0x00), Qt::SolidPattern);
 
     s.clear();
     s << QBrush(QColor(0x00, 0x00, 0x00), Qt::SolidPattern);

-    s << QBrush(QColor(0x33, 0x33, 0x33), Qt::Dense3Pattern);
+    s << QBrush(QColor(0x20, 0x20, 0x20), Qt::Dense3Pattern);

     s << QBrush(QColor(0x66, 0x66, 0x66), Qt::Dense1Pattern);
     s << QBrush(QColor(0x99, 0x99, 0x99), Qt::SolidPattern);
     s << QBrush(QColor(0xcc, 0xcc, 0xcc), Qt::CrossPattern);
     s << QBrush(QColor(0xff, 0xff, 0xff), Qt::SolidPattern);
     /*: black-and-white color scheme name */
     s << QBrush(QColor(0x66, 0x66, 0x66), Qt::Dense1Pattern);
     s << QBrush(QColor(0x99, 0x99, 0x99), Qt::SolidPattern);
     s << QBrush(QColor(0xcc, 0xcc, 0xcc), Qt::CrossPattern);
     s << QBrush(QColor(0xff, 0xff, 0xff), Qt::SolidPattern);
     /*: black-and-white color scheme name */

-    schemes << QPair<QString, QVector<QBrush> >(QObject::tr("Black-and-white"), s);
+    schemes << QPair<QString, QVector<QBrush> >(QObject::tr("Black-and-white scheme"), s);

 
     QSettings settings;
     currentScheme = settings.value("colorScheme", 0).toInt();
 
     QSettings settings;
     currentScheme = settings.value("colorScheme", 0).toInt();

@@ -60,9 +60,14 @@ int ColorScheme::getNumSchemes ()
     return schemes.size();
 }
 
     return schemes.size();
 }
 

+int ColorScheme::getNextColorScheme ()
+{
+    return (currentScheme + 1) % schemes.size();
+}
+

 QString ColorScheme::getSchemeName (int scheme)
 {
 QString ColorScheme::getSchemeName (int scheme)
 {

-    Q_ASSERT(scheme > 0 && scheme < getNumSchemes());
+    Q_ASSERT(scheme >= 0 && scheme < getNumSchemes());

     return schemes.at(scheme).first;
 }
 
     return schemes.at(scheme).first;
 }
 

diff --git a/colorflood/src/colorscheme.hpp b/colorflood/src/colorscheme.hpp
index c366def..db6b786 100644 (file)
--- a/colorflood/src/colorscheme.hpp
+++ b/colorflood/src/colorscheme.hpp
@@ -29,6 +29,7 @@ public:
         }
 
     static int getNumSchemes ();
         }
 
     static int getNumSchemes ();

+    static int getNextColorScheme ();

     static QString getSchemeName (int scheme);
     const QVector<QBrush> &getScheme (int scheme);
     static QString getSchemeName ();
     static QString getSchemeName (int scheme);
     const QVector<QBrush> &getScheme (int scheme);
     static QString getSchemeName ();

diff --git a/colorflood/src/field.cpp b/colorflood/src/field.cpp
index 44e3259..89b5d17 100644 (file)
--- a/colorflood/src/field.cpp
+++ b/colorflood/src/field.cpp
@@ -114,6 +114,17 @@ Field::FieldSize Field::getSize () const
     return size;
 }
 
     return size;
 }
 

+void Field::setSize (int size)
+{
+    Q_ASSERT(size >= 0 && size < NUM_SIZES);
+
+    if (this->size == size)
+        return;
+
+    this->size = (FieldSize)size;
+    randomize();
+}
+

 void Field::randomize ()
 {
     FieldRect rect;
 void Field::randomize ()
 {
     FieldRect rect;

diff --git a/colorflood/src/field.hpp b/colorflood/src/field.hpp
index 81deb1b..c3b81f9 100644 (file)
--- a/colorflood/src/field.hpp
+++ b/colorflood/src/field.hpp
@@ -46,6 +46,7 @@ public:
     ~Field ();
 
     FieldSize getSize () const;
     ~Field ();
 
     FieldSize getSize () const;

+    void setSize (int size);

 
     static int getNumRectsOfSize (FieldSize size);
     static int getNumTurnsOfSize (FieldSize size);
 
     static int getNumRectsOfSize (FieldSize size);
     static int getNumTurnsOfSize (FieldSize size);

diff --git a/colorflood/src/window.cpp b/colorflood/src/window.cpp
index e0b64ea..7ade0a3 100644 (file)
--- a/colorflood/src/window.cpp
+++ b/colorflood/src/window.cpp
@@ -16,10 +16,12 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QSettings>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QSettings>

+#include <QMenuBar>

 #include "window.hpp"
 #include "colorbuttons.hpp"
 #include "field.hpp"
 #include "fullscreenexitbutton.hpp"
 #include "window.hpp"
 #include "colorbuttons.hpp"
 #include "field.hpp"
 #include "fullscreenexitbutton.hpp"

+#include "colorscheme.hpp"

 
 Window::Window ()
     : QWidget()
 
 Window::Window ()
     : QWidget()

@@ -64,26 +66,88 @@ Window::Window ()
 
     setLayout(hl);
 
 
     setLayout(hl);
 

-    QSettings settings;
+    /* menu bar */
+    QMenuBar *bar = new QMenuBar(this);

 
 

-    if (settings.value("fullscreen", true).toBool())
-        showFullScreen();
+    QObject::connect(bar->addAction(tr("Fullscreen mode")),
+                     SIGNAL(triggered()),
+                     this,
+                     SLOT(fullScreenMode()));

 
 

-    new FullScreenExitButton(this);
-}
+    QObject::connect(bar->addAction(
+                         ColorScheme::getSchemeName(
+                             ColorScheme::getNextColorScheme())),
+                     SIGNAL(triggered()),
+                     this,
+                     SLOT(colorScheme()));

 
 

-Window::~Window ()
-{
-    bool isFullscreen = windowState() & Qt::WindowFullScreen;
+    less = bar->addAction(tr("Less cells"));
+
+    QObject::connect(less,
+                     SIGNAL(triggered()),
+                     this,
+                     SLOT(lessCells()));
+
+    more = bar->addAction(tr("More cells"));

 
 

-    QSettings settings;
-    settings.setValue("fullscreen", isFullscreen);
+    QObject::connect(more,
+                     SIGNAL(triggered()),
+                     this,
+                     SLOT(moreCells()));
+
+    if (!field->getSize())
+        less->setEnabled(false);
+    else if (field->getSize() == Field::NUM_SIZES - 1)
+        more->setEnabled(false);
+
+    new FullScreenExitButton(this);
+    showFullScreen();

 }
 
 void Window::updateTurns (int turns)
 {
     /*: number of turns */
 }
 
 void Window::updateTurns (int turns)
 {
     /*: number of turns */

-    turnsLabel->setText(tr("<font size=\"16\">Turns: %1/%2</font>")
+    turnsLabel->setText(tr("<font size=\"12\">Turns: %1/%2</font>")

                         .arg(turns)
                         .arg(field->getNumTurnsOfSize(field->getSize())));
 }
                         .arg(turns)
                         .arg(field->getNumTurnsOfSize(field->getSize())));
 }

+
+void Window::fullScreenMode ()
+{
+    showFullScreen();
+}
+
+void Window::lessCells ()
+{
+    int s = field->getSize() - 1;
+
+    field->setSize(s);
+    more->setEnabled(true);
+
+    if (!s)
+        less->setEnabled(false);
+}
+
+void Window::moreCells ()
+{
+    int s = field->getSize() + 1;
+
+    field->setSize(s);
+    less->setEnabled(true);
+
+    if (s == Field::NUM_SIZES - 1)
+        more->setEnabled(false);
+}
+
+void Window::colorScheme ()
+{
+    QAction *action = static_cast<typeof(action)>(QObject::sender());
+
+    ColorScheme::setScheme(ColorScheme::getNextColorScheme());
+
+    field->update();
+    colorButtons->update();
+
+    action->setText(ColorScheme::getSchemeName(
+                        ColorScheme::getNextColorScheme()));
+}

diff --git a/colorflood/src/window.hpp b/colorflood/src/window.hpp
index 6429eae..9942a28 100644 (file)
--- a/colorflood/src/window.hpp
+++ b/colorflood/src/window.hpp
@@ -19,6 +19,7 @@
 class ColorButtons;
 class Field;
 class QLabel;
 class ColorButtons;
 class Field;
 class QLabel;

+class QAction;

 
 class Window : public QWidget
 {
 
 class Window : public QWidget
 {

@@ -26,15 +27,20 @@ class Window : public QWidget
 
 public:
     Window ();
 
 public:
     Window ();

-    ~Window ();

 
 private slots:
     void updateTurns (int turns);
 
 private slots:
     void updateTurns (int turns);

+    void fullScreenMode ();
+    void colorScheme ();
+    void lessCells ();
+    void moreCells ();

 
 private:
     ColorButtons *colorButtons;
     Field *field;
     QLabel *turnsLabel;
 
 private:
     ColorButtons *colorButtons;
     Field *field;
     QLabel *turnsLabel;

+    QAction *less;
+    QAction *more;

 };
 
 #endif // !_WINDOW_HPP
 };
 
 #endif // !_WINDOW_HPP