diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index f4613118b..eb36582fa 100644
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml.in
@@ -111,9 +111,9 @@
diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts
index d19174cc9..13449596d 100644
--- a/src/GEOMGUI/GEOM_msg_en.ts
+++ b/src/GEOMGUI/GEOM_msg_en.ts
@@ -4008,54 +4008,6 @@ Please, select face, shell or solid and try again
TOM_X
X
-
- TOOL_BASIC
- Basic
-
-
- TOOL_BLOCKS
- Blocks
-
-
- TOOL_BOOLEAN
- Boolean operations
-
-
- TOOL_FEATURES
- Modification
-
-
- TOOL_GENERATION
- Generation
-
-
- TOOL_PRIMITIVES
- Primitives
-
-
- TOOL_TRANSFORMATION
- Transformation
-
-
- TOOL_BUILD
- Build
-
-
- TOOL_OPERATIONS
- Operations
-
-
- TOOL_PICTURES
- Pictures
-
-
- TOOL_ADVANCED
- Advanced
-
-
- TOOL_MEASURES
- Measures
-
TOP_ARC
Create an arc
@@ -5181,10 +5133,6 @@ Ignoring units will cause model scaling (as dimensions are supposed to be specif
MEN_IMPORTEXPORT
Import / Export XAO
-
- TOOL_IMPORTEXPORT
- Import / Export XAO
-
TOP_EXPORTXAO
Export to XAO
@@ -5238,6 +5186,61 @@ Ignoring units will cause model scaling (as dimensions are supposed to be specif
X=%1, Y=%2, Z=%3
+
+ GeometryGUI
+
+ TOOL_BASIC
+ Basic
+
+
+ TOOL_BLOCKS
+ Blocks
+
+
+ TOOL_BOOLEAN
+ Boolean operations
+
+
+ TOOL_FEATURES
+ Modification
+
+
+ TOOL_GENERATION
+ Generation
+
+
+ TOOL_PRIMITIVES
+ Primitives
+
+
+ TOOL_TRANSFORMATION
+ Transformation
+
+
+ TOOL_BUILD
+ Build
+
+
+ TOOL_OPERATIONS
+ Operations
+
+
+ TOOL_PICTURES
+ Pictures
+
+
+ TOOL_ADVANCED
+ Advanced
+
+
+ TOOL_MEASURES
+ Measures
+
+
+ TOOL_IMPORTEXPORT
+ Import / Export XAO
+
+
BasicGUI_CurveDlg
diff --git a/src/GEOMGUI/GEOM_msg_fr.ts b/src/GEOMGUI/GEOM_msg_fr.ts
index af43089e2..6a506ac76 100644
--- a/src/GEOMGUI/GEOM_msg_fr.ts
+++ b/src/GEOMGUI/GEOM_msg_fr.ts
@@ -3996,54 +3996,6 @@ Choisissez une face, une coque ou un solide et essayez de nouveau
TOM_X
X
-
- TOOL_BASIC
- Objets de base
-
-
- TOOL_BLOCKS
- Blocs
-
-
- TOOL_BOOLEAN
- Opérations booléennes
-
-
- TOOL_FEATURES
- Modification
-
-
- TOOL_GENERATION
- Génération
-
-
- TOOL_PRIMITIVES
- Primitives
-
-
- TOOL_TRANSFORMATION
- Transformation
-
-
- TOOL_BUILD
- Construire
-
-
- TOOL_OPERATIONS
- Opérations
-
-
- TOOL_PICTURES
- Images
-
-
- TOOL_ADVANCED
- Avancé
-
-
- TOOL_MEASURES
- Informations
-
TOP_ARC
Créer un arc
@@ -5165,10 +5117,6 @@ le paramètre '%1' aux préférences du module Géométrie.MEN_IMPORTEXPORT
Import / Export XAO
-
- TOOL_IMPORTEXPORT
- Import / Export XAO
-
TOP_EXPORTXAO
Export XAO
@@ -5222,6 +5170,61 @@ le paramètre '%1' aux préférences du module Géométrie.X=%1, Y=%2, Z=%3
+
+ GeometryGUI
+
+ TOOL_BASIC
+ Objets de base
+
+
+ TOOL_BLOCKS
+ Blocs
+
+
+ TOOL_BOOLEAN
+ Opérations booléennes
+
+
+ TOOL_FEATURES
+ Modification
+
+
+ TOOL_GENERATION
+ Génération
+
+
+ TOOL_PRIMITIVES
+ Primitives
+
+
+ TOOL_TRANSFORMATION
+ Transformation
+
+
+ TOOL_BUILD
+ Construire
+
+
+ TOOL_OPERATIONS
+ Opérations
+
+
+ TOOL_PICTURES
+ Images
+
+
+ TOOL_ADVANCED
+ Avancé
+
+
+ TOOL_MEASURES
+ Informations
+
+
+ TOOL_IMPORTEXPORT
+ Import / Export XAO
+
+
BasicGUI_CurveDlg
diff --git a/src/GEOMGUI/GEOM_msg_ja.ts b/src/GEOMGUI/GEOM_msg_ja.ts
index 2d39d9f4d..25a9bff66 100644
--- a/src/GEOMGUI/GEOM_msg_ja.ts
+++ b/src/GEOMGUI/GEOM_msg_ja.ts
@@ -3983,54 +3983,6 @@
TOM_X
X
-
- TOOL_BASIC
- 基礎オブジェクト
-
-
- TOOL_BLOCKS
- ブロック分割
-
-
- TOOL_BOOLEAN
- ブーリアン操作
-
-
- TOOL_FEATURES
- フィーチャー
-
-
- TOOL_GENERATION
- 押し出し/回転
-
-
- TOOL_PRIMITIVES
- 基本図形
-
-
- TOOL_TRANSFORMATION
- 変形/移動/回転
-
-
- TOOL_BUILD
- 構築
-
-
- TOOL_OPERATIONS
- 操作
-
-
- TOOL_PICTURES
- 画像
-
-
- TOOL_ADVANCED
- 高度なツール
-
-
- TOOL_MEASURES
- 情報/測定
-
TOP_ARC
円弧を作成
@@ -5151,10 +5103,6 @@
MEN_IMPORTEXPORT
インポート/エクスポート
-
- TOOL_IMPORTEXPORT
- インポート/エクスポート
-
TOP_EXPORTXAO
エクスポートしました。
@@ -5208,6 +5156,61 @@
X=%1, Y=%2, Z=%3
+
+ GeometryGUI
+
+ TOOL_BASIC
+ 基礎オブジェクト
+
+
+ TOOL_BLOCKS
+ ブロック分割
+
+
+ TOOL_BOOLEAN
+ ブーリアン操作
+
+
+ TOOL_FEATURES
+ フィーチャー
+
+
+ TOOL_GENERATION
+ 押し出し/回転
+
+
+ TOOL_PRIMITIVES
+ 基本図形
+
+
+ TOOL_TRANSFORMATION
+ 変形/移動/回転
+
+
+ TOOL_BUILD
+ 構築
+
+
+ TOOL_OPERATIONS
+ 操作
+
+
+ TOOL_PICTURES
+ 画像
+
+
+ TOOL_ADVANCED
+ 高度なツール
+
+
+ TOOL_MEASURES
+ 情報/測定
+
+
+ TOOL_IMPORTEXPORT
+ インポート/エクスポート
+
+
BasicGUI_CurveDlg
diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index 1df722c35..fa594d236 100644
--- a/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx
@@ -1344,7 +1344,7 @@ void GeometryGUI::initialize( CAM_Application* app )
// ---- create toolbars --------------------------
- int basicTbId = createTool( tr( "TOOL_BASIC" ) );
+ int basicTbId = createTool( tr( "TOOL_BASIC" ), QString( "GEOMBasic" ) );
createTool( GEOMOp::OpPoint, basicTbId );
createTool( GEOMOp::OpLine, basicTbId );
createTool( GEOMOp::OpCircle, basicTbId );
@@ -1359,11 +1359,11 @@ void GeometryGUI::initialize( CAM_Application* app )
createTool( GEOMOp::OpLCS, basicTbId );
createTool( GEOMOp::OpOriginAndVectors, basicTbId );
-// int sketchTbId = createTool( tr( "TOOL_SKETCH" ) );
+// int sketchTbId = createTool( tr( "TOOL_SKETCH" ), QString( "GEOMSketch" ) );
// createTool( GEOMOp::Op2dSketcher, sketchTbId );
// createTool( GEOMOp::Op3dSketcher, sketchTbId );
- int primTbId = createTool( tr( "TOOL_PRIMITIVES" ) );
+ int primTbId = createTool( tr( "TOOL_PRIMITIVES" ), QString( "GEOMPrimitives" ) );
createTool( GEOMOp::OpBox, primTbId );
createTool( GEOMOp::OpCylinder, primTbId );
createTool( GEOMOp::OpSphere, primTbId );
@@ -1373,17 +1373,17 @@ void GeometryGUI::initialize( CAM_Application* app )
createTool( GEOMOp::OpDisk, primTbId );
//createTool( GEOMOp::OpPipeTShape, primTbId ); //rnc
- //int blocksTbId = createTool( tr( "TOOL_BLOCKS" ) );
+ //int blocksTbId = createTool( tr( "TOOL_BLOCKS" ), QString( "GEOMBlocks" ) );
//createTool( GEOMOp::OpDividedDisk, blocksTbId );
//createTool( GEOMOp::OpDividedCylinder, blocksTbId );
- int boolTbId = createTool( tr( "TOOL_BOOLEAN" ) );
+ int boolTbId = createTool( tr( "TOOL_BOOLEAN" ), QString( "GEOMBooleanOperations" ) );
createTool( GEOMOp::OpFuse, boolTbId );
createTool( GEOMOp::OpCommon, boolTbId );
createTool( GEOMOp::OpCut, boolTbId );
createTool( GEOMOp::OpSection, boolTbId );
- int genTbId = createTool( tr( "TOOL_GENERATION" ) );
+ int genTbId = createTool( tr( "TOOL_GENERATION" ), QString( "GEOMGeneration" ) );
createTool( GEOMOp::OpPrism, genTbId );
createTool( GEOMOp::OpRevolution, genTbId );
createTool( GEOMOp::OpFilling, genTbId );
@@ -1392,7 +1392,7 @@ void GeometryGUI::initialize( CAM_Application* app )
createTool( GEOMOp::OpPipePath, genTbId );
#endif
- int transTbId = createTool( tr( "TOOL_TRANSFORMATION" ) );
+ int transTbId = createTool( tr( "TOOL_TRANSFORMATION" ), QString( "GEOMTransformation" ) );
createTool( GEOMOp::OpTranslate, transTbId );
createTool( GEOMOp::OpRotate, transTbId );
createTool( GEOMOp::OpChangeLoc, transTbId );
@@ -1404,14 +1404,14 @@ void GeometryGUI::initialize( CAM_Application* app )
createTool( GEOMOp::OpMultiTranslate, transTbId );
createTool( GEOMOp::OpMultiRotate, transTbId );
- int operTbId = createTool( tr( "TOOL_OPERATIONS" ) );
+ int operTbId = createTool( tr( "TOOL_OPERATIONS" ), QString( "GEOMOperations" ) );
createTool( GEOMOp::OpExplode, operTbId );
createTool( GEOMOp::OpPartition, operTbId );
createTool( GEOMOp::OpArchimede, operTbId );
createTool( GEOMOp::OpShapesOnShape, operTbId );
createTool( GEOMOp::OpSharedShapes, operTbId );
- int featTbId = createTool( tr( "TOOL_FEATURES" ) );
+ int featTbId = createTool( tr( "TOOL_FEATURES" ), QString( "GEOMModification" ) );
createTool( GEOMOp::OpFillet1d, featTbId );
createTool( GEOMOp::OpFillet2d, featTbId );
createTool( GEOMOp::OpFillet3d, featTbId );
@@ -1423,7 +1423,7 @@ void GeometryGUI::initialize( CAM_Application* app )
createTool( GEOMOp::OpCurveCreator, featTbId );
#endif
- int buildTbId = createTool( tr( "TOOL_BUILD" ) );
+ int buildTbId = createTool( tr( "TOOL_BUILD" ), QString( "GEOMBuild" ) );
createTool( GEOMOp::OpEdge, buildTbId );
createTool( GEOMOp::OpWire, buildTbId );
createTool( GEOMOp::OpFace, buildTbId );
@@ -1431,7 +1431,7 @@ void GeometryGUI::initialize( CAM_Application* app )
createTool( GEOMOp::OpSolid, buildTbId );
createTool( GEOMOp::OpCompound, buildTbId );
- int measureTbId = createTool( tr( "TOOL_MEASURES" ) );
+ int measureTbId = createTool( tr( "TOOL_MEASURES" ), QString( "GEOMMeasures" ) );
createTool( GEOMOp::OpPointCoordinates, measureTbId );
createTool( GEOMOp::OpProperties, measureTbId );
createTool( GEOMOp::OpCenterMass, measureTbId );
@@ -1452,17 +1452,17 @@ void GeometryGUI::initialize( CAM_Application* app )
createTool( GEOMOp::OpGetNonBlocks, measureTbId );
createTool( GEOMOp::OpCheckSelfInters, measureTbId );
- int picturesTbId = createTool( tr( "TOOL_PICTURES" ) );
+ int picturesTbId = createTool( tr( "TOOL_PICTURES" ), QString( "GEOMPictures" ) );
createTool( GEOMOp::OpPictureImport, picturesTbId );
#ifdef WITH_OPENCV
createTool( GEOMOp::OpFeatureDetect, picturesTbId );
#endif
- int impexpTbId = createTool( tr( "TOOL_IMPORTEXPORT" ) );
+ int impexpTbId = createTool( tr( "TOOL_IMPORTEXPORT" ), QString( "GEOMImportExportXAO" ) );
createTool( GEOMOp::OpExportXAO, impexpTbId );
createTool( GEOMOp::OpImportXAO, impexpTbId );
- //int advancedTbId = createTool( tr( "TOOL_ADVANCED" ) );
+ //int advancedTbId = createTool( tr( "TOOL_ADVANCED" ), QString( "GEOMAdvanced" ) );
//createTool( GEOMOp::OpSmoothingSurface, advancedTbId );
//@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@//
@@ -1693,7 +1693,7 @@ void GeometryGUI::addPluginActions()
// create "Advanced Operations" menu and corresponding toolbar
//int advancedMenuId = createMenu(tr("MEN_ADVANCED"), -1, -1, 10);
- //int advancedTbarId = createTool(tr("TOOL_ADVANCED"));
+ //int advancedTbarId = createTool(tr("TOOL_ADVANCED"), QString( "Advanced" ));
int id = GEOMOp::OpLastOperationID; // TODO?
// loop on xmlFiles
@@ -1763,7 +1763,7 @@ void GeometryGUI::addPluginActions()
QString subTool = stools[0];
subTool = subTool.toUpper().prepend("TOOL_");
- int toolId = createTool(tr(subTool.toLatin1().constData()));
+ int toolId = createTool(tr(subTool.toLatin1().constData()), subTool.toLatin1().constData());
//createTool(id, advancedTbarId);
createTool(id, toolId);