Skip to content

GitLab

KSudoku
KSudoku
Commit 3f44d529 authored by Ian Wadham's avatar Ian Wadham
Browse files
Options

Add settings to control the look and feel of a 3-D puzzle. 

svn path=/trunk/KDE/kdegames/ksudoku/; revision=1286327
parent f76f2883
Hide whitespace changes
Inline Side-by-side
Showing with 420 additions and 38 deletions
src/gui/configgame.ui
View file @ 3f44d529
<ui version="4.0" >
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ConfigGame</class>
<widget class="QWidget" name="ConfigGame" >
<property name="geometry" >
<widget class="QWidget" name="ConfigGame">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
<width>413</width>
<height>466</height>
</rect>
</property>
<layout class="QVBoxLayout" >
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QCheckBox" name="kcfg_ShowHighlights" >
<property name="whatsThis" >
<string>Highlight the current row, column and box in different colors</string>
<widget class="QCheckBox" name="kcfg_ShowHighlights">
<property name="toolTip">
<string>Highlight the row, column and block that contain the selected cell</string>
</property>
<property name="text" >
<string>Show highlights</string>
<property name="whatsThis">
<string>Highlight the row, column and block that contain the selected cell. Blocks may be square or irregular (as in jigsaw-type or XSudoku puzzles).</string>
</property>
<property name="text">
<string>Show highlights in 2-D puzzles</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="kcfg_ShowErrors" >
<property name="whatsThis" >
<string>Highlight cells which values are against the rules in red</string>
<widget class="QCheckBox" name="kcfg_ShowErrors">
<property name="toolTip">
<string>Highlight in red any cells whose values break the Sudoku rules.</string>
</property>
<property name="whatsThis">
<string>Highlight in red any cells whose values break the Sudoku rules.</string>
</property>
<property name="text" >
<property name="text">
<string>Show errors</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="kcfg_ShowHighlights3D">
<property name="toolTip">
<string>Highlight the planes (blocks) that contain the selected cell.</string>
</property>
<property name="whatsThis">
<string>Highlight the planes (blocks) that contain the selected cell.</string>
</property>
<property name="text">
<string>Show highlights in 3-D puzzles</string>
</property>
</widget>
</item>
<item>
<spacer name="spacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>30</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="font">
<font>
<pointsize>13</pointsize>
</font>
</property>
<property name="text">
<string>Settings for 3-D Puzzles Only</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QSlider" name="kcfg_OverallSize3D">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>200</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Set the relative size of 3-D cells and the spaces between them.</string>
</property>
<property name="whatsThis">
<string>Set the relative size of 3-D cells and the spaces between them.</string>
</property>
<property name="minimum">
<number>7</number>
</property>
<property name="maximum">
<number>13</number>
</property>
<property name="singleStep">
<number>1</number>
</property>
<property name="pageStep">
<number>1</number>
</property>
<property name="value">
<number>10</number>
</property>
<property name="sliderPosition">
<number>10</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="invertedAppearance">
<bool>false</bool>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>1</number>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_6">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Set the relative size of 3-D cells and the spaces between them.</string>
</property>
<property name="whatsThis">
<string>Set the relative size of 3-D cells and the spaces between them.</string>
</property>
<property name="text">
<string>Overall size of 3-D cells</string>
</property>
<property name="buddy">
<cstring></cstring>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_1">
<item>
<widget class="QSlider" name="kcfg_SelectionSize3D">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>200</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Shrink or expand a cell by up to 30% when it is selected.</string>
</property>
<property name="whatsThis">
<string>Shrink or expand a cell by up to 30% when it is selected.</string>
</property>
<property name="minimum">
<number>7</number>
</property>
<property name="maximum">
<number>13</number>
</property>
<property name="singleStep">
<number>1</number>
</property>
<property name="pageStep">
<number>1</number>
</property>
<property name="value">
<number>7</number>
</property>
<property name="sliderPosition">
<number>7</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="invertedAppearance">
<bool>false</bool>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>1</number>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Shrink or expand a cell by up to 30% when it is selected.</string>
</property>
<property name="whatsThis">
<string>Shrink or expand a cell by up to 30% when it is selected.</string>
</property>
<property name="text">
<string>Size of selected 3-D cell</string>
</property>
<property name="buddy">
<cstring>kcfg_SelectionSize3D</cstring>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QSlider" name="kcfg_HighlightedSize3D">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>200</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Shrink or expand cells by up to 30% when they are highlighted.</string>
</property>
<property name="whatsThis">
<string>Shrink or expand cells by up to 30% when they are highlighted.</string>
</property>
<property name="minimum">
<number>7</number>
</property>
<property name="maximum">
<number>13</number>
</property>
<property name="pageStep">
<number>1</number>
</property>
<property name="value">
<number>7</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>1</number>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Shrink or expand cells by up to 30% when they are highlighted.</string>
</property>
<property name="whatsThis">
<string>Shrink or expand cells by up to 30% when they are highlighted.</string>
</property>
<property name="text">
<string>Size of highlighted 3-D cells</string>
</property>
<property name="buddy">
<cstring>kcfg_HighlightedSize3D</cstring>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QSlider" name="kcfg_OuterCellSize3D">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>200</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Shrink cells by up to 60% if they are not in an NxNxN cube that contains the selected cell.</string>
</property>
<property name="whatsThis">
<string>Shrink cells by up to 60% if they are not in an NxNxN cube that contains the selected cell. This is useful if a 3-D puzzle has more than one cube.</string>
</property>
<property name="minimum">
<number>4</number>
</property>
<property name="maximum">
<number>10</number>
</property>
<property name="pageStep">
<number>1</number>
</property>
<property name="value">
<number>4</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>1</number>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_5">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Shrink cells by up to 60% if they are not in an NxNxN cube that contains the selected cell.</string>
</property>
<property name="whatsThis">
<string>Shrink cells by up to 60% if they are not in an NxNxN cube that contains the selected cell. This is useful if a 3-D puzzle has more than one cube.</string>
</property>
<property name="text">
<string>Size of 3-D cells outside the selected volume</string>
</property>
<property name="buddy">
<cstring>kcfg_OuterCellSize3D</cstring>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="topMargin">
<number>5</number>
</property>
<item>
<widget class="QCheckBox" name="kcfg_DarkenOuterCells3D">
<property name="toolTip">
<string>Darken cells if they are not in an NxNxN cube that contains the selected cell.</string>
</property>
<property name="whatsThis">
<string>Shrink cells by up to 60% if they are not in an NxNxN cube that contains the selected cell. This is useful if a 3-D puzzle has more than one cube.</string>
</property>
<property name="text">
<string>Darken 3-D cells outside the selected volume</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<spacer>
<property name="orientation" >
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
......@@ -45,6 +399,15 @@
</item>
</layout>
</widget>
<tabstops>
<tabstop>kcfg_ShowHighlights</tabstop>
<tabstop>kcfg_ShowErrors</tabstop>
<tabstop>kcfg_ShowHighlights3D</tabstop>
<tabstop>kcfg_SelectionSize3D</tabstop>
<tabstop>kcfg_HighlightedSize3D</tabstop>
<tabstop>kcfg_OuterCellSize3D</tabstop>
<tabstop>kcfg_DarkenOuterCells3D</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>
src/gui/ksudoku.kcfg
View file @ 3f44d529
......@@ -11,6 +11,24 @@
<entry name="ShowErrors" type="Bool" key="showErrors">
<default>true</default>
</entry>
<entry name="ShowHighlights3D" type="Bool" key="showHighlights3D">
<default>true</default>
</entry>
<entry name="OverallSize3D" type="Int" key="overallSize3D">
<default>10</default>
</entry>
<entry name="SelectionSize3D" type="Int" key="selectionSize3D">
<default>7</default>
</entry>
<entry name="HighlightedSize3D" type="Int" key="highlightedSize3D">
<default>7</default>
</entry>
<entry name="OuterCellSize3D" type="Int" key="outerCellSize3D">
<default>4</default>
</entry>
<entry name="DarkenOuterCells3D" type="Bool" key="darkenOuterCells3D">
<default>true</default>
</entry>
</group>
<group name="Themes">
<entry name="Theme" type="String" key="theme">
......
src/gui/views/roxdokuview.cpp
View file @ 3f44d529
......@@ -36,8 +36,6 @@
#include "renderer.h"
#include <QDebug> // IDW test.
namespace ksudoku{
GLUquadricObj *quadratic; // Used For Our Quadric
......@@ -303,9 +301,15 @@ void RoxdokuView::selectValue(int value) {
}
void RoxdokuView::loadSettings() {
m_guidedMode = Settings::showErrors();
m_showHighlights = Settings::showHighlights();
qDebug() << "Show errors" << m_guidedMode << "Show highlights" << m_showHighlights;
m_guidedMode = Settings::showErrors();
m_showHighlights = Settings::showHighlights3D();
float s = Settings::overallSize3D()/10.0f; // Normal size.
m_unhighlightedSize = s;
m_selectionSize = s * Settings::selectionSize3D()/10.0f;
m_highlightedSize = s * Settings::highlightedSize3D()/10.0f;
m_outerCellSize = s * Settings::outerCellSize3D()/10.0f;
m_darkenOuterCells = Settings::darkenOuterCells3D();
}
void RoxdokuView::settingsChanged() {
......@@ -323,46 +327,37 @@ void RoxdokuView::myDrawCube(bool highlight, int name,
glBindTexture(GL_TEXTURE_2D, m_texture[m_order >= 16][m_game.value(name)]);
float sz = 1.0f;
// float s = 0.15f;
float s = 0.2f;
if(m_selection != -1 && m_selection != name && highlight) {
// IDW test. s = -0.25f;
s = +0.2;
// IDW test. Keep highlighted cells at same size. sz = 0.52f;
sz = 0.7f;
sz = m_highlightedSize;
switch(m_game.buttonState(name)) {
case ksudoku::GivenValue:
// IDW test. glColor3f(0.4f,0.4f,0.8f);
glColor3f(0.85f,1.0f,0.4f); // Green/Gold.
// IDW cancel. sz+=0.15;
break;
case ksudoku::ObviouslyWrong:
case ksudoku::WrongValue:
if(m_guidedMode && m_game.puzzle()->hasSolution())
glColor3f(0.75f,0.25f,0.25f); // Red.
else
// IDW test. glColor3f(0.5f+s,0.5f+s,1.0f+s);
glColor3f(0.75f+s,0.75f+s,0.25f+s);
break;
case ksudoku::Marker:
case ksudoku::CorrectValue:
// IDW test. glColor3f(0.5f+s,0.5f+s,1.0f+s);
glColor3f(0.75f+s,0.75f+s,0.25f+s); // Gold.
break;
}
} else {
// IDW test. sz = 1.0f;
// IDW test. s = 0.1f;
sz = m_unhighlightedSize;
s = 0.1f;
if (outside && (m_selection != -1)) {
// Shrink and darken cells outside the selection-volume.
sz = 0.52f;
s = -0.24;
sz = m_outerCellSize;
s = m_darkenOuterCells ? -0.24f : 0.0f;
}
switch(m_game.buttonState(name)) {
case ksudoku::GivenValue:
// IDW test. glColor3f(0.35f,0.70f,0.45f);
glColor3f(0.6f+s,0.9f+s,0.6f+s); // Green.
break;
case ksudoku::ObviouslyWrong:
......@@ -370,20 +365,20 @@ void RoxdokuView::myDrawCube(bool highlight, int name,
if(m_guidedMode && m_game.puzzle()->hasSolution())
glColor3f(0.75f,0.25f,0.25f); // Red.
else
// IDW test. glColor3f(0.5f+s,0.5f+s,1.0f+s);
glColor3f(0.6f+s,1.0f+s,1.0f+s);// Blue.
break;
case ksudoku::Marker:
case ksudoku::CorrectValue:
// IDW test. glColor3f(0.5f+s,0.5f+s,1.0f+s);
glColor3f(0.6f+s,1.0f+s,1.0f+s); // Blue.
break;
}
}
if(m_selection == name)
if(m_selection == name) {
sz = m_selectionSize;
// IDW test. glColor3f(0.75f,0.25f,0.25f);
glColor3f(1.0f,0.8f,0.4f); // Orange.
}
glBegin(GL_QUADS);
/* front face */
......
src/gui/views/roxdokuview.h
View file @ 3f44d529
......@@ -123,6 +123,12 @@ private:
bool m_guidedMode;
bool m_showHighlights;
float m_selectionSize;
float m_highlightedSize;
float m_unhighlightedSize;
float m_outerCellSize;
bool m_darkenOuterCells;
QTimer * m_delayTimer;
bool m_timeDelay;
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment