Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
12a749b3
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
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,发现更多精彩内容 >>
提交
12a749b3
编写于
8月 09, 2019
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
SQL editor: layout command + icons fix
上级
22435818
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
64 addition
and
2 deletion
+64
-2
plugins/org.jkiss.dbeaver.ui.editors.data/plugin.xml
plugins/org.jkiss.dbeaver.ui.editors.data/plugin.xml
+1
-1
plugins/org.jkiss.dbeaver.ui.editors.sql/OSGI-INF/l10n/bundle.properties
...ss.dbeaver.ui.editors.sql/OSGI-INF/l10n/bundle.properties
+2
-0
plugins/org.jkiss.dbeaver.ui.editors.sql/plugin.xml
plugins/org.jkiss.dbeaver.ui.editors.sql/plugin.xml
+6
-0
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
...s.sql/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
+7
-1
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorCommands.java
...c/org/jkiss/dbeaver/ui/editors/sql/SQLEditorCommands.java
+2
-0
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/handlers/ToggleEditorLayoutHandler.java
...er/ui/editors/sql/handlers/ToggleEditorLayoutHandler.java
+46
-0
未找到文件。
plugins/org.jkiss.dbeaver.ui.editors.data/plugin.xml
浏览文件 @
12a749b3
...
@@ -278,7 +278,7 @@
...
@@ -278,7 +278,7 @@
<image
commandId=
"org.jkiss.dbeaver.core.resultset.rejectChanges"
icon=
"platform:/plugin/org.jkiss.dbeaver.ui/icons/sql/cancel.png"
/>
<image
commandId=
"org.jkiss.dbeaver.core.resultset.rejectChanges"
icon=
"platform:/plugin/org.jkiss.dbeaver.ui/icons/sql/cancel.png"
/>
<image
commandId=
"org.jkiss.dbeaver.core.resultset.generateScript"
icon=
"platform:/plugin/org.jkiss.dbeaver.ui/icons/sql/sql_inspector.png"
/>
<image
commandId=
"org.jkiss.dbeaver.core.resultset.generateScript"
icon=
"platform:/plugin/org.jkiss.dbeaver.ui/icons/sql/sql_inspector.png"
/>
<image
commandId=
"org.jkiss.dbeaver.core.resultset.toggleMode"
icon=
"platform:/plugin/org.jkiss.dbeaver.ui/icons/sql/grid.png"
/>
<image
commandId=
"org.jkiss.dbeaver.core.resultset.toggleMode"
icon=
"platform:/plugin/org.jkiss.dbeaver.ui/icons/sql/grid.png"
/>
<image
commandId=
"org.jkiss.dbeaver.core.resultset.grid.toggleLayout"
icon=
"platform:/plugin/org.jkiss.dbeaver.ui/icons/misc/
layou
t.png"
/>
<image
commandId=
"org.jkiss.dbeaver.core.resultset.grid.toggleLayout"
icon=
"platform:/plugin/org.jkiss.dbeaver.ui/icons/misc/
rotate_lef
t.png"
/>
<image
commandId=
"org.jkiss.dbeaver.core.resultset.navigateLink"
icon=
"platform:/plugin/org.jkiss.dbeaver.ui/icons/misc/link.png"
/>
<image
commandId=
"org.jkiss.dbeaver.core.resultset.navigateLink"
icon=
"platform:/plugin/org.jkiss.dbeaver.ui/icons/misc/link.png"
/>
<image
commandId=
"org.jkiss.dbeaver.core.resultset.cell.save"
icon=
"platform:/plugin/org.jkiss.dbeaver.ui/icons/file/save.png"
/>
<image
commandId=
"org.jkiss.dbeaver.core.resultset.cell.save"
icon=
"platform:/plugin/org.jkiss.dbeaver.ui/icons/file/save.png"
/>
<image
commandId=
"org.jkiss.dbeaver.core.resultset.grid.togglePreview"
icon=
"platform:/plugin/org.jkiss.dbeaver.ui/icons/sql/panel_customize.png"
/>
<image
commandId=
"org.jkiss.dbeaver.core.resultset.grid.togglePreview"
icon=
"platform:/plugin/org.jkiss.dbeaver.ui/icons/sql/panel_customize.png"
/>
...
...
plugins/org.jkiss.dbeaver.ui.editors.sql/OSGI-INF/l10n/bundle.properties
浏览文件 @
12a749b3
...
@@ -39,6 +39,8 @@ column.org.jkiss.dbeaver.ui.editors.columns.script.position.name = Script positi
...
@@ -39,6 +39,8 @@ column.org.jkiss.dbeaver.ui.editors.columns.script.position.name = Script positi
command.org.jkiss.dbeaver.ui.editors.text.content.format.name
=
Content Format
command.org.jkiss.dbeaver.ui.editors.text.content.format.name
=
Content Format
command.org.jkiss.dbeaver.ui.editors.text.content.format.description
=
Format text
command.org.jkiss.dbeaver.ui.editors.text.content.format.description
=
Format text
command.org.jkiss.dbeaver.ui.editors.sql.toggleLayout.name
=
Toggle editor layout
command.org.jkiss.dbeaver.ui.editors.sql.toggleLayout.description
=
Toggle editor layout (horizontal/vertical)
command.org.jkiss.dbeaver.core.sql.editor.create.label
=
Create SQL script
command.org.jkiss.dbeaver.core.sql.editor.create.label
=
Create SQL script
command.org.jkiss.dbeaver.core.sql.editor.open.name
=
SQL Editor
command.org.jkiss.dbeaver.core.sql.editor.open.name
=
SQL Editor
...
...
plugins/org.jkiss.dbeaver.ui.editors.sql/plugin.xml
浏览文件 @
12a749b3
...
@@ -255,6 +255,7 @@
...
@@ -255,6 +255,7 @@
<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.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.ui.editors.sql.gotoMatchingBracket"
name=
"%command.org.jkiss.dbeaver.ui.editors.sql.gotoMatchingBracket.name"
description=
"%command.org.jkiss.dbeaver.ui.editors.sql.gotoMatchingBracket.description"
categoryId=
"org.jkiss.dbeaver.core.sql"
/>
<command
id=
"org.jkiss.dbeaver.ui.editors.sql.gotoMatchingBracket"
name=
"%command.org.jkiss.dbeaver.ui.editors.sql.gotoMatchingBracket.name"
description=
"%command.org.jkiss.dbeaver.ui.editors.sql.gotoMatchingBracket.description"
categoryId=
"org.jkiss.dbeaver.core.sql"
/>
<command
id=
"org.jkiss.dbeaver.ui.editors.text.content.format"
name=
"%command.org.jkiss.dbeaver.ui.editors.text.content.format.name"
description=
"%command.org.jkiss.dbeaver.ui.editors.text.content.format.description"
categoryId=
"org.jkiss.dbeaver.core.sql"
/>
<command
id=
"org.jkiss.dbeaver.ui.editors.text.content.format"
name=
"%command.org.jkiss.dbeaver.ui.editors.text.content.format.name"
description=
"%command.org.jkiss.dbeaver.ui.editors.text.content.format.description"
categoryId=
"org.jkiss.dbeaver.core.sql"
/>
<command
id=
"org.jkiss.dbeaver.ui.editors.sql.toggleLayout"
name=
"%command.org.jkiss.dbeaver.ui.editors.sql.toggleLayout.name"
description=
"%command.org.jkiss.dbeaver.ui.editors.sql.toggleLayout.description"
categoryId=
"org.jkiss.dbeaver.core.sql"
/>
</extension>
</extension>
...
@@ -278,6 +279,8 @@
...
@@ -278,6 +279,8 @@
<image
commandId=
"org.jkiss.dbeaver.ui.editors.sql.show.output"
icon=
"platform:/plugin/org.jkiss.dbeaver.ui/icons/sql/page_output.png"
/>
<image
commandId=
"org.jkiss.dbeaver.ui.editors.sql.show.output"
icon=
"platform:/plugin/org.jkiss.dbeaver.ui/icons/sql/page_output.png"
/>
<image
commandId=
"org.jkiss.dbeaver.ui.editors.sql.show.log"
icon=
"platform:/plugin/org.jkiss.dbeaver.ui/icons/sql/page_error.png"
/>
<image
commandId=
"org.jkiss.dbeaver.ui.editors.sql.show.log"
icon=
"platform:/plugin/org.jkiss.dbeaver.ui/icons/sql/page_error.png"
/>
<image
commandId=
"org.jkiss.dbeaver.ui.editors.sql.toggleLayout"
icon=
"platform:/plugin/org.jkiss.dbeaver.ui/icons/misc/rotate.png"
/>
</extension>
</extension>
<extension
point=
"org.eclipse.ui.handlers"
>
<extension
point=
"org.eclipse.ui.handlers"
>
...
@@ -459,6 +462,9 @@
...
@@ -459,6 +462,9 @@
<handler
commandId=
"org.jkiss.dbeaver.ui.editors.sql.close.tab"
class=
"org.jkiss.dbeaver.ui.editors.sql.handlers.CloseTabHandler"
>
<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>
<enabledWhen><reference
definitionId=
"org.jkiss.dbeaver.core.ui.sql.editor"
/></enabledWhen>
</handler>
</handler>
<handler
commandId=
"org.jkiss.dbeaver.ui.editors.sql.toggleLayout"
class=
"org.jkiss.dbeaver.ui.editors.sql.handlers.ToggleEditorLayoutHandler"
>
<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"
>
...
...
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
浏览文件 @
12a749b3
...
@@ -783,6 +783,8 @@ public class SQLEditor extends SQLEditorBase implements
...
@@ -783,6 +783,8 @@ public class SQLEditor extends SQLEditorBase implements
UIUtils
.
createEmptyLabel
(
sideToolBar
,
1
,
1
).
setLayoutData
(
new
GridData
(
GridData
.
FILL_VERTICAL
));
UIUtils
.
createEmptyLabel
(
sideToolBar
,
1
,
1
).
setLayoutData
(
new
GridData
(
GridData
.
FILL_VERTICAL
));
VerticalButton
.
create
(
sideToolBar
,
SWT
.
LEFT
|
SWT
.
CHECK
,
getSite
(),
SQLEditorCommands
.
CMD_SQL_SHOW_OUTPUT
,
false
);
VerticalButton
.
create
(
sideToolBar
,
SWT
.
LEFT
|
SWT
.
CHECK
,
getSite
(),
SQLEditorCommands
.
CMD_SQL_SHOW_OUTPUT
,
false
);
VerticalButton
.
create
(
sideToolBar
,
SWT
.
LEFT
|
SWT
.
CHECK
,
getSite
(),
SQLEditorCommands
.
CMD_SQL_SHOW_OUTPUT
,
false
);
VerticalButton
.
create
(
sideToolBar
,
SWT
.
LEFT
|
SWT
.
CHECK
,
getSite
(),
SQLEditorCommands
.
CMD_SQL_SHOW_LOG
,
false
);
VerticalButton
.
create
(
sideToolBar
,
SWT
.
LEFT
|
SWT
.
CHECK
,
getSite
(),
SQLEditorCommands
.
CMD_SQL_SHOW_LOG
,
false
);
//sideToolBar.add(ActionUtils.makeCommandContribution(getSite(), SQLEditorCommands.CMD_SQL_SHOW_OUTPUT, CommandContributionItem.STYLE_CHECK));
//sideToolBar.add(ActionUtils.makeCommandContribution(getSite(), SQLEditorCommands.CMD_SQL_SHOW_OUTPUT, CommandContributionItem.STYLE_CHECK));
...
@@ -845,6 +847,10 @@ public class SQLEditor extends SQLEditorBase implements
...
@@ -845,6 +847,10 @@ public class SQLEditor extends SQLEditorBase implements
switchPresentationSQLButton
.
addSelectionListener
(
switchListener
);
switchPresentationSQLButton
.
addSelectionListener
(
switchListener
);
switchPresentationExtraButton
.
addSelectionListener
(
switchListener
);
switchPresentationExtraButton
.
addSelectionListener
(
switchListener
);
// Stretch
UIUtils
.
createEmptyLabel
(
presentationSwitchFolder
,
1
,
1
).
setLayoutData
(
new
GridData
(
GridData
.
FILL_VERTICAL
));
VerticalButton
.
create
(
presentationSwitchFolder
,
SWT
.
RIGHT
|
SWT
.
CHECK
,
getSite
(),
SQLEditorCommands
.
CMD_TOGGLE_LAYOUT
,
false
);
}
}
/**
/**
...
@@ -2370,7 +2376,7 @@ public class SQLEditor extends SQLEditorBase implements
...
@@ -2370,7 +2376,7 @@ public class SQLEditor extends SQLEditorBase implements
}
}
items
.
add
(
new
ActionContributionItem
(
action
));
items
.
add
(
new
ActionContributionItem
(
action
));
}
}
return
items
.
toArray
(
new
IContributionItem
[
items
.
size
()
]);
return
items
.
toArray
(
new
IContributionItem
[
0
]);
}
}
}
}
...
...
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorCommands.java
浏览文件 @
12a749b3
...
@@ -49,4 +49,6 @@ public interface SQLEditorCommands
...
@@ -49,4 +49,6 @@ public interface SQLEditorCommands
String
CMD_SAVE_FILE
=
"org.jkiss.dbeaver.ui.editors.sql.save.file"
;
//$NON-NLS-1$
String
CMD_SAVE_FILE
=
"org.jkiss.dbeaver.ui.editors.sql.save.file"
;
//$NON-NLS-1$
String
CMD_NAVIGATE_OBJECT
=
"org.jkiss.dbeaver.ui.editors.sql.navigate.object"
;
String
CMD_NAVIGATE_OBJECT
=
"org.jkiss.dbeaver.ui.editors.sql.navigate.object"
;
String
CMD_TOGGLE_LAYOUT
=
"org.jkiss.dbeaver.ui.editors.sql.toggleLayout"
;
}
}
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/handlers/ToggleEditorLayoutHandler.java
0 → 100644
浏览文件 @
12a749b3
/*
* DBeaver - Universal Database Manager
* Copyright (C) 2010-2019 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.ui.editors.sql.SQLPreferenceConstants
;
import
org.jkiss.dbeaver.utils.RuntimeUtils
;
import
org.jkiss.utils.CommonUtils
;
public
class
ToggleEditorLayoutHandler
extends
AbstractHandler
{
@Override
public
Object
execute
(
ExecutionEvent
event
)
throws
ExecutionException
{
SQLEditor
editor
=
RuntimeUtils
.
getObjectAdapter
(
HandlerUtil
.
getActiveEditor
(
event
),
SQLEditor
.
class
);
if
(
editor
!=
null
)
{
String
curPresentationName
=
editor
.
getActivePreferenceStore
().
getString
(
SQLPreferenceConstants
.
RESULT_SET_ORIENTATION
);
SQLEditor
.
ResultSetOrientation
curOrientation
=
CommonUtils
.
valueOf
(
SQLEditor
.
ResultSetOrientation
.
class
,
curPresentationName
,
SQLEditor
.
ResultSetOrientation
.
HORIZONTAL
);
if
(
curOrientation
==
SQLEditor
.
ResultSetOrientation
.
HORIZONTAL
)
{
curOrientation
=
SQLEditor
.
ResultSetOrientation
.
VERTICAL
;
}
else
{
curOrientation
=
SQLEditor
.
ResultSetOrientation
.
HORIZONTAL
;
}
editor
.
getActivePreferenceStore
().
setValue
(
SQLPreferenceConstants
.
RESULT_SET_ORIENTATION
,
curOrientation
.
name
());
}
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录