diff --git a/resources/Makefile.am b/resources/Makefile.am index 338af7a15..da21b6088 100644 --- a/resources/Makefile.am +++ b/resources/Makefile.am @@ -178,7 +178,9 @@ dist_salomeres_DATA = \ scale_along_axes.png \ split_into_tetra.png \ mesh_duplicate_nodes.png \ - mesh_duplicate_nodes_with_elem.png + mesh_duplicate_nodes_with_elem.png \ + mesh_bounding_box.png \ + mesh_min_dist.png # VSR: little trick to avoid putting if SMESHCatalog.xml to the distribution archive nodist_salomeres_SCRIPTS = SMESHCatalog.xml diff --git a/resources/mesh_bounding_box.png b/resources/mesh_bounding_box.png new file mode 100755 index 000000000..f01bae8b0 Binary files /dev/null and b/resources/mesh_bounding_box.png differ diff --git a/resources/mesh_min_dist.png b/resources/mesh_min_dist.png new file mode 100755 index 000000000..6713caf0a Binary files /dev/null and b/resources/mesh_min_dist.png differ diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx index 9a83e9be2..48a44fd6e 100644 --- a/src/SMESHGUI/SMESHGUI.cxx +++ b/src/SMESHGUI/SMESHGUI.cxx @@ -3248,8 +3248,8 @@ void SMESHGUI::initialize( CAM_Application* app ) createSMESHAction( 1137, "DISABLE_AUTO_COLOR" ); createSMESHAction( 2000, "CTRL" ); - createSMESHAction( 501, "MEASURE_MIN_DIST" ); - createSMESHAction( 502, "MEASURE_BND_BOX" ); + createSMESHAction( 501, "MEASURE_MIN_DIST", "ICON_MEASURE_MIN_DIST" ); + createSMESHAction( 502, "MEASURE_BND_BOX", "ICON_MEASURE_BND_BOX" ); createSMESHAction( 300, "ERASE" ); createSMESHAction( 301, "DISPLAY" ); diff --git a/src/SMESHGUI/SMESHGUI_Measurements.cxx b/src/SMESHGUI/SMESHGUI_Measurements.cxx index ffc3fe32c..b07c08dc4 100644 --- a/src/SMESHGUI/SMESHGUI_Measurements.cxx +++ b/src/SMESHGUI/SMESHGUI_Measurements.cxx @@ -1098,17 +1098,19 @@ SMESHGUI_MeasureDlg::SMESHGUI_MeasureDlg( QWidget* parent, int page ) setWindowTitle( tr( "MEASUREMENTS" ) ); setSizeGripEnabled( true ); + SUIT_ResourceMgr* resMgr = SMESHGUI::resourceMgr(); + myTabWidget = new QTabWidget( this ); // min distance myMinDist = new SMESHGUI_MinDistance( myTabWidget ); - myTabWidget->addTab( myMinDist, tr( "MIN_DIST" ) ); + myTabWidget->addTab( myMinDist, resMgr->loadPixmap( "SMESH", tr( "ICON_MEASURE_MIN_DIST" ) ), tr( "MIN_DIST" ) ); // bounding box myBndBox = new SMESHGUI_BoundingBox( myTabWidget ); - myTabWidget->addTab( myBndBox, tr( "BND_BOX" ) ); + myTabWidget->addTab( myBndBox, resMgr->loadPixmap( "SMESH", tr( "ICON_MEASURE_BND_BOX" ) ), tr( "BND_BOX" ) ); // buttons QPushButton* okBtn = new QPushButton( tr( "SMESH_BUT_OK" ), this ); diff --git a/src/SMESHGUI/SMESH_images.ts b/src/SMESHGUI/SMESH_images.ts index b25d5a457..856e88f32 100644 --- a/src/SMESHGUI/SMESH_images.ts +++ b/src/SMESHGUI/SMESH_images.ts @@ -485,5 +485,13 @@ ICON_SPLIT_TO_TETRA split_into_tetra.png + + ICON_MEASURE_MIN_DIST + mesh_min_dist.png + + + ICON_MEASURE_BND_BOX + mesh_bounding_box.png +