From 126bafbe60e697be0ae79e89ab29109f8358ac49 Mon Sep 17 00:00:00 2001 From: fps Date: Thu, 14 Nov 2013 09:10:28 +0000 Subject: [PATCH] move XAO Import / Export menu to File Menu --- src/GEOMGUI/GEOM_msg_en.ts | 4 ++-- src/GEOMGUI/GEOM_msg_fr.ts | 4 ++-- src/GEOMGUI/GeometryGUI.cxx | 7 +++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts index 290393f51..f56578e90 100644 --- a/src/GEOMGUI/GEOM_msg_en.ts +++ b/src/GEOMGUI/GEOM_msg_en.ts @@ -4972,11 +4972,11 @@ Ignoring units will cause model scaling (as dimensions are supposed to be specif MEN_IMPORTEXPORT - Import / Export + Import / Export XAO TOOL_IMPORTEXPORT - Import / Export + Import / Export XAO TOP_EXPORTXAO diff --git a/src/GEOMGUI/GEOM_msg_fr.ts b/src/GEOMGUI/GEOM_msg_fr.ts index b2f9569f2..63aabd403 100644 --- a/src/GEOMGUI/GEOM_msg_fr.ts +++ b/src/GEOMGUI/GEOM_msg_fr.ts @@ -4913,7 +4913,7 @@ le paramètre '%1' aux préférences du module Géométrie. MEN_IMPORTEXPORT - Import / Export + Import / Export XAO TOP_EXPORTXAO @@ -4953,7 +4953,7 @@ le paramètre '%1' aux préférences du module Géométrie. TOOLS_IMPORTEXPORT - Import / Export + Import / Export XAO CC_PNT_ITEM_X_Y diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index 242524eb1..0a480ed0a 100644 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -1087,6 +1087,9 @@ void GeometryGUI::initialize( CAM_Application* app ) createMenu( separator(), fileId, 10 ); createMenu( GEOMOp::OpImport, fileId, 10 ); createMenu( GEOMOp::OpExport, fileId, 10 ); + int impexpId = createMenu( tr( "MEN_IMPORTEXPORT" ), fileId, -1, 10 ); + createMenu( GEOMOp::OpExportXAO, impexpId, -1 ); + createMenu( GEOMOp::OpImportXAO, impexpId, -1 ); createMenu( separator(), fileId, -1 ); int editId = createMenu( tr( "MEN_EDIT" ), -1, -1 ); @@ -1128,10 +1131,6 @@ void GeometryGUI::initialize( CAM_Application* app ) createMenu( GEOMOp::OpPipePath, genId, -1 ); #endif - int impexpId = createMenu( tr( "MEN_IMPORTEXPORT" ), newEntId, -1 ); - createMenu( GEOMOp::OpExportXAO, impexpId, -1 ); - createMenu( GEOMOp::OpImportXAO, impexpId, -1 ); - //int advId = createMenu( tr( "MEN_ADVANCED" ), newEntId, -1 ); //createMenu( GEOMOp::OpSmoothingSurface, 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 @@//