From 112f1783c84a66139c1e7d5fcec75bf4bbb6d667 Mon Sep 17 00:00:00 2001
From: vsv <vsv@opencascade.com>
Date: Fri, 14 Feb 2020 14:45:23 +0300
Subject: [PATCH] Issue #3138: Create Import, Export sub-menus in File menu

---
 src/ExchangePlugin/plugin-Exchange.xml |  5 +--
 src/SHAPERGUI/SHAPERGUI.cpp            |  7 ++-
 src/SHAPERGUI/SHAPERGUI.h              |  9 ++--
 src/XGUI/XGUI_SalomeConnector.h        |  6 ++-
 src/XGUI/XGUI_Workshop.cpp             | 59 +++++++++++++++++---------
 src/XGUI/XGUI_Workshop.h               |  5 ++-
 src/XGUI/XGUI_msg_fr.ts                | 48 +++++++++++++++++++--
 7 files changed, 104 insertions(+), 35 deletions(-)

diff --git a/src/ExchangePlugin/plugin-Exchange.xml b/src/ExchangePlugin/plugin-Exchange.xml
index f62481945..d47c5cd83 100644
--- a/src/ExchangePlugin/plugin-Exchange.xml
+++ b/src/ExchangePlugin/plugin-Exchange.xml
@@ -13,14 +13,13 @@
                 tooltip="Select the part to import the document" />
       </feature>
       <feature id="Import" title="Import" tooltip="Import a file" icon="icons/Exchange/import.png"
-               helpfile="importFeature.html"
-               internal="1">
+               helpfile="importFeature.html" internal="1">
         <file_selector id="file_path" title="Import file" path="">
           <validator id="ExchangePlugin_ImportFormat" parameters="BREP|BRP:BREP,STEP|STP:STEP,IGES|IGS:IGES,XAO:XAO" />
         </file_selector>
       </feature>
       <feature id="Export" title="Export" tooltip="Export to file" icon="icons/Exchange/export.png"
-               helpfile="exportFeature.html">
+               helpfile="exportFeature.html" internal="1">
         <source path="export_widget.xml" />
       </feature>
       <feature id="Dump" title="Dump" tooltip="Dump Python script" icon="icons/Exchange/dump.png"
diff --git a/src/SHAPERGUI/SHAPERGUI.cpp b/src/SHAPERGUI/SHAPERGUI.cpp
index e9e7c0c0f..94fe8014a 100644
--- a/src/SHAPERGUI/SHAPERGUI.cpp
+++ b/src/SHAPERGUI/SHAPERGUI.cpp
@@ -699,9 +699,14 @@ QAction* SHAPERGUI::addFeatureOfNested(const QString& theWBName,
 QAction* SHAPERGUI::addDesktopCommand(const QString& theId, const QString& theTitle,
                                            const QString& theTip, const QIcon& theIcon,
                                            const QKeySequence& theKeys, bool isCheckable,
-                                           const char* theMenuSourceText, const int theMenuPosition)
+                                           const char* theMenuSourceText,
+                                           const QString& theSubMenu,
+                                           const int theMenuPosition,
+                                           const int theSuibMenuPosition)
 {
   int aMenu = createMenu(tr(theMenuSourceText), -1, -1);
+  if (!theSubMenu.isNull())
+    aMenu = createMenu(theSubMenu, aMenu, -1, theSuibMenuPosition);
 
   int aId = getNextCommandId();
   myActionsList.append(aId);
diff --git a/src/SHAPERGUI/SHAPERGUI.h b/src/SHAPERGUI/SHAPERGUI.h
index 1c5267838..f94f08e54 100644
--- a/src/SHAPERGUI/SHAPERGUI.h
+++ b/src/SHAPERGUI/SHAPERGUI.h
@@ -91,10 +91,11 @@ Q_OBJECT
   virtual bool isFeatureOfNested(const QAction* theAction);
 
   virtual QAction* addDesktopCommand(const QString& theId, const QString& theTitle,
-                                     const QString& theTip, const QIcon& theIcon,
-                                     const QKeySequence& theKeys, bool isCheckable,
-                                     const char* theMenuSourceText,
-                                     const int theMenuPosition = 10);
+    const QString& theTip, const QIcon& theIcon,
+    const QKeySequence& theKeys, bool isCheckable,
+    const char* theMenuSourceText, const QString& theSubMenu = QString(),
+    const int theMenuPosition = 10,
+    const int theSuibMenuPosition = -1) Standard_OVERRIDE;
 
   virtual void addDesktopMenuSeparator(const char* theMenuSourceText,
                                        const int theMenuPosition = 10);
