Browse Source

REPORT-3293 9.0设计器控件设置重画

master
kerry 7 years ago
parent
commit
6f14be3b1c
  1. 2
      designer/src/com/fr/quickeditor/ChartQuickEditor.java
  2. 2
      designer_base/src/com/fr/design/mainframe/widget/editors/DataBindingEditor.java
  3. 10
      designer_form/src/com/fr/design/mainframe/widget/accessibles/AccessibleWLayoutBorderStyleEditor.java
  4. 4
      designer_form/src/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java
  5. 40
      designer_form/src/com/fr/design/widget/ui/designer/custom/WidgetValueField.java
  6. 33
      designer_form/src/com/fr/design/widget/ui/designer/custom/WidgetValueFormula.java
  7. 17
      designer_form/src/com/fr/design/widget/ui/designer/custom/WidgetValuePane.java
  8. 33
      designer_form/src/com/fr/design/widget/ui/designer/custom/WidgetValueString.java

2
designer/src/com/fr/quickeditor/ChartQuickEditor.java

@ -1,7 +1,7 @@
package com.fr.quickeditor; package com.fr.quickeditor;
import com.fr.base.chart.BaseChartCollection; import com.fr.base.chart.BaseChartCollection;
import com.fr.chart.chartattr.ChartCollection; //import com.fr.chart.chartattr.ChartCollection;
import com.fr.design.designer.TargetComponent; import com.fr.design.designer.TargetComponent;
import com.fr.design.gui.chart.BaseChartPropertyPane; import com.fr.design.gui.chart.BaseChartPropertyPane;
import com.fr.design.mainframe.ElementCasePane; import com.fr.design.mainframe.ElementCasePane;

2
designer_base/src/com/fr/design/mainframe/widget/editors/DataBindingEditor.java

@ -58,7 +58,7 @@ public class DataBindingEditor extends Editor<DataBinding> {
public DataBindingEditor() { public DataBindingEditor() {
this.initCompontents(); this.initCompontents();
this.setName(Inter.getLocText("FieldBinding")); this.setName(Inter.getLocText("FR-Designer_Widget_Field"));
} }

10
designer_form/src/com/fr/design/mainframe/widget/accessibles/AccessibleWLayoutBorderStyleEditor.java

@ -3,9 +3,6 @@
*/ */
package com.fr.design.mainframe.widget.accessibles; package com.fr.design.mainframe.widget.accessibles;
import java.awt.Dimension;
import javax.swing.SwingUtilities;
import com.fr.design.mainframe.widget.editors.ITextComponent; import com.fr.design.mainframe.widget.editors.ITextComponent;
import com.fr.design.mainframe.widget.renderer.LayoutBorderStyleRenderer; import com.fr.design.mainframe.widget.renderer.LayoutBorderStyleRenderer;
@ -15,6 +12,9 @@ import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.gui.xpane.LayoutBorderPane; import com.fr.design.gui.xpane.LayoutBorderPane;
import com.fr.form.ui.LayoutBorderStyle; import com.fr.form.ui.LayoutBorderStyle;
import javax.swing.*;
import java.awt.*;
public class AccessibleWLayoutBorderStyleEditor extends UneditableAccessibleEditor { public class AccessibleWLayoutBorderStyleEditor extends UneditableAccessibleEditor {
private LayoutBorderPane borderPane; private LayoutBorderPane borderPane;
@ -27,6 +27,10 @@ public class AccessibleWLayoutBorderStyleEditor extends UneditableAccessibleEdit
return new RendererField(new LayoutBorderStyleRenderer()); return new RendererField(new LayoutBorderStyleRenderer());
} }
protected void setBorderVisible(){
this.setBorder(BorderFactory.createLineBorder(Color.lightGray));
}
@Override @Override
protected void showEditorPane() { protected void showEditorPane() {
if (borderPane == null) { if (borderPane == null) {

4
designer_form/src/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java

@ -47,8 +47,8 @@ public class FormWidgetValuePane extends JPanel {
} }
public void attributeChange(int index, JPanel customPane, CardLayout cardLayout, String[] tabTitles){ public void attributeChange(int index, JPanel customPane, CardLayout cardLayout, String[] tabTitles){
if (ComparatorUtils.equals(tabTitles[index], Inter.getLocText("FieldBinding"))) { if (ComparatorUtils.equals(tabTitles[index], Inter.getLocText("FR-Designer_Widget_Field"))) {
customPane.setPreferredSize(new Dimension(100, 50)); customPane.setPreferredSize(new Dimension(100, 47));
} else { } else {
customPane.setPreferredSize(new Dimension(100, 20)); customPane.setPreferredSize(new Dimension(100, 20));
} }

40
designer_form/src/com/fr/design/widget/ui/designer/custom/WidgetValueField.java

@ -1,40 +0,0 @@
package com.fr.design.widget.ui.designer.custom;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.general.Inter;
import javax.swing.*;
import java.awt.*;
/**
* Created by ibm on 2017/8/1.
*/
public class WidgetValueField implements WidgetValuePane{
private UITextField dataSource;
private UITextField field;
public WidgetValueField(){
dataSource = new UITextField();
field = new UITextField();
}
public JComponent createWidgetValuePane(){
JPanel jPanel = new JPanel();
jPanel.setLayout(new BorderLayout(1,7));
jPanel.add(dataSource, BorderLayout.NORTH);
jPanel.add(field, BorderLayout.CENTER);
return jPanel;
}
public String markTitle(){
return Inter.getLocText("FR-Designer_Widget_Field");
}
public void update(){
//todo
}
public void populate(){
//todo
}
}

33
designer_form/src/com/fr/design/widget/ui/designer/custom/WidgetValueFormula.java

@ -1,33 +0,0 @@
package com.fr.design.widget.ui.designer.custom;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.general.Inter;
import javax.swing.*;
/**
* Created by ibm on 2017/8/1.
*/
public class WidgetValueFormula implements WidgetValuePane{
private UITextField uiTextField;
public WidgetValueFormula(){
uiTextField = new UITextField();
}
public JComponent createWidgetValuePane(){
return uiTextField;
}
public String markTitle(){
return Inter.getLocText("FR-Designer_Widget_Formula");
}
public void update(){
}
public void populate(){
}
}

17
designer_form/src/com/fr/design/widget/ui/designer/custom/WidgetValuePane.java

@ -1,17 +0,0 @@
package com.fr.design.widget.ui.designer.custom;
import javax.swing.*;
/**
* Created by ibm on 2017/8/1.
*/
public interface WidgetValuePane{
JComponent createWidgetValuePane();
String markTitle();
void update();
void populate();
}

33
designer_form/src/com/fr/design/widget/ui/designer/custom/WidgetValueString.java

@ -1,33 +0,0 @@
package com.fr.design.widget.ui.designer.custom;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.general.Inter;
import javax.swing.*;
/**
* Created by ibm on 2017/8/1.
*/
public class WidgetValueString implements WidgetValuePane{
private UITextField uiTextField;
public WidgetValueString(){
uiTextField = new UITextField();
}
public JComponent createWidgetValuePane(){
return uiTextField;
}
public String markTitle(){
return Inter.getLocText("FR-Designer_Widget_String");
}
public void update(){
}
public void populate(){
}
}
Loading…
Cancel
Save