From 4183e3b50c374cff57c502d11332a648de4bbfe9 Mon Sep 17 00:00:00 2001 From: plough Date: Thu, 21 Sep 2017 11:25:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BD=E9=99=85=E5=8C=96=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/design/report/UnitFieldPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer/src/com/fr/design/report/UnitFieldPane.java b/designer/src/com/fr/design/report/UnitFieldPane.java index e74155a93..e115e8a3f 100644 --- a/designer/src/com/fr/design/report/UnitFieldPane.java +++ b/designer/src/com/fr/design/report/UnitFieldPane.java @@ -48,7 +48,7 @@ public class UnitFieldPane extends JPanel { } else if (unitType == Constants.UNIT_INCH) { this.setText(Inter.getLocText("FR-Designer_Unit_INCH")); } else { - this.setText(Inter.getLocText("FR-Designer_Unit_MM-mm")); + this.setText(Inter.getLocText("FR-Designer_Unit_MM")); } //ajust the heigt of unitLabel. From d9cb9c1aa51c5f477510451000cd14f029fcc6c9 Mon Sep 17 00:00:00 2001 From: plough Date: Thu, 21 Sep 2017 16:55:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=82=AC=E5=81=9C=E6=8F=90=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/gui/ibutton/UIButton.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/gui/ibutton/UIButton.java b/designer_base/src/com/fr/design/gui/ibutton/UIButton.java index 776a6a284..91602372d 100644 --- a/designer_base/src/com/fr/design/gui/ibutton/UIButton.java +++ b/designer_base/src/com/fr/design/gui/ibutton/UIButton.java @@ -36,7 +36,7 @@ public class UIButton extends JButton implements UIObserver { private CellBorderStyle border = null; protected UIObserverListener uiObserverListener; - private static final int TOOLTIP_INIT_DELAY = 1000; // 延迟 1s 显示提示文字 + private static final int TOOLTIP_INIT_DELAY = 300; // 延迟 0.3s 显示提示文字 public UIButton() { this(StringUtils.EMPTY);