diff --git a/designer/src/com/fr/design/actions/CellSelectionAction.java b/designer/src/com/fr/design/actions/CellSelectionAction.java index 8ca67feafc..16bf089c55 100644 --- a/designer/src/com/fr/design/actions/CellSelectionAction.java +++ b/designer/src/com/fr/design/actions/CellSelectionAction.java @@ -5,30 +5,33 @@ import com.fr.grid.selection.CellSelection; import com.fr.grid.selection.Selection; public abstract class CellSelectionAction extends ElementCaseAction { - protected CellSelectionAction(ElementCasePane t) { - super(t); - } - - @Override - public boolean executeActionReturnUndoRecordNeeded() { - ElementCasePane ePane = this.getEditingComponent(); - Selection s = ePane.getSelection(); - - // TODO ALEX_SEP instanceof i hate it - if (s instanceof CellSelection) { - return executeActionReturnUndoRecordNeededWithCellSelection((CellSelection)s); - } - - return false; - } - - protected abstract boolean executeActionReturnUndoRecordNeededWithCellSelection(CellSelection cs); - - @Override - public void update() { - super.update(); - if (this.isEnabled()) { - this.setEnabled(this.getEditingComponent().getSelection() instanceof CellSelection); - } - } + protected CellSelectionAction() { + } + + protected CellSelectionAction(ElementCasePane t) { + super(t); + } + + @Override + public boolean executeActionReturnUndoRecordNeeded() { + ElementCasePane ePane = this.getEditingComponent(); + Selection s = ePane.getSelection(); + + // TODO ALEX_SEP instanceof i hate it + if (s instanceof CellSelection) { + return executeActionReturnUndoRecordNeededWithCellSelection((CellSelection) s); + } + + return false; + } + + protected abstract boolean executeActionReturnUndoRecordNeededWithCellSelection(CellSelection cs); + + @Override + public void update() { + super.update(); + if (this.isEnabled()) { + this.setEnabled(this.getEditingComponent().getSelection() instanceof CellSelection); + } + } } \ No newline at end of file diff --git a/designer/src/com/fr/design/actions/ElementCaseAction.java b/designer/src/com/fr/design/actions/ElementCaseAction.java index bfc0c8b4e5..09b7848306 100644 --- a/designer/src/com/fr/design/actions/ElementCaseAction.java +++ b/designer/src/com/fr/design/actions/ElementCaseAction.java @@ -3,17 +3,15 @@ package com.fr.design.actions; //ElementCaseAction应该有GridSelectionChangeListener，就从悬浮元素和单元格来讲，就必须有了，用来判断这些ElementCaseAction是否可以编辑,当然还可以做些其他事情 // -import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.ElementCasePane; -import com.fr.grid.selection.CellSelection; -import com.fr.grid.selection.Selection; -import com.fr.design.selection.SelectionEvent; -import com.fr.design.selection.SelectionListener; public abstract class ElementCaseAction extends SelectionListenerAction { - protected ElementCaseAction(ElementCasePane t) { - super(t); - t.addSelectionChangeListener(createSelectionListener()); - } + protected ElementCaseAction() { + } + + protected ElementCaseAction(ElementCasePane t) { + super(t); + t.addSelectionChangeListener(createSelectionListener()); + } } \ No newline at end of file diff --git a/designer/src/com/fr/design/actions/SelectionListenerAction.java b/designer/src/com/fr/design/actions/SelectionListenerAction.java index 48cd2d4f9a..d150460ec7 100644 --- a/designer/src/com/fr/design/actions/SelectionListenerAction.java +++ b/designer/src/com/fr/design/actions/SelectionListenerAction.java @@ -12,11 +12,14 @@ import com.fr.grid.selection.Selection; */ public abstract class SelectionListenerAction extends TemplateComponentAction { + protected SelectionListenerAction() { + } + protected SelectionListenerAction(ElementCasePane elementCasePane) { super(elementCasePane); } - protected SelectionListener createSelectionListener () { + protected SelectionListener createSelectionListener() { return new SelectionListener() { @Override diff --git a/designer/src/com/fr/design/actions/insert/cell/AbstractCellAction.java b/designer/src/com/fr/design/actions/insert/cell/AbstractCellAction.java index a8c9ab80fe..1127acf538 100644 --- a/designer/src/com/fr/design/actions/insert/cell/AbstractCellAction.java +++ b/designer/src/com/fr/design/actions/insert/cell/AbstractCellAction.java @@ -13,12 +13,15 @@ import com.fr.report.elementcase.TemplateElementCase; * Cell. */ public abstract class AbstractCellAction extends CellSelectionAction { - protected AbstractCellAction(ElementCasePane t) { - super(t); - } - + protected AbstractCellAction() { + } + + protected AbstractCellAction(ElementCasePane t) { + super(t); + } + public abstract Class getCellValueClass(); - + /* * TODO ALEX_SEP 这里的返回boolean量表示模板是否改变,导致很多很多的方法的boolean返回值都是这个意思 * @@ -26,8 +29,8 @@ public abstract class AbstractCellAction extends CellSelectionAction { */ @Override protected boolean executeActionReturnUndoRecordNeededWithCellSelection( - CellSelection cs) { - ElementCasePane ePane = this.getEditingComponent(); + CellSelection cs) { + ElementCasePane ePane = this.getEditingComponent(); //got simple cell element from column and row. TemplateElementCase report = ePane.getEditingElementCase(); @@ -35,17 +38,18 @@ public abstract class AbstractCellAction extends CellSelectionAction { if (report != null && this instanceof DSColumnCellAction) { SheetUtils.calculateDefaultParent(report); } - + return ePane.getGrid().startCellEditingAt_DEC( - cs.getColumn(), - cs.getRow(), - this.getCellValueClass(), false + cs.getColumn(), + cs.getRow(), + this.getCellValueClass(), false ); } - @Override - public void update() { - super.update(); - ElementCasePane ePane = this.getEditingComponent(); - this.setEnabled(ePane.isSelectedOneCell()); - } + + @Override + public void update() { + super.update(); + ElementCasePane ePane = this.getEditingComponent(); + this.setEnabled(ePane.isSelectedOneCell()); + } } \ No newline at end of file diff --git a/designer/src/com/fr/design/actions/insert/cell/BiasCellAction.java b/designer/src/com/fr/design/actions/insert/cell/BiasCellAction.java index e3821f299d..9fc6162881 100644 --- a/designer/src/com/fr/design/actions/insert/cell/BiasCellAction.java +++ b/designer/src/com/fr/design/actions/insert/cell/BiasCellAction.java @@ -3,8 +3,6 @@ */ package com.fr.design.actions.insert.cell; -import javax.swing.KeyStroke; - import com.fr.base.BaseUtils; import com.fr.design.actions.core.WorkBookSupportable; import com.fr.design.mainframe.ElementCasePane; @@ -12,12 +10,23 @@ import com.fr.design.menu.MenuKeySet; import com.fr.general.Inter; import com.fr.report.cell.painter.BiasTextPainter; +import javax.swing.KeyStroke; + /** * Bias */ public class BiasCellAction extends AbstractCellAction implements WorkBookSupportable { - public BiasCellAction(ElementCasePane t) { - super(t); + + public BiasCellAction() { + initAction(); + } + + public BiasCellAction(ElementCasePane t) { + super(t); + initAction(); + } + + private void initAction() { this.setMenuKeySet(INSERT_SLOPE_LINE); this.setName(getMenuKeySet().getMenuKeySetName()+ "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); diff --git a/designer/src/com/fr/design/actions/insert/cell/ChartCellAction.java b/designer/src/com/fr/design/actions/insert/cell/ChartCellAction.java index 8f12d287b2..83d8f238ee 100644 --- a/designer/src/com/fr/design/actions/insert/cell/ChartCellAction.java +++ b/designer/src/com/fr/design/actions/insert/cell/ChartCellAction.java @@ -16,11 +16,19 @@ import javax.swing.*; * . */ public class ChartCellAction extends AbstractCellAction implements WorkBookSupportable { + public ChartCellAction(){ + initAction(); + } + public ChartCellAction(ElementCasePane t) { super(t); - this.setMenuKeySet(INSERT_CHART); - this.setName(getMenuKeySet().getMenuKeySetName()+ "..."); - this.setMnemonic(getMenuKeySet().getMnemonic()); + initAction(); + } + + private void initAction() { + this.setMenuKeySet(INSERT_CHART); + this.setName(getMenuKeySet().getMenuKeySetName()+ "..."); + this.setMnemonic(getMenuKeySet().getMnemonic()); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/chart.png")); } diff --git a/designer/src/com/fr/design/actions/insert/cell/DSColumnCellAction.java b/designer/src/com/fr/design/actions/insert/cell/DSColumnCellAction.java index 90d0ccb8bc..7afd7b4ef7 100644 --- a/designer/src/com/fr/design/actions/insert/cell/DSColumnCellAction.java +++ b/designer/src/com/fr/design/actions/insert/cell/DSColumnCellAction.java @@ -8,13 +8,21 @@ import com.fr.general.IOUtils; import com.fr.report.cell.cellattr.core.group.DSColumn; public class DSColumnCellAction extends AbstractCellAction implements WorkBookSupportable { - public DSColumnCellAction(ElementCasePane t) { - super(t); + public DSColumnCellAction() { + initAction(); + } + + public DSColumnCellAction(ElementCasePane t) { + super(t); + initAction(); + this.setSearchText(new DSColumnPane()); + } + + private void initAction() { this.setMenuKeySet(KeySetUtils.INSERT_DATA_COLUMN); - this.setName(getMenuKeySet().getMenuKeySetName()+ "..."); + this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/m_insert/bindColumn.png")); - this.setSearchText(new DSColumnPane()); } @Override diff --git a/designer/src/com/fr/design/actions/insert/cell/FormulaCellAction.java b/designer/src/com/fr/design/actions/insert/cell/FormulaCellAction.java index 92757d88e0..499b9119df 100644 --- a/designer/src/com/fr/design/actions/insert/cell/FormulaCellAction.java +++ b/designer/src/com/fr/design/actions/insert/cell/FormulaCellAction.java @@ -13,10 +13,18 @@ import com.fr.general.Inter; import javax.swing.*; public class FormulaCellAction extends AbstractCellAction implements WorkBookSupportable { - public FormulaCellAction(ElementCasePane t) { - super(t); + public FormulaCellAction() { + initAction(); + } + + public FormulaCellAction(ElementCasePane t) { + super(t); + initAction(); + } + + private void initAction() { this.setMenuKeySet(INSERT_FORMULA); - this.setName(getMenuKeySet().getMenuKeySetName()+ "..."); + this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/formula.png")); } @@ -39,7 +47,7 @@ public class FormulaCellAction extends AbstractCellAction implements WorkBookSup }; @Override - public Class getCellValueClass() { + public Class getCellValueClass() { return Formula.class; } } \ No newline at end of file diff --git a/designer/src/com/fr/design/actions/insert/cell/GeneralCellAction.java b/designer/src/com/fr/design/actions/insert/cell/GeneralCellAction.java index 7146924673..40aef3198c 100644 --- a/designer/src/com/fr/design/actions/insert/cell/GeneralCellAction.java +++ b/designer/src/com/fr/design/actions/insert/cell/GeneralCellAction.java @@ -15,10 +15,18 @@ import javax.swing.*; * */ public class GeneralCellAction extends AbstractCellAction implements WorkBookSupportable { - public GeneralCellAction(ElementCasePane t) { - super(t); + public GeneralCellAction() { + initAction(); + } + + public GeneralCellAction(ElementCasePane t) { + super(t); + initAction(); + } + + private void initAction() { this.setMenuKeySet(INSERT_TEXT); - this.setName(getMenuKeySet().getMenuKeySetName()+ "..."); + this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/text.png")); } @@ -41,7 +49,7 @@ public class GeneralCellAction extends AbstractCellAction implements WorkBookSup }; @Override - public Class getCellValueClass() { + public Class getCellValueClass() { return String.class; } } \ No newline at end of file diff --git a/designer/src/com/fr/design/actions/insert/cell/ImageCellAction.java b/designer/src/com/fr/design/actions/insert/cell/ImageCellAction.java index 594cb771be..e3761909a9 100644 --- a/designer/src/com/fr/design/actions/insert/cell/ImageCellAction.java +++ b/designer/src/com/fr/design/actions/insert/cell/ImageCellAction.java @@ -16,10 +16,18 @@ import java.awt.*; * Image */ public class ImageCellAction extends AbstractCellAction implements WorkBookSupportable { - public ImageCellAction(ElementCasePane t) { - super(t); + public ImageCellAction() { + initAction(); + } + + public ImageCellAction(ElementCasePane t) { + super(t); + initAction(); + } + + private void initAction() { this.setMenuKeySet(INSERT_IMAGE); - this.setName(getMenuKeySet().getMenuKeySetName()+ "..."); + this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/image.png")); } @@ -42,7 +50,7 @@ public class ImageCellAction extends AbstractCellAction implements WorkBookSuppo }; @Override - public Class getCellValueClass() { + public Class getCellValueClass() { return Image.class; } } \ No newline at end of file diff --git a/designer/src/com/fr/design/actions/insert/cell/RichTextCellAction.java b/designer/src/com/fr/design/actions/insert/cell/RichTextCellAction.java index c8017099f4..c9df15162b 100644 --- a/designer/src/com/fr/design/actions/insert/cell/RichTextCellAction.java +++ b/designer/src/com/fr/design/actions/insert/cell/RichTextCellAction.java @@ -1,7 +1,5 @@ package com.fr.design.actions.insert.cell; -import javax.swing.KeyStroke; - import com.fr.base.BaseUtils; import com.fr.design.actions.core.WorkBookSupportable; import com.fr.design.mainframe.ElementCasePane; @@ -10,53 +8,64 @@ import com.fr.general.ComparatorUtils; import com.fr.general.Inter; import com.fr.report.cell.cellattr.core.RichText; +import javax.swing.KeyStroke; + public class RichTextCellAction extends AbstractCellAction implements WorkBookSupportable { - public RichTextCellAction(ElementCasePane t) { - super(t); + public RichTextCellAction() { + initAction(); + } + + public RichTextCellAction(ElementCasePane t) { + super(t); + initAction(); + } + + private void initAction() { this.setMenuKeySet(INSERT_RICHTEXT); - this.setName(getMenuKeySet().getMenuKeySetName()+ "..."); + this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); this.setSmallIcon(BaseUtils.readIcon( "/com/fr/design/images/m_insert/richtext.png")); - } - - @Override - public Class getCellValueClass() { - return RichText.class; - } - - /** - * equals 比较 - * @param object - * @return true false - */ - @Override - public boolean equals(Object object) { - if (this == object){ - return true; - } - if (!(object instanceof RichTextCellAction)){ - return false; - } - - return ComparatorUtils.equals(this.getEditingComponent(),((RichTextCellAction)object).getEditingComponent()); - } + } + + @Override + public Class getCellValueClass() { + return RichText.class; + } + + /** + * equals 比较 + * + * @param object + * @return true false + */ + @Override + public boolean equals(Object object) { + if (this == object) { + return true; + } + if (!(object instanceof RichTextCellAction)) { + return false; + } + + return ComparatorUtils.equals(this.getEditingComponent(), ((RichTextCellAction) object).getEditingComponent()); + } private static final MenuKeySet INSERT_RICHTEXT = new MenuKeySet() { - @Override - public char getMnemonic() { - return 'R'; - } - - @Override - public String getMenuName() { - return Inter.getLocText("FR-Designer_RichText"); - } - - @Override - public KeyStroke getKeyStroke() { - return null; - } + @Override + public char getMnemonic() { + return 'R'; + } + + @Override + public String getMenuName() { + return Inter.getLocText("FR-Designer_RichText"); + } + + @Override + public KeyStroke getKeyStroke() { + return null; + } }; } \ No newline at end of file diff --git a/designer/src/com/fr/design/actions/insert/cell/SubReportCellAction.java b/designer/src/com/fr/design/actions/insert/cell/SubReportCellAction.java index 79dc6c6421..a055bcd0d0 100644 --- a/designer/src/com/fr/design/actions/insert/cell/SubReportCellAction.java +++ b/designer/src/com/fr/design/actions/insert/cell/SubReportCellAction.java @@ -1,7 +1,5 @@ package com.fr.design.actions.insert.cell; -import javax.swing.KeyStroke; - import com.fr.base.BaseUtils; import com.fr.design.mainframe.ElementCasePane; import com.fr.design.menu.MenuKeySet; @@ -9,54 +7,65 @@ import com.fr.general.ComparatorUtils; import com.fr.general.Inter; import com.fr.report.cell.cellattr.core.SubReport; +import javax.swing.KeyStroke; + public class SubReportCellAction extends AbstractCellAction { - public SubReportCellAction(ElementCasePane t) { - super(t); + public SubReportCellAction() { + initAction(); + } + + public SubReportCellAction(ElementCasePane t) { + super(t); + initAction(); + } + + private void initAction() { this.setMenuKeySet(INSERT_SUB_REPORT); - this.setName(getMenuKeySet().getMenuKeySetName()+ "..."); + this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); this.setSmallIcon(BaseUtils.readIcon( "/com/fr/design/images/m_insert/subReport.png")); - } - - public static final MenuKeySet INSERT_SUB_REPORT = new MenuKeySet() { - @Override - public char getMnemonic() { - return 'S'; - } - - @Override - public String getMenuName() { - return Inter.getLocText("M_Insert-Sub_Report"); - } - - @Override - public KeyStroke getKeyStroke() { - return null; - } - }; - - /** - * equals 比较 - * @param object - * @return true false - */ - @Override - public boolean equals(Object object) { - if (this == object){ - return true; - } - if (!(object instanceof SubReportCellAction)){ - return false; - } - - return ComparatorUtils.equals(this.getEditingComponent(),((SubReportCellAction)object).getEditingComponent()); - } - - @Override - public Class getCellValueClass() { - return SubReport.class; - } + } + + public static final MenuKeySet INSERT_SUB_REPORT = new MenuKeySet() { + @Override + public char getMnemonic() { + return 'S'; + } + + @Override + public String getMenuName() { + return Inter.getLocText("M_Insert-Sub_Report"); + } + + @Override + public KeyStroke getKeyStroke() { + return null; + } + }; + + /** + * equals 比较 + * + * @param object + * @return true false + */ + @Override + public boolean equals(Object object) { + if (this == object) { + return true; + } + if (!(object instanceof SubReportCellAction)) { + return false; + } + + return ComparatorUtils.equals(this.getEditingComponent(), ((SubReportCellAction) object).getEditingComponent()); + } + + @Override + public Class getCellValueClass() { + return SubReport.class; + } } \ No newline at end of file diff --git a/designer/src/com/fr/design/widget/ui/IframeEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/IframeEditorDefinePane.java index cf7797e813..359c8c6363 100644 --- a/designer/src/com/fr/design/widget/ui/IframeEditorDefinePane.java +++ b/designer/src/com/fr/design/widget/ui/IframeEditorDefinePane.java @@ -1,17 +1,13 @@ package com.fr.design.widget.ui; -import java.awt.*; -import java.util.List; - -import javax.swing.BorderFactory; - import com.fr.design.constants.LayoutConstants; +import com.fr.design.dialog.DialogActionListener; +import com.fr.design.dialog.UIDialog; import com.fr.design.foldablepane.UIExpandablePane; -import com.fr.design.gui.ilable.UILabel; -import javax.swing.JPanel; - import com.fr.design.gui.frpane.ReportletParameterViewPane; +import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icheckbox.UICheckBox; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; @@ -20,68 +16,114 @@ import com.fr.form.ui.IframeEditor; import com.fr.general.Inter; import com.fr.stable.ParameterProvider; +import javax.swing.*; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.ArrayList; +import java.util.List; + public class IframeEditorDefinePane extends AbstractDataModify { - private UITextField srcTextField; - private ReportletParameterViewPane parameterViewPane; - private UICheckBox horizontalCheck; - private UICheckBox verticalCheck; - - public IframeEditorDefinePane() { - this.initComponents(); - } - - private void initComponents() { - this.setLayout(FRGUIPaneFactory.createBorderLayout()); - this.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); - contentPane.setBorder(BorderFactory.createEmptyBorder(0, 2, 0, 0)); - JPanel attr = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane(); - attr.add(horizontalCheck = new UICheckBox(Inter.getLocText("Preference-Horizontal_Scroll_Bar_Visible"))); - attr.add(verticalCheck = new UICheckBox(Inter.getLocText("Preference-Vertical_Scroll_Bar_Visible"))); - contentPane.add(attr); - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] rowSize = { p, p, p, p }; - double[] columnSize = { p, f }; - - java.awt.Component[][] coms = { - { horizontalCheck, null }, - { verticalCheck, null }, - { new UILabel(Inter.getLocText("Form-Url") + ":"), srcTextField = new UITextField() }, - { new UILabel(Inter.getLocText("Parameter") + ":"), parameterViewPane = new ReportletParameterViewPane() } }; - int[][] rowCount = {{1, 1},{1, 1},{1, 1}, {1, 1}}; - JPanel panel = TableLayoutHelper.createGapTableLayoutPane(coms, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, 5); - - - contentPane.add(panel); - - UIExpandablePane uiExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 280, 20, contentPane); - this.add(uiExpandablePane, BorderLayout.NORTH); - - } - - - @Override - protected String title4PopupWindow() { - return "iframe"; - } - - @Override - public void populateBean(IframeEditor e) { - srcTextField.setText(e.getSrc()); - parameterViewPane.populate(e.getParameters()); - this.horizontalCheck.setSelected(e.isOverflowx()); - this.verticalCheck.setSelected(e.isOverflowy()); - } - - @Override - public IframeEditor updateBean() { - IframeEditor ob = new IframeEditor(); - ob.setSrc(srcTextField.getText()); - List parameterList = parameterViewPane.update(); - ob.setParameters(parameterList.toArray(new ParameterProvider[parameterList.size()])); - ob.setOverflowx(this.horizontalCheck.isSelected()); - ob.setOverflowy(this.verticalCheck.isSelected()); - return ob; - } + + private static final int P_W = 610; + private static final int P_H = 580; + private UITextField srcTextField; + private ReportletParameterViewPane parameterViewPane; + private UICheckBox horizontalCheck; + private UICheckBox verticalCheck; + private UIButton parameterViewPaneButton; + private List list; + + + public IframeEditorDefinePane() { + this.initComponents(); + } + + private void initComponents() { + this.setLayout(FRGUIPaneFactory.createBorderLayout()); + this.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); + JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); + contentPane.setBorder(BorderFactory.createEmptyBorder(0, 2, 0, 0)); + JPanel attr = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane(); + attr.add(horizontalCheck = new UICheckBox(Inter.getLocText("Preference-Horizontal_Scroll_Bar_Visible"))); + attr.add(verticalCheck = new UICheckBox(Inter.getLocText("Preference-Vertical_Scroll_Bar_Visible"))); + contentPane.add(attr); + double p = TableLayout.PREFERRED; + double f = TableLayout.FILL; + double[] rowSize = {p, p, p, p}; + double[] columnSize = {p, f}; + + parameterViewPaneButton = new UIButton(Inter.getLocText("FR-Designer_Edit")); + parameterViewPaneButton.addActionListener(parameterListener); + parameterViewPane = new ReportletParameterViewPane(); + + java.awt.Component[][] coms = { + {horizontalCheck, null}, + {verticalCheck, null}, + {new UILabel(Inter.getLocText("Form-Url")), srcTextField = new UITextField()}, + {new UILabel(Inter.getLocText("FR-Designer_Parameters")), parameterViewPaneButton}}; + int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}}; + JPanel panel = TableLayoutHelper.createGapTableLayoutPane(coms, rowSize, columnSize, rowCount, 45, LayoutConstants.VGAP_LARGE); + + + contentPane.add(panel); + + UIExpandablePane uiExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 280, 24, contentPane); + this.add(uiExpandablePane, BorderLayout.NORTH); + + } + + ActionListener parameterListener = new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + List paraList = parameterViewPane.update(); + list = new ArrayList(); + ParameterProvider pr = null; + for (ParameterProvider parameterProvider : paraList) { + try { + pr = (ParameterProvider) parameterProvider.clone(); + } catch (CloneNotSupportedException e1) { + e1.printStackTrace(); + } + list.add(pr); + } + + UIDialog dialog = parameterViewPane.showUnsizedWindow(SwingUtilities.getWindowAncestor(new JPanel()), new DialogActionListener() { + @Override + public void doOk() { + } + + @Override + public void doCancel() { + parameterViewPane.update(list); + } + }); + dialog.setSize(P_W, P_H); + dialog.setVisible(true); + } + }; + + @Override + protected String title4PopupWindow() { + return "iframe"; + } + + @Override + public void populateBean(IframeEditor e) { + srcTextField.setText(e.getSrc()); + parameterViewPane.populate(e.getParameters()); + this.horizontalCheck.setSelected(e.isOverflowx()); + this.verticalCheck.setSelected(e.isOverflowy()); + } + + @Override + public IframeEditor updateBean() { + IframeEditor ob = new IframeEditor(); + ob.setSrc(srcTextField.getText()); + List parameterList = parameterViewPane.update(); + ob.setParameters(parameterList.toArray(new ParameterProvider[parameterList.size()])); + ob.setOverflowx(this.horizontalCheck.isSelected()); + ob.setOverflowy(this.verticalCheck.isSelected()); + return ob; + } } \ No newline at end of file diff --git a/designer/src/com/fr/quickeditor/CellQuickEditor.java b/designer/src/com/fr/quickeditor/CellQuickEditor.java index 0184e57cde..29cb2a3078 100644 --- a/designer/src/com/fr/quickeditor/CellQuickEditor.java +++ b/designer/src/com/fr/quickeditor/CellQuickEditor.java @@ -1,27 +1,29 @@ package com.fr.quickeditor; -import com.fr.design.actions.utils.DeprecatedActionManager; -import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.actions.UpdateAction; +import com.fr.design.actions.core.ActionFactory; +import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.ElementCasePane; +import com.fr.design.menu.MenuKeySet; +import com.fr.design.menu.ShortCut; import com.fr.design.selection.QuickEditor; -import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.IOUtils; import com.fr.general.Inter; import com.fr.grid.selection.CellSelection; import com.fr.report.cell.TemplateCellElement; import com.fr.stable.ColumnRow; import javax.swing.*; +import javax.swing.event.PopupMenuEvent; +import javax.swing.event.PopupMenuListener; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; +import java.util.ArrayList; /** * @author zhou, yaoh.wu @@ -32,6 +34,10 @@ public abstract class CellQuickEditor extends QuickEditor { protected UITextField columnRowTextField; protected TemplateCellElement cellElement; + protected UIComboBox comboBox; + private UpdateAction[] cellInsertActions; + private MenuKeySet[] cellInsertActionNames; + private int selectedIndex; public CellQuickEditor() { double p = TableLayout.PREFERRED; @@ -58,7 +64,7 @@ public abstract class CellQuickEditor extends QuickEditor { cellLabel.setPreferredSize(new Dimension(60, 20)); UILabel insertContentLabel = new UILabel(Inter.getLocText("HF-Insert_Content")); insertContentLabel.setPreferredSize(new Dimension(60, 20)); - UIButton cellElementEditButton = initCellElementEditButton(); + UIComboBox cellElementEditButton = initCellElementEditComboBox(); Component[][] components = new Component[][]{ new Component[]{cellLabel, columnRowTextField = initColumnRowTextField()}, new Component[]{insertContentLabel, cellElementEditButton}, @@ -71,20 +77,57 @@ public abstract class CellQuickEditor extends QuickEditor { /** * 初始化添加按钮 - * TODO 9.0 换成下拉菜单后原来的快捷键不好处理，先跳过。 * * @return UIButton */ - private UIButton initCellElementEditButton() { - final UIButton cellElementEditButton = new UIButton(IOUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); - cellElementEditButton.addMouseListener(new MouseAdapter() { + private UIComboBox initCellElementEditComboBox() { + final String[] items = getDefaultComboBoxItems(); + comboBox = new UIComboBox(items); + final Object comboBoxSelected = getComboBoxSelected(); + if (comboBoxSelected != null) { + comboBox.setSelectedItem(((ShortCut) comboBoxSelected).getMenuKeySet().getMenuKeySetName()); + } else { + comboBox.setSelectedIndex(1); + } + comboBox.addPopupMenuListener(new PopupMenuListener() { + @Override + public void popupMenuWillBecomeVisible(PopupMenuEvent e) { + if (cellInsertActions == null) { + cellInsertActions = ActionFactory.createCellInsertAction(ElementCasePane.class, tc); + } + // 这边重新获取是因为要根据JTemplate做一个过滤 + ArrayList arrayList = new ArrayList(); + for (UpdateAction action : cellInsertActions) { + arrayList.add(action.getMenuKeySet().getMenuKeySetName()); + } + comboBox.setModel(new DefaultComboBoxModel(arrayList.toArray(new String[arrayList.size()]))); + } + + @Override + public void popupMenuWillBecomeInvisible(PopupMenuEvent e) { + } @Override - public void mousePressed(MouseEvent evt) { - GUICoreUtils.showPopMenuWithParentWidth(DeprecatedActionManager.getCellMenu(tc).createJPopupMenu(), cellElementEditButton, 0, cellElementEditButton.getY() - 6); + public void popupMenuCanceled(PopupMenuEvent e) { } }); - return cellElementEditButton; + comboBox.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + selectedIndex = comboBox.getSelectedIndex(); + cellInsertActions[selectedIndex].actionPerformed(e); + } + }); + return comboBox; + } + + private String[] getDefaultComboBoxItems() { + cellInsertActionNames = ActionFactory.createCellInsertActionName(); + ArrayList names = new ArrayList<>(); + for (MenuKeySet cellInsertActionName : cellInsertActionNames) { + names.add(cellInsertActionName.getMenuKeySetName()); + } + return names.toArray(new String[names.size()]); } /** @@ -130,6 +173,14 @@ public abstract class CellQuickEditor extends QuickEditor { */ public abstract JComponent createCenterBody(); + + /** + * 初始化下拉框中的类型 + * + * @return JComponent 待显示的详细信息面板 + */ + public abstract Object getComboBoxSelected(); + /** * 刷新 */ diff --git a/designer/src/com/fr/quickeditor/cellquick/CellBiasTextPainterEditor.java b/designer/src/com/fr/quickeditor/cellquick/CellBiasTextPainterEditor.java index ad0b3f3f24..261a1111ad 100644 --- a/designer/src/com/fr/quickeditor/cellquick/CellBiasTextPainterEditor.java +++ b/designer/src/com/fr/quickeditor/cellquick/CellBiasTextPainterEditor.java @@ -1,5 +1,7 @@ package com.fr.quickeditor.cellquick; +import com.fr.design.actions.core.ActionFactory; +import com.fr.design.actions.insert.cell.BiasCellAction; import com.fr.design.cell.editor.BiasTextPainterCellEditor.BiasTextPainterPane; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.gui.ibutton.UIButton; @@ -36,6 +38,11 @@ public class CellBiasTextPainterEditor extends CellQuickEditor { return content; } + @Override + public Object getComboBoxSelected() { + return ActionFactory.createAction(BiasCellAction.class); + } + private void showEditingDialog() { final BiasTextPainter oldbiasTextPainter = (BiasTextPainter) cellElement.getValue(); final BiasTextPainterPane biasTextPainterPane = new BiasTextPainterPane(); diff --git a/designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java b/designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java index 84b226bb68..127cfd6326 100644 --- a/designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java +++ b/designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java @@ -2,6 +2,8 @@ package com.fr.quickeditor.cellquick; import com.fr.base.Formula; import com.fr.design.actions.columnrow.DSColumnConditionAction; +import com.fr.design.actions.core.ActionFactory; +import com.fr.design.actions.insert.cell.DSColumnCellAction; import com.fr.design.data.DesignTableDataManager; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.dscolumn.DSColumnAdvancedPane; @@ -981,4 +983,9 @@ public class CellDSColumnEditor extends CellQuickEditor { } } } + + @Override + public Object getComboBoxSelected() { + return ActionFactory.createAction(DSColumnCellAction.class); + } } \ No newline at end of file diff --git a/designer/src/com/fr/quickeditor/cellquick/CellFormulaQuickEditor.java b/designer/src/com/fr/quickeditor/cellquick/CellFormulaQuickEditor.java index 07e2367eaf..0edadfc321 100644 --- a/designer/src/com/fr/quickeditor/cellquick/CellFormulaQuickEditor.java +++ b/designer/src/com/fr/quickeditor/cellquick/CellFormulaQuickEditor.java @@ -3,6 +3,8 @@ package com.fr.quickeditor.cellquick; import com.fr.base.Formula; import com.fr.base.Style; import com.fr.base.TextFormat; +import com.fr.design.actions.core.ActionFactory; +import com.fr.design.actions.insert.cell.FormulaCellAction; import com.fr.design.gui.itextfield.UITextField; import com.fr.grid.selection.CellSelection; import com.fr.quickeditor.CellQuickEditor; @@ -77,6 +79,11 @@ public class CellFormulaQuickEditor extends CellQuickEditor { return content; } + @Override + public Object getComboBoxSelected() { + return ActionFactory.createAction(FormulaCellAction.class); + } + private void changeReportPaneCell(String tmpText) { isEditing = true; diff --git a/designer/src/com/fr/quickeditor/cellquick/CellImageQuickEditor.java b/designer/src/com/fr/quickeditor/cellquick/CellImageQuickEditor.java index 40de2df794..315e95c571 100644 --- a/designer/src/com/fr/quickeditor/cellquick/CellImageQuickEditor.java +++ b/designer/src/com/fr/quickeditor/cellquick/CellImageQuickEditor.java @@ -1,6 +1,8 @@ package com.fr.quickeditor.cellquick; import com.fr.base.Style; +import com.fr.design.actions.core.ActionFactory; +import com.fr.design.actions.insert.cell.ImageCellAction; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.mainframe.DesignerContext; @@ -68,4 +70,8 @@ public class CellImageQuickEditor extends CellQuickEditor { } + @Override + public Object getComboBoxSelected() { + return ActionFactory.createAction(ImageCellAction.class); + } } \ No newline at end of file diff --git a/designer/src/com/fr/quickeditor/cellquick/CellRichTextEditor.java b/designer/src/com/fr/quickeditor/cellquick/CellRichTextEditor.java index 6322251075..a0cbf705bd 100644 --- a/designer/src/com/fr/quickeditor/cellquick/CellRichTextEditor.java +++ b/designer/src/com/fr/quickeditor/cellquick/CellRichTextEditor.java @@ -1,5 +1,6 @@ package com.fr.quickeditor.cellquick; +import com.fr.design.actions.core.ActionFactory; import com.fr.design.actions.insert.cell.RichTextCellAction; import com.fr.design.gui.ibutton.UIButton; import com.fr.general.Inter; @@ -32,6 +33,11 @@ public class CellRichTextEditor extends CellQuickEditor { return content; } + @Override + public Object getComboBoxSelected() { + return ActionFactory.createAction(RichTextCellAction.class); + } + @Override protected void refreshDetails() { RichTextCellAction subReportCellAction = new RichTextCellAction(tc); diff --git a/designer/src/com/fr/quickeditor/cellquick/CellStringQuickEditor.java b/designer/src/com/fr/quickeditor/cellquick/CellStringQuickEditor.java index 96dce177f0..f525682870 100644 --- a/designer/src/com/fr/quickeditor/cellquick/CellStringQuickEditor.java +++ b/designer/src/com/fr/quickeditor/cellquick/CellStringQuickEditor.java @@ -22,6 +22,9 @@ import java.awt.event.KeyEvent; * */ public class CellStringQuickEditor extends CellQuickEditor { + + //instance + private static CellStringQuickEditor THIS; //文本域 //TODO 9.0 文本域要根据具体文本数量自适应大小，比较难搞，先跳过。 private UITextField stringTextField; @@ -148,4 +151,9 @@ public class CellStringQuickEditor extends CellQuickEditor { stringTextField.getDocument().addDocumentListener(documentListener); } + @Override + public Object getComboBoxSelected() { + return null; + } + } \ No newline at end of file diff --git a/designer/src/com/fr/quickeditor/cellquick/CellSubReportEditor.java b/designer/src/com/fr/quickeditor/cellquick/CellSubReportEditor.java index 5eb3e5586f..3ef0cda8aa 100644 --- a/designer/src/com/fr/quickeditor/cellquick/CellSubReportEditor.java +++ b/designer/src/com/fr/quickeditor/cellquick/CellSubReportEditor.java @@ -1,5 +1,6 @@ package com.fr.quickeditor.cellquick; +import com.fr.design.actions.core.ActionFactory; import com.fr.design.actions.insert.cell.SubReportCellAction; import com.fr.design.gui.ibutton.UIButton; import com.fr.general.Inter; @@ -40,4 +41,9 @@ public class CellSubReportEditor extends CellQuickEditor { subReportButton.setAction(subReportCellAction); } + @Override + public Object getComboBoxSelected() { + return ActionFactory.createAction(SubReportCellAction.class); + } + } \ No newline at end of file diff --git a/designer_base/src/com/fr/design/actions/TemplateComponentAction.java b/designer_base/src/com/fr/design/actions/TemplateComponentAction.java index a8bfe8fb61..2194c7a791 100644 --- a/designer_base/src/com/fr/design/actions/TemplateComponentAction.java +++ b/designer_base/src/com/fr/design/actions/TemplateComponentAction.java @@ -4,30 +4,34 @@ package com.fr.design.actions; import com.fr.design.designer.TargetComponent; public abstract class TemplateComponentAction extends UndoableAction implements TemplateComponentActionInterface { - private T t; - protected TemplateComponentAction(T t) { - this.t = t; - } - - protected void setEditingComponent(T t) { - this.t = t; - } - - @Override - public T getEditingComponent() { - return t; - } - - @Override - public void prepare4Undo() { - this.getEditingComponent().fireTargetModified(); + private T t; + + protected TemplateComponentAction() { + } + + protected TemplateComponentAction(T t) { + this.t = t; + } + + protected void setEditingComponent(T t) { + this.t = t; + } + + @Override + public T getEditingComponent() { + return t; + } + + @Override + public void prepare4Undo() { + this.getEditingComponent().fireTargetModified(); T component = getEditingComponent(); if (component == null) { return; } component.requestFocus(); - } + } /** * update enable @@ -35,6 +39,6 @@ public abstract class TemplateComponentAction extends */ @Override public void update() { - this.setEnabled(this.getEditingComponent() != null); + this.setEnabled(this.getEditingComponent() != null); } } \ No newline at end of file diff --git a/designer_base/src/com/fr/design/actions/core/ActionFactory.java b/designer_base/src/com/fr/design/actions/core/ActionFactory.java index 55a72002f4..b1e2f1a65e 100644 --- a/designer_base/src/com/fr/design/actions/core/ActionFactory.java +++ b/designer_base/src/com/fr/design/actions/core/ActionFactory.java @@ -5,6 +5,7 @@ import com.fr.base.Utils; import com.fr.design.actions.UpdateAction; import com.fr.design.file.HistoryTemplateListPane; import com.fr.design.mainframe.JTemplate; +import com.fr.design.menu.MenuKeySet; import com.fr.design.selection.QuickEditor; import javax.swing.*; @@ -132,6 +133,17 @@ public class ActionFactory { return createEditor(clazz, cellEditor); } + public static UpdateAction createAction(Class clazz) { + try { + Constructor c = clazz.getDeclaredConstructor(); + c.setAccessible(true); + return c.newInstance(); + } catch (Exception e) { + FRContext.getLogger().error(e.getMessage(), e); + } + return null; + } + /** * peter:从Action来产生ToolTipText. * @@ -190,7 +202,7 @@ public class ActionFactory { } if (jTemplate.acceptToolbarItem(clazz)) { try { - Constructor c = (Constructor)clazz.getConstructor(cls); + Constructor c = (Constructor) clazz.getConstructor(cls); actions.add(c.newInstance(obj)); } catch (Exception e) { FRContext.getLogger().error(e.getMessage(), e); @@ -200,6 +212,24 @@ public class ActionFactory { return actions.toArray(new UpdateAction[actions.size()]); } + + public static MenuKeySet[] createCellInsertActionName() { + List actionNames = new ArrayList<>(); + for (Class clazz : actionClasses) { + if (clazz == null) { + continue; + } + try { + Constructor c = (Constructor) clazz.getConstructor(); + actionNames.add(c.newInstance().getMenuKeySet()); + + } catch (Exception e) { + FRContext.getLogger().error(e.getMessage(), e); + } + } + return actionNames.toArray(new MenuKeySet[actionNames.size()]); + } + /** * 登记悬浮元素插入类型 * @@ -225,7 +255,7 @@ public class ActionFactory { continue; } try { - Constructor c = (Constructor)clazz.getConstructor(cls); + Constructor c = (Constructor) clazz.getConstructor(cls); actions.add(c.newInstance(obj)); } catch (Exception e) { FRContext.getLogger().error(e.getMessage(), e); diff --git a/designer_base/src/com/fr/design/gui/frpane/ReportletParameterViewPane.java b/designer_base/src/com/fr/design/gui/frpane/ReportletParameterViewPane.java index a9cea2cf13..084b11ee48 100644 --- a/designer_base/src/com/fr/design/gui/frpane/ReportletParameterViewPane.java +++ b/designer_base/src/com/fr/design/gui/frpane/ReportletParameterViewPane.java @@ -23,115 +23,124 @@ import java.util.List; /** * Defin hyperlink. * in fact,this is a TablEditorPane + * * @editor zhou * @since 2012-3-23下午3:48:10 */ public class ReportletParameterViewPane extends BasicPane { - private UITableEditorPane editorPane; + private UITableEditorPane editorPane; - public ReportletParameterViewPane() { - this(null, ParameterTableModel.NO_CHART_USE); - } + public ReportletParameterViewPane() { + this(null, ParameterTableModel.NO_CHART_USE); + } - // kunsnat: 控制是否用Chart的热点链接actions - public ReportletParameterViewPane(int useParaType) { - this(null, useParaType); - } + // kunsnat: 控制是否用Chart的热点链接actions + public ReportletParameterViewPane(int useParaType) { + this(null, useParaType); + } - public ReportletParameterViewPane(UITableEditAction[] actions, int useParaType) { - this(actions, useParaType, ValueEditorPaneFactory.createVallueEditorPaneWithUseType(useParaType), - ValueEditorPaneFactory.createVallueEditorPaneWithUseType(useParaType)); - } + public ReportletParameterViewPane(UITableEditAction[] actions, int useParaType) { + this(actions, useParaType, ValueEditorPaneFactory.createVallueEditorPaneWithUseType(useParaType), + ValueEditorPaneFactory.createVallueEditorPaneWithUseType(useParaType)); + } - public ReportletParameterViewPane(int useParaType, ValueEditorPane valueEditorPane, ValueEditorPane valueRenderPane) { - this(null, useParaType, valueEditorPane, valueRenderPane); - } + public ReportletParameterViewPane(int useParaType, ValueEditorPane valueEditorPane, ValueEditorPane valueRenderPane) { + this(null, useParaType, valueEditorPane, valueRenderPane); + } - public ReportletParameterViewPane(UITableEditAction[] actions, int useParaType, ValueEditorPane valueEditorPane, ValueEditorPane valueRenderPane) { - this.initComponent(actions, useParaType, valueEditorPane, valueRenderPane); - } + public ReportletParameterViewPane(UITableEditAction[] actions, int useParaType, ValueEditorPane valueEditorPane, ValueEditorPane valueRenderPane) { + this.initComponent(actions, useParaType, valueEditorPane, valueRenderPane); + } /** * 初始化组件 - * @param actions Chart的热点链接actions - * @param useParaType 类型 + * + * @param actions Chart的热点链接actions + * @param useParaType 类型 */ - public void initComponent(final UITableEditAction[] actions, int useParaType, ValueEditorPane valueEditorPane, ValueEditorPane valueRenderPane) { - this.setLayout(FRGUIPaneFactory.createBorderLayout()); - - if (useParaType != ParameterTableModel.NO_CHART_USE) { - ParameterTableModel model = new ParameterTableModel(valueEditorPane, valueRenderPane, this) { - @Override - public UITableEditAction[] createAction() { - UITableEditAction[] tableEditActions = new UITableEditAction[] { new AddChartParameterAction(), new DeleteAction(this.component), - new MoveUpAction(), new MoveDownAction() }; - return (UITableEditAction[]) ArrayUtils.addAll(tableEditActions, actions); - } - }; - editorPane = new UITableEditorPane(model); - } else { - editorPane = new UITableEditorPane(new ParameterTableModel() { - @Override - public UITableEditAction[] createAction() { - return (UITableEditAction[]) ArrayUtils.addAll(super.createAction(), actions); - } - }); - } - - this.add(editorPane, BorderLayout.CENTER); - } + public void initComponent(final UITableEditAction[] actions, int useParaType, ValueEditorPane valueEditorPane, ValueEditorPane valueRenderPane) { + this.setLayout(FRGUIPaneFactory.createBorderLayout()); + + if (useParaType != ParameterTableModel.NO_CHART_USE) { + ParameterTableModel model = new ParameterTableModel(valueEditorPane, valueRenderPane, this) { + @Override + public UITableEditAction[] createAction() { + UITableEditAction[] tableEditActions = new UITableEditAction[]{new AddChartParameterAction(), new DeleteAction(this.component), + new MoveUpAction(), new MoveDownAction()}; + return (UITableEditAction[]) ArrayUtils.addAll(tableEditActions, actions); + } + }; + editorPane = new UITableEditorPane(model); + } else { + editorPane = new UITableEditorPane(new ParameterTableModel() { + @Override + public UITableEditAction[] createAction() { + return (UITableEditAction[]) ArrayUtils.addAll(super.createAction(), actions); + } + }); + } + + this.add(editorPane, BorderLayout.CENTER); + } /** * 增加事件监听 - * @param l 加的东东 + * + * @param l 加的东东 */ - public void addTableEditorListener(TableModelListener l) { - editorPane.addTableListener(l); - } - - @Override - protected String title4PopupWindow() { - return Inter.getLocText("Parameters"); - } - - public void populate(ParameterProvider[] parameters) { - if (parameters == null) { - return; - } - editorPane.populate(parameters); - } - - public void populate(KV[] kv) { - if (kv == null) { - return; - } - Parameter[] parameters = new Parameter[kv.length]; - for (int i = 0; i < kv.length; i++) { - parameters[i] = new Parameter(kv[i].getKey(), kv[i].getValue()); - } - this.populate(parameters); - } - - public List update() { - return editorPane.update(); - } + public void addTableEditorListener(TableModelListener l) { + editorPane.addTableListener(l); + } + + @Override + protected String title4PopupWindow() { + return Inter.getLocText("Parameters"); + } + + public void populate(ParameterProvider[] parameters) { + if (parameters == null) { + return; + } + editorPane.populate(parameters); + } + + public void populate(KV[] kv) { + if (kv == null) { + return; + } + Parameter[] parameters = new Parameter[kv.length]; + for (int i = 0; i < kv.length; i++) { + parameters[i] = new Parameter(kv[i].getKey(), kv[i].getValue()); + } + this.populate(parameters); + } + + public List update() { + return editorPane.update(); + } + + public void update(List list) { + editorPane.update(list); + } + /** * 更新 - * @return 数组 + * + * @return 数组 */ - public KV[] updateKV() { - List list = this.update(); - int length = list.size(); - KV[] kv = new KV[length]; - for (int i = 0; i < length; i++) { - kv[i] = new KV(); - kv[i].setKey(list.get(i).getName()); - kv[i].setValue( list.get(i).getValue()); - } - return kv; - } + public KV[] updateKV() { + List list = this.update(); + int length = list.size(); + KV[] kv = new KV[length]; + for (int i = 0; i < length; i++) { + kv[i] = new KV(); + kv[i].setKey(list.get(i).getName()); + kv[i].setValue(list.get(i).getValue()); + } + return kv; + } } \ No newline at end of file diff --git a/designer_base/src/com/fr/design/gui/itableeditorpane/UITableEditorPane.java b/designer_base/src/com/fr/design/gui/itableeditorpane/UITableEditorPane.java index 50f441d976..316879a423 100644 --- a/designer_base/src/com/fr/design/gui/itableeditorpane/UITableEditorPane.java +++ b/designer_base/src/com/fr/design/gui/itableeditorpane/UITableEditorPane.java @@ -1,12 +1,12 @@ package com.fr.design.gui.itableeditorpane; -import com.fr.design.constants.UIConstants; import com.fr.design.border.UIRoundedBorder; +import com.fr.design.constants.UIConstants; +import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.dialog.BasicPane; import com.fr.general.Inter; import javax.swing.*; @@ -16,19 +16,19 @@ import java.util.List; /** * 表格编辑面板,一般是两列.键-值 用泛型实现，用的时候请定义T.model里面的T要一样 - * + * * @editor zhou * @since 2012-3-28下午3:06:30 */ public class UITableEditorPane extends BasicPane { - /** - * - */ - private static final long serialVersionUID = 6855793816972735815L; - private JTable editTable; - // 放置action 的按钮. - private UITableModelAdapter tableModel; - private String leftLabelName; + /** + * + */ + private static final long serialVersionUID = 6855793816972735815L; + private JTable editTable; + // 放置action 的按钮. + private UITableModelAdapter tableModel; + private String leftLabelName; private JPanel buttonPane; public UITableEditorPane(UITableModelAdapter model) { @@ -66,7 +66,7 @@ public class UITableEditorPane extends BasicPane { return tableModel; } - private void initbuttonPane(UITableEditAction[] action){ + private void initbuttonPane(UITableEditAction[] action) { buttonPane = new JPanel(); if (action != null) { @@ -88,54 +88,61 @@ public class UITableEditorPane extends BasicPane { /** * 增加事件监听 - * @param l 加的东东 + * + * @param l 加的东东 */ - public void addTableListener(TableModelListener l) { - tableModel.addTableModelListener(l); - } + public void addTableListener(TableModelListener l) { + tableModel.addTableModelListener(l); + } /** * 移除事件监听 - * @param l 去的东东 + * + * @param l 去的东东 */ - public void removeTableListener(TableModelListener l) { - tableModel.removeTableModelListener(l); - } + public void removeTableListener(TableModelListener l) { + tableModel.removeTableModelListener(l); + } - @Override - protected String title4PopupWindow() { - return Inter.getLocText("TableData_Dynamic_Parameter_Setting"); - } + @Override + protected String title4PopupWindow() { + return Inter.getLocText("TableData_Dynamic_Parameter_Setting"); + } - public void populate(T[] objs) { - tableModel.clear(); - if(objs==null){ - return; - } - for (T obj : objs) { - tableModel.addRow(obj); - } - this.tableModel.fireTableDataChanged(); - if (objs.length > 0) { - this.editTable.getSelectionModel().setSelectionInterval(0, 0); - } - } + public void populate(T[] objs) { + tableModel.clear(); + if (objs == null) { + return; + } + for (T obj : objs) { + tableModel.addRow(obj); + } + this.tableModel.fireTableDataChanged(); + if (objs.length > 0) { + this.editTable.getSelectionModel().setSelectionInterval(0, 0); + } + } - // TODO:august这个最好还是返回数组 - public List update() { - tableModel.stopCellEditing(); - return tableModel.getList(); - } + // TODO:august这个最好还是返回数组 + public List update() { + tableModel.stopCellEditing(); + return tableModel.getList(); + } - public int getSelectedRow() { - return this.editTable.getSelectedRow(); - } + public void update(List list) { + tableModel.stopCellEditing(); + tableModel.setList(list); + } - public int getSelectedColumn() { - return this.editTable.getSelectedColumn(); - } + public int getSelectedRow() { + return this.editTable.getSelectedRow(); + } + + public int getSelectedColumn() { + return this.editTable.getSelectedColumn(); + } - public JPanel getbuttonPane(){ + public JPanel getbuttonPane() { return buttonPane; } diff --git a/designer_base/src/com/fr/design/images/arrow/arrow_down.png b/designer_base/src/com/fr/design/images/arrow/arrow_down.png index f044ad4c15..ac8c423944 100644 Binary files a/designer_base/src/com/fr/design/images/arrow/arrow_down.png and b/designer_base/src/com/fr/design/images/arrow/arrow_down.png differ diff --git a/designer_base/src/com/fr/design/images/arrow/arrow_up.png b/designer_base/src/com/fr/design/images/arrow/arrow_up.png index a613a4e7b6..283ad88f58 100644 Binary files a/designer_base/src/com/fr/design/images/arrow/arrow_up.png and b/designer_base/src/com/fr/design/images/arrow/arrow_up.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/add.png b/designer_base/src/com/fr/design/images/buttonicon/add.png index 98cde552d3..432fe208ac 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/add.png and b/designer_base/src/com/fr/design/images/buttonicon/add.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/add_press.png b/designer_base/src/com/fr/design/images/buttonicon/add_press.png index f0921e4427..f3268f9b61 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/add_press.png and b/designer_base/src/com/fr/design/images/buttonicon/add_press.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/addicon.png b/designer_base/src/com/fr/design/images/buttonicon/addicon.png index d12f1faf57..bd90eb7c1e 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/addicon.png and b/designer_base/src/com/fr/design/images/buttonicon/addicon.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/cube.png b/designer_base/src/com/fr/design/images/buttonicon/cube.png index 23d27849c0..ee024f10ea 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/cube.png and b/designer_base/src/com/fr/design/images/buttonicon/cube.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/editp.png b/designer_base/src/com/fr/design/images/buttonicon/editp.png index 16b59563c3..fd1cde458e 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/editp.png and b/designer_base/src/com/fr/design/images/buttonicon/editp.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/hiden.png b/designer_base/src/com/fr/design/images/buttonicon/hiden.png index d75cff80e4..ea0030304f 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/hiden.png and b/designer_base/src/com/fr/design/images/buttonicon/hiden.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/hidep.png b/designer_base/src/com/fr/design/images/buttonicon/hidep.png index 6e5b72b34b..a40f9db9c8 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/hidep.png and b/designer_base/src/com/fr/design/images/buttonicon/hidep.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/minus.png b/designer_base/src/com/fr/design/images/buttonicon/minus.png index bc68e3a8c5..569e998491 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/minus.png and b/designer_base/src/com/fr/design/images/buttonicon/minus.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/newcpts.png b/designer_base/src/com/fr/design/images/buttonicon/newcpts.png index 4b28f291e1..0a68f6c88c 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/newcpts.png and b/designer_base/src/com/fr/design/images/buttonicon/newcpts.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/open.png b/designer_base/src/com/fr/design/images/buttonicon/open.png index 369c79356e..ed92604ca6 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/open.png and b/designer_base/src/com/fr/design/images/buttonicon/open.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/pageb24.png b/designer_base/src/com/fr/design/images/buttonicon/pageb24.png index 33c1a4bf49..67127219d8 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/pageb24.png and b/designer_base/src/com/fr/design/images/buttonicon/pageb24.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/pages.png b/designer_base/src/com/fr/design/images/buttonicon/pages.png index c54f9ca9c9..bf91c74a03 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/pages.png and b/designer_base/src/com/fr/design/images/buttonicon/pages.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/plus.png b/designer_base/src/com/fr/design/images/buttonicon/plus.png index e864ca822d..dd5800914d 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/plus.png and b/designer_base/src/com/fr/design/images/buttonicon/plus.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/redo.png b/designer_base/src/com/fr/design/images/buttonicon/redo.png index 12be726de0..f6b77b4f47 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/redo.png and b/designer_base/src/com/fr/design/images/buttonicon/redo.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/refresh.png b/designer_base/src/com/fr/design/images/buttonicon/refresh.png index c635fb8d5b..37df066470 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/refresh.png and b/designer_base/src/com/fr/design/images/buttonicon/refresh.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/run24.png b/designer_base/src/com/fr/design/images/buttonicon/run24.png index ebdac1d621..8628e02a66 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/run24.png and b/designer_base/src/com/fr/design/images/buttonicon/run24.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/undo.png b/designer_base/src/com/fr/design/images/buttonicon/undo.png index 509ddb3a82..f86a17441d 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/undo.png and b/designer_base/src/com/fr/design/images/buttonicon/undo.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/writeb24.png b/designer_base/src/com/fr/design/images/buttonicon/writeb24.png index 5fdbb0eacf..92e3443831 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/writeb24.png and b/designer_base/src/com/fr/design/images/buttonicon/writeb24.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/writes.png b/designer_base/src/com/fr/design/images/buttonicon/writes.png index 72a099299d..16ea8e50ad 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/writes.png and b/designer_base/src/com/fr/design/images/buttonicon/writes.png differ diff --git a/designer_base/src/com/fr/design/images/chart/ChartStyle.png b/designer_base/src/com/fr/design/images/chart/ChartStyle.png index 129c25335a..3d1e6d7e4e 100644 Binary files a/designer_base/src/com/fr/design/images/chart/ChartStyle.png and b/designer_base/src/com/fr/design/images/chart/ChartStyle.png differ diff --git a/designer_base/src/com/fr/design/images/chart/ChartType.png b/designer_base/src/com/fr/design/images/chart/ChartType.png index ef9987a8d4..504ca94847 100644 Binary files a/designer_base/src/com/fr/design/images/chart/ChartType.png and b/designer_base/src/com/fr/design/images/chart/ChartType.png differ diff --git a/designer_base/src/com/fr/design/images/chart/InterAttr.png b/designer_base/src/com/fr/design/images/chart/InterAttr.png index 827f83db53..eda00984cf 100644 Binary files a/designer_base/src/com/fr/design/images/chart/InterAttr.png and b/designer_base/src/com/fr/design/images/chart/InterAttr.png differ diff --git a/designer_base/src/com/fr/design/images/control/addPopup.png b/designer_base/src/com/fr/design/images/control/addPopup.png index c337d8c640..db3368e363 100644 Binary files a/designer_base/src/com/fr/design/images/control/addPopup.png and b/designer_base/src/com/fr/design/images/control/addPopup.png differ diff --git a/designer_base/src/com/fr/design/images/control/bar.png b/designer_base/src/com/fr/design/images/control/bar.png index 958fe20adc..d31ce01297 100644 Binary files a/designer_base/src/com/fr/design/images/control/bar.png and b/designer_base/src/com/fr/design/images/control/bar.png differ diff --git a/designer_base/src/com/fr/design/images/control/copy.png b/designer_base/src/com/fr/design/images/control/copy.png index b70fd4bb0b..4d93d0ee5b 100644 Binary files a/designer_base/src/com/fr/design/images/control/copy.png and b/designer_base/src/com/fr/design/images/control/copy.png differ diff --git a/designer_base/src/com/fr/design/images/control/edit.png b/designer_base/src/com/fr/design/images/control/edit.png index 3ce387e789..7491cb9c23 100644 Binary files a/designer_base/src/com/fr/design/images/control/edit.png and b/designer_base/src/com/fr/design/images/control/edit.png differ diff --git a/designer_base/src/com/fr/design/images/control/remove.png b/designer_base/src/com/fr/design/images/control/remove.png index 3142c589df..5c889b8bac 100644 Binary files a/designer_base/src/com/fr/design/images/control/remove.png and b/designer_base/src/com/fr/design/images/control/remove.png differ diff --git a/designer_base/src/com/fr/design/images/dashboard/files.png b/designer_base/src/com/fr/design/images/dashboard/files.png index 4d07d8d4a0..69d482a36f 100644 Binary files a/designer_base/src/com/fr/design/images/dashboard/files.png and b/designer_base/src/com/fr/design/images/dashboard/files.png differ diff --git a/designer_base/src/com/fr/design/images/data/bind/distanceconnect.png b/designer_base/src/com/fr/design/images/data/bind/distanceconnect.png index d8e26b2276..2ec210d208 100644 Binary files a/designer_base/src/com/fr/design/images/data/bind/distanceconnect.png and b/designer_base/src/com/fr/design/images/data/bind/distanceconnect.png differ diff --git a/designer_base/src/com/fr/design/images/data/bind/localconnect.png b/designer_base/src/com/fr/design/images/data/bind/localconnect.png index 369f5d9b99..d8134eca7f 100644 Binary files a/designer_base/src/com/fr/design/images/data/bind/localconnect.png and b/designer_base/src/com/fr/design/images/data/bind/localconnect.png differ diff --git a/designer_base/src/com/fr/design/images/data/dataDictionary.png b/designer_base/src/com/fr/design/images/data/dataDictionary.png index 2f0fc8c870..516d368b27 100644 Binary files a/designer_base/src/com/fr/design/images/data/dataDictionary.png and b/designer_base/src/com/fr/design/images/data/dataDictionary.png differ diff --git a/designer_base/src/com/fr/design/images/data/dataTable.png b/designer_base/src/com/fr/design/images/data/dataTable.png index 0a17322a8c..1517e0d6da 100644 Binary files a/designer_base/src/com/fr/design/images/data/dataTable.png and b/designer_base/src/com/fr/design/images/data/dataTable.png differ diff --git a/designer_base/src/com/fr/design/images/data/dock/serverdatabase.png b/designer_base/src/com/fr/design/images/data/dock/serverdatabase.png index 93593ecad5..1ca875ba17 100644 Binary files a/designer_base/src/com/fr/design/images/data/dock/serverdatabase.png and b/designer_base/src/com/fr/design/images/data/dock/serverdatabase.png differ diff --git a/designer_base/src/com/fr/design/images/data/multi.png b/designer_base/src/com/fr/design/images/data/multi.png index ca55ee911d..8242a9e3b4 100644 Binary files a/designer_base/src/com/fr/design/images/data/multi.png and b/designer_base/src/com/fr/design/images/data/multi.png differ diff --git a/designer_base/src/com/fr/design/images/data/source/rename.png b/designer_base/src/com/fr/design/images/data/source/rename.png index 8422b4f932..5c244dd5d4 100644 Binary files a/designer_base/src/com/fr/design/images/data/source/rename.png and b/designer_base/src/com/fr/design/images/data/source/rename.png differ diff --git a/designer_base/src/com/fr/design/images/file/fold.png b/designer_base/src/com/fr/design/images/file/fold.png index da58e790dd..69d482a36f 100644 Binary files a/designer_base/src/com/fr/design/images/file/fold.png and b/designer_base/src/com/fr/design/images/file/fold.png differ diff --git a/designer_base/src/com/fr/design/images/file/newfolder.png b/designer_base/src/com/fr/design/images/file/newfolder.png index 1fc3b2afae..259064881c 100644 Binary files a/designer_base/src/com/fr/design/images/file/newfolder.png and b/designer_base/src/com/fr/design/images/file/newfolder.png differ diff --git a/designer_base/src/com/fr/design/images/form/toolbar/ec_frozen.png b/designer_base/src/com/fr/design/images/form/toolbar/ec_frozen.png index d1b29e4692..bae5ddaea2 100644 Binary files a/designer_base/src/com/fr/design/images/form/toolbar/ec_frozen.png and b/designer_base/src/com/fr/design/images/form/toolbar/ec_frozen.png differ diff --git a/designer_base/src/com/fr/design/images/gui/color/background.png b/designer_base/src/com/fr/design/images/gui/color/background.png index 0dc9491c33..c562645348 100644 Binary files a/designer_base/src/com/fr/design/images/gui/color/background.png and b/designer_base/src/com/fr/design/images/gui/color/background.png differ diff --git a/designer_base/src/com/fr/design/images/lookandfeel/ErrorIcon.png b/designer_base/src/com/fr/design/images/lookandfeel/ErrorIcon.png index 8404e72037..ff0450a5a4 100644 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/ErrorIcon.png and b/designer_base/src/com/fr/design/images/lookandfeel/ErrorIcon.png differ diff --git a/designer_base/src/com/fr/design/images/lookandfeel/InformationIcon.png b/designer_base/src/com/fr/design/images/lookandfeel/InformationIcon.png index a81f92580a..480c829ed2 100644 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/InformationIcon.png and b/designer_base/src/com/fr/design/images/lookandfeel/InformationIcon.png differ diff --git a/designer_base/src/com/fr/design/images/lookandfeel/QuestionIcon.png b/designer_base/src/com/fr/design/images/lookandfeel/QuestionIcon.png index 2ca3e141b8..7fe24c0885 100644 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/QuestionIcon.png and b/designer_base/src/com/fr/design/images/lookandfeel/QuestionIcon.png differ diff --git a/designer_base/src/com/fr/design/images/lookandfeel/TreeFolderOpenedIcon.png b/designer_base/src/com/fr/design/images/lookandfeel/TreeFolderOpenedIcon.png index 4281dc8875..ed92604ca6 100644 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/TreeFolderOpenedIcon.png and b/designer_base/src/com/fr/design/images/lookandfeel/TreeFolderOpenedIcon.png differ diff --git a/designer_base/src/com/fr/design/images/lookandfeel/WarningIcon.png b/designer_base/src/com/fr/design/images/lookandfeel/WarningIcon.png index 35e3e50f67..155b296e6c 100644 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/WarningIcon.png and b/designer_base/src/com/fr/design/images/lookandfeel/WarningIcon.png differ diff --git a/designer_base/src/com/fr/design/images/m_edit/copy.png b/designer_base/src/com/fr/design/images/m_edit/copy.png index caf8872b82..4d93d0ee5b 100644 Binary files a/designer_base/src/com/fr/design/images/m_edit/copy.png and b/designer_base/src/com/fr/design/images/m_edit/copy.png differ diff --git a/designer_base/src/com/fr/design/images/m_edit/cut.png b/designer_base/src/com/fr/design/images/m_edit/cut.png index 527cc0d488..dded7fd3e5 100644 Binary files a/designer_base/src/com/fr/design/images/m_edit/cut.png and b/designer_base/src/com/fr/design/images/m_edit/cut.png differ diff --git a/designer_base/src/com/fr/design/images/m_edit/formatBrush.png b/designer_base/src/com/fr/design/images/m_edit/formatBrush.png index df49c5049b..c821df52be 100644 Binary files a/designer_base/src/com/fr/design/images/m_edit/formatBrush.png and b/designer_base/src/com/fr/design/images/m_edit/formatBrush.png differ diff --git a/designer_base/src/com/fr/design/images/m_edit/merge.png b/designer_base/src/com/fr/design/images/m_edit/merge.png index 84471ef04a..5924dc1e0f 100644 Binary files a/designer_base/src/com/fr/design/images/m_edit/merge.png and b/designer_base/src/com/fr/design/images/m_edit/merge.png differ diff --git a/designer_base/src/com/fr/design/images/m_edit/unmerge.png b/designer_base/src/com/fr/design/images/m_edit/unmerge.png index b7b5721276..43423aee10 100644 Binary files a/designer_base/src/com/fr/design/images/m_edit/unmerge.png and b/designer_base/src/com/fr/design/images/m_edit/unmerge.png differ diff --git a/designer_base/src/com/fr/design/images/m_file/formExport.png b/designer_base/src/com/fr/design/images/m_file/formExport.png index 42c232cee3..b513d073b1 100644 Binary files a/designer_base/src/com/fr/design/images/m_file/formExport.png and b/designer_base/src/com/fr/design/images/m_file/formExport.png differ diff --git a/designer_base/src/com/fr/design/images/m_file/pdf.png b/designer_base/src/com/fr/design/images/m_file/pdf.png index 7e0bf68a54..e5b6709ede 100644 Binary files a/designer_base/src/com/fr/design/images/m_file/pdf.png and b/designer_base/src/com/fr/design/images/m_file/pdf.png differ diff --git a/designer_base/src/com/fr/design/images/m_file/preview.png b/designer_base/src/com/fr/design/images/m_file/preview.png index 6a87163344..8628e02a66 100644 Binary files a/designer_base/src/com/fr/design/images/m_file/preview.png and b/designer_base/src/com/fr/design/images/m_file/preview.png differ diff --git a/designer_base/src/com/fr/design/images/m_file/saveAs.png b/designer_base/src/com/fr/design/images/m_file/saveAs.png index a2ef8d6001..fd2303d243 100644 Binary files a/designer_base/src/com/fr/design/images/m_file/saveAs.png and b/designer_base/src/com/fr/design/images/m_file/saveAs.png differ diff --git a/designer_base/src/com/fr/design/images/m_file/switch.png b/designer_base/src/com/fr/design/images/m_file/switch.png index e2ae481e00..cbf7cfb991 100644 Binary files a/designer_base/src/com/fr/design/images/m_file/switch.png and b/designer_base/src/com/fr/design/images/m_file/switch.png differ diff --git a/designer_base/src/com/fr/design/images/m_file/text.png b/designer_base/src/com/fr/design/images/m_file/text.png index e1895978c3..900a6de0c0 100644 Binary files a/designer_base/src/com/fr/design/images/m_file/text.png and b/designer_base/src/com/fr/design/images/m_file/text.png differ diff --git a/designer_base/src/com/fr/design/images/m_file/view_folder.png b/designer_base/src/com/fr/design/images/m_file/view_folder.png index 562854c847..4d16dc7aea 100644 Binary files a/designer_base/src/com/fr/design/images/m_file/view_folder.png and b/designer_base/src/com/fr/design/images/m_file/view_folder.png differ diff --git a/designer_base/src/com/fr/design/images/m_file/word.png b/designer_base/src/com/fr/design/images/m_file/word.png index b5f2534a9e..62bc3aff44 100644 Binary files a/designer_base/src/com/fr/design/images/m_file/word.png and b/designer_base/src/com/fr/design/images/m_file/word.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/bold.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/bold.png index dc86e5ae99..676d461289 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/bold.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/bold.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/italic.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/italic.png index d4088b5796..6b36a5c1ac 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/italic.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/italic.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/otherset.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/otherset.png index cdef0467c3..5cd5db7165 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/otherset.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/otherset.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/underline.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/underline.png index 3e4426448b..47caa60e35 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/underline.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/underline.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/highlight.png b/designer_base/src/com/fr/design/images/m_format/highlight.png index 3aee9dd988..7491cb9c23 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/highlight.png and b/designer_base/src/com/fr/design/images/m_format/highlight.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/modified.png b/designer_base/src/com/fr/design/images/m_format/modified.png index 53ff9b6ccb..160e737a2e 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/modified.png and b/designer_base/src/com/fr/design/images/m_format/modified.png differ diff --git a/designer_base/src/com/fr/design/images/m_help/demo.png b/designer_base/src/com/fr/design/images/m_help/demo.png index c60877fe6b..6e34e21bea 100644 Binary files a/designer_base/src/com/fr/design/images/m_help/demo.png and b/designer_base/src/com/fr/design/images/m_help/demo.png differ diff --git a/designer_base/src/com/fr/design/images/m_help/feedback.png b/designer_base/src/com/fr/design/images/m_help/feedback.png index 2b02f585b2..7a195fd4ed 100644 Binary files a/designer_base/src/com/fr/design/images/m_help/feedback.png and b/designer_base/src/com/fr/design/images/m_help/feedback.png differ diff --git a/designer_base/src/com/fr/design/images/m_help/help.png b/designer_base/src/com/fr/design/images/m_help/help.png index c70b6b77dd..e50a5b70c0 100644 Binary files a/designer_base/src/com/fr/design/images/m_help/help.png and b/designer_base/src/com/fr/design/images/m_help/help.png differ diff --git a/designer_base/src/com/fr/design/images/m_help/product_forum.png b/designer_base/src/com/fr/design/images/m_help/product_forum.png index 50e96bb873..76e2116c64 100644 Binary files a/designer_base/src/com/fr/design/images/m_help/product_forum.png and b/designer_base/src/com/fr/design/images/m_help/product_forum.png differ diff --git a/designer_base/src/com/fr/design/images/m_insert/cell.png b/designer_base/src/com/fr/design/images/m_insert/cell.png index 7540801488..22fb4eb688 100644 Binary files a/designer_base/src/com/fr/design/images/m_insert/cell.png and b/designer_base/src/com/fr/design/images/m_insert/cell.png differ diff --git a/designer_base/src/com/fr/design/images/m_insert/chart.png b/designer_base/src/com/fr/design/images/m_insert/chart.png index f65529fc23..504ca94847 100644 Binary files a/designer_base/src/com/fr/design/images/m_insert/chart.png and b/designer_base/src/com/fr/design/images/m_insert/chart.png differ diff --git a/designer_base/src/com/fr/design/images/m_insert/insertColumn.png b/designer_base/src/com/fr/design/images/m_insert/insertColumn.png index e625c25dde..c32da612b6 100644 Binary files a/designer_base/src/com/fr/design/images/m_insert/insertColumn.png and b/designer_base/src/com/fr/design/images/m_insert/insertColumn.png differ diff --git a/designer_base/src/com/fr/design/images/m_report/background.png b/designer_base/src/com/fr/design/images/m_report/background.png index 1a5e533685..cc19990d3b 100644 Binary files a/designer_base/src/com/fr/design/images/m_report/background.png and b/designer_base/src/com/fr/design/images/m_report/background.png differ diff --git a/designer_base/src/com/fr/design/images/m_report/close.png b/designer_base/src/com/fr/design/images/m_report/close.png index 5d7c014fa4..2b4e8a3a79 100644 Binary files a/designer_base/src/com/fr/design/images/m_report/close.png and b/designer_base/src/com/fr/design/images/m_report/close.png differ diff --git a/designer_base/src/com/fr/design/images/m_report/close_over.png b/designer_base/src/com/fr/design/images/m_report/close_over.png index 728a46dbcd..149ca323a1 100644 Binary files a/designer_base/src/com/fr/design/images/m_report/close_over.png and b/designer_base/src/com/fr/design/images/m_report/close_over.png differ diff --git a/designer_base/src/com/fr/design/images/m_report/close_press.png b/designer_base/src/com/fr/design/images/m_report/close_press.png index b3dd9dbdc0..a75cff2549 100644 Binary files a/designer_base/src/com/fr/design/images/m_report/close_press.png and b/designer_base/src/com/fr/design/images/m_report/close_press.png differ diff --git a/designer_base/src/com/fr/design/images/m_report/footer.png b/designer_base/src/com/fr/design/images/m_report/footer.png index 39c7e0dc09..843c8bc592 100644 Binary files a/designer_base/src/com/fr/design/images/m_report/footer.png and b/designer_base/src/com/fr/design/images/m_report/footer.png differ diff --git a/designer_base/src/com/fr/design/images/m_report/header.png b/designer_base/src/com/fr/design/images/m_report/header.png index 00d095ecaa..e7961cd4ec 100644 Binary files a/designer_base/src/com/fr/design/images/m_report/header.png and b/designer_base/src/com/fr/design/images/m_report/header.png differ diff --git a/designer_base/src/com/fr/design/images/m_report/linearAttr.png b/designer_base/src/com/fr/design/images/m_report/linearAttr.png index ce8ea71ee2..b6398ea113 100644 Binary files a/designer_base/src/com/fr/design/images/m_report/linearAttr.png and b/designer_base/src/com/fr/design/images/m_report/linearAttr.png differ diff --git a/designer_base/src/com/fr/design/images/m_report/reportWriteAttr.png b/designer_base/src/com/fr/design/images/m_report/reportWriteAttr.png index c81fb8e761..99d321e676 100644 Binary files a/designer_base/src/com/fr/design/images/m_report/reportWriteAttr.png and b/designer_base/src/com/fr/design/images/m_report/reportWriteAttr.png differ diff --git a/designer_base/src/com/fr/design/images/m_report/webreportattribute.png b/designer_base/src/com/fr/design/images/m_report/webreportattribute.png index 3a0129cad2..1e29591c08 100644 Binary files a/designer_base/src/com/fr/design/images/m_report/webreportattribute.png and b/designer_base/src/com/fr/design/images/m_report/webreportattribute.png differ diff --git a/designer_base/src/com/fr/design/images/m_web/cache.png b/designer_base/src/com/fr/design/images/m_web/cache.png index 85b9d9ee44..9e766b10d7 100644 Binary files a/designer_base/src/com/fr/design/images/m_web/cache.png and b/designer_base/src/com/fr/design/images/m_web/cache.png differ diff --git a/designer_base/src/com/fr/design/images/server/plugin.png b/designer_base/src/com/fr/design/images/server/plugin.png index fe80282ed4..290ce7a19e 100644 Binary files a/designer_base/src/com/fr/design/images/server/plugin.png and b/designer_base/src/com/fr/design/images/server/plugin.png differ