#10 Menu contributions move

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

@@ -108,7 +108,6 @@ menu.search=Se&arch
 menu.database=&Database
 menu.database.tools=Tools
 menu.database.sql.generate=Generate SQL
-menu.sqleditor=&SQL Editor
 
 category.utility.name=Utility
 category.utility.description=Utility Commands
@@ -143,11 +142,7 @@ toolbar.dbeaver-transaction-monitor.label = Transaction monitor
 toolbar.dbeaver-datasource-selector.label = DataSource Selector
 toolbar.dbeaver-edit.label = Edit actions
 
-menu.org.jkiss.dbeaver.core.project.select.label = Active Project
 menu.filter.label = Filter
-menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.execute.label = Execute
-menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.file.label = File
-menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.layout.label = Layout
 
 context.org.jkiss.dbeaver.ui.context.resultset.description = Results viewer context
 context.org.jkiss.dbeaver.ui.context.resultset.name = Results viewer context

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

@@ -204,12 +204,7 @@ menu.database.sql.generate                                    = SQL generieren
 menu.database.tools                                           = Werkzeuge
 menu.filter.label                                             = Filter
 menu.navigate                                                 = Navigieren
-menu.org.jkiss.dbeaver.core.project.select.label              = Aktives Projekt
-menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.execute.label = Ausf\u00FChren
-menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.file.label    = Datei
-menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.layout.label  = Layout
 menu.search                                                   = &Suche
-menu.sqleditor                                                = &SQL-Editor
 
 meta.org.jkiss.dbeaver.registry.DataSourceDescriptor$ContextInfo.name.name    = Kontextname
 meta.org.jkiss.dbeaver.registry.DataSourceDescriptor.description.name         = Beschreibung

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

@@ -37,6 +37,5 @@ command.org.jkiss.dbeaver.core.process.stop.description = Terminar proceso en ej
 
 menu.database = Base de Datos
 menu.database.tools = Herramientas
-menu.sqleditor = Editor SQL
 category.utility.name = Utilidades
 category.utility.description = Comandos de utilidad

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

@@ -90,13 +90,8 @@ menu.database              = &Base de donn\u00E9es
 menu.database.sql.generate = G\u00E9n\u00E9rer du SQL
 menu.database.tools        = Outils
 menu.navigate              = Navigieren
-menu.sqleditor             = Editeur &SQL
 
-menu.org.jkiss.dbeaver.core.project.select.label = Projet actif
 menu.filter.label = Filtrer
-menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.execute.label = Ex\u00E9cuter
-menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.file.label = Fichier
-menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.layout.label = Agencement
 
 
 meta.org.jkiss.dbeaver.registry.DataSourceDescriptor$ContextInfo.name.name                  = Nom du contexte

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

@@ -35,6 +35,5 @@ command.org.jkiss.dbeaver.core.process.stop.description = Termina processo in es
 
 menu.database = Database
 menu.database.tools = Strumenti
-menu.sqleditor = Editor SQL
 category.utility.name = Utilit\u00E0
 category.utility.description = Comandi di Utilit\u00E0

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

@@ -103,7 +103,6 @@ command.org.jkiss.dbeaver.core.process.stop.description=\u5B9F\u884C\u30D7\u30ED
 menu.database=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
 menu.database.tools=\u30C4\u30FC\u30EB
 menu.database.sql.generate=SQL\u306E\u751F\u6210
-menu.sqleditor=SQL\u30A8\u30C7\u30A3\u30BF
 
 category.utility.name=\u30E6\u30FC\u30C6\u30A3\u30EA\u30C6\u30A3
 category.utility.description=\u30E6\u30FC\u30C6\u30A3\u30EA\u30C6\u30A3\u30B3\u30DE\u30F3\u30C9
@@ -138,11 +137,7 @@ toolbar.dbeaver-transaction-monitor.label =\u30C8\u30E9\u30F3\u30B6\u30AF\u30B7\
 toolbar.dbeaver-datasource-selector.label =\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u30BB\u30EC\u30AF\u30BF
 toolbar.dbeaver-edit.label =\u30A2\u30AF\u30B7\u30E7\u30F3\u306E\u7DE8\u96C6
 
-menu.org.jkiss.dbeaver.core.project.select.label =\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8
 menu.filter.label =\u30D5\u30A3\u30EB\u30BF
-menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.execute.label =\u5B9F\u884C\u3059\u308B
-menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.file.label =\u30D5\u30A1\u30A4\u30EB
-menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.layout.label =\u30EC\u30A4\u30A2\u30A6\u30C8
 
 context.org.jkiss.dbeaver.ui.context.resultset.description =\u7D50\u679C\u30D3\u30E5\u30FC\u30A2\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8
 context.org.jkiss.dbeaver.ui.context.resultset.name =\u7D50\u679C\u30D3\u30E5\u30FC\u30A2\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8

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

@@ -63,12 +63,7 @@ menu.database.sql.generate                                    = \u0413\u0435\u04
 menu.database.tools                                           = \u0418\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u044B
 menu.filter.label                                             = \u0424\u0438\u043B\u044C\u0442\u0440
 menu.navigate                                                 = \u041D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F
-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.ui.editors.sql.SQLEditor.execute.label = \u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C
-menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.file.label    = \u0424\u0430\u0439\u043B
-menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.layout.label  = \u0420\u0430\u0441\u043F\u043E\u043B\u043E\u0436\u0435\u043D\u0438\u0435
 menu.search                                                   = \u041F\u043E\u0438\u0441\u043A
-menu.sqleditor                                                = \u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 SQL
 
 meta.org.jkiss.dbeaver.registry.DataSourceDescriptor.description.name         = \u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435
 meta.org.jkiss.dbeaver.registry.DataSourceDescriptor.name.name                = \u0418\u043C\u044F

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

@@ -204,12 +204,7 @@ menu.database.sql.generate                                    = \u751F\u6210 SQL
 menu.database.tools                                           = \u5DE5\u5177
 menu.filter.label                                             = \u8FC7\u6EE4\u5668
 menu.navigate                                                 = \u5BFC\u822A
-menu.org.jkiss.dbeaver.core.project.select.label              = \u6D3B\u52A8\u9879\u76EE
-menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.execute.label = \u6267\u884C
-menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.file.label    = \u6587\u4EF6
-menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.layout.label  = \u5E03\u5C40
 menu.search                                                   = \u67E5\u627E(&A)
-menu.sqleditor                                                = &SQL \u7F16\u8F91\u5668
 
 meta.org.jkiss.dbeaver.registry.DataSourceDescriptor$ContextInfo.name.name    = \u4E0A\u4E0B\u6587\u540D\u79F0
 meta.org.jkiss.dbeaver.registry.DataSourceDescriptor.description.name         = \u63CF\u8FF0

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

@@ -633,55 +633,6 @@
 
         </menuContribution>
 
-        <!-- Database Navigator menu & toolbar -->
-        <menuContribution allPopups="false" locationURI="menu:org.jkiss.dbeaver.core.databaseNavigator">
-            <command commandId="org.jkiss.dbeaver.core.new.connection"/>
-            <command commandId="org.jkiss.dbeaver.core.driver.manager"/>
-            <separator name="projects" visible="true"/>
-            <menu label="%menu.org.jkiss.dbeaver.core.project.select.label" commandId="org.jkiss.dbeaver.core.project.select">
-                <dynamic id="org.jkiss.dbeaver.core.menu.project.active" class="org.jkiss.dbeaver.ui.navigator.actions.NavigatorActiveProjectContributor"/>
-            </menu>
-            <command commandId="org.jkiss.dbeaver.core.new.folder"/>
-            <separator name="additions" visible="true"/>
-            <command commandId="org.eclipse.ui.navigate.collapseAll" label="%command.org.eclipse.ui.navigate.collapseAll.name"/>
-            <command commandId="org.jkiss.dbeaver.core.navigator.linkeditor"/>
-            <command commandId="org.jkiss.dbeaver.core.navigator.preferences"/>
-        </menuContribution>
-
-        <menuContribution allPopups="false" locationURI="toolbar:org.jkiss.dbeaver.core.databaseNavigator">
-            <command commandId="org.jkiss.dbeaver.core.new.connection"/>
-            <command commandId="org.jkiss.dbeaver.core.new.folder"/>
-            <separator name="additions" visible="true"/>
-            <command commandId="org.eclipse.ui.navigate.collapseAll"/>
-            <command commandId="org.jkiss.dbeaver.core.navigator.linkeditor"/>
-        </menuContribution>
-
-        <!-- Project Navigator menu & toolbar -->
-        <menuContribution allPopups="false" locationURI="menu:org.jkiss.dbeaver.core.projectNavigator">
-            <command commandId="org.jkiss.dbeaver.core.project.create"/>
-            <command commandId="org.jkiss.dbeaver.core.project.refresh"/>
-            <separator name="additions" visible="true"/>
-            <command commandId="org.eclipse.ui.navigate.collapseAll" label="%command.org.eclipse.ui.navigate.collapseAll.name" tooltip="%command.org.eclipse.ui.navigate.collapseAll.description"/>
-            <command commandId="org.jkiss.dbeaver.core.navigator.linkeditor"/>
-            <command commandId="org.jkiss.dbeaver.core.navigator.preferences"/>
-        </menuContribution>
-
-        <menuContribution allPopups="false" locationURI="toolbar:org.jkiss.dbeaver.core.projectNavigator">
-            <command commandId="org.jkiss.dbeaver.core.project.create"/>
-            <separator name="additions" visible="true"/>
-            <command commandId="org.eclipse.ui.navigate.collapseAll" label="%command.org.eclipse.ui.navigate.collapseAll.name"/>
-            <command commandId="org.jkiss.dbeaver.core.navigator.linkeditor"/>
-            <command commandId="org.jkiss.dbeaver.core.navigator.preferences"/>
-        </menuContribution>
-
-        <!-- Project explorer menu & toolbar -->
-        <menuContribution allPopups="false" locationURI="toolbar:org.jkiss.dbeaver.core.projectExplorer">
-            <command commandId="org.jkiss.dbeaver.core.navigator.view.configure"/>
-            <command commandId="org.eclipse.ui.navigate.collapseAll" label="%command.org.eclipse.ui.navigate.collapseAll.name "/>
-            <command commandId="org.eclipse.ui.navigate.expandAll" label="%command.org.eclipse.ui.navigate.expandAll.name "/>
-            <command commandId="org.jkiss.dbeaver.core.navigator.linkeditor"/>
-        </menuContribution>
-
         <!-- All Context menus -->
         <menuContribution allPopups="false" locationURI="popup:org.eclipse.ui.popup.any?after=navigator_additions">
             <command commandId="org.jkiss.dbeaver.core.connect">
@@ -901,130 +852,6 @@
             <dynamic id="org.jkiss.dbeaver.core.menu.project.active" class="org.jkiss.dbeaver.ui.navigator.actions.NavigatorActiveProjectContributor"/>
         </menuContribution>
 
-        <!-- SQL editor menu -->
-        <menuContribution allPopups="false" locationURI="menu:org.eclipse.ui.main.menu?after=additions">
-            <menu id="SQLEditorMenu" label="%menu.sqleditor">
-                <command commandId="org.jkiss.dbeaver.core.sql.editor.open"/>
-                <command commandId="org.jkiss.dbeaver.core.sql.editor.recent"/>
-                <command commandId="org.jkiss.dbeaver.core.sql.editor.create"/>
-                <separator name="execute" visible="true"/>
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.statement">
-                    <visibleWhen>
-                        <with variable="activeEditor">
-                            <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
-                        </with>
-                    </visibleWhen>
-                </command>
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.statementNew">
-                    <visibleWhen>
-                        <with variable="activeEditor">
-                            <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
-                        </with>
-                    </visibleWhen>
-                </command>
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.script">
-                    <visibleWhen>
-                        <with variable="activeEditor">
-                            <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
-                        </with>
-                    </visibleWhen>
-                </command>
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.scriptNew">
-                    <visibleWhen>
-                        <with variable="activeEditor">
-                            <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
-                        </with>
-                    </visibleWhen>
-                </command>
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.count">
-                    <visibleWhen>
-                        <with variable="activeEditor">
-                            <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
-                        </with>
-                    </visibleWhen>
-                </command>
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.all.rows">
-                    <visibleWhen>
-                        <with variable="activeEditor">
-                            <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
-                        </with>
-                    </visibleWhen>
-                </command>
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.expression">
-                    <visibleWhen>
-                        <with variable="activeEditor">
-                            <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
-                        </with>
-                    </visibleWhen>
-                </command>
-                <separator name="query" visible="true"/>
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.explain">
-                    <visibleWhen>
-                        <with variable="activeEditor">
-                            <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
-                        </with>
-                    </visibleWhen>
-                </command>
-                <separator name="files" visible="true"/>
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.open.file">
-                    <visibleWhen>
-                        <with variable="activeEditor">
-                            <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
-                        </with>
-                    </visibleWhen>
-                </command>
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.save.file">
-                    <visibleWhen>
-                        <with variable="activeEditor">
-                            <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
-                        </with>
-                    </visibleWhen>
-                </command>
-                <separator name="misc" visible="true"/>
-                <command commandId="org.jkiss.dbeaver.ui.tools.select.connection"/>
-                <command commandId="org.jkiss.dbeaver.ui.tools.select.schema"/>
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.toggle.result.panel"/>
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.maximize.result.panel" style="push"/>
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.switch.panel"/>
-            </menu>
-        </menuContribution>
-
-        <menuContribution allPopups="false" locationURI="popup:org.jkiss.dbeaver.ui.editors.sql.SQLEditor.EditorContext?after=sql.additions">
-            <menu id="org.jkiss.dbeaver.ui.editors.sql.SQLEditor.execute" label="%menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.execute.label" icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/sql/sql_exec.png">
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.statement"/>
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.statementNew"/>
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.script"/>
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.scriptNew"/>
-                <separator name="additions_extra" visible="true"/>
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.count"/>
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.all.rows"/>
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.expression"/>
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.explain"/>
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.export.data"/>
-                <separator name="additions_active_object" visible="true"/>
-                <command commandId="org.jkiss.dbeaver.ui.tools.select.connection"/>
-                <command commandId="org.jkiss.dbeaver.ui.tools.select.schema"/>
-            </menu>
-            <menu id="org.jkiss.dbeaver.ui.editors.sql.SQLEditor.file" label="%menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.file.label">
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.rename"/>
-                <command commandId="org.eclipse.ui.file.revert"/>
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.open.file"/>
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.save.file"/>
-            </menu>
-        </menuContribution>
-        <menuContribution allPopups="false" locationURI="popup:org.jkiss.dbeaver.ui.editors.sql.SQLEditor.EditorContext?after=sql.extras">
-            <menu id="org.jkiss.dbeaver.ui.editors.sql.SQLEditor.layout" label="%menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.layout.label">
-                <dynamic id="org.jkiss.dbeaver.ui.editors.sql.SQLEditor.layout.resultSet.orientation" class="org.jkiss.dbeaver.ui.editors.sql.SQLEditor$ResultSetOrientationMenuContributor"/>
-                <separator name="layout_toggles" visible="true"/>
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.toggle.result.panel"/>
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.maximize.result.panel"/>
-                <command commandId="org.jkiss.dbeaver.ui.editors.sql.switch.panel"/>
-            </menu>
-        </menuContribution>
-        <menuContribution allPopups="false" locationURI="popup:org.jkiss.dbeaver.ui.editors.sql.SQLEditor.EditorContext?after=group.copy">
-            <command commandId="org.jkiss.dbeaver.core.edit.copy.special"/>
-        </menuContribution>
-
         <!-- QM menu & toolbar -->
 
         <menuContribution allPopups="false" locationURI="menu:org.jkiss.dbeaver.core.queryManager">

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

@@ -91,3 +91,8 @@ command.org.jkiss.dbeaver.ui.editors.sql.rename.name=Rename SQL Script
 command.org.jkiss.dbeaver.ui.editors.sql.rename.description=Rename current SQL script
 command.org.jkiss.dbeaver.ui.editors.sql.close.tab.name=Close tab
 command.org.jkiss.dbeaver.ui.editors.sql.close.tab.description=Close results tab
+
+menu.sqleditor=&SQL Editor
+menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.execute.label = Execute
+menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.file.label = File
+menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.layout.label = Layout

plugins/org.jkiss.dbeaver.ui.editors.sql/OSGI-INF/l10n/bundle_de.properties

@@ -82,3 +82,8 @@ command.org.jkiss.dbeaver.ui.editors.sql.word.wrap.description              = Ze
 command.org.jkiss.dbeaver.ui.editors.sql.word.wrap.name                     = Zeilenumbruch umschalten
 command.org.jkiss.dbeaver.ui.editors.text.content.format.description        = Text formatieren
 command.org.jkiss.dbeaver.ui.editors.text.content.format.name               = Inhaltsformatierung
+
+menu.sqleditor                                                = &SQL-Editor
+menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.execute.label = Ausf\u00FChren
+menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.file.label    = Datei
+menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.layout.label  = Layout

plugins/org.jkiss.dbeaver.ui.editors.sql/OSGI-INF/l10n/bundle_es.properties

@@ -18,3 +18,5 @@ command.org.jkiss.dbeaver.ui.editors.sql.save.file.name = Grabar script SQL
 command.org.jkiss.dbeaver.ui.editors.sql.save.file.description = Grabar a fichero
 command.org.jkiss.dbeaver.ui.editors.text.content.format.name = Formatear contenidp
 command.org.jkiss.dbeaver.ui.editors.text.content.format.description = Formatear texto
+
+menu.sqleditor = Editor SQL

plugins/org.jkiss.dbeaver.ui.editors.sql/OSGI-INF/l10n/bundle_fr.properties

@@ -83,3 +83,8 @@ command.org.jkiss.dbeaver.ui.editors.sql.show.output.name                 = Affi
 command.org.jkiss.dbeaver.ui.editors.sql.show.output.description          = Afficher la console de sortie serveur
 command.org.jkiss.dbeaver.ui.editors.sql.show.log.name                    = Afficher le journal d'ex\u00E9cution
 command.org.jkiss.dbeaver.ui.editors.sql.show.log.description             = Afficher le journal d'ex\u00E9cution SQL
+
+menu.sqleditor             = Editeur &SQL
+menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.execute.label = Ex\u00E9cuter
+menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.file.label = Fichier
+menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.layout.label = Agencement

plugins/org.jkiss.dbeaver.ui.editors.sql/OSGI-INF/l10n/bundle_it.properties

@@ -19,3 +19,5 @@ command.org.jkiss.dbeaver.ui.editors.sql.save.file.name = Salva script SQL
 command.org.jkiss.dbeaver.ui.editors.sql.save.file.description = Salva su file
 command.org.jkiss.dbeaver.ui.editors.text.content.format.name = Formatta contenuto
 command.org.jkiss.dbeaver.ui.editors.text.content.format.description = Formatta testo
+
+menu.sqleditor = Editor SQL

plugins/org.jkiss.dbeaver.ui.editors.sql/OSGI-INF/l10n/bundle_ja.properties

@@ -87,3 +87,7 @@ command.org.jkiss.dbeaver.ui.editors.sql.close.tab.description=\u7D50\u679C\u30B
 command.org.jkiss.dbeaver.ui.editors.text.content.format.name=\u30B3\u30F3\u30C6\u30F3\u30C4\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8
 command.org.jkiss.dbeaver.ui.editors.text.content.format.description=\u30C6\u30AD\u30B9\u30C8\u306E\u66F8\u5F0F\u8A2D\u5B9A
 
+menu.sqleditor=SQL\u30A8\u30C7\u30A3\u30BF
+menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.execute.label =\u5B9F\u884C\u3059\u308B
+menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.file.label =\u30D5\u30A1\u30A4\u30EB
+menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.layout.label =\u30EC\u30A4\u30A2\u30A6\u30C8

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

@@ -69,3 +69,8 @@ command.org.jkiss.dbeaver.ui.editors.sql.word.wrap.description              = \u
 command.org.jkiss.dbeaver.ui.editors.sql.word.wrap.name                     = \u0412\u043A\u043B/\u0432\u044B\u043A\u043B \u043F\u0435\u0440\u0435\u043D\u043E\u0441 \u0441\u0442\u0440\u043E\u043A
 command.org.jkiss.dbeaver.ui.editors.text.content.format.description        = \u041E\u0442\u0444\u043E\u0440\u043C\u0430\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0442\u0435\u043A\u0441\u0442
 command.org.jkiss.dbeaver.ui.editors.text.content.format.name               = \u0424\u043E\u0440\u043C\u0430\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0442\u0435\u043A\u0441\u0442
+
+menu.sqleditor                                                = \u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 SQL
+menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.execute.label = \u0412\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C
+menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.file.label    = \u0424\u0430\u0439\u043B
+menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.layout.label  = \u0420\u0430\u0441\u043F\u043E\u043B\u043E\u0436\u0435\u043D\u0438\u0435

plugins/org.jkiss.dbeaver.ui.editors.sql/OSGI-INF/l10n/bundle_zh.properties

@@ -91,3 +91,8 @@ command.org.jkiss.dbeaver.ui.editors.sql.word.wrap.description              = \u
 command.org.jkiss.dbeaver.ui.editors.sql.word.wrap.name                     = \u5207\u6362\u81EA\u52A8\u6362\u884C
 command.org.jkiss.dbeaver.ui.editors.text.content.format.description        = \u683C\u5F0F\u5316\u6587\u672C
 command.org.jkiss.dbeaver.ui.editors.text.content.format.name               = \u5185\u5BB9\u683C\u5F0F\u5316
+
+menu.sqleditor                                                = &SQL \u7F16\u8F91\u5668
+menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.execute.label = \u6267\u884C
+menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.file.label    = \u6587\u4EF6
+menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.layout.label  = \u5E03\u5C40

plugins/org.jkiss.dbeaver.ui.editors.sql/plugin.xml

@@ -579,4 +579,130 @@
         <key commandId="org.jkiss.dbeaver.core.sql.editor.create" contextId="org.jkiss.dbeaver.ui.perspective" schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" sequence="CTRL+]"/>
     </extension>
 
+    <extension point="org.eclipse.ui.menus">
+        <!-- SQL editor menu -->
+        <menuContribution allPopups="false" locationURI="menu:org.eclipse.ui.main.menu?after=additions">
+            <menu id="SQLEditorMenu" label="%menu.sqleditor">
+                <command commandId="org.jkiss.dbeaver.core.sql.editor.open"/>
+                <command commandId="org.jkiss.dbeaver.core.sql.editor.recent"/>
+                <command commandId="org.jkiss.dbeaver.core.sql.editor.create"/>
+                <separator name="execute" visible="true"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.statement">
+                    <visibleWhen>
+                        <with variable="activeEditor">
+                            <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
+                        </with>
+                    </visibleWhen>
+                </command>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.statementNew">
+                    <visibleWhen>
+                        <with variable="activeEditor">
+                            <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
+                        </with>
+                    </visibleWhen>
+                </command>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.script">
+                    <visibleWhen>
+                        <with variable="activeEditor">
+                            <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
+                        </with>
+                    </visibleWhen>
+                </command>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.scriptNew">
+                    <visibleWhen>
+                        <with variable="activeEditor">
+                            <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
+                        </with>
+                    </visibleWhen>
+                </command>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.count">
+                    <visibleWhen>
+                        <with variable="activeEditor">
+                            <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
+                        </with>
+                    </visibleWhen>
+                </command>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.all.rows">
+                    <visibleWhen>
+                        <with variable="activeEditor">
+                            <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
+                        </with>
+                    </visibleWhen>
+                </command>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.expression">
+                    <visibleWhen>
+                        <with variable="activeEditor">
+                            <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
+                        </with>
+                    </visibleWhen>
+                </command>
+                <separator name="query" visible="true"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.explain">
+                    <visibleWhen>
+                        <with variable="activeEditor">
+                            <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
+                        </with>
+                    </visibleWhen>
+                </command>
+                <separator name="files" visible="true"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.open.file">
+                    <visibleWhen>
+                        <with variable="activeEditor">
+                            <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
+                        </with>
+                    </visibleWhen>
+                </command>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.save.file">
+                    <visibleWhen>
+                        <with variable="activeEditor">
+                            <instanceof value="org.jkiss.dbeaver.ui.editors.sql.SQLEditor"/>
+                        </with>
+                    </visibleWhen>
+                </command>
+                <separator name="misc" visible="true"/>
+                <command commandId="org.jkiss.dbeaver.ui.tools.select.connection"/>
+                <command commandId="org.jkiss.dbeaver.ui.tools.select.schema"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.toggle.result.panel"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.maximize.result.panel" style="push"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.switch.panel"/>
+            </menu>
+        </menuContribution>
+
+        <menuContribution allPopups="false" locationURI="popup:org.jkiss.dbeaver.ui.editors.sql.SQLEditor.EditorContext?after=sql.additions">
+            <menu id="org.jkiss.dbeaver.ui.editors.sql.SQLEditor.execute" label="%menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.execute.label" icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/sql/sql_exec.png">
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.statement"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.statementNew"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.script"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.scriptNew"/>
+                <separator name="additions_extra" visible="true"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.count"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.all.rows"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.expression"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.explain"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.export.data"/>
+                <separator name="additions_active_object" visible="true"/>
+                <command commandId="org.jkiss.dbeaver.ui.tools.select.connection"/>
+                <command commandId="org.jkiss.dbeaver.ui.tools.select.schema"/>
+            </menu>
+            <menu id="org.jkiss.dbeaver.ui.editors.sql.SQLEditor.file" label="%menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.file.label">
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.rename"/>
+                <command commandId="org.eclipse.ui.file.revert"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.open.file"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.save.file"/>
+            </menu>
+        </menuContribution>
+        <menuContribution allPopups="false" locationURI="popup:org.jkiss.dbeaver.ui.editors.sql.SQLEditor.EditorContext?after=sql.extras">
+            <menu id="org.jkiss.dbeaver.ui.editors.sql.SQLEditor.layout" label="%menu.org.jkiss.dbeaver.ui.editors.sql.SQLEditor.layout.label">
+                <dynamic id="org.jkiss.dbeaver.ui.editors.sql.SQLEditor.layout.resultSet.orientation" class="org.jkiss.dbeaver.ui.editors.sql.SQLEditor$ResultSetOrientationMenuContributor"/>
+                <separator name="layout_toggles" visible="true"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.toggle.result.panel"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.maximize.result.panel"/>
+                <command commandId="org.jkiss.dbeaver.ui.editors.sql.switch.panel"/>
+            </menu>
+        </menuContribution>
+        <menuContribution allPopups="false" locationURI="popup:org.jkiss.dbeaver.ui.editors.sql.SQLEditor.EditorContext?after=group.copy">
+            <command commandId="org.jkiss.dbeaver.core.edit.copy.special"/>
+        </menuContribution>
+    </extension>
+
 </plugin>

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

