From 993b9c20c81066f5b079302383d1c062429992f4 Mon Sep 17 00:00:00 2001 From: pengda Date: Fri, 11 Jun 2021 16:50:54 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-51958=20=E8=BF=9C=E7=A8=8B=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E6=A3=80=E6=B5=8B=E5=8F=8A=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/env/CheckServiceDialog.java | 5 ++--- .../fr/design/images/lookandfeel/deleteIcon.png | Bin 0 -> 326 bytes .../mainframe/notificationCenter/normal.png | Bin 0 -> 423 bytes .../notificationCenter/notificationCenter.png | Bin 0 -> 347 bytes 4 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 designer-base/src/main/resources/com/fr/design/images/lookandfeel/deleteIcon.png create mode 100644 designer-realize/src/main/resources/com/fr/design/mainframe/notificationCenter/normal.png create mode 100644 designer-realize/src/main/resources/com/fr/design/mainframe/notificationCenter/notificationCenter.png diff --git a/designer-base/src/main/java/com/fr/env/CheckServiceDialog.java b/designer-base/src/main/java/com/fr/env/CheckServiceDialog.java index 185268e79..ef4b0e032 100644 --- a/designer-base/src/main/java/com/fr/env/CheckServiceDialog.java +++ b/designer-base/src/main/java/com/fr/env/CheckServiceDialog.java @@ -167,7 +167,8 @@ public class CheckServiceDialog extends JDialog implements ActionListener { centerPanel.add(detailsPane, BorderLayout.CENTER); JPanel buttonPanel = FRGUIPaneFactory.createBorderLayout_M_Pane(); buttonPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10)); - if (isOnline()) { + boolean Sync = false; + if (Sync && isOnline()) { ignoreButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Sync_Ignore")); ignoreButton.addActionListener(this); syncButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Sync_To_Local")); @@ -183,8 +184,6 @@ public class CheckServiceDialog extends JDialog implements ActionListener { buttonPanel.add(progressBar, BorderLayout.CENTER); buttonPanel.add(syncButton, BorderLayout.EAST); } else { - UILabel adviceLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Sync_Suggestion")); - centerPanel.add(adviceLabel, BorderLayout.SOUTH); UIButton okButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Button_Confirm")); okButton.addActionListener(this); buttonPanel.add(okButton, BorderLayout.EAST); diff --git a/designer-base/src/main/resources/com/fr/design/images/lookandfeel/deleteIcon.png b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/deleteIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..71c71fc82855a055159ddba17019fd7f2ae118c8 GIT binary patch literal 326 zcmV-M0lEH(P)DMTsaZQK8*v<0@$==;%>$2GVd23b+JEprr@ z`=H$QAzIr-n$m{|zMU)Y{ZI$sU#ztgfIj<>Ls&{8JTUXNX*h7uhg20N`;&*^L4$_c zKtx0l(Pb1>%Kcn44ca?8v=A+fwK5#*pr+2 YKZQ?+64-RMBme*a07*qoM6N<$f_N8@A^-pY literal 0 HcmV?d00001 diff --git a/designer-realize/src/main/resources/com/fr/design/mainframe/notificationCenter/normal.png b/designer-realize/src/main/resources/com/fr/design/mainframe/notificationCenter/normal.png new file mode 100644 index 0000000000000000000000000000000000000000..5ee1816682bcf905486879dfbd13663e692391da GIT binary patch literal 423 zcmV;Y0a*TtP)*v|#Day&iS-|+8(U*aNK@}>0`#(r@P9rd z0|Os6hy7<@_{7M-nE1+m%{rJo+yJm<#{a7s|1&V*^VNSwhJTFz8AD-)fDHgUo15zn zE}PK}{LjGf@%z_rsvz%x4G=vP)XMmuu?obFm2hFGRg7Wy@aHQ--pwgsy_3{)7z9|j z8Jg}dVOa8F4_NF!k@Z**JT22%LKpIk{yck-P6B!s8 zQDgZ3|Njg%cjq(AdA1E^E{XwQFTi9nq1Jd{A-sSbi0FoZ z_*gWf1|qI#1i1tR&}?P^C8+OTzp22Z5fT#=BqW%#DN4#PLnz8j`0@ZQIRI9{wh`a7 R`QiWo002ovPDHLkV1n=4#R32T literal 0 HcmV?d00001 diff --git a/designer-realize/src/main/resources/com/fr/design/mainframe/notificationCenter/notificationCenter.png b/designer-realize/src/main/resources/com/fr/design/mainframe/notificationCenter/notificationCenter.png new file mode 100644 index 0000000000000000000000000000000000000000..0445f313449a9ec1f97ccd5d3de489870e1db79c GIT binary patch literal 347 zcmV-h0i^zkP)G*rC7WyJ`lnoNm zU6P))BJu{vp)n>dzSjW!TOyp)Sr);-nBcS#ptW8F=oNs| zuyZ<{er&{X{Qlc7IZ#TuL@Up>%cNmIDP+v!<0G?_RzNxT@khpxC#IO002ovPDHLkV1j<@jEevO literal 0 HcmV?d00001