#3753 Database search pages contributions

Former-commit-id: a182063f

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

@@ -10,8 +10,6 @@ view.project.explorer.title=\u0410\u043A\u0442\u0438\u0432\u043D\u044B\u0439 \u0
 view.query.manager.title=\u041C\u0435\u043D\u0435\u0434\u0436\u0435\u0440 \u0437\u0430\u043F\u0440\u043E\u0441\u043E\u0432
 view.shell.process.title=\u041F\u0440\u043E\u0446\u0435\u0441\u0441
 
-menu.navigate=\u041D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F
-
 editor.sql.name=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 SQL
 editor.entity.name=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u0441\u0443\u0449\u043D\u043E\u0441\u0442\u0438
 editor.lob.name=Large Object Editor
@@ -164,6 +162,8 @@ DateFormatter.number.general.minFractDigits.description=Minimum fraction digits
 DateFormatter.number.general.roundingMode.label=\u0420\u0435\u0436\u0438\u043C \u043E\u043A\u0440\u0443\u0433\u043B\u0435\u043D\u0438\u044F
 DateFormatter.number.general.roundingMode.description=\u0420\u0435\u0436\u0438\u043C \u043E\u043A\u0440\u0443\u0433\u043B\u0435\u043D\u0438\u044F
 
+menu.navigate=\u041D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F
+menu.search=\u041F\u043E\u0438\u0441\u043A
 menu.database=\u0411\u0430\u0437\u0430 \u0434\u0430\u043D\u043D\u044B\u0445
 menu.database.tools=\u0418\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u044B
 menu.database.sql.generate=\u0413\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u0442\u044C SQL
@@ -244,4 +244,8 @@ command.org.jkiss.dbeaver.core.resultset.export.name=\u042D\u043A\u0441\u043F\u0
 command.org.jkiss.dbeaver.ui.tools.select.connection.name=\u041F\u043E\u043C\u0435\u043D\u044F\u0442\u044C \u0430\u043A\u0442\u0438\u0432\u043D\u043E\u0435 \u0441\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u0435
 command.org.jkiss.dbeaver.ui.tools.select.schema.name=\u041F\u043E\u043C\u0435\u043D\u044F\u0442\u044C \u0430\u043A\u0442\u0438\u0432\u043D\u0443\u044E \u0441\u0445\u0435\u043C\u0443
 command.org.jkiss.dbeaver.ui.tools.menu.name=\u0418\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u044B
+
 content-type.org.jkiss.dbeaver.bookmark.name=\u0417\u0430\u043A\u043B\u0430\u0434\u043A\u0430
+
+search.page.label.db.metadata = \u041F\u043E\u0438\u0441\u043A \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432 \u0411\u0414
+search.page.label.db.fulltext = \u041F\u043E\u043B\u043D\u043E\u0442\u0435\u043A\u0441\u0442\u043E\u0432\u044B\u0439 \u043F\u043E\u0438\u0441\u043A \u0411\u0414

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

@@ -199,8 +199,15 @@
             <separator name="settings" visible="true"/>
             <command commandId="org.eclipse.ui.window.preferences" label="%command.org.jkiss.dbeaver.core.window.preferences.name"/>
         </menuContribution>
+
+        <!-- Main toolbar -->
+
+        <menuContribution allPopups="false" locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
+        </menuContribution>
     </extension>
 
+    <!-- Keybindings. A bit different than standard -->
+
     <extension point="org.eclipse.ui.bindings">
         <scheme description="%productName" id="org.jkiss.dbeaver.defaultKeyScheme" name="%productName" parentId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
 

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

@@ -36,8 +36,6 @@ view.shell.process.title=Process
 view.sql.results.title=Data
 view.database.output.title=Output
 
-menu.navigate=Navigate
-
 language.en.label=English
 language.zh.label=Chinese
 language.ru.label=Russian
@@ -346,6 +344,8 @@ DateFormatter.number.general.useTypeScale.description=Use column/attribute data
 DateFormatter.number.general.roundingMode.label=Rounding mode
 DateFormatter.number.general.roundingMode.description=Rounding mode
 
+menu.navigate=Navigate
+menu.search=Se&arch
 menu.database=&Database
 menu.database.tools=Tools
 menu.database.sql.generate=Generate SQL

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

@@ -2507,6 +2507,43 @@
         </menuContribution>
     </extension>
 
