Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
-学无止境
dbeaver
提交
9ea0fb72
D
dbeaver
项目概览
-学无止境
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
18
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,发现更多精彩内容 >>
提交
9ea0fb72
编写于
7月 19, 2019
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#6303 Filter panel redesign
上级
750c761e
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
25 addition
and
7 deletion
+25
-7
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetFilterPanel.java
...s/dbeaver/ui/controls/resultset/ResultSetFilterPanel.java
+25
-7
未找到文件。
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetFilterPanel.java
浏览文件 @
9ea0fb72
...
...
@@ -156,9 +156,9 @@ class ResultSetFilterPanel extends Composite implements IContentProposalProvider
StyledTextUtils
.
fillDefaultStyledTextContextMenu
(
filtersText
);
StyledTextUtils
.
enableDND
(
this
.
filtersText
);
this
.
executePanel
=
new
ExecutePanel
(
filterComposite
);
this
.
editFilterPanel
=
new
EditFilterPanel
(
filterComposite
);
this
.
historyPanel
=
new
HistoryPanel
(
filterComposite
);
this
.
executePanel
=
new
ExecutePanel
(
filterComposite
);
// Register filters text in focus service
UIUtils
.
addDefaultEditActionsSupport
(
viewer
.
getSite
(),
this
.
filtersText
);
...
...
@@ -634,6 +634,12 @@ class ResultSetFilterPanel extends Composite implements IContentProposalProvider
GridData
gd
=
new
GridData
(
GridData
.
VERTICAL_ALIGN_BEGINNING
|
GridData
.
FILL_VERTICAL
);
setLayoutData
(
gd
);
addPaintListener
(
this
::
paintPanel
);
addMouseMoveListener
(
e
->
{
if
(!
hover
)
{
hover
=
true
;
redraw
();
}
});
addMouseTrackListener
(
new
MouseTrackAdapter
()
{
@Override
public
void
mouseEnter
(
MouseEvent
e
)
{
...
...
@@ -789,7 +795,7 @@ class ResultSetFilterPanel extends Composite implements IContentProposalProvider
GridData
gd
=
new
GridData
(
GridData
.
HORIZONTAL_ALIGN_BEGINNING
|
GridData
.
FILL_VERTICAL
);
gd
.
heightHint
=
MIN_FILTER_TEXT_HEIGHT
;
gd
.
widthHint
=
dropImageE
.
getBounds
().
width
+
2
;
gd
.
widthHint
=
dropImageE
.
getBounds
().
width
+
6
;
setLayoutData
(
gd
);
addDisposeListener
(
e
->
UIUtils
.
dispose
(
dropImageD
));
...
...
@@ -1011,7 +1017,7 @@ class ResultSetFilterPanel extends Composite implements IContentProposalProvider
GridData
gd
=
new
GridData
(
GridData
.
HORIZONTAL_ALIGN_BEGINNING
|
GridData
.
FILL_VERTICAL
);
gd
.
heightHint
=
MIN_FILTER_TEXT_HEIGHT
;
gd
.
widthHint
=
1
0
+
enabledImage
.
getBounds
().
width
+
6
;
gd
.
widthHint
=
1
2
+
enabledImage
.
getBounds
().
width
;
setLayoutData
(
gd
);
}
...
...
@@ -1026,7 +1032,7 @@ class ResultSetFilterPanel extends Composite implements IContentProposalProvider
}
if
(
viewer
.
isRefreshInProgress
())
{
e
.
gc
.
drawImage
(
DBeaverIcons
.
getImage
(
UIIcon
.
CLOSE
),
x
,
e
.
y
+
2
);
}
else
if
(
hover
)
{
}
else
if
(
hover
&&
isActionEnabled
()
)
{
e
.
gc
.
drawImage
(
enabledImage
,
x
,
e
.
y
+
2
);
}
else
{
e
.
gc
.
drawImage
(
disabledImage
,
x
,
e
.
y
+
2
);
...
...
@@ -1037,6 +1043,8 @@ class ResultSetFilterPanel extends Composite implements IContentProposalProvider
}
}
protected
abstract
boolean
isActionEnabled
();
protected
abstract
boolean
executeAction
(
MouseEvent
e
);
}
...
...
@@ -1047,9 +1055,14 @@ class ResultSetFilterPanel extends Composite implements IContentProposalProvider
super
(
addressBar
,
UIIcon
.
RS_REFRESH
,
ResultSetMessages
.
controls_resultset_viewer_action_refresh
,
false
);
}
@Override
protected
boolean
isActionEnabled
()
{
return
!
viewer
.
isRefreshInProgress
();
}
@Override
protected
boolean
executeAction
(
MouseEvent
e
)
{
if
(
!
viewer
.
isRefreshInProgress
())
{
if
(
isActionEnabled
())
{
viewer
.
refreshData
(
null
);
return
true
;
}
...
...
@@ -1060,12 +1073,17 @@ class ResultSetFilterPanel extends Composite implements IContentProposalProvider
private
class
ExecutePanel
extends
ToolItemPanel
{
ExecutePanel
(
Composite
addressBar
)
{
super
(
addressBar
,
UIIcon
.
SQL_EXECUTE
,
ResultSetMessages
.
sql_editor_resultset_filter_panel_btn_apply
,
true
);
super
(
addressBar
,
UIIcon
.
SQL_EXECUTE
,
ResultSetMessages
.
sql_editor_resultset_filter_panel_btn_apply
,
false
);
}
@Override
protected
boolean
isActionEnabled
()
{
return
!
viewer
.
isRefreshInProgress
()
&&
isEnabled
();
}
@Override
protected
boolean
executeAction
(
MouseEvent
e
)
{
if
(
!
viewer
.
isRefreshInProgress
())
{
if
(
isActionEnabled
())
{
setCustomDataFilter
();
return
true
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录