From f9191f54f340db523483c30d32f5261050476b49 Mon Sep 17 00:00:00 2001 From: "yaoh.wu" Date: Tue, 18 Sep 2018 11:40:57 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-11395=20=E7=94=A8=E6=88=B7=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E4=BA=A4=E4=BA=92=E4=BF=AE=E8=AE=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/remote/ui/UserManagerPane.java | 12 +++++++----- .../images/buttonicon/user_search_normal.png | Bin 0 -> 444 bytes .../images/buttonicon/user_search_normal@2x.png | Bin 0 -> 844 bytes .../java/com/fr/start/preload/ImagePreLoader.java | 7 +++++-- 4 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 designer-base/src/main/resources/com/fr/design/images/buttonicon/user_search_normal.png create mode 100644 designer-base/src/main/resources/com/fr/design/images/buttonicon/user_search_normal@2x.png 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 a0fbb0bab..d23a5cbaf 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 @@ -1,5 +1,6 @@ package com.fr.design.remote.ui; +import com.fr.base.BaseUtils; import com.fr.design.border.UITitledBorder; import com.fr.design.constants.LayoutConstants; import com.fr.design.dialog.BasicPane; @@ -240,13 +241,14 @@ public class UserManagerPane extends BasicPane { ); // 搜索 - JPanel searchPanel = new JPanel(new FlowLayout(FlowLayout.LEFT)); - searchPanel.setBorder(BorderFactory.createEmptyBorder()); - keyField.setPreferredSize(new Dimension(250, 20)); + JPanel searchPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 5)); + searchPanel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 5)); + keyField.setPreferredSize(new Dimension(270, 20)); keyField.requestFocus(); keyField.addKeyListener(keyFieldKeyListener); keyField.getDocument().addDocumentListener(documentListener); - keyButton.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Search")); + keyButton.setIcon(BaseUtils.readIcon("com/fr/design/images/buttonicon/user_search_normal.png")); + keyButton.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Search")); keyButton.addActionListener(keyButtonActionListener); searchPanel.add(keyField); searchPanel.add(keyButton); @@ -395,7 +397,7 @@ public class UserManagerPane extends BasicPane { final SwingWorker loadMoreWorker = new SwingWorker, Void>() { @Override protected List doInBackground() { - + String username = WorkContext.getCurrent().getConnection().getUserName(); synchronized (addingMembers) { addingMembers.remove(RemoteDesignMember.DEFAULT_MEMBER); diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/user_search_normal.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/user_search_normal.png new file mode 100644 index 0000000000000000000000000000000000000000..9a9a2e65a42643407fb8f09966d6b6442c504a3f GIT binary patch literal 444 zcmV;t0YmPx$c1c7*R5%f(QN2sUP!PXMf)d+qLP(xi) z*)@PnxzVV;#cP$VDZ}&DO8}h*MEPkL+HNkFwOO;z@i4EdM|#*n_%nlz?Rx#TI!cEY zgQW~E0kSLUPNELFM~HCo6PPJD&iQD(1iu<#L)Z1IL?-1#dD=}< zq{S|!3nBt+_If?q`gjR~V3Dr!oUTwK)cXDYRyrB?IZqe4j>p)J2r^|UVQ1W_!YjZY zB39A_ItP6J=|hP5J3f^Vj+M{n-wTC8+p?@>+qUcq+cL zlsFv(gR^$K^Gf=h3QbMJ1w^evLbKTWrdiROoU!89d=Y}puf4fWo0000Px&21!IgR9Fe+R?lk_K^WbMY15EE@X|xpOTdEkT0=>RHPAmG-uw%^coP)=0u`~r zgGW6J-psiO(FQ_D>#>(Y^^z2Nk!V7iCS-gso0)FX?9Of>r|xBE=6m1!-hA`T56img zpD-mLpU>a!_xr`sNEU?<>r%=zeb8>9eH4j^ax4}rSF6=OCa!sQPXUEOVWr#cK11M_ za7@i}c8#?mwm`((guzX@S|LH|cGnQU^b)9Kh4 z-65_~@%k8PTQ)1Me(5qzJ%fYbPdQ~TV{ z$z)R;iqj9T1^9u&+6IGxDsCgc1|VH62I2`9HsCBC#W&6-D(Y<3Hrv+%kgg*dA!K_N z6t=H8P>erKzFGipHG+Azo19E`#UZ8GGhwv=Ua0`Lk%=81CMHKOJAKK4Ec}Z`#b+;^ z8rK4NV)06)ffox;Mgc zS$vsH=8Y*h?Nb8ynBaX50^H~F0Yub;EC(^f(#HuZS5HoUzYZcm?bj*nbsr?0IYg{p zl8MscVdME_|7vTl0K#~m2Yr&U;1IaPv}5M4&~^p&7vU*DY316^d6Z)5#2NQFw;HS6 zU2q#4*>^J{c9Dq}iqri!3UGtNw1bMc6^1kn_Vl#1mrmPB_-sx5w%F&mn`dDH7$k^@ zg$nQzVcU0xtyU8c*qL*H1B>{a0u;N7TguT>)n0f8R3I(~XO7)*4?E}s`c-AS+5i8I WHhpe=F>4_J0000