REPORT-60942 引导页视觉更新

designer-base/src/main/java/com/fr/design/mainframe/guide/ui/GuideManageDialog.java

@@ -1,6 +1,7 @@
 package com.fr.design.mainframe.guide.ui;
 
 
+import com.fr.base.svg.IconUtils;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
@@ -14,7 +15,6 @@ import com.fr.design.mainframe.guide.base.GuideManager;
 import com.fr.design.mainframe.guide.base.GuideVersion;
 import com.fr.design.mainframe.guide.collect.GuideCollector;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.general.IOUtils;
 
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
@@ -31,9 +31,9 @@ import java.awt.event.ActionListener;
 public class GuideManageDialog extends JDialog {
     private static final int DEFAULT_HEIGHT = 400;
     private static final int DEFAULT_WIDTH = 600;
-    private static final Icon GROUP_COMPLETE_NONE = IOUtils.readIcon("/com/fr/design/mainframe/guide/complete_none.png");
+    private static final Icon GROUP_COMPLETE_NONE = IconUtils.readIcon("/com/fr/design/mainframe/guide/complete_none.svg");
-    private static final Icon GROUP_COMPLETE_SOME = IOUtils.readIcon("/com/fr/design/mainframe/guide/complete_some.png");
+    private static final Icon GROUP_COMPLETE_SOME = IconUtils.readIcon("/com/fr/design/mainframe/guide/complete_some.svg");
-    private static final Icon GROUP_COMPLETE_ALL = IOUtils.readIcon("/com/fr/design/mainframe/guide/complete_all.png");
+    private static final Icon GROUP_COMPLETE_ALL = IconUtils.readIcon("/com/fr/design/mainframe/guide/complete_all.svg");
     private static final Color BORDER_COLOR = new Color(224, 224, 225);
     private static final Color UNCOMPLETE_FONT_COLOR = new Color(51, 51, 52);
     private static final Color COMPLETE_FONT_COLOR =  new Color(51,51,52,128);

designer-base/src/main/resources/com/fr/design/mainframe/guide/complete_all.svg

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 7备份 4</title>
+    <defs>
+        <filter id="filter-1">
+            <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 0.254902 0 0 0 0 0.607843 0 0 0 0 0.976471 0 0 0 1.000000 0"></feColorMatrix>
+        </filter>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组-7备份-4" transform="translate(-452.000000, -294.000000)" filter="url(#filter-1)">
+            <g transform="translate(452.000000, 294.000000)" id="icon_QuestionIcon_normal备份-9">
+                <rect id="矩形" x="0" y="0" width="16" height="16"></rect>
+                <path d="M8,0.25 C10.1399118,0.25 12.0774083,1.11754994 13.4799292,2.52007081 C14.8824501,3.92259169 15.75,5.86008824 15.75,8 C15.75,10.1399118 14.8824501,12.0774083 13.4799292,13.4799292 C12.0774083,14.8824501 10.1399118,15.75 8,15.75 C5.86008824,15.75 3.92259169,14.8824501 2.52007081,13.4799292 C1.11754994,12.0774083 0.25,10.1399118 0.25,8 C0.25,5.86008824 1.11754994,3.92259169 2.52007081,2.52007081 C3.92259169,1.11754994 5.86008824,0.25 8,0.25 Z" id="Fill-3" stroke-opacity="0.496167163" stroke="#419BF9" stroke-width="0.5"></path>
+                <path d="M14.5,8 C14.5,9.79476471 13.7723707,11.4197578 12.5960643,12.5960643 C11.4197578,13.7723707 9.79476471,14.5 8,14.5 C6.20523529,14.5 4.58024219,13.7723707 3.40393574,12.5960643 C2.22762929,11.4197578 1.5,9.79476471 1.5,8 C1.5,7.70052513 1.5202589,7.4057771 1.55948076,7.11705169 L7.49405002,11.7381593 L12.7897165,3.60605749 C13.8517066,4.7630672 14.5,6.30590319 14.5,8 Z M8,1.5 C9.67636009,1.5 11.2046101,2.13478954 12.3574752,3.17706357 L6.80926645,9.1207825 L1.6022332,6.8455736 C1.84106679,5.51344393 2.4858429,4.32202858 3.40393574,3.40393574 C4.58024219,2.22762929 6.20523529,1.5 8,1.5 Z" id="形状结合" stroke="#419BF9" fill="#419BF9"></path>
+            </g>
+        </g>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/mainframe/guide/complete_none.svg

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 7备份 5</title>
+    <defs>
+        <filter id="filter-1">
+            <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 0.254902 0 0 0 0 0.607843 0 0 0 0 0.976471 0 0 0 1.000000 0"></feColorMatrix>
+        </filter>
+        <path d="M14,7 C14,10.8656471 10.8656471,14 7,14 C3.13435294,14 0,10.8656471 0,7 C0,3.13435294 3.13435294,0 7,0 C10.8656471,0 14,3.13435294 14,7 Z" id="path-2"></path>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组-7备份-5" transform="translate(-452.000000, -550.000000)" filter="url(#filter-1)">
+            <g transform="translate(452.000000, 550.000000)" id="icon_QuestionIcon_normal备份-9">
+                <rect id="矩形" x="0" y="0" width="16" height="16"></rect>
+                <path d="M8,0.25 C10.1399118,0.25 12.0774083,1.11754994 13.4799292,2.52007081 C14.8824501,3.92259169 15.75,5.86008824 15.75,8 C15.75,10.1399118 14.8824501,12.0774083 13.4799292,13.4799292 C12.0774083,14.8824501 10.1399118,15.75 8,15.75 C5.86008824,15.75 3.92259169,14.8824501 2.52007081,13.4799292 C1.11754994,12.0774083 0.25,10.1399118 0.25,8 C0.25,5.86008824 1.11754994,3.92259169 2.52007081,2.52007081 C3.92259169,1.11754994 5.86008824,0.25 8,0.25 Z" id="Fill-3" stroke-opacity="0.495982777" stroke="#419BF9" stroke-width="0.5"></path>
+                <g id="路径-3" transform="translate(1.000000, 1.000000)">
+                    <mask id="mask-3" fill="white">
+                        <use xlink:href="#path-2"></use>
+                    </mask>
+                    <path stroke="#419BF9" d="M7,0.5 C8.79476471,0.5 10.4197578,1.22762929 11.5960643,2.40393574 C12.7723707,3.58024219 13.5,5.20523529 13.5,7 C13.5,8.79476471 12.7723707,10.4197578 11.5960643,11.5960643 C10.4197578,12.7723707 8.79476471,13.5 7,13.5 C5.20523529,13.5 3.58024219,12.7723707 2.40393574,11.5960643 C1.22762929,10.4197578 0.5,8.79476471 0.5,7 C0.5,5.20523529 1.22762929,3.58024219 2.40393574,2.40393574 C3.58024219,1.22762929 5.20523529,0.5 7,0.5 Z"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/mainframe/guide/complete_some.svg

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 7备份 4</title>
+    <defs>
+        <filter id="filter-1">
+            <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 0.254902 0 0 0 0 0.607843 0 0 0 0 0.976471 0 0 0 1.000000 0"></feColorMatrix>
+        </filter>
+        <path d="M14,7 C14,10.8656471 10.8656471,14 7,14 C3.13435294,14 0,10.8656471 0,7 C0,3.13435294 3.13435294,0 7,0 C10.8656471,0 14,3.13435294 14,7 Z" id="path-2"></path>
+        <path d="M14,7 C14,10.8656471 10.8656471,14 7,14 C3.13435294,14 0,10.8656471 0,7 C0,3.13435294 3.13435294,0 7,0 C10.8656471,0 14,3.13435294 14,7 Z" id="path-4"></path>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组-7备份-4" transform="translate(-452.000000, -422.000000)" filter="url(#filter-1)">
+            <g transform="translate(452.000000, 422.000000)" id="icon_QuestionIcon_normal备份-9">
+                <rect id="矩形" x="0" y="0" width="16" height="16"></rect>
+                <path d="M8,0.25 C10.1399118,0.25 12.0774083,1.11754994 13.4799292,2.52007081 C14.8824501,3.92259169 15.75,5.86008824 15.75,8 C15.75,10.1399118 14.8824501,12.0774083 13.4799292,13.4799292 C12.0774083,14.8824501 10.1399118,15.75 8,15.75 C5.86008824,15.75 3.92259169,14.8824501 2.52007081,13.4799292 C1.11754994,12.0774083 0.25,10.1399118 0.25,8 C0.25,5.86008824 1.11754994,3.92259169 2.52007081,2.52007081 C3.92259169,1.11754994 5.86008824,0.25 8,0.25 Z" id="Fill-3" stroke-opacity="0.495982777" stroke="#419BF9" stroke-width="0.5"></path>
+                <g id="路径-3" transform="translate(1.000000, 1.000000)">
+                    <mask id="mask-3" fill="white">
+                        <use xlink:href="#path-2"></use>
+                    </mask>
+                    <g id="蒙版"></g>
+                    <path d="M1.65086071,7.57759105 C2.92986055,6.74807704 4.30432707,6.33332003 5.77426028,6.33332003 C7.97916009,6.33332003 9.68111352,9.69885717 13.7949191,7.57759105 C16.5374562,6.16341363 14.5988699,9.08198996 7.97916009,16.33332 L2.03321526,13.4433732 L0,8.39748929 L1.65086071,7.57759105 Z" fill="#419BF9" mask="url(#mask-3)"></path>
+                    <mask id="mask-5" fill="white">
+                        <use xlink:href="#path-4"></use>
+                    </mask>
+                    <path stroke="#419BF9" d="M7,0.5 C8.79476471,0.5 10.4197578,1.22762929 11.5960643,2.40393574 C12.7723707,3.58024219 13.5,5.20523529 13.5,7 C13.5,8.79476471 12.7723707,10.4197578 11.5960643,11.5960643 C10.4197578,12.7723707 8.79476471,13.5 7,13.5 C5.20523529,13.5 3.58024219,12.7723707 2.40393574,11.5960643 C1.22762929,10.4197578 0.5,8.79476471 0.5,7 C0.5,5.20523529 1.22762929,3.58024219 2.40393574,2.40393574 C3.58024219,1.22762929 5.20523529,0.5 7,0.5 Z"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

designer-realize/src/main/java/com/fr/design/mainframe/guide/entry/GuideEntryHint.java

@@ -58,6 +58,6 @@ public class GuideEntryHint {
     private Point getBubbleLocation() {
         Point point = SwingUtilities.convertPoint(GuideEntryPane.getGuideEntryPane(),0,0, guideView.getRootPane());
         Dimension size = GuideEntryPane.getGuideEntryPane().getSize();
-        return new Point(point.x - 187,point.y + size.height);
+        return new Point(point.x - 187,point.y + size.height + 5);
     }
 }