diff --git a/designer/src/com/fr/design/widget/ValueWidgetPane.java b/designer/src/com/fr/design/widget/ValueWidgetPane.java index a588a8151..2205f785d 100644 --- a/designer/src/com/fr/design/widget/ValueWidgetPane.java +++ b/designer/src/com/fr/design/widget/ValueWidgetPane.java @@ -26,16 +26,17 @@ public class ValueWidgetPane extends WidgetPane { } public JPanel initNorthPane(){ + JPanel northPane = super.initNorthPane(); label = new UILabel(" " + Inter.getLocText(new String[]{"Widget", "Value"})+ ":"); label.setVisible(false); widgetValuePane = new JPanel(); widgetValuePane.setLayout(FRGUIPaneFactory.createBorderLayout()); double p = TableLayout.PREFERRED; double f = TableLayout.FILL; - double[] columnSize = {p, p, p, f}; + double[] columnSize = {p, p, f}; double[] rowSize = {p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText(new String[]{"FR-Designer_Selection", "FR-Designer_Widget"})), editorTypeComboBox, label,widgetValuePane}, + new Component[]{northPane, label,widgetValuePane}, }; JPanel jPanel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); return jPanel; diff --git a/designer/src/com/fr/design/widget/WidgetPane.java b/designer/src/com/fr/design/widget/WidgetPane.java index 5e73ac790..ac7a9ac0e 100644 --- a/designer/src/com/fr/design/widget/WidgetPane.java +++ b/designer/src/com/fr/design/widget/WidgetPane.java @@ -32,10 +32,10 @@ import java.util.Vector; */ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener { - protected EditorTypeComboBox editorTypeComboBox; + private EditorTypeComboBox editorTypeComboBox; private CellWidgetCardPane cellEditorCardPane; private boolean shouldFireSelectedEvent = true; - protected JPanel northPane; + private JPanel northPane; public WidgetPane() { this(null); diff --git a/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java index 141675d15..9adb2f14f 100644 --- a/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java +++ b/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java @@ -129,7 +129,6 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane