diff --git a/designer-base/src/main/java/com/fr/design/fun/FormWidgetOptionProvider.java b/designer-base/src/main/java/com/fr/design/fun/FormWidgetOptionProvider.java index 9f033d6dc6..d1b64e2bd9 100644 --- a/designer-base/src/main/java/com/fr/design/fun/FormWidgetOptionProvider.java +++ b/designer-base/src/main/java/com/fr/design/fun/FormWidgetOptionProvider.java @@ -23,4 +23,12 @@ public interface FormWidgetOptionProvider extends ParameterWidgetOptionProvider */ void paste2Container(T t); + /** + * 往扩展容器本身中添加粘贴内容 + * @param r + * @param 粘贴板选中的组件 + * @param 容器布局适配器 + */ + void formWidgetPaste(T t, R r, int x, int y); + } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/fun/impl/AbstractFormWidgetOptionProvider.java b/designer-base/src/main/java/com/fr/design/fun/impl/AbstractFormWidgetOptionProvider.java index 537a49d018..2e0633e870 100644 --- a/designer-base/src/main/java/com/fr/design/fun/impl/AbstractFormWidgetOptionProvider.java +++ b/designer-base/src/main/java/com/fr/design/fun/impl/AbstractFormWidgetOptionProvider.java @@ -30,4 +30,9 @@ public abstract class AbstractFormWidgetOptionProvider extends AbstractProvider public void paste2Container(T t) { // do nothing } + + @Override + public void formWidgetPaste(T t, R r, int x, int y) { + // do nothing + } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/mainframe/chart/info/ChartInfo.java b/designer-base/src/main/java/com/fr/design/mainframe/chart/info/ChartInfo.java index 9025b98064..262ccc8778 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/chart/info/ChartInfo.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/chart/info/ChartInfo.java @@ -19,6 +19,8 @@ import com.fr.stable.xml.XMLPrintWriter; import com.fr.stable.xml.XMLableReader; import com.fr.third.joda.time.DateTime; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; @@ -27,7 +29,7 @@ import java.util.Map; * @version 10.0 * Created by Bjorn on 2020-02-17 */ -public class ChartInfo extends AbstractPointInfo { +public class ChartInfo extends AbstractPointInfo implements Comparable { public static final String XML_TAG = "ChartInfo"; private static final String CHART_CONSUMING_URL = CloudCenter.getInstance().acquireUrlByKind("chartinfo.consuming") + "/single"; private static final String CHART_FUNCTION_URL = CloudCenter.getInstance().acquireUrlByKind("chart.info.function") + "/single"; @@ -338,4 +340,19 @@ public class ChartInfo extends AbstractPointInfo { chartInfo.chartConfigInfo = chartConfigInfo.clone(); return chartInfo; } + + @Override + public int compareTo(ChartInfo chartInfo) { + DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + return format.parse(this.getCompareDate()).compareTo(format.parse(chartInfo.getCompareDate())); + } catch (Exception ex) { + return 1; + } + } + + private String getCompareDate() { + return StringUtils.isNotEmpty(chartConsumingMap.get(ATTR_CHART_PROPERTY_END_TIME)) ? + chartConsumingMap.get(ATTR_CHART_PROPERTY_END_TIME) : chartConsumingMap.get(ATTR_CHART_TYPE_TIME); + } } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/chart/info/ChartInfoCollector.java b/designer-base/src/main/java/com/fr/design/mainframe/chart/info/ChartInfoCollector.java index cd651fc6b3..1b34722e6f 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/chart/info/ChartInfoCollector.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/chart/info/ChartInfoCollector.java @@ -13,7 +13,10 @@ import com.fr.stable.xml.XMLPrintWriter; import com.fr.stable.xml.XMLableReader; import com.fr.third.joda.time.DateTime; +import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -269,7 +272,10 @@ public class ChartInfoCollector extends AbstractPointCollector { writer.end(); writer.startTAG(XML_CHART_INFO_LIST); - for (ChartInfo chartInfo : pointInfoMap.values()) { + + List list = new ArrayList<>(pointInfoMap.values()); + Collections.sort(list); + for (ChartInfo chartInfo : list) { chartInfo.writeXML(writer); } writer.end(); diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/bug_normal.svg b/designer-base/src/main/resources/com/fr/design/images/bbs/bug_normal.svg index d3f4a599ee..5212ea9b91 100644 --- a/designer-base/src/main/resources/com/fr/design/images/bbs/bug_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/bbs/bug_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/center_normal.svg b/designer-base/src/main/resources/com/fr/design/images/bbs/center_normal.svg index 4fbcfa77dc..659f84062a 100644 --- a/designer-base/src/main/resources/com/fr/design/images/bbs/center_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/bbs/center_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/facebook_normal.svg b/designer-base/src/main/resources/com/fr/design/images/bbs/facebook_normal.svg index be85b39f18..3e229e01ae 100644 --- a/designer-base/src/main/resources/com/fr/design/images/bbs/facebook_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/bbs/facebook_normal.svg @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/help_normal.svg b/designer-base/src/main/resources/com/fr/design/images/bbs/help_normal.svg index d5b808fc97..56473312bf 100644 --- a/designer-base/src/main/resources/com/fr/design/images/bbs/help_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/bbs/help_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/need_normal.svg b/designer-base/src/main/resources/com/fr/design/images/bbs/need_normal.svg index ab21bc50ff..04bccffda3 100644 --- a/designer-base/src/main/resources/com/fr/design/images/bbs/need_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/bbs/need_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/question_normal.svg b/designer-base/src/main/resources/com/fr/design/images/bbs/question_normal.svg index e94015aafc..27005769cc 100644 --- a/designer-base/src/main/resources/com/fr/design/images/bbs/question_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/bbs/question_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/sign_normal.svg b/designer-base/src/main/resources/com/fr/design/images/bbs/sign_normal.svg index 3f3f3d875b..4054250809 100644 --- a/designer-base/src/main/resources/com/fr/design/images/bbs/sign_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/bbs/sign_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/solution_normal.svg b/designer-base/src/main/resources/com/fr/design/images/bbs/solution_normal.svg index 1538ce2cf8..ce4e0789bb 100644 --- a/designer-base/src/main/resources/com/fr/design/images/bbs/solution_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/bbs/solution_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/video_normal.svg b/designer-base/src/main/resources/com/fr/design/images/bbs/video_normal.svg index 2cde6094d5..659581e0dc 100644 --- a/designer-base/src/main/resources/com/fr/design/images/bbs/video_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/bbs/video_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/absolute_layout_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/absolute_layout_normal.svg index f7cbf331c0..55c093fb42 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/absolute_layout_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/absolute_layout_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/card_layout_16_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/card_layout_16_normal.svg index df9499aa01..95104065fb 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/card_layout_16_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/card_layout_16_normal.svg @@ -2,6 +2,6 @@ icon_tab块_normal - + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/new_form3_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/new_form3_normal.svg index 82797df980..41fa6afa64 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/new_form3_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/new_form3_normal.svg @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/newcpts_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/newcpts_normal.svg index 22e258dc27..587d4963b5 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/newcpts_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/newcpts_normal.svg @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/open_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/open_normal.svg index e39847cf2a..68f2cb3d14 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/open_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/open_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.svg index cd22a33fc0..7df1acf348 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.svg @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_normal.svg index 6326e5dc5f..b7000e6f96 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_selected.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_selected.svg index aee04091e6..e70df0a896 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_selected.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_selected.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.svg index 676e2123fd..bf79dfdbf6 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_normal.svg index 17c1c3ad7f..ca05aca236 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.svg index 20ec3d345d..bf0af1df1a 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.svg index 2996337a6f..f839505353 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_normal.svg index 486824f88b..32256c90fb 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_selected.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_selected.svg index 8fd7efb326..e5c0423676 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_selected.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_selected.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_disabled.svg index 30c6ee777e..a7d31cd63e 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_disabled.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.svg index 7d05f41837..48655aa194 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.svg index 0a2896f52c..8d8e798466 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.svg index 238d5cb3ba..61a2c84fea 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_normal.svg index b100145680..972f102b1d 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_selected.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_selected.svg index af3a5e3a6d..74eef28bb3 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_selected.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_selected.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.svg index 78d8cfb9b2..edf86bce7d 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.svg index d80ac64976..c98ec8852e 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.svg index c4f2503c53..517c3c1aa3 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.svg @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_disabled.svg index fbb24140c0..56c05df4cf 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_disabled.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_normal.svg index 85b0fd1d41..9d50a6616d 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.svg index 96105ce35f..1c3dd78f7f 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_disabled.svg index 813523a359..4e5ad7a64d 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_disabled.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.svg index e4e76fda39..a5848ed13c 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_selected.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_selected.svg index 8e66ad8b16..48dc61a997 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_selected.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_selected.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_disabled.svg index eded042891..e461edef65 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_disabled.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.svg index cc63ec8653..9f7c629ad1 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.svg index a5dd18b3ee..fe17b80623 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/redo_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/redo_disabled.svg index 7866d7b444..ae600230cd 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/redo_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/redo_disabled.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/redo_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/redo_normal.svg index 3f1e16e890..8c26e8925f 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/redo_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/redo_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/report_16_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/report_16_normal.svg index ba2772495e..2fef231c44 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/report_16_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/report_16_normal.svg @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/save_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/save_disabled.svg index 7b44ca6728..99087a805b 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/save_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/save_disabled.svg @@ -9,4 +9,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/save_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/save_normal.svg index c821dbecf2..f1caf5d1e7 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/save_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/save_normal.svg @@ -9,4 +9,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/undo_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/undo_disabled.svg index ca7b9f1c6d..24c5cd7c93 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/undo_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/undo_disabled.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/undo_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/undo_normal.svg index 72f9e29332..d36032371a 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/undo_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/undo_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/button_16_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/button_16_normal.svg index 55601500d5..0075e9b27d 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/button_16_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/button_16_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/button_group_16_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/button_group_16_normal.svg index 97d0a7ae89..847399b276 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/button_group_16_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/button_group_16_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/check_box_16_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/check_box_16_normal.svg index 89f8486540..9018cbd653 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/check_box_16_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/check_box_16_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/checkbox_group_16_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/checkbox_group_16_normal.svg index 67c95d63eb..18cdfb342d 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/checkbox_group_16_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/checkbox_group_16_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/combo_box_16_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/combo_box_16_normal.svg index f90c2e4962..cbb7c39068 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/combo_box_16_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/combo_box_16_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/combo_check_16_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/combo_check_16_normal.svg index b491ff55f1..3c5cf474c3 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/combo_check_16_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/combo_check_16_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/comboboxtree16_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/comboboxtree16_normal.svg index dda6ba7885..8c32ce6a68 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/comboboxtree16_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/comboboxtree16_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/date_16_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/date_16_normal.svg index 4f8d4437bd..0c77109219 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/date_16_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/date_16_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/label_16_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/label_16_normal.svg index 270db542f3..eab538ae95 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/label_16_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/label_16_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/number_field_16_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/number_field_16_normal.svg index 8384ab70b2..171842baa8 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/number_field_16_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/number_field_16_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/password_field_16_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/password_field_16_normal.svg index 25884c0952..6a0c47b4b3 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/password_field_16_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/password_field_16_normal.svg @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/text_area_16_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/text_area_16_normal.svg index 6f57cb809b..b576394acf 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/text_area_16_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/text_area_16_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/text_field_16_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/text_field_16_normal.svg index 97089c5132..04d51b5b2d 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/text_field_16_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/text_field_16_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/tree_16_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/tree_16_normal.svg index bd685702d5..342e0fa963 100644 --- a/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/tree_16_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/tree_16_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/chart/ChartType_normal.svg b/designer-base/src/main/resources/com/fr/design/images/chart/ChartType_normal.svg index b4e4dcb5bb..a58a7e161d 100644 --- a/designer-base/src/main/resources/com/fr/design/images/chart/ChartType_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/chart/ChartType_normal.svg @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/data/bind/distanceconnect_normal.svg b/designer-base/src/main/resources/com/fr/design/images/data/bind/distanceconnect_normal.svg index ff87b3e47d..93bcbdb40c 100644 --- a/designer-base/src/main/resources/com/fr/design/images/data/bind/distanceconnect_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/data/bind/distanceconnect_normal.svg @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/data/bind/localconnect_normal.svg b/designer-base/src/main/resources/com/fr/design/images/data/bind/localconnect_normal.svg index dad50a6051..d5a4717d24 100644 --- a/designer-base/src/main/resources/com/fr/design/images/data/bind/localconnect_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/data/bind/localconnect_normal.svg @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/data/dock/serverdatabase_normal.svg b/designer-base/src/main/resources/com/fr/design/images/data/dock/serverdatabase_normal.svg index 0371b6c909..5822e894e7 100644 --- a/designer-base/src/main/resources/com/fr/design/images/data/dock/serverdatabase_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/data/dock/serverdatabase_normal.svg @@ -10,4 +10,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/data/source/dataDictionary_normal.svg b/designer-base/src/main/resources/com/fr/design/images/data/source/dataDictionary_normal.svg index 5ca77fe5b2..7885f3e34b 100644 --- a/designer-base/src/main/resources/com/fr/design/images/data/source/dataDictionary_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/data/source/dataDictionary_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/edit/redo_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/edit/redo_disabled.svg index 7866d7b444..ae600230cd 100644 --- a/designer-base/src/main/resources/com/fr/design/images/edit/redo_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/edit/redo_disabled.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/edit/redo_normal.svg b/designer-base/src/main/resources/com/fr/design/images/edit/redo_normal.svg index 6723f533a6..b15749b41d 100644 --- a/designer-base/src/main/resources/com/fr/design/images/edit/redo_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/edit/redo_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/edit/undo_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/edit/undo_disabled.svg index ca7b9f1c6d..24c5cd7c93 100644 --- a/designer-base/src/main/resources/com/fr/design/images/edit/undo_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/edit/undo_disabled.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/edit/undo_normal.svg b/designer-base/src/main/resources/com/fr/design/images/edit/undo_normal.svg index f66553747e..0e49c799e6 100644 --- a/designer-base/src/main/resources/com/fr/design/images/edit/undo_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/edit/undo_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/expand/cellAttr_normal.svg b/designer-base/src/main/resources/com/fr/design/images/expand/cellAttr_normal.svg index 557ab9d032..fb0a350ddb 100644 --- a/designer-base/src/main/resources/com/fr/design/images/expand/cellAttr_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/expand/cellAttr_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/gui/color/background_normal.svg b/designer-base/src/main/resources/com/fr/design/images/gui/color/background_normal.svg index 112cfef2a9..c4714560ce 100644 --- a/designer-base/src/main/resources/com/fr/design/images/gui/color/background_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/gui/color/background_normal.svg @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/gui/popup_normal.svg b/designer-base/src/main/resources/com/fr/design/images/gui/popup_normal.svg index 81e81b0a17..6d64eb7a70 100644 --- a/designer-base/src/main/resources/com/fr/design/images/gui/popup_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/gui/popup_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_edit/copy_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/m_edit/copy_disabled.svg index 8f4820de19..05585d3abd 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_edit/copy_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_edit/copy_disabled.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_edit/copy_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_edit/copy_normal.svg index 31127a9576..7e45e69356 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_edit/copy_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_edit/copy_normal.svg @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_edit/cut_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/m_edit/cut_disabled.svg index c4982036b3..6f469f8e63 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_edit/cut_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_edit/cut_disabled.svg @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_edit/cut_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_edit/cut_normal.svg index a4cc6a17db..485201206b 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_edit/cut_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_edit/cut_normal.svg @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_edit/formatBrush_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_edit/formatBrush_normal.svg index 009e60355b..f02c9cb616 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_edit/formatBrush_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_edit/formatBrush_normal.svg @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_edit/merge_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/m_edit/merge_disabled.svg index a2b0f3ddf9..a54f56a5bc 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_edit/merge_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_edit/merge_disabled.svg @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_edit/merge_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_edit/merge_normal.svg index 4a79d5a64e..ad75844975 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_edit/merge_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_edit/merge_normal.svg @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_edit/paste_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/m_edit/paste_disabled.svg index c2536b377c..778257c33d 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_edit/paste_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_edit/paste_disabled.svg @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_edit/paste_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_edit/paste_normal.svg index 5ae3370728..3a2f314044 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_edit/paste_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_edit/paste_normal.svg @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_edit/redo_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/m_edit/redo_disabled.svg index 7866d7b444..ae600230cd 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_edit/redo_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_edit/redo_disabled.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_edit/redo_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_edit/redo_normal.svg index 6723f533a6..b15749b41d 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_edit/redo_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_edit/redo_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_edit/undo_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/m_edit/undo_disabled.svg index ca7b9f1c6d..24c5cd7c93 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_edit/undo_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_edit/undo_disabled.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_edit/undo_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_edit/undo_normal.svg index f66553747e..0e49c799e6 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_edit/undo_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_edit/undo_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_edit/unmerge_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/m_edit/unmerge_disabled.svg index 7ab193216d..bb9f7a22f6 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_edit/unmerge_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_edit/unmerge_disabled.svg @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_edit/unmerge_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_edit/unmerge_normal.svg index faad95c001..3af2c0ff3d 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_edit/unmerge_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_edit/unmerge_normal.svg @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_file/export_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_file/export_normal.svg index 693fba9383..8b0d7ba9d1 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_file/export_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_file/export_normal.svg @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_file/formExport_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_file/formExport_normal.svg index cf751fc185..7f28a5105b 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_file/formExport_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_file/formExport_normal.svg @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_file/pageSetup_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_file/pageSetup_normal.svg index 565fc0aee8..f09c3aeadb 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_file/pageSetup_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_file/pageSetup_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_file/repeatAndFrozen_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_file/repeatAndFrozen_normal.svg index 537d768548..116063de60 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_file/repeatAndFrozen_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_file/repeatAndFrozen_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_file/saveAs_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_file/saveAs_normal.svg index a94f787543..8b50d562fe 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_file/saveAs_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_file/saveAs_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_file/save_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/m_file/save_disabled.svg index 7158a2c9f1..c5f6ea3a2a 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_file/save_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_file/save_disabled.svg @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_file/save_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_file/save_normal.svg index 6da2e13e81..03da5de8f6 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_file/save_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_file/save_normal.svg @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_file/switch_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_file/switch_normal.svg index 2bde0dd525..17d5d0dda3 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_file/switch_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_file/switch_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_format/cellAttr_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_format/cellAttr_normal.svg index 2c8311fedd..8348b9703a 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_format/cellAttr_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_format/cellAttr_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/bold_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/bold_normal.svg index 173782b1d9..fa9d660221 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/bold_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/bold_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/bold_selected.svg b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/bold_selected.svg index 16c56767a1..638fadc32c 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/bold_selected.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/bold_selected.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_center_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_center_normal.svg index c7ca8f8898..46c7848030 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_center_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_center_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_center_selected.svg b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_center_selected.svg index 84625ef781..ca87172041 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_center_selected.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_center_selected.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_left_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_left_normal.svg index 6adf580340..480e12e8c1 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_left_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_left_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_left_selected.svg b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_left_selected.svg index 36d615ae47..b859a9ac96 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_left_selected.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_left_selected.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_right_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_right_normal.svg index 39d4a33369..9707e270d9 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_right_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_right_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_right_selected.svg b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_right_selected.svg index 7ec881db60..f2ca4708cb 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_right_selected.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_right_selected.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/italic_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/italic_normal.svg index 7873d4d1a0..97ed4dd1ae 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/italic_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/italic_normal.svg @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/italic_selected.svg b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/italic_selected.svg index c942c51ecf..1a84fd6da9 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/italic_selected.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/italic_selected.svg @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/underline_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/underline_normal.svg index 377791ff19..51a6fd7837 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/underline_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/underline_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/underline_selected.svg b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/underline_selected.svg index 35df2737d9..ccaafc40a6 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/underline_selected.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/underline_selected.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_format/highlight_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_format/highlight_normal.svg index 7d05f41837..48655aa194 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_format/highlight_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_format/highlight_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_format/modified_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_format/modified_normal.svg index 93b9e7a6da..57f397dabf 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_format/modified_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_format/modified_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_format/noborder_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_format/noborder_normal.svg index f91b02e107..4f583e6967 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_format/noborder_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_format/noborder_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_help/demo_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_help/demo_normal.svg index 6f18bd2f05..b9755a908d 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_help/demo_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_help/demo_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/bias_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/m_insert/bias_disabled.svg index 68d174f00c..bc8c7ac44d 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_insert/bias_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_insert/bias_disabled.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/bias_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_insert/bias_normal.svg index d7cfbd2614..e20ec42eb0 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_insert/bias_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_insert/bias_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/bindColumn_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/m_insert/bindColumn_disabled.svg index 9e883967bc..6c80b82afb 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_insert/bindColumn_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_insert/bindColumn_disabled.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/bindColumn_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_insert/bindColumn_normal.svg index 2f6c209669..ea35ccb27f 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_insert/bindColumn_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_insert/bindColumn_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/cell_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_insert/cell_normal.svg index 7122f3db8f..a2d91db47d 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_insert/cell_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_insert/cell_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/chart_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/m_insert/chart_disabled.svg index 9e178473a5..b2b724c64c 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_insert/chart_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_insert/chart_disabled.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/chart_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_insert/chart_normal.svg index 4346002019..59fc97567f 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_insert/chart_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_insert/chart_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/floatPop_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_insert/floatPop_normal.svg index 6098d54ff9..95806104dc 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_insert/floatPop_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_insert/floatPop_normal.svg @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/float_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_insert/float_normal.svg index ba67578c14..b2204b711e 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_insert/float_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_insert/float_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/formula_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/m_insert/formula_disabled.svg index f7070f3d02..18eb078e73 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_insert/formula_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_insert/formula_disabled.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/formula_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_insert/formula_normal.svg index de9f4effd3..981ec11b45 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_insert/formula_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_insert/formula_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/hyperLink_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_insert/hyperLink_normal.svg index 85b0fd1d41..9d50a6616d 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_insert/hyperLink_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_insert/hyperLink_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/image_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/m_insert/image_disabled.svg index d1e0811d35..b18058f59c 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_insert/image_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_insert/image_disabled.svg @@ -9,4 +9,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/image_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_insert/image_normal.svg index 5105371265..19eb761998 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_insert/image_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_insert/image_normal.svg @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/insertColumn_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_insert/insertColumn_normal.svg index 358dcc3574..a1b3065268 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_insert/insertColumn_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_insert/insertColumn_normal.svg @@ -10,4 +10,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/insertRow_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_insert/insertRow_normal.svg index ecf535ba6f..9a2e37e271 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_insert/insertRow_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_insert/insertRow_normal.svg @@ -11,4 +11,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/richtext_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/m_insert/richtext_disabled.svg index 5951896bb2..916c433033 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_insert/richtext_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_insert/richtext_disabled.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/richtext_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_insert/richtext_normal.svg index fa017a7552..3665dd01e1 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_insert/richtext_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_insert/richtext_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/subReport_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/m_insert/subReport_disabled.svg index 02889deb40..14ee3f16c3 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_insert/subReport_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_insert/subReport_disabled.svg @@ -9,4 +9,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/subReport_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_insert/subReport_normal.svg index 37ba3195d9..d06985a528 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_insert/subReport_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_insert/subReport_normal.svg @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/text_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/m_insert/text_disabled.svg index 9f66f88347..a25d12a706 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_insert/text_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_insert/text_disabled.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/text_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_insert/text_normal.svg index 4673b661df..bf3b0c6879 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_insert/text_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_insert/text_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/allow_authority_edit_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/allow_authority_edit_normal.svg index 9d8bff2791..ac662cd61f 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_report/allow_authority_edit_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_report/allow_authority_edit_normal.svg @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/background_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/background_normal.svg index 4cacc0f6d0..aa95ad94f0 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_report/background_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_report/background_normal.svg @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/delete_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/delete_disabled.svg index bc72176ba2..fa76d8b95b 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_report/delete_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_report/delete_disabled.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/delete_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/delete_normal.svg index 90832de79d..74ff5ab385 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_report/delete_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_report/delete_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/exit_authority_edit_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/exit_authority_edit_normal.svg index cb214cf19f..a3d57dde95 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_report/exit_authority_edit_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_report/exit_authority_edit_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/footer_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/footer_normal.svg index a9ebb25152..32d3e1553b 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_report/footer_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_report/footer_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/header_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/header_normal.svg index 5a4073df1d..c51df52e8f 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_report/header_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_report/header_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/linearAttr_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/linearAttr_normal.svg index 35c6a92e33..2f04689766 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_report/linearAttr_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_report/linearAttr_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/mobile_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/mobile_normal.svg index f13090adba..6b21d092b3 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_report/mobile_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_report/mobile_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/p_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/p_normal.svg index 326b33cf36..11f81ebe39 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_report/p_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_report/p_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/reportEngineAttr_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/reportEngineAttr_normal.svg index b9d5b48bd4..6490eb9c3e 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_report/reportEngineAttr_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_report/reportEngineAttr_normal.svg @@ -11,4 +11,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/reportWriteAttr_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/reportWriteAttr_normal.svg index d70ac6e2ce..4e7443f778 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_report/reportWriteAttr_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_report/reportWriteAttr_normal.svg @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/watermark_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/watermark_normal.svg index 52b0581e8a..a3c0cf5154 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_report/watermark_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_report/watermark_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/webreportattribute_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/webreportattribute_normal.svg index f1929fd4f3..ed6b252af1 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_report/webreportattribute_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_report/webreportattribute_normal.svg @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_web/datasource_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_web/datasource_normal.svg index 626af16f04..1e16b5ecfc 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_web/datasource_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_web/datasource_normal.svg @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_web/edit_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_web/edit_normal.svg index 8145a3a182..b3f329e95f 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_web/edit_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_web/edit_normal.svg @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_web/function_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_web/function_normal.svg index 349c6ae7af..f8bdbd3835 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_web/function_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_web/function_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_web/style_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_web/style_normal.svg index de5f21cc5a..9e20fc208d 100644 --- a/designer-base/src/main/resources/com/fr/design/images/m_web/style_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/m_web/style_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/reportfit/fit_normal.svg b/designer-base/src/main/resources/com/fr/design/images/reportfit/fit_normal.svg index 21717e20ab..bc44c9dc2f 100644 --- a/designer-base/src/main/resources/com/fr/design/images/reportfit/fit_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/reportfit/fit_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/server/platform_16_16_normal.svg b/designer-base/src/main/resources/com/fr/design/images/server/platform_16_16_normal.svg index 2363d22f2e..f691c42deb 100644 --- a/designer-base/src/main/resources/com/fr/design/images/server/platform_16_16_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/server/platform_16_16_normal.svg @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/server/plugin_normal.svg b/designer-base/src/main/resources/com/fr/design/images/server/plugin_normal.svg index 0ecf1d2944..8b5cd823b5 100644 --- a/designer-base/src/main/resources/com/fr/design/images/server/plugin_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/server/plugin_normal.svg @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/sheet/add_polysheet_normal.svg b/designer-base/src/main/resources/com/fr/design/images/sheet/add_polysheet_normal.svg index 581db9cfbd..adf5ee4131 100644 --- a/designer-base/src/main/resources/com/fr/design/images/sheet/add_polysheet_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/sheet/add_polysheet_normal.svg @@ -13,4 +13,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/sheet/next_page_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/sheet/next_page_disabled.svg index 4bbe1ebb4e..2b3f4621da 100644 --- a/designer-base/src/main/resources/com/fr/design/images/sheet/next_page_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/sheet/next_page_disabled.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/sheet/next_page_normal.svg b/designer-base/src/main/resources/com/fr/design/images/sheet/next_page_normal.svg index 5526b5488f..588a01a499 100644 --- a/designer-base/src/main/resources/com/fr/design/images/sheet/next_page_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/sheet/next_page_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/sheet/polysheet_normal.svg b/designer-base/src/main/resources/com/fr/design/images/sheet/polysheet_normal.svg index 508a3eedb5..85674ff032 100644 --- a/designer-base/src/main/resources/com/fr/design/images/sheet/polysheet_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/sheet/polysheet_normal.svg @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/sheet/pre_page_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/sheet/pre_page_disabled.svg index 9f84932711..6be01cb530 100644 --- a/designer-base/src/main/resources/com/fr/design/images/sheet/pre_page_disabled.svg +++ b/designer-base/src/main/resources/com/fr/design/images/sheet/pre_page_disabled.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/sheet/pre_page_normal.svg b/designer-base/src/main/resources/com/fr/design/images/sheet/pre_page_normal.svg index 58c1fb016a..9a04977d79 100644 --- a/designer-base/src/main/resources/com/fr/design/images/sheet/pre_page_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/sheet/pre_page_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/images/update/update_new_normal.svg b/designer-base/src/main/resources/com/fr/design/images/update/update_new_normal.svg index c163c82f25..1ebd7fc6f0 100644 --- a/designer-base/src/main/resources/com/fr/design/images/update/update_new_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/images/update/update_new_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/designer-base/src/main/resources/com/fr/design/remote/images/icon_Remote_Design_Auth_Manager_normal@1x_normal.svg b/designer-base/src/main/resources/com/fr/design/remote/images/icon_Remote_Design_Auth_Manager_normal@1x_normal.svg index d4e2a743e1..879af48ed8 100644 --- a/designer-base/src/main/resources/com/fr/design/remote/images/icon_Remote_Design_Auth_Manager_normal@1x_normal.svg +++ b/designer-base/src/main/resources/com/fr/design/remote/images/icon_Remote_Design_Auth_Manager_normal@1x_normal.svg @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/designer-chart/src/main/resources/com/fr/van/chart/map/images/mapData_normal.svg b/designer-chart/src/main/resources/com/fr/van/chart/map/images/mapData_normal.svg index 086e6d9ef5..bbf7baac79 100644 --- a/designer-chart/src/main/resources/com/fr/van/chart/map/images/mapData_normal.svg +++ b/designer-chart/src/main/resources/com/fr/van/chart/map/images/mapData_normal.svg @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/models/SelectionModel.java b/designer-form/src/main/java/com/fr/design/designer/beans/models/SelectionModel.java index f6c74986e0..dc74087c40 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/models/SelectionModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/models/SelectionModel.java @@ -399,8 +399,10 @@ public class SelectionModel { boolean relativeEditor = selectionXCreator.getClass().equals(XWFitLayout.class); //选中的参数面板编辑器本身 boolean parameterEditor = selectionXCreator.getClass().equals(XWParameterLayout.class); + // 选中的是扩展容器布局本身 + boolean extraEditor = isSelectedExtraEditor(selectionXCreator); - return !(tabEditor || absoluteEditor || absoluteCanvas || relativeEditor || parameterEditor); + return !(tabEditor || absoluteEditor || absoluteCanvas || relativeEditor || parameterEditor || extraEditor); } else { return false; } @@ -410,6 +412,16 @@ public class SelectionModel { } } + private boolean isSelectedExtraEditor(XCreator selectionXCreator) { + Set set = ExtraDesignClassManager.getInstance().getArray(FormWidgetOptionProvider.XML_TAG); + for (FormWidgetOptionProvider provider : set) { + if (provider.isContainer() && ComparatorUtils.equals(provider.appearanceForWidget(), selectionXCreator.getClass())) { + return true; + } + } + return false; + } + /** * 是否有组件被选择。如果所选组件是最底层容器，也视为无选择 * diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java index 9d70b7f0a2..da268b0e6c 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java @@ -569,35 +569,6 @@ public class XWAbsoluteLayout extends XLayoutContainer { } } - /** - * 重新调整子组件宽度 - * @param width 宽度 - * @param actualSize 是否按照实际大小计算 - */ - @Override - public void recalculateChildWidth(int width, boolean actualSize){ - int componentCount = getComponentCount(); - for (int i = 0; i < componentCount; i++) { - XCreator creator = (XCreator) getComponent(i); - creator.recalculateChildWidth(width, actualSize); - } - } - - /** - * 重新调整子组件高度 - * @param height 高度 - * @param actualSize 是否按照实际大小计算 - */ - @Override - public void recalculateChildHeight(int height, boolean actualSize){ - int componentCount = getComponentCount(); - for (int i = 0; i < componentCount; i++) { - XCreator creator = (XCreator) getComponent(i); - creator.recalculateChildHeight(height, actualSize); - } - } - - /** * body大小手动调整的时候 * 按照比例调整组件的高度 diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormSelectionUtils.java b/designer-form/src/main/java/com/fr/design/mainframe/FormSelectionUtils.java index c310ee5780..2900650aa0 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormSelectionUtils.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormSelectionUtils.java @@ -1,5 +1,6 @@ package com.fr.design.mainframe; +import com.fr.design.ExtraDesignClassManager; import com.fr.design.designer.beans.LayoutAdapter; import com.fr.design.designer.beans.adapters.layout.AbstractLayoutAdapter; import com.fr.design.designer.beans.adapters.layout.FRTabFitLayoutAdapter; @@ -12,6 +13,7 @@ import com.fr.design.designer.creator.XWFitLayout; import com.fr.design.designer.creator.XWScaleLayout; import com.fr.design.designer.creator.XWTitleLayout; import com.fr.design.designer.creator.cardlayout.XWTabFitLayout; +import com.fr.design.fun.FormWidgetOptionProvider; import com.fr.design.utils.ComponentUtils; import com.fr.form.main.Form; import com.fr.form.ui.Widget; @@ -26,6 +28,7 @@ import java.awt.Toolkit; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Set; /** * 表单选中工具类 @@ -46,6 +49,8 @@ public class FormSelectionUtils { */ private static final String POSTFIX = "_c"; + private static FormWidgetOptionProvider optionProvider; + private FormSelectionUtils() { } @@ -64,10 +69,27 @@ public class FormSelectionUtils { //相对布局 relativePaste(designer, clipboard, adapter, x, y); return; + } else if (isExtraContainer(parent)) { + // 扩展布局 + optionProvider.formWidgetPaste(clipboard, adapter, x, y); + return; } Toolkit.getDefaultToolkit().beep(); } + private static boolean isExtraContainer(XLayoutContainer parent) { + if (parent != null) { + Set set = ExtraDesignClassManager.getInstance().getArray(FormWidgetOptionProvider.XML_TAG); + for (FormWidgetOptionProvider provider : set) { + if (provider.isContainer() && ComparatorUtils.equals(provider.appearanceForWidget(), parent.getClass())) { + optionProvider = provider; + return true; + } + } + } + return false; + } + public static void rebuildSelection(FormDesigner designer) { ArrayList newSelection = new ArrayList<>(); diff --git a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java index c1882270bf..b2827a36ce 100644 --- a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java +++ b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java @@ -261,7 +261,7 @@ public class CellDSColumnEditor extends CellQuickEditor { } //丢掉icon,修改按钮名称为编辑 condition.setSmallIcon(UIConstants.BLACK_ICON); - condition.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit")); + condition.setName(Toolkit.i18nText("Fine-Design_Basic_Edit")); conditionUIButton = new UIButton(condition); Component[][] components = new Component[][]{ new Component[]{uiLabel, UIComponentUtils.wrapWithBorderLayoutPane(conditionUIButton)} diff --git a/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/smallsearch_normal.svg b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/smallsearch_normal.svg index 2bd8d0a15d..673548dfaf 100644 --- a/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/smallsearch_normal.svg +++ b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/smallsearch_normal.svg @@ -4,4 +4,4 @@ - \ No newline at end of file +