From 17c81aba0b931b2e5e790012342b4e1984522efe Mon Sep 17 00:00:00 2001 From: "yaoh.wu" Date: Fri, 3 Aug 2018 13:57:31 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-10263=20=E8=BF=9C=E7=A8=8B=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E6=9D=83=E9=99=90=E9=AA=8C=E6=94=B6=E9=97=AE=E9=A2=98?= =?UTF-8?q?10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/gui/itree/filetree/FileTreeIcon.java | 13 ++++++++++--- .../gui/modern_style_cht_file_icon_16x16.png | Bin 0 -> 609 bytes .../gui/modern_style_cpt_file_icon_16x16.png | Bin 0 -> 564 bytes .../gui/modern_style_frm_file_icon_16x16.png | Bin 0 -> 497 bytes 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 designer-base/src/main/resources/com/fr/design/images/gui/modern_style_cht_file_icon_16x16.png create mode 100644 designer-base/src/main/resources/com/fr/design/images/gui/modern_style_cpt_file_icon_16x16.png create mode 100644 designer-base/src/main/resources/com/fr/design/images/gui/modern_style_frm_file_icon_16x16.png diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileTreeIcon.java b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileTreeIcon.java index 5647033ccd..130240aead 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileTreeIcon.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileTreeIcon.java @@ -37,6 +37,13 @@ public class FileTreeIcon { public static final Icon FRM_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/frm.png"); public static final Icon CHT_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/cht.png"); + public static final Icon MODERN_CPT_FILE_IMAGE_ICON = + BaseUtils.readIcon("/com/fr/design/images/gui/modern_style_cpt_file_icon_16x16.png"); + public static final Icon MODERN_FRM_FILE_IMAGE_ICON = + BaseUtils.readIcon("/com/fr/design/images/gui/modern_style_frm_file_icon_16x16.png"); + public static final Icon MODERN_CHT_FILE_IMAGE_ICON = + BaseUtils.readIcon("/com/fr/design/images/gui/modern_style_cht_file_icon_16x16.png"); + public static final LockIcon FOLDER_LOCK_ICON = new LockIcon(BaseUtils.readImage("/com/fr/design/images/gui/fold.png")); public static final LockIcon FILE_LOCK_ICON = @@ -205,19 +212,19 @@ public class FileTreeIcon { if (isLocked) { return FileTreeIcon.CPT_FILE_LOCK_ICON; } else { - return FileTreeIcon.CPT_FILE_IMAGE_ICON; + return FileTreeIcon.MODERN_CPT_FILE_IMAGE_ICON; } } else if (fileType == FRM_FILE) { //form frm if (isLocked) { return FileTreeIcon.FRM_FILE_LOCK_ICON; } else { - return FileTreeIcon.FRM_FILE_IMAGE_ICON; + return FileTreeIcon.MODERN_FRM_FILE_IMAGE_ICON; } } else if (fileType == CHT_FILE) { //chart cht if (isLocked) { return FileTreeIcon.CHT_FILE_LOCK_ICON; } else { - return FileTreeIcon.CHT_FILE_IMAGE_ICON; + return FileTreeIcon.MODERN_CHT_FILE_IMAGE_ICON; } } else { if (isLocked) { diff --git a/designer-base/src/main/resources/com/fr/design/images/gui/modern_style_cht_file_icon_16x16.png b/designer-base/src/main/resources/com/fr/design/images/gui/modern_style_cht_file_icon_16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..a1e244a9bb22c865e7a4cae47caaefd0f32d4443 GIT binary patch literal 609 zcmV-n0-pVeP)Px%8%ab#R5%fRQ@w5zK@k4-e(cK`qX?oi%0+|}2vJec_FtOOPTCHxk+wC`==UvFM?A%~B&>JCwC3;`?apQ}^ePL5JfNL3$wgH3mRVe@*XGaL4LtIJL zK$ltdFRV3*XLkkhY6_E1E11r@{nHCxO663A40%qBQ$>`N#EH^F(@vpG@MX3&JxsFnh);v zRiU=UY&PTIy=JrdknB2`{j|4j+i?&C6LKs(CMJyAyWj7>YPDLADdsl^E<_W-&zXqv v=}p*i94~D8UoMyV`HF70dq^A0M%wrTVkY8~k<`H&00000NkvXXu0mjfK)Vx1 literal 0 HcmV?d00001 diff --git a/designer-base/src/main/resources/com/fr/design/images/gui/modern_style_cpt_file_icon_16x16.png b/designer-base/src/main/resources/com/fr/design/images/gui/modern_style_cpt_file_icon_16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..15966d96d17a8445fa9d06fe635d1c03cbaae870 GIT binary patch literal 564 zcmV-40?Yl0P)Px$?ny*JR5%fZQ_X4FO$h6O-wNa6GziUyATNx5ex)e=^F&A572FwUHBSq zeSo|{1!=bt#D%RJT_p?*g0>oGGBG!EJ!jep(_~5yT<$$T-*>-z4p#x$U@*|?^?G$W zoht0#WR_(~&+~ru`~8K^#m#23Ua3?*+O}OtgIC$)WzzTkK-cvrF&)yt&oy5@L1j@_7m<5J3q_rL!l9K847FC^q`3$8Dqk(6)&>}?mZ+bS$; zxqeB&4%@rWXLx(`15Y260n5Pm--3!H5lD;!Vp*|7)iUhyo30-+VitwzcV!Nb6 zAr-7-)z%akDpk=s@j{%q0k$?xJnB>trJIprStCet2C3Mvbd>Yjl}0A{WX~oL5qeGu zgTBLJu>a{C6w0)00&18>-PtT?F-Va7)`pH3cdkr1&aDybJ+9(;tB9(70p_YV4@)qj zIqq2kVJIMkFjSSbWsLD|*#NJ!?byKS*Khc;h>*|ci6s0`tJQvT&Dt2#z~nrq5eQnQ zX@dUCVGsnb+wHc$N^mWirfKobv)SyB&M$kt-dRE(_aK+cN%{}|Xf(QJ+E7ULF}?d$ zr_(u4z`VzepnsqbhrwRP`TQR?@1>^Bmy}Te0000Px$t4TybR5%fZlg&=TKoG~LA5e-~q6cUQ9P|YUG4VjsBdpc<{_~sNsRC%j;ZU<}`yvcOh1SQ+G|hB2n|%%j zgG49iR;y)Omi1OeOVjjVyrL-Zji&4R4LW*4!1sN%-EN-%)|UK2_o2x(X*6hX840ORzLKJDn8>0+zz-M+A&3KpEwss_Jn9 zj)Y-M+DaiC?e1HlgsYkgkNpa4k`U(e@YkQv<2VMQkgXtaX4QZ(6Xb@Vi(`xle0m8S zB@_}*Q4q*#ma|asWHJHHIT(h4&%A!F*Xs-N$@9oj(wqn=n8dNsM%c;sola-9FYvFJ zrfE>A;Js`%Bb?tlj`Nl2ixN;d#s6XDx^BKpGB11*#D2lL@4DUYa