Search results view

Former-commit-id: 483dd492

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

@@ -25,6 +25,7 @@ productIcon=icons/dbeaver.png
 
 view.progress.title=Background Tasks
 view.templates.title=Templates
+view.search.title=Search
 
 menu.edit=Edit
 menu.navigate=Navigate

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

@@ -42,22 +42,27 @@
 
     <extension point="org.eclipse.ui.views">
         <view id="org.eclipse.ui.views.ProgressView"
-                icon="icons/progress_view.png"
-                category="org.eclipse.ui"
-                class="org.eclipse.ui.ExtensionFactory:progressView"
-                name="%view.progress.title"/>
+            icon="icons/progress_view.png"
+            category="org.eclipse.ui"
+            class="org.eclipse.ui.ExtensionFactory:progressView"
+            name="%view.progress.title"/>
         <view id="org.eclipse.ui.texteditor.TemplatesView"
-              name="%view.templates.title"
-              icon="icons/templates_view.png"
-              category="org.eclipse.ui"
-              class="org.eclipse.ui.texteditor.templates.TemplatesView"/>
+            name="%view.templates.title"
+            icon="icons/templates_view.png"
+            category="org.eclipse.ui"
+            class="org.eclipse.ui.texteditor.templates.TemplatesView"/>
         <view
-                id="org.eclipse.help.ui.HelpView"
-                category="org.jkiss.dbeaver.core.category"
-                class="org.jkiss.dbeaver.ui.help.LightweightHelpView"
-                allowMultiple="false"
-                icon="icons/help.png"
-                name="Help"/>
+            id="org.eclipse.help.ui.HelpView"
+            category="org.jkiss.dbeaver.core.category"
+            class="org.jkiss.dbeaver.ui.help.LightweightHelpView"
+            allowMultiple="false"
+            icon="icons/help.png"
+            name="Help"/>
+        <view id="org.jkiss.dbeaver.ui.search.SearchDatabaseObjectsView"
+            name="%view.search.title"
+            icon="platform:/plugin/org.jkiss.dbeaver.core/icons/misc/find.png"
+            category="org.eclipse.ui"
+            class="org.jkiss.dbeaver.ui.search.SearchDatabaseObjectsView"/>
     </extension>
 
     <extension point="org.eclipse.ui.handlers">

plugins/org.jkiss.dbeaver.core.application/plugin_ru.properties

@@ -25,6 +25,7 @@ productIcon=icons/dbeaver.png
 
 view.progress.title=\u0424\u043E\u043D\u043E\u0432\u044B\u0435 \u0437\u0430\u0434\u0430\u0447\u0438
 view.templates.title=\u0428\u0430\u0431\u043B\u043E\u043D\u044B
+view.search.title=\u041F\u043E\u0438\u0441\u043A
 
 menu.edit=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435
 menu.navigate=\u041D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F

plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/ui/search/SearchDatabaseObjectsView.java

 package org.jkiss.dbeaver.ui.search;
 
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
 import org.jkiss.dbeaver.ui.IHelpContextIds;
@@ -7,20 +10,32 @@ import org.jkiss.dbeaver.ui.UIUtils;
 
 public class SearchDatabaseObjectsView extends ViewPart
 {
-    public static final String VIEW_ID = "org.jkiss.dbeaver.core.searchResults";
+    public static final String VIEW_ID = "org.jkiss.dbeaver.ui.search.SearchDatabaseObjectsView";
+
+    private CTabFolder resultsFolder;
 
     @Override
     public void createPartControl(Composite parent)
     {
-        Composite group = UIUtils.createPlaceholder(parent, 1);
+        resultsFolder = new CTabFolder(parent, SWT.TOP);
 
-        UIUtils.setHelp(group, IHelpContextIds.CTX_SEARCH_RESULTS);
+        UIUtils.setHelp(resultsFolder, IHelpContextIds.CTX_SEARCH_RESULTS);
     }
 
     @Override
     public void setFocus()
     {
+        resultsFolder.setFocus();
+    }
+
+    public void addResults(IObjectSearchResultPage resultPage)
+    {
+        resultPage.createControl(resultsFolder);
 
+        CTabItem tabItem = new CTabItem(resultsFolder, SWT.NONE);
+        tabItem.setData(resultPage);
+        tabItem.setControl(resultPage.getControl());
+        //tabItem.setText(resultPage.getTitle());
     }
 
 }

plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF

@@ -107,7 +107,10 @@ Export-Package: org.apache.commons.logging,
  org.jkiss.dbeaver.ui.preferences,
  org.jkiss.dbeaver.ui.properties,
  org.jkiss.dbeaver.ui.properties.tabbed,
- org.jkiss.dbeaver.ui.search.database,
+ org.jkiss.dbeaver.ui.search,
+ org.jkiss.dbeaver.ui.search.data,
+ org.jkiss.dbeaver.ui.search.files,
+ org.jkiss.dbeaver.ui.search.metadata,
  org.jkiss.dbeaver.ui.views,
  org.jkiss.dbeaver.ui.views.navigator.database,
  org.jkiss.dbeaver.ui.views.navigator.database.load,