fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

REPORT-42238 【10.0.13】JDK11设计器图标模糊问题优化 

No.11: 替换了菜单栏-帮助和菜单栏-社区的图标
research/11.0
Yvan 4 years ago
parent
9ffb6ea90f
commit
0d11c8ae86
47 changed files with 248 additions and 67 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      designer-base/src/main/java/com/fr/design/actions/community/BBSAction.java
  2. 9
      designer-base/src/main/java/com/fr/design/actions/community/BugAction.java
  3. 4
      designer-base/src/main/java/com/fr/design/actions/community/BugNeedAction.java
  4. 4
      designer-base/src/main/java/com/fr/design/actions/community/CenterAction.java
  5. 5
      designer-base/src/main/java/com/fr/design/actions/community/FacebookFansAction.java
  6. 4
      designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java
  7. 4
      designer-base/src/main/java/com/fr/design/actions/community/QuestionAction.java
  8. 5
      designer-base/src/main/java/com/fr/design/actions/community/SignAction.java
  9. 4
      designer-base/src/main/java/com/fr/design/actions/community/TechSolutionAction.java
  10. 5
      designer-base/src/main/java/com/fr/design/actions/community/VideoAction.java
  11. 4
      designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java
  12. 6
      designer-base/src/main/java/com/fr/design/actions/help/WebDemoAction.java
  13. 4
      designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineAction.java
  14. 8
      designer-base/src/main/java/com/fr/design/actions/server/FunctionManagerAction.java
  15. 6
      designer-base/src/main/java/com/fr/design/actions/server/GlobalParameterAction.java
  16. 8
      designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java
  17. 6
      designer-base/src/main/java/com/fr/design/actions/server/PlatformManagerAction.java
  18. 6
      designer-base/src/main/java/com/fr/design/actions/server/PluginManagerAction.java
  19. 4
      designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthManagerAction.java
  20. 4
      designer-base/src/main/java/com/fr/design/update/actions/SoftwareUpdateAction.java
  21. 7
      designer-base/src/main/resources/com/fr/design/images/bbs/bbs_normal.svg
  22. 7
      designer-base/src/main/resources/com/fr/design/images/bbs/bug_normal.svg
  23. 7
      designer-base/src/main/resources/com/fr/design/images/bbs/center_normal.svg
  24. 9
      designer-base/src/main/resources/com/fr/design/images/bbs/facebook_normal.svg
  25. 7
      designer-base/src/main/resources/com/fr/design/images/bbs/help_normal.svg
  26. 7
      designer-base/src/main/resources/com/fr/design/images/bbs/need_normal.svg
  27. 7
      designer-base/src/main/resources/com/fr/design/images/bbs/question_normal.svg
  28. 7
      designer-base/src/main/resources/com/fr/design/images/bbs/sign_normal.svg
  29. 7
      designer-base/src/main/resources/com/fr/design/images/bbs/solution_normal.svg
  30. 7
      designer-base/src/main/resources/com/fr/design/images/bbs/video_normal.svg
  31. 9
      designer-base/src/main/resources/com/fr/design/images/chart/ChartType_normal.svg
  32. 13
      designer-base/src/main/resources/com/fr/design/images/data/dock/serverdatabase_normal.svg
  33. 7
      designer-base/src/main/resources/com/fr/design/images/m_help/demo_normal.svg
  34. 8
      designer-base/src/main/resources/com/fr/design/images/m_web/edit_normal.svg
  35. 7
      designer-base/src/main/resources/com/fr/design/images/m_web/function_normal.svg
  36. 8
      designer-base/src/main/resources/com/fr/design/images/server/platform_16_16_normal.svg
  37. 8
      designer-base/src/main/resources/com/fr/design/images/server/plugin_normal.svg
  38. 7
      designer-base/src/main/resources/com/fr/design/images/update/update_new_normal.svg
  39. 9
      designer-base/src/main/resources/com/fr/design/remote/images/icon_Remote_Design_Auth_Manager_normal@1x_normal.svg
  40. 6
      designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java
  41. 4
      designer-chart/src/main/java/com/fr/van/chart/map/server/ChartMapEditorAction.java
  42. 8
      designer-chart/src/main/resources/com/fr/van/chart/map/images/mapData_normal.svg
  43. 6
      designer-realize/src/main/java/com/fr/design/actions/server/ServerConfigManagerAction.java
  44. 3
      designer-realize/src/main/java/com/fr/design/actions/server/StyleListAction.java
  45. 4
      designer-realize/src/main/java/com/fr/design/actions/server/WidgetManagerAction.java
  46. 21
      designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java
  47. 7
      designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/smallsearch_normal.svg

8
designer-base/src/main/java/com/fr/design/actions/community/BBSAction.java
Unescape View File

