Browse Source

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

master
kerry 7 years ago
parent
commit
345ad71fb5
  1. 14
      designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java
  2. 29
      designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java

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

@ -35,7 +35,6 @@ public class ErrorInfoUploader {
public static final String FOLDER_NAME = "errorInfo"; public static final String FOLDER_NAME = "errorInfo";
private static ErrorInfoUploader collector; private static ErrorInfoUploader collector;
private static boolean licSupport = true;
// 在一台不能上网的电脑里发现了10w个errorinfo... // 在一台不能上网的电脑里发现了10w个errorinfo...
private static final int MAX_ERROR_SIZE = 2000; private static final int MAX_ERROR_SIZE = 2000;
@ -52,16 +51,6 @@ public class ErrorInfoUploader {
} }
}); });
// 这个控制没啥意义, 主要在于宣传功能.
licSupport = VT4FR.AlphaFine.support();
FRCoreContext.listenerLicense(new LicenseListener() {
@Override
public void onChange() {
licSupport = VT4FR.AlphaFine.support();
}
});
} }
private ErrorInfoUploader() { private ErrorInfoUploader() {
@ -83,7 +72,8 @@ public class ErrorInfoUploader {
// 从云中心更新最新的解决方案文件 // 从云中心更新最新的解决方案文件
private void checkUpdateSolution(){ private void checkUpdateSolution(){
if (!licSupport) {
if (!VT4FR.AlphaFine.support()) {
return; return;
} }

29
designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java

@ -2,7 +2,14 @@ package com.fr.design.mainframe.widget.ui;
import com.fr.design.data.DataCreatorUI; import com.fr.design.data.DataCreatorUI;
import com.fr.design.designer.beans.events.DesignerEvent; import com.fr.design.designer.beans.events.DesignerEvent;
import com.fr.design.designer.creator.*; 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.XWAbsoluteLayout;
import com.fr.design.designer.creator.XWFitLayout;
import com.fr.design.designer.creator.XWParameterLayout;
import com.fr.design.designer.creator.XWScaleLayout;
import com.fr.design.designer.creator.XWTitleLayout;
import com.fr.design.dialog.AttrScrollPane; import com.fr.design.dialog.AttrScrollPane;
import com.fr.design.dialog.BasicScrollPane; import com.fr.design.dialog.BasicScrollPane;
import com.fr.design.foldablepane.UIExpandablePane; import com.fr.design.foldablepane.UIExpandablePane;
@ -11,8 +18,8 @@ import com.fr.design.gui.frpane.AttributeChangeListener;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormDesigner;
import com.fr.design.widget.DataModify; import com.fr.design.widget.DataModify;
import com.fr.design.widget.Operator;
import com.fr.design.widget.FormWidgetDefinePaneFactoryBase; import com.fr.design.widget.FormWidgetDefinePaneFactoryBase;
import com.fr.design.widget.Operator;
import com.fr.design.widget.ui.designer.component.WidgetAbsoluteBoundPane; import com.fr.design.widget.ui.designer.component.WidgetAbsoluteBoundPane;
import com.fr.design.widget.ui.designer.component.WidgetBoundPane; import com.fr.design.widget.ui.designer.component.WidgetBoundPane;
import com.fr.form.ui.Widget; import com.fr.form.ui.Widget;
@ -79,14 +86,8 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
} }
public XCreator findXcreator(FormDesigner designer) { public XCreator findXcreator(FormDesigner designer) {
int size = designer.getSelectionModel().getSelection().size(); XCreator creator = designer.getSelectionModel().getSelection().getSelectedCreator();
if (size == 0 || size == 1) { return creator != null ? creator : designer.getRootComponent();
XCreator creator = size == 0 ? designer.getRootComponent() : designer.getSelectionModel().getSelection()
.getSelectedCreator();
return creator;
} else {
return null;
}
} }
/** /**
@ -128,7 +129,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
this.listener = new AttributeChangeListener() { this.listener = new AttributeChangeListener() {
@Override @Override
public void attributeChange() { public void attributeChange() {
if(!isExtraWidget){ if (!isExtraWidget) {
updateCreator(); updateCreator();
} }
updateWidgetBound(); updateWidgetBound();
@ -136,7 +137,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
} }
}; };
if(isExtraWidget){ if (isExtraWidget) {
return; return;
} }
@ -191,7 +192,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
innerWidget = crBoundsWidget.getWidget(); innerWidget = crBoundsWidget.getWidget();
} }
currentEditorDefinePane.populateBean(innerWidget); currentEditorDefinePane.populateBean(innerWidget);
if(widgetPropertyPane != null){ if (widgetPropertyPane != null) {
widgetPropertyPane.populate(innerWidget); widgetPropertyPane.populate(innerWidget);
} }
reinitAllListeners(); reinitAllListeners();
@ -212,7 +213,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
fireValueChanged(); fireValueChanged();
} }
public void updateWidgetBound (){ public void updateWidgetBound() {
if (widgetBoundPane != null && ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_Coords_And_Size"))) { if (widgetBoundPane != null && ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_Coords_And_Size"))) {
widgetBoundPane.update(); widgetBoundPane.update();
designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_RESIZED); designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_RESIZED);

Loading…
Cancel
Save