#3764 Add annotation related icons

ApplicationCode/Commands/AnnotationCommands/RicCreateReachCircleAnnotationFeature.cpp

@@ -70,7 +70,7 @@ void RicCreateReachCircleAnnotationFeature::onActionTriggered(bool isChecked)
 //--------------------------------------------------------------------------------------------------
 void RicCreateReachCircleAnnotationFeature::setupActionLook(QAction* actionToSetup)
 {
-    actionToSetup->setIcon(QIcon(":/Plus.png"));
+    actionToSetup->setIcon(QIcon(":/ReachCircle16x16.png"));
     actionToSetup->setText("Create Reach Circle Annotation");
 }
 

ApplicationCode/Commands/AnnotationCommands/RicCreateTextAnnotationFeature.cpp

@@ -69,7 +69,7 @@ void RicCreateTextAnnotationFeature::onActionTriggered(bool isChecked)
 //--------------------------------------------------------------------------------------------------
 void RicCreateTextAnnotationFeature::setupActionLook(QAction* actionToSetup)
 {
-    actionToSetup->setIcon(QIcon(":/Plus.png"));
+    actionToSetup->setIcon(QIcon(":/TextAnnotation16x16.png"));
     actionToSetup->setText("Create Text Annotation");
 }
 

ApplicationCode/Commands/AnnotationCommands/RicImportPolylinesAnnotationFeature.cpp

@@ -88,6 +88,6 @@ void RicImportPolylinesAnnotationFeature::onActionTriggered(bool isChecked)
 //--------------------------------------------------------------------------------------------------
 void RicImportPolylinesAnnotationFeature::setupActionLook(QAction* actionToSetup)
 {
-    actionToSetup->setIcon(QIcon(":/FormationCollection16x16.png"));
+    actionToSetup->setIcon(QIcon(":/PolylinesFromFile16x16.png"));
     actionToSetup->setText("Import Poly Lines Annotation");
 }

ApplicationCode/ProjectDataModel/Annotations/RimAnnotationCollection.cpp

@@ -42,7 +42,7 @@ CAF_PDM_SOURCE_INIT(RimAnnotationCollection, "RimAnnotationCollection");
 //--------------------------------------------------------------------------------------------------
 RimAnnotationCollection::RimAnnotationCollection()
 {
-    CAF_PDM_InitObject("Annotations", ":/WellCollection.png", "", "");
+    CAF_PDM_InitObject("Annotations", ":/Annotations16x16.png", "", "");
 
     CAF_PDM_InitFieldNoDefault(&m_reachCircleAnnotations, "ReachCircleAnnotations", "Reach Circle Annotations", "", "", "");
     m_reachCircleAnnotations.uiCapability()->setUiHidden(true);

ApplicationCode/ProjectDataModel/Annotations/RimAnnotationInViewCollection.cpp

@@ -32,7 +32,7 @@ CAF_PDM_SOURCE_INIT(RimAnnotationInViewCollection, "Annotations");
 //--------------------------------------------------------------------------------------------------
 RimAnnotationInViewCollection::RimAnnotationInViewCollection()
 {
-    CAF_PDM_InitObject("Annotations", ":/Plus.png", "", "");
+    CAF_PDM_InitObject("Annotations", ":/Annotations16x16.png", "", "");
 
     CAF_PDM_InitField(&m_isActive, "Active", true, "Active", "", "", "");
     m_isActive.uiCapability()->setUiHidden(true);

ApplicationCode/ProjectDataModel/Annotations/RimLineBasedAnnotation.cpp

@@ -33,10 +33,9 @@ RimLineBasedAnnotation::RimLineBasedAnnotation()
     m_appearance = new RimAnnotationLineAppearance();
     m_appearance.uiCapability()->setUiTreeHidden(true);
     m_appearance.uiCapability()->setUiTreeChildrenHidden(true);
+
     CAF_PDM_InitField(&m_isActive, "IsActive", true, "Is Active", "", "", "");
     m_isActive.uiCapability()->setUiHidden(true);
-
-
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/Annotations/RimPolylinesAnnotation.h

@@ -39,8 +39,6 @@ public:
     RimPolylinesAnnotation();
     ~RimPolylinesAnnotation();
 
-
     virtual cvf::ref<RigPolyLinesData> polyLinesData() = 0;
     virtual bool isEmpty() = 0;
-
 };

ApplicationCode/ProjectDataModel/Annotations/RimPolylinesFromFileAnnotation.cpp

@@ -36,7 +36,7 @@ CAF_PDM_SOURCE_INIT(RimPolylinesFromFileAnnotation, "PolylinesFromFileAnnotation
 //--------------------------------------------------------------------------------------------------
 RimPolylinesFromFileAnnotation::RimPolylinesFromFileAnnotation()
 {
-    CAF_PDM_InitObject("PolyLines Annotation", ":/WellCollection.png", "", "");
+    CAF_PDM_InitObject("PolyLines Annotation", ":/PolylinesFromFile16x16.png", "", "");
 
     CAF_PDM_InitFieldNoDefault(&m_polyLinesFileName, "PolyLineFilePath", "File", "", "", "");
     CAF_PDM_InitField(&m_userDescription, "PolyLineDescription", QString(""), "Name", "", "", "");

ApplicationCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.cpp

@@ -32,7 +32,7 @@ CAF_PDM_SOURCE_INIT(RimReachCircleAnnotation, "RimReachCircleAnnotation");
 //--------------------------------------------------------------------------------------------------
 RimReachCircleAnnotation::RimReachCircleAnnotation()
 {
-    CAF_PDM_InitObject("CircleAnnotation", ":/WellCollection.png", "", "");
+    CAF_PDM_InitObject("CircleAnnotation", ":/ReachCircle16x16.png", "", "");
 
     CAF_PDM_InitField(&m_centerPointXyd, "CenterPointXyd", Vec3d::ZERO, "Center Point", "", "", "");
     CAF_PDM_InitField(&m_radius, "Radius", 0.0, "Radius", "", "", "");

ApplicationCode/ProjectDataModel/Annotations/RimTextAnnotation.cpp

@@ -32,7 +32,7 @@ CAF_PDM_SOURCE_INIT(RimTextAnnotation, "RimTextAnnotation");
 //--------------------------------------------------------------------------------------------------
 RimTextAnnotation::RimTextAnnotation()
 {
-    CAF_PDM_InitObject("TextAnnotation", ":/WellCollection.png", "", "");
+    CAF_PDM_InitObject("TextAnnotation", ":/TextAnnotation16x16.png", "", "");
 
     CAF_PDM_InitField(&m_anchorPointXyd, "AnchorPointXyd", Vec3d::ZERO, "Anchor Point", "", "", "");
     CAF_PDM_InitField(&m_labelPointXyd, "LabelPointXyd", Vec3d::ZERO, "Label Point", "", "", "");

ApplicationCode/Resources/ResInsight.qrc

@@ -140,6 +140,11 @@
     <file>ToggleOnOff16x16.png</file>
     <file>ToggleOnOthersOff16x16.png</file>
     <file>ExportCompletionsSymbol16x16.png</file>
+    <file>TextAnnotation16x16.png</file>
+    <file>Annotations16x16.png</file>
+    <file>PolylinesFromFile16x16.png</file>
+    <file>ReachCircle16x16.png</file>
+
   </qresource>
   <qresource prefix="/Shader/">
     <file>fs_CellFace.glsl</file>