diff --git a/src/XGUI/XGUI_SalomeConnector.h b/src/XGUI/XGUI_SalomeConnector.h
index acf23e2be..c24961943 100644
--- a/src/XGUI/XGUI_SalomeConnector.h
+++ b/src/XGUI/XGUI_SalomeConnector.h
@@ -92,13 +92,17 @@ class XGUI_EXPORT XGUI_SalomeConnector
   //! \param isCheckable - is checkable or not
   //! \param theKeys - hot keys
   //! \param theMenuSourceText - a source text of the desktop menu
+  //! \param theSubMenu - a sub-menu name
   //! \param theMenuPosition - a position of the command in the desktop menu
+  //! \param theSuibMenuPosition - a position of the sub-menu in the desktop menu
   //! returns created action
   virtual QAction* addDesktopCommand(const QString& theId, const QString& theTitle,
                                      const QString& theTip, const QIcon& theIcon,
                                      const QKeySequence& theKeys, bool isCheckable,
                                      const char* theMenuSourceText,
-                                     const int theMenuPosition = 10) = 0;
+                                     const QString& theSubMenu = QString(),
+                                     const int theMenuPosition = 10,
+                                     const int theSuibMenuPosition = -1) = 0;
 
   //! Insert separator into Edit menu of SALOME desktop
   virtual void addDesktopMenuSeparator(const char* theMenuSourceText,
diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index 799f5c00f..ac03c11b2 100644
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -91,6 +91,7 @@
 #include <ExchangePlugin_ExportPart.h>
 #include <ExchangePlugin_ImportPart.h>
 #include <ExchangePlugin_Import.h>
+#include <ExchangePlugin_ExportFeature.h>
 
 #include <GeomAPI_Pnt.h>
 #include <GeomAPI_ShapeExplorer.h>
@@ -472,38 +473,43 @@ void XGUI_Workshop::initMenu()
 
 
   // Add commands to a file menu
-  aAction = salomeConnector()->addDesktopCommand("SAVEAS_CMD", tr("Export native..."),
-                                             tr("Export the current document into a native file"),
-                                              QIcon(), QKeySequence(),
-                                              false, "MEN_DESK_FILE");
-  connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onSaveAs()));
-
-  aAction = salomeConnector()->addDesktopCommand("OPEN_CMD", tr("Import native..."),
+  // Import sub-menu
+  aAction = salomeConnector()->addDesktopCommand("OPEN_CMD", tr("Part set..."),
                                               tr("Import native file"),
                                               QIcon(), QKeySequence(),
-                                              false, "MEN_DESK_FILE");
+                                              false, "MEN_DESK_FILE", tr("Import"), 10, 10);
   connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onOpen()));
-  salomeConnector()->addDesktopMenuSeparator("MEN_DESK_FILE");
 
-  aAction = salomeConnector()->addDesktopCommand("EXPORT_PART_CMD", tr("Export part..."),
-                                          tr("Export a part of the current document into a file"),
-                                          QIcon(), QKeySequence(),
-                                          false, "MEN_DESK_FILE");
-  connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onExportPart()));
-
-  aAction = salomeConnector()->addDesktopCommand("IMPORT_PART_CMD", tr("Import part..."),
+  aAction = salomeConnector()->addDesktopCommand("IMPORT_PART_CMD", tr("Part..."),
                                           tr("Import structure of a part"),
                                           QIcon(), QKeySequence(),
-                                          false, "MEN_DESK_FILE");
+                                          false, "MEN_DESK_FILE", tr("Import"), 10, 10);
   connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onImportPart()));
 
-  aAction = salomeConnector()->addDesktopCommand("IMPORT_SHAPE_CMD", tr("Import shape..."),
-    tr("Import shape from a file"),
+  aAction = salomeConnector()->addDesktopCommand("IMPORT_SHAPE_CMD", tr("From CAD format..."),
+    tr("Import shape from a CAD format file"),
     ModuleBase_IconFactory::loadIcon("icons/Exchange/import.png"),
-    QKeySequence(), false, "MEN_DESK_FILE");
+    QKeySequence(), false, "MEN_DESK_FILE", tr("Import"), 10, 10);
   connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onImportShape()));
 
-  salomeConnector()->addDesktopMenuSeparator("MEN_DESK_FILE");
+  // Export sub-menu
+  aAction = salomeConnector()->addDesktopCommand("SAVEAS_CMD", tr("Part set..."),
+                                             tr("Export the current document into a native file"),
+                                              QIcon(), QKeySequence(),
+                                              false, "MEN_DESK_FILE", tr("Export"), 10, 11);
+  connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onSaveAs()));
+
+  aAction = salomeConnector()->addDesktopCommand("EXPORT_PART_CMD", tr("Part..."),
+                                          tr("Export a part of the current document into a file"),
+                                          QIcon(), QKeySequence(),
+                                          false, "MEN_DESK_FILE", tr("Export"), 10, 11);
+  connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onExportPart()));
+
+  aAction = salomeConnector()->addDesktopCommand("EXPORT_SHAPE_CMD", tr("To CAD format..."),
+    tr("Export shape to a CAD format file"),
+    ModuleBase_IconFactory::loadIcon("icons/Exchange/export.png"),
+    QKeySequence(), false, "MEN_DESK_FILE", tr("Export"), 10, 11);
+  connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onExportShape()));
 
 #else
   // File commands group
