+ Add pipette icon

FreeCAD · Feb 8, 2014 · 4915564 · 4915564
1 parent 4e722e2
commit 4915564
Show file tree

Hide file tree

Showing 8 changed files with 232 additions and 58 deletions.
diff --git a/src/Mod/Inspection/Gui/Command.cpp b/src/Mod/Inspection/Gui/Command.cpp
@@ -77,7 +77,7 @@ CmdInspectElement::CmdInspectElement()
     sToolTipText  = "Get distance information";
     sWhatsThis    = "Inspection_InspectElement";
     sStatusTip    = sToolTipText;
-    sPixmap       = "mesh_pipette";
+    sPixmap       = "inspect_pipette";
 }
 
 void CmdInspectElement::activated(int iMsg)
@@ -89,7 +89,7 @@ void CmdInspectElement::activated(int iMsg)
         viewer->setEditing(true);
         viewer->setRedirectToSceneGraphEnabled(true);
         viewer->setRedirectToSceneGraph(true);
-        viewer->setEditingCursor(QCursor(Gui::BitmapFactory().pixmap("mesh_pipette"),4,29));
+        viewer->setEditingCursor(QCursor(Gui::BitmapFactory().pixmapFromSvg("inspect_pipette",QSize(32,32)),4,29));
         viewer->addEventCallback(SoButtonEvent::getClassTypeId(),
             InspectionGui::ViewProviderInspection::inspectCallback);
      }

diff --git a/src/Mod/Inspection/Gui/Resources/Inspection.qrc b/src/Mod/Inspection/Gui/Resources/Inspection.qrc
@@ -1,4 +1,5 @@
-<!DOCTYPE RCC><RCC version="1.0">
+<RCC>
     <qresource> 
+        <file>icons/inspect_pipette.svg</file>
     </qresource>
 </RCC> 
diff --git a/src/Mod/Inspection/Gui/Resources/icons/inspect_pipette.svg b/src/Mod/Inspection/Gui/Resources/icons/inspect_pipette.svg
diff --git a/src/Mod/Mesh/Gui/AppMeshGui.cpp b/src/Mod/Mesh/Gui/AppMeshGui.cpp
@@ -89,7 +89,6 @@ void MeshGuiExport initMeshGui()
 
     // Register icons
     Gui::BitmapFactory().addXPM("mesh_fillhole", mesh_fillhole);
-    Gui::BitmapFactory().addXPM("mesh_pipette", mesh_pipette);
 
     // instantiating the commands
     CreateMeshCommands();

diff --git a/src/Mod/Mesh/Gui/Command.cpp b/src/Mod/Mesh/Gui/Command.cpp
@@ -1179,7 +1179,7 @@ void CmdMeshEvaluateFacet::activated(int iMsg)
     if (view) {
         Gui::View3DInventorViewer* viewer = view->getViewer();
         viewer->setEditing(true);
-        viewer->setEditingCursor(QCursor(Gui::BitmapFactory().pixmap("mesh_pipette"),4,29));
+        viewer->setEditingCursor(QCursor(Gui::BitmapFactory().pixmapFromSvg("mesh_pipette",QSize(32,32)),4,29));
         viewer->addEventCallback(SoMouseButtonEvent::getClassTypeId(), MeshGui::ViewProviderMeshFaceSet::faceInfoCallback);
      }
 }

diff --git a/src/Mod/Mesh/Gui/Resources/Mesh.qrc b/src/Mod/Mesh/Gui/Resources/Mesh.qrc
@@ -2,6 +2,7 @@
     <qresource> 
         <file>icons/mesh_boundary.svg</file>
         <file>icons/mesh_cut.svg</file>
+        <file>icons/mesh_pipette.svg</file>
         <file>icons/Tree_Mesh.svg</file>
         <file>icons/Mesh_Curvature_Plot.svg</file>
         <file>icons/Mesh_Export_Mesh.svg</file>

diff --git a/src/Mod/Mesh/Gui/Resources/icons/mesh_pipette.svg b/src/Mod/Mesh/Gui/Resources/icons/mesh_pipette.svg
diff --git a/src/Mod/Mesh/Gui/images.h b/src/Mod/Mesh/Gui/images.h
@@ -37,56 +37,3 @@ static const char *mesh_fillhole[]={
 "................................",
 "................................"};
 
-/* XPM */
-static const char *mesh_pipette[]={
-"32 32 17 1",
-"# c #000000",
-"j c #080808",
-"b c #101010",
-"f c #1c1c1c",
-"g c #4c4c4c",
-"c c #777777",
-"a c #848484",
-"i c #9c9c9c",
-"l c #b9b9b9",
-"e c #cacaca",
-"n c #d6d6d6",
-"k c #dedede",
-"d c #e7e7e7",
-"m c #efefef",
-"h c #f7f7f7",
-"w c #ffffff",
-". c None",
-"................................",
-".....................#####......",
-"...................#######......",
-"...................#########....",
-"..................##########....",
-"..................##########....",
-"..................##########....",
-".................###########....",
-"...............#############....",
-".............###############....",
-".............#############......",
-".............#############......",
-"...............ab######.........",
-"..............cdef#####.........",
-".............ghdacf####.........",
-"............#ehiacj####.........",
-"............awiaaf####..........",
-"...........iheacf##.............",
-"..........#kdaag##..............",
-".........gedaacb#...............",
-".........lwiac##................",
-".......#amlaaf##................",
-".......cheaag#..................",
-"......#ndaag##..................",
-".....#imaacb#...................",
-".....iwlacf#....................",
-"....#nlaag##....................",
-"....feaagj#.....................",
-"....caag##......................",
-"....ffbj##......................",
-"................................",
-"................................"};
-