Icons update and new icons from ABA

diff --git a/src/PartSet/PartSet_icons.qrc b/src/PartSet/PartSet_icons.qrc
index 30e6b1b354dee44d9b0012aed510a2a72d6e7735..150fffa4f01355654e0636c947055926db0f97f9 100644 (file)
--- a/src/PartSet/PartSet_icons.qrc
+++ b/src/PartSet/PartSet_icons.qrc
@@ -90,5 +90,8 @@
      <file>icons/collinear.png</file>
      <file>icons/middlepoint.png</file>
      <file>icons/rectangle.png</file>
+     <file>icons/intersection_point.png</file>
+     <file>icons/intersection.png</file>
+     <file>icons/move_to_end.png</file>
  </qresource>
  </RCC>

diff --git a/src/PartSet/icons/circle_3pt_32x32.png b/src/PartSet/icons/circle_3pt_32x32.png
index 7c1fc490728139983d36888a4b1584c7bef35cf6..d7ed5b227843d4258cb204653f08ac29e84e8e8b 100644 (file)
Binary files a/src/PartSet/icons/circle_3pt_32x32.png and b/src/PartSet/icons/circle_3pt_32x32.png differ

diff --git a/src/PartSet/icons/circle_pt_rad_32x32.png b/src/PartSet/icons/circle_pt_rad_32x32.png
index d7621a943cbf8d1354e8e59353f22cae6a1029a2..6a8b7e7fac98e3c9cad375968b50b3dc335c8943 100644 (file)
Binary files a/src/PartSet/icons/circle_pt_rad_32x32.png and b/src/PartSet/icons/circle_pt_rad_32x32.png differ

diff --git a/src/PartSet/icons/collinear.png b/src/PartSet/icons/collinear.png
index 18c6dbe26e2444d691b7802e22735c00b5274c76..d96834f31fab79cd21e1113543aa8178b657fa1f 100644 (file)
Binary files a/src/PartSet/icons/collinear.png and b/src/PartSet/icons/collinear.png differ

diff --git a/src/PartSet/icons/intersection.png b/src/PartSet/icons/intersection.png
new file mode 100644 (file)
index 0000000..bba96f4
Binary files /dev/null and b/src/PartSet/icons/intersection.png differ

diff --git a/src/PartSet/icons/intersection_point.png b/src/PartSet/icons/intersection_point.png
new file mode 100644 (file)
index 0000000..ffb88f8
Binary files /dev/null and b/src/PartSet/icons/intersection_point.png differ

diff --git a/src/PartSet/icons/middlepoint.png b/src/PartSet/icons/middlepoint.png
index 98d1b6383661987b0f1460aefcbc7c6756483a7f..af1252161e0d28dbd966b5dd5bee2f4a4fe33314 100644 (file)
Binary files a/src/PartSet/icons/middlepoint.png and b/src/PartSet/icons/middlepoint.png differ

diff --git a/src/PartSet/icons/move_to_end.png b/src/PartSet/icons/move_to_end.png
new file mode 100644 (file)
index 0000000..a80ce7f
Binary files /dev/null and b/src/PartSet/icons/move_to_end.png differ

diff --git a/src/PartSet/icons/shape_group.png b/src/PartSet/icons/shape_group.png
index cd6aa5c97516315ba10fa43e684e11d42b4eaace..a00d1a263fa449024edce67256d7c37d943c84d5 100644 (file)
Binary files a/src/PartSet/icons/shape_group.png and b/src/PartSet/icons/shape_group.png differ

diff --git a/src/PartSet/icons/source_for_extrusion.png b/src/PartSet/icons/source_for_extrusion.png
new file mode 100644 (file)
index 0000000..af485db
Binary files /dev/null and b/src/PartSet/icons/source_for_extrusion.png differ

