diff --git a/resources/etc/OpenBoard.config b/resources/etc/OpenBoard.config
index d016619f..81088661 100644
--- a/resources/etc/OpenBoard.config
+++ b/resources/etc/OpenBoard.config
@@ -25,12 +25,14 @@ UseSystemOnScreenKeyboard=true
[Board]
AutoSaveIntervalInMinutes=3
-CrossColorDarkBackground=#C8C0C0C0
+CrossColorDarkBackground=#C82C2C2C
CrossColorLightBackground=#A5E1FF
DarkBackground=0
DefaultPageSize=@Size(1280 960)
EraserCircleWidthIndex=1
FeatureSliderPosition=40
+GridDarkBackgroundColors=#FFFFFF, #FF3400, #66C0FF, #81FF5C, #FFFF00, #B68360, #FF497E, #8D69FF, #C82C2C2C
+GridLightBackgroundColors=#000000, #FF0000, #004080, #008000, #FFDD00, #C87400, #800040, #008080, #5F2D0A, #A5E1FF
InterpolateMarkerStrokes=true
InterpolatePenStrokes=true
KeyboardPaletteKeyBtnSize=16x16
diff --git a/resources/forms/brushProperties.ui b/resources/forms/brushProperties.ui
index f149562f..5c4de12c 100644
--- a/resources/forms/brushProperties.ui
+++ b/resources/forms/brushProperties.ui
@@ -20,7 +20,7 @@
QFrame::Plain
- -
+
-
QFrame::NoFrame
@@ -70,24 +70,78 @@
- -
-
-
- Qt::Vertical
-
-
- QSizePolicy::Fixed
+
-
+
+
+ QFrame::NoFrame
-
-
- 20
- 40
-
+
+ QFrame::Raised
-
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 154
+ 20
+
+
+
+
+ -
+
+
+ Opacity
+
+
+
+ -
+
+
+ 20
+
+
+ 100
+
+
+ 50
+
+
+ Qt::Horizontal
+
+
+ QSlider::TicksAbove
+
+
+ 20
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 156
+ 20
+
+
+
+
+
+
- -
+
-
+
+ Qt::LeftToRight
+
QFrame::NoFrame
@@ -146,6 +200,19 @@
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
-
@@ -197,74 +264,7 @@
- -
-
-
- QFrame::NoFrame
-
-
- QFrame::Raised
-
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 154
- 20
-
-
-
-
- -
-
-
- Opacity
-
-
-
- -
-
-
- 20
-
-
- 100
-
-
- 50
-
-
- Qt::Horizontal
-
-
- QSlider::TicksAbove
-
-
- 20
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 156
- 20
-
-
-
-
-
-
-
- -
+
-
@@ -458,7 +458,7 @@
- -
+
-
Qt::Vertical
@@ -471,118 +471,79 @@
- -
-
-
- Qt::Horizontal
+
-
+
+
+ QFrame::NoFrame
-
-
- 0
- 0
-
+
+ QFrame::Raised
-
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Show preview circle from
+
+
+
+ -
+
+
+ -
+
+
+ px
+
+
+
+
+
- -
-
+
-
+
Qt::Horizontal
- 0
- 0
+ 198
+ 20
- -
-
-
- QFrame::NoFrame
-
-
- QFrame::Raised
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Show preview circle from
-
-
-
- -
-
-
- -
-
-
- px
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 198
- 20
-
-
-
-
-
-
-
-
+
- UBCircleFrame
+ UBColorPicker
QFrame
-
+
1
- UBColorPicker
+ UBCircleFrame
QFrame
-
+
1
diff --git a/resources/forms/preferences.ui b/resources/forms/preferences.ui
index 0ddcafe3..f179bbb8 100644
--- a/resources/forms/preferences.ui
+++ b/resources/forms/preferences.ui
@@ -14,6 +14,64 @@
Preferences
+ -
+
+
+ QFrame::NoFrame
+
+
+ QFrame::Raised
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ Default Settings
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
-
+
+
+ Close
+
+
+ true
+
+
+
+
+
+
+
+
-
@@ -24,7 +82,7 @@
-
- 6
+ 1
@@ -477,6 +535,300 @@
+
+
+ Grid
+
+
+
+ true
+
+
+
+ -1
+ -1
+ 741
+ 591
+
+
+
+ QFrame::NoFrame
+
+
+ QFrame::Raised
+
+
+
+
+ 0
+ 0
+ 741
+ 611
+
+
+
+ QFrame::StyledPanel
+
+
+ QFrame::Raised
+
+
+
+
+ 260
+ 30
+ 221
+ 50
+
+
+
+ QFrame::NoFrame
+
+
+ QFrame::Raised
+
+
+ -
+
+
+ On Dark Background
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 32
+ 32
+
+
+
+ QFrame::StyledPanel
+
+
+ QFrame::Raised
+
+
+
+
+
+
+
+
+ 0
+ 90
+ 741
+ 52
+
+
+
+ QFrame::NoFrame
+
+
+ QFrame::Raised
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 154
+ 20
+
+
+
+
+ -
+
+
+ Opacity
+
+
+
+ -
+
+
+ 20
+
+
+ 100
+
+
+ 50
+
+
+ Qt::Horizontal
+
+
+ QSlider::TicksAbove
+
+
+ 20
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 156
+ 20
+
+
+
+
+
+
+
+
+
+ 260
+ 150
+ 221
+ 51
+
+
+
+ QFrame::NoFrame
+
+
+ QFrame::Raised
+
+
+ -
+
+
+ On Light Background
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 32
+ 32
+
+
+
+ QFrame::StyledPanel
+
+
+ QFrame::Raised
+
+
+
+
+
+
+
+
+ 0
+ 210
+ 741
+ 52
+
+
+
+ QFrame::NoFrame
+
+
+ QFrame::Raised
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 154
+ 20
+
+
+
+
+ -
+
+
+ Opacity
+
+
+
+ -
+
+
+ 20
+
+
+ 100
+
+
+ 50
+
+
+ Qt::Horizontal
+
+
+ QSlider::TicksAbove
+
+
+ 20
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 156
+ 20
+
+
+
+
+
+
+
+
+
Pen
@@ -2657,7 +3009,7 @@ Public License instead of this License. But first, please read
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;">
<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:12pt; font-weight:600;">Translations</span></p>
<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;"><br /></span></p>
<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">A special thanks to:</span></p>
@@ -2751,7 +3103,7 @@ p, li { white-space: pre-wrap; }
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;">
<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
<tr>
<td style="border: none;">
@@ -2770,8 +3122,8 @@ p, li { white-space: pre-wrap; }
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">Case Postale 241</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">1211 Genève 8</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">Switzerland</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.openboard.ch"><span style=" font-family:'.Helvetica Neue DeskInterface'; font-size:11pt; text-decoration: underline; color:#0000ff;">openboard.ch</span></a></p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Helvetica Neue DeskInterface'; font-size:11pt; text-decoration: underline; color:#0000ff;"><br /></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.openboard.ch"><span style=" font-family:'.Helvetica Neue DeskInterface'; text-decoration: underline; color:#0000ff;">openboard.ch</span></a></p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Helvetica Neue DeskInterface'; text-decoration: underline; color:#0000ff;"><br /></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:10pt;">email: </span><a href="mailto:sem.logistique@edu.ge.ch"><span style=" font-family:'Cantarell'; font-size:10pt; text-decoration: underline; color:#0000ff;">sem.logistique@edu.ge.ch</span></a></p></td></tr></table></body></html>
@@ -2859,66 +3211,16 @@ p, li { white-space: pre-wrap; }
- -
-
-
- QFrame::NoFrame
-
-
- QFrame::Raised
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
- Default Settings
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
-
-
-
- Close
-
-
- true
-
-
-
-
-
-
-
-
+
+
+ UBColorPicker
+ QFrame
+
+ 1
+
+
mainTabWidget
useExternalBrowserCheckBox
diff --git a/src/core/UBPreferencesController.cpp b/src/core/UBPreferencesController.cpp
index 4c87c6ac..94041b37 100644
--- a/src/core/UBPreferencesController.cpp
+++ b/src/core/UBPreferencesController.cpp
@@ -39,6 +39,7 @@
#include "core/UBDisplayManager.h"
#include "board/UBBoardController.h"
+#include "domain/UBGraphicsScene.h"
#include "board/UBDrawingController.h"
#include "podcast/UBPodcastController.h"
@@ -76,6 +77,8 @@ UBPreferencesController::UBPreferencesController(QWidget *parent)
, mPreferencesUI(0)
, mPenProperties(0)
, mMarkerProperties(0)
+ , mDarkBackgroundGridColorPicker(0)
+ , mLightBackgroundGridColorPicker(0)
{
mDesktop = qApp->desktop();
mPreferencesWindow = new UBPreferencesDialog(this,parent, Qt::Dialog);
@@ -97,6 +100,10 @@ UBPreferencesController::~UBPreferencesController()
delete mPenProperties;
delete mMarkerProperties;
+
+ delete mDarkBackgroundGridColorPicker;
+
+ delete mLightBackgroundGridColorPicker;
}
void UBPreferencesController::adjustScreens(int screen)
@@ -149,6 +156,43 @@ void UBPreferencesController::wire()
connect(mPreferencesUI->verticalChoice, SIGNAL(clicked(bool)), this, SLOT(toolbarOrientationVertical(bool)));
connect(mPreferencesUI->toolbarDisplayTextCheckBox, SIGNAL(clicked(bool)), settings->appToolBarDisplayText, SLOT(setBool(bool)));
+ //grid tab
+ //On light background
+ QList gridLightBackgroundColors = settings->boardGridLightBackgroundColors->colors();
+ QColor selectedCrossColorLightBackground(settings->boardCrossColorLightBackground->get().toString());
+
+ mLightBackgroundGridColorPicker = new UBColorPicker(mPreferencesUI->crossColorLightBackgroundFrame);
+ mLightBackgroundGridColorPicker->setObjectName(QString::fromUtf8("crossColorLightBackgroundFrame"));
+ mLightBackgroundGridColorPicker->setMinimumSize(QSize(32, 32));
+ mLightBackgroundGridColorPicker->setFrameShape(QFrame::StyledPanel);
+ mLightBackgroundGridColorPicker->setFrameShadow(QFrame::Raised);
+
+ mPreferencesUI->crossColorLightBackgroundLayout->addWidget(mLightBackgroundGridColorPicker);
+ mLightBackgroundGridColorPicker->setColors(gridLightBackgroundColors);
+ mLightBackgroundGridColorPicker->setSelectedColorIndex(gridLightBackgroundColors.indexOf(selectedCrossColorLightBackground));
+ mPreferencesUI->lightBackgroundOpacitySlider->setValue(selectedCrossColorLightBackground.alpha()*100 / 255);
+
+ QObject::connect(mLightBackgroundGridColorPicker, SIGNAL(colorSelected(const QColor&)), this, SLOT(setCrossColorOnLightBackground(const QColor&)));
+ connect(mPreferencesUI->lightBackgroundOpacitySlider, SIGNAL(valueChanged(int)), this, SLOT(lightBackgroundCrossOpacityValueChanged(int)));
+
+ //On dark background
+ QList gridDarkBackgroundColors = settings->boardGridDarkBackgroundColors->colors();
+ QColor selectedCrossColorDarkBackground(settings->boardCrossColorDarkBackground->get().toString());
+
+ mDarkBackgroundGridColorPicker = new UBColorPicker(mPreferencesUI->crossColorDarkBackgroundFrame);
+ mDarkBackgroundGridColorPicker->setObjectName(QString::fromUtf8("crossColorDarkBackgroundFrame"));
+ mDarkBackgroundGridColorPicker->setMinimumSize(QSize(32, 32));
+ mDarkBackgroundGridColorPicker->setFrameShape(QFrame::StyledPanel);
+ mDarkBackgroundGridColorPicker->setFrameShadow(QFrame::Raised);
+
+ mPreferencesUI->crossColorDarkBackgroundLayout->addWidget(mDarkBackgroundGridColorPicker);
+ mDarkBackgroundGridColorPicker->setColors(gridDarkBackgroundColors);
+ mDarkBackgroundGridColorPicker->setSelectedColorIndex(gridDarkBackgroundColors.indexOf(selectedCrossColorDarkBackground));
+ mPreferencesUI->darkBackgroundOpacitySlider->setValue(selectedCrossColorDarkBackground.alpha()*100 / 255);
+
+ QObject::connect(mDarkBackgroundGridColorPicker, SIGNAL(colorSelected(const QColor&)), this, SLOT(setCrossColorOnDarkBackground(const QColor&)));
+ connect(mPreferencesUI->darkBackgroundOpacitySlider, SIGNAL(valueChanged(int)), this, SLOT(darkBackgroundCrossOpacityValueChanged(int)));
+
// pen
QList penLightBackgroundColors = settings->boardPenLightBackgroundColors->colors();
QList penDarkBackgroundColors = settings->boardPenDarkBackgroundColors->colors();
@@ -340,6 +384,54 @@ void UBPreferencesController::defaultSettings()
}
+void UBPreferencesController::darkBackgroundCrossOpacityValueChanged(int value)
+{
+ UBSettings* settings = UBSettings::settings();
+ int opacity = value * 255 / 100;
+
+ QList gridDarkBackgroundColors = settings->boardGridDarkBackgroundColors->colors();
+
+ int index = mDarkBackgroundGridColorPicker->selectedColorIndex();
+ QColor currentColor = gridDarkBackgroundColors.at(index);
+ currentColor.setAlpha(opacity);
+ gridDarkBackgroundColors.replace(index, currentColor);
+ mDarkBackgroundGridColorPicker->setColors(gridDarkBackgroundColors);
+
+ settings->boardGridDarkBackgroundColors->setColor(index, currentColor);
+
+ UBSettings::settings()->boardCrossColorDarkBackground->set(currentColor.name(QColor::HexArgb));
+
+ if (UBApplication::boardController && UBApplication::boardController->activeScene())
+ {
+ foreach(QGraphicsView* view, UBApplication::boardController->activeScene()->views())
+ view->resetCachedContent();
+ }
+}
+
+void UBPreferencesController::lightBackgroundCrossOpacityValueChanged(int value)
+{
+ UBSettings* settings = UBSettings::settings();
+ int opacity = value * 255 / 100;
+
+ QList gridLightBackgroundColors = settings->boardGridLightBackgroundColors->colors();
+
+ int index = mLightBackgroundGridColorPicker->selectedColorIndex();
+ QColor currentColor = gridLightBackgroundColors.at(index);
+ currentColor.setAlpha(opacity);
+ gridLightBackgroundColors.replace(index, currentColor);
+ mLightBackgroundGridColorPicker->setColors(gridLightBackgroundColors);
+
+ settings->boardGridLightBackgroundColors->setColor(index, currentColor);
+
+ UBSettings::settings()->boardCrossColorLightBackground->set(currentColor.name(QColor::HexArgb));
+
+ if (UBApplication::boardController && UBApplication::boardController->activeScene())
+ {
+ foreach(QGraphicsView* view, UBApplication::boardController->activeScene()->views())
+ view->resetCachedContent();
+ }
+}
+
void UBPreferencesController::penPreviewFromSizeChanged(int value)
{
UBSettings::settings()->setPenPreviewFromSize(value);
@@ -446,6 +538,31 @@ void UBPreferencesController::colorSelected(const QColor& color)
}
+void UBPreferencesController::setCrossColorOnDarkBackground(const QColor& color)
+{
+ UBSettings::settings()->boardCrossColorDarkBackground->set(color.name(QColor::HexArgb));
+
+ mPreferencesUI->darkBackgroundOpacitySlider->setValue(color.alpha() * 100 / 255);
+
+ if (UBApplication::boardController && UBApplication::boardController->activeScene())
+ {
+ foreach(QGraphicsView* view, UBApplication::boardController->activeScene()->views())
+ view->resetCachedContent();
+ }
+}
+
+void UBPreferencesController::setCrossColorOnLightBackground(const QColor& color)
+{
+ UBSettings::settings()->boardCrossColorLightBackground->set(color.name(QColor::HexArgb));
+
+ mPreferencesUI->lightBackgroundOpacitySlider->setValue(color.alpha() * 100 / 255);
+
+ if (UBApplication::boardController && UBApplication::boardController->activeScene())
+ {
+ foreach(QGraphicsView* view, UBApplication::boardController->activeScene()->views())
+ view->resetCachedContent();
+ }
+}
void UBPreferencesController::toolbarPositionChanged(bool checked)
{
diff --git a/src/core/UBPreferencesController.h b/src/core/UBPreferencesController.h
index ea4d8b32..b25fdbc7 100644
--- a/src/core/UBPreferencesController.h
+++ b/src/core/UBPreferencesController.h
@@ -47,7 +47,6 @@ namespace Ui
class UBBrushPropertiesFrame;
-
class UBPreferencesDialog : public QDialog
{
Q_OBJECT;
@@ -84,15 +83,21 @@ class UBPreferencesController : public QObject
Ui::preferencesDialog* mPreferencesUI;
UBBrushPropertiesFrame* mPenProperties;
UBBrushPropertiesFrame* mMarkerProperties;
+ UBColorPicker* mDarkBackgroundGridColorPicker;
+ UBColorPicker* mLightBackgroundGridColorPicker;
protected slots:
void close();
void defaultSettings();
void penPreviewFromSizeChanged(int value);
+ void darkBackgroundCrossOpacityValueChanged(int value);
+ void lightBackgroundCrossOpacityValueChanged(int value);
void widthSliderChanged(int value);
void opacitySliderChanged(int value);
void colorSelected(const QColor&);
+ void setCrossColorOnDarkBackground(const QColor& color);
+ void setCrossColorOnLightBackground(const QColor& color);
void toolbarPositionChanged(bool checked);
void toolbarOrientationVertical(bool checked);
void toolbarOrientationHorizontal(bool checked);
@@ -122,5 +127,4 @@ class UBBrushPropertiesFrame : public Ui::brushProperties
};
-
#endif /* UBPREFERENCESCONTROLLER_H_ */
diff --git a/src/core/UBSetting.cpp b/src/core/UBSetting.cpp
index 3340ea8f..b4fab800 100644
--- a/src/core/UBSetting.cpp
+++ b/src/core/UBSetting.cpp
@@ -105,13 +105,16 @@ UBColorListSetting::UBColorListSetting(UBSettings* owner, const QString& pDomain
: UBSetting(owner, pDomain, pKey, pDefaultValue)
, mAlpha(pAlpha)
{
+
foreach(QString s, get().toStringList())
{
QColor color;
color.setNamedColor(s);
- color.setAlphaF(mAlpha);
+ if (mAlpha>=0)
+ color.setAlphaF(mAlpha);
mColors.append(color);
}
+
}
UBColorListSetting::~UBColorListSetting()
@@ -129,7 +132,9 @@ QVariant UBColorListSetting::reset()
{
QColor color;
color.setNamedColor(s);
- color.setAlphaF(mAlpha);
+ if (mAlpha>=0)
+ color.setAlphaF(mAlpha);
+
mColors.append(color);
}
@@ -146,10 +151,15 @@ QList UBColorListSetting::colors() const
void UBColorListSetting::setColor(int pIndex, const QColor& color)
{
QStringList list = get().toStringList();
- list.replace(pIndex, color.name());
- QColor c = color;
- c.setAlphaF(mAlpha);
- mColors.replace(pIndex, c);
+ list.replace(pIndex, color.name(QColor::HexArgb));
+ if (mAlpha>=0)
+ {
+ QColor c = color;
+ c.setAlphaF(mAlpha);
+ mColors.replace(pIndex, c);
+ }
+ else
+ mColors.replace(pIndex, color);
set(list);
}
diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp
index 2b51e724..c8f4a29f 100644
--- a/src/core/UBSettings.cpp
+++ b/src/core/UBSettings.cpp
@@ -286,10 +286,17 @@ void UBSettings::init()
pageSize = new UBSetting(this, "Board", "DefaultPageSize", documentSizes.value(DocumentSizeRatio::Ratio4_3));
-
- boardCrossColorDarkBackground = new UBSetting(this, "Board", "CrossColorDarkBackground", "#C8C0C0C0");
+ boardCrossColorDarkBackground = new UBSetting(this, "Board", "CrossColorDarkBackground", "#C82C2C2C");
boardCrossColorLightBackground = new UBSetting(this, "Board", "CrossColorLightBackground", "#A5E1FF");
+ QStringList gridLightBackgroundColors;
+ gridLightBackgroundColors << "#FFFFFF" << "#FF3400" << "#66C0FF" << "#81FF5C" << "#FFFF00" << "#B68360" << "#FF497E" << "#8D69FF" << "#C82C2C2C";
+ boardGridLightBackgroundColors = new UBColorListSetting(this, "Board", "GridLightBackgroundColors", gridLightBackgroundColors, -1.0);
+
+ QStringList gridDarkBackgroundColors;
+ gridDarkBackgroundColors << "#000000" << "#FF0000" << "#004080" << "#008000" << "#FFDD00" << "#C87400" << "#800040" << "#008080" << "#A5E1FF";
+ boardGridDarkBackgroundColors = new UBColorListSetting(this, "Board", "GridDarkBackgroundColors", gridDarkBackgroundColors, -1.0);
+
QStringList penLightBackgroundColors;
penLightBackgroundColors << "#000000" << "#FF0000" <<"#004080" << "#008000" << "#FFDD00" << "#C87400" << "#800040" << "#008080" << "#5F2D0A" << "#FFFFFF";
boardPenLightBackgroundColors = new UBColorListSetting(this, "Board", "PenLightBackgroundColors", penLightBackgroundColors, 1.0);
diff --git a/src/core/UBSettings.h b/src/core/UBSettings.h
index e00c8e9c..91d6dc25 100644
--- a/src/core/UBSettings.h
+++ b/src/core/UBSettings.h
@@ -294,6 +294,9 @@ class UBSettings : public QObject
UBSetting* boardCrossColorDarkBackground;
UBSetting* boardCrossColorLightBackground;
+ UBColorListSetting* boardGridLightBackgroundColors;
+ UBColorListSetting* boardGridDarkBackgroundColors;
+
UBColorListSetting* boardPenLightBackgroundColors;
UBColorListSetting* boardPenLightBackgroundSelectedColors;