@@ -75,3 +75,4 @@ command.org.jkiss.dbeaver.core.object.move.up.description=Move object up
 command.org.jkiss.dbeaver.core.object.move.down.name=Move down
 command.org.jkiss.dbeaver.core.object.move.down.description=Move object down
 
+menu.org.jkiss.dbeaver.core.project.select.label = Active Project

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

@@ -65,3 +65,5 @@ command.org.jkiss.dbeaver.core.resource.link.file.name                      = Da
 commandParameter.org.jkiss.dbeaver.core.resource.link.file.contenttype.name = Verkn\u00FCpfter Dateiinhaltstyp
 command.org.jkiss.dbeaver.core.resource.link.folder.description             = Erstellt eine Verkn\u00FCpfung auf einen Ordner im Dateisystem
 command.org.jkiss.dbeaver.core.resource.link.folder.name                    = Ordnerverkn\u00FCpfung erstellen
+
+menu.org.jkiss.dbeaver.core.project.select.label              = Aktives Projekt

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

@@ -62,3 +62,5 @@ command.org.jkiss.dbeaver.core.resource.link.file.description             = Cr\u
 commandParameter.org.jkiss.dbeaver.core.resource.link.file.contenttype.name=Type de contenu du fichier li\u00E9
 command.org.jkiss.dbeaver.core.resource.link.folder.description           = Cr\u00E9er un lien vers un r\u00E9pertoire du syst\u00E8me
 command.org.jkiss.dbeaver.core.resource.link.folder.name                  = Cr\u00E9er un lien vers un r\u00E9pertoire
+
+menu.org.jkiss.dbeaver.core.project.select.label = Projet actif

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

@@ -61,3 +61,4 @@ command.org.jkiss.dbeaver.core.object.move.up.description=\u30AA\u30D6\u30B8\u30
 command.org.jkiss.dbeaver.core.object.move.down.name=\u4E0B\u306B\u79FB\u52D5
 command.org.jkiss.dbeaver.core.object.move.down.description=\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u4E0B\u306B\u79FB\u52D5\u3059\u308B
 
+menu.org.jkiss.dbeaver.core.project.select.label =\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8

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

@@ -33,3 +33,5 @@ command.org.jkiss.dbeaver.core.resource.link.file.name                      = \u
 commandParameter.org.jkiss.dbeaver.core.resource.link.file.contenttype.name = Linked file content type
 command.org.jkiss.dbeaver.core.resource.link.folder.description             = \u0421\u043E\u0437\u0434\u0430\u0442\u044C \u0441\u0441\u044B\u043B\u043A\u0443 \u043D\u0430 \u043F\u0430\u043F\u043A\u0443 \u0432 \u0444\u0430\u0439\u043B\u043E\u0432\u043E\u0439 \u0441\u0438\u0441\u0442\u0435\u043C\u0435
 command.org.jkiss.dbeaver.core.resource.link.folder.name                    = \u0421\u043E\u0437\u0434\u0430\u0442\u044C \u0441\u0441\u044B\u043B\u043A\u0443 \u043D\u0430 \u043F\u0430\u043F\u043A\u0443
+
+menu.org.jkiss.dbeaver.core.project.select.label              = \u0410\u043A\u0442\u0438\u0432\u043D\u044B\u0439 \u043F\u0440\u043E\u0435\u043A\u0442

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

