From 58d96e6e1df410d587bcfa91152fd8da6d9da2c0 Mon Sep 17 00:00:00 2001
From: rraphael <raphael.raphael@c-s.fr>
Date: Fri, 15 Jan 2021 12:29:20 +0100
Subject: [PATCH] rebase fix

---
 src/ExchangePlugin/doc/importFeature.rst | 35 ++++++++++++------------
 src/ExchangePlugin/plugin-Exchange.xml   | 22 ++-------------
 2 files changed, 20 insertions(+), 37 deletions(-)

diff --git a/src/ExchangePlugin/doc/importFeature.rst b/src/ExchangePlugin/doc/importFeature.rst
index c939ae31d..e76131a42 100644
--- a/src/ExchangePlugin/doc/importFeature.rst
+++ b/src/ExchangePlugin/doc/importFeature.rst
@@ -68,7 +68,6 @@ The following property panel will be opened:
    **Import property panel**
 
 The first combobox provides the list of formats avalables (BREP, XAO, IGES or STEP).
-
 The **Import to** combobox provides the list of destinations (one of existing Parts or a new Part).
 
 In this panel it is possible to enter a file name directly or press **'...'** button and browse it with help of import file dialog box:
@@ -77,11 +76,10 @@ In this panel it is possible to enter a file name directly or press **'...'** bu
    :align: center
 
    **Dialog box to import CAD-neutral format**
-
 Import BREP, XAO, IGES
 """"""""""""""""""""""
 In case of first choice the format of imported file will be defined according to file extension.
-
+  
 **Apply** button imports the file.
   
 **Cancel** button cancels the operation.
@@ -103,20 +101,6 @@ The Result of the operation depends on the imported file content.
 
    Import of BREP file.
 
-Import pictures
------------------------
-
-It is possible to import pictures in the following image formats: GIF, TIFF, PNG, JPG, JPEG, BMP, PPM, JPE.
-To import a file into active part select in the Main Menu *File -> Import -> Picture...* item.
-
-Result
-""""""
-
-.. figure:: images/imageImported.png
-   :align: center
-
-   Import of PNG image file.
-
 **See Also** a sample TUI Script of :ref:`tui_import_file` operation.
 
 
@@ -160,3 +144,20 @@ The Result of the operation depends on the imported file content.
    Import of STEP file.
 
 **See Also** a sample TUI Script of :ref:`tui_import_file_step` operation.
+
+
+Import pictures
+"""""""""""""""
+
+It is possible to import pictures in the following image formats: GIF, TIFF, PNG, JPG, JPEG, BMP, PPM, JPE.
+To import a file into active part select in the Main Menu *File -> Import -> Picture...* item.
+
+Result
+""""""
+
+.. figure:: images/imageImported.png
+   :align: center
+
+   Import of PNG image file.
+
+**See Also** a sample TUI Script of :ref:`tui_import_file` operation.
diff --git a/src/ExchangePlugin/plugin-Exchange.xml b/src/ExchangePlugin/plugin-Exchange.xml
index b553ded18..c6f58a196 100644
--- a/src/ExchangePlugin/plugin-Exchange.xml
+++ b/src/ExchangePlugin/plugin-Exchange.xml
@@ -1,7 +1,7 @@
 <plugin>
   <workbench id="Part">
     <group id="Exchange">
-      <feature id="Import" title="Import" tooltip="Import a file" icon="icons/Exchange/import.png"
+      <feature id="ImportMacro" title="Import" tooltip="Import a file" icon="icons/Exchange/import.png"
                helpfile="importFeature.html"
                internal="1">
       <switch id="ImportType">
@@ -49,18 +49,7 @@
                 label="Import to"
                 tooltip="Select the image to import the document" />
       </feature>
-      <feature id="ImportImage" title="Import" tooltip="Import a file" icon="icons/Exchange/import.png"
-               helpfile="importFeature.html"
-               internal="1">
-        <file_selector id="file_path" title="Import image file" path="">
-          <validator id="ExchangePlugin_ImportFormat" parameters="GIF|TIFF|PNG|JPG|JPEG|BMP|PPM|JPE:Image" />
-        </file_selector>
-        <choice id="target_part"
-                string_list_attribute="target_parts_list"
-                label="Import to"
-                tooltip="Select the image to import the document" />
-      </feature>
-      <feature id="ImportFeature" title="Import" tooltip="Import a file" icon="icons/Exchange/import.png"
+      <feature id="Import" title="Import" tooltip="Import a file" icon="icons/Exchange/import.png"
                helpfile="importFeature.html" internal="1">
         <switch id="ImportType">
           <case id="Regular" title="BREP, XAO, IGES, STL">
@@ -95,13 +84,6 @@
           <validator id="ExchangePlugin_ImportFormat" parameters="GIF|TIFF|PNG|JPG|JPEG|BMP|PPM|JPE:Image" />
         </file_selector>
       </feature>
-      <feature id="ImportImageFeature" title="Import" tooltip="Import a file" icon="icons/Exchange/import.png"
-               helpfile="importFeature.html"
-               internal="1">
-        <file_selector id="file_path" title="Import image file" path="">
-          <validator id="ExchangePlugin_ImportFormat" parameters="GIF|TIFF|PNG|JPG|JPEG|BMP|PPM|JPE:Image" />
-        </file_selector>
-      </feature>
       <feature id="Export" title="Export" tooltip="Export to file" icon="icons/Exchange/export.png"
                helpfile="exportFeature.html" internal="1">
         <source path="export_widget.xml" />
-- 
2.39.2