From f88ee1d68af3541715a63680b86d4debf9af159a Mon Sep 17 00:00:00 2001 From: "yaoh.wu" Date: Fri, 10 Aug 2018 17:44:52 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-6700=20=E8=BF=9C=E7=A8=8B=E6=9D=83?= =?UTF-8?q?=E9=99=90=E9=AA=8C=E6=94=B6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/border/UITitledBorder.java | 29 ++++++++++++++++++ .../com/fr/design/i18n/DesignI18nImpl.java | 2 +- .../fr/design/remote/button/IconButton.java | 2 +- .../design/remote/ui/AuthorityEditorPane.java | 4 ++- .../fr/design/remote/ui/UserManagerPane.java | 10 +++--- .../remote/images/icon_tab_close_normal.png | Bin 0 -> 256 bytes .../images/icon_tab_close_normal@2x.png | Bin 0 -> 420 bytes 7 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 designer-base/src/main/resources/com/fr/design/remote/images/icon_tab_close_normal.png create mode 100644 designer-base/src/main/resources/com/fr/design/remote/images/icon_tab_close_normal@2x.png diff --git a/designer-base/src/main/java/com/fr/design/border/UITitledBorder.java b/designer-base/src/main/java/com/fr/design/border/UITitledBorder.java index 0c5adcc483..3987844cf8 100644 --- a/designer-base/src/main/java/com/fr/design/border/UITitledBorder.java +++ b/designer-base/src/main/java/com/fr/design/border/UITitledBorder.java @@ -17,6 +17,10 @@ public class UITitledBorder extends TitledBorder { return new UITitledBorder(title); } + public static UITitledBorder createBorderWithTitle(String title, int roundedCorner) { + return new UITitledBorder(title, roundedCorner); + } + private UITitledBorder(String title) { super( BorderFactory.createCompoundBorder( @@ -37,4 +41,29 @@ public class UITitledBorder extends TitledBorder { new Color(1, 159, 222) ); } + + /** + * @param title title + * @param roundedCorner corner width 圆弧宽度，即圆角直径 + */ + private UITitledBorder(String title, int roundedCorner) { + super( + BorderFactory.createCompoundBorder( + BorderFactory.createEmptyBorder( + 0, + 0, + 5, + 0), + new UIRoundedBorder( + UIConstants.TITLED_BORDER_COLOR, + 1, + roundedCorner) + ), + title, + TitledBorder.LEADING, + TitledBorder.TOP, + null, + new Color(1, 159, 222) + ); + } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/i18n/DesignI18nImpl.java b/designer-base/src/main/java/com/fr/design/i18n/DesignI18nImpl.java index af759aa3bf..176d6ec3c1 100644 --- a/designer-base/src/main/java/com/fr/design/i18n/DesignI18nImpl.java +++ b/designer-base/src/main/java/com/fr/design/i18n/DesignI18nImpl.java @@ -34,7 +34,7 @@ public class DesignI18nImpl implements DesignI18nProvider { @Override public String i18nText(String key, Object... args) { - String format = InterProviderFactory.getProvider().getLocText(key); + String format = this.i18nText(key); MessageFormatter.FormattingTuple tuple = MessageFormatter.arrayFormat(format, args); return localeManager.getLocalBundle(GeneralContext.getLocale()).getText(localeManager, tuple.getMessage()); } diff --git a/designer-base/src/main/java/com/fr/design/remote/button/IconButton.java b/designer-base/src/main/java/com/fr/design/remote/button/IconButton.java index 132f99a8fc..598ec7f057 100644 --- a/designer-base/src/main/java/com/fr/design/remote/button/IconButton.java +++ b/designer-base/src/main/java/com/fr/design/remote/button/IconButton.java @@ -19,7 +19,7 @@ public final class IconButton extends JButton { super(StringUtils.EMPTY); setContentAreaFilled(false); setFocusPainted(false); - setIcon(BaseUtils.readIcon("com/fr/design/remote/images/icon_Remove_x.png")); + setIcon(BaseUtils.readIcon("com/fr/design/remote/images/icon_tab_close_normal.png")); setBorder(null); } diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityEditorPane.java b/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityEditorPane.java index b85e49fcfd..eaa96f330e 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityEditorPane.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityEditorPane.java @@ -38,7 +38,9 @@ public class AuthorityEditorPane extends BasicBeanPane { IOFileNodeFilter filter = new IOFileNodeFilter(new String[]{".cpt", ".class", ".frm", ".form"}); tree.setDigIn(true); tree.setFileNodeFilter(filter); - this.add(new UIScrollPane(tree), BorderLayout.CENTER); + UIScrollPane scrollPane = new UIScrollPane(tree); + scrollPane.setBorder(BorderFactory.createEmptyBorder()); + this.add(scrollPane, BorderLayout.CENTER); tree.refreshEnv(); } diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java b/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java index 08f377b79f..bb3f222b99 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java @@ -194,7 +194,7 @@ public class UserManagerPane extends BasicPane { public UserManagerPane() { - this.setBorder(BorderFactory.createEmptyBorder(0,4,0,4)); + this.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 4)); this.setLayout(new BorderLayout()); this.add( TableLayoutHelper.createCommonTableLayoutPane( @@ -221,8 +221,8 @@ public class UserManagerPane extends BasicPane { BorderFactory.createCompoundBorder( new EmptyBorder(6, 0, 0, 0), UITitledBorder.createBorderWithTitle( - Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Decision_Member") - ) + Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Decision_Member"), + 4) ) ); @@ -279,7 +279,9 @@ public class UserManagerPane extends BasicPane { content.setBorder( BorderFactory.createCompoundBorder( new EmptyBorder(6, 0, 0, 0), - UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member") + UITitledBorder.createBorderWithTitle( + Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member"), + 4 ) ) ); diff --git a/designer-base/src/main/resources/com/fr/design/remote/images/icon_tab_close_normal.png b/designer-base/src/main/resources/com/fr/design/remote/images/icon_tab_close_normal.png new file mode 100644 index 0000000000000000000000000000000000000000..9020a3ce99374bc08190087b6ea05e3ea915c495 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|c6quuhFA!` z4LHer$UxxCtrEdQ?P8NU_?zSe_N?r8;Q!G5WXl0&mEByARF$_(N{wFB_$K|h@xAP> zq`o7K%QDa9-p)&Al-V*P+|beGeBqbvyY9VlWoBddwK%Dwa7H8HU(A$6%A3^^79Gu$ z_*MOb-{LkylL@1na`G8wi@qlv%T5UzK$;I{SX2ZxNI6`mJH@1yX02*>!d1eLUZ&Uy>Mf^-!=$4bT@1p00i_>zopr E0DGZmfB*mh literal 0 HcmV?d00001 diff --git a/designer-base/src/main/resources/com/fr/design/remote/images/icon_tab_close_normal@2x.png b/designer-base/src/main/resources/com/fr/design/remote/images/icon_tab_close_normal@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..912429fc9d9bd2d1ea42d10187a4f34aca801cac GIT binary patch literal 420 zcmV;V0bBlwP)Px$UP(kjR9Fe^Rncm~FcdX|iPFAqKe4@SEu+xc?ZdZ1q4UMJ`4ih~isGm>M@$Hz zw@E7VK@t$JH|O4Sa;|A7ldysV!GYj_#euHtSdt`*q9|euRBZ!`8q}&J5!?`Yl}^+2 zb-(XQ&YQ11&+pU*5db5wOVps2fT^@qKomtQ#@M$w&EsaX{Tvd3Jzxa(0X3*qOhjO{ z2z5r|^?W{itE%c(@9Bck@iKN20PqmO(4HiszMTb7B9PZ??{$YFN8U>S3e3|Ycbd63 zIcmKHphy>SY{J+ma@1OH0YK(z+jf+2vk!iI3&81jyT1=