+
+    <!-- Legacy action sets. We have to use them to manage Eclipse search framework. -->
+
+    <extension point="org.eclipse.ui.actionSets">
+        <actionSet
+                id="org.jkiss.dbeaver.search.searchActionSet"
+                label="DBeaver Search"
+                visible="true">
+            <!-- Some ancient Eclipse bug makes us to do this crazy things.
+            Redefine search menu placeholders. Otherwise it doesn't work. -->
+            <menu
+                    label="%menu.search"
+                    path="navigate"
+                    id="org.eclipse.search.menu">
+                <groupMarker name="internalDialogGroup"/>   <!-- not to be used by clients  -->
+                <groupMarker name="dialogGroup"/>           <!-- to be used by clients      -->
+                <separator name="fileSearchContextMenuActionsGroup"/> <!-- to be used by clients      -->
+                <separator name="contextMenuActionsGroup"/> <!-- to be used by clients -->
+                <separator name="occurencesActionsGroup"/> <!-- to be used by clients -->
+                <separator name="extraSearchGroup"/> <!-- to be used by clients -->
+            </menu>
+
+            <action id="org.jkiss.dbeaver.search.OpenDataSearchPage"
+                    definitionId="org.jkiss.dbeaver.search.OpenDataSearchPage"
+                    menubarPath="org.eclipse.search.menu/dialogGroup"
+                    label="%search.page.label.db.fulltext"
+                    icon="icons/search/data.png"
+                    class="org.jkiss.dbeaver.ui.search.data.OpenDataSearchPageAction"/>
+            <action id="org.jkiss.dbeaver.search.OpenMetadataSearchPage"
+                    definitionId="org.jkiss.dbeaver.search.OpenMetadataSearchPage"
+                    menubarPath="org.eclipse.search.menu/dialogGroup"
+                    label="%search.page.label.db.metadata"
+                    icon="icons/search/metadata.png"
+                    class="org.jkiss.dbeaver.ui.search.metadata.OpenMetadataSearchPageAction"/>
+        </actionSet>
+    </extension>
+
     <extension point="org.eclipse.ui.bindings">
 
         <key commandId="org.jkiss.dbeaver.ui.tools.menu" schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" sequence="ALT+`"/>

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/search/data/OpenDataSearchPageAction.java

+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jkiss.dbeaver.ui.search.data;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+
+import org.eclipse.search.ui.NewSearchUI;
+
+/**
+ * Opens the data search dialog.
+ */
+public class OpenDataSearchPageAction implements IWorkbenchWindowActionDelegate {
+
+	private static final String DATA_SEARCH_PAGE_ID = SearchDataPage.class.getName();
+
+	private IWorkbenchWindow fWindow;
+
+	public OpenDataSearchPageAction() {
+	}
+
+	@Override
+	public void init(IWorkbenchWindow window) {
+		fWindow= window;
+	}
+
+	@Override
+	public void run(IAction action) {
+		if (fWindow == null || fWindow.getActivePage() == null) {
+			return;
+		}
+		NewSearchUI.openSearchDialog(fWindow, DATA_SEARCH_PAGE_ID);
+	}
+
+	@Override
+	public void selectionChanged(IAction action, ISelection selection) {
+		// do nothing since the action isn't selection dependent.
+	}
+
+	@Override
+	public void dispose() {
+		fWindow= null;
+	}
+
+}

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/search/metadata/OpenMetadataSearchPageAction.java

+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jkiss.dbeaver.ui.search.metadata;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.search.ui.NewSearchUI;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.jkiss.dbeaver.ui.search.data.SearchDataPage;
+
+/**
+ * Opens the data search dialog.
+ */
+public class OpenMetadataSearchPageAction implements IWorkbenchWindowActionDelegate {
+
+	private static final String DATA_SEARCH_PAGE_ID = SearchMetadataPage.class.getName();
+
+	private IWorkbenchWindow fWindow;
+
+	public OpenMetadataSearchPageAction() {
+	}
+
+	@Override
+	public void init(IWorkbenchWindow window) {
+		fWindow= window;
+	}
+
+	@Override
+	public void run(IAction action) {
+		if (fWindow == null || fWindow.getActivePage() == null) {
+			return;
+		}
+		NewSearchUI.openSearchDialog(fWindow, DATA_SEARCH_PAGE_ID);
+	}
+
+	@Override
+	public void selectionChanged(IAction action, ISelection selection) {
+		// do nothing since the action isn't selection dependent.
+	}
+
+	@Override
+	public void dispose() {
+		fWindow= null;
+	}
+
+}