From 6f14be3b1cf4290036ba7348bef2e3433cb3d90c Mon Sep 17 00:00:00 2001 From: kerry Date: Tue, 8 Aug 2017 18:45:12 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-3293=209.0=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E8=AE=BE=E7=BD=AE=E9=87=8D=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/quickeditor/ChartQuickEditor.java | 2 +- .../widget/editors/DataBindingEditor.java | 2 +- .../AccessibleWLayoutBorderStyleEditor.java | 12 ++++-- .../component/FormWidgetValuePane.java | 4 +- .../ui/designer/custom/WidgetValueField.java | 40 ------------------- .../designer/custom/WidgetValueFormula.java | 33 --------------- .../ui/designer/custom/WidgetValuePane.java | 17 -------- .../ui/designer/custom/WidgetValueString.java | 33 --------------- 8 files changed, 12 insertions(+), 131 deletions(-) delete mode 100644 designer_form/src/com/fr/design/widget/ui/designer/custom/WidgetValueField.java delete mode 100644 designer_form/src/com/fr/design/widget/ui/designer/custom/WidgetValueFormula.java delete mode 100644 designer_form/src/com/fr/design/widget/ui/designer/custom/WidgetValuePane.java delete mode 100644 designer_form/src/com/fr/design/widget/ui/designer/custom/WidgetValueString.java diff --git a/designer/src/com/fr/quickeditor/ChartQuickEditor.java b/designer/src/com/fr/quickeditor/ChartQuickEditor.java index 452367ad34..91ddc28b6f 100644 --- a/designer/src/com/fr/quickeditor/ChartQuickEditor.java +++ b/designer/src/com/fr/quickeditor/ChartQuickEditor.java @@ -1,7 +1,7 @@ package com.fr.quickeditor; 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.gui.chart.BaseChartPropertyPane; import com.fr.design.mainframe.ElementCasePane; diff --git a/designer_base/src/com/fr/design/mainframe/widget/editors/DataBindingEditor.java b/designer_base/src/com/fr/design/mainframe/widget/editors/DataBindingEditor.java index aae321a5f4..cbe453bd30 100644 --- a/designer_base/src/com/fr/design/mainframe/widget/editors/DataBindingEditor.java +++ b/designer_base/src/com/fr/design/mainframe/widget/editors/DataBindingEditor.java @@ -58,7 +58,7 @@ public class DataBindingEditor extends Editor { public DataBindingEditor() { this.initCompontents(); - this.setName(Inter.getLocText("FieldBinding")); + this.setName(Inter.getLocText("FR-Designer_Widget_Field")); } diff --git a/designer_form/src/com/fr/design/mainframe/widget/accessibles/AccessibleWLayoutBorderStyleEditor.java b/designer_form/src/com/fr/design/mainframe/widget/accessibles/AccessibleWLayoutBorderStyleEditor.java index f7d13b59c3..c2345cd833 100644 --- a/designer_form/src/com/fr/design/mainframe/widget/accessibles/AccessibleWLayoutBorderStyleEditor.java +++ b/designer_form/src/com/fr/design/mainframe/widget/accessibles/AccessibleWLayoutBorderStyleEditor.java @@ -3,9 +3,6 @@ */ 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.renderer.LayoutBorderStyleRenderer; @@ -15,6 +12,9 @@ import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.gui.xpane.LayoutBorderPane; import com.fr.form.ui.LayoutBorderStyle; +import javax.swing.*; +import java.awt.*; + public class AccessibleWLayoutBorderStyleEditor extends UneditableAccessibleEditor { private LayoutBorderPane borderPane; @@ -26,7 +26,11 @@ public class AccessibleWLayoutBorderStyleEditor extends UneditableAccessibleEdit protected ITextComponent createTextField() { return new RendererField(new LayoutBorderStyleRenderer()); } - + + protected void setBorderVisible(){ + this.setBorder(BorderFactory.createLineBorder(Color.lightGray)); + } + @Override protected void showEditorPane() { if (borderPane == null) { diff --git a/designer_form/src/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java b/designer_form/src/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java index 149683ec79..cf23f4d2dc 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java +++ b/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){ - if (ComparatorUtils.equals(tabTitles[index], Inter.getLocText("FieldBinding"))) { - customPane.setPreferredSize(new Dimension(100, 50)); + if (ComparatorUtils.equals(tabTitles[index], Inter.getLocText("FR-Designer_Widget_Field"))) { + customPane.setPreferredSize(new Dimension(100, 47)); } else { customPane.setPreferredSize(new Dimension(100, 20)); } diff --git a/designer_form/src/com/fr/design/widget/ui/designer/custom/WidgetValueField.java b/designer_form/src/com/fr/design/widget/ui/designer/custom/WidgetValueField.java deleted file mode 100644 index c618eec5fa..0000000000 --- a/designer_form/src/com/fr/design/widget/ui/designer/custom/WidgetValueField.java +++ /dev/null @@ -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 - } -} diff --git a/designer_form/src/com/fr/design/widget/ui/designer/custom/WidgetValueFormula.java b/designer_form/src/com/fr/design/widget/ui/designer/custom/WidgetValueFormula.java deleted file mode 100644 index 5c1e092c3d..0000000000 --- a/designer_form/src/com/fr/design/widget/ui/designer/custom/WidgetValueFormula.java +++ /dev/null @@ -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(){ - - } -} \ No newline at end of file diff --git a/designer_form/src/com/fr/design/widget/ui/designer/custom/WidgetValuePane.java b/designer_form/src/com/fr/design/widget/ui/designer/custom/WidgetValuePane.java deleted file mode 100644 index dfd53ecf4f..0000000000 --- a/designer_form/src/com/fr/design/widget/ui/designer/custom/WidgetValuePane.java +++ /dev/null @@ -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(); -} \ No newline at end of file diff --git a/designer_form/src/com/fr/design/widget/ui/designer/custom/WidgetValueString.java b/designer_form/src/com/fr/design/widget/ui/designer/custom/WidgetValueString.java deleted file mode 100644 index 0ee82f970c..0000000000 --- a/designer_form/src/com/fr/design/widget/ui/designer/custom/WidgetValueString.java +++ /dev/null @@ -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(){ - - } -} \ No newline at end of file