Database toolbar visibility fix (visible only in DBeaver perspective)

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

@@ -1742,15 +1742,29 @@
         <!-- Database toolbar -->
         <menuContribution allPopups="false" locationURI="toolbar:org.eclipse.ui.main.toolbar?before=additions">
             <toolbar id="dbeaver-general" label="%toolbar.dbeaver-general.label">
-                <command commandId="org.jkiss.dbeaver.core.new.connection" label="%command.org.jkiss.dbeaver.core.new.connection.name" tooltip="%command.org.jkiss.dbeaver.core.new.connection.description"/>
+                <command commandId="org.jkiss.dbeaver.core.new.connection" label="%command.org.jkiss.dbeaver.core.new.connection.name" tooltip="%command.org.jkiss.dbeaver.core.new.connection.description">
+                    <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
+                </command>
                 <separator name="sql-tools" visible="true"/>
-                <command commandId="org.jkiss.dbeaver.core.connect" label="%command.org.jkiss.dbeaver.core.connect.name"/>
-                <command commandId="org.jkiss.dbeaver.core.invalidate" label="%command.org.jkiss.dbeaver.core.invalidate.name"/>
-                <command commandId="org.jkiss.dbeaver.core.disconnect" label="%command.org.jkiss.dbeaver.core.disconnect.name"/>
+                <command commandId="org.jkiss.dbeaver.core.connect" label="%command.org.jkiss.dbeaver.core.connect.name">
+                    <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
+                </command>
+                <command commandId="org.jkiss.dbeaver.core.invalidate" label="%command.org.jkiss.dbeaver.core.invalidate.name">
+                    <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
+                </command>
+                <command commandId="org.jkiss.dbeaver.core.disconnect" label="%command.org.jkiss.dbeaver.core.disconnect.name">
+                    <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
+                </command>
                 <separator name="sql-tools" visible="true"/>
-                <command commandId="org.jkiss.dbeaver.core.sql.editor.open" label="%command.org.jkiss.dbeaver.core.sql.editor.open.name"/>
-                <command commandId="org.jkiss.dbeaver.core.sql.editor.recent" label="%command.org.jkiss.dbeaver.core.sql.editor.recent.name"/>
-                <command commandId="org.jkiss.dbeaver.core.sql.editor.create" label="%command.org.jkiss.dbeaver.core.sql.editor.create.name"/>
+                <command commandId="org.jkiss.dbeaver.core.sql.editor.open" label="%command.org.jkiss.dbeaver.core.sql.editor.open.name">
+                    <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
+                </command>
+                <command commandId="org.jkiss.dbeaver.core.sql.editor.recent" label="%command.org.jkiss.dbeaver.core.sql.editor.recent.name">
+                    <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
+                </command>
+                <command commandId="org.jkiss.dbeaver.core.sql.editor.create" label="%command.org.jkiss.dbeaver.core.sql.editor.create.name">
+                    <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
+                </command>
                 <separator name="additions" visible="false"/>
             </toolbar>
             <toolbar id="dbeaver-transactions" label="%toolbar.dbeaver-transactions.label">

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

@@ -2,8 +2,7 @@
 <?eclipse version="3.4"?>
 <plugin>
 
-   <extension
-         point="org.eclipse.core.expressions.definitions">
+   <extension point="org.eclipse.core.expressions.definitions">
       <definition id="DBeaverPerspectiveActive">
           <with variable="activeWorkbenchWindow.activePerspective">
               <equals value="org.jkiss.dbeaver.core.perspective"/>