Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
1d259a21
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,发现更多精彩内容 >>
提交
1d259a21
编写于
12月 28, 2018
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#10 Data editor pref pages move
Former-commit-id:
676131f4
上级
ec2b0327
变更
12
展开全部
隐藏空白更改
内联
并排
Showing
12 changed file
with
1034 addition
and
1018 deletion
+1034
-1018
plugins/org.jkiss.dbeaver.core.application/plugin.xml
plugins/org.jkiss.dbeaver.core.application/plugin.xml
+4
-4
plugins/org.jkiss.dbeaver.core.eclipse/plugin.xml
plugins/org.jkiss.dbeaver.core.eclipse/plugin.xml
+4
-4
plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF
plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF
+1
-0
plugins/org.jkiss.dbeaver.core/plugin.xml
plugins/org.jkiss.dbeaver.core/plugin.xml
+4
-4
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_de.properties
...re/src/org/jkiss/dbeaver/core/CoreResources_de.properties
+0
-4
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
.../jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
+1
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/internal/ResultSetMessages.properties
.../controls/resultset/internal/ResultSetMessages.properties
+0
-2
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditConnectionWizard.java
...s/dbeaver/ui/dialogs/connection/EditConnectionWizard.java
+4
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/data/preferences/PrefPageDataFormat.java
...eaver/ui/editors/data/preferences/PrefPageDataFormat.java
+514
-509
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/data/preferences/PrefPageResultSetEditors.java
...ui/editors/data/preferences/PrefPageResultSetEditors.java
+5
-1
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/data/preferences/PrefPageResultSetMain.java
...er/ui/editors/data/preferences/PrefPageResultSetMain.java
+241
-237
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/data/preferences/PrefPageResultSetPresentation.java
...itors/data/preferences/PrefPageResultSetPresentation.java
+256
-252
未找到文件。
plugins/org.jkiss.dbeaver.core.application/plugin.xml
浏览文件 @
1d259a21
...
...
@@ -239,17 +239,17 @@
<page
category=
"org.jkiss.dbeaver.preferences.main.errorHandle"
id=
"org.jkiss.dbeaver.preferences.main.errorLogs"
class=
"org.jkiss.dbeaver.ui.preferences.PrefPageErrorLogs"
name=
"%pref.page.name.errorLogs"
>
<keywordReference
id=
"org.jkiss.dbeaver.core.keyword.dbeaver"
/>
</page>
<page
category=
"org.jkiss.dbeaver.preferences.editors"
id=
"org.jkiss.dbeaver.preferences.main.resultset"
class=
"org.jkiss.dbeaver.ui.preferences.PrefPageResultSetMain"
name=
"%pref.page.name.resultset"
>
<page
category=
"org.jkiss.dbeaver.preferences.editors"
id=
"org.jkiss.dbeaver.preferences.main.resultset"
class=
"org.jkiss.dbeaver.ui.
editors.data.
preferences.PrefPageResultSetMain"
name=
"%pref.page.name.resultset"
>
<keywordReference
id=
"org.jkiss.dbeaver.core.keyword.dbeaver"
/>
</page>
<page
category=
"org.jkiss.dbeaver.preferences.main.resultset"
id=
"org.jkiss.dbeaver.preferences.main.resultset.editors"
class=
"org.jkiss.dbeaver.ui.preferences.PrefPageResultSetEditors"
name=
"%pref.page.name.resultset.editors"
>
<page
category=
"org.jkiss.dbeaver.preferences.main.resultset"
id=
"org.jkiss.dbeaver.preferences.main.resultset.editors"
class=
"org.jkiss.dbeaver.ui.
editors.data.
preferences.PrefPageResultSetEditors"
name=
"%pref.page.name.resultset.editors"
>
<keywordReference
id=
"org.jkiss.dbeaver.core.keyword.pref.editor.content"
/>
<keywordReference
id=
"org.jkiss.dbeaver.core.keyword.dbeaver"
/>
</page>
<page
category=
"org.jkiss.dbeaver.preferences.main.resultset"
id=
"org.jkiss.dbeaver.preferences.main.resultset.presentation"
class=
"org.jkiss.dbeaver.ui.preferences.PrefPageResultSetPresentation"
name=
"%pref.page.name.resultset.presentation"
>
<page
category=
"org.jkiss.dbeaver.preferences.main.resultset"
id=
"org.jkiss.dbeaver.preferences.main.resultset.presentation"
class=
"org.jkiss.dbeaver.ui.
editors.data.
preferences.PrefPageResultSetPresentation"
name=
"%pref.page.name.resultset.presentation"
>
<keywordReference
id=
"org.jkiss.dbeaver.core.keyword.dbeaver"
/>
</page>
<page
category=
"org.jkiss.dbeaver.preferences.main.resultset"
id=
"org.jkiss.dbeaver.preferences.main.dataformat"
class=
"org.jkiss.dbeaver.ui.preferences.PrefPageDataFormat"
name=
"%pref.page.name.data.formats"
>
<page
category=
"org.jkiss.dbeaver.preferences.main.resultset"
id=
"org.jkiss.dbeaver.preferences.main.dataformat"
class=
"org.jkiss.dbeaver.ui.
editors.data.
preferences.PrefPageDataFormat"
name=
"%pref.page.name.data.formats"
>
<keywordReference
id=
"org.jkiss.dbeaver.core.keyword.pref.db.dataformat"
/>
<keywordReference
id=
"org.jkiss.dbeaver.core.keyword.dbeaver"
/>
</page>
...
...
plugins/org.jkiss.dbeaver.core.eclipse/plugin.xml
浏览文件 @
1d259a21
...
...
@@ -55,16 +55,16 @@
<page
category=
"org.jkiss.dbeaver.preferences.main.errorHandle"
id=
"org.jkiss.dbeaver.preferences.main.errorLogs"
class=
"org.jkiss.dbeaver.ui.preferences.PrefPageErrorLogs"
name=
"%pref.page.name.errorLogs"
>
<keywordReference
id=
"org.jkiss.dbeaver.core.keyword.dbeaver"
/>
</page>
<page
category=
"org.jkiss.dbeaver.preferences.editors"
id=
"org.jkiss.dbeaver.preferences.main.resultset"
class=
"org.jkiss.dbeaver.ui.preferences.PrefPageResultSetMain"
name=
"%pref.page.name.resultset"
>
<page
category=
"org.jkiss.dbeaver.preferences.editors"
id=
"org.jkiss.dbeaver.preferences.main.resultset"
class=
"org.jkiss.dbeaver.ui.
editors.data.
preferences.PrefPageResultSetMain"
name=
"%pref.page.name.resultset"
>
<keywordReference
id=
"org.jkiss.dbeaver.core.keyword.dbeaver"
/>
</page>
<page
category=
"org.jkiss.dbeaver.preferences.main.resultset"
id=
"org.jkiss.dbeaver.preferences.main.resultset.editors"
class=
"org.jkiss.dbeaver.ui.preferences.PrefPageResultSetEditors"
name=
"%pref.page.name.resultset.editors"
>
<page
category=
"org.jkiss.dbeaver.preferences.main.resultset"
id=
"org.jkiss.dbeaver.preferences.main.resultset.editors"
class=
"org.jkiss.dbeaver.ui.
editors.data.
preferences.PrefPageResultSetEditors"
name=
"%pref.page.name.resultset.editors"
>
<keywordReference
id=
"org.jkiss.dbeaver.core.keyword.pref.editor.content"
/>
</page>
<page
category=
"org.jkiss.dbeaver.preferences.main.resultset"
id=
"org.jkiss.dbeaver.preferences.main.resultset.presentation"
class=
"org.jkiss.dbeaver.ui.preferences.PrefPageResultSetPresentation"
name=
"%pref.page.name.resultset.presentation"
>
<page
category=
"org.jkiss.dbeaver.preferences.main.resultset"
id=
"org.jkiss.dbeaver.preferences.main.resultset.presentation"
class=
"org.jkiss.dbeaver.ui.
editors.data.
preferences.PrefPageResultSetPresentation"
name=
"%pref.page.name.resultset.presentation"
>
<keywordReference
id=
"org.jkiss.dbeaver.core.keyword.dbeaver"
/>
</page>
<page
category=
"org.jkiss.dbeaver.preferences.main.resultset"
id=
"org.jkiss.dbeaver.preferences.main.dataformat"
class=
"org.jkiss.dbeaver.ui.preferences.PrefPageDataFormat"
name=
"%pref.page.name.data.formats"
>
<page
category=
"org.jkiss.dbeaver.preferences.main.resultset"
id=
"org.jkiss.dbeaver.preferences.main.dataformat"
class=
"org.jkiss.dbeaver.ui.
editors.data.
preferences.PrefPageDataFormat"
name=
"%pref.page.name.data.formats"
>
<keywordReference
id=
"org.jkiss.dbeaver.core.keyword.pref.db.dataformat"
/>
<keywordReference
id=
"org.jkiss.dbeaver.core.keyword.dbeaver"
/>
</page>
...
...
plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF
浏览文件 @
1d259a21
...
...
@@ -42,6 +42,7 @@ Export-Package: org.jkiss.dbeaver,
org.jkiss.dbeaver.ui.dialogs.tools,
org.jkiss.dbeaver.ui.e4,
org.jkiss.dbeaver.ui.editors.data,
org.jkiss.dbeaver.ui.editors.data.preferences,
org.jkiss.dbeaver.ui.editors.sql,
org.jkiss.dbeaver.ui.editors.sql.convert,
org.jkiss.dbeaver.ui.editors.sql.dialogs,
...
...
plugins/org.jkiss.dbeaver.core/plugin.xml
浏览文件 @
1d259a21
...
...
@@ -2881,16 +2881,16 @@
</enabledWhen>
</page>
<page
category=
"org.jkiss.dbeaver.preferences.editors"
id=
"org.jkiss.dbeaver.preferences.main.resultset"
class=
"org.jkiss.dbeaver.ui.preferences.PrefPageResultSetMain"
name=
"%page.org.jkiss.dbeaver.preferences.main.resultset.name"
>
<page
category=
"org.jkiss.dbeaver.preferences.editors"
id=
"org.jkiss.dbeaver.preferences.main.resultset"
class=
"org.jkiss.dbeaver.ui.
editors.data.
preferences.PrefPageResultSetMain"
name=
"%page.org.jkiss.dbeaver.preferences.main.resultset.name"
>
<enabledWhen><reference
definitionId=
"org.jkiss.dbeaver.core.preferences.datasource"
/></enabledWhen>
</page>
<page
category=
"org.jkiss.dbeaver.preferences.main.resultset"
id=
"org.jkiss.dbeaver.preferences.main.resultset.editors"
class=
"org.jkiss.dbeaver.ui.preferences.PrefPageResultSetEditors"
name=
"%page.org.jkiss.dbeaver.preferences.main.resultset.editors.name"
>
<page
category=
"org.jkiss.dbeaver.preferences.main.resultset"
id=
"org.jkiss.dbeaver.preferences.main.resultset.editors"
class=
"org.jkiss.dbeaver.ui.
editors.data.
preferences.PrefPageResultSetEditors"
name=
"%page.org.jkiss.dbeaver.preferences.main.resultset.editors.name"
>
<enabledWhen><reference
definitionId=
"org.jkiss.dbeaver.core.preferences.datasource"
/></enabledWhen>
</page>
<page
category=
"org.jkiss.dbeaver.preferences.main.resultset"
id=
"org.jkiss.dbeaver.preferences.main.resultset.presentation"
class=
"org.jkiss.dbeaver.ui.preferences.PrefPageResultSetPresentation"
name=
"%page.org.jkiss.dbeaver.preferences.main.resultset.presentation.name"
>
<page
category=
"org.jkiss.dbeaver.preferences.main.resultset"
id=
"org.jkiss.dbeaver.preferences.main.resultset.presentation"
class=
"org.jkiss.dbeaver.ui.
editors.data.
preferences.PrefPageResultSetPresentation"
name=
"%page.org.jkiss.dbeaver.preferences.main.resultset.presentation.name"
>
<enabledWhen><reference
definitionId=
"org.jkiss.dbeaver.core.preferences.datasource"
/></enabledWhen>
</page>
<page
category=
"org.jkiss.dbeaver.preferences.main.resultset"
id=
"org.jkiss.dbeaver.preferences.main.dataformat"
class=
"org.jkiss.dbeaver.ui.preferences.PrefPageDataFormat"
name=
"%page.org.jkiss.dbeaver.preferences.main.dataformat.name"
>
<page
category=
"org.jkiss.dbeaver.preferences.main.resultset"
id=
"org.jkiss.dbeaver.preferences.main.dataformat"
class=
"org.jkiss.dbeaver.ui.
editors.data.
preferences.PrefPageDataFormat"
name=
"%page.org.jkiss.dbeaver.preferences.main.dataformat.name"
>
<enabledWhen>
<or>
<instanceof
value=
"org.jkiss.dbeaver.model.navigator.DBNDataSource"
/>
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_de.properties
浏览文件 @
1d259a21
...
...
@@ -1748,10 +1748,6 @@ runtime_jobs_disconnect_name = Verbindung trennen von {0}
sql_editor_menu_format
=
Formatierung
sql_editor_resultset_tool_item_log
=
Protokoll
sql_editor_resultset_tool_item_output
=
Ausgabe
toolbar_datasource_selector_action_read_databases
=
Datenbankliste lesen
toolbar_datasource_selector_all
=
Alle
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
浏览文件 @
1d259a21
...
...
@@ -96,7 +96,7 @@ import org.jkiss.dbeaver.ui.editors.TextEditorUtils;
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.ui.preferences.PrefPageDataFormat
;
import
org.jkiss.dbeaver.ui.
editors.data.
preferences.PrefPageDataFormat
;
import
org.jkiss.dbeaver.ui.preferences.PrefPageDatabaseGeneral
;
import
org.jkiss.dbeaver.utils.RuntimeUtils
;
import
org.jkiss.utils.ArrayUtils
;
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/internal/ResultSetMessages.properties
浏览文件 @
1d259a21
...
...
@@ -81,8 +81,6 @@ controls_rs_pump_job_context_name = Read data from "{0}"
controls_rs_pump_job_name
=
Read data
## SQL editor resultset filter panel ##
sql_editor_resultset_tool_item_log
=
Log
sql_editor_resultset_tool_item_output
=
Output
sql_editor_menu_format
=
Format
sql_editor_resultset_filter_panel_text_enter_sql_to_filter
=
Enter a SQL expression to filter results (use Ctrl+Space)
sql_editor_resultset_filter_panel_text_enter_filter_not_support
=
Data filter is not supported
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditConnectionWizard.java
浏览文件 @
1d259a21
...
...
@@ -39,6 +39,10 @@ import org.jkiss.dbeaver.ui.IActionConstants;
import
org.jkiss.dbeaver.ui.ICompositeDialogPage
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.actions.datasource.DataSourceHandler
;
import
org.jkiss.dbeaver.ui.editors.data.preferences.PrefPageDataFormat
;
import
org.jkiss.dbeaver.ui.editors.data.preferences.PrefPageResultSetEditors
;
import
org.jkiss.dbeaver.ui.editors.data.preferences.PrefPageResultSetMain
;
import
org.jkiss.dbeaver.ui.editors.data.preferences.PrefPageResultSetPresentation
;
import
org.jkiss.dbeaver.ui.preferences.*
;
import
org.jkiss.dbeaver.utils.GeneralUtils
;
import
org.jkiss.utils.CommonUtils
;
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageDataFormat.java
→
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/
editors/data/
preferences/PrefPageDataFormat.java
浏览文件 @
1d259a21
此差异已折叠。
点击以展开。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageResultSetEditors.java
→
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/
editors/data/
preferences/PrefPageResultSetEditors.java
浏览文件 @
1d259a21
...
...
@@ -15,13 +15,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.jkiss.dbeaver.ui.preferences
;
package
org.jkiss.dbeaver.ui.
editors.data.
preferences
;
import
org.eclipse.swt.SWT
;
import
org.eclipse.swt.layout.GridData
;
import
org.eclipse.swt.layout.GridLayout
;
import
org.eclipse.swt.widgets.*
;
import
org.jkiss.dbeaver.DBeaverPreferences
;
import
org.jkiss.dbeaver.Log
;
import
org.jkiss.dbeaver.ModelPreferences
;
import
org.jkiss.dbeaver.core.CoreMessages
;
import
org.jkiss.dbeaver.model.DBConstants
;
...
...
@@ -32,6 +33,7 @@ import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.ui.controls.resultset.ResultSetPreferences
;
import
org.jkiss.dbeaver.ui.data.IValueController
;
import
org.jkiss.dbeaver.ui.preferences.TargetPrefPage
;
import
org.jkiss.dbeaver.utils.GeneralUtils
;
import
org.jkiss.dbeaver.utils.PrefUtils
;
...
...
@@ -40,6 +42,8 @@ import org.jkiss.dbeaver.utils.PrefUtils;
*/
public
class
PrefPageResultSetEditors
extends
TargetPrefPage
{
static
final
Log
log
=
Log
.
getLog
(
PrefPageResultSetEditors
.
class
);
public
static
final
String
PAGE_ID
=
"org.jkiss.dbeaver.preferences.main.resultset.editors"
;
//$NON-NLS-1$
private
Button
stringUseEditorCheck
;
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageResultSetMain.java
→
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/
editors/data/
preferences/PrefPageResultSetMain.java
浏览文件 @
1d259a21
此差异已折叠。
点击以展开。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageResultSetPresentation.java
→
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/
editors/data/
preferences/PrefPageResultSetPresentation.java
浏览文件 @
1d259a21
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录