From 30c40ec32b57fe17b85f4360dc4db3243c66712e Mon Sep 17 00:00:00 2001 From: anchore Date: Thu, 17 Nov 2016 11:54:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E6=97=A5=E6=96=87=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/mainframe/DesignerFrameFileDealerPane.java | 11 ++++++++++- .../fr/design/mainframe/toolbar/ToolBarMenuDock.java | 4 +++- designer_base/src/com/fr/design/menu/KeySetUtils.java | 11 ++++++++++- .../com/fr/design/style/color/NewColorSelectPane.java | 5 ++++- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java index eb20ee9e7f..7ede19d517 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java +++ b/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java @@ -27,6 +27,7 @@ import com.fr.file.FILE; import com.fr.file.FileNodeFILE; import com.fr.file.filetree.FileNode; import com.fr.general.ComparatorUtils; +import com.fr.general.GeneralContext; import com.fr.general.Inter; import com.fr.stable.CoreConstants; import com.fr.stable.StableUtils; @@ -42,6 +43,7 @@ import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.io.File; import java.util.HashMap; +import java.util.Locale; import java.util.Map; import java.util.Set; @@ -411,7 +413,14 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt }); UIButton cancelButton = new UIButton(Inter.getLocText("FR-Designer_Cancel")); - cancelButton.setBounds(250, 90, 60, 25); + + // mod by anchore 16/11/16 + if (Locale.JAPAN.equals(GeneralContext.getLocale())) { + cancelButton.setBounds(250, 90, 80, 25); + } else { + cancelButton.setBounds(180, 90, 80, 25); + } + //cancelButton.setBounds(250, 90, 60, 25); cancelButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { jd.dispose(); diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index 4e1d1decd1..8c2d49a075 100644 --- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -300,7 +300,9 @@ public abstract class ToolBarMenuDock { //shortCuts.add(new TutorialAction()); shortCuts.add(SeparatorDef.DEFAULT); if (ComparatorUtils.equals(ProductConstants.APP_NAME,FINEREPORT)) { - shortCuts.add(new FeedBackAction()); + + // mod by anchore 16/11/17 去掉反馈 + //shortCuts.add(new FeedBackAction()); shortCuts.add(SeparatorDef.DEFAULT); shortCuts.add(SeparatorDef.DEFAULT); // shortCuts.add(new ForumAction()); diff --git a/designer_base/src/com/fr/design/menu/KeySetUtils.java b/designer_base/src/com/fr/design/menu/KeySetUtils.java index 78a557806d..91840bcdcb 100644 --- a/designer_base/src/com/fr/design/menu/KeySetUtils.java +++ b/designer_base/src/com/fr/design/menu/KeySetUtils.java @@ -4,10 +4,12 @@ package com.fr.design.menu; +import com.fr.general.GeneralContext; import com.fr.general.Inter; import javax.swing.*; import java.awt.event.KeyEvent; +import java.util.Locale; /** * Created by IntelliJ IDEA. @@ -710,7 +712,14 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText(new String[]{"Allow", "DashBoard-Potence", "Edit"}); + + // mod by anchore 16/11/16 + if (Locale.JAPAN.equals(GeneralContext.getLocale())) { + return Inter.getLocText(new String[]{"DashBoard-Potence", "Edit"}) + "に" + Inter.getLocText("Allow"); + } else { + return Inter.getLocText(new String[]{"Allow", "DashBoard-Potence", "Edit"}); + } + //return Inter.getLocText(new String[]{"Allow", "DashBoard-Potence", "Edit"}); } @Override diff --git a/designer_base/src/com/fr/design/style/color/NewColorSelectPane.java b/designer_base/src/com/fr/design/style/color/NewColorSelectPane.java index feffb92e0f..bbecf01d3d 100644 --- a/designer_base/src/com/fr/design/style/color/NewColorSelectPane.java +++ b/designer_base/src/com/fr/design/style/color/NewColorSelectPane.java @@ -93,7 +93,10 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { } centerPane.add(Box.createVerticalStrut(1)); - UIButton customButton = new UIButton(Inter.getLocText(new String[]{"More", "Color"}) + "..."); + + // mod by anchore 16/11/16 + UIButton customButton = new UIButton(Inter.getLocText("FR-Designer-Basic_More_Color")); + //UIButton customButton = new UIButton(Inter.getLocText(new String[]{"More", "Color"}) + "..."); customButton.addMouseListener(new MouseAdapter() { @Override From 45af5555831238eacf247f57c8aa4f2429bf2e8b Mon Sep 17 00:00:00 2001 From: anchore Date: Thu, 17 Nov 2016 13:48:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=84=E8=8C=83=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/mainframe/DesignerFrameFileDealerPane.java | 2 +- designer_base/src/com/fr/design/menu/KeySetUtils.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java index 7ede19d517..093f90e5a5 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java +++ b/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java @@ -415,7 +415,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt UIButton cancelButton = new UIButton(Inter.getLocText("FR-Designer_Cancel")); // mod by anchore 16/11/16 - if (Locale.JAPAN.equals(GeneralContext.getLocale())) { + if (ComparatorUtils.equals(Locale.JAPAN, GeneralContext.getLocale())) { cancelButton.setBounds(250, 90, 80, 25); } else { cancelButton.setBounds(180, 90, 80, 25); diff --git a/designer_base/src/com/fr/design/menu/KeySetUtils.java b/designer_base/src/com/fr/design/menu/KeySetUtils.java index 91840bcdcb..ac9314b5ab 100644 --- a/designer_base/src/com/fr/design/menu/KeySetUtils.java +++ b/designer_base/src/com/fr/design/menu/KeySetUtils.java @@ -4,6 +4,7 @@ package com.fr.design.menu; +import com.fr.general.ComparatorUtils; import com.fr.general.GeneralContext; import com.fr.general.Inter; @@ -714,10 +715,10 @@ public class KeySetUtils { public String getMenuName() { // mod by anchore 16/11/16 - if (Locale.JAPAN.equals(GeneralContext.getLocale())) { - return Inter.getLocText(new String[]{"DashBoard-Potence", "Edit"}) + "に" + Inter.getLocText("Allow"); + if (ComparatorUtils.equals(Locale.JAPAN, GeneralContext.getLocale())) { + return Inter.getLocText(new String[]{"FR-Engine_RP_Authority_Edit", "Allow"}); } else { - return Inter.getLocText(new String[]{"Allow", "DashBoard-Potence", "Edit"}); + return Inter.getLocText(new String[]{"Allow", "FR-Engine_RP_Authority_Edit"}); } //return Inter.getLocText(new String[]{"Allow", "DashBoard-Potence", "Edit"}); } From 3ab77cfb70cf2d2500f3bc94691610d5e1103a5b Mon Sep 17 00:00:00 2001 From: anchore Date: Thu, 17 Nov 2016 14:18:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96key?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/menu/KeySetUtils.java | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/designer_base/src/com/fr/design/menu/KeySetUtils.java b/designer_base/src/com/fr/design/menu/KeySetUtils.java index ac9314b5ab..1b62fcdc4a 100644 --- a/designer_base/src/com/fr/design/menu/KeySetUtils.java +++ b/designer_base/src/com/fr/design/menu/KeySetUtils.java @@ -66,7 +66,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_Close_Current"); + return Inter.getLocText("FR-Designer_Close"); } @Override @@ -83,7 +83,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M-Save"); + return Inter.getLocText("FR-Designer_Save"); } @Override @@ -151,7 +151,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("Export"); + return Inter.getLocText("FR-Designer_Export"); } @Override @@ -186,7 +186,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("Export-Excel-Page"); + return Inter.getLocText("FR-Engine_Export-Excel-Page"); } @Override @@ -204,7 +204,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("Export-Excel-Simple"); + return Inter.getLocText("FR-Engine_Export-Excel-Simple"); } @Override @@ -222,7 +222,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("Export-Excel-PageToSheet"); + return Inter.getLocText("FR-Engine_Export-Excel-PageToSheet"); } @Override @@ -365,7 +365,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("ExportAndOutput"); + return Inter.getLocText("FR-Designer_ExportAndOutput"); } @Override @@ -382,7 +382,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return "EXCEL"+Inter.getLocText("ExportAndOutput"); + return "EXCEL"+Inter.getLocText("FR-Designer_ExportAndOutput"); } @Override @@ -416,7 +416,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M-SwitchWorkspace"); + return Inter.getLocText("FR-Designer_M-SwitchWorkspace"); } @Override @@ -433,7 +433,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M-Exit"); + return Inter.getLocText("FR-Designer_M-Exit"); } @Override @@ -451,7 +451,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M-Template"); + return Inter.getLocText("FR-Designer_M-Template"); } @Override @@ -642,7 +642,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("ReportColumns-Columns"); + return Inter.getLocText("FR-Designer_ReportColumns-Columns"); } @Override @@ -660,7 +660,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M-Repeat-Freeze"); + return Inter.getLocText("FR-Designer_M-Repeat-Freeze"); } @Override @@ -678,7 +678,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("Frozen"); + return Inter.getLocText("FR-Engine_Frozen"); } @Override @@ -737,7 +737,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M-Cell"); + return Inter.getLocText("FR-Designer_Cell"); } @Override @@ -771,7 +771,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("Widget-Settings"); + return Inter.getLocText("FR-Designer_Widget-Settings"); } @Override @@ -805,7 +805,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("Condition_Attributes"); + return Inter.getLocText("FR-Designer_Condition_Attributes"); } @Override @@ -822,7 +822,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("Present"); + return Inter.getLocText("FR-Chart-Style_Present"); } @Override @@ -890,7 +890,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("Currency_Line"); + return Inter.getLocText("FR-Designer_Currency_Line"); } @Override