Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
99c1f6bf
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,发现更多精彩内容 >>
提交
99c1f6bf
编写于
4月 11, 2019
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#4553 Fetch size editor moved to RSV status bar
上级
9472d985
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
31 addition
and
6 deletion
+31
-6
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
.../jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
+24
-5
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsMessages.java
...dbeaver/ui/editors/data/internal/DataEditorsMessages.java
+1
-0
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources.properties
.../ui/editors/data/internal/DataEditorsResources.properties
+1
-0
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources_de.properties
.../editors/data/internal/DataEditorsResources_de.properties
+1
-1
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources_fr.properties
.../editors/data/internal/DataEditorsResources_fr.properties
+1
-0
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources_ja.properties
.../editors/data/internal/DataEditorsResources_ja.properties
+1
-0
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources_ru.properties
.../editors/data/internal/DataEditorsResources_ru.properties
+1
-0
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources_zh.properties
.../editors/data/internal/DataEditorsResources_zh.properties
+1
-0
未找到文件。
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
浏览文件 @
99c1f6bf
...
...
@@ -30,10 +30,7 @@ import org.eclipse.jface.viewers.*;
import
org.eclipse.osgi.util.NLS
;
import
org.eclipse.swt.SWT
;
import
org.eclipse.swt.custom.*
;
import
org.eclipse.swt.events.FocusEvent
;
import
org.eclipse.swt.events.FocusListener
;
import
org.eclipse.swt.events.SelectionAdapter
;
import
org.eclipse.swt.events.SelectionEvent
;
import
org.eclipse.swt.events.*
;
import
org.eclipse.swt.graphics.Color
;
import
org.eclipse.swt.graphics.Point
;
import
org.eclipse.swt.graphics.RGB
;
...
...
@@ -97,12 +94,14 @@ import org.jkiss.dbeaver.ui.css.CSSUtils;
import
org.jkiss.dbeaver.ui.css.DBStyles
;
import
org.jkiss.dbeaver.ui.data.IValueController
;
import
org.jkiss.dbeaver.ui.dialogs.ConfirmationDialog
;
import
org.jkiss.dbeaver.ui.editors.data.internal.DataEditorsMessages
;
import
org.jkiss.dbeaver.ui.editors.data.preferences.PrefPageDataFormat
;
import
org.jkiss.dbeaver.ui.editors.data.preferences.PrefPageResultSetMain
;
import
org.jkiss.dbeaver.ui.editors.object.struct.EditConstraintPage
;
import
org.jkiss.dbeaver.ui.editors.object.struct.EditDictionaryPage
;
import
org.jkiss.dbeaver.ui.navigator.NavigatorCommands
;
import
org.jkiss.dbeaver.utils.GeneralUtils
;
import
org.jkiss.dbeaver.utils.PrefUtils
;
import
org.jkiss.dbeaver.utils.RuntimeUtils
;
import
org.jkiss.utils.ArrayUtils
;
import
org.jkiss.utils.CommonUtils
;
...
...
@@ -161,6 +160,7 @@ public class ResultSetViewer extends Viewer
private
Composite
statusBar
;
private
StatusLabel
statusLabel
;
private
ActiveStatusMessage
rowCountLabel
;
private
Text
resultSetSize
;
private
final
DynamicFindReplaceTarget
findReplaceTarget
;
...
...
@@ -1444,7 +1444,7 @@ public class ResultSetViewer extends Viewer
{
final
int
fontHeight
=
UIUtils
.
getFontHeight
(
statusBar
);
statusLabel
=
new
StatusLabel
(
statusBar
,
SWT
.
NONE
,
this
);
statusLabel
.
setLayoutData
(
new
RowData
(
4
0
*
fontHeight
,
SWT
.
DEFAULT
));
statusLabel
.
setLayoutData
(
new
RowData
(
3
0
*
fontHeight
,
SWT
.
DEFAULT
));
rowCountLabel
=
new
ActiveStatusMessage
(
statusBar
,
DBeaverIcons
.
getImage
(
UIIcon
.
RS_REFRESH
),
ResultSetMessages
.
controls_resultset_viewer_calculate_row_count
,
this
)
{
@Override
...
...
@@ -1470,6 +1470,20 @@ public class ResultSetViewer extends Viewer
};
rowCountLabel
.
setLayoutData
(
new
RowData
(
10
*
fontHeight
,
SWT
.
DEFAULT
));
rowCountLabel
.
setMessage
(
"Row Count"
);
resultSetSize
=
new
Text
(
statusBar
,
SWT
.
BORDER
);
resultSetSize
.
setLayoutData
(
new
RowData
(
5
*
fontHeight
,
SWT
.
DEFAULT
));
resultSetSize
.
setBackground
(
UIStyles
.
getDefaultTextBackground
());
resultSetSize
.
setToolTipText
(
DataEditorsMessages
.
resultset_segment_size
);
resultSetSize
.
addModifyListener
(
e
->
{
DBSDataContainer
dataContainer
=
getDataContainer
();
int
fetchSize
=
CommonUtils
.
toInt
(
resultSetSize
.
getText
());
if
(
fetchSize
>
0
&&
dataContainer
!=
null
&&
dataContainer
.
getDataSource
()
!=
null
)
{
DBPPreferenceStore
store
=
dataContainer
.
getDataSource
().
getContainer
().
getPreferenceStore
();
store
.
setValue
(
ResultSetPreferences
.
RESULT_SET_MAX_ROWS
,
fetchSize
);
PrefUtils
.
savePreferenceStore
(
store
);
}
});
}
}
...
...
@@ -1625,6 +1639,11 @@ public class ResultSetViewer extends Viewer
}
statusLabel
.
setStatus
(
status
,
messageType
);
rowCountLabel
.
updateActionState
();
DBSDataContainer
dataContainer
=
getDataContainer
();
if
(
dataContainer
!=
null
&&
dataContainer
.
getDataSource
()
!=
null
)
{
resultSetSize
.
setText
(
String
.
valueOf
(
dataContainer
.
getDataSource
().
getContainer
().
getPreferenceStore
().
getInt
(
ResultSetPreferences
.
RESULT_SET_MAX_ROWS
)));
}
}
public
void
updateStatusMessage
()
...
...
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsMessages.java
浏览文件 @
99c1f6bf
...
...
@@ -24,6 +24,7 @@ public class DataEditorsMessages extends NLS {
public
static
String
grid_tooltip_sort_by_column
;
public
static
String
grid_tooltip_filter_by_column
;
public
static
String
controls_column_info_panel_property_key
;
public
static
String
resultset_segment_size
;
static
{
// initialize resource bundle
...
...
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources.properties
浏览文件 @
99c1f6bf
...
...
@@ -2,3 +2,4 @@ grid_tooltip_sort_by_column = Sort by column
grid_tooltip_filter_by_column
=
Filter by column value
controls_column_info_panel_property_key
=
Key
resultset_segment_size
=
Result-set fetch size
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources_de.properties
浏览文件 @
99c1f6bf
...
...
@@ -2,4 +2,4 @@ grid_tooltip_filter_by_column = Filtern mit Spaltenwert
grid_tooltip_sort_by_column
=
Sortieren mit Spalte
controls_column_info_panel_property_key
=
Schl
\u
00FCssel
resultset_segment_size
=
Maximale Gr
\u
00F6
\u
00DFe der Ergebnismenge
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources_fr.properties
浏览文件 @
99c1f6bf
...
...
@@ -2,3 +2,4 @@ grid_tooltip_sort_by_column = Trier par colonne
grid_tooltip_filter_by_column
=
Filtrer par la valeur de colonne
controls_column_info_panel_property_key
=
Clef
resultset_segment_size
=
Taille maximale de r
\u
00E9sultats
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources_ja.properties
浏览文件 @
99c1f6bf
controls_column_info_panel_property_key
=
\u
30AD
\u
30FC
resultset_segment_size
=
\u
7D50
\u
679C
\u
30BB
\u
30C3
\u
30C8
\u
306E
\u6700\u5927\u
30B5
\u
30A4
\u
30BA
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources_ru.properties
浏览文件 @
99c1f6bf
...
...
@@ -2,3 +2,4 @@ grid_tooltip_sort_by_column = \u0421\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u
grid_tooltip_filter_by_column
=
\u0424\u0438\u
043B
\u
044C
\u0442\u0440
\u
043F
\u
043E
\u0437\u
043D
\u0430\u0447\u0435\u
043D
\u0438\u
044E
\u
043A
\u
043E
\u
043B
\u
043E
\u
043D
\u
043A
\u0438
controls_column_info_panel_property_key
=
\u
041A
\u
043B
\u
044E
\u0447
toolbar_datasource_selector_resultset_segment_size
=
\u0420\u0430\u0437\u
043C
\u0435\u0440
\u0432\u
044B
\u0431\u
043E
\u0440\u
043A
\u0438
\u0434\u0430\u
043D
\u
043D
\u
044B
\u0445
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/internal/DataEditorsResources_zh.properties
浏览文件 @
99c1f6bf
...
...
@@ -3,3 +3,4 @@ grid_tooltip_sort_by_column = \u6309\u5217\u8FC7\u6EE4
controls_column_info_panel_property_key
=
\u
952E
resultset_segment_size
=
\u6700\u5927\u5316\u
7ED3
\u
679C
\u
96C6
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录