From 62c0a19071bba8ba24c2bf16253a1f843dc62c3b Mon Sep 17 00:00:00 2001
From: Yorik van Havre <yorik@uncreated.net>
Date: Thu, 13 Aug 2015 23:12:00 -0300
Subject: [PATCH] Added preferences setting for default App::Annotation color

---
 src/Gui/ViewProviderAnnotation.cpp          |  8 +++-
 src/Mod/Part/Gui/DlgSettingsObjectColor.cpp |  4 ++
 src/Mod/Part/Gui/DlgSettingsObjectColor.ui  | 53 ++++++++++++++++++++-
 3 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/src/Gui/ViewProviderAnnotation.cpp b/src/Gui/ViewProviderAnnotation.cpp
index 04683c172..4797cecc9 100644
--- a/src/Gui/ViewProviderAnnotation.cpp
+++ b/src/Gui/ViewProviderAnnotation.cpp
@@ -49,7 +49,9 @@
 #include "ViewProviderAnnotation.h"
 #include <App/Annotation.h>
 #include <App/PropertyGeo.h>
+#include <App/Application.h>
 #include <App/PropertyStandard.h>
+#include <Base/Parameter.h>
 #include <Gui/BitmapFactory.h>
 #include "SoFCSelection.h"
 #include "SoTextLabel.h"
@@ -66,7 +68,11 @@ PROPERTY_SOURCE(Gui::ViewProviderAnnotation, Gui::ViewProviderDocumentObject)
 
 ViewProviderAnnotation::ViewProviderAnnotation() 
 {
-    ADD_PROPERTY(TextColor,(1.0f,1.0f,1.0f));
+    ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View");
+    unsigned long col = hGrp->GetUnsigned("AnnotationTextColor",4294967295UL); // light grey
+    float r,g,b;
+    r = ((col >> 24) & 0xff) / 255.0; g = ((col >> 16) & 0xff) / 255.0; b = ((col >> 8) & 0xff) / 255.0;
+    ADD_PROPERTY(TextColor,(r,g,b));
     ADD_PROPERTY(Justification,((long)0));
     Justification.setEnums(JustificationEnums);
     ADD_PROPERTY(FontSize,(12));
diff --git a/src/Mod/Part/Gui/DlgSettingsObjectColor.cpp b/src/Mod/Part/Gui/DlgSettingsObjectColor.cpp
index 7032f6b62..31092d00b 100644
--- a/src/Mod/Part/Gui/DlgSettingsObjectColor.cpp
+++ b/src/Mod/Part/Gui/DlgSettingsObjectColor.cpp
@@ -60,6 +60,8 @@ void DlgSettingsObjectColor::saveSettings()
     DefaultShapeVertexColor->onSave();
     DefaultShapeVertexWidth->onSave();
     BoundingBoxColor->onSave();
+    // Annotations
+    AnnotationTextColor->onSave();
 }
 
 void DlgSettingsObjectColor::loadSettings()
@@ -71,6 +73,8 @@ void DlgSettingsObjectColor::loadSettings()
     DefaultShapeVertexColor->onRestore();
     DefaultShapeVertexWidth->onRestore();
     BoundingBoxColor->onRestore();
+    // Annotations
+    AnnotationTextColor->onRestore();
 }
 
 /**
diff --git a/src/Mod/Part/Gui/DlgSettingsObjectColor.ui b/src/Mod/Part/Gui/DlgSettingsObjectColor.ui
index 3272497a9..3bbf5d103 100644
--- a/src/Mod/Part/Gui/DlgSettingsObjectColor.ui
+++ b/src/Mod/Part/Gui/DlgSettingsObjectColor.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>359</width>
-    <height>282</height>
+    <width>332</width>
+    <height>331</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -242,6 +242,55 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Annotations</string>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <item>
+       <layout class="QGridLayout" name="gridLayout_2">
+        <item row="0" column="0">
+         <widget class="QLabel" name="label">
+          <property name="minimumSize">
+           <size>
+            <width>182</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>Default text color</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="Gui::PrefColorButton" name="AnnotationTextColor">
+          <property name="prefEntry" stdset="0">
+           <cstring>AnnotationTextColor</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>View</cstring>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer_2">
+        <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>
+    </widget>
+   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">