Made modifications in menus organization to be consistent with previously commited...

diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index eb4aa6d772f0bf039af3e7b294126c7707d9b4f5..2b649768629c7a70260b41d6e050e5aea321c5c3 100644 (file)
--- a/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx
@@ -906,6 +906,8 @@ void GeometryGUI::initialize( CAM_Application* app )
   createMenu( GEOMOp::OpArc,     basicId, -1 );
   createMenu( GEOMOp::OpCurve,   basicId, -1 );
   createMenu( separator(),       basicId, -1 );
+  createMenu( GEOMOp::Op2dSketcher, basicId, -1 );
+  createMenu( GEOMOp::Op3dSketcher, basicId, -1 );
   createMenu( GEOMOp::OpVector,  basicId, -1 );
   createMenu( GEOMOp::OpPlane,   basicId, -1 );
   createMenu( GEOMOp::OpLCS,     basicId, -1 );
@@ -919,6 +921,7 @@ void GeometryGUI::initialize( CAM_Application* app )
   createMenu( GEOMOp::OpCone,      primId, -1 );
   createMenu( GEOMOp::OpRectangle, primId, -1 );
   createMenu( GEOMOp::OpDisk,      primId, -1 );
+  createMenu( GEOMOp::OpPipeTShape,primId, -1 );
 
   int genId = createMenu( tr( "MEN_GENERATION" ), newEntId, -1 );
   createMenu( GEOMOp::OpPrism,      genId, -1 );
@@ -926,8 +929,8 @@ void GeometryGUI::initialize( CAM_Application* app )
   createMenu( GEOMOp::OpFilling,    genId, -1 );
   createMenu( GEOMOp::OpPipe,       genId, -1 );
 
-  int advId = createMenu( tr( "MEN_ADVANCED" ), newEntId, -1 );
-  createMenu( GEOMOp::OpPipeTShape, advId, -1 );
+//   int advId = createMenu( tr( "MEN_ADVANCED" ), newEntId, -1 );
+//   createMenu( GEOMOp::OpPipeTShape, advId, -1 );
 //   createMenu( GEOMOp::OpPipeTShapeGroups, advId, -1 );
   //@@ 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 @@//
 
@@ -945,11 +948,6 @@ void GeometryGUI::initialize( CAM_Application* app )
 
   createMenu( separator(),          newEntId, -1 );
 
-  createMenu( GEOMOp::Op2dSketcher, newEntId, -1 );
-  createMenu( GEOMOp::Op3dSketcher, newEntId, -1 );
-
-  createMenu( separator(),          newEntId, -1 );
-
   createMenu( GEOMOp::OpExplode,    newEntId, -1 );
 
   int buildId = createMenu( tr( "MEN_BUILD" ), newEntId, -1 );