From 3dfbc13293d5bdd2fd3faa3cb6122825373da39f Mon Sep 17 00:00:00 2001 From: richie Date: Tue, 29 Mar 2016 14:38:53 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/mainframe/DesignerFrame.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java index 7d5adb038..3b3ffdf69 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java +++ b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java @@ -568,6 +568,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); StringBuilder defaultTitleSB = new StringBuilder(); defaultTitleSB.append(ProductConstants.PRODUCT_NAME); + defaultTitleSB.append(" "); + defaultTitleSB.append(ProductConstants.BRANCH); // james：标识登录的用户和登录的ENV String envName = DesignerEnvManager.getEnvManager().getCurEnvName(); Env env = DesignerEnvManager.getEnvManager().getEnv(envName); From 573d9740f97e344e879c5c23b61a93d308f2f6b5 Mon Sep 17 00:00:00 2001 From: richie Date: Wed, 30 Mar 2016 09:21:26 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=97=B6=E9=97=B4=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/mainframe/DesignerFrame.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java index 3b3ffdf69..876bf3922 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java +++ b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java @@ -574,7 +574,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta String envName = DesignerEnvManager.getEnvManager().getCurEnvName(); Env env = DesignerEnvManager.getEnvManager().getEnv(envName); if (env != null) { - defaultTitleSB.append('-').append(env.getUser()).append('@').append(envName).append('['); + defaultTitleSB.append(env.getUser()).append('@').append(envName).append('['); defaultTitleSB.append(env.getEnvDescription()); defaultTitleSB.append(']'); if (editingTemplate != null) { From 2ca8643344786f1582d127c8e2a3fbd0a3fe1f8e Mon Sep 17 00:00:00 2001 From: richie Date: Wed, 30 Mar 2016 09:25:08 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=88=A0=E9=99=A4master=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E7=89=88=E6=9C=AC=E6=9E=84=E5=BB=BA=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=A0=87=E8=AE=B0,=E4=BC=A0=E9=94=99=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/mainframe/DesignerFrame.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java index 876bf3922..7d5adb038 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java +++ b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java @@ -568,13 +568,11 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); StringBuilder defaultTitleSB = new StringBuilder(); defaultTitleSB.append(ProductConstants.PRODUCT_NAME); - defaultTitleSB.append(" "); - defaultTitleSB.append(ProductConstants.BRANCH); // james：标识登录的用户和登录的ENV String envName = DesignerEnvManager.getEnvManager().getCurEnvName(); Env env = DesignerEnvManager.getEnvManager().getEnv(envName); if (env != null) { - defaultTitleSB.append(env.getUser()).append('@').append(envName).append('['); + defaultTitleSB.append('-').append(env.getUser()).append('@').append(envName).append('['); defaultTitleSB.append(env.getEnvDescription()); defaultTitleSB.append(']'); if (editingTemplate != null) { From 64baf41950786655bb80c32832cef6d09b53f428 Mon Sep 17 00:00:00 2001 From: richie Date: Wed, 30 Mar 2016 09:25:46 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=97=B6=E9=97=B4=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/mainframe/DesignerFrame.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java index 7d5adb038..876bf3922 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java +++ b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java @@ -568,11 +568,13 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); StringBuilder defaultTitleSB = new StringBuilder(); defaultTitleSB.append(ProductConstants.PRODUCT_NAME); + defaultTitleSB.append(" "); + defaultTitleSB.append(ProductConstants.BRANCH); // james：标识登录的用户和登录的ENV String envName = DesignerEnvManager.getEnvManager().getCurEnvName(); Env env = DesignerEnvManager.getEnvManager().getEnv(envName); if (env != null) { - defaultTitleSB.append('-').append(env.getUser()).append('@').append(envName).append('['); + defaultTitleSB.append(env.getUser()).append('@').append(envName).append('['); defaultTitleSB.append(env.getEnvDescription()); defaultTitleSB.append(']'); if (editingTemplate != null) { From d2cfe2f9789bb55c6c6f1b625e59dedd811061ed Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Wed, 30 Mar 2016 19:10:49 +0800 Subject: [PATCH 05/11] rt --- .../src/com/fr/design/extra/PluginFromStorePane.java | 5 +++-- designer_base/src/com/fr/design/extra/PluginUpdatePane.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/designer_base/src/com/fr/design/extra/PluginFromStorePane.java b/designer_base/src/com/fr/design/extra/PluginFromStorePane.java index 717cd1199..f59c2d166 100644 --- a/designer_base/src/com/fr/design/extra/PluginFromStorePane.java +++ b/designer_base/src/com/fr/design/extra/PluginFromStorePane.java @@ -184,6 +184,9 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane(){ @@ -229,8 +232,6 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane(){ @@ -205,8 +208,6 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane Date: Wed, 30 Mar 2016 19:13:56 +0800 Subject: [PATCH 06/11] rt --- .../src/com/fr/design/mainframe/bbs/BBSLoginDialog.java | 6 +++++- designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java b/designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java index 60545d7b6..f809022ff 100644 --- a/designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java +++ b/designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java @@ -225,9 +225,13 @@ public class BBSLoginDialog extends UIDialog { setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Login-Failure-Tip")); } - public void tipForUsernameEmpty(){ + private void tipForUsernameEmpty(){ setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Username-Empty-Tip")); } + + public void tipForDownloadPluginWithoutLogin() { + setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Download-Unlogin-Tip")); + } private void tipForPasswordEmpty(){ setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Password-Empty-Tip")); diff --git a/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java b/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java index 0f803d7f8..98a07bd12 100644 --- a/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java +++ b/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java @@ -81,7 +81,7 @@ public class UserInfoLabel extends UILabel{ bbsLoginDialog = new BBSLoginDialog(DesignerContext.getDesignerFrame(), UserInfoLabel.this); } bbsLoginDialog.clearLoginInformation(); - bbsLoginDialog.tipForUsernameEmpty(); + bbsLoginDialog.tipForDownloadPluginWithoutLogin(); bbsLoginDialog.setModal(true); bbsLoginDialog.showWindow(); } From 954ab356d668ea84ec5f75380373135ef8ef61e8 Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Wed, 30 Mar 2016 20:00:53 +0800 Subject: [PATCH 07/11] rt --- designer_base/src/com/fr/design/extra/PluginFromStorePane.java | 2 +- designer_base/src/com/fr/design/extra/PluginUpdatePane.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/extra/PluginFromStorePane.java b/designer_base/src/com/fr/design/extra/PluginFromStorePane.java index f59c2d166..e40f5a2bf 100644 --- a/designer_base/src/com/fr/design/extra/PluginFromStorePane.java +++ b/designer_base/src/com/fr/design/extra/PluginFromStorePane.java @@ -184,7 +184,7 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane Date: Wed, 30 Mar 2016 23:25:38 +0800 Subject: [PATCH 08/11] rt --- designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java | 2 +- designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java b/designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java index f809022ff..702b878a6 100644 --- a/designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java +++ b/designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java @@ -229,7 +229,7 @@ public class BBSLoginDialog extends UIDialog { setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Username-Empty-Tip")); } - public void tipForDownloadPluginWithoutLogin() { + public void showTipForDownloadPluginWithoutLogin() { setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Download-Unlogin-Tip")); } diff --git a/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java b/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java index 98a07bd12..319c3d92e 100644 --- a/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java +++ b/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java @@ -81,7 +81,7 @@ public class UserInfoLabel extends UILabel{ bbsLoginDialog = new BBSLoginDialog(DesignerContext.getDesignerFrame(), UserInfoLabel.this); } bbsLoginDialog.clearLoginInformation(); - bbsLoginDialog.tipForDownloadPluginWithoutLogin(); + bbsLoginDialog.showTipForDownloadPluginWithoutLogin(); bbsLoginDialog.setModal(true); bbsLoginDialog.showWindow(); } From 6e2660120e6b4ce93bb06e907d9c2d313581a476 Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Thu, 31 Mar 2016 10:35:14 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E9=9F=A9=E6=96=87=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/utils/DesignUtils.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/utils/DesignUtils.java b/designer_base/src/com/fr/design/utils/DesignUtils.java index 61b71e859..f048578d9 100644 --- a/designer_base/src/com/fr/design/utils/DesignUtils.java +++ b/designer_base/src/com/fr/design/utils/DesignUtils.java @@ -247,7 +247,11 @@ public class DesignUtils { //默认语言(中文:宋体, 英文:Tahoma, 其他:Dialog) guiFRFont = getNamedFont("SimSun"); if (!guiFRFont.canDisplay(displayChar)) { - FRContext.getLogger().error(Inter.getLocText("FR-Base_SimSun_Not_Found")); + //比如想在中文或英文系统里用韩文设计器 + guiFRFont = getNamedFont("Dialog"); + if(!guiFRFont.canDisplay(displayChar)) { + FRContext.getLogger().error(Inter.getLocText("FR-Base_SimSun_Not_Found")); + } } } @@ -266,7 +270,8 @@ public class DesignUtils { return ComparatorUtils.equals(defaultLocale, Locale.TRADITIONAL_CHINESE) || ComparatorUtils.equals(defaultLocale, Locale.JAPANESE) || ComparatorUtils.equals(defaultLocale, Locale.JAPAN) - || ComparatorUtils.equals(defaultLocale, Locale.KOREAN); + || ComparatorUtils.equals(defaultLocale, Locale.KOREAN) + || ComparatorUtils.equals(defaultLocale, Locale.KOREA); } /** From 474f4da1df674703a86174289e8e1c527c7087ea Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Thu, 31 Mar 2016 13:23:41 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E9=9F=A9=E6=96=87=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/actions/file/LocalePane.java | 5 +++ .../design/actions/file/PreferencePane.java | 31 +++++++------------ 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/designer_base/src/com/fr/design/actions/file/LocalePane.java b/designer_base/src/com/fr/design/actions/file/LocalePane.java index a604bc22a..27dad46df 100644 --- a/designer_base/src/com/fr/design/actions/file/LocalePane.java +++ b/designer_base/src/com/fr/design/actions/file/LocalePane.java @@ -48,6 +48,7 @@ public class LocalePane extends BasicPane { private static final String CN = "fr_zh_CN.properties"; private static final String JP = "fr_ja_JP.properties"; private static final String TW = "fr_zh_TW.properties"; + private static final String KR = "fr_ko_KR.properties"; private static final String PREFIX = "fr_"; private static final int LOCALE_NAME_LEN = 5; @@ -128,6 +129,7 @@ public class LocalePane extends BasicPane { Properties cn = loadLocaleProperties(CN); Properties jp = loadLocaleProperties(JP); Properties tw = loadLocaleProperties(TW); + Properties kr = loadLocaleProperties(KR); Set keys = fr.stringPropertyNames(); List sortKeys = new ArrayList(keys); @@ -138,6 +140,7 @@ public class LocalePane extends BasicPane { Vector cnVector = new Vector(); Vector jpVector = new Vector(); Vector twVector = new Vector(); + Vector krVector = new Vector(); for (String key : sortKeys) { keyVector.add(key); valueVector.add(fr.getProperty(key)); @@ -145,6 +148,7 @@ public class LocalePane extends BasicPane { cnVector.add(cn.getProperty(key)); jpVector.add(jp.getProperty(key)); twVector.add(tw.getProperty(key)); + krVector.add(kr.getProperty(key)); } predefineTableModel.addColumn(Inter.getLocText("Key"), keyVector); predefineTableModel.addColumn(Inter.getLocText("Value"), valueVector); @@ -152,6 +156,7 @@ public class LocalePane extends BasicPane { predefineTableModel.addColumn("zh_CN", cnVector); predefineTableModel.addColumn("ja_JP", jpVector); predefineTableModel.addColumn("zh_TW", twVector); + predefineTableModel.addColumn("ko_KR", krVector); } private void initCustomProperties() throws Exception { diff --git a/designer_base/src/com/fr/design/actions/file/PreferencePane.java b/designer_base/src/com/fr/design/actions/file/PreferencePane.java index a40f0e82f..c3944afd1 100644 --- a/designer_base/src/com/fr/design/actions/file/PreferencePane.java +++ b/designer_base/src/com/fr/design/actions/file/PreferencePane.java @@ -1,24 +1,5 @@ package com.fr.design.actions.file; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.io.File; -import java.util.Locale; - -import javax.swing.JFileChooser; -import javax.swing.JPanel; -import javax.swing.KeyStroke; -import javax.swing.SwingUtilities; - import com.fr.base.BaseUtils; import com.fr.design.DesignerEnvManager; import com.fr.design.dialog.BasicDialog; @@ -39,9 +20,16 @@ import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.DesignerContext; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; +import com.fr.general.FRFont; import com.fr.general.FRLevel; import com.fr.general.Inter; +import javax.swing.*; +import java.awt.*; +import java.awt.event.*; +import java.io.File; +import java.util.Locale; + /** * 选项对话框 * @@ -87,7 +75,9 @@ public class PreferencePane extends BasicPane { getLocaledLanguage("Simplified_Chinese_Language", Locale.SIMPLIFIED_CHINESE), getLocaledLanguage("English_Language", Locale.ENGLISH), getLocaledLanguage("Japanese_Language", Locale.JAPAN), - getLocaledLanguage("Traditional_Chinese_Language", Locale.TRADITIONAL_CHINESE)}; + getLocaledLanguage("Traditional_Chinese_Language", Locale.TRADITIONAL_CHINESE), + getLocaledLanguage("Korea_Language",Locale.KOREA), + }; //设置是否支持undo private UICheckBox supportUndoCheckBox; @@ -366,6 +356,7 @@ public class PreferencePane extends BasicPane { generalPane.add(languageAndDashBoard_pane); languageAndDashBoard_pane.add(LanguagePane); languageComboBox = new UIComboBox(LANGUAGE); + languageComboBox.setFont(FRFont.getInstance("Dialog", Font.PLAIN, 12));//为了在中文系统中显示韩文 ActionLabel languageLabel = new ActionLabel(Inter.getLocText("FR-Designer_Designer_Language")); languageLabel.addActionListener(new ActionListener() { @Override From 2ae594dfc48d6f2d754a1beab87e1e193fd5c59e Mon Sep 17 00:00:00 2001 From: fr_shine Date: Thu, 31 Mar 2016 16:16:10 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../series/SeriesCondition/DataSeriesConditionPane.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java index 70c6b3b4f..f4eac4821 100644 --- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java +++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java @@ -5,6 +5,7 @@ import com.fr.chart.base.AttrAlpha; import com.fr.chart.base.AttrBackground; import com.fr.chart.base.AttrContents; import com.fr.chart.base.DataSeriesCondition; +import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartattr.Plot; import com.fr.chart.chartglyph.ConditionAttr; import com.fr.data.condition.AbstractCondition; @@ -49,10 +50,13 @@ public class DataSeriesConditionPane extends ConditionAttributesPane