@ -1,6 +1,6 @@
package com.fr.design.actions.community;
import com.fr.base.BaseUtils;
import com.fr.base.svg.SVGIconUtils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.menu.MenuKeySet;
@ -13,15 +13,15 @@ import java.awt.event.ActionEvent;
public class BBSAction extends UpdateAction
{
public BBSAction()
{
this.setMenuKeySet(BBS);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs/bbs.png"));
this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/bbs/bbs_normal.svg"));
}
/**

9
designer-base/src/main/java/com/fr/design/actions/community/BugAction.java
Unescape View File

@ -1,6 +1,6 @@
package com.fr.design.actions.community;
import com.fr.base.BaseUtils;
import com.fr.base.svg.SVGIconUtils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.menu.MenuKeySet;
import com.fr.design.utils.BrowseUtils;
@ -17,8 +17,7 @@ public class BugAction extends UpdateAction
{ this.setMenuKeySet(BUG);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs/bug.png"));
this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/bbs/bug_normal.svg"));
}
@Override
@ -29,7 +28,7 @@ public void actionPerformed(ActionEvent arg0)
}
public static final MenuKeySet BUG = new MenuKeySet() {
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community_Bug");
@ -43,7 +42,7 @@ public void actionPerformed(ActionEvent arg0)
@Override
public char getMnemonic()
{
return 'U';
}
};

4
designer-base/src/main/java/com/fr/design/actions/community/BugNeedAction.java
Unescape View File

@ -1,6 +1,6 @@
package com.fr.design.actions.community;
import com.fr.base.BaseUtils;
import com.fr.base.svg.SVGIconUtils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.locale.impl.BugNeedMark;
import com.fr.design.menu.MenuKeySet;
@ -20,7 +20,7 @@ public class BugNeedAction extends UpdateAction {
this.setMenuKeySet(BugAndNeed);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs/need.png"));
this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/bbs/need_normal.svg"));
}
@Override

4
designer-base/src/main/java/com/fr/design/actions/community/CenterAction.java
Unescape View File

@ -1,6 +1,6 @@
package com.fr.design.actions.community;
import com.fr.base.BaseUtils;
import com.fr.base.svg.SVGIconUtils;
import com.fr.design.menu.MenuKeySet;
import com.fr.design.utils.BrowseUtils;
import com.fr.general.CloudCenter;
@ -17,7 +17,7 @@ public class CenterAction extends UpAction{
this.setMenuKeySet(CENTER);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs/center.png"));
this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/bbs/center_normal.svg"));
}

5
designer-base/src/main/java/com/fr/design/actions/community/FacebookFansAction.java
Unescape View File

@ -1,10 +1,9 @@
package com.fr.design.actions.community;
import com.fr.base.svg.SVGIconUtils;
import com.fr.design.menu.MenuKeySet;
import com.fr.design.utils.BrowseUtils;
import com.fr.general.CloudCenter;
import com.fr.general.IOUtils;
import javax.swing.KeyStroke;
import java.awt.event.ActionEvent;
@ -14,7 +13,7 @@ public class FacebookFansAction extends UpAction {
this.setMenuKeySet(FACEBOOKFANS);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/bbs/facebook.png"));
this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/bbs/facebook_normal.svg"));
}
@Override

4
designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java
Unescape View File

@ -1,6 +1,6 @@
package com.fr.design.actions.community;
import com.fr.base.BaseUtils;
import com.fr.base.svg.SVGIconUtils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.menu.MenuKeySet;
import com.fr.design.utils.BrowseUtils;
@ -18,7 +18,7 @@ public class NeedAction extends UpdateAction
this.setMenuKeySet(NEED);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs/need.png"));
this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/bbs/need_normal.svg"));
}

4
designer-base/src/main/java/com/fr/design/actions/community/QuestionAction.java
Unescape View File

@ -1,6 +1,6 @@
package com.fr.design.actions.community;
import com.fr.base.BaseUtils;
import com.fr.base.svg.SVGIconUtils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.menu.MenuKeySet;
import com.fr.design.utils.BrowseUtils;
@ -16,7 +16,7 @@ public class QuestionAction extends UpdateAction {
this.setMenuKeySet(QUESTIONS);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs/question.png"));
this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/bbs/question_normal.svg"));
}

5
designer-base/src/main/java/com/fr/design/actions/community/SignAction.java
Unescape View File

@ -1,6 +1,6 @@
package com.fr.design.actions.community;
import com.fr.base.BaseUtils;
import com.fr.base.svg.SVGIconUtils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.menu.MenuKeySet;
@ -19,8 +19,7 @@ public class SignAction extends UpdateAction
this.setMenuKeySet(SIGN);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs/sign.png"));
this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/bbs/sign_normal.svg"));
}
@Override

4
designer-base/src/main/java/com/fr/design/actions/community/TechSolutionAction.java
Unescape View File

@ -1,6 +1,6 @@
package com.fr.design.actions.community;
import com.fr.base.BaseUtils;
import com.fr.base.svg.SVGIconUtils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.menu.MenuKeySet;
import com.fr.design.utils.BrowseUtils;
@ -21,7 +21,7 @@ public class TechSolutionAction extends UpdateAction{
this.setMenuKeySet(TSO);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs/solution.png"));
this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/bbs/solution_normal.svg"));
}

5
designer-base/src/main/java/com/fr/design/actions/community/VideoAction.java
Unescape View File

@ -1,10 +1,10 @@
package com.fr.design.actions.community;
import com.fr.base.svg.SVGIconUtils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.locale.impl.VideoMark;
import com.fr.design.menu.MenuKeySet;
import com.fr.design.utils.BrowseUtils;
import com.fr.general.IOUtils;
import com.fr.general.locale.LocaleCenter;
import com.fr.general.locale.LocaleMark;
@ -20,8 +20,7 @@ public class VideoAction extends UpdateAction
this.setMenuKeySet(VIDEO);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/bbs/video.png"));
this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/bbs/video_normal.svg"));
}
@Override

4
designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java
Unescape View File

@ -1,10 +1,10 @@
package com.fr.design.actions.help;
import com.fr.base.svg.SVGIconUtils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.menu.MenuKeySet;
import com.fr.general.CloudCenter;
import com.fr.general.GeneralContext;
import com.fr.general.IOUtils;
import com.fr.general.http.HttpToolbox;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.CommonUtils;
@ -28,7 +28,7 @@ public class TutorialAction extends UpdateAction {
this.setMenuKeySet(HELP_TUTORIAL);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/bbs/help.png"));
this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/bbs/help_normal.svg"));
this.setAccelerator(getMenuKeySet().getKeyStroke());
}

6
designer-base/src/main/java/com/fr/design/actions/help/WebDemoAction.java
Unescape View File

@ -1,6 +1,6 @@
package com.fr.design.actions.help;
import com.fr.base.BaseUtils;
import com.fr.base.svg.SVGIconUtils;
import com.fr.design.DesignerEnvManager;
import com.fr.design.actions.UpdateAction;
import com.fr.design.menu.MenuKeySet;
@ -16,7 +16,7 @@ public class WebDemoAction extends UpdateAction {
this.setMenuKeySet(PRODUCT_DEMO);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_help/demo.png"));
this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_help/demo_normal.svg"));
}
/**
@ -45,4 +45,4 @@ public class WebDemoAction extends UpdateAction {
}
};
}
}

4
designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineAction.java
Unescape View File

@ -1,5 +1,6 @@
package com.fr.design.actions.help.alphafine;
import com.fr.base.svg.SVGIcon;
import com.fr.design.DesignerEnvManager;
import com.fr.design.actions.UpdateAction;
import com.fr.design.dialog.BasicDialog;
@ -8,7 +9,6 @@ import com.fr.design.dialog.DialogActionListener;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.DesignerFrame;
import com.fr.design.menu.MenuKeySet;
import com.fr.general.IOUtils;
import javax.swing.KeyStroke;
import java.awt.event.ActionEvent;
@ -21,7 +21,7 @@ public class AlphaFineAction extends UpdateAction {
this.setMenuKeySet(ALPHAFINE);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/smallsearch.png"));
this.setSmallIcon(SVGIcon.readSVGIcon("com/fr/design/mainframe/alphafine/images/smallsearch_normal.svg"));
this.generateAndSetSearchText(AlphaFineConfigPane.class.getName());
}

8
designer-base/src/main/java/com/fr/design/actions/server/FunctionManagerAction.java
Unescape View File

@ -4,6 +4,7 @@
package com.fr.design.actions.server;
import com.fr.base.svg.SVGIconUtils;
import com.fr.config.Configuration;
import com.fr.design.actions.UpdateAction;
import com.fr.design.dialog.BasicDialog;
@ -12,7 +13,6 @@ import com.fr.design.formula.FunctionManagerPane;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.menu.MenuKeySet;
import com.fr.file.FunctionConfig;
import com.fr.general.IOUtils;
import com.fr.transaction.Configurations;
import com.fr.transaction.Worker;
@ -29,7 +29,7 @@ public class FunctionManagerAction extends UpdateAction {
this.setMenuKeySet(FUNCTION_MANAGER);
this.setName(getMenuKeySet().getMenuKeySetName()+"...");
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/m_web/function.png"));
this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_web/function_normal.svg"));
this.generateAndSetSearchText(FunctionManagerPane.class.getName());
}
@ -63,7 +63,7 @@ public class FunctionManagerAction extends UpdateAction {
functionManagerPane.populate(mirror);
functionManagerDialog.setVisible(true);
}
public void update() {
this.setEnabled(true);
}
@ -84,4 +84,4 @@ public class FunctionManagerAction extends UpdateAction {
return null;
}
};
}
}

6
designer-base/src/main/java/com/fr/design/actions/server/GlobalParameterAction.java
Unescape View File

@ -3,8 +3,8 @@
*/
package com.fr.design.actions.server;
import com.fr.base.BaseUtils;
import com.fr.base.ParameterConfig;
import com.fr.base.svg.SVGIconUtils;
import com.fr.config.ServerPreferenceConfig;
import com.fr.design.DesignModelAdapter;
import com.fr.design.actions.UpdateAction;
@ -31,7 +31,7 @@ public class GlobalParameterAction extends UpdateAction {
this.setMenuKeySet(GLOBAL_PARAMETER);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/p.png"));
this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_report/p_normal.svg"));
}
/**
@ -91,4 +91,4 @@ public class GlobalParameterAction extends UpdateAction {
return null;
}
};
}
}

8
designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java
Unescape View File

@ -3,8 +3,8 @@
*/
package com.fr.design.actions.server;
import com.fr.base.BaseUtils;
import com.fr.base.TableData;
import com.fr.base.svg.SVGIconUtils;
import com.fr.design.DesignModelAdapter;
import com.fr.design.actions.UpdateAction;
import com.fr.design.data.DesignTableDataManager;
@ -40,7 +40,7 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
this.setMenuKeySet(SERVER_TABLEDATA);
this.setName(getMenuKeySet().getMenuKeySetName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/data/dock/serverdatabase.png"));
this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/data/dock/serverdatabase_normal.svg"));
}
public static final MenuKeySet SERVER_TABLEDATA = new MenuKeySet() {
@ -70,7 +70,7 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
final TableDataConfig tableDataConfig = TableDataConfig.getInstance();
final TableDataManagerPane globalTableDataPane = new TableDataManagerPane() {
public void complete() {
TableDataConfig mirror = tableDataConfig.mirror();
populate(mirror);
}
@ -166,4 +166,4 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
public void fireDSChanged(Map<String, String> map) {
DesignTableDataManager.fireDSChanged(map);
}
}
}

6
designer-base/src/main/java/com/fr/design/actions/server/PlatformManagerAction.java
Unescape View File

@ -1,6 +1,6 @@
package com.fr.design.actions.server;
import com.fr.base.BaseUtils;
import com.fr.base.svg.SVGIconUtils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.menu.MenuKeySet;
import com.fr.design.utils.DesignUtils;
@ -14,7 +14,7 @@ public class PlatformManagerAction extends UpdateAction {
this.setMenuKeySet(PLATEFORM_MANAGER);
this.setName(getMenuKeySet().getMenuKeySetName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/server/platform_16_16.png"));
this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/server/platform_16_16_normal.svg"));
}
/**
@ -41,4 +41,4 @@ public class PlatformManagerAction extends UpdateAction {
return null;
}
};
}
}

6
designer-base/src/main/java/com/fr/design/actions/server/PluginManagerAction.java
Unescape View File

@ -1,9 +1,9 @@
package com.fr.design.actions.server;
import com.fr.base.svg.SVGIconUtils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.menu.MenuKeySet;
import com.fr.design.os.impl.PMDialogAction;
import com.fr.general.IOUtils;
import com.fr.stable.os.support.OSBasedAction;
import com.fr.stable.os.support.OSSupportCenter;
@ -20,7 +20,7 @@ public class PluginManagerAction extends UpdateAction {
this.setMenuKeySet(PLUGIN_MANAGER);
this.setName(getMenuKeySet().getMenuKeySetName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/server/plugin.png"));
this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/server/plugin_normal.svg"));
}
@Override
public void actionPerformed(ActionEvent e) {
@ -45,4 +45,4 @@ public class PluginManagerAction extends UpdateAction {
return null;
}
};
}
}

4
designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthManagerAction.java
Unescape View File

@ -1,6 +1,6 @@
package com.fr.design.remote.action;
import com.fr.base.BaseUtils;
import com.fr.base.svg.SVGIconUtils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionAdapter;
@ -27,7 +27,7 @@ public class RemoteDesignAuthManagerAction extends UpdateAction {
public RemoteDesignAuthManagerAction() {
this.setName(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Authority_Manager"));
// 远程设计权限管理
this.setSmallIcon(BaseUtils.readIcon("com/fr/design/remote/images/icon_Remote_Design_Auth_Manager_normal@1x.png"));
this.setSmallIcon(SVGIconUtils.readIcon("com/fr/design/remote/images/icon_Remote_Design_Auth_Manager_normal@1x_normal.svg"));
}

4
designer-base/src/main/java/com/fr/design/update/actions/SoftwareUpdateAction.java
Unescape View File

@ -1,6 +1,6 @@
package com.fr.design.update.actions;
import com.fr.base.BaseUtils;
import com.fr.base.svg.SVGIconUtils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.os.impl.UpdateDialogAction;
import com.fr.stable.os.support.OSBasedAction;
@ -15,7 +15,7 @@ public class SoftwareUpdateAction extends UpdateAction {
public SoftwareUpdateAction() {
setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_UpdateAndUpgrade"));
setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/update/update_new.png"));
setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/update/update_new_normal.svg"));
}

7
designer-base/src/main/resources/com/fr/design/images/bbs/bbs_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?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>icon/社区/首页_normal</title>
<g id="icon/社区/首页_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M2.41421356,7 L3,7 L3,14 L6,14 L6,10 L10,10 L10,14 L13,14 L13,7 L13.5857864,7 L8,1.41421356 L2.41421356,7 Z M0.341421356,7.65857864 L8,0 L15.6585786,7.65857864 C15.7366835,7.7366835 15.7366835,7.8633165 15.6585786,7.94142136 C15.6210714,7.97892863 15.5702006,8 15.5171573,8 L14,8 L14,15 L9,15 L9,11 L7,11 L7,15 L2,15 L2,8 L0.482842712,8 C0.372385763,8 0.282842712,7.91045695 0.282842712,7.8 C0.282842712,7.7469567 0.303914081,7.69608592 0.341421356,7.65857864 Z" id="Rectangle-148" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 888 B

7
designer-base/src/main/resources/com/fr/design/images/bbs/bug_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?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>icon/社区/bug反馈_normal</title>
<g id="icon/社区/bug反馈_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M15.2720866,8.99108296 C15.2720866,9.1455772 15.2157608,9.27952294 15.1031246,9.3929202 C14.9904884,9.50631745 14.8565427,9.56263555 14.7012874,9.56187449 L12.703517,9.56187449 C12.703517,10.5786445 12.5045011,11.4409202 12.1064691,12.1487017 L13.9615416,14.0129068 C14.0741778,14.125543 14.1304959,14.2594888 14.1304959,14.4147441 C14.1304959,14.5699994 14.0741778,14.7039451 13.9615416,14.8165813 C13.8542328,14.9292175 13.720287,14.9855356 13.5597043,14.9855356 C13.3991217,14.9855356 13.2651759,14.9292175 13.1578671,14.8165813 L11.3918381,13.059685 C11.362157,13.0893661 11.3176352,13.12818 11.2582729,13.1761264 C11.1989106,13.2240729 11.0740975,13.3089306 10.8838337,13.4306995 C10.6935698,13.5524683 10.5002618,13.6609187 10.3039095,13.7560506 C10.1075572,13.8511826 9.86363895,13.9375623 9.57215475,14.01519 C9.28067054,14.0928176 8.99223056,14.1316315 8.70683479,14.1316315 L8.70683479,6.14055007 L7.56525174,6.14055007 L7.56525174,14.1316315 C7.2623517,14.1316315 6.96059324,14.0916761 6.65997637,14.0117652 C6.35935949,13.9318544 6.10060067,13.8336783 5.88369989,13.7172368 C5.66679911,13.6007953 5.47044683,13.4847344 5.29464304,13.369054 C5.11883925,13.2533736 4.98945984,13.1567195 4.90650481,13.0790919 L4.77293959,12.9546593 L3.14047582,14.8005991 C3.02175118,14.9254122 2.8790533,14.9878188 2.71238218,14.9878188 C2.57006483,14.9878188 2.44220753,14.9402528 2.32881028,14.8451209 C2.21617408,14.7378121 2.15528965,14.6053884 2.14615699,14.44785 C2.13702433,14.2903115 2.18306818,14.15218 2.28428854,14.0334553 L4.08570661,12.0094286 C3.74094853,11.3313282 3.56856949,10.5166185 3.56856949,9.56529926 L1.57079914,9.56529926 C1.4163049,9.56529926 1.28235916,9.50898116 1.1689619,9.39634497 C1.05556465,9.28370877 0.999246554,9.14976303 1,8.99450773 C1.00076867,8.83925243 1.05708677,8.70530669 1.1689619,8.59267049 C1.28083704,8.48003429 1.41478279,8.42371619 1.57079914,8.42371619 L3.56856949,8.42371619 L3.56856949,5.80149992 L2.0251492,4.25807962 C1.912513,4.14544343 1.8561949,4.01149768 1.8561949,3.85624238 C1.8561949,3.70098709 1.912513,3.56704134 2.0251492,3.45440514 C2.13778539,3.34176895 2.27173114,3.28545085 2.42698644,3.28545085 C2.58224173,3.28545085 2.71618748,3.34176895 2.82882368,3.45440514 L4.37224397,4.99782544 L11.8998426,4.99782544 L13.4432629,3.45440514 C13.5558991,3.34176895 13.6898449,3.28545085 13.8451002,3.28545085 C14.0003555,3.28545085 14.1343012,3.34176895 14.2469374,3.45440514 C14.3595736,3.56704134 14.4158917,3.70098709 14.4158917,3.85624238 C14.4158917,4.01149768 14.3595736,4.14544343 14.2469374,4.25807962 L12.7035171,5.80149992 L12.7035171,8.42371619 L14.7012875,8.42371619 C14.8557817,8.42371619 14.9897274,8.48003429 15.1031247,8.59267049 C15.2165219,8.70530669 15.27284,8.83925243 15.2720866,8.99450773 L15.2720866,8.99108296 Z M10.9911425,3.8539592 L5.2832272,3.8539592 C5.2832272,3.06322266 5.56101241,2.38968866 6.11658283,1.83335719 C6.67215326,1.27702572 7.34568726,0.999240513 8.13718484,1 C8.92868242,1.00076261 9.60221642,1.27854782 10.1577868,1.83335719 C10.7133573,2.38816657 10.9911425,3.06170057 10.9911425,3.8539592 Z" id="Shape" fill="#333334"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

7
designer-base/src/main/resources/com/fr/design/images/bbs/center_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?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>icon/社区/活动中心_normal</title>
<g id="icon/社区/活动中心_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M5.8,1 C5.91045695,1 6,1.08954305 6,1.2 L6,2 L10,2 L10,1.2 C10,1.08954305 10.0895431,1 10.2,1 L11.8,1 C11.9104569,1 12,1.08954305 12,1.2 L12,2 L14,2 C14.5522847,2 15,2.44771525 15,3 L15,14 C15,14.5522847 14.5522847,15 14,15 L2,15 C1.44771525,15 1,14.5522847 1,14 L1,3 C1,2.44771525 1.44771525,2 2,2 L4,2 L4,1.2 C4,1.08954305 4.08954305,1 4.2,1 L5.8,1 Z M14,3 L2,3 L2,14 L14,14 L14,3 Z M5.8,9 C5.91045695,9 6,9.08954305 6,9.2 L6,10.8 C6,10.9104569 5.91045695,11 5.8,11 L4.2,11 C4.08954305,11 4,10.9104569 4,10.8 L4,9.2 C4,9.08954305 4.08954305,9 4.2,9 L5.8,9 Z M8.8,9 C8.91045695,9 9,9.08954305 9,9.2 L9,10.8 C9,10.9104569 8.91045695,11 8.8,11 L7.2,11 C7.08954305,11 7,10.9104569 7,10.8 L7,9.2 C7,9.08954305 7.08954305,9 7.2,9 L8.8,9 Z M11.8,9 C11.9104569,9 12,9.08954305 12,9.2 L12,10.8 C12,10.9104569 11.9104569,11 11.8,11 L10.2,11 C10.0895431,11 10,10.9104569 10,10.8 L10,9.2 C10,9.08954305 10.0895431,9 10.2,9 L11.8,9 Z M5.8,6 C5.91045695,6 6,6.08954305 6,6.2 L6,7.8 C6,7.91045695 5.91045695,8 5.8,8 L4.2,8 C4.08954305,8 4,7.91045695 4,7.8 L4,6.2 C4,6.08954305 4.08954305,6 4.2,6 L5.8,6 Z M8.8,6 C8.91045695,6 9,6.08954305 9,6.2 L9,7.8 C9,7.91045695 8.91045695,8 8.8,8 L7.2,8 C7.08954305,8 7,7.91045695 7,7.8 L7,6.2 C7,6.08954305 7.08954305,6 7.2,6 L8.8,6 Z M11.8,6 C11.9104569,6 12,6.08954305 12,6.2 L12,7.8 C12,7.91045695 11.9104569,8 11.8,8 L10.2,8 C10.0895431,8 10,7.91045695 10,7.8 L10,6.2 C10,6.08954305 10.0895431,6 10.2,6 L11.8,6 Z" id="形状结合" fill="#333334"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

9
designer-base/src/main/resources/com/fr/design/images/bbs/facebook_normal.svg
Unescape View File

@ -0,0 +1,9 @@
<?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>icon_facebook粉丝圈_normal</title>
<g id="icon_facebook粉丝圈_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="icomoonfacebook2" fill="#333334" fill-rule="nonzero">
<path d="M14.5,0 L1.5,0 C0.672484996,0.00219792664 0.00219792664,0.672484996 0,1.5 L0,14.5 C0.00219792664,15.327515 0.672484996,15.9978021 1.5,16 L8,16 L8,9 L6,9 L6,7 L8,7 L8,6 C8.00256968,4.34421132 9.34421132,3.00256968 11,3 L13,3 L13,5 L11,5 C10.4477153,5 10,5.44771525 10,6 L10,7 L13,7 L12.5,9 L10,9 L10,16 L14.5,16 C15.327515,15.9978021 15.9978021,15.327515 16,14.5 L16,1.5 C15.9978021,0.672484996 15.327515,0.00219792664 14.5,0 Z" id="路径"></path>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 905 B

7
designer-base/src/main/resources/com/fr/design/images/bbs/help_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?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>icon/社区/帮助文档_normal</title>
<g id="icon/社区/帮助文档_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M13.1428571,1 C13.6142857,1 14,1.39375 14,1.875 L14,1.875 L14,14.125 C14,14.60625 13.6142857,15 13.1428571,15 L13.1428571,15 L2.85714286,15 C2.38571429,15 2,14.60625 2,14.125 L2,14.125 L2,1.875 C2,1.39375 2.38571429,1 2.85714286,1 L2.85714286,1 Z M4,2 L3,2 L3,14 L4,14 L4,2 Z M13,2 L5,2 L5,14 L13,14 L13,2 Z M11,11 L11,12 L7,12 L7,11 L11,11 Z M11,9 L11,10 L7,10 L7,9 L11,9 Z M10.5,4 C10.7761424,4 11,4.22385763 11,4.5 L11,4.5 L11,6.5 C11,6.77614237 10.7761424,7 10.5,7 L10.5,7 L7.5,7 C7.22385763,7 7,6.77614237 7,6.5 L7,6.5 L7,4.5 C7,4.22385763 7.22385763,4 7.5,4 L7.5,4 Z" id="Combined-Shape" fill="#333334"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 992 B

7
designer-base/src/main/resources/com/fr/design/images/bbs/need_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?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>icon/社区/需求反馈_normal</title>
<g id="icon/社区/需求反馈_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M13.0758389,9.75977829 L14.7397914,11.4242307 L11.4118864,14.7516357 L8.49996964,15.9996 L9.74793398,13.0876832 L13.0758389,9.75977829 Z M13,1 L13,8.42 L12.7847053,8.63674856 L12.0768284,9.34385513 L12.077,9.344 L12,9.42 L12,2 L2,2 L2,14 L8.268,14 L7.84,15 L1,15 L1,1 L13,1 Z M15.1553795,9.34424016 C15.6148663,9.80372704 15.6148663,10.5487057 15.1553795,11.0081926 L13.491427,9.34424016 C13.9509139,8.88525328 14.6958926,8.88525328 15.1553795,9.34424016 Z M8,8 L8,9 L3,9 L3,8 L8,8 Z M11,6 L11,7 L3,7 L3,6 L11,6 Z M11,3 L11,5 L3,5 L3,3 L11,3 Z" id="Combined-Shape" fill="#333334"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 963 B

7
designer-base/src/main/resources/com/fr/design/images/bbs/question_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?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>icon/社区/问题求助_normal</title>
<g id="icon/社区/问题求助_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M8,1 C11.86575,1 15,4.14762257 15,8.03060058 C15,9.67082164 14.4343113,11.1731005 13.4943112,12.3667764 C13.2764824,12.6414842 13.0569382,12.8824315 12.822125,13.1074719 L13.5110424,13.7061268 L13.5140482,13.829443 C13.5360683,13.8083393 13.5579585,13.7871261 13.579718,13.7658045 L15,15 L7.40325,15 C3.821875,14.6921111 1,11.7083193 1,8.03060058 C1,4.14762257 4.13425,1 8,1 Z M8,2 C4.68739322,2 2,4.69905398 2,8.03060058 C2,11.156684 4.39197001,13.7374333 7.40325,14 L12.3246641,14 L11.3391614,13.1436187 L12.1302018,12.3855008 C13.3178542,11.2472776 14,9.69476956 14,8.03060058 C14,4.69905398 11.3126068,2 8,2 Z M7.644,11.308 C7.88290176,11.308 8.08464923,11.3832279 8.24271068,11.5412893 C8.39608638,11.694665 8.476,11.8892373 8.476,12.116 C8.476,12.3579755 8.3937042,12.553428 8.22757246,12.7057154 C8.06134606,12.8580896 7.8682638,12.936 7.644,12.936 C7.4197362,12.936 7.22665394,12.8580896 7.05728932,12.7027107 C6.89782446,12.5432458 6.824,12.3519733 6.824,12.116 C6.824,11.8776413 6.89929,11.685994 7.05728932,11.5412893 C7.21675418,11.3818245 7.40802665,11.308 7.644,11.308 Z M7.824,4 C8.62306191,4 9.25637141,4.21625203 9.73966253,4.66236725 C10.20762,5.09238226 10.444,5.68490802 10.444,6.428 C10.444,6.9849335 10.2836914,7.47528934 9.96482213,7.89601844 C9.83439467,8.05253139 9.49188194,8.37918705 8.98136199,8.8316823 C8.73225307,9.04682182 8.55658949,9.25365152 8.43809265,9.46687293 C8.29344163,9.71166697 8.224,9.98110049 8.224,10.292 L8.224,10.568 L8.124,10.668 L7.164,10.668 L7.064,10.568 L7.064,10.292 C7.064,9.88163075 7.13905012,9.51888851 7.28938169,9.20571145 C7.46498014,8.82942905 7.86990853,8.36406359 8.52128932,7.78528932 C8.78038614,7.52619251 8.86304576,7.43993899 8.92191312,7.3615305 C9.14935705,7.07722558 9.26,6.78678784 9.26,6.476 C9.26,6.02939509 9.1302719,5.67969326 8.87980118,5.42919054 C8.62961934,5.16813122 8.2647239,5.04 7.776,5.04 C7.20272311,5.04 6.79107378,5.22079193 6.52263183,5.58978216 C6.27310143,5.9073663 6.148,6.3423781 6.148,6.908 L6.048,7.008 L5.1,7.008 L5,6.908 C5,6.03512495 5.24136908,5.34196247 5.73400599,4.82473272 C6.2340788,4.27465264 6.9331946,4 7.824,4 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

7
designer-base/src/main/resources/com/fr/design/images/bbs/sign_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?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>icon/社区/报表工程师认证_normal</title>
<g id="icon/社区/报表工程师认证_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M11,1 C11.5522847,1 12,1.44771525 12,2 L12,7 L11,8.05 L11,2 L2,2 L2,14 L6.5,14 L7.64285714,15 L2,15 C1.44771525,15 1,14.5522847 1,14 L1,2 C1,1.44771525 1.44771525,1 2,1 L11,1 Z M12,13.325 L12,14 C12,14.5522847 11.5522847,15 11,15 L10.4047619,15 L12,13.325 Z M14.8448344,6.15342954 C15.0447996,6.36527011 15.0525188,6.71731806 14.8620758,6.93975065 L8.81720991,14 L6.17075455,11.424173 C5.96293623,11.2219009 5.94187748,10.8705282 6.1237185,10.6393601 C6.30555953,10.408192 6.62144084,10.3847672 6.82925915,10.5870393 L8.75423236,12.460639 L14.1379379,6.17260811 C14.3283809,5.95017552 14.6448693,5.94158898 14.8448344,6.15342954 Z M9,7 L9,8 L3,8 L3,7 L9,7 Z M10,5 L10,6 L3,6 L3,5 L10,5 Z M10,3 L10,4 L3,4 L3,3 L10,3 Z" id="形状结合" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

7
designer-base/src/main/resources/com/fr/design/images/bbs/solution_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?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>icon/社区/技术方案_normal</title>
<g id="icon/社区/技术方案_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M9,1 L9,2 L14,2 L14,4 L13,4 L13,3 L8,3 L8,2 L2,2 L2,14 L14,14 L14,15 L1,15 L1,1 L9,1 Z M15,5 L15,13 L3,13 L3,5 L15,5 Z M6.26634295,6.58859116 L6.20156691,6.64644661 L4,9 L6.20156691,11.3535534 C6.38421953,11.5488155 6.68035793,11.5488155 6.86301054,11.3535534 C7.02283158,11.182699 7.04280921,10.9189587 6.92294343,10.7248829 L6.86301054,10.6464466 L5.32288726,9 L6.86301054,7.35355339 C7.04566315,7.15829124 7.04566315,6.84170876 6.86301054,6.64644661 C6.72094739,6.49457605 6.51023236,6.46082704 6.33765726,6.54519957 L6.26634295,6.58859116 Z M11.1369895,6.64644661 C10.9543368,6.84170876 10.9543368,7.15829124 11.1369895,7.35355339 L12.6771127,9 L11.1369895,10.6464466 C10.9543368,10.8417088 10.9543368,11.1582912 11.1369895,11.3535534 C11.3196421,11.5488155 11.6157805,11.5488155 11.7984331,11.3535534 L14,9 L11.7984331,6.64644661 C11.6157805,6.45118446 11.3196421,6.45118446 11.1369895,6.64644661 Z M10,7 L9,7 L8,11 L9,11 L10,7 Z" id="形状" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

7
designer-base/src/main/resources/com/fr/design/images/bbs/video_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?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>icon/社区/视频教程_normal</title>
<g id="icon/社区/视频教程_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M8,1 C11.8659932,1 15,4.13400675 15,8 C15,11.8659932 11.8659932,15 8,15 C4.13400675,15 1,11.8659932 1,8 C1,4.13400675 4.13400675,1 8,1 Z M8,2 C4.6862915,2 2,4.6862915 2,8 C2,11.3137085 4.6862915,14 8,14 C11.3137085,14 14,11.3137085 14,8 C14,4.6862915 11.3137085,2 8,2 Z M7.24590914,5 C7.3017481,5 7.35592446,5.01892169 7.39952736,5.05365284 L10.9384667,7.87253508 C11.0091675,7.92885063 11.0206304,8.03156938 10.9640697,8.10196382 C10.9565069,8.11137637 10.9479202,8.11992586 10.9384667,8.1274559 L7.39952736,10.9463381 C7.29347611,11.0308115 7.13872736,11.0136917 7.05388636,10.9081 C7.01900404,10.8646861 7,10.8107445 7,10.7551475 L7,5.24484346 C7,5.10962015 7.11009727,5 7.24590914,5 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

9
designer-base/src/main/resources/com/fr/design/images/chart/ChartType_normal.svg
Unescape View File

@ -0,0 +1,9 @@
<?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>icon_图表预定义配色_normal</title>
<g id="icon_图表预定义配色_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<polygon id="Fill-1" fill="#333334" points="1 15 5 15 5 8 1 8"></polygon>
<polygon id="Fill-2" fill="#333334" points="6 15 10 15 10 2 6 2"></polygon>
<polygon id="Fill-3" fill="#333334" points="11 15 15 15 15 5 11 5"></polygon>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 614 B

13
designer-base/src/main/resources/com/fr/design/images/data/dock/serverdatabase_normal.svg
Unescape View File

@ -0,0 +1,13 @@
<?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>icon_服务器数据集_normal</title>
<g id="icon_服务器数据集_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Group-2" transform="translate(2.000000, 2.000000)">
<path d="M13,10.0833333 L13,11.8333333 C13,12.4776655 11.6568542,13 10,13 C8.34314575,13 7,12.4776655 7,11.8333333 L7,11.8333333 L7,10.0833333 C7,10.7276655 8.34314575,11.25 10,11.25 C11.5878187,11.25 12.8875266,10.7702866 12.9930789,10.1632105 L13,10.0833333 Z M13,7.75 L13,9.5 C13,10.1443322 11.6568542,10.6666667 10,10.6666667 C8.34314575,10.6666667 7,10.1443322 7,9.5 L7,9.5 L7,7.75 C7,8.39433221 8.34314575,8.91666667 10,8.91666667 C11.5878187,8.91666667 12.8875266,8.43695325 12.9930789,7.82987716 L13,7.75 Z M10,6 C11.6568542,6 13,6.52233446 13,7.16666667 C13,7.81099887 11.6568542,8.33333333 10,8.33333333 C8.34314575,8.33333333 7,7.81099887 7,7.16666667 C7,6.52233446 8.34314575,6 10,6 Z" id="Combined-Shape" fill="#419BF9"></path>
<path d="M10.3529067,5.10839844 L10.3529067,1 C10.3529067,0.44771525 9.90519143,0 9.35290668,0 L5.93112309,0 C5.50858334,0 5.09080948,0.089259051 4.70516188,0.261931502 L0.591346262,2.10387899 C0.231573001,2.26496629 0,2.62237828 0,3.01656849 L0,11.1589704 C0,11.7112551 0.44771525,12.1589704 1,12.1589704 L5.74389648,12.1589704" id="Path" stroke="#333334"></path>
<rect id="Rectangle-63" fill="#333334" x="2" y="4" width="3.9564209" height="1"></rect>
<rect id="Rectangle" fill="#333334" x="2" y="6" width="3.9564209" height="1"></rect>
<rect id="Rectangle-2" fill="#333334" x="2" y="8" width="3.9564209" height="2"></rect>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

7
designer-base/src/main/resources/com/fr/design/images/m_help/demo_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?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>icon_产品演示_normal</title>
<g id="icon_产品演示_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M14,1 C14.5522847,1 15,1.44771525 15,2 L15,14 C15,14.5522847 14.5522847,15 14,15 L1,15 C0.44771525,15 0,14.5522847 0,14 L0,2 C0,1.44771525 0.44771525,1 1,1 L14,1 Z M14,4 L1,4 L1,14 L14,14 L14,4 Z M6,6 L6,12 L5,12 L5,6 L6,6 Z M4,10 L4,11 L3,11 L3,10 L4,10 Z M9,9 L9,11 L7,11 L7,9 L9,9 Z M12,9 L12,11 L10,11 L10,9 L12,9 Z M4,8 L4,9 L3,9 L3,8 L4,8 Z M9,6 L9,8 L7,8 L7,6 L9,6 Z M12,6 L12,8 L10,8 L10,6 L12,6 Z M4,6 L4,7 L3,7 L3,6 L4,6 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 858 B

8
designer-base/src/main/resources/com/fr/design/images/m_web/edit_normal.svg
Unescape View File

@ -0,0 +1,8 @@
<?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>icon_服务器配置_normal</title>
<g id="icon_服务器配置_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M13.0758389,9.75977829 L14.7397914,11.4242307 L11.4118864,14.7516357 L8.49996964,15.9996 L9.74793398,13.0876832 L13.0758389,9.75977829 Z M15.1553795,9.34424016 C15.6148663,9.80372704 15.6148663,10.5487057 15.1553795,11.0081926 L13.491427,9.34424016 C13.9509139,8.88525328 14.6958926,8.88525328 15.1553795,9.34424016 Z" id="Combined-Shape" fill="#333334"></path>
<path d="M13.9931545,1 C14.5492199,1 15,1.44371665 15,1.99980749 L15,5.00019251 C15,5.18235446 14.9510312,5.35313811 14.8654084,5.50022573 C14.9510251,5.64542671 15,5.81651267 15,5.99980749 L15.0005048,8.107534 C14.6762132,8.00174414 14.3320211,7.97404714 13.9973419,8.02443225 C13.9995846,7.15032335 14,5.99980749 14,5.99980749 L2.00684547,6 L2.00684547,6 C2.0010832,6 2,9.00019251 2,9.00019251 L12.419,9 L12.0768284,9.34385513 L12.077,9.344 L11.421,9.999 L2.00684547,10 L2.00684547,10 C2.0010832,10 2,13.0001925 2,13.0001925 L8.697,13 L8.268,14 L2.00684547,14 C1.45078007,14 1,13.5562834 1,13.0001925 L1,9.99980749 C1,9.81764554 1.04896881,9.64686189 1.13459156,9.49977427 C1.04897491,9.35457329 1,9.18348733 1,9.00019251 L1,5.99980749 C1,5.81764554 1.04896881,5.64686189 1.13459156,5.49977427 C1.04897491,5.35457329 1,5.18348733 1,5.00019251 L1,1.99980749 C1,1.44762906 1.44994876,1 2.00684547,1 L13.9931545,1 Z M15,12.577 L15,13.0001925 C15,13.5523709 14.5500512,14 13.9931545,14 L13.576,14 L15,12.577 Z M4,11 L4,12 L3,12 L3,11 L4,11 Z M6,11 L6,12 L5,12 L5,11 L6,11 Z M10.42,11 L9.42,12 L9,12 L9,11 L10.42,11 Z M4,7 L4,8 L3,8 L3,7 L4,7 Z M6,7 L6,8 L5,8 L5,7 L6,7 Z M13,7 L13,8 L9,8 L9,7 L13,7 Z M14,1.99980749 L2.00684547,2 L2.00684547,2 C2.0010832,2 2,5.00019251 2,5.00019251 L13.9814047,5.00000045 C13.9891898,5.00000015 13.9931545,5 13.9931545,5 C13.9989168,5 14,1.99980749 14,1.99980749 Z M4,3 L4,4 L3,4 L3,3 L4,3 Z M6,3 L6,4 L5,4 L5,3 L6,3 Z M13,3 L13,4 L9,4 L9,3 L13,3 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

7
designer-base/src/main/resources/com/fr/design/images/m_web/function_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?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>icon_函数管理器_normal</title>
<g id="icon_函数管理器_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M4,10 L1,10 L1,7 L8,7 L8,10 L5,10 L5.001,11 L8,11 L8,14 L1,14 L1,11 L4,11 L4,10 Z M3,12 L2,12 L2,13 L3,13 L3,12 Z M5.001,12 L4,12 L4,13 L5.001,13 L5.001,12 Z M7,12 L6,12 L6,13 L7,13 L7,12 Z M14.001,2 L14.001,11 L9,11 L9,10 L13,10 L13,4 L4,4 L4,6 L3,6 L3,2 L14.001,2 Z M3,8 L2,8 L2,9 L3,9 L3,8 Z M5.001,8 L4,8 L4,9 L5.001,9 L5.001,8 Z M7,8 L6,8 L6,9 L7,9 L7,8 Z" id="Combined-Shape" fill="#333334"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 772 B

8
designer-base/src/main/resources/com/fr/design/images/server/platform_16_16_normal.svg
Unescape View File

@ -0,0 +1,8 @@
<?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>icon_报表平台管理_normal</title>
<g id="icon_报表平台管理_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M7.75,7.25 C9.40685425,7.25 10.75,5.90685425 10.75,4.25 C10.75,2.59314575 9.40685425,1.25 7.75,1.25 C6.09314575,1.25 4.75,2.59314575 4.75,4.25 C4.75,5.90685425 6.09314575,7.25 7.75,7.25 Z M3.5,4.25 C3.5,1.90278981 5.40278981,0 7.75,0 C10.0972102,0 12,1.90278981 12,4.25 C12,5.7318876 11.2345008,7.07337589 10.0264451,7.83987928 C10.6191505,8.02173015 11.1882476,8.27475604 11.722975,8.59458452 C12.0784554,8.80720274 12.1942682,9.26773772 11.9816499,9.6232182 C11.7690317,9.97869867 11.3084967,10.0945114 10.9530163,9.88189319 C9.98673624,9.30394657 8.88780525,9 7.75,9 C4.29822031,9 1.5,11.7982203 1.5,15.25 C1.5,15.6642136 1.16421356,16 0.75,16 C0.335786438,16 0,15.6642136 0,15.25 C0,11.8052703 2.26486522,8.822541 5.47325647,7.83968978 C4.26537039,7.07315304 3.5,5.73176293 3.5,4.25 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
<path d="M13.0758389,9.75977829 L14.7397914,11.4242307 L11.4118864,14.7516357 L8.49996964,15.9996 L9.74793398,13.0876832 L13.0758389,9.75977829 Z M15.1553795,9.34424016 C15.6148663,9.80372704 15.6148663,10.5487057 15.1553795,11.0081926 L13.491427,9.34424016 C13.9509139,8.88525328 14.6958926,8.88525328 15.1553795,9.34424016 Z" id="Combined-Shape" fill="#333334"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

8
designer-base/src/main/resources/com/fr/design/images/server/plugin_normal.svg
Unescape View File

@ -0,0 +1,8 @@
<?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>icon_插件管理_normal</title>
<g id="icon_插件管理_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M8.80813953,0 C10.2720549,0 11.4642097,1.16354506 11.5102479,2.61627907 L14.4767442,2.61627907 C14.7657304,2.61627907 15,2.85054868 15,3.13953488 L15,7.06379381 C15,7.49515443 14.5073899,7.74123715 14.1624884,7.4821716 C13.8778037,7.2683366 13.5327751,7.15116279 13.1686047,7.15116279 C12.2534817,7.15116279 11.5116279,7.89301655 11.5116279,8.80813953 C11.5116279,9.12309262 11.5995,9.41752207 11.7520653,9.66824891 L10.9995606,10.4221396 C10.6638352,9.97169443 10.4651163,9.41312363 10.4651163,8.80813953 C10.4651163,7.31504414 11.6755093,6.10465116 13.1686047,6.10465116 C13.4382508,6.10465116 13.7021701,6.14435807 13.9534884,6.22047661 L13.9534884,3.6627907 L10.9447595,3.6627907 C10.6139473,3.6627907 10.3661527,3.3596428 10.4319619,3.03544246 C10.4539349,2.92719537 10.4651163,2.81621825 10.4651163,2.70348837 C10.4651163,1.78836539 9.72326252,1.04651163 8.80813953,1.04651163 C7.89301655,1.04651163 7.15116279,1.78836539 7.15116279,2.70348837 C7.15116279,2.81621825 7.16234416,2.92719537 7.18431716,3.03544246 C7.25012636,3.3596428 7.00233172,3.6627907 6.67151953,3.6627907 L3.6627907,3.6627907 L3.6627907,6.67151953 C3.6627907,7.00233172 3.3596428,7.25012636 3.03544246,7.18431716 C2.92719537,7.16234416 2.81621825,7.15116279 2.70348837,7.15116279 C1.78836539,7.15116279 1.04651163,7.89301655 1.04651163,8.80813953 C1.04651163,9.72326252 1.78836539,10.4651163 2.70348837,10.4651163 C2.81621825,10.4651163 2.92719537,10.4539349 3.03544246,10.4319619 C3.3596428,10.3661527 3.6627907,10.6139473 3.6627907,10.9447595 L3.6627907,13.9534884 L6.22047661,13.9534884 C6.14435807,13.7021701 6.10465116,13.4382508 6.10465116,13.1686047 C6.10465116,11.6755093 7.31504414,10.4651163 8.80813953,10.4651163 C9.41312363,10.4651163 9.97169443,10.6638352 10.4221396,10.9995606 L9.66824891,11.7520653 C9.41752207,11.5995 9.12309262,11.5116279 8.80813953,11.5116279 C7.89301655,11.5116279 7.15116279,12.2534817 7.15116279,13.1686047 C7.15116279,13.5327751 7.2683366,13.8778037 7.4821716,14.1624884 C7.74123715,14.5073899 7.49515443,15 7.06379381,15 L3.13953488,15 C2.85054868,15 2.61627907,14.7657304 2.61627907,14.4767442 L2.61627907,11.5102479 C1.16354506,11.4642097 0,10.2720549 0,8.80813953 C0,7.34422419 1.16354506,6.15206935 2.61627907,6.10603114 L2.61627907,3.13953488 C2.61627907,2.85054868 2.85054868,2.61627907 3.13953488,2.61627907 L6.10603114,2.61627907 C6.15206935,1.16354506 7.34422419,0 8.80813953,0 Z M15,12.577 L15,14.4767442 C15,14.7657304 14.7657304,15 14.4767442,15 L12.576,15 L13.623,13.953 L13.9534884,13.9534884 L13.953,13.623 L15,12.577 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
<path d="M13.0758389,9.75977829 L14.7397914,11.4242307 L11.4118864,14.7516357 L8.49996964,15.9996 L9.74793398,13.0876832 L13.0758389,9.75977829 Z M15.1553795,9.34424016 C15.6148663,9.80372704 15.6148663,10.5487057 15.1553795,11.0081926 L13.491427,9.34424016 C13.9509139,8.88525328 14.6958926,8.88525328 15.1553795,9.34424016 Z" id="Combined-Shape" fill="#333334"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

7
designer-base/src/main/resources/com/fr/design/images/update/update_new_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?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>icon_更新升级_normal </title>
<g id="icon_更新升级_normal-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M2.00010953,8 C2.00010953,11.3137085 4.68640103,14 8.00010953,14 C10.2870279,14 12.3431788,12.7094237 13.357439,10.7047818 C13.4821062,10.4583824 13.7829152,10.3596989 14.0293147,10.4843661 C14.2757141,10.6090334 14.3743976,10.9098424 14.2497304,11.1562418 C13.0668432,13.4941677 10.6677456,15 8.00010953,15 C4.72096524,15 1.96844652,12.7452479 1.20835423,9.70154459 L0.947323124,10.2236068 C0.823828499,10.470596 0.523491979,10.5707082 0.276502731,10.4472136 C0.0295134818,10.323719 -0.0705986916,10.0233825 0.0528959328,9.7763932 L1.05289593,7.7763932 C1.28885129,7.30448249 2.00010953,7.47238779 2.00010953,8 Z M8.12,4.17333333 C8.13516113,4.18470418 8.14862915,4.1981722 8.16,4.21333333 L10.76,7.68 C10.8262742,7.76836556 10.8083656,7.89372583 10.72,7.96 C10.6853808,7.98596443 10.643274,8 10.6,8 L8.60010953,8 L8.60010953,11.2496256 C8.60010953,11.5809965 8.33148038,11.8496256 8.00010953,11.8496256 C7.70187576,11.8496256 7.45446278,11.632036 7.40796252,11.3469487 L7.40010953,11.2496256 L7.40010953,8 L5.4,8 C5.28954305,8 5.2,7.91045695 5.2,7.8 C5.2,7.75672596 5.21403557,7.71461923 5.24,7.68 L7.84,4.21333333 C7.90627417,4.12496777 8.03163444,4.10705916 8.12,4.17333333 Z M8.00010953,1 C11.2792538,1 14.0317725,3.25475209 14.7918648,6.29845541 L15.0528959,5.7763932 C15.1763906,5.52940395 15.4767271,5.42929178 15.7237163,5.5527864 C15.9707056,5.67628103 16.0708177,5.97661755 15.9473231,6.2236068 L14.9473231,8.2236068 C14.7113678,8.69551751 14.0001095,8.52761221 14.0001095,8 C14.0001095,4.6862915 11.313818,2 8.00010953,2 C5.76517052,2 3.74830514,3.23225986 2.70996145,5.16634914 C2.57934373,5.40964654 2.27622564,5.50099147 2.03292825,5.37037376 C1.78963085,5.23975605 1.69828591,4.93663796 1.82890363,4.69334056 C3.0397877,2.43786587 5.39317273,1 8.00010953,1 Z" id="形状结合" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

9
designer-base/src/main/resources/com/fr/design/remote/images/icon_Remote_Design_Auth_Manager_normal@1x_normal.svg
Unescape View File

@ -0,0 +1,9 @@
<?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>icon_远程设计权限管理_normal </title>
<g id="icon_远程设计权限管理_normal-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M15,11.5 C15.5522847,11.5 16,11.9477153 16,12.5 L16,15 C16,15.5522847 15.5522847,16 15,16 L12,16 C11.4477153,16 11,15.5522847 11,15 L11,12.5 C11,11.9477153 11.4477153,11.5 12,11.5 L15,11.5 Z M13.5,13 C13.2238576,13 13,13.2238576 13,13.5 C13,13.7761424 13.2238576,14 13.5,14 C13.7761424,14 14,13.7761424 14,13.5 C14,13.2238576 13.7761424,13 13.5,13 Z" id="Rectangle-2" fill="#333334" fill-rule="nonzero"></path>
<path d="M7.75,7.25 C9.40685425,7.25 10.75,5.90685425 10.75,4.25 C10.75,2.59314575 9.40685425,1.25 7.75,1.25 C6.09314575,1.25 4.75,2.59314575 4.75,4.25 C4.75,5.90685425 6.09314575,7.25 7.75,7.25 Z M3.5,4.25 C3.5,1.90278981 5.40278981,0 7.75,0 C10.0972102,0 12,1.90278981 12,4.25 C12,5.7318876 11.2345008,7.07337589 10.0264451,7.83987928 C10.6191505,8.02173015 11.1882476,8.27475604 11.722975,8.59458452 C12.0784554,8.80720274 12.1942682,9.26773772 11.9816499,9.6232182 C11.7690317,9.97869867 11.3084967,10.0945114 10.9530163,9.88189319 C9.98673624,9.30394657 8.88780525,9 7.75,9 C4.29822031,9 1.5,11.7982203 1.5,15.25 C1.5,15.6642136 1.16421356,16 0.75,16 C0.335786438,16 0,15.6642136 0,15.25 C0,11.8052703 2.26486522,8.822541 5.47325647,7.83968978 C4.26537039,7.07315304 3.5,5.73176293 3.5,4.25 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
<path d="M12,12.25 L12,11.5 C12,10.6715729 12.6715729,10 13.5,10 C14.3284271,10 15,10.6715729 15,11.5 L15,12.25" id="Rectangle-140" stroke="#333334" stroke-width="0.75"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

6
designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java
Unescape View File

@ -1,6 +1,7 @@
package com.fr.design.module;
import com.fr.base.ChartPreStyleConfig;
import com.fr.base.svg.SVGIconUtils;
import com.fr.concurrent.NamedThreadFactory;
import com.fr.design.actions.UpdateAction;
import com.fr.design.dialog.BasicDialog;
@ -8,7 +9,6 @@ import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.DesignerFrame;
import com.fr.design.menu.MenuKeySet;
import com.fr.general.IOUtils;
import com.fr.module.ModuleContext;
import com.fr.transaction.CallBackAdaptor;
import com.fr.transaction.Configurations;
@ -33,7 +33,7 @@ public class ChartPreStyleAction extends UpdateAction {
this.setMenuKeySet(CHART_DEFAULT_STYLE);
this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/chart/ChartType.png"));
this.setSmallIcon(SVGIconUtils.readIcon("com/fr/design/images/chart/ChartType_normal.svg"));
this.generateAndSetSearchText(ChartPreStyleManagerPane.class.getName());
}
@ -101,4 +101,4 @@ public class ChartPreStyleAction extends UpdateAction {
return null;
}
};
}
}

4
designer-chart/src/main/java/com/fr/van/chart/map/server/ChartMapEditorAction.java
Unescape View File

@ -1,10 +1,10 @@
package com.fr.van.chart.map.server;
import com.fr.base.ServerConfig;
import com.fr.base.svg.SVGIconUtils;
import com.fr.design.DesignerEnvManager;
import com.fr.design.actions.UpdateAction;
import com.fr.general.GeneralContext;
import com.fr.general.IOUtils;
import com.fr.start.ServerStarter;
import com.fr.workspace.WorkContext;
@ -17,7 +17,7 @@ import java.awt.event.ActionEvent;
public class ChartMapEditorAction extends UpdateAction {
public ChartMapEditorAction(){
this.setSmallIcon(IOUtils.readIcon("/com/fr/van/chart/map/images/mapData.png"));
this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/van/chart/map/images/mapData_normal.svg"));
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Data"));
}

8
designer-chart/src/main/resources/com/fr/van/chart/map/images/mapData_normal.svg
Unescape View File

@ -0,0 +1,8 @@
<?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>icon_地图数据_normal</title>
<g id="icon_地图数据_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M12.6406,1.9996 L13.1346,2.2886 L14.4096,3.3506 L15.3696,3.0996 L15.2786,4.0726 L14.6496,5.7706 L12.9466,6.8796 L12.4246,6.4946 L12.0896,6.8926 L12.1226,7.2706 L12.7827973,7.26408472 C12.7221216,7.29711551 12.6626863,7.33324525 12.604724,7.37247385 L12.5759755,7.3454585 L8.40468124,11.5167527 L7.9116,12.6666 L7.5456,12.8216 L6.4876,11.8426 L6.7776,11.3466 L6.6316,10.4926 L5.5656,10.6846 L3.1756,10.0936 L1.4576,8.5616 L1.7836,7.7456 L1.0646,6.6476 L0.9996,5.7476 L2.7856,5.3456 L2.8966,4.4886 L4.8296,3.5116 L5.5596,4.4606 L6.6536,5.7506 L8.6226,6.2896 L10.8236,5.1676 L11.7406,4.3166 L11.0126,3.5886 L11.7406,2.8606 L12.0396,2.3566 L12.6406,1.9996 Z" id="Combined-Shape" fill="#333334"></path>
<path d="M12.5758693,8.75977829 L14.2398217,10.4242307 L10.9119168,13.7516357 L8,14.9996 L9.24796434,12.0876832 L12.5758693,8.75977829 Z M14.6554098,8.34424016 C15.1148967,8.80372704 15.1148967,9.54870575 14.6554098,10.0081926 L12.9914574,8.34424016 C13.4509442,7.88525328 14.195923,7.88525328 14.6554098,8.34424016 Z" id="Combined-Shape" fill="#333334"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

6
designer-realize/src/main/java/com/fr/design/actions/server/ServerConfigManagerAction.java
Unescape View File

@ -3,6 +3,7 @@
*/
package com.fr.design.actions.server;
import com.fr.base.svg.SVGIconUtils;
import com.fr.config.Configuration;
import com.fr.config.ServerPreferenceConfig;
import com.fr.design.actions.UpdateAction;
@ -11,7 +12,6 @@ import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.menu.MenuKeySet;
import com.fr.design.webattr.EditReportServerParameterPane;
import com.fr.general.IOUtils;
import com.fr.transaction.Configurations;
import com.fr.transaction.Worker;
@ -31,7 +31,7 @@ public class ServerConfigManagerAction extends UpdateAction {
this.setMenuKeySet(SERVER_CONFIG_MANAGER);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/m_web/edit.png"));
this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_web/edit_normal.svg"));
this.generateAndSetSearchText(EditReportServerParameterPane.class.getName());
}
@ -45,7 +45,7 @@ public class ServerConfigManagerAction extends UpdateAction {
final EditReportServerParameterPane editReportServerParameterPane = new EditReportServerParameterPane() {
@Override
public void complete() {
ServerPreferenceConfig mirror = config.mirror();
populate(mirror);
}

3
designer-realize/src/main/java/com/fr/design/actions/server/StyleListAction.java
Unescape View File

@ -1,5 +1,6 @@
package com.fr.design.actions.server;
import com.fr.base.svg.SVGIconUtils;
import com.fr.config.Configuration;
import com.fr.config.ServerPreferenceConfig;
import com.fr.design.actions.UpdateAction;
@ -31,7 +32,7 @@ public class StyleListAction extends UpdateAction {
this.setMenuKeySet(PREDEFINED_STYLES);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/m_web/style.png"));
this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_web/style_normal.svg"));
this.generateAndSetSearchText(StyleManagerPane.class.getName());
}

4
designer-realize/src/main/java/com/fr/design/actions/server/WidgetManagerAction.java
Unescape View File

@ -1,6 +1,6 @@
package com.fr.design.actions.server;
import com.fr.base.BaseUtils;
import com.fr.base.svg.SVGIconUtils;
import com.fr.design.DesignModelAdapter;
import com.fr.design.actions.UpdateAction;
import com.fr.design.dialog.BasicDialog;
@ -23,7 +23,7 @@ public class WidgetManagerAction extends UpdateAction {
this.setMenuKeySet(WIDGET_MANAGER);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_format/modified.png"));
this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_format/modified_normal.svg"));
}
/**

21
designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java
Unescape View File

@ -52,6 +52,7 @@ public class ImagePreLoader {
"/com/fr/design/images/m_file/preview.png",
"com/fr/base/images/cell/blank.gif",
"com/fr/design/images/data/dock/serverdatabase.png",
"com/fr/design/images/data/dock/serverdatabase_normal.svg",
"/com/fr/design/images/data/dock/serverclasstabledata.png",
"/com/fr/design/images/data/dock/serverdatatable.png",
"/com/fr/design/images/data/file.png",
@ -74,6 +75,7 @@ public class ImagePreLoader {
"com/fr/design/images/buttonicon/run24.png",
"com/fr/design/images/buttonicon/runs.png",
"com/fr/design/mainframe/alphafine/images/smallsearch.png",
"com/fr/design/mainframe/alphafine/images/smallsearch_normal.svg",
"com/fr/design/images/buttonicon/pageb24.png",
"com/fr/design/images/buttonicon/writeb24.png",
"com/fr/design/images/buttonicon/anab24.png",
@ -126,6 +128,7 @@ public class ImagePreLoader {
"com/fr/design/images/control/tab/remove.png",
"com/fr/design/images/m_file/preview.png",
"com/fr/design/images/m_web/connection.png",
"com/fr/design/images/m_web/connection_normal.svg",
"com/fr/design/images/control/addPopup.png",
"com/fr/design/images/buttonicon/propertiestab/cellelement_normal.png",
"com/fr/design/images/buttonicon/propertiestab/cellattr_normal.png",
@ -151,6 +154,7 @@ public class ImagePreLoader {
"com/fr/design/images/data/bind/localconnect.png",
"com/fr/design/images/gui/tab_add_normal.png",
"com/fr/design/images/m_help/demo.png",
"com/fr/design/images/m_help/demo_normal.svg",
"com/fr/design/images/gui/tab_add_hover.png",
"com/fr/design/images/gui/tab_add_click.png",
"com/fr/design/images/gui/tab_delete.png",
@ -161,6 +165,17 @@ public class ImagePreLoader {
"com/fr/design/images/update.png",
"com/fr/design/images/need.png",
"com/fr/design/images/bug.png",
"/com/fr/design/images/bbs/video_normal.svg",
"/com/fr/design/images/bbs/help_normal.svg",
"/com/fr/design/images/bbs/bbs_normal.svg",
"/com/fr/design/images/bbs/question_normal.svg",
"/com/fr/design/images/bbs/solution_normal.svg",
"/com/fr/design/images/bbs/bug_normal.svg",
"/com/fr/design/images/bbs/need_normal.svg",
"/com/fr/design/images/bbs/center_normal.svg",
"/com/fr/design/images/bbs/sign_normal.svg",
"/com/fr/design/images/bbs/facebook_normal.svg",
"/com/fr/design/images/update/update_new_normal.svg",
"com/fr/design/images/signature.png",
"com/fr/design/images/m_file/switch.png",
"com/fr/design/images/gui/blank.gif",
@ -179,7 +194,9 @@ public class ImagePreLoader {
"com/fr/design/images/gui/frm.png",
"com/fr/design/images/gui/cht.png",
"com/fr/design/images/chart/ChartType.png",
"com/fr/design/images/chart/ChartType_normal.svg",
"com/fr/van/chart/map/images/mapData.png",
"com/fr/van/chart/map/images/mapData_normal.svg",
"com/fr/design/images/buttonicon/add.png",
"com/fr/base/images/cell/control/remove.png",
"com/fr/design/images/control/up.png",
@ -445,14 +462,18 @@ public class ImagePreLoader {
"com/fr/web/images/email.png",
"com/fr/web/images/preview.png",
"com/fr/design/images/server/platform_16_16.png",
"com/fr/design/images/server/platform_16_16_normal.svg",
"com/fr/design/images/data/user_widget.png",
"com/fr/design/images/server/plugin.png",
"com/fr/design/images/server/plugin_normal.svg",
"com/fr/web/images/excel.png",
"com/fr/design/images/m_web/function.png",
"com/fr/design/images/m_web/function_normal.svg",
"com/fr/web/images/word.png",
"com/fr/web/images/pageSetup.png",
"com/fr/web/images/export.png",
"com/fr/design/images/m_web/edit.png",
"com/fr/design/images/m_web/edit_normal.svg",
"com/fr/web/images/pageNumber.png",
"com/fr/web/images/first.png",
"com/fr/design/images/m_web/style.png",

7
designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/smallsearch_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?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>icon_搜索_normal</title>
<g id="icon_搜索_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M6.5,1 C9.53756612,1 12,3.46243388 12,6.5 C12,7.75769341 11.577854,8.91678934 10.8675261,9.84332369 L14.7880061,13.764409 C15.0706646,14.0470675 15.0706646,14.5053476 14.7880061,14.7880061 C14.5053476,15.0706646 14.0470675,15.0706646 13.764409,14.7880061 L9.84332369,10.8675261 C8.91678934,11.577854 7.75769341,12 6.5,12 C3.46243388,12 1,9.53756612 1,6.5 C1,3.46243388 3.46243388,1 6.5,1 Z M6.5,2 C4.01471863,2 2,4.01471863 2,6.5 C2,8.98528137 4.01471863,11 6.5,11 C8.98528137,11 11,8.98528137 11,6.5 C11,4.01471863 8.98528137,2 6.5,2 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 950 B

Write Preview
Loading…
Cancel
Save