@@ -65,3 +65,5 @@ command.org.jkiss.dbeaver.core.resource.link.file.name                      = \u
 commandParameter.org.jkiss.dbeaver.core.resource.link.file.contenttype.name = \u94FE\u63A5\u6587\u4EF6\u7684\u5185\u5BB9\u7C7B\u578B
 command.org.jkiss.dbeaver.core.resource.link.folder.description             = \u521B\u5EFA\u5230\u6587\u4EF6\u5939\u7684\u94FE\u63A5
 command.org.jkiss.dbeaver.core.resource.link.folder.name                    = \u94FE\u63A5\u6587\u4EF6\u5939
+
+menu.org.jkiss.dbeaver.core.project.select.label              = \u6D3B\u52A8\u9879\u76EE

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

@@ -654,4 +654,57 @@
         </handler>
 
     </extension>
+
+    <extension point="org.eclipse.ui.menus">
+        <!-- Database Navigator menu & toolbar -->
+        <menuContribution allPopups="false" locationURI="menu:org.jkiss.dbeaver.core.databaseNavigator">
+            <command commandId="org.jkiss.dbeaver.core.new.connection"/>
+            <command commandId="org.jkiss.dbeaver.core.driver.manager"/>
+            <separator name="projects" visible="true"/>
+            <menu commandId="org.jkiss.dbeaver.core.project.select" label="%menu.org.jkiss.dbeaver.core.project.select.label">
+                <dynamic id="org.jkiss.dbeaver.core.menu.project.active" class="org.jkiss.dbeaver.ui.navigator.actions.NavigatorActiveProjectContributor"/>
+            </menu>
+            <command commandId="org.jkiss.dbeaver.core.new.folder"/>
+            <separator name="additions" visible="true"/>
+            <command commandId="org.eclipse.ui.navigate.collapseAll"/>
+            <command commandId="org.jkiss.dbeaver.core.navigator.linkeditor"/>
+            <command commandId="org.jkiss.dbeaver.core.navigator.preferences"/>
+        </menuContribution>
+
+        <menuContribution allPopups="false" locationURI="toolbar:org.jkiss.dbeaver.core.databaseNavigator">
+            <command commandId="org.jkiss.dbeaver.core.new.connection"/>
+            <command commandId="org.jkiss.dbeaver.core.new.folder"/>
+            <separator name="additions" visible="true"/>
+            <command commandId="org.eclipse.ui.navigate.collapseAll"/>
+            <command commandId="org.jkiss.dbeaver.core.navigator.linkeditor"/>
+        </menuContribution>
+
+        <!-- Project Navigator menu & toolbar -->
+        <menuContribution allPopups="false" locationURI="menu:org.jkiss.dbeaver.core.projectNavigator">
+            <command commandId="org.jkiss.dbeaver.core.project.create"/>
+            <command commandId="org.jkiss.dbeaver.core.project.refresh"/>
+            <separator name="additions" visible="true"/>
+            <command commandId="org.eclipse.ui.navigate.collapseAll"/>
+            <command commandId="org.jkiss.dbeaver.core.navigator.linkeditor"/>
+            <command commandId="org.jkiss.dbeaver.core.navigator.preferences"/>
+        </menuContribution>
+
+        <menuContribution allPopups="false" locationURI="toolbar:org.jkiss.dbeaver.core.projectNavigator">
+            <command commandId="org.jkiss.dbeaver.core.project.create"/>
+            <separator name="additions" visible="true"/>
+            <command commandId="org.eclipse.ui.navigate.collapseAll"/>
+            <command commandId="org.jkiss.dbeaver.core.navigator.linkeditor"/>
+            <command commandId="org.jkiss.dbeaver.core.navigator.preferences"/>
+        </menuContribution>
+
+        <!-- Project explorer menu & toolbar -->
+        <menuContribution allPopups="false" locationURI="toolbar:org.jkiss.dbeaver.core.projectExplorer">
+            <command commandId="org.jkiss.dbeaver.core.navigator.view.configure"/>
+            <command commandId="org.eclipse.ui.navigate.collapseAll"/>
+            <command commandId="org.eclipse.ui.navigate.expandAll"/>
+            <command commandId="org.jkiss.dbeaver.core.navigator.linkeditor"/>
+        </menuContribution>
+
+    </extension>
+
 </plugin>