dbeaver/dbeaver-ee#1563 Introduce a separate command for exporting ERD

plugins/org.jkiss.dbeaver.erd.ui/OSGI-INF/l10n/bundle.properties

@@ -22,6 +22,10 @@ command.org.jkiss.dbeaver.erd.diagram.view.name = View Diagram
 command.org.jkiss.dbeaver.erd.diagram.view.description = View Entity Relations Diagram
 command.org.jkiss.dbeaver.erd.diagram.create.description = Create Entity Relationship diagram
 command.org.jkiss.dbeaver.erd.diagram.create.name = Create Diagram
+command.org.jkiss.dbeaver.erd.diagram.saveAs.name = Save diagram as ...
+command.org.jkiss.dbeaver.erd.diagram.saveAs.description = Save diagram in external format
+command.org.jkiss.dbeaver.erd.toggleHand.name = Toggle hand tool
+command.org.jkiss.dbeaver.erd.toggleHand.description = Cycle through hand tool and previously used tool
 
 themeElementCategory.org.jkiss.dbeaver.ui.presentation.erd.label = ER Diagrams
 themeElementCategory.org.jkiss.dbeaver.ui.presentation.erd.description = ER Diagrams

plugins/org.jkiss.dbeaver.erd.ui/OSGI-INF/l10n/bundle_ru.properties

@@ -24,3 +24,6 @@ colorDefinition.org.jkiss.dbeaver.erd.diagram.borders.color.1.label = \u0426\u04
 themeElementCategory.org.jkiss.dbeaver.ui.presentation.erd.borders.label = \u0413\u0440\u0430\u043D\u0438\u0446\u044B
 resourceHandler.erd.ui.navigator.name = ER \u0434\u0438\u0430\u0433\u0440\u0430\u043C\u043C\u044B
 resourceHandler.erd.ui.navigator.folder = ER \u0434\u0438\u0430\u0433\u0440\u0430\u043C\u043C\u044B
+
+command.org.jkiss.dbeaver.erd.diagram.saveAs.name = \u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0434\u0438\u0430\u0433\u0440\u0430\u043C\u043C\u0443 \u043A\u0430\u043A ...
+command.org.jkiss.dbeaver.erd.diagram.saveAs.description = \u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0434\u0438\u0430\u0433\u0440\u0430\u043C\u043C\u0443 \u0432\u043E \u0432\u043D\u0435\u0448\u043D\u0435\u043C \u0444\u043E\u0440\u043C\u0430\u0442\u0435

plugins/org.jkiss.dbeaver.erd.ui/plugin.xml

@@ -165,6 +165,13 @@
                 </with>
             </activeWhen>
         </handler>
+        <handler commandId="org.jkiss.dbeaver.erd.diagram.saveAs" class="org.jkiss.dbeaver.erd.ui.action.ERDHandlerSaveImage">
+            <activeWhen>
+                <with variable="activeEditor">
+                    <adapt type="org.jkiss.dbeaver.erd.ui.editor.ERDEditorPart"/>
+                </with>
+            </activeWhen>
+        </handler>
 
     </extension>
 
@@ -410,11 +417,19 @@
     <extension point="org.eclipse.ui.commands">
         <command id="org.jkiss.dbeaver.erd.diagram.view" name="%command.org.jkiss.dbeaver.erd.diagram.view.name" description="%command.org.jkiss.dbeaver.erd.diagram.view.description" categoryId="org.jkiss.dbeaver.core.navigator"/>
         <command id="org.jkiss.dbeaver.erd.diagram.create" name="%command.org.jkiss.dbeaver.erd.diagram.create.name" description="%command.org.jkiss.dbeaver.erd.diagram.create.description" categoryId="org.jkiss.dbeaver.core.navigator"/>
+        <command id="org.jkiss.dbeaver.erd.diagram.saveAs" name="%command.org.jkiss.dbeaver.erd.diagram.saveAs.name" description="%command.org.jkiss.dbeaver.erd.diagram.saveAs.description" categoryId="org.eclipse.gef3.category.view"/>
+        <command id="org.jkiss.dbeaver.erd.toggleHand" name="%command.org.jkiss.dbeaver.erd.toggleHand.name" description="%command.org.jkiss.dbeaver.erd.toggleHand.description" categoryId="org.eclipse.gef3.category.view"/>
     </extension>
 
     <extension point="org.eclipse.ui.commandImages">
         <image commandId="org.jkiss.dbeaver.erd.diagram.view" icon="icons/erd.png"/>
         <image commandId="org.jkiss.dbeaver.erd.diagram.create" icon="icons/erd.png"/>
+        <image commandId="org.jkiss.dbeaver.erd.toggleHand" icon="platform:/plugin/org.jkiss.dbeaver.erd.ui/icons/move.png"/>
+        <image commandId="org.jkiss.dbeaver.erd.diagram.saveAs" icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/picture_save.png"/>
+    </extension>
+
+    <extension point="org.eclipse.ui.bindings">
+        <key commandId="org.jkiss.dbeaver.erd.toggleHand" contextId="org.eclipse.ui.contexts.window" schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" sequence="TAB"/>
     </extension>
 
     <extension point="org.eclipse.ui.handlers">
@@ -519,16 +534,4 @@
         <exportFormat ext="graphml" label="GraphML format" class="org.jkiss.dbeaver.erd.ui.export.ERDExportGraphML"/>
     </extension>
 
-    <extension point="org.eclipse.ui.commands">
-        <command id="org.jkiss.dbeaver.erd.toggleHand" name="Toggle hand tool" description="Cycle through hand tool and previously used tool" categoryId="org.eclipse.gef3.category.view"/>
-    </extension>
-
-    <extension point="org.eclipse.ui.bindings">
-        <key commandId="org.jkiss.dbeaver.erd.toggleHand" contextId="org.eclipse.ui.contexts.window" schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" sequence="TAB"/>
-    </extension>
-
-    <extension point="org.eclipse.ui.commandImages">
-        <image commandId="org.jkiss.dbeaver.erd.toggleHand" icon="platform:/plugin/org.jkiss.dbeaver.erd.ui/icons/move.png"/>
-    </extension>
-
 </plugin>

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/ERDUIConstants.java

@@ -73,6 +73,8 @@ public class ERDUIConstants {
     public static final String COLOR_ERD_HEADER_COLOR_6 = "org.jkiss.dbeaver.ui.presentation.erd.headers.color.6"; //$NON-NLS-1$
     public static final String COLOR_ERD_HEADER_COLOR_7 = "org.jkiss.dbeaver.ui.presentation.erd.headers.color.7"; //$NON-NLS-1$
 
+    public static final String CMD_SAVE_AS = "org.jkiss.dbeaver.erd.diagram.saveAs";
+
     public static final String ICON_LOCATION_PREFIX = "platform:/plugin/" + ERDUIActivator.PLUGIN_ID + "/icons/";
 
     public static final int DEFAULT_NOTE_BORDER_WIDTH = 1;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditorPart.java

@@ -956,11 +956,7 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
                 ERDUIMessages.erd_editor_control_action_print_diagram,
                 UIIcon.PRINT));
 
