Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
958b3513
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,发现更多精彩内容 >>
提交
958b3513
编写于
6月 05, 2018
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#3574 Grouping panel default colors fix
Former-commit-id:
199bfbf0
上级
14234a05
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
21 addition
and
6 deletion
+21
-6
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
.../jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
+13
-6
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/EditorUtils.java
...er.core/src/org/jkiss/dbeaver/ui/editors/EditorUtils.java
+8
-0
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
浏览文件 @
958b3513
...
...
@@ -22,6 +22,7 @@ import org.eclipse.core.runtime.jobs.JobChangeAdapter;
import
org.eclipse.jface.action.*
;
import
org.eclipse.jface.dialogs.IDialogConstants
;
import
org.eclipse.jface.dialogs.IDialogSettings
;
import
org.eclipse.jface.preference.IPreferenceStore
;
import
org.eclipse.jface.resource.ImageDescriptor
;
import
org.eclipse.jface.resource.StringConverter
;
import
org.eclipse.jface.text.IFindReplaceTarget
;
...
...
@@ -29,7 +30,10 @@ 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.*
;
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.graphics.Color
;
import
org.eclipse.swt.graphics.Point
;
import
org.eclipse.swt.graphics.RGB
;
...
...
@@ -79,6 +83,7 @@ import org.jkiss.dbeaver.ui.controls.resultset.view.EmptyPresentation;
import
org.jkiss.dbeaver.ui.controls.resultset.view.StatisticsPresentation
;
import
org.jkiss.dbeaver.ui.data.IValueController
;
import
org.jkiss.dbeaver.ui.dialogs.ConfirmationDialog
;
import
org.jkiss.dbeaver.ui.editors.EditorUtils
;
import
org.jkiss.dbeaver.ui.editors.object.struct.EditConstraintPage
;
import
org.jkiss.dbeaver.ui.editors.object.struct.EditDictionaryPage
;
import
org.jkiss.dbeaver.ui.preferences.PrefPageDataFormat
;
...
...
@@ -209,8 +214,9 @@ public class ResultSetViewer extends Viewer
this
.
viewerPanel
.
setRedraw
(
false
);
{
String
bgRGB
=
getPreferenceStore
().
getString
(
AbstractTextEditor
.
PREFERENCE_COLOR_BACKGROUND
);
String
fgRGB
=
getPreferenceStore
().
getString
(
AbstractTextEditor
.
PREFERENCE_COLOR_FOREGROUND
);
IPreferenceStore
preferenceStore
=
EditorUtils
.
getEditorsPreferenceStore
();
String
bgRGB
=
preferenceStore
.
getString
(
AbstractTextEditor
.
PREFERENCE_COLOR_BACKGROUND
);
String
fgRGB
=
preferenceStore
.
getString
(
AbstractTextEditor
.
PREFERENCE_COLOR_FOREGROUND
);
defaultBackground
=
CommonUtils
.
isEmpty
(
bgRGB
)
?
viewerPanel
.
getDisplay
().
getSystemColor
(
SWT
.
COLOR_LIST_BACKGROUND
)
:
UIUtils
.
getSharedColor
(
bgRGB
);
defaultForeground
=
CommonUtils
.
isEmpty
(
fgRGB
)
?
viewerPanel
.
getDisplay
().
getSystemColor
(
SWT
.
COLOR_LIST_FOREGROUND
)
:
UIUtils
.
getSharedColor
(
fgRGB
);
}
...
...
@@ -3694,9 +3700,10 @@ public class ResultSetViewer extends Viewer
if
(
dataSource
==
null
)
{
return
;
}
DBPPreferenceStore
preferenceStore
=
DBeaverCore
.
getGlobalPreferenceStore
();
boolean
curValue
=
preferenceStore
.
getBoolean
(
DBeaverPreferences
.
RESULT_SET_COLORIZE_DATA_TYPES
);
preferenceStore
.
setValue
(
DBeaverPreferences
.
RESULT_SET_COLORIZE_DATA_TYPES
,
!
curValue
);
DBPPreferenceStore
dsStore
=
dataSource
.
getContainer
().
getPreferenceStore
();
boolean
curValue
=
dsStore
.
getBoolean
(
DBeaverPreferences
.
RESULT_SET_COLORIZE_DATA_TYPES
);
// Set local setting to default
dsStore
.
setValue
(
DBeaverPreferences
.
RESULT_SET_COLORIZE_DATA_TYPES
,
!
curValue
);
refreshData
(
null
);
}
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/EditorUtils.java
浏览文件 @
958b3513
...
...
@@ -26,9 +26,12 @@ import org.eclipse.core.runtime.IAdaptable;
import
org.eclipse.core.runtime.IPath
;
import
org.eclipse.core.runtime.QualifiedName
;
import
org.eclipse.core.runtime.jobs.Job
;
import
org.eclipse.core.runtime.preferences.InstanceScope
;
import
org.eclipse.jface.preference.IPreferenceStore
;
import
org.eclipse.ui.*
;
import
org.eclipse.ui.ide.FileStoreEditorInput
;
import
org.eclipse.ui.ide.IDE
;
import
org.eclipse.ui.preferences.ScopedPreferenceStore
;
import
org.jkiss.code.NotNull
;
import
org.jkiss.code.Nullable
;
import
org.jkiss.dbeaver.Log
;
...
...
@@ -255,4 +258,9 @@ public class EditorUtils {
}
return
"Auto save all editors"
.
equals
(
currentJob
.
getName
());
}
public
static
IPreferenceStore
getEditorsPreferenceStore
()
{
return
new
ScopedPreferenceStore
(
InstanceScope
.
INSTANCE
,
"org.eclipse.ui.editors"
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录