diff --git a/src/XGUI/XGUI_ContextMenuMgr.cpp b/src/XGUI/XGUI_ContextMenuMgr.cpp
index 2f831b59fc0b6f6a3c100df2641aba348e6b25f5..e1b8584766d9865eb70e67d9ee6c6de6354c2363 100644 (file)
--- a/src/XGUI/XGUI_ContextMenuMgr.cpp
+++ b/src/XGUI/XGUI_ContextMenuMgr.cpp
@@ -71,7 +71,7 @@ void XGUI_ContextMenuMgr::createActions()
   aAction = new QAction(QIcon(":pictures/move.png"), XGUI_Workshop::MOVE_TO_END_COMMAND, this);
   addAction("MOVE_CMD", aAction);
 
-  aAction = new QAction(QIcon(":pictures/delete.png"), tr("Clean history"), this);
+  aAction = new QAction(QIcon(":pictures/clean_history.png"), tr("Clean history"), this);
   addAction("CLEAN_HISTORY_CMD", aAction);
 
   aAction = new QAction(QIcon(":pictures/color.png"), tr("Color..."), this);

diff --git a/src/XGUI/XGUI_pictures.qrc b/src/XGUI/XGUI_pictures.qrc
index 9e6925a41e9ddf5db30cbb4f5fa692799c01cd3a..692f569d6e180d63fc79f9b2dfb9b959ff158409 100644 (file)
--- a/src/XGUI/XGUI_pictures.qrc
+++ b/src/XGUI/XGUI_pictures.qrc
@@ -9,7 +9,7 @@
      <file>pictures/rebuild.png</file>
      <file>pictures/preferences.png</file>
      <file>pictures/copy.png</file>
-     
+
      <file>pictures/params_folder.png</file>
      <file>pictures/constr_folder.png</file>
      <file>pictures/constr_object.png</file>
@@ -19,7 +19,7 @@
      <file>pictures/properties.png</file>
      <file>pictures/features.png</file>
      <file>pictures/point_ico.png</file>
-     
+
      <file>pictures/x_point.png</file>
      <file>pictures/y_point.png</file>
      <file>pictures/z_point.png</file>
@@ -32,20 +32,21 @@
      <file>pictures/button_ok.png</file>
      <file>pictures/button_ok_error.png</file>
      <file>pictures/button_plus.png</file>
-   
+
      <file>pictures/assembly.png</file>
      <file>pictures/delete.png</file>
      <file>pictures/rename_edit.png</file>
      <file>pictures/eye_pencil.png</file>
      <file>pictures/eye_pencil_closed.png</file>
-   
+     <file>pictures/clean_history.png</file>
+
      <file>pictures/view_prefs.png</file>
      <file>pictures/module.png</file>
      <file>pictures/shading.png</file>
      <file>pictures/wireframe.png</file>
      <file>pictures/expression.png</file>
      <file>pictures/arrow.png</file>
-   
+
      <file>pictures/solid.png</file>
      <file>pictures/compsolid.png</file>
      <file>pictures/compoundofsolids.png</file>
@@ -53,5 +54,7 @@
      <file>pictures/vertex.png</file>
      <file>pictures/face.png</file>
      <file>pictures/compound.png</file>
+     <file>pictures/shell.png</file>
+     <file>pictures/wire.png</file>
  </qresource>
  </RCC>

diff --git a/src/XGUI/pictures/clean_history.png b/src/XGUI/pictures/clean_history.png
new file mode 100644 (file)
index 0000000..aecfa49
Binary files /dev/null and b/src/XGUI/pictures/clean_history.png differ

diff --git a/src/XGUI/pictures/shell.png b/src/XGUI/pictures/shell.png
new file mode 100644 (file)
index 0000000..cfcb5e1
Binary files /dev/null and b/src/XGUI/pictures/shell.png differ

diff --git a/src/XGUI/pictures/wire.png b/src/XGUI/pictures/wire.png
new file mode 100644 (file)
index 0000000..87b8556
Binary files /dev/null and b/src/XGUI/pictures/wire.png differ