#9747 SQL Editor sub-menu + extra command

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

@@ -161,5 +161,6 @@ maven.respository.central.unsecure = Central Repository (unsecure)
 
 perspective.name=DBeaver
 
+menu.org.jkiss.dbeaver.core.connection.sqleditor = SQL Editor
 menu.org.jkiss.dbeaver.core.project.select.label = Active Project
 menu.org.jkiss.dbeaver.core.connection.settings.label = Connection view

plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_de.properties

@@ -129,3 +129,4 @@ wizard.org.jkiss.dbeaver.core.wizard.new.connection.description = Datenbankverbi
 wizard.org.jkiss.dbeaver.core.wizard.new.connection.name        = Datenbankverbindung
 
 menu.org.jkiss.dbeaver.core.project.select.label              = Aktives Projekt
+menu.org.jkiss.dbeaver.core.connection.sqleditor              = SQL-Editor

plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_es.properties

@@ -39,3 +39,5 @@ page.org.jkiss.dbeaver.preferences.main.resultset.plain.text.name = Llanura Text
 menu.database = Base de Datos
 category.utility.name = Utilidades
 category.utility.description = Comandos de utilidad
+
+menu.org.jkiss.dbeaver.core.connection.sqleditor              = Editor SQL

plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_fr.properties

@@ -142,3 +142,4 @@ page.org.jkiss.dbeaver.preferences.main.errorHandle.name = Gestion des erreurs
 perspective.name=DBeaver
 
 menu.org.jkiss.dbeaver.core.project.select.label = Projet actif
+menu.org.jkiss.dbeaver.core.connection.sqleditor = Editeur SQL

plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_ja.properties

@@ -141,3 +141,4 @@ maven.respository.central.unsecure =\u4E2D\u592E\u30EA\u30DD\u30B8\u30C8\u30EA\u
 perspective.name=DBeaver
 
 menu.org.jkiss.dbeaver.core.project.select.label =\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8
+menu.org.jkiss.dbeaver.core.connection.sqleditor = SQL\u30A8\u30C7\u30A3\u30BF

plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_ko.properties

@@ -144,3 +144,4 @@ maven.respository.central.unsecure = \uC911\uC559 \uC800\uC7A5\uC18C (unsecure)
 #perspective.name=DBeaver
 
 menu.org.jkiss.dbeaver.core.project.select.label = \uD65C\uC131 \uD504\uB85C\uC81D\uD2B8
+menu.org.jkiss.dbeaver.core.connection.sqleditor = SQL \uD3B8\uC9D1\uAE30

plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_pt_BR.properties

@@ -101,6 +101,7 @@ menu.filter.label                                     = &Filtro
 menu.navigate                                         = Navegar
 menu.org.jkiss.dbeaver.core.connection.settings.label = Ver Conex\u00E3o
 menu.org.jkiss.dbeaver.core.project.select.label      = Projeto Ativo
+menu.org.jkiss.dbeaver.core.connection.sqleditor      = Editor de SQL
 
 page.org.jkiss.dbeaver.preferences.connectionTypes.name             = Tipos de conex\u00E3o
 page.org.jkiss.dbeaver.preferences.editors.name                     = Editor

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

@@ -109,3 +109,4 @@ wizard.org.jkiss.dbeaver.core.wizard.import.scripts.name = \u0421\u043A\u0440\u0
 wizard.org.jkiss.dbeaver.core.wizard.import.scripts.description = SQL \u0421\u043A\u0440\u0438\u043F\u0442\u044B
 
 menu.org.jkiss.dbeaver.core.project.select.label              = \u0410\u043A\u0442\u0438\u0432\u043D\u044B\u0439 \u043F\u0440\u043E\u0435\u043A\u0442
+menu.org.jkiss.dbeaver.core.connection.sqleditor              = \u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 SQL

plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_zh.properties

@@ -128,4 +128,5 @@ wizard.org.jkiss.dbeaver.core.wizard.import.scripts.name        = \u811A\u672C
 wizard.org.jkiss.dbeaver.core.wizard.new.connection.description = \u6570\u636E\u5E93\u8FDE\u63A5
 wizard.org.jkiss.dbeaver.core.wizard.new.connection.name        = \u6570\u636E\u5E93\u8FDE\u63A5
 
-menu.org.jkiss.dbeaver.core.project.select.label              = \u6D3B\u52A8\u9879\u76EE
+menu.org.jkiss.dbeaver.core.project.select.label                = \u6D3B\u52A8\u9879\u76EE
+menu.org.jkiss.dbeaver.core.connection.sqleditor                = SQL \u7F16\u8F91\u5668

plugins/org.jkiss.dbeaver.core/plugin.xml

@@ -193,6 +193,15 @@
         </definition>
 -->
 
+        <definition id="org.jkiss.dbeaver.core.ui.selected.datasource">
+            <with variable="selection">
+                <count value="1"/>
+                <iterate operator="and">
+                    <instanceof value="org.jkiss.dbeaver.model.navigator.DBNDataSource"/>
+                </iterate>
+            </with>
+        </definition>
+
         <definition id="org.jkiss.dbeaver.core.ui.querylog.view">
             <with variable="activePart">
                 <instanceof value="org.jkiss.dbeaver.ui.views.qm.QueryManagerView"/>
@@ -669,26 +678,18 @@
         <menuContribution allPopups="false" locationURI="popup:org.eclipse.ui.popup.any?after=navigator_additions">
             <separator name="sql_tools" visible="true"/>
 
-            <command commandId="org.jkiss.dbeaver.core.sql.editor.open">
-                <visibleWhen>
-                    <with variable="selection">
-                        <count value="1"/>
-                        <iterate operator="and">
-                            <instanceof value="org.jkiss.dbeaver.model.navigator.DBNDataSource"/>
-                        </iterate>
-                    </with>
-                </visibleWhen>
-            </command>
-            <command commandId="org.jkiss.dbeaver.core.sql.editor.recent">
-                <visibleWhen>
-                    <with variable="selection">
-                        <count value="+"/>
-                        <iterate operator="and">
-                            <instanceof value="org.jkiss.dbeaver.model.navigator.DBNDataSource"/>
-                        </iterate>
-                    </with>
-                </visibleWhen>
-            </command>
+            <menu label="%menu.org.jkiss.dbeaver.core.connection.sqleditor">
+                <visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.selected.datasource"/></visibleWhen>
+                <command commandId="org.jkiss.dbeaver.core.sql.editor.open">
+                    <visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.selected.datasource"/></visibleWhen>
+                </command>
+                <command commandId="org.jkiss.dbeaver.core.sql.editor.recent">
+                    <visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.selected.datasource"/></visibleWhen>
+                </command>
+                <command commandId="org.jkiss.dbeaver.core.sql.editor.create">
+                    <visibleWhen><reference definitionId="org.jkiss.dbeaver.core.ui.selected.datasource"/></visibleWhen>
+                </command>
+            </menu>
 
             <command commandId="org.jkiss.dbeaver.core.project.active">
                 <visibleWhen checkEnabled="true"/>