From: dbv <dbv@opencascade.com>
Date: Fri, 19 Feb 2016 15:03:37 +0000 (+0300)
Subject: Icons update and new icons from ABA
X-Git-Tag: V_2.2.0~84
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=64d34f561da9d38c1551d18a752cb05711e33128;p=modules%2Fshaper.git

Icons update and new icons from ABA
---

diff --git a/src/PartSet/PartSet_icons.qrc b/src/PartSet/PartSet_icons.qrc
index 30e6b1b35..150fffa4f 100644
--- 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 7c1fc4907..d7ed5b227 100644
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 d7621a943..6a8b7e7fa 100644
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 18c6dbe26..d96834f31 100644
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
index 000000000..bba96f48c
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
index 000000000..ffb88f8a7
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 98d1b6383..af1252161 100644
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
index 000000000..a80ce7fd5
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 cd6aa5c97..a00d1a263 100644
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
index 000000000..af485dbf7
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 2f831b59f..e1b858476 100644
--- 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 9e6925a41..692f569d6 100644
--- 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
index 000000000..aecfa4913
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
index 000000000..cfcb5e1ee
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
index 000000000..87b855649
Binary files /dev/null and b/src/XGUI/pictures/wire.png differ