Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
290e106b
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dbeaver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
290e106b
编写于
4月 08, 2017
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#1505 Close results tab command/shortcut
上级
6e52e4c2
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
57 addition
and
1 deletion
+57
-1
plugins/org.jkiss.dbeaver.core/plugin.properties
plugins/org.jkiss.dbeaver.core/plugin.properties
+2
-0
plugins/org.jkiss.dbeaver.core/plugin.xml
plugins/org.jkiss.dbeaver.core/plugin.xml
+5
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreCommands.java
...dbeaver.core/src/org/jkiss/dbeaver/core/CoreCommands.java
+1
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
....core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
+11
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/handlers/CloseTabHandler.java
...kiss/dbeaver/ui/editors/sql/handlers/CloseTabHandler.java
+38
-0
未找到文件。
plugins/org.jkiss.dbeaver.core/plugin.properties
浏览文件 @
290e106b
...
@@ -149,6 +149,8 @@ command.org.jkiss.dbeaver.ui.editors.sql.sync.auto.name=Auto-sync connection wit
...
@@ -149,6 +149,8 @@ command.org.jkiss.dbeaver.ui.editors.sql.sync.auto.name=Auto-sync connection wit
command.org.jkiss.dbeaver.ui.editors.sql.sync.auto.description
=
Auto-sync active connection with database navigator selection
command.org.jkiss.dbeaver.ui.editors.sql.sync.auto.description
=
Auto-sync active connection with database navigator selection
command.org.jkiss.dbeaver.ui.editors.sql.rename.name
=
Rename SQL Script
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.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
command.org.jkiss.dbeaver.core.export.data.name
=
Export Data
command.org.jkiss.dbeaver.core.export.data.name
=
Export Data
command.org.jkiss.dbeaver.core.export.data.description
=
Export data to file(s) or database table(s)
command.org.jkiss.dbeaver.core.export.data.description
=
Export data to file(s) or database table(s)
...
...
plugins/org.jkiss.dbeaver.core/plugin.xml
浏览文件 @
290e106b
...
@@ -262,6 +262,7 @@
...
@@ -262,6 +262,7 @@
<command
id=
"org.jkiss.dbeaver.ui.editors.sql.sync.connection"
name=
"%command.org.jkiss.dbeaver.ui.editors.sql.sync.connection.name"
description=
"%command.org.jkiss.dbeaver.ui.editors.sql.sync.connection.description"
categoryId=
"org.jkiss.dbeaver.core.sql"
/>
<command
id=
"org.jkiss.dbeaver.ui.editors.sql.sync.connection"
name=
"%command.org.jkiss.dbeaver.ui.editors.sql.sync.connection.name"
description=
"%command.org.jkiss.dbeaver.ui.editors.sql.sync.connection.description"
categoryId=
"org.jkiss.dbeaver.core.sql"
/>
<command
id=
"org.jkiss.dbeaver.ui.editors.sql.sync.auto"
name=
"%command.org.jkiss.dbeaver.ui.editors.sql.sync.auto.name"
description=
"%command.org.jkiss.dbeaver.ui.editors.sql.sync.auto.description"
categoryId=
"org.jkiss.dbeaver.core.sql"
/>
<command
id=
"org.jkiss.dbeaver.ui.editors.sql.sync.auto"
name=
"%command.org.jkiss.dbeaver.ui.editors.sql.sync.auto.name"
description=
"%command.org.jkiss.dbeaver.ui.editors.sql.sync.auto.description"
categoryId=
"org.jkiss.dbeaver.core.sql"
/>
<command
id=
"org.jkiss.dbeaver.ui.editors.sql.rename"
name=
"%command.org.jkiss.dbeaver.ui.editors.sql.rename.name"
description=
"%command.org.jkiss.dbeaver.ui.editors.sql.rename.description"
categoryId=
"org.jkiss.dbeaver.core.sql"
/>
<command
id=
"org.jkiss.dbeaver.ui.editors.sql.rename"
name=
"%command.org.jkiss.dbeaver.ui.editors.sql.rename.name"
description=
"%command.org.jkiss.dbeaver.ui.editors.sql.rename.description"
categoryId=
"org.jkiss.dbeaver.core.sql"
/>
<command
id=
"org.jkiss.dbeaver.ui.editors.sql.close.tab"
name=
"%command.org.jkiss.dbeaver.ui.editors.sql.close.tab.name"
description=
"%command.org.jkiss.dbeaver.ui.editors.sql.close.tab.description"
categoryId=
"org.jkiss.dbeaver.core.sql"
/>
<command
id=
"org.jkiss.dbeaver.core.export.data"
name=
"%command.org.jkiss.dbeaver.core.export.data.name"
description=
"%command.org.jkiss.dbeaver.core.export.data.description"
categoryId=
"org.jkiss.dbeaver.core.util"
/>
<command
id=
"org.jkiss.dbeaver.core.export.data"
name=
"%command.org.jkiss.dbeaver.core.export.data.name"
description=
"%command.org.jkiss.dbeaver.core.export.data.description"
categoryId=
"org.jkiss.dbeaver.core.util"
/>
<command
id=
"org.jkiss.dbeaver.core.import.data"
name=
"%command.org.jkiss.dbeaver.core.import.data.name"
description=
"%command.org.jkiss.dbeaver.core.import.data.description"
categoryId=
"org.jkiss.dbeaver.core.util"
/>
<command
id=
"org.jkiss.dbeaver.core.import.data"
name=
"%command.org.jkiss.dbeaver.core.import.data.name"
description=
"%command.org.jkiss.dbeaver.core.import.data.description"
categoryId=
"org.jkiss.dbeaver.core.util"
/>
...
@@ -1068,6 +1069,9 @@
...
@@ -1068,6 +1069,9 @@
</with>
</with>
</enabledWhen>
</enabledWhen>
</handler>
</handler>
<handler
commandId=
"org.jkiss.dbeaver.ui.editors.sql.close.tab"
class=
"org.jkiss.dbeaver.ui.editors.sql.handlers.CloseTabHandler"
>
<enabledWhen><reference
definitionId=
"org.jkiss.dbeaver.core.ui.sql.editor"
/></enabledWhen>
</handler>
<handler
commandId=
"org.jkiss.dbeaver.ui.editors.sql.navigate.object"
class=
"org.jkiss.dbeaver.ui.editors.sql.handlers.NavigateObjectHandler"
>
<handler
commandId=
"org.jkiss.dbeaver.ui.editors.sql.navigate.object"
class=
"org.jkiss.dbeaver.ui.editors.sql.handlers.NavigateObjectHandler"
>
<enabledWhen>
<enabledWhen>
<with
variable=
"activeEditor"
>
<with
variable=
"activeEditor"
>
...
@@ -2128,6 +2132,7 @@
...
@@ -2128,6 +2132,7 @@
<key
commandId=
"org.jkiss.dbeaver.ui.editors.sql.run.count"
contextId=
"org.jkiss.dbeaver.ui.editors.sql"
schemeId=
"org.eclipse.ui.defaultAcceleratorConfiguration"
sequence=
"CTRL+ALT+C"
/>
<key
commandId=
"org.jkiss.dbeaver.ui.editors.sql.run.count"
contextId=
"org.jkiss.dbeaver.ui.editors.sql"
schemeId=
"org.eclipse.ui.defaultAcceleratorConfiguration"
sequence=
"CTRL+ALT+C"
/>
<key
commandId=
"org.jkiss.dbeaver.ui.editors.sql.run.expression"
contextId=
"org.jkiss.dbeaver.ui.editors.sql"
schemeId=
"org.eclipse.ui.defaultAcceleratorConfiguration"
sequence=
"CTRL+ALT+'"
/>
<key
commandId=
"org.jkiss.dbeaver.ui.editors.sql.run.expression"
contextId=
"org.jkiss.dbeaver.ui.editors.sql"
schemeId=
"org.eclipse.ui.defaultAcceleratorConfiguration"
sequence=
"CTRL+ALT+'"
/>
<key
commandId=
"org.jkiss.dbeaver.ui.editors.sql.run.explain"
contextId=
"org.jkiss.dbeaver.ui.editors.sql"
schemeId=
"org.eclipse.ui.defaultAcceleratorConfiguration"
sequence=
"CTRL+SHIFT+E"
/>
<key
commandId=
"org.jkiss.dbeaver.ui.editors.sql.run.explain"
contextId=
"org.jkiss.dbeaver.ui.editors.sql"
schemeId=
"org.eclipse.ui.defaultAcceleratorConfiguration"
sequence=
"CTRL+SHIFT+E"
/>
<key
commandId=
"org.jkiss.dbeaver.ui.editors.sql.close.tab"
contextId=
"org.jkiss.dbeaver.ui.editors.sql"
schemeId=
"org.eclipse.ui.defaultAcceleratorConfiguration"
sequence=
"CTRL+SHIFT+\"
/>
<key
commandId=
"org.jkiss.dbeaver.ui.editors.sql.navigate.object"
contextId=
"org.jkiss.dbeaver.ui.editors.sql"
schemeId=
"org.eclipse.ui.defaultAcceleratorConfiguration"
sequence=
"F4"
/>
<key
commandId=
"org.jkiss.dbeaver.ui.editors.sql.navigate.object"
contextId=
"org.jkiss.dbeaver.ui.editors.sql"
schemeId=
"org.eclipse.ui.defaultAcceleratorConfiguration"
sequence=
"F4"
/>
<key
commandId=
"org.jkiss.dbeaver.ui.editors.sql.query.next"
contextId=
"org.jkiss.dbeaver.ui.editors.sql"
schemeId=
"org.eclipse.ui.defaultAcceleratorConfiguration"
sequence=
"ALT+ARROW_DOWN"
/>
<key
commandId=
"org.jkiss.dbeaver.ui.editors.sql.query.next"
contextId=
"org.jkiss.dbeaver.ui.editors.sql"
schemeId=
"org.eclipse.ui.defaultAcceleratorConfiguration"
sequence=
"ALT+ARROW_DOWN"
/>
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreCommands.java
浏览文件 @
290e106b
...
@@ -62,6 +62,7 @@ public interface CoreCommands
...
@@ -62,6 +62,7 @@ public interface CoreCommands
String
CMD_SQL_SHOW_OUTPUT
=
"org.jkiss.dbeaver.ui.editors.sql.show.output"
;
String
CMD_SQL_SHOW_OUTPUT
=
"org.jkiss.dbeaver.ui.editors.sql.show.output"
;
String
CMD_SQL_SHOW_LOG
=
"org.jkiss.dbeaver.ui.editors.sql.show.log"
;
String
CMD_SQL_SHOW_LOG
=
"org.jkiss.dbeaver.ui.editors.sql.show.log"
;
String
CMD_SQL_EDITOR_MAXIMIZE_PANEL
=
"org.jkiss.dbeaver.ui.editors.sql.maximize.result.panel"
;
String
CMD_SQL_EDITOR_MAXIMIZE_PANEL
=
"org.jkiss.dbeaver.ui.editors.sql.maximize.result.panel"
;
String
CMD_SQL_EDITOR_CLOSE_TAB
=
"org.jkiss.dbeaver.ui.editors.sql.close.tab"
;
String
CMD_SQL_ASSIST_TEMPLATES
=
"org.jkiss.dbeaver.ui.editors.sql.assist.templates"
;
//$NON-NLS-1$
String
CMD_SQL_ASSIST_TEMPLATES
=
"org.jkiss.dbeaver.ui.editors.sql.assist.templates"
;
//$NON-NLS-1$
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
浏览文件 @
290e106b
...
@@ -593,7 +593,7 @@ public class SQLEditor extends SQLEditorBase implements
...
@@ -593,7 +593,7 @@ public class SQLEditor extends SQLEditorBase implements
public
void
menuAboutToShow
(
IMenuManager
manager
)
public
void
menuAboutToShow
(
IMenuManager
manager
)
{
{
manager
.
add
(
ActionUtils
.
makeCommandContribution
(
getSite
(),
CoreCommands
.
CMD_SQL_EDITOR_MAXIMIZE_PANEL
));
manager
.
add
(
ActionUtils
.
makeCommandContribution
(
getSite
(),
CoreCommands
.
CMD_SQL_EDITOR_MAXIMIZE_PANEL
));
if
(
resultTabs
.
getItemCount
()
>
3
)
{
if
(
resultTabs
.
getItemCount
()
>
1
)
{
manager
.
add
(
new
Action
(
"Close multiple results"
)
{
manager
.
add
(
new
Action
(
"Close multiple results"
)
{
@Override
@Override
public
void
run
()
public
void
run
()
...
@@ -625,6 +625,9 @@ public class SQLEditor extends SQLEditorBase implements
...
@@ -625,6 +625,9 @@ public class SQLEditor extends SQLEditorBase implements
}
}
});
});
}
}
if
(
activeTab
!=
null
&&
activeTab
.
getShowClose
())
{
manager
.
add
(
ActionUtils
.
makeCommandContribution
(
getSite
(),
CoreCommands
.
CMD_SQL_EDITOR_CLOSE_TAB
));
}
}
}
});
});
menuMgr
.
setRemoveAllWhenShown
(
true
);
menuMgr
.
setRemoveAllWhenShown
(
true
);
...
@@ -669,6 +672,13 @@ public class SQLEditor extends SQLEditorBase implements
...
@@ -669,6 +672,13 @@ public class SQLEditor extends SQLEditorBase implements
resultTabs
.
setSelection
(
item
);
resultTabs
.
setSelection
(
item
);
}
}
public
void
closeActiveTab
()
{
CTabItem
tabItem
=
resultTabs
.
getSelection
();
if
(
tabItem
!=
null
&&
tabItem
.
getShowClose
())
{
tabItem
.
dispose
();
}
}
public
void
showOutputPanel
()
{
public
void
showOutputPanel
()
{
if
(
sashForm
.
getMaximizedControl
()
!=
null
)
{
if
(
sashForm
.
getMaximizedControl
()
!=
null
)
{
sashForm
.
setMaximizedControl
(
null
);
sashForm
.
setMaximizedControl
(
null
);
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/handlers/CloseTabHandler.java
0 → 100644
浏览文件 @
290e106b
/*
* 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.editors.sql.handlers
;
import
org.eclipse.core.commands.AbstractHandler
;
import
org.eclipse.core.commands.ExecutionEvent
;
import
org.eclipse.core.commands.ExecutionException
;
import
org.eclipse.ui.handlers.HandlerUtil
;
import
org.jkiss.dbeaver.ui.editors.sql.SQLEditor
;
import
org.jkiss.dbeaver.utils.RuntimeUtils
;
public
class
CloseTabHandler
extends
AbstractHandler
{
@Override
public
Object
execute
(
ExecutionEvent
event
)
throws
ExecutionException
{
SQLEditor
editor
=
RuntimeUtils
.
getObjectAdapter
(
HandlerUtil
.
getActiveEditor
(
event
),
SQLEditor
.
class
);
if
(
editor
!=
null
)
{
editor
.
closeActiveTab
();
}
return
null
;
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录