-            toolBarManager.add(ActionUtils.makeCommandContribution(
-                getSite(),
-                IWorkbenchCommandConstants.FILE_SAVE_AS,
-                ERDUIMessages.erd_editor_control_action_save_external_format,
-                UIIcon.PICTURE_SAVE));
+            toolBarManager.add(ActionUtils.makeCommandContribution(getSite(), ERDUIConstants.CMD_SAVE_AS));
         }
         toolBarManager.add(new Separator("configuration"));
         {

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/internal/ERDUIMessages.java

@@ -59,7 +59,6 @@ public class ERDUIMessages extends NLS {
 	//ERD editor action item control
 	public static String erd_editor_control_action_toggle_grid;
 	public static String erd_editor_control_action_refresh_diagram;
-	public static String erd_editor_control_action_save_external_format;
 	public static String erd_editor_control_action_print_diagram;
 	public static String erd_editor_control_action_configuration;
 	//ERD editor action item control

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/internal/ERDUIMessages.properties

@@ -31,7 +31,6 @@ wizard_page_diagram_create_title=Create new diagram
 ## ERD editor action item control ##
 erd_editor_control_action_toggle_grid = Toggle Grid
 erd_editor_control_action_refresh_diagram = Refresh Diagram
-erd_editor_control_action_save_external_format =  Save diagram in external format
 erd_editor_control_action_print_diagram = Print Diagram
 erd_editor_control_action_configuration = Configuration
 erd_preference_page_title_attribute_style=Attribute styles

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/internal/ERDUIMessages_de.properties

@@ -12,8 +12,6 @@ erd_editor_control_action_print_diagram = Diagramm drucken
 
 erd_editor_control_action_refresh_diagram = Diagramm aktualisieren
 
-erd_editor_control_action_save_external_format = Diagramm in externen Format speichern
-
 erd_editor_control_action_toggle_grid = Raster umschalten
 
 erd_tool_create_connection = Verbindung

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/internal/ERDUIMessages_ja.properties

@@ -31,6 +31,5 @@ wizard_page_diagram_create_title=\u65B0\u3057\u3044\u56F3\u306E\u4F5C\u6210
 ## ERD editor action item control ##
 erd_editor_control_action_toggle_grid =\u00A0\u30B0\u30EA\u30C3\u30C9\u306E\u5207\u308A\u66FF\u3048
 erd_editor_control_action_refresh_diagram =\u00A0\u56F3\u306E\u66F4\u65B0
-erd_editor_control_action_save_external_format =\u00A0\u00A0\u30C0\u30A4\u30A2\u30B0\u30E9\u30E0\u3092\u5916\u90E8\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u3067\u4FDD\u5B58
 erd_editor_control_action_print_diagram =\u00A0\u56F3\u306E\u5370\u5237
 erd_editor_control_action_configuration =\u00A0\u69CB\u6210
\ No newline at end of file

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/internal/ERDUIMessages_ru.properties

@@ -46,7 +46,6 @@ erd_view_style_selection_item_alphabetical_order=\u0410\u043B\u0444\u0430\u0432\
 erd_view_style_selection_item_alphabetical_order_action=\u0421\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043A\u043E\u043B\u043E\u043D\u043A\u0438 \u0432 \u0430\u043B\u0444\u0430\u0432\u0438\u0442\u043D\u043E\u043C \u043F\u043E\u0440\u044F\u0434\u043A\u0435
 erd_editor_control_action_toggle_grid = \u041F\u0435\u0440\u0435\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0441\u0435\u0442\u043A\u0443
 erd_editor_control_action_refresh_diagram = \u041E\u0431\u043D\u043E\u0432\u0438\u0442\u044C \u0434\u0438\u0430\u0433\u0440\u0430\u043C\u043C\u0443
-erd_editor_control_action_save_external_format =  \u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0434\u0438\u0430\u0433\u0440\u0430\u043C\u043C\u0443 \u0432\u043E \u0432\u043D\u0435\u0448\u043D\u0435\u043C \u0444\u043E\u0440\u043C\u0430\u0442\u0435
 erd_editor_control_action_print_diagram = \u041F\u0435\u0447\u0430\u0442\u044C \u0434\u0438\u0430\u0433\u0440\u0430\u043C\u043C\u044B
 erd_editor_control_action_configuration = \u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F
 erd_tool_set_text_text_bring_to_front=\u041D\u0430 \u043F\u0435\u0440\u0435\u0434\u043D\u0438\u0439 \u043F\u043B\u0430\u043D

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/internal/ERDUIMessages_zh.properties

@@ -30,8 +30,6 @@ erd_editor_control_action_print_diagram = \u6253\u5370\u56FE\u8868
 
 erd_editor_control_action_refresh_diagram = \u5237\u65B0\u56FE\u8868
 
-erd_editor_control_action_save_external_format = \u4FDD\u5B58\u56FE\u8868\u4E3A\u5916\u90E8\u683C\u5F0F
-
 ## ERD editor action item control ##
 erd_editor_control_action_toggle_grid = \u5207\u6362\u7F51\u683C\u7EBF