@@ -1321,6 +1327,17 @@ void XGUI_Workshop::onImportShape()
   }
 }
 
+//******************************************************
+void XGUI_Workshop::onExportShape()
+{
+  if (abortAllOperations()) {
+    ModuleBase_OperationFeature* anExportOp = dynamic_cast<ModuleBase_OperationFeature*>(
+        module()->createOperation(ExchangePlugin_ExportFeature::ID()));
+    myPropertyPanel->updateApplyPlusButton(anExportOp->feature());
+    operationMgr()->startOperation(anExportOp);
+  }
+}
+
 //******************************************************
 void XGUI_Workshop::onExportPart()
 {
diff --git a/src/XGUI/XGUI_Workshop.h b/src/XGUI/XGUI_Workshop.h
index 2a3eacc14..18f9cd77c 100644
--- a/src/XGUI/XGUI_Workshop.h
+++ b/src/XGUI/XGUI_Workshop.h
@@ -405,12 +405,15 @@ signals:
   /// Import part structure from a file
   void onImportPart();
 
-  /// Import part structure from a file
+  /// Import shape from a file
   void onImportShape();
 
   /// Export features to a file
   void onExportPart();
 
+  /// Export a shape to a file
+  void onExportShape();
+
 #ifndef HAVE_SALOME
   /// Exit application
   void onExit();
diff --git a/src/XGUI/XGUI_msg_fr.ts b/src/XGUI/XGUI_msg_fr.ts
index f6e80a045..666c30458 100644
--- a/src/XGUI/XGUI_msg_fr.ts
+++ b/src/XGUI/XGUI_msg_fr.ts
@@ -204,6 +204,10 @@
         <source>Windows</source>
         <translation>Fenêtres</translation>
     </message>
+    <message>
+        <source>Iso-lines...</source>
+        <translation>Iso-lines...</translation>
+    </message>
 </context>
 <context>
     <name>XGUI_DataTree</name>
@@ -539,7 +543,7 @@
     </message>
     <message>
         <source>Export native...</source>
-        <translation>Exporter natif...</translation>
+        <translation type="vanished">Exporter natif...</translation>
     </message>
     <message>
         <source>Export the current document into a native file</source>
@@ -547,7 +551,7 @@
     </message>
     <message>
         <source>Import native...</source>
-        <translation>Importer natif...</translation>
+        <translation type="vanished">Importer natif...</translation>
     </message>
     <message>
         <source>Import native file</source>
@@ -667,7 +671,7 @@ Supprimer des objets du panneau à afficher ?</translation>
     </message>
     <message>
         <source>Export part...</source>
-        <translation>Partie export...</translation>
+        <translation type="vanished">Partie export...</translation>
     </message>
     <message>
         <source>Export a part of the current document into a file</source>
@@ -675,11 +679,47 @@ Supprimer des objets du panneau à afficher ?</translation>
     </message>
     <message>
         <source>Import part...</source>
-        <translation>Importer une partie...</translation>
+        <translation type="vanished">Importer une partie...</translation>
     </message>
     <message>
         <source>Import structure of a part</source>
         <translation>Structure d&apos;importation d&apos;une pièce</translation>
     </message>
+    <message>
+        <source>Part set...</source>
+        <translation>Ensemble de parties...</translation>
+    </message>
+    <message>
+        <source>Import</source>
+        <translation>Importation</translation>
+    </message>
+    <message>
+        <source>Part...</source>
+        <translation>Partie...</translation>
+    </message>
+    <message>
+        <source>From CAD format...</source>
+        <translation>A partir du format CAO...</translation>
+    </message>
+    <message>
+        <source>Import shape from a CAD format file</source>
+        <translation>Importer une forme à partir d&apos;un fichier au format CAO</translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation>Exporter</translation>
+    </message>
+    <message>
+        <source>To CAD format...</source>
+        <translation>Au format CAO...</translation>
+    </message>
+    <message>
+        <source>Number of Iso-lines</source>
+        <translation>Nombre de Iso-lignes</translation>
+    </message>
+    <message>
+        <source>Export shape to a CAD format file</source>
+        <translation>Exportation de la forme vers un fichier au format CAO</translation>
+    </message>
 </context>
 </TS>
-- 
2.39.2