Skip to content

Commit f7c73ef

Browse files
car031car031
committed
shadow PNG icons for SVG counterparts
1 parent 9bf2cfb commit f7c73ef

File tree

111 files changed

+58
-42
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+58
-42
lines changed

‎logicaldoc-core/src/main/java/com/logicaldoc/core/automation/AutomationNumberTool.java‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.logicaldoc.core.automation;
22

3+
import org.apache.commons.lang3.StringUtils;
4+
35
import com.logicaldoc.util.LocaleUtil;
46

57
/**
@@ -9,7 +11,7 @@
911
* @author Marco Meschieri - LogicalDOC
1012
* @since 7.3
1113
*/
12-
@AutomationDictionary(key="NumberTool")
14+
@AutomationDictionary(key = "NumberTool")
1315
public class AutomationNumberTool extends org.apache.velocity.tools.generic.NumberTool {
1416

1517
private static final long serialVersionUID = 1L;
@@ -26,4 +28,18 @@ public class AutomationNumberTool extends org.apache.velocity.tools.generic.Numb
2628
public String format(String format, Object obj, String locale) {
2729
return super.format(format, obj, LocaleUtil.toLocale(locale));
2830
}
31+
32+
/**
33+
* Converts a string into a Long
34+
*
35+
* @param str The string to convert
36+
*
37+
* @return The converted value
38+
*/
39+
public Long toLong(String str) {
40+
if (StringUtils.isNotEmpty(str))
41+
return Long.parseLong(str);
42+
else
43+
return null;
44+
}
2945
}

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/preview/PreviewTile.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ private void initGUI() {
4949
}
5050
});
5151

52-
Img closeThumbnailImage = new Img("[SKIN]/rectangle-xmark.svg", 16, 16);
52+
Img closeThumbnailImage = new Img("[SKIN]/icons/rectangle-xmark.png", 16, 16);
5353
closeThumbnailImage.setShowRollOver(true);
5454
closeThumbnailImage.addClickHandler(event -> {
5555
Session.get().setShowThumbnail(false);

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/util/ItemFactory.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
*/
129129
public class ItemFactory {
130130

131-
private static final String SKIN_TRASH = "[SKIN]/trash.svg";
131+
private static final String SKIN_TRASH = "[SKIN]/icons/trash.png";
132132

133133
private static final String CLEAR = "clear";
134134

@@ -316,6 +316,7 @@ public class ItemFactory {
316316
spinnerItem.setIconHeight(ITEM_ICON_SIZE);
317317
spinnerItem.setIconWidth(ITEM_ICON_SIZE);
318318
spinnerItem.setIconVAlign(VerticalAlignment.CENTER);
319+
spinnerItem.setWriteStackedIcons(true);
319320
SpinnerItem.setDefaultProperties(spinnerItem);
320321

321322
PasswordItem passwordItem = new PasswordItem();
@@ -1321,7 +1322,7 @@ public static SpinnerItem newSpinnerItem(String name, String title, Long value)
13211322
spinner.setTitle(I18N.message(title));
13221323
spinner.setMin(0);
13231324
spinner.setStep(1);
1324-
spinner.setWidth(60);
1325+
spinner.setWidth(60);
13251326
if (value != null)
13261327
spinner.setValue(value.intValue());
13271328
else
@@ -1393,15 +1394,15 @@ public static TextItem newCronExpressionItem(String name, String title, String v
13931394

13941395
FormItemIcon composer = new FormItemIcon();
13951396
composer.setPrompt(I18N.message("opencronexpressioncomposer"));
1396-
composer.setSrc("[SKIN]/calendar-lines-pen.svg");
1397+
composer.setSrc("[SKIN]/icons/calendar-lines-pen.png");
13971398
composer.addFormItemClickHandler(click -> {
13981399
new CronExpressionComposer(cron, handler).show();
13991400
click.cancel();
14001401
});
14011402

14021403
FormItemIcon validate = new FormItemIcon();
14031404
validate.setPrompt(I18N.message("validate"));
1404-
validate.setSrc("[SKIN]/check.svg");
1405+
validate.setSrc("[SKIN]/icons/check.png");
14051406
validate.addFormItemClickHandler(click -> InfoService.Instance.get().getCronDescription(cron.getValueAsString(),
14061407
I18N.getLocale(), new AsyncCallback<>() {
14071408

@@ -1606,7 +1607,7 @@ public static PasswordItem newPasswordItem(String name, String title, String val
16061607
private static FormItemIcon newShowPasswordIcon() {
16071608
FormItemIcon showPassword = new FormItemIcon();
16081609
showPassword.setName("showpassword");
1609-
showPassword.setSrc("[SKIN]/eye.svg");
1610+
showPassword.setSrc("[SKIN]/icons/eye.png");
16101611
showPassword.setPrompt(I18N.message("showpassword"));
16111612
showPassword.addFormItemClickHandler(event -> {
16121613
NodeList<Element> inputElements = Document.get().getElementsByTagName("input");
@@ -1637,7 +1638,7 @@ public static PasswordItem newPasswordItemPreventAutocomplete(String name, Strin
16371638
if (withGeneratorTool) {
16381639
FormItemIcon generator = new FormItemIcon();
16391640
generator.setName("generator");
1640-
generator.setSrc("[SKIN]/key.svg");
1641+
generator.setSrc("[SKIN]/icons/key.png");
16411642
generator.setPrompt(I18N.message("passwordgenerator"));
16421643
generator.addFormItemClickHandler(event -> new PasswordGenerator().show());
16431644
password.setIcons(newShowPasswordIcon(), generator);
@@ -1676,7 +1677,7 @@ public static StaticTextItem newSafePasswordItem(String name, String title, Stri
16761677

16771678
FormItemIcon edit = new FormItemIcon();
16781679
edit.setName("edit");
1679-
edit.setSrc("[SKIN]/pen-to-square.svg");
1680+
edit.setSrc("[SKIN]/icons/pen-to-square.png");
16801681
edit.setPrompt(I18N.message("edit"));
16811682
edit.addFormItemClickHandler(event -> {
16821683
PasswordItem password = newPasswordItem("psw", title,
@@ -2028,7 +2029,7 @@ public static TextAreaItem newTextAreaItemForAutomation(String name, String valu
20282029
private static void appendAutomationEditorIcon(FormItem item, ChangedHandler handler, boolean withHtmlEditor) {
20292030
FormItemIcon editAutomation = new FormItemIcon();
20302031
editAutomation.setName("editautomation");
2031-
editAutomation.setSrc("[SKIN]/java.svg");
2032+
editAutomation.setSrc("[SKIN]/icons/java.png");
20322033
editAutomation.setPrompt(I18N.message("openautomationeditor"));
20332034
editAutomation.addFormItemClickHandler(click -> new AutomationItemEditor(item, handler).show());
20342035

@@ -2042,7 +2043,7 @@ private static void appendAutomationEditorIcon(FormItem item, ChangedHandler han
20422043
private static FormItemIcon prepareEditHtmlIcon(FormItem item, ChangedHandler handler) {
20432044
FormItemIcon editHtml = new FormItemIcon();
20442045
editHtml.setName(EDITHTML);
2045-
editHtml.setSrc("[SKIN]/code.svg");
2046+
editHtml.setSrc("[SKIN]/icons/code.png");
20462047
editHtml.setPrompt(I18N.message("openhtmleditor"));
20472048
editHtml.addFormItemClickHandler(click -> new HtmlItemEditor(item, handler).show());
20482049
return editHtml;
@@ -2769,7 +2770,7 @@ public static TextAreaItem newTextAreaItemForNote(String name, String title, Str
27692770
if (withSimplifiedHtmlEditor) {
27702771
FormItemIcon editHtml = new FormItemIcon();
27712772
editHtml.setName(EDITHTML);
2772-
editHtml.setSrc("[SKIN]/code.svg");
2773+
editHtml.setSrc("[SKIN]/icons/code.png");
27732774
editHtml.setPrompt(I18N.message("openhtmleditor"));
27742775
editHtml.addFormItemClickHandler(click -> {
27752776
RichTextItem htmlItem = newRichTextItemForNote("html", "html", item.getValueAsString());

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/widgets/CopyTextFormItemIcon.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class CopyTextFormItemIcon extends FormItemIcon {
2121
public CopyTextFormItemIcon(String text, String tooltip) {
2222
setName("copy");
2323
setPrompt(I18N.message(tooltip));
24-
setSrc("[SKIN]/paste.svg");
24+
setSrc("[SKIN]/icons/paste.png");
2525
addFormItemClickHandler(event -> {
2626
if (text != null)
2727
Util.copyText(text);

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/widgets/DocumentSelector.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public DocumentSelector(String name, List<FormItemIcon> additionalIcons) {
3838

3939
FormItemIcon search = new FormItemIcon();
4040
search.setPrompt(I18N.message("search"));
41-
search.setSrc("[SKIN]/magnifying-glass.svg");
41+
search.setSrc("[SKIN]/icons/magnifying-glass.png");
4242
search.setWidth(12);
4343
search.setHeight(12);
4444
search.addFormItemClickHandler(click -> new DocumentSelectorDialog() {
@@ -52,7 +52,7 @@ protected void onSelection(List<GUIDocument> selection) {
5252

5353
FormItemIcon clear = new FormItemIcon();
5454
clear.setPrompt(I18N.message("clear"));
55-
clear.setSrc("[SKIN]/trash.svg");
55+
clear.setSrc("[SKIN]/icons/trash.png");
5656
clear.setWidth(12);
5757
clear.setHeight(12);
5858
clear.addFormItemClickHandler(click -> {

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/widgets/FolderSelector.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public FolderSelector(String name, List<FormItemIcon> additionalIcons) {
5555

5656
FormItemIcon search = new FormItemIcon();
5757
search.setPrompt(I18N.message("search"));
58-
search.setSrc("[SKIN]/magnifying-glass.svg");
58+
search.setSrc("[SKIN]/icons/magnifying-glass.png");
5959
search.setWidth(12);
6060
search.setHeight(12);
6161
search.addFormItemClickHandler(click -> new FolderSearchDialog(FolderSelector.this).show());
@@ -64,7 +64,7 @@ public FolderSelector(String name, List<FormItemIcon> additionalIcons) {
6464

6565
FormItemIcon open = new FormItemIcon();
6666
open.setPrompt(I18N.message("openfolder"));
67-
open.setSrc("[SKIN]/folder.svg");
67+
open.setSrc("[SKIN]/icons/folder.png");
6868
open.setWidth(12);
6969
open.setHeight(12);
7070
open.addFormItemClickHandler(click -> {
@@ -74,7 +74,7 @@ public FolderSelector(String name, List<FormItemIcon> additionalIcons) {
7474

7575
FormItemIcon clear = new FormItemIcon();
7676
clear.setPrompt(I18N.message("clear"));
77-
clear.setSrc("[SKIN]/trash.svg");
77+
clear.setSrc("[SKIN]/icons/trash.png");
7878
clear.setWidth(12);
7979
clear.setHeight(12);
8080
clear.addFormItemClickHandler(click -> {

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/widgets/QRFormItemIcon.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public QRFormItemIcon(String code, String tooltip) {
2222
setName("qrcode");
2323
if (Util.isCommercial()) {
2424
setPrompt(I18N.message(tooltip));
25-
setSrc("[SKIN]/qrcode.svg");
25+
setSrc("[SKIN]/icons/qrcode.png");
2626
addFormItemClickHandler(event -> {
2727
String content = code;
2828
if (content == null)
@@ -46,7 +46,7 @@ public QRFormItemIcon(String code) {
4646
}
4747

4848
/**
49-
* The constructor, the current item's text will be user for the QR Code
49+
* The constructor, the current item's text will be used for the QR Code
5050
*/
5151
public QRFormItemIcon() {
5252
this(null);

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/ai/robot/AnswerEditor.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.smartgwt.client.types.TitleOrientation;
77
import com.smartgwt.client.widgets.Window;
88
import com.smartgwt.client.widgets.form.DynamicForm;
9-
import com.smartgwt.client.widgets.form.fields.RichTextItem;
9+
import com.smartgwt.client.widgets.form.fields.TextAreaItem;
1010
import com.smartgwt.client.widgets.form.fields.TextItem;
1111
import com.smartgwt.client.widgets.form.fields.events.ChangedHandler;
1212
import com.smartgwt.client.widgets.grid.ListGrid;
@@ -72,8 +72,7 @@ public AnswerEditor(ListGrid grid, ListGridRecord rec, ChangedHandler changedHan
7272
category.setWidth("*");
7373
category.setHeight(30);
7474

75-
RichTextItem answer = ItemFactory.newRichTextItemForAutomation(ANSWER, ANSWER, rec.getAttributeAsString(ANSWER),
76-
null);
75+
TextAreaItem answer = ItemFactory.newTextAreaItemForAutomation(ANSWER, ANSWER, rec.getAttributeAsString(ANSWER), changedHandler, true);
7776
answer.setRequired(true);
7877
answer.setWidth("*");
7978
answer.setHeight("*");

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/ai/robot/RobotProperties.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ protected Canvas getRollOverCanvas(Integer rowNum, Integer colNum) {
158158
editImg.setShowDown(false);
159159
editImg.setShowRollOver(false);
160160
editImg.setLayoutAlign(Alignment.CENTER);
161-
editImg.setSrc("[SKIN]/pencil.svg");
161+
editImg.setSrc("[SKIN]/icons/pencil.png");
162162
editImg.setPrompt(I18N.message("edit"));
163163
editImg.setHeight(16);
164164
editImg.setWidth(16);

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/ai/sampler/SamplerProperties.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ private void refresh() {
157157
category.setVisibleWhen(new AdvancedCriteria(TYPE, OperatorId.EQUALS, METADATA));
158158
FormItemIcon takeAttributeForCategory = new FormItemIcon();
159159
takeAttributeForCategory.setName("takeattributes");
160-
takeAttributeForCategory.setSrc("[SKIN]/ballot.svg");
160+
takeAttributeForCategory.setSrc("[SKIN]/icons/ballot.png");
161161
takeAttributeForCategory.setPrompt(I18N.message("takeattributes"));
162162
takeAttributeForCategory.addFormItemClickHandler(click -> new AttributeSelector(
163163
selection -> click.getItem().setValue(selection[0].getAttributeAsString("name"))).show());
@@ -174,7 +174,7 @@ private void refresh() {
174174

175175
FormItemIcon takeAttributeForFeatures = new FormItemIcon();
176176
takeAttributeForFeatures.setName("takeattributes");
177-
takeAttributeForFeatures.setSrc("[SKIN]/ballot.svg");
177+
takeAttributeForFeatures.setSrc("[SKIN]/icons/ballot.png");
178178
takeAttributeForFeatures.setPrompt(I18N.message("takeattributes"));
179179
takeAttributeForFeatures.addFormItemClickHandler(click -> new AttributeSelector(selection -> {
180180
String str = click.getItem().getValue() != null ? click.getItem().getValue().toString() : "";

0 commit comments

Comments
 (0)