Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
af4f26c5
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,发现更多精彩内容 >>
提交
af4f26c5
编写于
8月 16, 2017
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#894 Filter save action/icon
上级
51bf2520
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
22 addition
and
2 deletion
+22
-2
plugins/org.jkiss.dbeaver.core/icons/misc/filter_save.png
plugins/org.jkiss.dbeaver.core/icons/misc/filter_save.png
+0
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/UIIcon.java
...g.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/UIIcon.java
+1
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetFilterPanel.java
...s/dbeaver/ui/controls/resultset/ResultSetFilterPanel.java
+16
-2
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
.../jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
+5
-0
未找到文件。
plugins/org.jkiss.dbeaver.core/icons/misc/filter_save.png
0 → 100644
浏览文件 @
af4f26c5
710 字节
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/UIIcon.java
浏览文件 @
af4f26c5
...
...
@@ -100,6 +100,7 @@ public class UIIcon {
public
static
final
DBIcon
FILTER_CLIPBOARD
=
new
DBIcon
(
"filter_clipboard"
,
"misc/filter_clipboard.png"
);
//$NON-NLS-1$ //$NON-NLS-2$
public
static
final
DBIcon
FILTER_APPLY
=
new
DBIcon
(
"filter_apply"
,
"misc/filter_apply.png"
);
//$NON-NLS-1$ //$NON-NLS-2$
public
static
final
DBIcon
FILTER_RESET
=
new
DBIcon
(
"filter_reset"
,
"misc/filter_reset.png"
);
//$NON-NLS-1$ //$NON-NLS-2$
public
static
final
DBIcon
FILTER_SAVE
=
new
DBIcon
(
"filter_save"
,
"misc/filter_save.png"
);
//$NON-NLS-1$ //$NON-NLS-2$
public
static
final
DBIcon
EVENT
=
new
DBIcon
(
"event"
,
"misc/event.png"
);
//$NON-NLS-1$ //$NON-NLS-2$
public
static
final
DBIcon
HOME
=
new
DBIcon
(
"home"
,
"misc/home.png"
);
//$NON-NLS-1$ //$NON-NLS-2$
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetFilterPanel.java
浏览文件 @
af4f26c5
...
...
@@ -94,6 +94,7 @@ class ResultSetFilterPanel extends Composite implements IContentProposalProvider
private
final
ToolBar
filterToolbar
;
private
final
ToolItem
filtersApplyButton
;
private
final
ToolItem
filtersClearButton
;
private
final
ToolItem
filtersSaveButton
;
private
final
ToolItem
autoRefreshButton
;
private
final
ToolItem
historyBackButton
;
private
final
ToolItem
historyForwardButton
;
...
...
@@ -226,7 +227,7 @@ class ResultSetFilterPanel extends Composite implements IContentProposalProvider
filtersClearButton
=
new
ToolItem
(
filterToolbar
,
SWT
.
PUSH
|
SWT
.
NO_FOCUS
);
filtersClearButton
.
setImage
(
DBeaverIcons
.
getImage
(
UIIcon
.
FILTER_RESET
));
filtersClearButton
.
setToolTipText
(
"Remove all filters"
);
filtersClearButton
.
setToolTipText
(
"Remove all filters
/orderings
"
);
filtersClearButton
.
addSelectionListener
(
new
SelectionAdapter
()
{
@Override
public
void
widgetSelected
(
SelectionEvent
e
)
{
...
...
@@ -235,6 +236,18 @@ class ResultSetFilterPanel extends Composite implements IContentProposalProvider
});
filtersClearButton
.
setEnabled
(
false
);
filtersSaveButton
=
new
ToolItem
(
filterToolbar
,
SWT
.
PUSH
|
SWT
.
NO_FOCUS
);
filtersSaveButton
.
setImage
(
DBeaverIcons
.
getImage
(
UIIcon
.
FILTER_SAVE
));
filtersSaveButton
.
setToolTipText
(
"Save filter settings for current object"
);
filtersSaveButton
.
addSelectionListener
(
new
SelectionAdapter
()
{
@Override
public
void
widgetSelected
(
SelectionEvent
e
)
{
viewer
.
saveDataFilter
();
}
});
filtersSaveButton
.
setEnabled
(
false
);
ToolItem
filtersCustomButton
=
new
ToolItem
(
filterToolbar
,
SWT
.
PUSH
|
SWT
.
NO_FOCUS
);
filtersCustomButton
.
setImage
(
DBeaverIcons
.
getImage
(
UIIcon
.
FILTER
));
filtersCustomButton
.
setToolTipText
(
"Custom Filters"
);
...
...
@@ -319,7 +332,8 @@ class ResultSetFilterPanel extends Composite implements IContentProposalProvider
String
filterText
=
filtersText
.
getText
();
filtersText
.
setEnabled
(
supportsDataFilter
);
filtersApplyButton
.
setEnabled
(
supportsDataFilter
);
filtersClearButton
.
setEnabled
(
supportsDataFilter
&&
!
CommonUtils
.
isEmpty
(
filterText
));
filtersClearButton
.
setEnabled
(
viewer
.
getModel
().
getDataFilter
().
hasFilters
());
filtersSaveButton
.
setEnabled
(
true
);
// Update history buttons
if
(
historyPosition
>
0
)
{
historyBackButton
.
setEnabled
(
true
);
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
浏览文件 @
af4f26c5
...
...
@@ -288,6 +288,11 @@ public class ResultSetViewer extends Viewer
setDataFilter
(
model
.
createDataFilter
(),
refresh
);
}
public
void
saveDataFilter
()
{
}
void
switchFilterFocus
()
{
boolean
filterFocused
=
filtersPanel
.
getEditControl
().
isFocusControl
();
if
(
filterFocused
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录