Browse Source

Merge branch 'release/9.0' of http://www.finedevelop.com:2015/scm/~kerry/design into release/9.0

master
kerry 7 years ago
parent
commit
1be2b1162e
  1. 2
      designer/src/com/fr/design/actions/ButtonGroupAction.java
  2. 12
      designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java
  3. 2
      designer/src/com/fr/start/Designer.java
  4. 172
      designer_base/src/com/fr/design/DesignerEnvManager.java
  5. 2
      designer_base/src/com/fr/design/actions/server/PlatformManagerAction.java
  6. 2
      designer_base/src/com/fr/design/gui/controlpane/JListControlPane.java
  7. 2
      designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java
  8. 30
      designer_base/src/com/fr/design/gui/core/WidgetOption.java
  9. BIN
      designer_base/src/com/fr/design/images/buttonicon/card_layout_16.png
  10. BIN
      designer_base/src/com/fr/design/images/buttonicon/layout_absolute_new.png
  11. BIN
      designer_base/src/com/fr/design/images/buttonicon/list_pressed.png
  12. BIN
      designer_base/src/com/fr/design/images/buttonicon/new_form3.png
  13. BIN
      designer_base/src/com/fr/design/images/buttonicon/report_16.png
  14. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/button_16.png
  15. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/button_group_16.png
  16. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/check_box_16.png
  17. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/checkbox_group_16.png
  18. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/combo_box_16.png
  19. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/combo_check_16.png
  20. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/comboboxtree.png
  21. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/date_16.png
  22. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/files_up.png
  23. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/label_16.png
  24. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/number_field_16.png
  25. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/password_field_16.png
  26. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/text_area_16.png
  27. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/text_field_16.png
  28. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/tree_16.png
  29. BIN
      designer_base/src/com/fr/design/images/control/sortAsc.png
  30. BIN
      designer_base/src/com/fr/design/images/data/source/dataDictionary.png
  31. BIN
      designer_base/src/com/fr/design/images/expand/cellAttr.gif
  32. BIN
      designer_base/src/com/fr/design/images/gui/color/foreground.png
  33. BIN
      designer_base/src/com/fr/design/images/gui/color/foreground2.png
  34. BIN
      designer_base/src/com/fr/design/images/lookandfeel/FileIcon.png
  35. BIN
      designer_base/src/com/fr/design/images/m_edit/redo.png
  36. BIN
      designer_base/src/com/fr/design/images/m_edit/undo.png
  37. BIN
      designer_base/src/com/fr/design/images/m_file/excel.png
  38. BIN
      designer_base/src/com/fr/design/images/m_file/export.png
  39. BIN
      designer_base/src/com/fr/design/images/m_file/pageSetup.png
  40. BIN
      designer_base/src/com/fr/design/images/m_file/save.png
  41. BIN
      designer_base/src/com/fr/design/images/m_format/cellAttr.png
  42. BIN
      designer_base/src/com/fr/design/images/m_format/highlight.png
  43. BIN
      designer_base/src/com/fr/design/images/m_insert/chart.png
  44. BIN
      designer_base/src/com/fr/design/images/m_insert/float.png
  45. BIN
      designer_base/src/com/fr/design/images/m_insert/floatPop.png
  46. BIN
      designer_base/src/com/fr/design/images/m_insert/hyperLink.png
  47. BIN
      designer_base/src/com/fr/design/images/m_insert/insertRow.png
  48. BIN
      designer_base/src/com/fr/design/images/m_insert/subReport.png
  49. BIN
      designer_base/src/com/fr/design/images/m_report/allow_authority_edit.png
  50. BIN
      designer_base/src/com/fr/design/images/m_report/exportAttr.png
  51. BIN
      designer_base/src/com/fr/design/images/m_report/p.png
  52. BIN
      designer_base/src/com/fr/design/images/m_report/reportEngineAttr.png
  53. BIN
      designer_base/src/com/fr/design/images/m_web/datasource.png
  54. BIN
      designer_base/src/com/fr/design/images/m_web/edit.png
  55. BIN
      designer_base/src/com/fr/design/images/m_web/function.png
  56. BIN
      designer_base/src/com/fr/design/images/m_web/style.png
  57. BIN
      designer_base/src/com/fr/design/images/server/platform_16_16.png
  58. 13
      designer_base/src/com/fr/start/BaseDesigner.java
  59. 5
      designer_chart/src/com/fr/plugin/chart/map/server/ChartMapEditorAction.java
  60. BIN
      designer_form/src/com/fr/design/form/images/delete icon.png
  61. BIN
      designer_form/src/com/fr/design/form/images/download icon.png
  62. BIN
      designer_form/src/com/fr/design/form/images/install icon.png
  63. BIN
      designer_form/src/com/fr/design/form/images/refresh.png
  64. 108
      designer_form/src/com/fr/design/gui/core/FormWidgetOption.java
  65. 14
      designer_form/src/com/fr/design/mainframe/JForm.java
  66. 2
      designer_form/src/com/fr/design/mainframe/actions/NewFormAction.java

2
designer/src/com/fr/design/actions/ButtonGroupAction.java

