[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdegames/kmines
From:       Dmitry Suzdalev <dimsuz () gmail ! com>
Date:       2008-07-11 9:17:02
Message-ID: 1215767822.717683.8459.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 830809 by dimsuz:

I don't know how could I forget to add an ability to turn off using "?" marks :)
Fix that.
To be backported to 4.1 branch

BUG: 165494


 M  +1 -1      CMakeLists.txt  
 M  +5 -1      cellitem.cpp  
 A             generalopts.ui  
 M  +4 -4      kmines.kcfg  
 M  +21 -0     mainwindow.cpp  


--- trunk/KDE/kdegames/kmines/CMakeLists.txt #830808:830809
@@ -17,7 +17,7 @@
    renderer.cpp
    main.cpp )
 
-kde4_add_ui_files(kmines_SRCS customgame.ui)
+kde4_add_ui_files(kmines_SRCS customgame.ui generalopts.ui)
 
 kde4_add_kcfg_files(kmines_SRCS settings.kcfgc )
 
--- trunk/KDE/kdegames/kmines/cellitem.cpp #830808:830809
@@ -18,6 +18,8 @@
 
 #include "cellitem.h"
 
+#include "settings.h"
+
 #include <kdebug.h>
 
 #include "renderer.h"
@@ -91,13 +93,15 @@
     // this will provide cycling through
     // Released -> "?"-mark -> "RedFlag"-mark -> Released
 
+    bool useQuestion = Settings::self()->useQuestionMarks();
+
     switch(m_state)
     {
         case KMinesState::Released:
             m_state = KMinesState::Flagged;
             break;
         case KMinesState::Flagged:
-            m_state = KMinesState::Questioned;
+            m_state = useQuestion ? KMinesState::Questioned : KMinesState::Released;
             break;
         case KMinesState::Questioned:
             m_state = KMinesState::Released;
--- trunk/KDE/kdegames/kmines/kmines.kcfg #830808:830809
@@ -5,6 +5,10 @@
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
   <kcfgfile name="kminesrc"/>
   <group name="General">
+    <entry name="UseQuestionMarks" type="Bool" key="question mark">
+      <label>Whether the "unsure" marker may be used.</label>
+      <default>true</default>
+    </entry>
     <entry name="Theme" type="String" key="Theme">
       <label>The graphical theme to be used.</label>
     </entry>
@@ -26,10 +30,6 @@
       <label>The number of mines in the playing field.</label>
       <default>20</default>
     </entry>
-    <entry name="UncertainMark" type="Bool" key="uncertain mark">
-      <label>Whether the "uncertain" marker may be used.</label>
-      <default>true</default>
-    </entry>
     <entry name="level" type="Enum">
       <label>The difficulty level.</label>
       <default>Easy</default>
--- trunk/KDE/kdegames/kmines/mainwindow.cpp #830808:830809
@@ -33,7 +33,11 @@
 #include <QDesktopWidget>
 
 #include "ui_customgame.h"
+#include "ui_generalopts.h"
 
+/*
+ * Classes for config dlg pages
+ */
 class CustomGameConfig : public QWidget
 {
 public:
@@ -46,6 +50,22 @@
     Ui::CustomGameConfig ui;
 };
 
+class GeneralOptsConfig : public QWidget
+{
+public:
+    GeneralOptsConfig(QWidget *parent)
+        : QWidget(parent)
+    {
+        ui.setupUi(this);
+    }
+private:
+    Ui::GeneralOptsConfig ui;
+};
+
+/*
+ * Main window
+ */
+
 KMinesMainWindow::KMinesMainWindow()
 {
     m_scene = new KMinesScene(this);
@@ -204,6 +224,7 @@
     if ( KConfigDialog::showDialog( "settings" ) )
         return;
     KConfigDialog *dialog = new KConfigDialog( this, "settings", Settings::self() );
+    dialog->addPage( new GeneralOptsConfig( dialog ), i18n("General"), \
                "games-config-options" );
     dialog->addPage( new KGameThemeSelector( dialog, Settings::self(), \
KGameThemeSelector::NewStuffDisableDownload ), i18n( "Theme" ), "games-config-theme" \
                );
     dialog->addPage( new CustomGameConfig( dialog ), i18n("Custom Game"), \
                "games-config-custom" );
     connect( dialog, SIGNAL( settingsChanged(const QString&) ), this, SLOT( \
loadSettings() ) );


[prev in list] [next in list] [prev in thread] [next in thread]