Browse Source

Merge branch 'newui' of ssh://code.fineres.com:7999/~vito/c-design into newui

newui
vito 12 months ago
parent
commit
6300177649
  1. 3
      designer-base/src/main/java/com/fr/design/actions/community/CenterAction.java
  2. 3
      designer-base/src/main/java/com/fr/design/actions/edit/UndoAction.java
  3. 5
      designer-base/src/main/resources/com/fine/theme/icon/toolbar/servicePlatform.svg
  4. 5
      designer-base/src/main/resources/com/fine/theme/icon/toolbar/servicePlatform_disable.svg

3
designer-base/src/main/java/com/fr/design/actions/community/CenterAction.java

@ -1,5 +1,6 @@
package com.fr.design.actions.community;
import com.fine.theme.icon.LazyIcon;
import com.fr.design.i18n.LocaleLinkProvider;
import com.fr.design.menu.MenuKeySet;
@ -24,7 +25,7 @@ public class CenterAction extends UpAction {
this.setMenuKeySet(CENTER);
this.setName(getMenuKeySet().getMenuName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("actCenter");
this.setSmallIcon(new LazyIcon("actCenter"));
}
@Override

3
designer-base/src/main/java/com/fr/design/actions/edit/UndoAction.java

@ -3,6 +3,7 @@
*/
package com.fr.design.actions.edit;
import com.fine.theme.icon.LazyIcon;
import com.fr.design.DesignerEnvManager;
import com.fr.design.actions.TemplateComponentActionInterface;
import com.fr.design.actions.UpdateAction;
@ -22,7 +23,7 @@ public class UndoAction extends UpdateAction implements TemplateComponentActionI
this.setMenuKeySet(KeySetUtils.UNDO);
this.setName(getMenuKeySet().getMenuKeySetName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("monochrome_undo");
this.setSmallIcon(new LazyIcon("monochrome_undo"));
this.setAccelerator(getMenuKeySet().getKeyStroke());
}

5
designer-base/src/main/resources/com/fine/theme/icon/toolbar/servicePlatform.svg

@ -0,0 +1,5 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M4.3177 9.99235C4.79907 8.06648 5.76014 6.32819 7.06799 4.90476C9.27298 2.50489 12.4637 1 16.003 1C19.5454 1 22.7386 2.50753 24.9438 4.91106C26.2486 6.33332 27.2076 8.06932 27.6883 9.99235C27.85 10.6394 27.9576 11.3077 28.006 11.9923H28C28 11.9949 28 11.9974 28 12V19C28 20.1046 27.1046 21 26 21H22C20.8954 21 20 20.1046 20 19V12C20 10.8954 20.8954 10 22 10H25.6138C24.3764 5.95954 20.5532 3 16.003 3C12.9673 3 10.2553 4.31722 8.41871 6.39384C7.50238 7.42994 6.80389 8.65509 6.39193 10H10C11.1046 10 12 10.8954 12 12V19C12 20.1046 11.1046 21 10 21H8V26C8 26.5523 8.44772 27 9 27H13C13 25.8954 13.8954 25 15 25H17C18.1046 25 19 25.8954 19 27V29C19 30.1046 18.1046 31 17 31H15C13.8954 31 13 30.1046 13 29H9C7.34315 29 6 27.6569 6 26V21C4.89543 21 4 20.1046 4 19V12C4 11.9974 4 11.9949 4.00001 11.9923H4C4.00001 11.9923 4.00001 11.9922 4.00002 11.9921C4.00044 11.8816 4.00983 11.7732 4.02749 11.6677C4.08389 11.0962 4.18163 10.5368 4.3177 9.99235ZM6 12H10V19H6V12ZM26 12H22V19H26V12ZM15 27H17V29H15V27Z"
fill="#0A1C38" fill-opacity="0.9"/>
</svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

5
designer-base/src/main/resources/com/fine/theme/icon/toolbar/servicePlatform_disable.svg

@ -0,0 +1,5 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M4.3177 9.99235C4.79907 8.06648 5.76014 6.32819 7.06799 4.90476C9.27298 2.50489 12.4637 1 16.003 1C19.5454 1 22.7386 2.50753 24.9438 4.91106C26.2486 6.33332 27.2076 8.06932 27.6883 9.99235C27.85 10.6394 27.9576 11.3077 28.006 11.9923H28C28 11.9949 28 11.9974 28 12V19C28 20.1046 27.1046 21 26 21H22C20.8954 21 20 20.1046 20 19V12C20 10.8954 20.8954 10 22 10H25.6138C24.3764 5.95954 20.5532 3 16.003 3C12.9673 3 10.2553 4.31722 8.41871 6.39384C7.50238 7.42994 6.80389 8.65509 6.39193 10H10C11.1046 10 12 10.8954 12 12V19C12 20.1046 11.1046 21 10 21H8V26C8 26.5523 8.44772 27 9 27H13C13 25.8954 13.8954 25 15 25H17C18.1046 25 19 25.8954 19 27V29C19 30.1046 18.1046 31 17 31H15C13.8954 31 13 30.1046 13 29H9C7.34315 29 6 27.6569 6 26V21C4.89543 21 4 20.1046 4 19V12C4 11.9974 4 11.9949 4.00001 11.9923H4C4.00001 11.9923 4.00001 11.9922 4.00002 11.9921C4.00044 11.8816 4.00983 11.7732 4.02749 11.6677C4.08389 11.0962 4.18163 10.5368 4.3177 9.99235ZM6 12H10V19H6V12ZM26 12H22V19H26V12ZM15 27H17V29H15V27Z"
fill="#0A1C38" fill-opacity="0.29"/>
</svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

Loading…
Cancel
Save