Browse Source

Merge pull request #11742 in DESIGN/design from bugfix/11.0 to feature/x

* commit 'e3fb05119e5797b9d1ceece52f8b97f0f18015b2':
  REPORT-92134,REPORT-92120,REPORT-92123 问题修复
feature/x
superman 2 years ago
parent
commit
ad8eeaa814
  1. 2
      designer-base/src/main/java/com/fr/design/actions/file/LocateAction.java
  2. 2
      designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
  3. 3
      designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
  4. 15
      designer-base/src/main/resources/com/fr/design/standard/locate/locate_disabled.svg
  5. 0
      designer-base/src/main/resources/com/fr/design/standard/locate/locate_normal.svg

2
designer-base/src/main/java/com/fr/design/actions/file/LocateAction.java

@ -28,7 +28,7 @@ public class LocateAction extends UpdateAction {
public LocateAction() {
this.setName(Toolkit.i18nText("Fine-Design_Basic_Locate"));
this.setSmallIcon("/com/fr/design/standard/locate", false);
this.setSmallIcon("/com/fr/design/standard/locate/locate");
}
@Override

2
designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java

@ -452,7 +452,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
public SwitchAction() {
this.setName(Toolkit.i18nText("Fine-Design_Basic_Search"));
this.setMnemonic('S');
this.setSmallIcon("/com/fr/design/standard/search_normal");
this.setSmallIcon("/com/fr/design/standard/search", false);
}
@Override

3
designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@ -1,6 +1,5 @@
package com.fr.design.mainframe;
import com.fr.base.BaseUtils;
import com.fr.base.Parameter;
import com.fr.base.TRL;
import com.fr.base.extension.FileExtension;
@ -1425,7 +1424,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
public Icon getPreviewLargeIcon() {
PreviewProvider provider = getPreviewType();
String iconPath = provider.iconPathForLarge();
return BaseUtils.readIcon(iconPath);
return IconUtils.readIcon(iconPath);
}
/**

15
designer-base/src/main/resources/com/fr/design/standard/locate/locate_disabled.svg

@ -0,0 +1,15 @@
<svg width="15" height="15" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_2163_45508)">
<circle cx="8" cy="8" r="6" stroke="#C2C2C2" stroke-width="1.2"/>
<circle cx="8" cy="8" r="2.5" fill="#C2C2C2"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2.5 8.5C2.5 8.77614 2.27614 9 2 9L0.5 9C0.223858 9 -9.78513e-09 8.77614 -2.18557e-08 8.5L-6.55671e-08 7.5C-7.76376e-08 7.22386 0.223858 7 0.5 7L2 7C2.27614 7 2.5 7.22386 2.5 7.5L2.5 8.5Z" fill="#C2C2C2"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M7.5 2.5C7.22386 2.5 7 2.27614 7 2V0.5C7 0.223858 7.22386 0 7.5 0H8.5C8.77614 0 9 0.223858 9 0.5V2C9 2.27614 8.77614 2.5 8.5 2.5H7.5Z" fill="#C2C2C2"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M7.5 16C7.22386 16 7 15.7761 7 15.5V14C7 13.7239 7.22386 13.5 7.5 13.5H8.5C8.77614 13.5 9 13.7239 9 14V15.5C9 15.7761 8.77614 16 8.5 16H7.5Z" fill="#C2C2C2"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M16 8.5C16 8.77614 15.7761 9 15.5 9L14 9C13.7239 9 13.5 8.77614 13.5 8.5L13.5 7.5C13.5 7.22386 13.7239 7 14 7L15.5 7C15.7761 7 16 7.22386 16 7.5L16 8.5Z" fill="#C2C2C2"/>
</g>
<defs>
<clipPath id="clip0_2163_45508">
<rect width="16" height="16" fill="white"/>
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

0
designer-base/src/main/resources/com/fr/design/standard/locate_normal.svg → designer-base/src/main/resources/com/fr/design/standard/locate/locate_normal.svg

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Loading…
Cancel
Save