From 63b1742010f6b0764692d1f8a092949ae8876948 Mon Sep 17 00:00:00 2001
From: Craig Watson <craig@watsons.ch>
Date: Wed, 16 Dec 2015 14:16:00 +0100
Subject: [PATCH] Added a 5th pen color (yellow by default)

---
 resources/forms/mainWindow.ui            | 9 +++++++++
 src/board/UBBoardController.cpp          | 1 +
 src/core/UBSettings.cpp                  | 4 ++--
 src/desktop/UBDesktopPropertyPalette.cpp | 2 ++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/resources/forms/mainWindow.ui b/resources/forms/mainWindow.ui
index 552db21e..a56f509d 100644
--- a/resources/forms/mainWindow.ui
+++ b/resources/forms/mainWindow.ui
@@ -445,6 +445,15 @@
     <string>Color</string>
    </property>
   </action>
+  <action name="actionColor4">
+   <property name="icon">
+    <iconset resource="../OpenBoard.qrc">
+     <normaloff>:/images/toolbar/color.png</normaloff>:/images/toolbar/color.png</iconset>
+   </property>
+   <property name="text">
+    <string>Color</string>
+   </property>
+  </action>
   <action name="actionWebBack">
    <property name="icon">
     <iconset resource="../OpenBoard.qrc">
diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp
index ceb85256..99af72b7 100644
--- a/src/board/UBBoardController.cpp
+++ b/src/board/UBBoardController.cpp
@@ -291,6 +291,7 @@ void UBBoardController::setupToolbar()
     colorActions.append(mMainWindow->actionColor1);
     colorActions.append(mMainWindow->actionColor2);
     colorActions.append(mMainWindow->actionColor3);
+    colorActions.append(mMainWindow->actionColor4);
 
     UBToolbarButtonGroup *colorChoice =
             new UBToolbarButtonGroup(mMainWindow->boardToolBar, colorActions);
diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp
index 64595ce1..a076d664 100644
--- a/src/core/UBSettings.cpp
+++ b/src/core/UBSettings.cpp
@@ -45,7 +45,7 @@ QPointer<UBSettings> UBSettings::sSingleton = 0;
 
 int UBSettings::pointerDiameter = 40;
 int UBSettings::crossSize = 32;
-int UBSettings::colorPaletteSize = 4;
+int UBSettings::colorPaletteSize = 5;
 int UBSettings::objectFrameWidth = 20;
 int UBSettings::boardMargin = 10;
 
@@ -265,7 +265,7 @@ void UBSettings::init()
     pageDpi = new UBSetting(this, "Board", "pageDpi", 0);
 
     QStringList penLightBackgroundColors;
-    penLightBackgroundColors << "#000000" << "#FF0000" <<"#004080" << "#008000" << "#C87400" << "#800040" << "#008080"  << "#5F2D0A";
+    penLightBackgroundColors << "#000000" << "#FF0000" <<"#004080" << "#008000" << "#FFFF00" << "#C87400" << "#800040" << "#008080"  << "#5F2D0A";
     boardPenLightBackgroundColors = new UBColorListSetting(this, "Board", "PenLightBackgroundColors", penLightBackgroundColors, 1.0);
 
     QStringList penDarkBackgroundColors;
diff --git a/src/desktop/UBDesktopPropertyPalette.cpp b/src/desktop/UBDesktopPropertyPalette.cpp
index d44b6bb6..6a65c43c 100644
--- a/src/desktop/UBDesktopPropertyPalette.cpp
+++ b/src/desktop/UBDesktopPropertyPalette.cpp
@@ -55,6 +55,7 @@ UBDesktopPenPalette::UBDesktopPenPalette(QWidget *parent, UBRightPalette* rightP
     colorActions.append(UBApplication::mainWindow->actionColor1);
     colorActions.append(UBApplication::mainWindow->actionColor2);
     colorActions.append(UBApplication::mainWindow->actionColor3);
+    colorActions.append(UBApplication::mainWindow->actionColor4);
 
     UBToolbarButtonGroup *colorChoice =
             new UBToolbarButtonGroup(UBApplication::mainWindow->boardToolBar, colorActions);
@@ -151,6 +152,7 @@ UBDesktopMarkerPalette::UBDesktopMarkerPalette(QWidget *parent, UBRightPalette*
     colorActions.append(UBApplication::mainWindow->actionColor1);
     colorActions.append(UBApplication::mainWindow->actionColor2);
     colorActions.append(UBApplication::mainWindow->actionColor3);
+    colorActions.append(UBApplication::mainWindow->actionColor4);
 
     UBToolbarButtonGroup *colorChoice = new UBToolbarButtonGroup(UBApplication::mainWindow->boardToolBar, colorActions);
     colorChoice->displayText(false);