diff --git a/build.xml b/build.xml index 7ca05c6..bbb4f22 100644 --- a/build.xml +++ b/build.xml @@ -1,7 +1,7 @@ - + diff --git a/plugin-widget-easyslides10.iml b/plugin-widget-easyslides10.iml index cd779d8..5967a84 100644 --- a/plugin-widget-easyslides10.iml +++ b/plugin-widget-easyslides10.iml @@ -1,35 +1,33 @@ - - - - + + + + - - - - - + + - + - - - + + + - - - - - - - - + + + + + + + + + - - - + + + @@ -52,5 +50,12 @@ + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3f29590..90cda0e 100644 --- a/pom.xml +++ b/pom.xml @@ -10,5 +10,10 @@ jar - plugin-widget-simpleppt10 - \ No newline at end of file + plugin-widget-easyslides10 + + + + ${project.basedir}/../webroot/WEB-INF/plugins/plugin-com.fr.plugin.easyslides10-1.0/classes + + diff --git a/src/main/java/com/fr/plugin/easyslides/CssFileLoader.java b/src/main/java/com/fr/plugin/easyslides/CssFileLoader.java index 5b61bd2..370bd2b 100644 --- a/src/main/java/com/fr/plugin/easyslides/CssFileLoader.java +++ b/src/main/java/com/fr/plugin/easyslides/CssFileLoader.java @@ -5,6 +5,6 @@ import com.fr.stable.fun.impl.AbstractCssFileHandler; public class CssFileLoader extends AbstractCssFileHandler { @Override public String[] pathsForFiles() { - return new String[]{"/com/fr/plugin/easyslides/web/impress-default.css"}; + return new String[]{"/com/fr/plugin/resources/web/impress-default.css"}; } } diff --git a/src/main/java/com/fr/plugin/easyslides/JsFileLoader.java b/src/main/java/com/fr/plugin/easyslides/JsFileLoader.java index 13d1870..8827114 100644 --- a/src/main/java/com/fr/plugin/easyslides/JsFileLoader.java +++ b/src/main/java/com/fr/plugin/easyslides/JsFileLoader.java @@ -15,7 +15,7 @@ public class JsFileLoader extends AbstractJavaScriptFileHandler { public String[] pathsForFiles() { return this.license.isAvailable() ? new String[]{ - "/com/fr/plugin/easyslides/web/widget.js" + "/com/fr/plugin/resources/web/widget.js" } : null; } diff --git a/src/main/java/com/fr/plugin/easyslides/LocaleFinder.java b/src/main/java/com/fr/plugin/easyslides/LocaleFinder.java index ce6642c..c16e23e 100644 --- a/src/main/java/com/fr/plugin/easyslides/LocaleFinder.java +++ b/src/main/java/com/fr/plugin/easyslides/LocaleFinder.java @@ -5,6 +5,6 @@ import com.fr.stable.fun.impl.AbstractLocaleFinder; public class LocaleFinder extends AbstractLocaleFinder { @Override public String find() { - return "com/fr/plugin/easyslides/local/easyslides"; + return "com/fr/plugin/resources/local/easyslides"; } } diff --git a/src/main/java/com/fr/plugin/easyslides/OptionProvider.java b/src/main/java/com/fr/plugin/easyslides/OptionProvider.java index 34bbd31..cfcdd63 100644 --- a/src/main/java/com/fr/plugin/easyslides/OptionProvider.java +++ b/src/main/java/com/fr/plugin/easyslides/OptionProvider.java @@ -10,19 +10,23 @@ import com.fr.plugin.transform.FunctionRecorder; @FunctionRecorder public class OptionProvider extends AbstractFormWidgetOptionProvider { + @Override @ExecuteFunctionRecord public Class classForWidget() { return EasySlidesWidget.class; } + @Override public Class appearanceForWidget() { return EasySlidesWidgetUI.class; } + @Override public String iconPathForWidget() {//图标 - return "com/fr/plugin/easyslides/images/icon.png"; + return "com/fr/plugin/resources/images/icon.png"; } + @Override public String nameForWidget() {//插件名称 return Inter.getLocText("Plugin-EasySlides_Widget"); } diff --git a/src/main/java/com/fr/plugin/easyslides/ui/EasySlidesWidgetUI.java b/src/main/java/com/fr/plugin/easyslides/ui/EasySlidesWidgetUI.java index 842c014..633cca2 100644 --- a/src/main/java/com/fr/plugin/easyslides/ui/EasySlidesWidgetUI.java +++ b/src/main/java/com/fr/plugin/easyslides/ui/EasySlidesWidgetUI.java @@ -9,7 +9,6 @@ import com.fr.design.mainframe.widget.editors.*; import com.fr.form.ui.Widget; import com.fr.general.IOUtils; import com.fr.general.Inter; -import com.fr.plugin.easyslides.ui.SlidesDataSourceEditor; import com.fr.stable.ArrayUtils; import javax.swing.*; @@ -30,7 +29,7 @@ public class EasySlidesWidgetUI extends XWidgetCreator { if (this.editor == null) { this.editor = FRGUIPaneFactory.createBorderLayout_S_Pane(); UILabel label = new UILabel(); - label.setIcon(IOUtils.readIcon("/com/fr/plugin/easyslides/images/display.png")); + label.setIcon(IOUtils.readIcon("/com/fr/plugin/resources/images/display.png")); label.setHorizontalAlignment(0); label.setVerticalAlignment(0); this.editor.add(label, "Center"); @@ -44,7 +43,7 @@ public class EasySlidesWidgetUI extends XWidgetCreator { @Override public String getIconPath() { - return "/com/fr/plugin/easyslides/images/icon.png"; + return "/com/fr/plugin/resources/images/icon.png"; } public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { diff --git a/src/main/java/com/fr/plugin/easyslides/images/display.png b/src/main/resources/com/fr/plugin/resources/images/display.png similarity index 100% rename from src/main/java/com/fr/plugin/easyslides/images/display.png rename to src/main/resources/com/fr/plugin/resources/images/display.png diff --git a/src/main/java/com/fr/plugin/easyslides/images/icon.png b/src/main/resources/com/fr/plugin/resources/images/icon.png similarity index 100% rename from src/main/java/com/fr/plugin/easyslides/images/icon.png rename to src/main/resources/com/fr/plugin/resources/images/icon.png diff --git a/src/main/java/com/fr/plugin/easyslides/local/easyslides.properties b/src/main/resources/com/fr/plugin/resources/local/easyslides.properties similarity index 100% rename from src/main/java/com/fr/plugin/easyslides/local/easyslides.properties rename to src/main/resources/com/fr/plugin/resources/local/easyslides.properties diff --git a/src/main/java/com/fr/plugin/easyslides/local/easyslides_en_US.properties b/src/main/resources/com/fr/plugin/resources/local/easyslides_en_US.properties similarity index 100% rename from src/main/java/com/fr/plugin/easyslides/local/easyslides_en_US.properties rename to src/main/resources/com/fr/plugin/resources/local/easyslides_en_US.properties diff --git a/src/main/java/com/fr/plugin/easyslides/local/easyslides_zh_CN.properties b/src/main/resources/com/fr/plugin/resources/local/easyslides_zh_CN.properties similarity index 100% rename from src/main/java/com/fr/plugin/easyslides/local/easyslides_zh_CN.properties rename to src/main/resources/com/fr/plugin/resources/local/easyslides_zh_CN.properties diff --git a/src/main/java/com/fr/plugin/easyslides/web/3D-rotations.css b/src/main/resources/com/fr/plugin/resources/web/3D-rotations.css similarity index 100% rename from src/main/java/com/fr/plugin/easyslides/web/3D-rotations.css rename to src/main/resources/com/fr/plugin/resources/web/3D-rotations.css diff --git a/src/main/java/com/fr/plugin/easyslides/web/impress-default.css b/src/main/resources/com/fr/plugin/resources/web/impress-default.css similarity index 100% rename from src/main/java/com/fr/plugin/easyslides/web/impress-default.css rename to src/main/resources/com/fr/plugin/resources/web/impress-default.css diff --git a/src/main/java/com/fr/plugin/easyslides/web/impress-main.js b/src/main/resources/com/fr/plugin/resources/web/impress-main.js similarity index 100% rename from src/main/java/com/fr/plugin/easyslides/web/impress-main.js rename to src/main/resources/com/fr/plugin/resources/web/impress-main.js diff --git a/src/main/java/com/fr/plugin/easyslides/web/impress-plugins.js b/src/main/resources/com/fr/plugin/resources/web/impress-plugins.js similarity index 100% rename from src/main/java/com/fr/plugin/easyslides/web/impress-plugins.js rename to src/main/resources/com/fr/plugin/resources/web/impress-plugins.js diff --git a/src/main/java/com/fr/plugin/easyslides/web/impress.js b/src/main/resources/com/fr/plugin/resources/web/impress.js similarity index 100% rename from src/main/java/com/fr/plugin/easyslides/web/impress.js rename to src/main/resources/com/fr/plugin/resources/web/impress.js diff --git a/src/main/java/com/fr/plugin/easyslides/web/widget.js b/src/main/resources/com/fr/plugin/resources/web/widget.js similarity index 92% rename from src/main/java/com/fr/plugin/easyslides/web/widget.js rename to src/main/resources/com/fr/plugin/resources/web/widget.js index 866d4d2..92dcfff 100644 --- a/src/main/java/com/fr/plugin/easyslides/web/widget.js +++ b/src/main/resources/com/fr/plugin/resources/web/widget.js @@ -10,8 +10,8 @@ _init: function () { FR.EasySlides.superclass._init.apply(this, arguments); - FR.$defaultImport('/com/fr/plugin/easyslides/web/impress-main.js', 'js'); - FR.$defaultImport('/com/fr/plugin/easyslides/web/impress-plugins.js', 'js'); + FR.$defaultImport('/com/fr/plugin/resources/web/impress-main.js', 'js'); + FR.$defaultImport('/com/fr/plugin/resources/web/impress-plugins.js', 'js'); var o = this.options; var myWidgetName = o.widgetName; diff --git a/超酷幻灯片/fr-plugin-widget-easyslides-1.0.zip b/超酷幻灯片/fr-plugin-widget-easyslides-1.0.zip index 166382f..3fcb860 100644 Binary files a/超酷幻灯片/fr-plugin-widget-easyslides-1.0.zip and b/超酷幻灯片/fr-plugin-widget-easyslides-1.0.zip differ