From 30c40ec32b57fe17b85f4360dc4db3243c66712e Mon Sep 17 00:00:00 2001
From: anchore <anchore@foxmail.com>
Date: Thu, 17 Nov 2016 11:54:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=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