Commit 9f3fa2fa authored by Craig Watson's avatar Craig Watson

Added settings for showing (or not) the eraser and highlighter preview circles

parent 35000fe7
...@@ -305,6 +305,9 @@ void UBSettings::init() ...@@ -305,6 +305,9 @@ void UBSettings::init()
boardMarkerLightBackgroundSelectedColors = new UBColorListSetting(this, "Board", "MarkerLightBackgroundSelectedColors", markerLightBackgroundSelectedColors, boardMarkerAlpha->get().toDouble()); boardMarkerLightBackgroundSelectedColors = new UBColorListSetting(this, "Board", "MarkerLightBackgroundSelectedColors", markerLightBackgroundSelectedColors, boardMarkerAlpha->get().toDouble());
boardMarkerDarkBackgroundSelectedColors = new UBColorListSetting(this, "Board", "MarkerDarkBackgroundSelectedColors", markerDarkBackgroundSelectedColors, boardMarkerAlpha->get().toDouble()); boardMarkerDarkBackgroundSelectedColors = new UBColorListSetting(this, "Board", "MarkerDarkBackgroundSelectedColors", markerDarkBackgroundSelectedColors, boardMarkerAlpha->get().toDouble());
showEraserPreviewCircle = new UBSetting(this, "Board", "ShowEraserPreviewCircle", true);
showMarkerPreviewCircle = new UBSetting(this, "Board", "ShowMarkerPreviewCircle", true);
webUseExternalBrowser = new UBSetting(this, "Web", "UseExternalBrowser", false); webUseExternalBrowser = new UBSetting(this, "Web", "UseExternalBrowser", false);
bool defaultShowPageImmediatelyOnMirroredScreen = true; bool defaultShowPageImmediatelyOnMirroredScreen = true;
......
...@@ -282,6 +282,9 @@ class UBSettings : public QObject ...@@ -282,6 +282,9 @@ class UBSettings : public QObject
UBColorListSetting* boardMarkerDarkBackgroundColors; UBColorListSetting* boardMarkerDarkBackgroundColors;
UBColorListSetting* boardMarkerDarkBackgroundSelectedColors; UBColorListSetting* boardMarkerDarkBackgroundSelectedColors;
UBSetting* showEraserPreviewCircle;
UBSetting* showMarkerPreviewCircle;
UBSetting* webUseExternalBrowser; UBSetting* webUseExternalBrowser;
UBSetting* webShowPageImmediatelyOnMirroredScreen; UBSetting* webShowPageImmediatelyOnMirroredScreen;
......
...@@ -2529,6 +2529,7 @@ void UBGraphicsScene::setDocumentUpdated() ...@@ -2529,6 +2529,7 @@ void UBGraphicsScene::setDocumentUpdated()
void UBGraphicsScene::createEraiser() void UBGraphicsScene::createEraiser()
{ {
if (UBSettings::settings()->showEraserPreviewCircle->get().toBool()) {
mEraser = new QGraphicsEllipseItem(); // mem : owned and destroyed by the scene mEraser = new QGraphicsEllipseItem(); // mem : owned and destroyed by the scene
mEraser->setRect(QRect(0, 0, 0, 0)); mEraser->setRect(QRect(0, 0, 0, 0));
mEraser->setVisible(false); mEraser->setVisible(false);
...@@ -2538,7 +2539,7 @@ void UBGraphicsScene::createEraiser() ...@@ -2538,7 +2539,7 @@ void UBGraphicsScene::createEraiser()
mTools << mEraser; mTools << mEraser;
addItem(mEraser); addItem(mEraser);
}
} }
void UBGraphicsScene::createPointer() void UBGraphicsScene::createPointer()
...@@ -2559,6 +2560,7 @@ void UBGraphicsScene::createPointer() ...@@ -2559,6 +2560,7 @@ void UBGraphicsScene::createPointer()
void UBGraphicsScene::createMarkerCircle() void UBGraphicsScene::createMarkerCircle()
{ {
if (UBSettings::settings()->showMarkerPreviewCircle->get().toBool()) {
mMarkerCircle = new QGraphicsEllipseItem(); mMarkerCircle = new QGraphicsEllipseItem();
mMarkerCircle->setRect(QRect(0, 0, 0, 0)); mMarkerCircle->setRect(QRect(0, 0, 0, 0));
...@@ -2571,6 +2573,7 @@ void UBGraphicsScene::createMarkerCircle() ...@@ -2571,6 +2573,7 @@ void UBGraphicsScene::createMarkerCircle()
mTools << mMarkerCircle; mTools << mMarkerCircle;
addItem(mMarkerCircle); addItem(mMarkerCircle);
}
} }
void UBGraphicsScene::setToolCursor(int tool) void UBGraphicsScene::setToolCursor(int tool)
......
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