@ -36,7 +36,7 @@ public abstract class ButtonGroupAction extends ElementCaseAction{
break;
}
}
if(value == -1 && createToolBarComponent().hasClick()) {
if(createToolBarComponent().hasClick()) {
index = getSelectedIndex();
createToolBarComponent().setClickState(false);
}

12
designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java

@ -29,6 +29,8 @@ public class ErrorInfoUploader {
private static ErrorInfoUploader collector;
private static boolean licSupport = true;
// 在一台不能上网的电脑里发现了10w个errorinfo...
private static final int MAX_ERROR_SIZE = 2000;
static {
GeneralContext.addEnvChangedListener(new EnvChangedListener() {
@ -123,6 +125,11 @@ public class ErrorInfoUploader {
}
File[] files = folder.listFiles();
if (files.length > MAX_ERROR_SIZE) {
StableUtils.deleteFile(folder);
return;
}
try {
for (File file : files) {
String filePath = file.getPath();
@ -131,6 +138,11 @@ public class ErrorInfoUploader {
if (suffix.endsWith(SUFFIX)) {
Thread.sleep(1000L);
String content = IOUtils.inputStream2String(new FileInputStream(file));
if (content.length() > MAX_ERROR_SIZE) {
file.delete();
continue;
}
String url = SiteCenter.getInstance().acquireUrlByKind("design.error");
if (sendErroInfo(url, content)) {
file.delete();

2
designer/src/com/fr/start/Designer.java

@ -365,7 +365,7 @@ public class Designer extends BaseDesigner {
*/
protected void collectUserInformation() {
//定制的就不弹出来了
if (!ComparatorUtils.equals(ProductConstants.APP_NAME, ProductConstants.DEFAULT_APPNAME)) {
if (!ComparatorUtils.equals(ProductConstants.APP_NAME, ProductConstants.DEFAULT_APP_NAME)) {
return;
}

172
designer_base/src/com/fr/design/DesignerEnvManager.java

@ -13,22 +13,47 @@ import com.fr.design.constants.UIConstants;
import com.fr.env.RemoteEnv;
import com.fr.env.SignIn;
import com.fr.file.FILEFactory;
import com.fr.general.*;
import com.fr.stable.*;
import com.fr.general.ComparatorUtils;
import com.fr.general.FRLevel;
import com.fr.general.FRLogFormatter;
import com.fr.general.FRLogger;
import com.fr.general.GeneralContext;
import com.fr.general.IOUtils;
import com.fr.general.Inter;
import com.fr.stable.Constants;
import com.fr.stable.EnvChangedListener;
import com.fr.stable.ListMap;
import com.fr.stable.ProductConstants;
import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils;
import com.fr.stable.core.UUID;
import com.fr.stable.project.ProjectConstants;
import com.fr.stable.xml.*;
import com.fr.stable.xml.XMLPrintWriter;
import com.fr.stable.xml.XMLReadable;
import com.fr.stable.xml.XMLTools;
import com.fr.stable.xml.XMLWriter;
import com.fr.stable.xml.XMLableReader;
import org.apache.log4j.Level;
import javax.swing.*;
import javax.swing.SwingWorker.StateValue;
import java.awt.*;
import java.io.*;
import java.util.*;
import java.io.File;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.OutputStream;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.logging.FileHandler;
import java.util.logging.Handler;
import org.apache.log4j.Level;
/**
* The manager of Designer GUI.
@ -36,6 +61,7 @@ import org.apache.log4j.Level;
public class DesignerEnvManager implements XMLReadable, XMLWriter {
private static final int MAX_SHOW_NUM = 10;
private static final String VERSION_80 = "80";
private static DesignerEnvManager designerEnvManager; // gui.
private String activationKey = null;
@ -145,19 +171,19 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
designerEnvManager.setCurEnvName(name);
}
}
GeneralContext.addEnvChangedListener(new EnvChangedListener() {
@Override
public void envChanged() {
designerEnvManager.setCurrentDirectoryPrefix(FILEFactory.ENV_PREFIX);
designerEnvManager.setDialogCurrentDirectory(ProjectConstants.REPORTLETS_NAME);
}
});
}
return designerEnvManager;
}
@ -219,9 +245,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
calender.setTimeInMillis(System.currentTimeMillis());
String today = calender.get(Calendar.YEAR) + "-" + (calender.get(Calendar.MONTH) + 1) + "-" + calender.get(Calendar.DAY_OF_MONTH);
String fileName = StableUtils.pathJoin(new String[]{
logLocation, "fr_" + today + "_%g.log"
});
String fileName = StableUtils.pathJoin(logLocation, "fr_" + today + "_%g.log");
if (!new java.io.File(fileName).exists()) {
StableUtils.makesureFileExist(new java.io.File(fileName));
}
@ -253,11 +277,14 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
try {
FileWriter fileWriter = new FileWriter(envFile);
File oldEnvFile = new File(ProductConstants.getEnvHome() + File.separator + ProductConstants.APP_NAME + "6-1" + "Env.xml");
File envFile80 = new File(getEnvHome(VERSION_80) + File.separator + getEnvFile().getName());
if (oldEnvFile.exists()) {
// marks:兼容DesignerEnv6-1.xml
FileReader fileReader = new FileReader(oldEnvFile);
Utils.copyCharTo(fileReader, fileWriter);
fileReader.close();
} else if (envFile80.exists()) {
compatibilityPrevVersion(envFile80);
} else {
// marks:生成一个新的xml文件
StringReader stringReader = new StringReader("<?xml version=\"1.0\" encoding=\"UTF-8\" ?><Env></Env>");
@ -270,6 +297,33 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
}
}
private static String getEnvHome(String version) {
String userHome = System.getProperty("user.home");
if (userHome == null) {
userHome = System.getProperty("userHome");
}
File envHome = new File(userHome + File.separator + "." + ProductConstants.APP_NAME + version);
if (!envHome.exists()) {
StableUtils.mkdirs(envHome);
}
return envHome.getAbsolutePath();
}
private void compatibilityPrevVersion(File prevEnvFile) {
try {
XMLTools.readFileXML(designerEnvManager, prevEnvFile);
} catch (Exception e) {
FRContext.getLogger().error(e.getMessage(), e);
}
// 清空前一个版本中的工作目录和最近打开
nameEnvMap = new ListMap<String, Env>();
recentOpenedFilePathList = new ArrayList<String>();
curEnvName = null;
designerEnvManager.saveXMLFile();
}
public static void setEnvFile(File envFile) {
DesignerEnvManager.envFile = envFile;
}
@ -285,6 +339,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
/**
* 是否启用了https
*
* @return 同上
*/
public boolean isHttps() {
@ -311,7 +366,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
return certificatePass;
}
public void setCertificatePass(String certificatePass){
public void setCertificatePass(String certificatePass) {
this.certificatePass = certificatePass;
}
@ -531,13 +586,13 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
this.reportLengthUnit = reportLengthUnit;
}
private void writeTempFile(File tempFile){
try{
private void writeTempFile(File tempFile) {
try {
OutputStream fout = new FileOutputStream(tempFile);
XMLTools.writeOutputStreamXML(this, fout);
fout.flush();
fout.close();
}catch (Exception e) {
} catch (Exception e) {
FRContext.getLogger().error(e.getMessage());
}
}
@ -546,9 +601,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
* 保存设计器的配置文件, 该文件不在env的resource目录下
* 而是在Consts.getEnvHome() + File.separator + Consts.APP_NAME
*
*
* @date 2014-9-29-上午11:04:23
*
*/
public void saveXMLFile() {
File xmlFile = this.getDesignerEnvFile();
@ -577,7 +630,6 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
* 是否加入产品改良
*
* @return 是否加入产品改良
*
*/
public boolean isJoinProductImprove() {
return joinProductImprove;
@ -585,7 +637,6 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
/**
* 设置加入产品改良
*
*/
public void setJoinProductImprove(boolean joinProductImprove) {
this.joinProductImprove = joinProductImprove;
@ -1155,63 +1206,63 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
this.lastShowBBSNewsTime = lastShowBBSNewsTime;
}
private void readXMLVersion(XMLableReader reader){
private void readXMLVersion(XMLableReader reader) {
String tmpVal;
if ((tmpVal = reader.getElementValue()) != null) {
reader.setXmlVersionByString(tmpVal);
}
}
private void readActiveKey(XMLableReader reader){
private void readActiveKey(XMLableReader reader) {
String tmpVal;
if ((tmpVal = reader.getElementValue()) != null) {
this.setActivationKey(tmpVal);
}
}
private void readLogLocation(XMLableReader reader){
private void readLogLocation(XMLableReader reader) {
String tmpVal;
if ((tmpVal = reader.getElementValue()) != null) {
this.setLogLocation(tmpVal);
}
}
private void readLanguage(XMLableReader reader){
private void readLanguage(XMLableReader reader) {
String tmpVal;
if ((tmpVal = reader.getElementValue()) != null) {
this.setLanguage(Integer.parseInt(tmpVal));
}
}
private void readJettyPort(XMLableReader reader){
private void readJettyPort(XMLableReader reader) {
String tmpVal;
if ((tmpVal = reader.getElementValue()) != null) {
this.setJettyServerPort(Integer.parseInt(tmpVal));
}
}
private void readPageLengthUnit(XMLableReader reader){
private void readPageLengthUnit(XMLableReader reader) {
String tmpVal;
if (StringUtils.isNotBlank(tmpVal = reader.getElementValue())) {
this.pageLengthUnit = Short.parseShort(tmpVal);
}
}
private void readReportLengthUnit(XMLableReader reader){
private void readReportLengthUnit(XMLableReader reader) {
String tmpVal;
if (StringUtils.isNotBlank(tmpVal = reader.getElementValue())) {
this.reportLengthUnit = Short.parseShort(tmpVal);
}
}
private void readLastOpenFile(XMLableReader reader){
private void readLastOpenFile(XMLableReader reader) {
String tmpVal;
if (StringUtils.isNotBlank(tmpVal = reader.getElementValue())) {
this.lastOpenFilePath = tmpVal;
}
}
private void readEncrytionKey(XMLableReader reader){
private void readEncrytionKey(XMLableReader reader) {
String tmpVal;
if (StringUtils.isNotBlank(tmpVal = reader.getElementValue())) {
this.encryptionKey = tmpVal;
@ -1219,15 +1270,14 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
}
private void readLastBBSTime(XMLableReader reader){
private void readLastBBSTime(XMLableReader reader) {
String tmpVal;
if (StringUtils.isNotBlank(tmpVal = reader.getElementValue())) {
this.lastShowBBSTime = tmpVal;
}
}
private void readLastBBSNewsTime(XMLableReader reader){
private void readLastBBSNewsTime(XMLableReader reader) {
String tmpVal;
if (StringUtils.isNotBlank(tmpVal = reader.getElementValue())) {
this.lastShowBBSNewsTime = tmpVal;
@ -1275,15 +1325,15 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
readEncrytionKey(reader);
} else if ("jdkHome".equals(name)) {
this.jdkHome = reader.getElementValue();
}else if ("lastBBSTime".equals(name)){
} else if ("lastBBSTime".equals(name)) {
readLastBBSTime(reader);
} else if ("lastBBSNewsTime".equals(name)){
} else if ("lastBBSNewsTime".equals(name)) {
readLastBBSNewsTime(reader);
}else if ("uuid".equals(name)){
} else if ("uuid".equals(name)) {
readUUID(reader);
} else if ("status".equals(name)){
} else if ("status".equals(name)) {
readActiveStatus(reader);
} else if (ComparatorUtils.equals(CAS_PARAS,name)){
} else if (ComparatorUtils.equals(CAS_PARAS, name)) {
readHttpsParas(reader);
} else if (name.equals("AlphaFineConfigManager")) {
readAlphaFineAttr(reader);
@ -1297,12 +1347,12 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
reader.readXMLObject(this.alphaFineConfigManager = new AlphaFineConfigManager());
}
private void readHttpsParas(XMLableReader reader){
private void readHttpsParas(XMLableReader reader) {
String tempVal;
if((tempVal = reader.getAttrAsString(CAS_CERTIFICATE_PATH, null)) != null){
if ((tempVal = reader.getAttrAsString(CAS_CERTIFICATE_PATH, null)) != null) {
this.setCertificatePath(tempVal);
}
if((tempVal = reader.getAttrAsString(CAS_CERTIFICATE_PASSWORD, null)) != null){
if ((tempVal = reader.getAttrAsString(CAS_CERTIFICATE_PASSWORD, null)) != null) {
this.setCertificatePass(tempVal);
}
@ -1429,18 +1479,6 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
}
}
});
// xml读完之后,看一下nameEnvMap是不是长度为0
if (nameEnvMap.isEmpty() && StableUtils.getInstallHome() != null) {
String install_home = StableUtils.getInstallHome();
if (install_home != null && new java.io.File(install_home).exists()) {
nameEnvMap.put("Default", LocalEnv.createEnv(StableUtils.pathJoin(new String[]{
install_home, ProjectConstants.WEBAPP_NAME, ProjectConstants.WEBINF_NAME
})));
curEnvName = "Default";
}
}
}
private void readRecentOpenFileList(XMLableReader reader) {
@ -1519,14 +1557,14 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
}
//写入uuid
private void writeUUID(XMLPrintWriter writer){
private void writeUUID(XMLPrintWriter writer) {
writer.startTAG("uuid");
writer.textNode(getUUID());
writer.end();
}
//读取uuid
private void readUUID(XMLableReader reader){
private void readUUID(XMLableReader reader) {
String tmpVal;
if (StringUtils.isNotBlank(tmpVal = reader.getElementValue())) {
this.uuid = tmpVal;
@ -1534,8 +1572,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
}
//写入激活状态
private void writeActiveStatus(XMLPrintWriter writer){
if (this.activeKeyStatus == 0){
private void writeActiveStatus(XMLPrintWriter writer) {
if (this.activeKeyStatus == 0) {
writer.startTAG("status");
writer.textNode(this.activeKeyStatus + "");
writer.end();
@ -1543,7 +1581,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
}
//读取激活状态
private void readActiveStatus(XMLableReader reader){
private void readActiveStatus(XMLableReader reader) {
String tmpVal;
if (StringUtils.isNotBlank(tmpVal = reader.getElementValue())) {
this.activeKeyStatus = Integer.parseInt(tmpVal);
@ -1596,7 +1634,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
if (!this.isOracleSystemSpace()) {
writer.attr("useOracleSystemSpace", this.isOracleSystemSpace());
}
if (!this.isJoinProductImprove()){
if (!this.isJoinProductImprove()) {
writer.attr("joinProductImprove", this.isJoinProductImprove());
}
if (!this.isAutoBackUp()) {
@ -1681,29 +1719,29 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
}
//写论坛相关的两个属性
private void writeBBSRelated(XMLPrintWriter writer){
if (StringUtils.isNotEmpty(this.lastShowBBSTime)){
private void writeBBSRelated(XMLPrintWriter writer) {
if (StringUtils.isNotEmpty(this.lastShowBBSTime)) {
writer.startTAG("lastBBSTime");
writer.textNode(lastShowBBSTime);
writer.end();
}
if (StringUtils.isNotEmpty(this.lastShowBBSNewsTime)){
if (StringUtils.isNotEmpty(this.lastShowBBSNewsTime)) {
writer.startTAG("lastBBSNewsTime");
writer.textNode(lastShowBBSNewsTime);
writer.end();
}
}
private void writeHttpsParas(XMLPrintWriter writer){
private void writeHttpsParas(XMLPrintWriter writer) {
writer.startTAG(CAS_PARAS);
if(StringUtils.isNotBlank(certificatePath)){
if (StringUtils.isNotBlank(certificatePath)) {
writer.attr(CAS_CERTIFICATE_PATH, certificatePath);
}
if(StringUtils.isNotBlank(certificatePass)){
if (StringUtils.isNotBlank(certificatePass)) {
writer.attr(CAS_CERTIFICATE_PASSWORD, certificatePass);
}
if(isHttps){
if (isHttps) {
writer.attr("enable", true);
}
writer.end();
@ -1736,7 +1774,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
if (env == null) {
return;
}
writer.startTAG("Env");
writer.classAttr(env.getClass());
writer.attr("name", name);

2
designer_base/src/com/fr/design/actions/server/PlatformManagerAction.java

@ -15,7 +15,7 @@ public class PlatformManagerAction extends UpdateAction {
this.setMenuKeySet(PLATEFORM_MANAGER);
this.setName(getMenuKeySet().getMenuKeySetName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/web/images/platform/platform_16_16.png"));
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/server/platform_16_16.png"));
}
/**

2
designer_base/src/com/fr/design/gui/controlpane/JListControlPane.java

@ -451,7 +451,7 @@ public abstract class JListControlPane extends JControlPane {
this.setName(Inter.getLocText("FR-Action_Copy"));
this.setMnemonic('C');
this.setSmallIcon(BaseUtils
.readIcon("/com/fr/base/images/cell/control/copy.png"));
.readIcon("/com/fr/design/images/m_edit/copy.png"));
}
@Override

2
designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java

@ -601,7 +601,7 @@ public abstract class UIListControlPane extends UIControlPane {
this.setName(Inter.getLocText("FR-Action_Copy"));
this.setMnemonic('C');
this.setSmallIcon(BaseUtils
.readIcon("/com/fr/base/images/cell/control/copy.png"));
.readIcon("/com/fr/design/images/m_edit/copy.png"));
}
@Override

30
designer_base/src/com/fr/design/gui/core/WidgetOption.java

@ -127,27 +127,27 @@ public abstract class WidgetOption implements Serializable {
}
public static final WidgetOption DATEEDITOR = WidgetOptionFactory.createByWidgetClass(Inter.getLocText(new String[]{"Date", "Widget"}),
BaseUtils.readIcon("/com/fr/web/images/form/resources/date_16.png"),
BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/date_16.png"),
DateEditor.class);
public static final WidgetOption TREE = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("Form-View_Tree"),
BaseUtils.readIcon("/com/fr/web/images/form/resources/tree_16.png"), TreeEditor.class);
BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/tree_16.png"), TreeEditor.class);
public static final WidgetOption TREECOMBOBOX = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer_Tree-ComboBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/comboboxtree.png"),
public static final WidgetOption TREECOMBOBOX = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer_Tree-ComboBox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/comboboxtree.png"),
TreeComboBoxEditor.class);
public static final WidgetOption CHECKBOXGROUP = WidgetOptionFactory.createByWidgetClass(
Inter.getLocText(new String[]{"Form-CheckBoxGroup", "Widget"}), BaseUtils.readIcon("/com/fr/web/images/form/resources/checkbox_group_16.png"), CheckBoxGroup.class);
Inter.getLocText(new String[]{"Form-CheckBoxGroup", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/checkbox_group_16.png"), CheckBoxGroup.class);
public static final WidgetOption RADIOGROUP = WidgetOptionFactory.createByWidgetClass(
Inter.getLocText(new String[]{"Form-RadioGroup", "Widget"}), BaseUtils.readIcon("/com/fr/web/images/form/resources/button_group_16.png"),
Inter.getLocText(new String[]{"Form-RadioGroup", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_group_16.png"),
RadioGroup.class);
public static final WidgetOption NUMBEREDITOR = WidgetOptionFactory.createByWidgetClass(
Inter.getLocText(new String[]{"Number", "Widget"}), BaseUtils.readIcon("/com/fr/web/images/form/resources/number_field_16.png"), NumberEditor.class);
Inter.getLocText(new String[]{"Number", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/number_field_16.png"), NumberEditor.class);
public static final WidgetOption LABEL = WidgetOptionFactory.createByWidgetClass(
Inter.getLocText(new String[]{"Label", "Widget"}), BaseUtils.readIcon("/com/fr/web/images/form/resources/label_16.png"),
Inter.getLocText(new String[]{"Label", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/label_16.png"),
Label.class);
public static final WidgetOption BUTTON = WidgetOptionFactory.createByWidgetClass(
@ -155,23 +155,23 @@ public abstract class WidgetOption implements Serializable {
Button.class);
public static final WidgetOption FREEBUTTON = WidgetOptionFactory.createByWidgetClass(
Inter.getLocText(new String[]{"Form-Button", "Widget"}), BaseUtils.readIcon("/com/fr/web/images/form/resources/button_16.png"),
Inter.getLocText(new String[]{"Form-Button", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_16.png"),
FreeButton.class);
public static final WidgetOption MULTI_FILEEDITOR = WidgetOptionFactory.createByWidgetClass(
Inter.getLocText(new String[]{"File", "Widget"}), BaseUtils.readIcon("/com/fr/web/images/form/resources/files_up.png"),
Inter.getLocText(new String[]{"File", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/files_up.png"),
MultiFileEditor.class);
public static final WidgetOption COMBOBOX = WidgetOptionFactory.createByWidgetClass(
Inter.getLocText(new String[]{"Form-ComboBox", "Widget"}), BaseUtils.readIcon("/com/fr/web/images/form/resources/combo_box_16.png"),
Inter.getLocText(new String[]{"Form-ComboBox", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_box_16.png"),
ComboBox.class);
public static final WidgetOption COMBOCHECKBOX = WidgetOptionFactory.createByWidgetClass(
Inter.getLocText(new String[]{"Form-ComboCheckBox", "Widget"}), BaseUtils.readIcon("/com/fr/web/images/form/resources/combo_check_16.png"),
Inter.getLocText(new String[]{"Form-ComboCheckBox", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_check_16.png"),
ComboCheckBox.class);
public static final WidgetOption CHECKBOX = WidgetOptionFactory.createByWidgetClass(
Inter.getLocText(new String[]{"Form-CheckBox", "Widget"}), BaseUtils.readIcon("/com/fr/web/images/form/resources/check_box_16.png"),
Inter.getLocText(new String[]{"Form-CheckBox", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/check_box_16.png"),
CheckBox.class);
public static final WidgetOption LIST = WidgetOptionFactory.createByWidgetClass(
@ -183,16 +183,16 @@ public abstract class WidgetOption implements Serializable {
TableTree.class);
public static final WidgetOption TEXTEDITOR = WidgetOptionFactory.createByWidgetClass(Inter.getLocText(new String[]{"Text", "Widget"})
, BaseUtils.readIcon("/com/fr/web/images/form/resources/text_field_16.png"),
, BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/text_field_16.png"),
TextEditor.class);
public static final WidgetOption TEXTAREA = WidgetOptionFactory.createByWidgetClass(
Inter.getLocText(new String[]{"Form-TextArea", "Widget"}), BaseUtils.readIcon("/com/fr/web/images/form/resources/text_area_16.png"),
Inter.getLocText(new String[]{"Form-TextArea", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/text_area_16.png"),
TextArea.class);
public static final WidgetOption PASSWORD = WidgetOptionFactory.createByWidgetClass(
Inter.getLocText(new String[]{"Form-Password", "Widget"}),
BaseUtils.readIcon("/com/fr/web/images/form/resources/password_field_16.png"), Password.class);
BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/password_field_16.png"), Password.class);
public static final WidgetOption IFRAMEDITOR = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer_Form-Iframe"), BaseUtils.readIcon("/com/fr/web/images/form/resources/iframe_16.png"),
IframeEditor.class);

BIN
designer_base/src/com/fr/design/images/buttonicon/card_layout_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 148 B

BIN
designer_base/src/com/fr/design/images/buttonicon/layout_absolute_new.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 138 B

BIN
designer_base/src/com/fr/design/images/buttonicon/list_pressed.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 296 B

BIN
designer_base/src/com/fr/design/images/buttonicon/new_form3.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 278 B

BIN
designer_base/src/com/fr/design/images/buttonicon/report_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 155 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/button_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 121 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/button_group_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 280 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/check_box_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 264 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/checkbox_group_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 263 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/combo_box_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 211 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/combo_check_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 212 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/comboboxtree.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 204 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/date_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 191 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/files_up.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 709 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/label_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 359 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/number_field_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 401 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/password_field_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 306 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/text_area_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 365 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/text_field_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 113 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/tree_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 225 B

BIN
designer_base/src/com/fr/design/images/control/sortAsc.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 404 B

After

Width:  |  Height:  |  Size: 345 B

BIN
designer_base/src/com/fr/design/images/data/source/dataDictionary.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 216 B

After

Width:  |  Height:  |  Size: 167 B

BIN
designer_base/src/com/fr/design/images/expand/cellAttr.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 254 B

After

Width:  |  Height:  |  Size: 207 B

BIN
designer_base/src/com/fr/design/images/gui/color/foreground.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
designer_base/src/com/fr/design/images/gui/color/foreground2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
designer_base/src/com/fr/design/images/lookandfeel/FileIcon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 232 B

BIN
designer_base/src/com/fr/design/images/m_edit/redo.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 318 B

After

Width:  |  Height:  |  Size: 421 B

BIN
designer_base/src/com/fr/design/images/m_edit/undo.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 343 B

After

Width:  |  Height:  |  Size: 450 B

BIN
designer_base/src/com/fr/design/images/m_file/excel.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 372 B

After

Width:  |  Height:  |  Size: 339 B

BIN
designer_base/src/com/fr/design/images/m_file/export.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 287 B

After

Width:  |  Height:  |  Size: 362 B

BIN
designer_base/src/com/fr/design/images/m_file/pageSetup.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 203 B

After

Width:  |  Height:  |  Size: 204 B

BIN
designer_base/src/com/fr/design/images/m_file/save.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 218 B

After

Width:  |  Height:  |  Size: 228 B

BIN
designer_base/src/com/fr/design/images/m_format/cellAttr.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 453 B

BIN
designer_base/src/com/fr/design/images/m_format/highlight.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 399 B

After

Width:  |  Height:  |  Size: 352 B

BIN
designer_base/src/com/fr/design/images/m_insert/chart.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 151 B

After

Width:  |  Height:  |  Size: 135 B

BIN
designer_base/src/com/fr/design/images/m_insert/float.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 186 B

After

Width:  |  Height:  |  Size: 143 B

BIN
designer_base/src/com/fr/design/images/m_insert/floatPop.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 222 B

After

Width:  |  Height:  |  Size: 236 B

BIN
designer_base/src/com/fr/design/images/m_insert/hyperLink.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 686 B

After

Width:  |  Height:  |  Size: 740 B

BIN
designer_base/src/com/fr/design/images/m_insert/insertRow.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 303 B

After

Width:  |  Height:  |  Size: 276 B

BIN
designer_base/src/com/fr/design/images/m_insert/subReport.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 279 B

After

Width:  |  Height:  |  Size: 279 B

BIN
designer_base/src/com/fr/design/images/m_report/allow_authority_edit.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 334 B

After

Width:  |  Height:  |  Size: 370 B

BIN
designer_base/src/com/fr/design/images/m_report/exportAttr.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 287 B

After

Width:  |  Height:  |  Size: 362 B

BIN
designer_base/src/com/fr/design/images/m_report/p.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 303 B

BIN
designer_base/src/com/fr/design/images/m_report/reportEngineAttr.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 452 B

After

Width:  |  Height:  |  Size: 413 B

BIN
designer_base/src/com/fr/design/images/m_web/datasource.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 335 B

After

Width:  |  Height:  |  Size: 440 B

BIN
designer_base/src/com/fr/design/images/m_web/edit.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 503 B

After

Width:  |  Height:  |  Size: 372 B

BIN
designer_base/src/com/fr/design/images/m_web/function.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 256 B

After

Width:  |  Height:  |  Size: 191 B

BIN
designer_base/src/com/fr/design/images/m_web/style.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 374 B

After

Width:  |  Height:  |  Size: 477 B

BIN
designer_base/src/com/fr/design/images/server/platform_16_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 605 B

13
designer_base/src/com/fr/start/BaseDesigner.java

@ -59,11 +59,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
private Timer timer;
public BaseDesigner(String[] args) {
BuildContext.setBuildFilePath(buildPropertiesPath());
if (isDebug()) {
setDebugEnv();
}
RestartHelper.deleteRecordFilesWhenStart();
//初始化插件引擎
PluginStartup.start();
@ -71,7 +67,12 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
PluginConversionModule.getInstance().markDesignerStart();
SiteCenter.getInstance();
DesignUtils.setPort(getStartPort());
BuildContext.setBuildFilePath(buildPropertiesPath());
if (isDebug()) {
setDebugEnv();
} else {
DesignUtils.setPort(getStartPort());
}
// 如果端口被占用了 说明程序已经运行了一次,也就是说,已经建立一个监听服务器,现在只要给服务器发送命令就好了
if (DesignUtils.isStarted()) {
DesignUtils.clientSend(args);
@ -99,7 +100,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
DesignUtils.initLookAndFeel();
DesignUtils.creatListeningServer(getStartPort(), startFileSuffix());
// 初始化Log Handler
DesignerEnvManager.loadLogSetting();
DesignerFrame df = createDesignerFrame();

5
designer_chart/src/com/fr/plugin/chart/map/server/ChartMapEditorAction.java

@ -1,6 +1,8 @@
package com.fr.plugin.chart.map.server;
import com.fr.base.ConfigManager;
import com.fr.base.Env;
import com.fr.base.FRContext;
import com.fr.design.DesignerEnvManager;
import com.fr.design.actions.UpdateAction;
import com.fr.general.GeneralContext;
@ -24,7 +26,8 @@ public class ChartMapEditorAction extends UpdateAction {
int port = DesignerEnvManager.getEnvManager().getJettyServerPort();
String web = GeneralContext.getCurrentAppNameOfEnv();
String serverlet = ConfigManager.getProviderInstance().getServletMapping();
StartServer.browserURLWithLocalEnv(String.format("http://localhost:%d/%s/%s?op=map", port, web, serverlet));
Env env = FRContext.getCurrentEnv();
StartServer.browserURLWithLocalEnv(env.isLocalEnv() ? String.format("http://localhost:%d/%s/%s?op=map", port, web, serverlet) : env.getPath() + "?op=map");
}
}

BIN
designer_form/src/com/fr/design/form/images/delete icon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 232 B

After

Width:  |  Height:  |  Size: 167 B

BIN
designer_form/src/com/fr/design/form/images/download icon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 706 B

After

Width:  |  Height:  |  Size: 336 B

BIN
designer_form/src/com/fr/design/form/images/install icon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 705 B

After

Width:  |  Height:  |  Size: 453 B

BIN
designer_form/src/com/fr/design/form/images/refresh.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 474 B

After

Width:  |  Height:  |  Size: 606 B

108
designer_form/src/com/fr/design/gui/core/FormWidgetOption.java

@ -1 +1,107 @@
package com.fr.design.gui.core; import javax.swing.Icon; import com.fr.base.BaseUtils; import com.fr.form.ui.ElementCaseEditor; import com.fr.form.ui.Widget; import com.fr.form.ui.container.WAbsoluteLayout; import com.fr.form.ui.container.WBorderLayout; import com.fr.form.ui.container.WCardLayout; import com.fr.form.ui.container.WFitLayout; import com.fr.form.ui.container.WHorizontalBoxLayout; import com.fr.form.ui.container.WParameterLayout; import com.fr.form.ui.container.WVerticalBoxLayout; import com.fr.general.Inter; /** * Author : Shockway * Date: 13-6-17 * Time: 上午10:40 */ public class FormWidgetOption extends WidgetOption { /** * 返回名字 * @return 名字 */ @Override public String optionName() { return null; } /** * 返回图标 * @return 图标 */ @Override public Icon optionIcon() { return null; } /** * 组件类 * @return 类 */ @Override public Class<? extends Widget> widgetClass() { return null; } /** * 返回组件 * @return 控件 */ @Override public Widget createWidget() { return null; } /* * 表单容器 */ public static WidgetOption[] getFormContainerInstance() { return new WidgetOption[] { ABSOLUTELAYOUTCONTAINER, BORDERLAYOUTCONTAINER, HORIZONTALBOXLAYOUTCONTAINER, VERTICALBOXLAYOUTCONTAINER, CARDLAYOUTCONTAINER, FITLAYOUTCONTAINER }; } /** * 表单工具栏上的布局 * @return 控件 */ public static WidgetOption[] getFormLayoutInstance() { return new WidgetOption[] {CARDLAYOUTCONTAINER, ABSOLUTELAYOUTCONTAINER}; } public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Layout_Block_Absolute"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_absolute_new.png"), WAbsoluteLayout.class); public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_BorderLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"), WBorderLayout.class); public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Layout_Block_Tab"), BaseUtils.readIcon("/com/fr/web/images/form/resources/card_layout_16.png"), WCardLayout.class); public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Layout-HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"), WHorizontalBoxLayout.class); public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_VerticalBoxLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WVerticalBoxLayout.class); public static final WidgetOption FITLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer-Layout_Adaptive_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WFitLayout.class); public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Para-Body"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter.png"), WParameterLayout.class); public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Form-Report"), BaseUtils.readIcon("/com/fr/web/images/form/resources/report_16.png"), ElementCaseEditor.class); }
package com.fr.design.gui.core;
import javax.swing.Icon;
import com.fr.base.BaseUtils;
import com.fr.form.ui.ElementCaseEditor;
import com.fr.form.ui.Widget;
import com.fr.form.ui.container.WAbsoluteLayout;
import com.fr.form.ui.container.WBorderLayout;
import com.fr.form.ui.container.WCardLayout;
import com.fr.form.ui.container.WFitLayout;
import com.fr.form.ui.container.WHorizontalBoxLayout;
import com.fr.form.ui.container.WParameterLayout;
import com.fr.form.ui.container.WVerticalBoxLayout;
import com.fr.general.Inter;
/**
* Author : Shockway
* Date: 13-6-17
* Time: 上午10:40
*/
public class FormWidgetOption extends WidgetOption {
/**
* 返回名字
* @return 名字
*/
@Override
public String optionName() {
return null;
}
/**
* 返回图标
* @return 图标
*/
@Override
public Icon optionIcon() {
return null;
}
/**
* 组件类
* @return
*/
@Override
public Class<? extends Widget> widgetClass() {
return null;
}
/**
* 返回组件
* @return 控件
*/
@Override
public Widget createWidget() {
return null;
}
/*
* 表单容器
*/
public static WidgetOption[] getFormContainerInstance() {
return new WidgetOption[] { ABSOLUTELAYOUTCONTAINER, BORDERLAYOUTCONTAINER, HORIZONTALBOXLAYOUTCONTAINER, VERTICALBOXLAYOUTCONTAINER,
CARDLAYOUTCONTAINER, FITLAYOUTCONTAINER };
}
/**
* 表单工具栏上的布局
* @return 控件
*/
public static WidgetOption[] getFormLayoutInstance() {
return new WidgetOption[] {CARDLAYOUTCONTAINER, ABSOLUTELAYOUTCONTAINER};
}
public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter
.getLocText("FR-Designer_Layout_Block_Absolute"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/layout_absolute_new.png"),
WAbsoluteLayout.class);
public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter
.getLocText("FR-Designer_BorderLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"),
WBorderLayout.class);
public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter
.getLocText("FR-Designer_Layout_Block_Tab"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/card_layout_16.png"),
WCardLayout.class);
public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter
.getLocText("FR-Designer_Layout-HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"),
WHorizontalBoxLayout.class);
public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter
.getLocText("FR-Designer_VerticalBoxLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"),
WVerticalBoxLayout.class);
public static final WidgetOption FITLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer-Layout_Adaptive_Layout"),
BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"),
WFitLayout.class);
public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter
.getLocText("FR-Designer_Para-Body"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter.png"),
WParameterLayout.class);
public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Inter
.getLocText("FR-Designer_Form-Report"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/report_16.png"),
ElementCaseEditor.class);
}

14
designer_form/src/com/fr/design/mainframe/JForm.java

@ -18,6 +18,7 @@ import com.fr.design.designer.creator.XCreator;
import com.fr.design.designer.creator.XCreatorUtils;
import com.fr.design.designer.creator.XLayoutContainer;
import com.fr.design.designer.creator.XWAbsoluteBodyLayout;
import com.fr.design.designer.creator.XWParameterLayout;
import com.fr.design.designer.properties.FormWidgetAuthorityEditPane;
import com.fr.design.event.TargetModifiedEvent;
import com.fr.design.event.TargetModifiedListener;
@ -58,8 +59,17 @@ import com.fr.stable.ArrayUtils;
import com.fr.stable.Constants;
import com.fr.stable.bridge.StableFactory;
import javax.swing.*;
import java.awt.*;
import javax.swing.BorderFactory;
import javax.swing.Icon;
import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
import java.awt.BorderLayout;
import java.awt.CardLayout;
import java.awt.Color;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.image.BufferedImage;

2
designer_form/src/com/fr/design/mainframe/actions/NewFormAction.java

@ -22,7 +22,7 @@ public class NewFormAction extends UpdateAction {
this.setMenuKeySet(NEW_FORM);
this.setName(getMenuKeySet().getMenuKeySetName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/web/images/form/new_form3.png"));
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/new_form3.png"));
this.setAccelerator(getMenuKeySet().getKeyStroke());
}

Loading…
Cancel
Save