diff --git a/designer/src/com/fr/design/actions/cell/style/StyleBackgroundAction.java b/designer/src/com/fr/design/actions/cell/style/StyleBackgroundAction.java index 0ef9f5538..168a17ee3 100644 --- a/designer/src/com/fr/design/actions/cell/style/StyleBackgroundAction.java +++ b/designer/src/com/fr/design/actions/cell/style/StyleBackgroundAction.java @@ -51,21 +51,21 @@ public class StyleBackgroundAction extends AbstractStyleAction implements Change } @Override - public boolean isFontStye() { - return false; - } + public boolean isFontStye() { + return false; + } - @Override - public JComponent createToolBarComponent() { - Object object = this.getValue(UIToolbarColorButton.class.getName()); - if (object == null || !(object instanceof UIToolbarColorButton)) { - UIToolbarColorButton tbButton = new UIToolbarColorButton(BaseUtils.readIcon("/com/fr/design/images/gui/color/background.png")); - tbButton.set4Toolbar(); - this.putValue(UIToolbarColorButton.class.getName(), tbButton); + @Override + public JComponent createToolBarComponent() { + Object object = this.getValue(UIToolbarColorButton.class.getName()); + if (object == null || !(object instanceof UIToolbarColorButton)) { + UIToolbarColorButton tbButton = new UIToolbarColorButton(BaseUtils.readIcon("/com/fr/design/images/gui/color/background.png")); + tbButton.set4Toolbar(); + this.putValue(UIToolbarColorButton.class.getName(), tbButton); - tbButton.setEnabled(this.isEnabled()); - tbButton.setColor(Color.WHITE); - tbButton.addColorChangeListener(this); + tbButton.setEnabled(this.isEnabled()); + tbButton.setColor(Color.WHITE); + tbButton.addColorChangeListener(this); //peter:产生tooltip tbButton.setToolTipText(ActionFactory.createButtonToolTipText(this)); diff --git a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFinePane.java b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFinePane.java index 0aab6a7d4..cfd37479e 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFinePane.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFinePane.java @@ -6,6 +6,7 @@ import com.fr.design.actions.help.alphafine.AlphaFineListener; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.mainframe.alphafine.AlphaFineHelper; +import com.fr.design.utils.ThemeUtils; import com.fr.general.IOUtils; import com.fr.general.Inter; @@ -30,6 +31,7 @@ public class AlphaFinePane extends BasicPane { refreshButton.setToolTipText(Inter.getLocText("FR-Designer_AlphaFine")); refreshButton.set4ToolbarButton(); this.add(refreshButton); + this.setBackground(ThemeUtils.WHITE_BORDER_COLOR); refreshButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { diff --git a/designer/src/com/fr/design/mainframe/alphafine/images/alphafine1.png b/designer/src/com/fr/design/mainframe/alphafine/images/alphafine1.png deleted file mode 100644 index 8d5464a6d..000000000 Binary files a/designer/src/com/fr/design/mainframe/alphafine/images/alphafine1.png and /dev/null differ diff --git a/designer/src/com/fr/design/mainframe/alphafine/images/alphafine2.png b/designer/src/com/fr/design/mainframe/alphafine/images/alphafine2.png deleted file mode 100644 index aae79cb06..000000000 Binary files a/designer/src/com/fr/design/mainframe/alphafine/images/alphafine2.png and /dev/null differ diff --git a/designer/src/com/fr/design/mainframe/alphafine/images/alphafine3.png b/designer/src/com/fr/design/mainframe/alphafine/images/alphafine3.png deleted file mode 100644 index 2657e4d06..000000000 Binary files a/designer/src/com/fr/design/mainframe/alphafine/images/alphafine3.png and /dev/null differ diff --git a/designer/src/com/fr/design/mainframe/alphafine/images/alphafine4.png b/designer/src/com/fr/design/mainframe/alphafine/images/alphafine4.png deleted file mode 100644 index e23a33ab5..000000000 Binary files a/designer/src/com/fr/design/mainframe/alphafine/images/alphafine4.png and /dev/null differ diff --git a/designer/src/com/fr/design/mainframe/alphafine/images/alphafine5.png b/designer/src/com/fr/design/mainframe/alphafine/images/alphafine5.png deleted file mode 100644 index 064f0d8e8..000000000 Binary files a/designer/src/com/fr/design/mainframe/alphafine/images/alphafine5.png and /dev/null differ diff --git a/designer/src/com/fr/design/mainframe/alphafine/images/selected1.png b/designer/src/com/fr/design/mainframe/alphafine/images/selected1.png deleted file mode 100644 index 3d7cf2514..000000000 Binary files a/designer/src/com/fr/design/mainframe/alphafine/images/selected1.png and /dev/null differ diff --git a/designer/src/com/fr/design/mainframe/alphafine/images/selected2.png b/designer/src/com/fr/design/mainframe/alphafine/images/selected2.png deleted file mode 100644 index dd04302fc..000000000 Binary files a/designer/src/com/fr/design/mainframe/alphafine/images/selected2.png and /dev/null differ diff --git a/designer/src/com/fr/design/mainframe/alphafine/images/selected3.png b/designer/src/com/fr/design/mainframe/alphafine/images/selected3.png deleted file mode 100644 index 6242e6194..000000000 Binary files a/designer/src/com/fr/design/mainframe/alphafine/images/selected3.png and /dev/null differ diff --git a/designer/src/com/fr/design/mainframe/alphafine/images/selected4.png b/designer/src/com/fr/design/mainframe/alphafine/images/selected4.png deleted file mode 100644 index 2d4c9b262..000000000 Binary files a/designer/src/com/fr/design/mainframe/alphafine/images/selected4.png and /dev/null differ diff --git a/designer/src/com/fr/design/mainframe/alphafine/images/selected5.png b/designer/src/com/fr/design/mainframe/alphafine/images/selected5.png deleted file mode 100644 index a4734fb91..000000000 Binary files a/designer/src/com/fr/design/mainframe/alphafine/images/selected5.png and /dev/null differ diff --git a/designer/src/com/fr/poly/PolyComponetsBar.java b/designer/src/com/fr/poly/PolyComponetsBar.java index 1413a26e1..625978bcd 100644 --- a/designer/src/com/fr/poly/PolyComponetsBar.java +++ b/designer/src/com/fr/poly/PolyComponetsBar.java @@ -34,7 +34,7 @@ public class PolyComponetsBar extends JToolBar { setOrientation(SwingConstants.VERTICAL); setBorder(BorderFactory.createEmptyBorder(4, 4, 0, 4)); setFloatable(false); - setBackground(UIConstants.NORMAL_BACKGROUND); + setBackground(UIConstants.TOOLBARUI_BACKGROUND); setLayout(FRGUIPaneFactory.create1ColumnGridLayout()); int typeLen = typeName.length < MAX_BAR_NUM ? typeName.length : MAX_BAR_NUM; serIcons = new SerIcon[typeLen + 1]; diff --git a/designer/src/com/fr/poly/PolyDesigner.java b/designer/src/com/fr/poly/PolyDesigner.java index 088ef95e0..0f7fcbc49 100644 --- a/designer/src/com/fr/poly/PolyDesigner.java +++ b/designer/src/com/fr/poly/PolyDesigner.java @@ -152,6 +152,7 @@ public class PolyDesigner extends ReportComponent= PRE_GAP && evtX <= PRE_GAP + newWorkBookIconMode.getIconWidth()); } public void setButtonGray(boolean isGray) { newWorkBookIconMode = isGray ? GRAY_NEW_CPT : getNew(); } public abstract Icon getNew(); public abstract Icon getMouseOverNew(); public abstract Icon getMousePressNew(); } \ No newline at end of file +package com.fr.design.file; import com.fr.base.BaseUtils; import com.fr.design.constants.UIConstants; import com.fr.design.mainframe.DesignerContext; import javax.swing.*; import java.awt.*; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; import java.awt.geom.Line2D; /** * Author : daisy * Date: 13-8-27 * Time: 下午6:07 */ public abstract class NewTemplatePane extends JComponent implements MouseListener, MouseMotionListener { private static final Icon GRAY_NEW_CPT = BaseUtils.readIcon("/com/fr/design/images/buttonicon/additicon_grey.png"); private static final int PRE_GAP = 0; private static final int HEIGHT = 26; private Graphics2D g2d; private Icon newWorkBookIconMode = null; private int newIconStartX = PRE_GAP; public NewTemplatePane() { newWorkBookIconMode = getNew(); this.setLayout(new BorderLayout(0, 0)); this.addMouseListener(this); this.addMouseMotionListener(this); this.setBorder(null); this.setForeground(new Color(99, 99, 99)); } public Dimension getPreferredSize() { Dimension dim = super.getPreferredSize(); dim.width = HEIGHT; return dim; } public void paintComponent(Graphics g) { super.paintComponent(g); g2d = (Graphics2D) g; int sheetIconY = (getHeight() - newWorkBookIconMode.getIconHeight()) / 2; newWorkBookIconMode.paintIcon(this, g2d, newIconStartX, sheetIconY); // paintUnderLine(g2d); } private void paintUnderLine(Graphics2D g2d) { //画下面的那条线 g2d.setPaint(UIConstants.LINE_COLOR); g2d.draw(new Line2D.Double((float) 0, (float) (getHeight()-1), getWidth(), (float) (getHeight()-1))); } /** *鼠标点击 * @param e 事件 */ public void mouseClicked(MouseEvent e) { if (BaseUtils.isAuthorityEditing()) { newWorkBookIconMode = GRAY_NEW_CPT; } } /** *鼠标按下 * @param e 事件 */ public void mousePressed(MouseEvent e) { int evtX = e.getX(); if (BaseUtils.isAuthorityEditing()) { newWorkBookIconMode = GRAY_NEW_CPT; } if (isOverNewIcon(evtX) && newWorkBookIconMode != GRAY_NEW_CPT) { newWorkBookIconMode = getMousePressNew(); newIconStartX = 0; DesignerContext.getDesignerFrame().addAndActivateJTemplate(); } this.repaint(); } /** *鼠标松开 * @param e 事件 */ public void mouseReleased(MouseEvent e) { if (BaseUtils.isAuthorityEditing()) { newWorkBookIconMode = GRAY_NEW_CPT; } } /** *鼠标进入 * @param e 事件 */ public void mouseEntered(MouseEvent e) { if (BaseUtils.isAuthorityEditing()) { newWorkBookIconMode = GRAY_NEW_CPT; } } /** *鼠标离开 * @param e 事件 */ public void mouseExited(MouseEvent e) { newIconStartX = PRE_GAP; if (BaseUtils.isAuthorityEditing()) { newWorkBookIconMode = GRAY_NEW_CPT; } else { newWorkBookIconMode = getNew(); } this.repaint(); } /** *鼠标拖拽 * @param e 事件 */ public void mouseDragged(MouseEvent e) { } /** *鼠标移动 * @param e 事件 */ public void mouseMoved(MouseEvent e) { int evtX = e.getX(); if (BaseUtils.isAuthorityEditing()) { newWorkBookIconMode = GRAY_NEW_CPT; } else if (isOverNewIcon(evtX)) { newIconStartX = 0; newWorkBookIconMode = getMouseOverNew(); } this.repaint(); } private boolean isOverNewIcon(int evtX) { return (evtX >= PRE_GAP && evtX <= PRE_GAP + newWorkBookIconMode.getIconWidth()); } public void setButtonGray(boolean isGray) { newWorkBookIconMode = isGray ? GRAY_NEW_CPT : getNew(); } public abstract Icon getNew(); public abstract Icon getMouseOverNew(); public abstract Icon getMousePressNew(); } \ No newline at end of file diff --git a/designer_base/src/com/fr/design/gui/UIDefaultTheme.java b/designer_base/src/com/fr/design/gui/UIDefaultTheme.java index 06db81bbd..7a9a523fc 100644 --- a/designer_base/src/com/fr/design/gui/UIDefaultTheme.java +++ b/designer_base/src/com/fr/design/gui/UIDefaultTheme.java @@ -48,7 +48,7 @@ public class UIDefaultTheme extends DefaultMetalTheme { putTreeAndList(table); putOthers(table); table.put("Desktop.background", new ColorUIResource(212, 210, 194)); - table.put("Separator.background", new ColorUIResource(173, 170, 153)); + table.put("Separator.background", new ColorUIResource(232, 232, 233)); table.put("Separator.foreground", new ColorUIResource(236, 233, 216)); table.put("TitledBorder.border", new LineBorder( new ColorUIResource(165, 163, 151))); diff --git a/designer_base/src/com/fr/design/gui/autocomplete/arrow_left.png b/designer_base/src/com/fr/design/gui/autocomplete/arrow_left.png deleted file mode 100644 index 5dc696781..000000000 Binary files a/designer_base/src/com/fr/design/gui/autocomplete/arrow_left.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/gui/autocomplete/arrow_right.png b/designer_base/src/com/fr/design/gui/autocomplete/arrow_right.png deleted file mode 100644 index b1a181923..000000000 Binary files a/designer_base/src/com/fr/design/gui/autocomplete/arrow_right.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/gui/autocomplete/bullet_black.png b/designer_base/src/com/fr/design/gui/autocomplete/bullet_black.png deleted file mode 100644 index b962e28d3..000000000 Binary files a/designer_base/src/com/fr/design/gui/autocomplete/bullet_black.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/gui/autocomplete/osx_sizegrip.png b/designer_base/src/com/fr/design/gui/autocomplete/osx_sizegrip.png deleted file mode 100644 index 07fa8b19e..000000000 Binary files a/designer_base/src/com/fr/design/gui/autocomplete/osx_sizegrip.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/gui/itree/filetree/EnvFileTree.java b/designer_base/src/com/fr/design/gui/itree/filetree/EnvFileTree.java index c7d767600..8cfde735d 100644 --- a/designer_base/src/com/fr/design/gui/itree/filetree/EnvFileTree.java +++ b/designer_base/src/com/fr/design/gui/itree/filetree/EnvFileTree.java @@ -106,7 +106,7 @@ public class EnvFileTree extends RefreshableJTree { Dimension dim = label.getPreferredSize(); dim.height += 2; this.setPreferredSize(dim); - this.setBackgroundNonSelectionColor(UIConstants.NORMAL_BACKGROUND); + this.setBackgroundNonSelectionColor(UIConstants.TREE_BACKGROUND); this.setForeground(UIConstants.FONT_COLOR); this.setBackgroundSelectionColor(UIConstants.FLESH_BLUE); return this; @@ -327,18 +327,18 @@ public class EnvFileTree extends RefreshableJTree { /* * 把FileNode[]转成ExpandMutableTreeNode[] */ - private ExpandMutableTreeNode[] fileNodeArray2TreeNodeArray(FileNode[] fn_array) { - ExpandMutableTreeNode[] res = new ExpandMutableTreeNode[fn_array.length]; - for (int i = 0; i < res.length; i++) { - FileNode fn = fn_array[i]; - res[i] = new ExpandMutableTreeNode(fn); - if (fn.isDirectory()) { - res[i].add(new ExpandMutableTreeNode()); + private ExpandMutableTreeNode[] fileNodeArray2TreeNodeArray(FileNode[] fn_array) { + ExpandMutableTreeNode[] res = new ExpandMutableTreeNode[fn_array.length]; + for (int i = 0; i < res.length; i++) { + FileNode fn = fn_array[i]; + res[i] = new ExpandMutableTreeNode(fn); + if (fn.isDirectory()) { + res[i].add(new ExpandMutableTreeNode()); + } } - } - return res; - } + return res; + } /* * 是否是父子关系的文件. diff --git a/designer_base/src/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java b/designer_base/src/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java index b4f8e3fc9..792f9d012 100644 --- a/designer_base/src/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java +++ b/designer_base/src/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java @@ -40,7 +40,7 @@ public abstract class RefreshableJTree extends CheckBoxTree { ExpandMutableTreeNode root = (ExpandMutableTreeNode) model.getRoot(); root.setExpanded(true); this.setRootVisible(false); - this.setBackground(UIConstants.NORMAL_BACKGROUND); + this.setBackground(UIConstants.TREE_BACKGROUND); this.addTreeExpansionListener(expansion); this.addTreeWillExpandListener(willExpand); } diff --git a/designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/focusabletip/osx_sizegrip.png b/designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/focusabletip/osx_sizegrip.png deleted file mode 100644 index 07fa8b19e..000000000 Binary files a/designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/focusabletip/osx_sizegrip.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/browser/360.png b/designer_base/src/com/fr/design/images/browser/360.png deleted file mode 100644 index 4aef06a2e..000000000 Binary files a/designer_base/src/com/fr/design/images/browser/360.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/browser/firefox.png b/designer_base/src/com/fr/design/images/browser/firefox.png deleted file mode 100644 index 7b81ceb75..000000000 Binary files a/designer_base/src/com/fr/design/images/browser/firefox.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/browser/ie.png b/designer_base/src/com/fr/design/images/browser/ie.png deleted file mode 100644 index 9317e116d..000000000 Binary files a/designer_base/src/com/fr/design/images/browser/ie.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/Artboard 2.png b/designer_base/src/com/fr/design/images/buttonicon/Artboard 2.png deleted file mode 100644 index 0b52d6665..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/Artboard 2.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/add_over.png b/designer_base/src/com/fr/design/images/buttonicon/add_over.png deleted file mode 100644 index 5135d8013..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/add_over.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/arrow.png b/designer_base/src/com/fr/design/images/buttonicon/arrow.png deleted file mode 100644 index 41a4bf549..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/arrow.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/arrowdown.png b/designer_base/src/com/fr/design/images/buttonicon/arrowdown.png deleted file mode 100644 index 41a4bf549..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/arrowdown.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/arrowup.png b/designer_base/src/com/fr/design/images/buttonicon/arrowup.png deleted file mode 100644 index 8d94b28b2..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/arrowup.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/button_0.png b/designer_base/src/com/fr/design/images/buttonicon/button_0.png deleted file mode 100644 index b8e4b9391..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/button_0.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/dscolumn.png b/designer_base/src/com/fr/design/images/buttonicon/dscolumn.png deleted file mode 100644 index 1da59efff..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/dscolumn.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/list_cover.png b/designer_base/src/com/fr/design/images/buttonicon/list_cover.png deleted file mode 100644 index 1f370df58..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/list_cover.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/list_covered.png b/designer_base/src/com/fr/design/images/buttonicon/list_covered.png deleted file mode 100644 index 866a6a353..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/list_covered.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/list_icon.png b/designer_base/src/com/fr/design/images/buttonicon/list_icon.png deleted file mode 100644 index 2629503f7..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/list_icon.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/list_press.png b/designer_base/src/com/fr/design/images/buttonicon/list_press.png deleted file mode 100644 index 37ac4a2ee..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/list_press.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/list_pressed.png b/designer_base/src/com/fr/design/images/buttonicon/list_pressed.png deleted file mode 100644 index de264df1e..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/list_pressed.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.png deleted file mode 100644 index 3e1035333..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_normal.png deleted file mode 100644 index d2e0a2b43..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_normal.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_selected.png deleted file mode 100644 index c4b71b853..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_selected.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.png deleted file mode 100644 index 7ea07bb9a..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_normal.png deleted file mode 100644 index 73ee5b87a..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_normal.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.png deleted file mode 100644 index 87c812f79..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.png deleted file mode 100644 index 2e450c35b..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_normal.png deleted file mode 100644 index 22fb4eb68..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_normal.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_selected.png deleted file mode 100644 index 11e5aefbf..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_selected.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_disabled.png deleted file mode 100644 index 70b2dbd9b..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_disabled.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.png deleted file mode 100644 index 14ff765e4..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.png deleted file mode 100644 index 082dce2e8..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.png deleted file mode 100644 index 136dc6568..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_normal.png deleted file mode 100644 index 1cbf98153..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_normal.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_selected.png deleted file mode 100644 index f9cea74c9..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_selected.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.png deleted file mode 100644 index 552597755..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.png deleted file mode 100644 index a84c636d3..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.png deleted file mode 100644 index 477e9d448..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_disabled.png deleted file mode 100644 index cde4d783a..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_disabled.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_normal.png deleted file mode 100644 index b81a666d5..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_normal.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.png deleted file mode 100644 index 80135b046..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_disabled.png deleted file mode 100644 index ac9163d6c..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_disabled.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.png deleted file mode 100644 index 38979ca5f..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_selected.png deleted file mode 100644 index 88315dc20..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_selected.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_diabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_diabled.png deleted file mode 100644 index 3a2cdfed5..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_diabled.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.png deleted file mode 100644 index f67375cde..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.png deleted file mode 100644 index c36f293f9..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/type_string的副本.png b/designer_base/src/com/fr/design/images/buttonicon/type_string的副本.png deleted file mode 100644 index 7ab0d7789..000000000 Binary files a/designer_base/src/com/fr/design/images/buttonicon/type_string的副本.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/chart/ConditionAttr.png b/designer_base/src/com/fr/design/images/chart/ConditionAttr.png deleted file mode 100644 index e71332c05..000000000 Binary files a/designer_base/src/com/fr/design/images/chart/ConditionAttr.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/chart/moved.png b/designer_base/src/com/fr/design/images/chart/moved.png deleted file mode 100644 index c7aeba248..000000000 Binary files a/designer_base/src/com/fr/design/images/chart/moved.png and /dev/null 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 7b7f67026..c337d8c64 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/arrow_down.png b/designer_base/src/com/fr/design/images/control/arrow_down.png deleted file mode 100644 index f7e3c2ede..000000000 Binary files a/designer_base/src/com/fr/design/images/control/arrow_down.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/control/close_rollover.png b/designer_base/src/com/fr/design/images/control/close_rollover.png deleted file mode 100644 index 3e557fcef..000000000 Binary files a/designer_base/src/com/fr/design/images/control/close_rollover.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/control/closet.png b/designer_base/src/com/fr/design/images/control/closet.png deleted file mode 100644 index 0dc9f9094..000000000 Binary files a/designer_base/src/com/fr/design/images/control/closet.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/control/downdis.png b/designer_base/src/com/fr/design/images/control/downdis.png deleted file mode 100644 index 19baf0cb2..000000000 Binary files a/designer_base/src/com/fr/design/images/control/downdis.png and /dev/null 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 b5c0c5d4f..3ce387e78 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/left.png b/designer_base/src/com/fr/design/images/control/left.png index 3936b9e97..379aac2ca 100644 Binary files a/designer_base/src/com/fr/design/images/control/left.png and b/designer_base/src/com/fr/design/images/control/left.png differ diff --git a/designer_base/src/com/fr/design/images/control/leftleft.png b/designer_base/src/com/fr/design/images/control/leftleft.png deleted file mode 100644 index 15e9ec0ce..000000000 Binary files a/designer_base/src/com/fr/design/images/control/leftleft.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/control/refresh.png b/designer_base/src/com/fr/design/images/control/refresh.png index ee8f76575..c635fb8d5 100644 Binary files a/designer_base/src/com/fr/design/images/control/refresh.png and b/designer_base/src/com/fr/design/images/control/refresh.png differ diff --git a/designer_base/src/com/fr/design/images/control/right.png b/designer_base/src/com/fr/design/images/control/right.png index 9a1da6da8..18d782f8f 100644 Binary files a/designer_base/src/com/fr/design/images/control/right.png and b/designer_base/src/com/fr/design/images/control/right.png differ diff --git a/designer_base/src/com/fr/design/images/control/rightright.png b/designer_base/src/com/fr/design/images/control/rightright.png deleted file mode 100644 index 7d5ac4f51..000000000 Binary files a/designer_base/src/com/fr/design/images/control/rightright.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/control/tab/end.png b/designer_base/src/com/fr/design/images/control/tab/end.png index da848239f..5be9ccd29 100644 Binary files a/designer_base/src/com/fr/design/images/control/tab/end.png and b/designer_base/src/com/fr/design/images/control/tab/end.png differ diff --git a/designer_base/src/com/fr/design/images/control/tab/end_not.png b/designer_base/src/com/fr/design/images/control/tab/end_not.png deleted file mode 100644 index 1f08bdf35..000000000 Binary files a/designer_base/src/com/fr/design/images/control/tab/end_not.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/control/tab/first.png b/designer_base/src/com/fr/design/images/control/tab/first.png index 5bdb04402..a6dce39ba 100644 Binary files a/designer_base/src/com/fr/design/images/control/tab/first.png and b/designer_base/src/com/fr/design/images/control/tab/first.png differ diff --git a/designer_base/src/com/fr/design/images/control/tab/first_not.png b/designer_base/src/com/fr/design/images/control/tab/first_not.png deleted file mode 100644 index 50d048a19..000000000 Binary files a/designer_base/src/com/fr/design/images/control/tab/first_not.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/control/tab/next.png b/designer_base/src/com/fr/design/images/control/tab/next.png index 495a51805..f7a70f060 100644 Binary files a/designer_base/src/com/fr/design/images/control/tab/next.png and b/designer_base/src/com/fr/design/images/control/tab/next.png differ diff --git a/designer_base/src/com/fr/design/images/control/tab/next_not.png b/designer_base/src/com/fr/design/images/control/tab/next_not.png deleted file mode 100644 index f002a0b9e..000000000 Binary files a/designer_base/src/com/fr/design/images/control/tab/next_not.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/control/tab/prev.png b/designer_base/src/com/fr/design/images/control/tab/prev.png index 5923d5794..dcefb5868 100644 Binary files a/designer_base/src/com/fr/design/images/control/tab/prev.png and b/designer_base/src/com/fr/design/images/control/tab/prev.png differ diff --git a/designer_base/src/com/fr/design/images/control/tab/prev_not.png b/designer_base/src/com/fr/design/images/control/tab/prev_not.png deleted file mode 100644 index 2530395fd..000000000 Binary files a/designer_base/src/com/fr/design/images/control/tab/prev_not.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/control/up.png b/designer_base/src/com/fr/design/images/control/up.png index a613a4e7b..86b83f76a 100644 Binary files a/designer_base/src/com/fr/design/images/control/up.png and b/designer_base/src/com/fr/design/images/control/up.png differ diff --git a/designer_base/src/com/fr/design/images/control/updis.png b/designer_base/src/com/fr/design/images/control/updis.png deleted file mode 100644 index 387ec7eec..000000000 Binary files a/designer_base/src/com/fr/design/images/control/updis.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/control/warn.png b/designer_base/src/com/fr/design/images/control/warn.png deleted file mode 100644 index 087e3f153..000000000 Binary files a/designer_base/src/com/fr/design/images/control/warn.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/custombtn/preview_click.png b/designer_base/src/com/fr/design/images/custombtn/preview_click.png deleted file mode 100644 index 896cb146b..000000000 Binary files a/designer_base/src/com/fr/design/images/custombtn/preview_click.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/custombtn/preview_hover.png b/designer_base/src/com/fr/design/images/custombtn/preview_hover.png deleted file mode 100644 index 6b13f4432..000000000 Binary files a/designer_base/src/com/fr/design/images/custombtn/preview_hover.png and /dev/null 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 deleted file mode 100644 index 4d07d8d4a..000000000 Binary files a/designer_base/src/com/fr/design/images/dashboard/files.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/bind/groupAscColumn.png b/designer_base/src/com/fr/design/images/data/bind/groupAscColumn.png deleted file mode 100644 index b4b2bd4da..000000000 Binary files a/designer_base/src/com/fr/design/images/data/bind/groupAscColumn.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/bind/groupColumn.png b/designer_base/src/com/fr/design/images/data/bind/groupColumn.png deleted file mode 100644 index 7e1da7fc6..000000000 Binary files a/designer_base/src/com/fr/design/images/data/bind/groupColumn.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/bind/groupDescColumn.png b/designer_base/src/com/fr/design/images/data/bind/groupDescColumn.png deleted file mode 100644 index ed6677fd2..000000000 Binary files a/designer_base/src/com/fr/design/images/data/bind/groupDescColumn.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/bind/summaryColumn.png b/designer_base/src/com/fr/design/images/data/bind/summaryColumn.png deleted file mode 100644 index 7e1da7fc6..000000000 Binary files a/designer_base/src/com/fr/design/images/data/bind/summaryColumn.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/comb_widget.png b/designer_base/src/com/fr/design/images/data/comb_widget.png deleted file mode 100644 index 1d40383d3..000000000 Binary files a/designer_base/src/com/fr/design/images/data/comb_widget.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/convertEmbedded.png b/designer_base/src/com/fr/design/images/data/convertEmbedded.png deleted file mode 100644 index 9b6ed472a..000000000 Binary files a/designer_base/src/com/fr/design/images/data/convertEmbedded.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/custom_widget.png b/designer_base/src/com/fr/design/images/data/custom_widget.png deleted file mode 100644 index 83acad4a8..000000000 Binary files a/designer_base/src/com/fr/design/images/data/custom_widget.png and /dev/null 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 deleted file mode 100644 index 2f0fc8c87..000000000 Binary files a/designer_base/src/com/fr/design/images/data/dataDictionary.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/datakubiao.png b/designer_base/src/com/fr/design/images/data/datakubiao.png deleted file mode 100644 index 9ca2ef571..000000000 Binary files a/designer_base/src/com/fr/design/images/data/datakubiao.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/diy.png b/designer_base/src/com/fr/design/images/data/diy.png deleted file mode 100644 index c97a40a1c..000000000 Binary files a/designer_base/src/com/fr/design/images/data/diy.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/dock/classTableData.png b/designer_base/src/com/fr/design/images/data/dock/classTableData.png deleted file mode 100644 index 3b704e025..000000000 Binary files a/designer_base/src/com/fr/design/images/data/dock/classTableData.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/dock/dataTable.png b/designer_base/src/com/fr/design/images/data/dock/dataTable.png deleted file mode 100644 index 0a17322a8..000000000 Binary files a/designer_base/src/com/fr/design/images/data/dock/dataTable.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/dock/database.png b/designer_base/src/com/fr/design/images/data/dock/database.png deleted file mode 100644 index ca581da50..000000000 Binary files a/designer_base/src/com/fr/design/images/data/dock/database.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/dock/relation_table_data.png b/designer_base/src/com/fr/design/images/data/dock/relation_table_data.png deleted file mode 100644 index 5dc59abb5..000000000 Binary files a/designer_base/src/com/fr/design/images/data/dock/relation_table_data.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/dock/table_proc.png b/designer_base/src/com/fr/design/images/data/dock/table_proc.png deleted file mode 100644 index 07ea0a5d8..000000000 Binary files a/designer_base/src/com/fr/design/images/data/dock/table_proc.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/dock/table_text.png b/designer_base/src/com/fr/design/images/data/dock/table_text.png deleted file mode 100644 index 38fd94d78..000000000 Binary files a/designer_base/src/com/fr/design/images/data/dock/table_text.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/editQuery.png b/designer_base/src/com/fr/design/images/data/editQuery.png deleted file mode 100644 index 13abb74a5..000000000 Binary files a/designer_base/src/com/fr/design/images/data/editQuery.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/newQuery.png b/designer_base/src/com/fr/design/images/data/newQuery.png deleted file mode 100644 index 7948d5091..000000000 Binary files a/designer_base/src/com/fr/design/images/data/newQuery.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/sap.png b/designer_base/src/com/fr/design/images/data/sap.png deleted file mode 100644 index 863e24f63..000000000 Binary files a/designer_base/src/com/fr/design/images/data/sap.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/hibernateTableData.png b/designer_base/src/com/fr/design/images/data/source/hibernateTableData.png deleted file mode 100644 index b276e2865..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/hibernateTableData.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/jdbcDataquery.png b/designer_base/src/com/fr/design/images/data/source/jdbcDataquery.png deleted file mode 100644 index 3977a41e0..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/jdbcDataquery.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/newDatabase.png b/designer_base/src/com/fr/design/images/data/source/newDatabase.png deleted file mode 100644 index 5e53949d5..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/newDatabase.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/newDatasource.png b/designer_base/src/com/fr/design/images/data/source/newDatasource.png deleted file mode 100644 index 7948d5091..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/newDatasource.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/bullet_key.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/bullet_key.png deleted file mode 100644 index 3d37f2ea4..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/bullet_key.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/bullet_pink.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/bullet_pink.png deleted file mode 100644 index 058ad261f..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/bullet_pink.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/cart_add.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/cart_add.png deleted file mode 100644 index 45c290008..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/cart_add.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/cart_delete.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/cart_delete.png deleted file mode 100644 index ac5bce5c8..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/cart_delete.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/chart_organisation.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/chart_organisation.png deleted file mode 100644 index c32d25c16..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/chart_organisation.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/database.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/database.png deleted file mode 100644 index 3d09261a2..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/database.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/database_connect.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/database_connect.png deleted file mode 100644 index 3a111977c..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/database_connect.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/database_gear.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/database_gear.png deleted file mode 100644 index 7c0ab2b4c..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/database_gear.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/database_lightning.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/database_lightning.png deleted file mode 100644 index d9eefc225..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/database_lightning.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/database_save.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/database_save.png deleted file mode 100644 index 44c06dddf..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/database_save.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/database_table.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/database_table.png deleted file mode 100644 index 693709cbc..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/database_table.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/database_tables.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/database_tables.png deleted file mode 100644 index d76448e34..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/database_tables.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/folder_database.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/folder_database.png deleted file mode 100644 index 5193e2eff..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/folder_database.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/folder_page.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/folder_page.png deleted file mode 100644 index 1ef6e1143..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/folder_page.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/folder_table.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/folder_table.png deleted file mode 100644 index 473cee355..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/folder_table.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/page_edit.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/page_edit.png deleted file mode 100644 index 046811ed7..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/page_edit.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/page_gear.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/page_gear.png deleted file mode 100644 index 8e83281c5..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/page_gear.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/page_save.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/page_save.png deleted file mode 100644 index caea546af..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/page_save.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/page_white_database.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/page_white_database.png deleted file mode 100644 index bddba1f98..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/page_white_database.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/table_error.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/table_error.png deleted file mode 100644 index 589e92b55..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/table_error.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/table_gear.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/table_gear.png deleted file mode 100644 index cfc2702ac..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/table_gear.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/table_link.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/table_link.png deleted file mode 100644 index decac8a62..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/table_link.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/table_multiple.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/table_multiple.png deleted file mode 100644 index d76448e34..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/table_multiple.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/table_relationship.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/table_relationship.png deleted file mode 100644 index 28b8505c0..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/table_relationship.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/table_row_delete.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/table_row_delete.png deleted file mode 100644 index 54c69691e..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/table_row_delete.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/table_row_insert.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/table_row_insert.png deleted file mode 100644 index ff5925efd..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/table_row_insert.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/table_sort.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/table_sort.png deleted file mode 100644 index ed6785a6a..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/table_sort.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/textfield.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/textfield.png deleted file mode 100644 index d37e7304e..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/textfield.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/selectwizard/wrench.png b/designer_base/src/com/fr/design/images/data/source/selectwizard/wrench.png deleted file mode 100644 index 5c8213fef..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/selectwizard/wrench.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/sqlAscColumn.png b/designer_base/src/com/fr/design/images/data/source/sqlAscColumn.png deleted file mode 100644 index b4b2bd4da..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/sqlAscColumn.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/sqlColumn.png b/designer_base/src/com/fr/design/images/data/source/sqlColumn.png deleted file mode 100644 index 7e1da7fc6..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/sqlColumn.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/sqlConditionColumn.png b/designer_base/src/com/fr/design/images/data/source/sqlConditionColumn.png deleted file mode 100644 index 7e1da7fc6..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/sqlConditionColumn.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/sqlDescColumn.png b/designer_base/src/com/fr/design/images/data/source/sqlDescColumn.png deleted file mode 100644 index ed6677fd2..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/sqlDescColumn.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/sqlTable.png b/designer_base/src/com/fr/design/images/data/source/sqlTable.png deleted file mode 100644 index 5da4c8cb3..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/sqlTable.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/sqlViewTable.png b/designer_base/src/com/fr/design/images/data/source/sqlViewTable.png deleted file mode 100644 index e8a1b33b0..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/sqlViewTable.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/source/textDatasource.png b/designer_base/src/com/fr/design/images/data/source/textDatasource.png deleted file mode 100644 index 6a890d57d..000000000 Binary files a/designer_base/src/com/fr/design/images/data/source/textDatasource.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/data/table2.png b/designer_base/src/com/fr/design/images/data/table2.png deleted file mode 100644 index 8d7a3557d..000000000 Binary files a/designer_base/src/com/fr/design/images/data/table2.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/dock/desktop.png b/designer_base/src/com/fr/design/images/dock/desktop.png deleted file mode 100644 index b67f9c02c..000000000 Binary files a/designer_base/src/com/fr/design/images/dock/desktop.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/dock/projectVer.png b/designer_base/src/com/fr/design/images/dock/projectVer.png deleted file mode 100644 index 52ac9fa3f..000000000 Binary files a/designer_base/src/com/fr/design/images/dock/projectVer.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/edit/insertRow_B.png b/designer_base/src/com/fr/design/images/edit/insertRow_B.png deleted file mode 100644 index 8328efbd7..000000000 Binary files a/designer_base/src/com/fr/design/images/edit/insertRow_B.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/file/disk.png b/designer_base/src/com/fr/design/images/file/disk.png deleted file mode 100644 index 9597aa286..000000000 Binary files a/designer_base/src/com/fr/design/images/file/disk.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/file/nostar.png b/designer_base/src/com/fr/design/images/file/nostar.png deleted file mode 100644 index 1eef24767..000000000 Binary files a/designer_base/src/com/fr/design/images/file/nostar.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/file/pngFile.png b/designer_base/src/com/fr/design/images/file/pngFile.png deleted file mode 100644 index 5db7b7af3..000000000 Binary files a/designer_base/src/com/fr/design/images/file/pngFile.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/file/star.png b/designer_base/src/com/fr/design/images/file/star.png deleted file mode 100644 index 8d654a7b5..000000000 Binary files a/designer_base/src/com/fr/design/images/file/star.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/bottom_border.png b/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/bottom_border.png deleted file mode 100644 index 71bbb7338..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/bottom_border.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/bottom_border_.png b/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/bottom_border_.png deleted file mode 100644 index 5d8d54cad..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/bottom_border_.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/bottom_left.png b/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/bottom_left.png deleted file mode 100644 index 93c696046..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/bottom_left.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/bottom_left_.png b/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/bottom_left_.png deleted file mode 100644 index 5856d739c..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/bottom_left_.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/bottom_right.png b/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/bottom_right.png deleted file mode 100644 index e9e8e6bad..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/bottom_right.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/bottom_right_.png b/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/bottom_right_.png deleted file mode 100644 index 721cf76b6..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/bottom_right_.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/control_close.png b/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/control_close.png deleted file mode 100644 index 5cfa6ea33..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/control_close.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/control_close_.png b/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/control_close_.png deleted file mode 100644 index fdbde079e..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/control_close_.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/control_max.png b/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/control_max.png deleted file mode 100644 index 2acaefb87..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/control_max.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/control_max_.png b/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/control_max_.png deleted file mode 100644 index db9753a77..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/control_max_.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/control_min.png b/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/control_min.png deleted file mode 100644 index 77b5559f2..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/control_min.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/control_min_.png b/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/control_min_.png deleted file mode 100644 index 86ef29817..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/control_min_.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/controls.png b/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/controls.png deleted file mode 100644 index 1d5547540..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/controls.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/controls_.png b/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/controls_.png deleted file mode 100644 index 686602bab..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/controls_.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/left_border.png b/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/left_border.png deleted file mode 100644 index 2b8c9d2d1..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/left_border.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/left_border_.png b/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/left_border_.png deleted file mode 100644 index 7e1d3cea7..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/left_border_.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/right_border.png b/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/right_border.png deleted file mode 100644 index 7e28d5278..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/right_border.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/right_border_.png b/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/right_border_.png deleted file mode 100644 index 7097fb24a..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/right_border_.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/title_pane.png b/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/title_pane.png deleted file mode 100644 index 17d7b0599..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/title_pane.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/top_border.png b/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/top_border.png deleted file mode 100644 index 8da3415c8..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/top_border.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/top_border_.png b/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/top_border_.png deleted file mode 100644 index b215d5b72..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/top_border_.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/top_left.png b/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/top_left.png deleted file mode 100644 index 3f0d3ec78..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/top_left.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/top_left_.png b/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/top_left_.png deleted file mode 100644 index c962416ef..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/top_left_.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/top_right.png b/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/top_right.png deleted file mode 100644 index dfda54c33..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/top_right.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/top_right_.png b/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/top_right_.png deleted file mode 100644 index 9c08317e9..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/beans/adapters/container/top_right_.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/bottom_align.png b/designer_base/src/com/fr/design/images/form/designer/bottom_align.png deleted file mode 100644 index 7523ba498..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/bottom_align.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/center_align.png b/designer_base/src/com/fr/design/images/form/designer/center_align.png deleted file mode 100644 index 0ca2b5bcf..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/center_align.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/left_align.png b/designer_base/src/com/fr/design/images/form/designer/left_align.png deleted file mode 100644 index d6c6fef58..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/left_align.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/middle_align.png b/designer_base/src/com/fr/design/images/form/designer/middle_align.png deleted file mode 100644 index d3d937369..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/middle_align.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/right_align.png b/designer_base/src/com/fr/design/images/form/designer/right_align.png deleted file mode 100644 index f20179f08..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/right_align.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/same_height.png b/designer_base/src/com/fr/design/images/form/designer/same_height.png deleted file mode 100644 index 8f1691b2f..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/same_height.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/same_width.png b/designer_base/src/com/fr/design/images/form/designer/same_width.png deleted file mode 100644 index a176e8fc2..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/same_width.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/form/designer/top_align.png b/designer_base/src/com/fr/design/images/form/designer/top_align.png deleted file mode 100644 index 938b7ca7d..000000000 Binary files a/designer_base/src/com/fr/design/images/form/designer/top_align.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/gc.png b/designer_base/src/com/fr/design/images/gc.png deleted file mode 100644 index 507c5c4f5..000000000 Binary files a/designer_base/src/com/fr/design/images/gc.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/general/close-rolver.png b/designer_base/src/com/fr/design/images/general/close-rolver.png deleted file mode 100644 index 8ada6cceb..000000000 Binary files a/designer_base/src/com/fr/design/images/general/close-rolver.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/general/mini-rolver.png b/designer_base/src/com/fr/design/images/general/mini-rolver.png deleted file mode 100644 index fd3031025..000000000 Binary files a/designer_base/src/com/fr/design/images/general/mini-rolver.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/general/resize-rolver.png b/designer_base/src/com/fr/design/images/general/resize-rolver.png deleted file mode 100644 index 34f279acb..000000000 Binary files a/designer_base/src/com/fr/design/images/general/resize-rolver.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/general/resize.png b/designer_base/src/com/fr/design/images/general/resize.png deleted file mode 100644 index fb4b5423c..000000000 Binary files a/designer_base/src/com/fr/design/images/general/resize.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/gui/chtlocked.png b/designer_base/src/com/fr/design/images/gui/chtlocked.png deleted file mode 100644 index 256f021b1..000000000 Binary files a/designer_base/src/com/fr/design/images/gui/chtlocked.png and /dev/null 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 23465a72e..0dc9491c3 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/gui/folder.png b/designer_base/src/com/fr/design/images/gui/folder.png index da58e790d..8babde7b9 100644 Binary files a/designer_base/src/com/fr/design/images/gui/folder.png and b/designer_base/src/com/fr/design/images/gui/folder.png differ diff --git a/designer_base/src/com/fr/design/images/gui/folder/expanded.png b/designer_base/src/com/fr/design/images/gui/folder/expanded.png deleted file mode 100644 index 865415de9..000000000 Binary files a/designer_base/src/com/fr/design/images/gui/folder/expanded.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/gui/folder/foldered.png b/designer_base/src/com/fr/design/images/gui/folder/foldered.png deleted file mode 100644 index 67d3c2cc8..000000000 Binary files a/designer_base/src/com/fr/design/images/gui/folder/foldered.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/gui/folder/hovered_expanded.png b/designer_base/src/com/fr/design/images/gui/folder/hovered_expanded.png deleted file mode 100644 index d4d537639..000000000 Binary files a/designer_base/src/com/fr/design/images/gui/folder/hovered_expanded.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/gui/folder/hovered_foldered.png b/designer_base/src/com/fr/design/images/gui/folder/hovered_foldered.png deleted file mode 100644 index b02555d28..000000000 Binary files a/designer_base/src/com/fr/design/images/gui/folder/hovered_foldered.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/gui/pngFile.png b/designer_base/src/com/fr/design/images/gui/pngFile.png deleted file mode 100644 index 5db7b7af3..000000000 Binary files a/designer_base/src/com/fr/design/images/gui/pngFile.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/gui/popupCenter.png b/designer_base/src/com/fr/design/images/gui/popupCenter.png deleted file mode 100644 index 17d090c8a..000000000 Binary files a/designer_base/src/com/fr/design/images/gui/popupCenter.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/gui/tab_delete.png b/designer_base/src/com/fr/design/images/gui/tab_delete.png index a81952d2d..e5c592e58 100644 Binary files a/designer_base/src/com/fr/design/images/gui/tab_delete.png and b/designer_base/src/com/fr/design/images/gui/tab_delete.png differ diff --git a/designer_base/src/com/fr/design/images/gui/textFile.png b/designer_base/src/com/fr/design/images/gui/textFile.png deleted file mode 100644 index 17a448b83..000000000 Binary files a/designer_base/src/com/fr/design/images/gui/textFile.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/load/busy-icon0.png b/designer_base/src/com/fr/design/images/load/busy-icon0.png deleted file mode 100755 index 242c0c85b..000000000 Binary files a/designer_base/src/com/fr/design/images/load/busy-icon0.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/load/busy-icon1.png b/designer_base/src/com/fr/design/images/load/busy-icon1.png deleted file mode 100755 index 9f6f63438..000000000 Binary files a/designer_base/src/com/fr/design/images/load/busy-icon1.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/load/busy-icon10.png b/designer_base/src/com/fr/design/images/load/busy-icon10.png deleted file mode 100755 index c4ef4a1fc..000000000 Binary files a/designer_base/src/com/fr/design/images/load/busy-icon10.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/load/busy-icon11.png b/designer_base/src/com/fr/design/images/load/busy-icon11.png deleted file mode 100755 index 6eca1f5e4..000000000 Binary files a/designer_base/src/com/fr/design/images/load/busy-icon11.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/load/busy-icon12.png b/designer_base/src/com/fr/design/images/load/busy-icon12.png deleted file mode 100755 index e447ee8ac..000000000 Binary files a/designer_base/src/com/fr/design/images/load/busy-icon12.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/load/busy-icon13.png b/designer_base/src/com/fr/design/images/load/busy-icon13.png deleted file mode 100755 index 848a6f1a4..000000000 Binary files a/designer_base/src/com/fr/design/images/load/busy-icon13.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/load/busy-icon14.png b/designer_base/src/com/fr/design/images/load/busy-icon14.png deleted file mode 100755 index 7b3561df2..000000000 Binary files a/designer_base/src/com/fr/design/images/load/busy-icon14.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/load/busy-icon2.png b/designer_base/src/com/fr/design/images/load/busy-icon2.png deleted file mode 100755 index c866e62a7..000000000 Binary files a/designer_base/src/com/fr/design/images/load/busy-icon2.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/load/busy-icon3.png b/designer_base/src/com/fr/design/images/load/busy-icon3.png deleted file mode 100755 index 9be22fa58..000000000 Binary files a/designer_base/src/com/fr/design/images/load/busy-icon3.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/load/busy-icon4.png b/designer_base/src/com/fr/design/images/load/busy-icon4.png deleted file mode 100755 index f07c20dc4..000000000 Binary files a/designer_base/src/com/fr/design/images/load/busy-icon4.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/load/busy-icon5.png b/designer_base/src/com/fr/design/images/load/busy-icon5.png deleted file mode 100755 index 653fc9c3b..000000000 Binary files a/designer_base/src/com/fr/design/images/load/busy-icon5.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/load/busy-icon6.png b/designer_base/src/com/fr/design/images/load/busy-icon6.png deleted file mode 100755 index 703557264..000000000 Binary files a/designer_base/src/com/fr/design/images/load/busy-icon6.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/load/busy-icon7.png b/designer_base/src/com/fr/design/images/load/busy-icon7.png deleted file mode 100755 index 49fbc6ec5..000000000 Binary files a/designer_base/src/com/fr/design/images/load/busy-icon7.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/load/busy-icon8.png b/designer_base/src/com/fr/design/images/load/busy-icon8.png deleted file mode 100755 index e1a5a4093..000000000 Binary files a/designer_base/src/com/fr/design/images/load/busy-icon8.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/load/busy-icon9.png b/designer_base/src/com/fr/design/images/load/busy-icon9.png deleted file mode 100755 index 827801235..000000000 Binary files a/designer_base/src/com/fr/design/images/load/busy-icon9.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/lookandfeel/ComboBoxFocus.png b/designer_base/src/com/fr/design/images/lookandfeel/ComboBoxFocus.png deleted file mode 100644 index 566556a06..000000000 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/ComboBoxFocus.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/lookandfeel/ComputerIcon.png b/designer_base/src/com/fr/design/images/lookandfeel/ComputerIcon.png deleted file mode 100644 index 83461c1e2..000000000 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/ComputerIcon.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/lookandfeel/DirectoryIcon.png b/designer_base/src/com/fr/design/images/lookandfeel/DirectoryIcon.png deleted file mode 100644 index da58e790d..000000000 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/DirectoryIcon.png and /dev/null 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 deleted file mode 100644 index 8404e7203..000000000 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/ErrorIcon.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/lookandfeel/FileDetailsIcon.png b/designer_base/src/com/fr/design/images/lookandfeel/FileDetailsIcon.png deleted file mode 100644 index fafb0c4f9..000000000 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/FileDetailsIcon.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/lookandfeel/FileIcon.png b/designer_base/src/com/fr/design/images/lookandfeel/FileIcon.png deleted file mode 100644 index 7b797d4ee..000000000 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/FileIcon.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/lookandfeel/FileListIcon.png b/designer_base/src/com/fr/design/images/lookandfeel/FileListIcon.png deleted file mode 100644 index 8ca793240..000000000 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/FileListIcon.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/lookandfeel/FloppyIcon.png b/designer_base/src/com/fr/design/images/lookandfeel/FloppyIcon.png deleted file mode 100644 index 92c333375..000000000 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/FloppyIcon.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/lookandfeel/HarddiskIcon.png b/designer_base/src/com/fr/design/images/lookandfeel/HarddiskIcon.png deleted file mode 100644 index 9597aa286..000000000 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/HarddiskIcon.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/lookandfeel/HomeFolderIcon.png b/designer_base/src/com/fr/design/images/lookandfeel/HomeFolderIcon.png deleted file mode 100644 index 369f5d9b9..000000000 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/HomeFolderIcon.png and /dev/null 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 deleted file mode 100644 index a81f92580..000000000 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/InformationIcon.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/lookandfeel/InternalFrameIcon.png b/designer_base/src/com/fr/design/images/lookandfeel/InternalFrameIcon.png deleted file mode 100644 index 3a893e4cd..000000000 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/InternalFrameIcon.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/lookandfeel/NewFolderIcon.png b/designer_base/src/com/fr/design/images/lookandfeel/NewFolderIcon.png deleted file mode 100644 index 1fc3b2afa..000000000 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/NewFolderIcon.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/lookandfeel/ParentDirectoryIcon.png b/designer_base/src/com/fr/design/images/lookandfeel/ParentDirectoryIcon.png deleted file mode 100644 index a613a4e7b..000000000 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/ParentDirectoryIcon.png and /dev/null 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 deleted file mode 100644 index 2ca3e141b..000000000 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/QuestionIcon.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/lookandfeel/TreeFolderClosedIcon.png b/designer_base/src/com/fr/design/images/lookandfeel/TreeFolderClosedIcon.png deleted file mode 100644 index da58e790d..000000000 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/TreeFolderClosedIcon.png and /dev/null 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 deleted file mode 100644 index 4281dc887..000000000 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/TreeFolderOpenedIcon.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/lookandfeel/TreeLeafIcon.png b/designer_base/src/com/fr/design/images/lookandfeel/TreeLeafIcon.png deleted file mode 100644 index 4fdd29006..000000000 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/TreeLeafIcon.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/lookandfeel/TreeMinusIcon.png b/designer_base/src/com/fr/design/images/lookandfeel/TreeMinusIcon.png deleted file mode 100644 index aad6c5524..000000000 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/TreeMinusIcon.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/lookandfeel/TreePlusIcon.png b/designer_base/src/com/fr/design/images/lookandfeel/TreePlusIcon.png deleted file mode 100644 index 960b40ee9..000000000 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/TreePlusIcon.png and /dev/null 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 deleted file mode 100644 index 35e3e50f6..000000000 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/WarningIcon.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/lookandfeel/brightmask.png b/designer_base/src/com/fr/design/images/lookandfeel/brightmask.png deleted file mode 100644 index b88feb4d6..000000000 Binary files a/designer_base/src/com/fr/design/images/lookandfeel/brightmask.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_edit/pluralundo.png b/designer_base/src/com/fr/design/images/m_edit/pluralundo.png deleted file mode 100644 index e33c896fc..000000000 Binary files a/designer_base/src/com/fr/design/images/m_edit/pluralundo.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_file/crossTable.png b/designer_base/src/com/fr/design/images/m_file/crossTable.png deleted file mode 100644 index 09935205d..000000000 Binary files a/designer_base/src/com/fr/design/images/m_file/crossTable.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_file/design_large.png b/designer_base/src/com/fr/design/images/m_file/design_large.png deleted file mode 100644 index 4fe9b0c75..000000000 Binary files a/designer_base/src/com/fr/design/images/m_file/design_large.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_file/groupTable.png b/designer_base/src/com/fr/design/images/m_file/groupTable.png deleted file mode 100644 index fc6389a67..000000000 Binary files a/designer_base/src/com/fr/design/images/m_file/groupTable.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_file/hyperLink.png b/designer_base/src/com/fr/design/images/m_file/hyperLink.png deleted file mode 100644 index a23db4f76..000000000 Binary files a/designer_base/src/com/fr/design/images/m_file/hyperLink.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_file/merge.png b/designer_base/src/com/fr/design/images/m_file/merge.png deleted file mode 100644 index 2359f057a..000000000 Binary files a/designer_base/src/com/fr/design/images/m_file/merge.png and /dev/null 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 3e488f11e..6a8716334 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_format/allborders.png b/designer_base/src/com/fr/design/images/m_format/allborders.png deleted file mode 100644 index 295e0549f..000000000 Binary files a/designer_base/src/com/fr/design/images/m_format/allborders.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellWriteAttr.png b/designer_base/src/com/fr/design/images/m_format/cellWriteAttr.png deleted file mode 100644 index b8a50b929..000000000 Binary files a/designer_base/src/com/fr/design/images/m_format/cellWriteAttr.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/generalAlignment.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/generalAlignment.png deleted file mode 100644 index d45ce4ba8..000000000 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/generalAlignment.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/h_center_pressed.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/h_center_pressed.png deleted file mode 100644 index 3c1846aa6..000000000 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/h_center_pressed.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/h_left_pressed.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/h_left_pressed.png deleted file mode 100644 index b8e217bc8..000000000 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/h_left_pressed.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/h_right_pressed.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/h_right_pressed.png deleted file mode 100644 index 1e28bebfb..000000000 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/h_right_pressed.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/h_s_pressed.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/h_s_pressed.png deleted file mode 100644 index 60e87418b..000000000 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/h_s_pressed.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/v_center_pressed.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/v_center_pressed.png deleted file mode 100644 index e5fd1c3f1..000000000 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/v_center_pressed.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/v_down_pressed.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/v_down_pressed.png deleted file mode 100644 index f8cf61f66..000000000 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/v_down_pressed.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/v_top_pressed.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/v_top_pressed.png deleted file mode 100644 index d19688ccf..000000000 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/v_top_pressed.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_format/doublebottom.png b/designer_base/src/com/fr/design/images/m_format/doublebottom.png deleted file mode 100644 index 0bb6385c9..000000000 Binary files a/designer_base/src/com/fr/design/images/m_format/doublebottom.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_format/editChart.png b/designer_base/src/com/fr/design/images/m_format/editChart.png deleted file mode 100644 index 51520236f..000000000 Binary files a/designer_base/src/com/fr/design/images/m_format/editChart.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_format/outsideborders.png b/designer_base/src/com/fr/design/images/m_format/outsideborders.png deleted file mode 100644 index 52bae526d..000000000 Binary files a/designer_base/src/com/fr/design/images/m_format/outsideborders.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_format/shape.png b/designer_base/src/com/fr/design/images/m_format/shape.png deleted file mode 100644 index 34f9c2ac4..000000000 Binary files a/designer_base/src/com/fr/design/images/m_format/shape.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_format/thickbottom.png b/designer_base/src/com/fr/design/images/m_format/thickbottom.png deleted file mode 100644 index 15bd0371d..000000000 Binary files a/designer_base/src/com/fr/design/images/m_format/thickbottom.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_format/thickoutsideborders.png b/designer_base/src/com/fr/design/images/m_format/thickoutsideborders.png deleted file mode 100644 index 595fd73c4..000000000 Binary files a/designer_base/src/com/fr/design/images/m_format/thickoutsideborders.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_format/topanddoublebotttom.png b/designer_base/src/com/fr/design/images/m_format/topanddoublebotttom.png deleted file mode 100644 index 568cffba2..000000000 Binary files a/designer_base/src/com/fr/design/images/m_format/topanddoublebotttom.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_format/topandthickbottom.png b/designer_base/src/com/fr/design/images/m_format/topandthickbottom.png deleted file mode 100644 index 7b4ea8913..000000000 Binary files a/designer_base/src/com/fr/design/images/m_format/topandthickbottom.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_format/topbottom.png b/designer_base/src/com/fr/design/images/m_format/topbottom.png deleted file mode 100644 index 584f57485..000000000 Binary files a/designer_base/src/com/fr/design/images/m_format/topbottom.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_help/forum.png b/designer_base/src/com/fr/design/images/m_help/forum.png deleted file mode 100644 index 557dcd638..000000000 Binary files a/designer_base/src/com/fr/design/images/m_help/forum.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_help/preview_analy.png b/designer_base/src/com/fr/design/images/m_help/preview_analy.png deleted file mode 100644 index 02e8e00eb..000000000 Binary files a/designer_base/src/com/fr/design/images/m_help/preview_analy.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_help/preview_form.png b/designer_base/src/com/fr/design/images/m_help/preview_form.png deleted file mode 100644 index 10b556d14..000000000 Binary files a/designer_base/src/com/fr/design/images/m_help/preview_form.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_help/preview_page.png b/designer_base/src/com/fr/design/images/m_help/preview_page.png deleted file mode 100644 index 739397a7b..000000000 Binary files a/designer_base/src/com/fr/design/images/m_help/preview_page.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_help/preview_write.png b/designer_base/src/com/fr/design/images/m_help/preview_write.png deleted file mode 100644 index ca0be2a82..000000000 Binary files a/designer_base/src/com/fr/design/images/m_help/preview_write.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_insert/accountTitle.png b/designer_base/src/com/fr/design/images/m_insert/accountTitle.png deleted file mode 100644 index 7c6d90be9..000000000 Binary files a/designer_base/src/com/fr/design/images/m_insert/accountTitle.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_insert/barcode.png b/designer_base/src/com/fr/design/images/m_insert/barcode.png deleted file mode 100644 index c208ad28d..000000000 Binary files a/designer_base/src/com/fr/design/images/m_insert/barcode.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_insert/bindCell.png b/designer_base/src/com/fr/design/images/m_insert/bindCell.png deleted file mode 100644 index 3ce09b689..000000000 Binary files a/designer_base/src/com/fr/design/images/m_insert/bindCell.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_insert/compositePop.png b/designer_base/src/com/fr/design/images/m_insert/compositePop.png deleted file mode 100644 index 5f9241bef..000000000 Binary files a/designer_base/src/com/fr/design/images/m_insert/compositePop.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_insert/crossTable.png b/designer_base/src/com/fr/design/images/m_insert/crossTable.png deleted file mode 100644 index 09935205d..000000000 Binary files a/designer_base/src/com/fr/design/images/m_insert/crossTable.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_insert/date.png b/designer_base/src/com/fr/design/images/m_insert/date.png index e5cd685af..3373e4c21 100644 Binary files a/designer_base/src/com/fr/design/images/m_insert/date.png and b/designer_base/src/com/fr/design/images/m_insert/date.png differ diff --git a/designer_base/src/com/fr/design/images/m_insert/groupTable.png b/designer_base/src/com/fr/design/images/m_insert/groupTable.png deleted file mode 100644 index fc6389a67..000000000 Binary files a/designer_base/src/com/fr/design/images/m_insert/groupTable.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_insert/newchart.png b/designer_base/src/com/fr/design/images/m_insert/newchart.png deleted file mode 100644 index 312f0b179..000000000 Binary files a/designer_base/src/com/fr/design/images/m_insert/newchart.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_insert/shape.png b/designer_base/src/com/fr/design/images/m_insert/shape.png deleted file mode 100644 index fa5cfea90..000000000 Binary files a/designer_base/src/com/fr/design/images/m_insert/shape.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_insert/shape_issosceles_triangle.png b/designer_base/src/com/fr/design/images/m_insert/shape_issosceles_triangle.png deleted file mode 100644 index 7047ea795..000000000 Binary files a/designer_base/src/com/fr/design/images/m_insert/shape_issosceles_triangle.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_insert/shape_line.png b/designer_base/src/com/fr/design/images/m_insert/shape_line.png deleted file mode 100644 index a89acef2a..000000000 Binary files a/designer_base/src/com/fr/design/images/m_insert/shape_line.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_insert/shape_oval.png b/designer_base/src/com/fr/design/images/m_insert/shape_oval.png deleted file mode 100644 index 99ca2af1c..000000000 Binary files a/designer_base/src/com/fr/design/images/m_insert/shape_oval.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_insert/shape_rectangle.png b/designer_base/src/com/fr/design/images/m_insert/shape_rectangle.png deleted file mode 100644 index 96a19563b..000000000 Binary files a/designer_base/src/com/fr/design/images/m_insert/shape_rectangle.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_insert/shape_rounded_rectangle.png b/designer_base/src/com/fr/design/images/m_insert/shape_rounded_rectangle.png deleted file mode 100644 index 71d6933b4..000000000 Binary files a/designer_base/src/com/fr/design/images/m_insert/shape_rounded_rectangle.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_insert/textBox.png b/designer_base/src/com/fr/design/images/m_insert/textBox.png deleted file mode 100644 index b9d0354bf..000000000 Binary files a/designer_base/src/com/fr/design/images/m_insert/textBox.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_report/bindData.png b/designer_base/src/com/fr/design/images/m_report/bindData.png deleted file mode 100644 index 5c3660d8f..000000000 Binary files a/designer_base/src/com/fr/design/images/m_report/bindData.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_report/reportWorkFlowAttr.png b/designer_base/src/com/fr/design/images/m_report/reportWorkFlowAttr.png deleted file mode 100644 index b3c0ac4c4..000000000 Binary files a/designer_base/src/com/fr/design/images/m_report/reportWorkFlowAttr.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_web/connection.png b/designer_base/src/com/fr/design/images/m_web/connection.png index c1a189634..8f27cd9c8 100644 Binary files a/designer_base/src/com/fr/design/images/m_web/connection.png and b/designer_base/src/com/fr/design/images/m_web/connection.png differ diff --git a/designer_base/src/com/fr/design/images/m_web/reportletdemo.png b/designer_base/src/com/fr/design/images/m_web/reportletdemo.png deleted file mode 100644 index 511a07d5b..000000000 Binary files a/designer_base/src/com/fr/design/images/m_web/reportletdemo.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_window/cascade.png b/designer_base/src/com/fr/design/images/m_window/cascade.png deleted file mode 100644 index 0e7ef14c4..000000000 Binary files a/designer_base/src/com/fr/design/images/m_window/cascade.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_window/formdesign.png b/designer_base/src/com/fr/design/images/m_window/formdesign.png deleted file mode 100644 index 813fb0dfb..000000000 Binary files a/designer_base/src/com/fr/design/images/m_window/formdesign.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_window/frozen.png b/designer_base/src/com/fr/design/images/m_window/frozen.png deleted file mode 100644 index c6ea7f230..000000000 Binary files a/designer_base/src/com/fr/design/images/m_window/frozen.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_window/generaldesign.png b/designer_base/src/com/fr/design/images/m_window/generaldesign.png deleted file mode 100644 index cb25a32db..000000000 Binary files a/designer_base/src/com/fr/design/images/m_window/generaldesign.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_window/title_hor.png b/designer_base/src/com/fr/design/images/m_window/title_hor.png deleted file mode 100644 index de943912c..000000000 Binary files a/designer_base/src/com/fr/design/images/m_window/title_hor.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/m_window/title_ver.png b/designer_base/src/com/fr/design/images/m_window/title_ver.png deleted file mode 100644 index 941d7e7f6..000000000 Binary files a/designer_base/src/com/fr/design/images/m_window/title_ver.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/mainframe/attribute.png b/designer_base/src/com/fr/design/images/mainframe/attribute.png deleted file mode 100644 index b159aab1b..000000000 Binary files a/designer_base/src/com/fr/design/images/mainframe/attribute.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/mainframe/fpt.png b/designer_base/src/com/fr/design/images/mainframe/fpt.png deleted file mode 100644 index 718ca528f..000000000 Binary files a/designer_base/src/com/fr/design/images/mainframe/fpt.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/Chart-Map/Chart-Map-0.png b/designer_base/src/com/fr/design/images/poly/Chart-Map/Chart-Map-0.png deleted file mode 100644 index 7e0c9d203..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/Chart-Map/Chart-Map-0.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Area/ChartF-Area-0.png b/designer_base/src/com/fr/design/images/poly/ChartF-Area/ChartF-Area-0.png deleted file mode 100644 index 55c8a8d85..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Area/ChartF-Area-0.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Area/ChartF-Area-1.png b/designer_base/src/com/fr/design/images/poly/ChartF-Area/ChartF-Area-1.png deleted file mode 100644 index a0925c4f7..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Area/ChartF-Area-1.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Area/ChartF-Area-2.png b/designer_base/src/com/fr/design/images/poly/ChartF-Area/ChartF-Area-2.png deleted file mode 100644 index 246ec15a1..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Area/ChartF-Area-2.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Area/ChartF-Area-3.png b/designer_base/src/com/fr/design/images/poly/ChartF-Area/ChartF-Area-3.png deleted file mode 100644 index f17cf8dd0..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Area/ChartF-Area-3.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Area/ChartF-Area-4.png b/designer_base/src/com/fr/design/images/poly/ChartF-Area/ChartF-Area-4.png deleted file mode 100644 index 8a3b7b006..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Area/ChartF-Area-4.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Area/ChartF-Area-5.png b/designer_base/src/com/fr/design/images/poly/ChartF-Area/ChartF-Area-5.png deleted file mode 100644 index 6a84f70b4..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Area/ChartF-Area-5.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-0.png b/designer_base/src/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-0.png deleted file mode 100644 index 613e1bf02..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-0.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-1.png b/designer_base/src/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-1.png deleted file mode 100644 index eb377c805..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-1.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-2.png b/designer_base/src/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-2.png deleted file mode 100644 index b6510ac8a..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-2.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-3.png b/designer_base/src/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-3.png deleted file mode 100644 index e73185699..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-3.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-4.png b/designer_base/src/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-4.png deleted file mode 100644 index dfa6596db..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-4.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-5.png b/designer_base/src/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-5.png deleted file mode 100644 index ab4231cc0..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-5.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-6.png b/designer_base/src/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-6.png deleted file mode 100644 index cb7a913dc..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-6.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Column/ChartF-Column-0.png b/designer_base/src/com/fr/design/images/poly/ChartF-Column/ChartF-Column-0.png deleted file mode 100644 index a434983c5..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Column/ChartF-Column-0.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Column/ChartF-Column-1.png b/designer_base/src/com/fr/design/images/poly/ChartF-Column/ChartF-Column-1.png deleted file mode 100644 index 3bc482a9b..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Column/ChartF-Column-1.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Column/ChartF-Column-2.png b/designer_base/src/com/fr/design/images/poly/ChartF-Column/ChartF-Column-2.png deleted file mode 100644 index bd95b78bb..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Column/ChartF-Column-2.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Column/ChartF-Column-3.png b/designer_base/src/com/fr/design/images/poly/ChartF-Column/ChartF-Column-3.png deleted file mode 100644 index 565c8f91f..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Column/ChartF-Column-3.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Column/ChartF-Column-4.png b/designer_base/src/com/fr/design/images/poly/ChartF-Column/ChartF-Column-4.png deleted file mode 100644 index 815872e98..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Column/ChartF-Column-4.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Column/ChartF-Column-5.png b/designer_base/src/com/fr/design/images/poly/ChartF-Column/ChartF-Column-5.png deleted file mode 100644 index 853be533f..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Column/ChartF-Column-5.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Column/ChartF-Column-6.png b/designer_base/src/com/fr/design/images/poly/ChartF-Column/ChartF-Column-6.png deleted file mode 100644 index ac1095d24..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Column/ChartF-Column-6.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Comb_Chart/ChartF-Comb_Chart-0.png b/designer_base/src/com/fr/design/images/poly/ChartF-Comb_Chart/ChartF-Comb_Chart-0.png deleted file mode 100644 index 85de8048d..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Comb_Chart/ChartF-Comb_Chart-0.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Comb_Chart/ChartF-Comb_Chart-1.png b/designer_base/src/com/fr/design/images/poly/ChartF-Comb_Chart/ChartF-Comb_Chart-1.png deleted file mode 100644 index ce26a61a3..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Comb_Chart/ChartF-Comb_Chart-1.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Donut/ChartF-Donut-0.png b/designer_base/src/com/fr/design/images/poly/ChartF-Donut/ChartF-Donut-0.png deleted file mode 100644 index 94608c2bb..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Donut/ChartF-Donut-0.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Donut/ChartF-Donut-1.png b/designer_base/src/com/fr/design/images/poly/ChartF-Donut/ChartF-Donut-1.png deleted file mode 100644 index ed3580ac2..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Donut/ChartF-Donut-1.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-0.png b/designer_base/src/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-0.png deleted file mode 100644 index a8caabbd2..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-0.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-1.png b/designer_base/src/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-1.png deleted file mode 100644 index 84c634733..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-1.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-2.png b/designer_base/src/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-2.png deleted file mode 100644 index 2dd09a837..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-2.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-3.png b/designer_base/src/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-3.png deleted file mode 100644 index 90bf152b1..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-3.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Gis/ChartF-Gis-0.png b/designer_base/src/com/fr/design/images/poly/ChartF-Gis/ChartF-Gis-0.png deleted file mode 100644 index ac4246a0c..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Gis/ChartF-Gis-0.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Line/ChartF-Line-0.png b/designer_base/src/com/fr/design/images/poly/ChartF-Line/ChartF-Line-0.png deleted file mode 100644 index e4c8657aa..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Line/ChartF-Line-0.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Line/ChartF-Line-1.png b/designer_base/src/com/fr/design/images/poly/ChartF-Line/ChartF-Line-1.png deleted file mode 100644 index 06cfd159b..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Line/ChartF-Line-1.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Line/ChartF-Line-2.png b/designer_base/src/com/fr/design/images/poly/ChartF-Line/ChartF-Line-2.png deleted file mode 100644 index 1e6bd9c7d..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Line/ChartF-Line-2.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Line/ChartF-Line-3.png b/designer_base/src/com/fr/design/images/poly/ChartF-Line/ChartF-Line-3.png deleted file mode 100644 index 1b263e69b..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Line/ChartF-Line-3.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Line/ChartF-Line-4.png b/designer_base/src/com/fr/design/images/poly/ChartF-Line/ChartF-Line-4.png deleted file mode 100644 index e4d996165..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Line/ChartF-Line-4.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Line/ChartF-Line-5.png b/designer_base/src/com/fr/design/images/poly/ChartF-Line/ChartF-Line-5.png deleted file mode 100644 index a00b64dd4..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Line/ChartF-Line-5.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Meter/ChartF-Meter-0.png b/designer_base/src/com/fr/design/images/poly/ChartF-Meter/ChartF-Meter-0.png deleted file mode 100644 index 393309dee..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Meter/ChartF-Meter-0.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Meter/ChartF-Meter-1.png b/designer_base/src/com/fr/design/images/poly/ChartF-Meter/ChartF-Meter-1.png deleted file mode 100644 index d840e009d..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Meter/ChartF-Meter-1.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-0.png b/designer_base/src/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-0.png deleted file mode 100644 index 94608c2bb..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-0.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-1.png b/designer_base/src/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-1.png deleted file mode 100644 index ed3580ac2..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-1.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-2.png b/designer_base/src/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-2.png deleted file mode 100644 index 2ef860654..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-2.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-3.png b/designer_base/src/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-3.png deleted file mode 100644 index 385361ea0..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-3.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-4.png b/designer_base/src/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-4.png deleted file mode 100644 index d07541941..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-4.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-5.png b/designer_base/src/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-5.png deleted file mode 100644 index c3591e115..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-5.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-0.png b/designer_base/src/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-0.png deleted file mode 100644 index 87acbabd8..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-0.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-1.png b/designer_base/src/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-1.png deleted file mode 100644 index a208aa453..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-1.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-2.png b/designer_base/src/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-2.png deleted file mode 100644 index 2cdeea09e..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-2.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-3.png b/designer_base/src/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-3.png deleted file mode 100644 index 008832345..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-3.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Range_Chart/ChartF-Range_Chart-0.png b/designer_base/src/com/fr/design/images/poly/ChartF-Range_Chart/ChartF-Range_Chart-0.png deleted file mode 100644 index d44271636..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Range_Chart/ChartF-Range_Chart-0.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-0.png b/designer_base/src/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-0.png deleted file mode 100644 index fa6c29643..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-0.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-1.png b/designer_base/src/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-1.png deleted file mode 100644 index c41ad37c8..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-1.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-2.png b/designer_base/src/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-2.png deleted file mode 100644 index e0097a74a..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-2.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-3.png b/designer_base/src/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-3.png deleted file mode 100644 index 2c7d6e87a..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-3.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-XYScatter/ChartF-XYScatter-0.png b/designer_base/src/com/fr/design/images/poly/ChartF-XYScatter/ChartF-XYScatter-0.png deleted file mode 100644 index 0ac86cbfd..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-XYScatter/ChartF-XYScatter-0.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-XYScatter/ChartF-XYScatter-1.png b/designer_base/src/com/fr/design/images/poly/ChartF-XYScatter/ChartF-XYScatter-1.png deleted file mode 100644 index f37797294..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-XYScatter/ChartF-XYScatter-1.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/ChartF-XYScatter/ChartF-XYScatter-2.png b/designer_base/src/com/fr/design/images/poly/ChartF-XYScatter/ChartF-XYScatter-2.png deleted file mode 100644 index f57ac7e9b..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/ChartF-XYScatter/ChartF-XYScatter-2.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/Chart_BubbleChart/Chart_BubbleChart-0.png b/designer_base/src/com/fr/design/images/poly/Chart_BubbleChart/Chart_BubbleChart-0.png deleted file mode 100644 index 832a1da1b..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/Chart_BubbleChart/Chart_BubbleChart-0.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/Chart_BubbleChart/FR-Chart-Chart_BubbleChart-0.png b/designer_base/src/com/fr/design/images/poly/Chart_BubbleChart/FR-Chart-Chart_BubbleChart-0.png deleted file mode 100644 index 832a1da1b..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/Chart_BubbleChart/FR-Chart-Chart_BubbleChart-0.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/toolbar/Chart-SVG_MAP.png b/designer_base/src/com/fr/design/images/poly/toolbar/Chart-SVG_MAP.png deleted file mode 100644 index d56a35bfe..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/toolbar/Chart-SVG_MAP.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-Area.png b/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-Area.png deleted file mode 100644 index 473baff55..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-Area.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-Bar.png b/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-Bar.png deleted file mode 100644 index a8d05d36b..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-Bar.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-Donut.png b/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-Donut.png deleted file mode 100644 index 8fd08de55..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-Donut.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-Funnel.png b/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-Funnel.png deleted file mode 100644 index b838ac93b..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-Funnel.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-Gantt.png b/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-Gantt.png deleted file mode 100644 index 6b651248c..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-Gantt.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-Pie.png b/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-Pie.png deleted file mode 100644 index 055502cb2..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-Pie.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-Radar.png b/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-Radar.png deleted file mode 100644 index 754781f9f..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-Radar.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-Stock.png b/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-Stock.png deleted file mode 100644 index 073de2b09..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-Stock.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-XYScatter.png b/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-XYScatter.png deleted file mode 100644 index 24a2aaa3e..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/toolbar/ChartF-XYScatter.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/toolbar/Chart_BubbleChart.png b/designer_base/src/com/fr/design/images/poly/toolbar/Chart_BubbleChart.png deleted file mode 100644 index e1ab5c313..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/toolbar/Chart_BubbleChart.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/toolbar/FR-Chart-Bit_Map.png b/designer_base/src/com/fr/design/images/poly/toolbar/FR-Chart-Bit_Map.png deleted file mode 100644 index 2f68dcf8f..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/toolbar/FR-Chart-Bit_Map.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewArea.png b/designer_base/src/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewArea.png deleted file mode 100644 index 473baff55..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewArea.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewBar.png b/designer_base/src/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewBar.png deleted file mode 100644 index 1f28a0943..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewBar.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewColumn.png b/designer_base/src/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewColumn.png deleted file mode 100644 index 8a51184b8..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewColumn.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewLine.png b/designer_base/src/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewLine.png deleted file mode 100644 index 63c460d69..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewLine.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewPie.png b/designer_base/src/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewPie.png deleted file mode 100644 index 055502cb2..000000000 Binary files a/designer_base/src/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewPie.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/report/groupReport.png b/designer_base/src/com/fr/design/images/report/groupReport.png deleted file mode 100644 index 35bda8b74..000000000 Binary files a/designer_base/src/com/fr/design/images/report/groupReport.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/reportcolumns/col_en.png b/designer_base/src/com/fr/design/images/reportcolumns/col_en.png deleted file mode 100644 index 14f73966d..000000000 Binary files a/designer_base/src/com/fr/design/images/reportcolumns/col_en.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/reportcolumns/row_en.png b/designer_base/src/com/fr/design/images/reportcolumns/row_en.png deleted file mode 100644 index 7c66662a2..000000000 Binary files a/designer_base/src/com/fr/design/images/reportcolumns/row_en.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/server/printerconf.png b/designer_base/src/com/fr/design/images/server/printerconf.png deleted file mode 100644 index 512e9528b..000000000 Binary files a/designer_base/src/com/fr/design/images/server/printerconf.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/serverM/org.png b/designer_base/src/com/fr/design/images/serverM/org.png deleted file mode 100644 index 4cb7ffef6..000000000 Binary files a/designer_base/src/com/fr/design/images/serverM/org.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/serverM/organization.png b/designer_base/src/com/fr/design/images/serverM/organization.png deleted file mode 100644 index 78ac9f01e..000000000 Binary files a/designer_base/src/com/fr/design/images/serverM/organization.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/serverM/roleAdd.png b/designer_base/src/com/fr/design/images/serverM/roleAdd.png deleted file mode 100644 index c28637f54..000000000 Binary files a/designer_base/src/com/fr/design/images/serverM/roleAdd.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/serverM/roleRemove.png b/designer_base/src/com/fr/design/images/serverM/roleRemove.png deleted file mode 100644 index eed621776..000000000 Binary files a/designer_base/src/com/fr/design/images/serverM/roleRemove.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/serverM/rtr.png b/designer_base/src/com/fr/design/images/serverM/rtr.png deleted file mode 100644 index c35d3dae0..000000000 Binary files a/designer_base/src/com/fr/design/images/serverM/rtr.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/toolbarbtn/close_tags.png b/designer_base/src/com/fr/design/images/toolbarbtn/close_tags.png deleted file mode 100644 index 769eeafd7..000000000 Binary files a/designer_base/src/com/fr/design/images/toolbarbtn/close_tags.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/toolbarbtn/closehover.png b/designer_base/src/com/fr/design/images/toolbarbtn/closehover.png deleted file mode 100644 index 933272b49..000000000 Binary files a/designer_base/src/com/fr/design/images/toolbarbtn/closehover.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/toolbarbtn/down.png b/designer_base/src/com/fr/design/images/toolbarbtn/down.png index 571176400..47c2ef450 100644 Binary files a/designer_base/src/com/fr/design/images/toolbarbtn/down.png and b/designer_base/src/com/fr/design/images/toolbarbtn/down.png differ diff --git a/designer_base/src/com/fr/design/images/toolbarbtn/parameter-hover.png b/designer_base/src/com/fr/design/images/toolbarbtn/parameter-hover.png deleted file mode 100644 index e625104a9..000000000 Binary files a/designer_base/src/com/fr/design/images/toolbarbtn/parameter-hover.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/toolbarbtn/xiala.png b/designer_base/src/com/fr/design/images/toolbarbtn/xiala.png deleted file mode 100644 index 4dc3a9404..000000000 Binary files a/designer_base/src/com/fr/design/images/toolbarbtn/xiala.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/images/warnings/warning 2.png b/designer_base/src/com/fr/design/images/warnings/warning 2.png deleted file mode 100644 index b8f3bdc61..000000000 Binary files a/designer_base/src/com/fr/design/images/warnings/warning 2.png and /dev/null differ diff --git a/designer_base/src/com/fr/design/mainframe/DesktopCardPane.java b/designer_base/src/com/fr/design/mainframe/DesktopCardPane.java index b295de7c7..ed80d6469 100644 --- a/designer_base/src/com/fr/design/mainframe/DesktopCardPane.java +++ b/designer_base/src/com/fr/design/mainframe/DesktopCardPane.java @@ -3,7 +3,7 @@ */ package com.fr.design.mainframe; -import java.awt.BorderLayout; +import java.awt.*; import com.fr.design.event.TargetModifiedEvent; diff --git a/designer_base/src/com/fr/design/mainframe/WestRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/WestRegionContainerPane.java index f0b646808..06faf6d5a 100644 --- a/designer_base/src/com/fr/design/mainframe/WestRegionContainerPane.java +++ b/designer_base/src/com/fr/design/mainframe/WestRegionContainerPane.java @@ -2,6 +2,7 @@ package com.fr.design.mainframe; import com.fr.design.DesignModelAdapter; import com.fr.design.DesignerEnvManager; +import com.fr.design.constants.UIConstants; import com.fr.design.data.datapane.TableDataTreePane; import com.fr.design.gui.icontainer.UIResizableContainer; import com.fr.general.GeneralContext; @@ -51,5 +52,6 @@ public class WestRegionContainerPane extends UIResizableContainer { }); setContainerWidth(165); + setBackground(UIConstants.TREE_BACKGROUND); } } \ No newline at end of file diff --git a/designer_chart/src/com/fr/design/images/copyjs.png b/designer_chart/src/com/fr/design/images/copyjs.png deleted file mode 100644 index d4b51fec4..000000000 Binary files a/designer_chart/src/com/fr/design/images/copyjs.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/exportimg.png b/designer_chart/src/com/fr/design/images/exportimg.png deleted file mode 100644 index 3f039124c..000000000 Binary files a/designer_chart/src/com/fr/design/images/exportimg.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/newchart_normal.png b/designer_chart/src/com/fr/design/images/newchart_normal.png deleted file mode 100644 index 2c53cce60..000000000 Binary files a/designer_chart/src/com/fr/design/images/newchart_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/newchart_over.png b/designer_chart/src/com/fr/design/images/newchart_over.png deleted file mode 100644 index a26a47e12..000000000 Binary files a/designer_chart/src/com/fr/design/images/newchart_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/newchart_press.png b/designer_chart/src/com/fr/design/images/newchart_press.png deleted file mode 100644 index b0e0c4637..000000000 Binary files a/designer_chart/src/com/fr/design/images/newchart_press.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/splash4Chart.png b/designer_chart/src/com/fr/design/images/splash4Chart.png deleted file mode 100644 index ec3e897ea..000000000 Binary files a/designer_chart/src/com/fr/design/images/splash4Chart.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/area/0_gray.png b/designer_chart/src/com/fr/design/images/toolbar/area/0_gray.png deleted file mode 100644 index 32be57ac3..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/area/0_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/area/0_normal.png b/designer_chart/src/com/fr/design/images/toolbar/area/0_normal.png deleted file mode 100644 index 140cbba82..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/area/0_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/area/0_over.png b/designer_chart/src/com/fr/design/images/toolbar/area/0_over.png deleted file mode 100644 index 3f7dc1c7f..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/area/0_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/area/1_gray.png b/designer_chart/src/com/fr/design/images/toolbar/area/1_gray.png deleted file mode 100644 index 1df354176..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/area/1_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/area/1_normal.png b/designer_chart/src/com/fr/design/images/toolbar/area/1_normal.png deleted file mode 100644 index 37f18c9e7..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/area/1_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/area/1_over.png b/designer_chart/src/com/fr/design/images/toolbar/area/1_over.png deleted file mode 100644 index f52ea6a48..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/area/1_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/area/2_gray.png b/designer_chart/src/com/fr/design/images/toolbar/area/2_gray.png deleted file mode 100644 index 90f6436af..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/area/2_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/area/2_normal.png b/designer_chart/src/com/fr/design/images/toolbar/area/2_normal.png deleted file mode 100644 index 5622dc837..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/area/2_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/area/2_over.png b/designer_chart/src/com/fr/design/images/toolbar/area/2_over.png deleted file mode 100644 index f24e513b3..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/area/2_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/area/3_gray.png b/designer_chart/src/com/fr/design/images/toolbar/area/3_gray.png deleted file mode 100644 index f9b401c99..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/area/3_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/area/3_normal.png b/designer_chart/src/com/fr/design/images/toolbar/area/3_normal.png deleted file mode 100644 index e54c00a28..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/area/3_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/area/3_over.png b/designer_chart/src/com/fr/design/images/toolbar/area/3_over.png deleted file mode 100644 index 092ff8292..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/area/3_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/bar/0_gray.png b/designer_chart/src/com/fr/design/images/toolbar/bar/0_gray.png deleted file mode 100644 index baa6debf8..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/bar/0_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/bar/0_normal.png b/designer_chart/src/com/fr/design/images/toolbar/bar/0_normal.png deleted file mode 100644 index d489dc4da..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/bar/0_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/bar/0_over.png b/designer_chart/src/com/fr/design/images/toolbar/bar/0_over.png deleted file mode 100644 index b2db29c3e..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/bar/0_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/bar/1_gray.png b/designer_chart/src/com/fr/design/images/toolbar/bar/1_gray.png deleted file mode 100644 index 3e9230770..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/bar/1_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/bar/1_normal.png b/designer_chart/src/com/fr/design/images/toolbar/bar/1_normal.png deleted file mode 100644 index a9a5425c6..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/bar/1_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/bar/1_over.png b/designer_chart/src/com/fr/design/images/toolbar/bar/1_over.png deleted file mode 100644 index c57635c7e..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/bar/1_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/bar/2_gray.png b/designer_chart/src/com/fr/design/images/toolbar/bar/2_gray.png deleted file mode 100644 index 2789e3ae3..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/bar/2_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/bar/2_normal.png b/designer_chart/src/com/fr/design/images/toolbar/bar/2_normal.png deleted file mode 100644 index 3b1b6972a..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/bar/2_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/bar/2_over.png b/designer_chart/src/com/fr/design/images/toolbar/bar/2_over.png deleted file mode 100644 index 0fcc0df51..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/bar/2_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/bar/3_gary.png b/designer_chart/src/com/fr/design/images/toolbar/bar/3_gary.png deleted file mode 100644 index ffd5e545b..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/bar/3_gary.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/bar/3_gray.png b/designer_chart/src/com/fr/design/images/toolbar/bar/3_gray.png deleted file mode 100644 index ffd5e545b..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/bar/3_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/bar/3_normal.png b/designer_chart/src/com/fr/design/images/toolbar/bar/3_normal.png deleted file mode 100644 index 669ccffe1..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/bar/3_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/bar/3_over.png b/designer_chart/src/com/fr/design/images/toolbar/bar/3_over.png deleted file mode 100644 index d7194a6a2..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/bar/3_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/bar/4_gray.png b/designer_chart/src/com/fr/design/images/toolbar/bar/4_gray.png deleted file mode 100644 index 70e4683d0..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/bar/4_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/bar/4_normal.png b/designer_chart/src/com/fr/design/images/toolbar/bar/4_normal.png deleted file mode 100644 index 82cc074b5..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/bar/4_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/bar/4_over.png b/designer_chart/src/com/fr/design/images/toolbar/bar/4_over.png deleted file mode 100644 index 259422a65..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/bar/4_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/bar/5_gray.png b/designer_chart/src/com/fr/design/images/toolbar/bar/5_gray.png deleted file mode 100644 index 046aa24d2..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/bar/5_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/bar/5_normal.png b/designer_chart/src/com/fr/design/images/toolbar/bar/5_normal.png deleted file mode 100644 index 01dc29107..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/bar/5_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/bar/5_over.png b/designer_chart/src/com/fr/design/images/toolbar/bar/5_over.png deleted file mode 100644 index 63dee58b1..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/bar/5_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/bar/6_gray.png b/designer_chart/src/com/fr/design/images/toolbar/bar/6_gray.png deleted file mode 100644 index ce1ce75d0..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/bar/6_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/bar/6_normal.png b/designer_chart/src/com/fr/design/images/toolbar/bar/6_normal.png deleted file mode 100644 index d96752098..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/bar/6_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/bar/6_over.png b/designer_chart/src/com/fr/design/images/toolbar/bar/6_over.png deleted file mode 100644 index c0a5737c7..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/bar/6_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/bubble/0_gray.png b/designer_chart/src/com/fr/design/images/toolbar/bubble/0_gray.png deleted file mode 100644 index da9f60e28..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/bubble/0_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/bubble/0_normal.png b/designer_chart/src/com/fr/design/images/toolbar/bubble/0_normal.png deleted file mode 100644 index 72823ae19..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/bubble/0_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/bubble/0_over.png b/designer_chart/src/com/fr/design/images/toolbar/bubble/0_over.png deleted file mode 100644 index 2ddec442a..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/bubble/0_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/column/0_gray.png b/designer_chart/src/com/fr/design/images/toolbar/column/0_gray.png deleted file mode 100644 index 08e9cefc1..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/column/0_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/column/0_normal.png b/designer_chart/src/com/fr/design/images/toolbar/column/0_normal.png deleted file mode 100644 index 27c077ab9..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/column/0_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/column/0_over.png b/designer_chart/src/com/fr/design/images/toolbar/column/0_over.png deleted file mode 100644 index e79ec9971..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/column/0_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/column/1_gray.png b/designer_chart/src/com/fr/design/images/toolbar/column/1_gray.png deleted file mode 100644 index 9b6b56a79..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/column/1_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/column/1_normal.png b/designer_chart/src/com/fr/design/images/toolbar/column/1_normal.png deleted file mode 100644 index ffbc24d86..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/column/1_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/column/1_over.png b/designer_chart/src/com/fr/design/images/toolbar/column/1_over.png deleted file mode 100644 index 5ac0dd420..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/column/1_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/column/2_gray.png b/designer_chart/src/com/fr/design/images/toolbar/column/2_gray.png deleted file mode 100644 index aaf4f5a8d..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/column/2_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/column/2_normal.png b/designer_chart/src/com/fr/design/images/toolbar/column/2_normal.png deleted file mode 100644 index ba7cf13c2..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/column/2_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/column/2_over.png b/designer_chart/src/com/fr/design/images/toolbar/column/2_over.png deleted file mode 100644 index eb88fb67e..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/column/2_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/column/3_gray.png b/designer_chart/src/com/fr/design/images/toolbar/column/3_gray.png deleted file mode 100644 index c35e61c25..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/column/3_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/column/3_normal.png b/designer_chart/src/com/fr/design/images/toolbar/column/3_normal.png deleted file mode 100644 index 5842bccb9..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/column/3_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/column/3_over.png b/designer_chart/src/com/fr/design/images/toolbar/column/3_over.png deleted file mode 100644 index bd9f6497e..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/column/3_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/column/4_gray.png b/designer_chart/src/com/fr/design/images/toolbar/column/4_gray.png deleted file mode 100644 index 4c4958c20..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/column/4_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/column/4_normal.png b/designer_chart/src/com/fr/design/images/toolbar/column/4_normal.png deleted file mode 100644 index 191789551..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/column/4_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/column/4_over.png b/designer_chart/src/com/fr/design/images/toolbar/column/4_over.png deleted file mode 100644 index 44cd8063e..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/column/4_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/column/5_gray.png b/designer_chart/src/com/fr/design/images/toolbar/column/5_gray.png deleted file mode 100644 index 9a1de0259..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/column/5_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/column/5_normal.png b/designer_chart/src/com/fr/design/images/toolbar/column/5_normal.png deleted file mode 100644 index 2bfa3d33b..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/column/5_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/column/5_over.png b/designer_chart/src/com/fr/design/images/toolbar/column/5_over.png deleted file mode 100644 index 1d8505510..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/column/5_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/column/6_gray.png b/designer_chart/src/com/fr/design/images/toolbar/column/6_gray.png deleted file mode 100644 index db9ff17d6..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/column/6_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/column/6_normal.png b/designer_chart/src/com/fr/design/images/toolbar/column/6_normal.png deleted file mode 100644 index 6218c9102..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/column/6_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/column/6_over.png b/designer_chart/src/com/fr/design/images/toolbar/column/6_over.png deleted file mode 100644 index a5cc6c056..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/column/6_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/custom/0_gray.png b/designer_chart/src/com/fr/design/images/toolbar/custom/0_gray.png deleted file mode 100644 index e3a78d4f1..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/custom/0_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/custom/0_normal.png b/designer_chart/src/com/fr/design/images/toolbar/custom/0_normal.png deleted file mode 100644 index 059e5f643..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/custom/0_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/custom/0_over.png b/designer_chart/src/com/fr/design/images/toolbar/custom/0_over.png deleted file mode 100644 index a80fbd377..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/custom/0_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/donut/0_gray.png b/designer_chart/src/com/fr/design/images/toolbar/donut/0_gray.png deleted file mode 100644 index 8cf435bb1..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/donut/0_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/donut/0_normal.png b/designer_chart/src/com/fr/design/images/toolbar/donut/0_normal.png deleted file mode 100644 index bb561d1e5..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/donut/0_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/donut/0_over.png b/designer_chart/src/com/fr/design/images/toolbar/donut/0_over.png deleted file mode 100644 index e69217b24..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/donut/0_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/donut/1_gray.png b/designer_chart/src/com/fr/design/images/toolbar/donut/1_gray.png deleted file mode 100644 index d21c01965..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/donut/1_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/donut/1_normal.png b/designer_chart/src/com/fr/design/images/toolbar/donut/1_normal.png deleted file mode 100644 index d006f15cb..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/donut/1_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/donut/1_over.png b/designer_chart/src/com/fr/design/images/toolbar/donut/1_over.png deleted file mode 100644 index acf9eba36..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/donut/1_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/funnel/0_gray.png b/designer_chart/src/com/fr/design/images/toolbar/funnel/0_gray.png deleted file mode 100644 index 9fefbb1c0..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/funnel/0_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/funnel/0_normal.png b/designer_chart/src/com/fr/design/images/toolbar/funnel/0_normal.png deleted file mode 100644 index fb50bbe29..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/funnel/0_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/funnel/0_over.png b/designer_chart/src/com/fr/design/images/toolbar/funnel/0_over.png deleted file mode 100644 index af504b8c7..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/funnel/0_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/gantt/0_gray.png b/designer_chart/src/com/fr/design/images/toolbar/gantt/0_gray.png deleted file mode 100644 index 612be8581..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/gantt/0_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/gantt/0_normal.png b/designer_chart/src/com/fr/design/images/toolbar/gantt/0_normal.png deleted file mode 100644 index b5b9088cb..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/gantt/0_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/gantt/0_over.png b/designer_chart/src/com/fr/design/images/toolbar/gantt/0_over.png deleted file mode 100644 index 3d9aad856..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/gantt/0_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/gis/0_gray.png b/designer_chart/src/com/fr/design/images/toolbar/gis/0_gray.png deleted file mode 100644 index ebc7c23cb..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/gis/0_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/gis/0_normal.png b/designer_chart/src/com/fr/design/images/toolbar/gis/0_normal.png deleted file mode 100644 index 7be42c740..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/gis/0_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/gis/0_over.png b/designer_chart/src/com/fr/design/images/toolbar/gis/0_over.png deleted file mode 100644 index e730f993e..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/gis/0_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/gis/1_gray.png b/designer_chart/src/com/fr/design/images/toolbar/gis/1_gray.png deleted file mode 100644 index 9d4bcfed4..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/gis/1_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/gis/1_normal.png b/designer_chart/src/com/fr/design/images/toolbar/gis/1_normal.png deleted file mode 100644 index 9d97b8242..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/gis/1_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/gis/1_over.png b/designer_chart/src/com/fr/design/images/toolbar/gis/1_over.png deleted file mode 100644 index 337ae8d2f..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/gis/1_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/line/0_gray.png b/designer_chart/src/com/fr/design/images/toolbar/line/0_gray.png deleted file mode 100644 index 894c6ec04..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/line/0_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/line/0_normal.png b/designer_chart/src/com/fr/design/images/toolbar/line/0_normal.png deleted file mode 100644 index 764b9bac9..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/line/0_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/line/0_over.png b/designer_chart/src/com/fr/design/images/toolbar/line/0_over.png deleted file mode 100644 index d91e0ea6c..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/line/0_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/map/0_gray.png b/designer_chart/src/com/fr/design/images/toolbar/map/0_gray.png deleted file mode 100644 index 3865ace74..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/map/0_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/map/0_normal.png b/designer_chart/src/com/fr/design/images/toolbar/map/0_normal.png deleted file mode 100644 index a1492da8f..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/map/0_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/map/0_over.png b/designer_chart/src/com/fr/design/images/toolbar/map/0_over.png deleted file mode 100644 index dec831942..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/map/0_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/meter/0_gray.png b/designer_chart/src/com/fr/design/images/toolbar/meter/0_gray.png deleted file mode 100644 index 8e24efd5d..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/meter/0_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/meter/0_normal.png b/designer_chart/src/com/fr/design/images/toolbar/meter/0_normal.png deleted file mode 100644 index 62327bb2b..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/meter/0_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/meter/0_over.png b/designer_chart/src/com/fr/design/images/toolbar/meter/0_over.png deleted file mode 100644 index 4fab1f077..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/meter/0_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/meter/1_gray.png b/designer_chart/src/com/fr/design/images/toolbar/meter/1_gray.png deleted file mode 100644 index ca7262cdd..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/meter/1_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/meter/1_normal.png b/designer_chart/src/com/fr/design/images/toolbar/meter/1_normal.png deleted file mode 100644 index bedd67c1a..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/meter/1_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/meter/1_over.png b/designer_chart/src/com/fr/design/images/toolbar/meter/1_over.png deleted file mode 100644 index 6f2824dfe..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/meter/1_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/meter/2_gray.png b/designer_chart/src/com/fr/design/images/toolbar/meter/2_gray.png deleted file mode 100644 index e0df53225..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/meter/2_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/meter/2_normal.png b/designer_chart/src/com/fr/design/images/toolbar/meter/2_normal.png deleted file mode 100644 index 36783e9e9..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/meter/2_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/meter/2_over.png b/designer_chart/src/com/fr/design/images/toolbar/meter/2_over.png deleted file mode 100644 index 76f3404b4..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/meter/2_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/pie/0_gray.png b/designer_chart/src/com/fr/design/images/toolbar/pie/0_gray.png deleted file mode 100644 index c05918239..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/pie/0_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/pie/0_normal.png b/designer_chart/src/com/fr/design/images/toolbar/pie/0_normal.png deleted file mode 100644 index 1b1363b5f..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/pie/0_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/pie/0_over.png b/designer_chart/src/com/fr/design/images/toolbar/pie/0_over.png deleted file mode 100644 index 60e08dfa7..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/pie/0_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/pie/1_gray.png b/designer_chart/src/com/fr/design/images/toolbar/pie/1_gray.png deleted file mode 100644 index 80058c5ec..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/pie/1_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/pie/1_normal.png b/designer_chart/src/com/fr/design/images/toolbar/pie/1_normal.png deleted file mode 100644 index 5524fa143..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/pie/1_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/pie/1_over.png b/designer_chart/src/com/fr/design/images/toolbar/pie/1_over.png deleted file mode 100644 index 09a1c2e50..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/pie/1_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/radar/0_gray.png b/designer_chart/src/com/fr/design/images/toolbar/radar/0_gray.png deleted file mode 100644 index eed538adf..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/radar/0_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/radar/0_normal.png b/designer_chart/src/com/fr/design/images/toolbar/radar/0_normal.png deleted file mode 100644 index b8fa24288..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/radar/0_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/radar/0_over.png b/designer_chart/src/com/fr/design/images/toolbar/radar/0_over.png deleted file mode 100644 index 76550b6a5..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/radar/0_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/range/0_gray.png b/designer_chart/src/com/fr/design/images/toolbar/range/0_gray.png deleted file mode 100644 index 614f6f142..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/range/0_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/range/0_normal.png b/designer_chart/src/com/fr/design/images/toolbar/range/0_normal.png deleted file mode 100644 index 0877a3a74..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/range/0_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/range/0_over.png b/designer_chart/src/com/fr/design/images/toolbar/range/0_over.png deleted file mode 100644 index c94bc34cc..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/range/0_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/stock/0_gray.png b/designer_chart/src/com/fr/design/images/toolbar/stock/0_gray.png deleted file mode 100644 index acf6a462c..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/stock/0_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/stock/0_normal.png b/designer_chart/src/com/fr/design/images/toolbar/stock/0_normal.png deleted file mode 100644 index e6acf8b0a..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/stock/0_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/stock/0_over.png b/designer_chart/src/com/fr/design/images/toolbar/stock/0_over.png deleted file mode 100644 index 24fba1e0b..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/stock/0_over.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/xyscatter/0_gray.png b/designer_chart/src/com/fr/design/images/toolbar/xyscatter/0_gray.png deleted file mode 100644 index b755a7226..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/xyscatter/0_gray.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/xyscatter/0_normal.png b/designer_chart/src/com/fr/design/images/toolbar/xyscatter/0_normal.png deleted file mode 100644 index d29e0eabe..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/xyscatter/0_normal.png and /dev/null differ diff --git a/designer_chart/src/com/fr/design/images/toolbar/xyscatter/0_over.png b/designer_chart/src/com/fr/design/images/toolbar/xyscatter/0_over.png deleted file mode 100644 index 2bb5013ce..000000000 Binary files a/designer_chart/src/com/fr/design/images/toolbar/xyscatter/0_over.png and /dev/null differ diff --git a/designer_form/src/com/fr/design/form/images/delete_hover&click.png b/designer_form/src/com/fr/design/form/images/delete_hover&click.png deleted file mode 100644 index b62e65679..000000000 Binary files a/designer_form/src/com/fr/design/form/images/delete_hover&click.png and /dev/null differ diff --git a/designer_form/src/com/fr/design/form/images/delete_normal.png b/designer_form/src/com/fr/design/form/images/delete_normal.png deleted file mode 100644 index ff002c64d..000000000 Binary files a/designer_form/src/com/fr/design/form/images/delete_normal.png and /dev/null differ diff --git a/designer_form/src/com/fr/design/form/util/XCreatorConstants.java b/designer_form/src/com/fr/design/form/util/XCreatorConstants.java index 126f4a9a3..33aac54a8 100644 --- a/designer_form/src/com/fr/design/form/util/XCreatorConstants.java +++ b/designer_form/src/com/fr/design/form/util/XCreatorConstants.java @@ -22,7 +22,7 @@ public class XCreatorConstants { public static final String PROPERTY_CATEGORY = "category"; public static final String DEFAULT_GROUP_NAME = "Form-Basic_Properties"; public static final String PROPERTY_VALIDATE = "FR-Designer_Validate"; - public static final Color FORM_BG = new Color(252, 252, 254); + public static final Color FORM_BG = new Color(255, 255, 255); // 拖拽标识块的大小 public static final int RESIZE_BOX_SIZ = 5; // 拖拽的小方块的内部颜色 @@ -30,7 +30,8 @@ public class XCreatorConstants { // 拖拽的小方块的边框颜色 public static final Color RESIZE_BOX_BORDER_COLOR = new Color(143, 171, 196); // 当前选取的组件的边框线着色 - public static final Color SELECTION_COLOR = new Color(179, 209, 236); + public static final Color SELECTION_COLOR = new Color(179, 209, 236); + public static final Color FORM_BORDER_COLOR = new Color(200, 201, 205); // 设计器区域外边框的颜色和粗细 public static final Border AREA_BORDER = BorderFactory.createLineBorder(new Color(224, 224, 255), 0); // 布局拖拽时的颜色 diff --git a/designer_form/src/com/fr/design/mainframe/FormArea.java b/designer_form/src/com/fr/design/mainframe/FormArea.java index 6c59130df..e51500a76 100644 --- a/designer_form/src/com/fr/design/mainframe/FormArea.java +++ b/designer_form/src/com/fr/design/mainframe/FormArea.java @@ -1,24 +1,5 @@ package com.fr.design.mainframe; -import java.awt.AWTEvent; -import java.awt.Adjustable; -import java.awt.Color; -import java.awt.Container; -import java.awt.Dimension; -import java.awt.Insets; -import java.awt.Point; -import java.awt.Rectangle; -import java.awt.Toolkit; -import java.awt.event.*; - -import javax.swing.JComponent; -import javax.swing.JPanel; -import javax.swing.border.LineBorder; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; -import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; - import com.fr.base.ScreenResolution; import com.fr.design.designer.beans.events.DesignerEvent; import com.fr.design.designer.creator.XCreator; @@ -26,802 +7,815 @@ import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.designer.creator.XWBorderLayout; import com.fr.design.designer.creator.XWFitLayout; import com.fr.design.file.HistoryTemplateListPane; -import com.fr.design.gui.frpane.UINumberSlidePane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UIBasicSpinner; import com.fr.design.gui.itextfield.UINumberField; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.design.scrollruler.BaseRuler; -import com.fr.design.scrollruler.HorizontalRuler; -import com.fr.design.scrollruler.RulerLayout; -import com.fr.design.scrollruler.ScrollRulerComponent; -import com.fr.design.scrollruler.VerticalRuler; +import com.fr.design.scrollruler.*; import com.fr.design.utils.ComponentUtils; import com.fr.design.utils.gui.LayoutUtils; import com.fr.form.ui.container.WBorderLayout; import com.fr.general.FRScreen; import com.fr.general.Inter; +import javax.swing.*; +import javax.swing.border.LineBorder; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import java.awt.*; +import java.awt.event.*; + public class FormArea extends JComponent implements ScrollRulerComponent { - private static final double SLIDER_FLOAT = 400.0; - private static final double SLIDER_MIN = 10.0; - public static final double DEFAULT_SLIDER = 100.0; - private static final int ROTATIONS = 50; - private static final int SHOWVALMAX = 400; - private static final int SHOWVALMIN = 10; - private FormDesigner designer; - private int horizontalValue = 0; - private int verticalValue = 0; - private int verticalMax = 0; - private int horicalMax = 0; - private FormScrollBar verScrollBar; - private FormScrollBar horScrollBar; - //显示和设置表单界面大小的控件 - private UINumberField widthPane; - private UINumberField heightPane; - private JFormSliderPane slidePane; - private boolean isValid = true; - // 初始时滑块值为100，托动后的值设为START_VALUE; - private double START_VALUE = DEFAULT_SLIDER; - private int resolution = ScreenResolution.getScreenResolution(); - private double screenValue; - private boolean isCtrl = false; - - public FormScrollBar getHorScrollBar() { - return horScrollBar; - } - - public void setHorScrollBar(FormScrollBar horScrollBar) { - this.horScrollBar = horScrollBar; - } - - public FormArea(FormDesigner designer) { - this(designer, true); - } - - public FormArea(FormDesigner designer, boolean useScrollBar) { - this.designer = designer; - this.designer.setParent(this); - isValid = useScrollBar; - verScrollBar = new FormScrollBar(Adjustable.VERTICAL, this); - horScrollBar = new FormScrollBar(Adjustable.HORIZONTAL, this); - if (useScrollBar) { - this.setLayout(new FormRulerLayout()); - designer.setBorder(new LineBorder(new Color(198,198,198))); - this.add(FormRulerLayout.CENTER, designer); - addFormSize(); - this.add(FormRulerLayout.VERTICAL, verScrollBar); - this.add(FormRulerLayout.HIRIZONTAL, horScrollBar); - enableEvents(AWTEvent.MOUSE_WHEEL_EVENT_MASK); - } else { - // 报表参数界面只要标尺和中心pane - this.setLayout(new RulerLayout()); - this.add(RulerLayout.CENTER, designer); - addFormRuler(); - } - this.setFocusTraversalKeysEnabled(false); - this.designer.addMouseWheelListener(showValSpinnerMouseWheelListener); - this.designer.addKeyListener(showValSpinnerKeyListener); - } - - - KeyListener showValSpinnerKeyListener = new KeyListener() { - @Override - public void keyTyped(KeyEvent e) { - - } - @Override - public void keyPressed(KeyEvent e) { - if( e.isControlDown()){ - isCtrl = true ; - } - } - @Override - public void keyReleased(KeyEvent e) { - isCtrl = false ; - } - }; - - MouseWheelListener showValSpinnerMouseWheelListener = new MouseWheelListener() { - @Override - public void mouseWheelMoved(MouseWheelEvent e) { - if (isCtrl){ - int dir = e.getWheelRotation(); - int old_resolution = (int) slidePane.getShowVal().getValue(); - slidePane.getShowVal().setValue(old_resolution - (dir * SHOWVALMIN)); - } - } - }; - - /** - * 增加表单的页面大小控制界面，包括手动修改和滑块拖动 - */ - private void addFormSize() { - double f = TableLayout.FILL; - double p = TableLayout.PREFERRED; - double[] rowSize = {f}; - double[] columnSize = { p, f, p, p, p, p, p, f, p}; - UILabel tipsPane = new UILabel("form"); - tipsPane.setPreferredSize(new Dimension(200, 0)); - widthPane = new UINumberField(); - widthPane.setPreferredSize(new Dimension(60, 0)); - heightPane = new UINumberField(); - heightPane.setPreferredSize(new Dimension(60, 0)); + private static final double SLIDER_FLOAT = 400.0; + private static final double SLIDER_MIN = 10.0; + public static final double DEFAULT_SLIDER = 100.0; + private static final int ROTATIONS = 50; + private static final int SHOWVALMAX = 400; + private static final int SHOWVALMIN = 10; + private FormDesigner designer; + private int horizontalValue = 0; + private int verticalValue = 0; + private int verticalMax = 0; + private int horicalMax = 0; + private FormScrollBar verScrollBar; + private FormScrollBar horScrollBar; + //显示和设置表单界面大小的控件 + private UINumberField widthPane; + private UINumberField heightPane; + private JFormSliderPane slidePane; + private boolean isValid = true; + // 初始时滑块值为100，托动后的值设为START_VALUE; + private double START_VALUE = DEFAULT_SLIDER; + private int resolution = ScreenResolution.getScreenResolution(); + private double screenValue; + private boolean isCtrl = false; + + public FormScrollBar getHorScrollBar() { + return horScrollBar; + } + + public void setHorScrollBar(FormScrollBar horScrollBar) { + this.horScrollBar = horScrollBar; + } + + public FormArea(FormDesigner designer) { + this(designer, true); + } + + public FormArea(FormDesigner designer, boolean useScrollBar) { + this.designer = designer; + this.designer.setParent(this); + isValid = useScrollBar; + verScrollBar = new FormScrollBar(Adjustable.VERTICAL, this); + horScrollBar = new FormScrollBar(Adjustable.HORIZONTAL, this); + if (useScrollBar) { + this.setLayout(new FormRulerLayout()); + designer.setBorder(new LineBorder(new Color(198, 198, 198))); + this.add(FormRulerLayout.CENTER, designer); + addFormSize(); + this.add(FormRulerLayout.VERTICAL, verScrollBar); + this.add(FormRulerLayout.HIRIZONTAL, horScrollBar); + enableEvents(AWTEvent.MOUSE_WHEEL_EVENT_MASK); + } else { + // 报表参数界面只要标尺和中心pane + this.setLayout(new RulerLayout()); + this.add(RulerLayout.CENTER, designer); + addFormRuler(); + } + this.setFocusTraversalKeysEnabled(false); + this.designer.addMouseWheelListener(showValSpinnerMouseWheelListener); + this.designer.addKeyListener(showValSpinnerKeyListener); + this.setOpaque(true); + this.setBackground(Color.white); + } + + + KeyListener showValSpinnerKeyListener = new KeyListener() { + @Override + public void keyTyped(KeyEvent e) { + + } + + @Override + public void keyPressed(KeyEvent e) { + if (e.isControlDown()) { + isCtrl = true; + } + } + + @Override + public void keyReleased(KeyEvent e) { + isCtrl = false; + } + }; + + MouseWheelListener showValSpinnerMouseWheelListener = new MouseWheelListener() { + @Override + public void mouseWheelMoved(MouseWheelEvent e) { + if (isCtrl) { + int dir = e.getWheelRotation(); + int old_resolution = (int) slidePane.getShowVal().getValue(); + slidePane.getShowVal().setValue(old_resolution - (dir * SHOWVALMIN)); + } + } + }; + + /** + * 增加表单的页面大小控制界面，包括手动修改和滑块拖动 + */ + private void addFormSize() { + double f = TableLayout.FILL; + double p = TableLayout.PREFERRED; + double[] rowSize = {f}; + double[] columnSize = {p, f, p, p, p, p, p, f, p}; + UILabel tipsPane = new UILabel("form"); + tipsPane.setPreferredSize(new Dimension(200, 0)); + widthPane = new UINumberField(); + widthPane.setPreferredSize(new Dimension(60, 0)); + heightPane = new UINumberField(); + heightPane.setPreferredSize(new Dimension(60, 0)); // slidePane = new UINumberSlidePane(SLIDER_MIN, SLIDER_FLOAT); // slidePane.setPreferredSize(new Dimension(260,20)); - slidePane = JFormSliderPane.getInstance(); - slidePane.setPreferredSize(new Dimension(350,20)); - - - JPanel resizePane =TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{ - {tipsPane, new UILabel(), widthPane, new UILabel(Inter.getLocText("FR-Designer_Indent-Pixel")), new UILabel("x"), - heightPane, new UILabel(Inter.getLocText("FR-Designer_Indent-Pixel")), new UILabel(), slidePane}}, - rowSize, columnSize, 8); - this.add(FormRulerLayout.BOTTOM, resizePane); - setWidgetsConfig(); - // 先初始话滑块及对应事件，然后获取分辨率调整容器的显示大小 - slidePane.setEnabled(false); - slidePane.setVisible(true); - initTransparent(); - initCalculateSize(); - } - - private void setWidgetsConfig() { - widthPane.setHorizontalAlignment(widthPane.CENTER); - heightPane.setHorizontalAlignment(heightPane.CENTER); - widthPane.setMaxDecimalLength(0); - heightPane.setMaxDecimalLength(0); - //控件初始值就是根节点组件初始的宽和高 - widthPane.setValue(designer.getRootComponent().getWidth()); - heightPane.setValue(designer.getRootComponent().getHeight()); - addWidthPaneListener(); - addHeightPaneListener(); - } - - private void initTransparent() { - initCalculateSize(); - slidePane.getShowVal().addChangeListener(showValSpinnerChangeListener); - } - - ChangeListener showValSpinnerChangeListener = new ChangeListener() { - @Override - public void stateChanged(ChangeEvent e) { - double value = (int) ((UIBasicSpinner)e.getSource()).getValue(); - value = value>SHOWVALMAX ? SHOWVALMAX : value; - value = value SHOWVALMAX ? SHOWVALMAX : value; + value = value < SHOWVALMIN ? SHOWVALMIN : value; + JForm jf = (JForm) HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); + jf.resolution = (int) value; + jf.getFormDesign().setResolution((int) value); + jf.getFormDesign().getArea().resolution = (int) value; + reCalculateRoot(value, true); + JTemplate form = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); + if (form != null) { + form.fireTargetModified(); + } + } + }; + + /** + * 返回当前的屏幕分辨率对应的百分比值 + * + * @return 缩放的百分比值 + */ + public double getScreenValue() { + return screenValue; + } + + /** + * 设置屏幕分辨率对应的百分比值 + * + * @param screenValue 百分比值 + */ + public void setScreenValue(double screenValue) { + this.screenValue = screenValue; + } + + private void initCalculateSize() { + Toolkit toolkit = Toolkit.getDefaultToolkit(); + Dimension scrnsize = toolkit.getScreenSize(); + this.screenValue = FRScreen.getByDimension(scrnsize).getValue(); + XLayoutContainer root = FormArea.this.designer.getRootComponent(); + // 7.1.1不放缩放滑块，但表单大小仍按屏幕分辨率调整 // slidePane.populateBean(screenValue); - if (root.acceptType(XWFitLayout.class)) { - XWFitLayout layout = (XWFitLayout) root; - if (screenValue != DEFAULT_SLIDER ) { - reCalculateRoot(screenValue, true); - } else { - // 组件间隔啊 - // REPORT-2585 原有的逻辑导致嵌套的tab中的间隔加不上去，会在后续拖动的过程中出问题 - reCalculateDefaultRoot(screenValue, true); - } - } - LayoutUtils.layoutContainer(root); - } - - //设置宽度的控件及响应事件 - private void addWidthPaneListener() { - widthPane.addActionListener( - new ActionListener() { - public void actionPerformed(ActionEvent evt) { - int width = (int) ((UINumberField) evt.getSource()).getValue(); - changeWidthPaneValue(width); - } - }); - widthPane.addFocusListener( - new FocusAdapter(){ - public void focusLost(FocusEvent e){ - // 失去焦点时，可以认为输入结束 - int width = (int) ((UINumberField) e.getSource()).getValue(); - changeWidthPaneValue(width); - } - }); - } - - private void changeWidthPaneValue(int width) { - XWFitLayout layout = (XWFitLayout) designer.getRootComponent(); - if (width != layout.toData().getContainerWidth()) { - reCalculateWidth(width); - designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_EDITED); - } - } - - private void addHeightPaneListener() { - heightPane.addActionListener( - new ActionListener() { - public void actionPerformed(ActionEvent evt) { - int height = (int) ((UINumberField) evt.getSource()).getValue(); - changeHeightPaneValue(height); - } - }); - heightPane.addFocusListener( - new FocusAdapter(){ - public void focusLost(FocusEvent e){ - // 失去焦点时，可以认为输入结束 - int height = (int) ((UINumberField) e.getSource()).getValue(); - changeHeightPaneValue(height); - } - }); - } - - private void changeHeightPaneValue(int height) { - XWFitLayout layout = (XWFitLayout) designer.getRootComponent(); - if (height != layout.toData().getContainerHeight()) { - reCalculateHeight(height); - designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_EDITED); - } - } - - private void reCalculateWidth(int width) { - XLayoutContainer root = FormArea.this.designer.getRootComponent(); - if (root.acceptType(XWFitLayout.class)) { - XWFitLayout layout = (XWFitLayout) root; - Dimension d = new Dimension(layout.toData().getContainerWidth(), layout.toData().getContainerHeight()); - Rectangle rec = new Rectangle(d); - // 容器大小改变时，设下backupBound为其之前的实际大小,以便调整贴边界的组件 - layout.setBackupBound(rec); - int dW = width-rec.width; - if (dW == 0) { - return; - } - double percent = (double) dW/rec.width; - if (percent < 0 && !layout.canReduce(percent)) { - widthPane.setValue(rec.width); - return; - } - // 布局容器先设大小为实际的高和当前的宽，然后按此调整内部的组件 - layout.setSize(width, rec.height); - layout.adjustCreatorsWidth(percent); - if (layout.getNeedAddWidth() > 0) { - widthPane.setValue(layout.getWidth()); - // 调整之后清零调整量，否则再次缩放到最小值会产生干扰 - layout.setNeedAddWidth(0); - } - doReCalculateRoot(width, rec.height, layout); - } - } - - private void reCalculateHeight(int height) { - XLayoutContainer root = FormArea.this.designer.getRootComponent(); - if (root.acceptType(XWFitLayout.class)) { - XWFitLayout layout = (XWFitLayout) root; - Dimension d = new Dimension(layout.toData().getContainerWidth(), layout.toData().getContainerHeight()); - Rectangle rec = new Rectangle(d); - // 容器大小改变时，设下backupBound为其之前的实际大小 - layout.setBackupBound(rec); - int dH = height - rec.height; - if (dH == 0) { - return; - } - double percent = (double) dH/rec.height; - if (percent < 0 && !layout.canReduce(percent)) { - heightPane.setValue(rec.height); - return; - } - layout.setSize(rec.width, height); - layout.adjustCreatorsHeight(percent); - if (layout.getNeedAddHeight() > 0) { - heightPane.setValue(layout.getHeight()); - // 调整之后清零调整量，否则再次缩放到最小值会产生干扰 - layout.setNeedAddHeight(0); - } - doReCalculateRoot(rec.width, height, layout); - } - } - - /** - * 修改大小后，再根据屏幕分辨率调整下 - */ - private void doReCalculateRoot(int width, int height, XWFitLayout layout) { + if (root.acceptType(XWFitLayout.class)) { + XWFitLayout layout = (XWFitLayout) root; + if (screenValue != DEFAULT_SLIDER) { + reCalculateRoot(screenValue, true); + } else { + // 组件间隔啊 + // REPORT-2585 原有的逻辑导致嵌套的tab中的间隔加不上去，会在后续拖动的过程中出问题 + reCalculateDefaultRoot(screenValue, true); + } + } + LayoutUtils.layoutContainer(root); + } + + //设置宽度的控件及响应事件 + private void addWidthPaneListener() { + widthPane.addActionListener( + new ActionListener() { + public void actionPerformed(ActionEvent evt) { + int width = (int) ((UINumberField) evt.getSource()).getValue(); + changeWidthPaneValue(width); + } + }); + widthPane.addFocusListener( + new FocusAdapter() { + public void focusLost(FocusEvent e) { + // 失去焦点时，可以认为输入结束 + int width = (int) ((UINumberField) e.getSource()).getValue(); + changeWidthPaneValue(width); + } + }); + } + + private void changeWidthPaneValue(int width) { + XWFitLayout layout = (XWFitLayout) designer.getRootComponent(); + if (width != layout.toData().getContainerWidth()) { + reCalculateWidth(width); + designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_EDITED); + } + } + + private void addHeightPaneListener() { + heightPane.addActionListener( + new ActionListener() { + public void actionPerformed(ActionEvent evt) { + int height = (int) ((UINumberField) evt.getSource()).getValue(); + changeHeightPaneValue(height); + } + }); + heightPane.addFocusListener( + new FocusAdapter() { + public void focusLost(FocusEvent e) { + // 失去焦点时，可以认为输入结束 + int height = (int) ((UINumberField) e.getSource()).getValue(); + changeHeightPaneValue(height); + } + }); + } + + private void changeHeightPaneValue(int height) { + XWFitLayout layout = (XWFitLayout) designer.getRootComponent(); + if (height != layout.toData().getContainerHeight()) { + reCalculateHeight(height); + designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_EDITED); + } + } + + private void reCalculateWidth(int width) { + XLayoutContainer root = FormArea.this.designer.getRootComponent(); + if (root.acceptType(XWFitLayout.class)) { + XWFitLayout layout = (XWFitLayout) root; + Dimension d = new Dimension(layout.toData().getContainerWidth(), layout.toData().getContainerHeight()); + Rectangle rec = new Rectangle(d); + // 容器大小改变时，设下backupBound为其之前的实际大小,以便调整贴边界的组件 + layout.setBackupBound(rec); + int dW = width - rec.width; + if (dW == 0) { + return; + } + double percent = (double) dW / rec.width; + if (percent < 0 && !layout.canReduce(percent)) { + widthPane.setValue(rec.width); + return; + } + // 布局容器先设大小为实际的高和当前的宽，然后按此调整内部的组件 + layout.setSize(width, rec.height); + layout.adjustCreatorsWidth(percent); + if (layout.getNeedAddWidth() > 0) { + widthPane.setValue(layout.getWidth()); + // 调整之后清零调整量，否则再次缩放到最小值会产生干扰 + layout.setNeedAddWidth(0); + } + doReCalculateRoot(width, rec.height, layout); + } + } + + private void reCalculateHeight(int height) { + XLayoutContainer root = FormArea.this.designer.getRootComponent(); + if (root.acceptType(XWFitLayout.class)) { + XWFitLayout layout = (XWFitLayout) root; + Dimension d = new Dimension(layout.toData().getContainerWidth(), layout.toData().getContainerHeight()); + Rectangle rec = new Rectangle(d); + // 容器大小改变时，设下backupBound为其之前的实际大小 + layout.setBackupBound(rec); + int dH = height - rec.height; + if (dH == 0) { + return; + } + double percent = (double) dH / rec.height; + if (percent < 0 && !layout.canReduce(percent)) { + heightPane.setValue(rec.height); + return; + } + layout.setSize(rec.width, height); + layout.adjustCreatorsHeight(percent); + if (layout.getNeedAddHeight() > 0) { + heightPane.setValue(layout.getHeight()); + // 调整之后清零调整量，否则再次缩放到最小值会产生干扰 + layout.setNeedAddHeight(0); + } + doReCalculateRoot(rec.width, height, layout); + } + } + + /** + * 修改大小后，再根据屏幕分辨率调整下 + */ + private void doReCalculateRoot(int width, int height, XWFitLayout layout) { // double value = slidePane.updateBean(); - //重置滑块的值为默认值100 - START_VALUE = DEFAULT_SLIDER; - if (screenValue == DEFAULT_SLIDER) { - layout.getParent().setSize(width, height+designer.getParaHeight()); - FormArea.this.validate(); - } else { - layout.setBackupGap(screenValue/DEFAULT_SLIDER); - reCalculateRoot(screenValue, false); - } - } - - /** - * 按照界面大小的百分比值调整root大小 - * @param needCalculateParaHeight 是否需要调整参数界面高度 - * @param value - */ - private void reCalculateRoot(double value, boolean needCalculateParaHeight) { - if (value == START_VALUE) { - return; - } - double percent = (value - START_VALUE) / START_VALUE; - XLayoutContainer root = FormArea.this.designer.getRootComponent(); - if (root.acceptType(XWFitLayout.class)) { - XWFitLayout layout = (XWFitLayout) root; - layout.setContainerPercent(value/DEFAULT_SLIDER); - traverAndAdjust(layout, percent); - layout.adjustCreatorsWhileSlide(percent); - - // 拖动滑块，先将内部组件百分比大小计算，再计算容器大小 - - Dimension d = new Dimension(layout.getWidth(), layout.getHeight()); - // 自适应布局的父层是border - if (layout.getParent() != null) { - int paraHeight = designer.getParaHeight(); - if (needCalculateParaHeight && paraHeight > 0) { - designer.setParaHeight(paraHeight); - XWBorderLayout parent = (XWBorderLayout) layout.getParent(); - parent.toData().setNorthSize(paraHeight); - parent.removeAll(); - parent.add(designer.getParaComponent(),WBorderLayout.NORTH); - parent.add(designer.getRootComponent(),WBorderLayout.CENTER); - } - layout.getParent().setSize(d.width, d.height+paraHeight); - // 调整自适应布局大小后，同步调整参数界面和border大小，此时刷新下formArea - FormArea.this.validate(); - } - START_VALUE = value; - } - } - - /** - * 按照界面大小的百分比值调整root大小 - * @param needCalculateParaHeight 是否需要调整参数界面高度 - * @param value - */ - private void reCalculateDefaultRoot(double value, boolean needCalculateParaHeight) { - XLayoutContainer root = FormArea.this.designer.getRootComponent(); - if (root.acceptType(XWFitLayout.class)) { - XWFitLayout layout = (XWFitLayout) root; - layout.setContainerPercent(1.0); - traverAndAdjust(layout, 0.0); - layout.adjustCreatorsWhileSlide(0.0); - - // 拖动滑块，先将内部组件百分比大小计算，再计算容器大小 - - Dimension d = new Dimension(layout.getWidth(), layout.getHeight()); - // 自适应布局的父层是border - if (layout.getParent() != null) { - int paraHeight = designer.getParaHeight(); - if (needCalculateParaHeight && paraHeight > 0) { - designer.setParaHeight(paraHeight); - XWBorderLayout parent = (XWBorderLayout) layout.getParent(); - parent.toData().setNorthSize(paraHeight); - parent.removeAll(); - parent.add(designer.getParaComponent(),WBorderLayout.NORTH); - parent.add(designer.getRootComponent(),WBorderLayout.CENTER); - } - layout.getParent().setSize(d.width, d.height+paraHeight); - // 调整自适应布局大小后，同步调整参数界面和border大小，此时刷新下formArea - FormArea.this.validate(); - } - } - } - - //循环遍历布局，按百分比调整子组件大小 - private void traverAndAdjust(XCreator creator,double percent){ - for(int i=0; i= designer.getRootComponent().getWidth(); - } - - /** - * 设置界面内的组件可见以及水平垂直滚动条的值 - * （除了根容器，拖入组件进来时如果大小超过当前界面大小，必须设置滚动条值，否则滚动条默认不显示） - * - * @param creator 控件 - */ - public void scrollPathToVisible(XCreator creator) { - creator.seleteRelatedComponent(creator); - - if (!ComponentUtils.isComponentVisible(creator) && !designer.isRoot(creator) && (creator.toData()).isVisible()) { - designer.makeVisible(creator); - } - - if (shouldSetScrollValue(creator)) { - return; - } - //获取在容器的绝对位置 - Rectangle rec = ComponentUtils.getRelativeBounds(creator); - int dWidth = getDesignerWidth(); - if (rec.width <= dWidth&&rec.x < getHorizontalValue()) { - //在边界内部且x位置小于水平滚动条的值 - horScrollBar.setValue(rec.x); - } else if (rec.x + rec.width > dWidth + horizontalValue) { - //超出边界宽度 - horScrollBar.setValue(rec.x + rec.width - dWidth); - } - int dHeight = getDesignerHeight(); - if (rec.height < dHeight && rec.y < getVerticalValue()) { - //在边界内部且y位置小于竖直滚动条的值 - verScrollBar.setValue(rec.y); - } else if (rec.y + rec.height > dHeight + verticalValue) { - //超出边界高度 - verScrollBar.setValue(rec.y + rec.height - dHeight); - } - } - - - /** - * 容器布局 - */ - public void doLayout() { - layout(); - if (isValid) { - XLayoutContainer root = designer.getRootComponent(); - setScrollBarProperties(root.getWidth()-designer.getWidth(), horScrollBar); - //计算滚动条值的时候应该算上参数面板的高度 - setScrollBarProperties(designer.getParaHeight() + root.getHeight()-designer.getHeight(), verScrollBar); - } - } - - /** - * 设置滚动条的属性 - */ - private void setScrollBarProperties(int value, FormScrollBar bar) { - if (value == 0 && isScrollNotVisible(bar)) { - return; - } - if (value <= 0) { - // 界面有滚动条时，手动缩小容器宽度到界面内，重置滚动条值和max - setScrollBarMax(0, bar); - bar.setMaximum(0); - bar.setValue(0); - bar.setEnabled(false); - } else { - //参数面板拖拽过程中value一直为当前value - int oldValue = verticalValue; - setScrollBarMax(value, bar); - bar.setEnabled(true); - bar.setMaximum(value); - bar.setValue(value); - bar.setValue(oldValue); - } - } - - private boolean isScrollNotVisible(FormScrollBar bar) { - if (bar.getOrientation() == Adjustable.VERTICAL ) { - return verticalMax == 0; - } else { - return horicalMax == 0; - } - } - - private void setScrollBarMax( int max, FormScrollBar bar) { - if (bar.getOrientation() == Adjustable.VERTICAL ) { - verticalMax = max; - } else { - horicalMax = max; - } - } - - /** - *返回designer的最小高度 - * - * @return int - */ - public int getMinHeight() { - return designer.getDesignerMode().getMinDesignHeight(); - } - - /** - *返回designer的最小宽度 - * - * @return int - */ - public int getMinWidth() { - return designer.getDesignerMode().getMinDesignWidth(); - } - - /** - * getRulerLengthUnit - * - * @return short - */ - public short getRulerLengthUnit() { - return -1; - } - - /** - * 返回水平滚动条的value - * - * @return int - */ - public int getHorizontalValue() { - return horizontalValue; - } - - /** - * 设置水平滚动条的value - * - * @param newValue - */ - public void setHorizontalValue(int newValue) { - this.horizontalValue = newValue; - } - - /** - * 返回竖直滚动条的value - * - * @return - */ - public int getVerticalValue() { - return verticalValue; - } - - /** - * 竖直滚动条赋值 - * - * @param newValue - */ - public void setVerticalValue(int newValue) { - this.verticalValue = newValue; - } - - /** - * 返回当前designer的高度 - * - * @return height - */ - public int getDesignerHeight() { - return designer.getHeight(); - } - - /** - * 返回当前designer的宽度 - * - * @return - */ - public int getDesignerWidth() { - return designer.getWidth(); - } - - /** - * 返回宽度控件的value - * - * @return 宽度 - */ - public double getWidthPaneValue() { - return widthPane.getValue(); - } - - /** - * 设置宽度值 - * @param value 值 - */ - public void setWidthPaneValue(int value) { - widthPane.setValue(value); - } - - /** - * 设置高度值 - * @param value 值 - */ - public void setHeightPaneValue(int value) { - heightPane.setValue(value); - } - - /** - * 返回高度控件的value - * - * @return 高度 - */ - public double getHeightPaneValue() { - return heightPane.getValue(); - } - - /** - * 返回界面大小的百分比值 - * - * @return 百分比值 - */ - public double getSlideValue() { + //重置滑块的值为默认值100 + START_VALUE = DEFAULT_SLIDER; + if (screenValue == DEFAULT_SLIDER) { + layout.getParent().setSize(width, height + designer.getParaHeight()); + FormArea.this.validate(); + } else { + layout.setBackupGap(screenValue / DEFAULT_SLIDER); + reCalculateRoot(screenValue, false); + } + } + + /** + * 按照界面大小的百分比值调整root大小 + * + * @param needCalculateParaHeight 是否需要调整参数界面高度 + * @param value + */ + private void reCalculateRoot(double value, boolean needCalculateParaHeight) { + if (value == START_VALUE) { + return; + } + double percent = (value - START_VALUE) / START_VALUE; + XLayoutContainer root = FormArea.this.designer.getRootComponent(); + if (root.acceptType(XWFitLayout.class)) { + XWFitLayout layout = (XWFitLayout) root; + layout.setContainerPercent(value / DEFAULT_SLIDER); + traverAndAdjust(layout, percent); + layout.adjustCreatorsWhileSlide(percent); + + // 拖动滑块，先将内部组件百分比大小计算，再计算容器大小 + + Dimension d = new Dimension(layout.getWidth(), layout.getHeight()); + // 自适应布局的父层是border + if (layout.getParent() != null) { + int paraHeight = designer.getParaHeight(); + if (needCalculateParaHeight && paraHeight > 0) { + designer.setParaHeight(paraHeight); + XWBorderLayout parent = (XWBorderLayout) layout.getParent(); + parent.toData().setNorthSize(paraHeight); + parent.removeAll(); + parent.add(designer.getParaComponent(), WBorderLayout.NORTH); + parent.add(designer.getRootComponent(), WBorderLayout.CENTER); + } + layout.getParent().setSize(d.width, d.height + paraHeight); + // 调整自适应布局大小后，同步调整参数界面和border大小，此时刷新下formArea + FormArea.this.validate(); + } + START_VALUE = value; + } + } + + /** + * 按照界面大小的百分比值调整root大小 + * + * @param needCalculateParaHeight 是否需要调整参数界面高度 + * @param value + */ + private void reCalculateDefaultRoot(double value, boolean needCalculateParaHeight) { + XLayoutContainer root = FormArea.this.designer.getRootComponent(); + if (root.acceptType(XWFitLayout.class)) { + XWFitLayout layout = (XWFitLayout) root; + layout.setContainerPercent(1.0); + traverAndAdjust(layout, 0.0); + layout.adjustCreatorsWhileSlide(0.0); + + // 拖动滑块，先将内部组件百分比大小计算，再计算容器大小 + + Dimension d = new Dimension(layout.getWidth(), layout.getHeight()); + // 自适应布局的父层是border + if (layout.getParent() != null) { + int paraHeight = designer.getParaHeight(); + if (needCalculateParaHeight && paraHeight > 0) { + designer.setParaHeight(paraHeight); + XWBorderLayout parent = (XWBorderLayout) layout.getParent(); + parent.toData().setNorthSize(paraHeight); + parent.removeAll(); + parent.add(designer.getParaComponent(), WBorderLayout.NORTH); + parent.add(designer.getRootComponent(), WBorderLayout.CENTER); + } + layout.getParent().setSize(d.width, d.height + paraHeight); + // 调整自适应布局大小后，同步调整参数界面和border大小，此时刷新下formArea + FormArea.this.validate(); + } + } + } + + //循环遍历布局，按百分比调整子组件大小 + private void traverAndAdjust(XCreator creator, double percent) { + for (int i = 0; i < creator.getComponentCount(); i++) { + Object object = creator.getComponent(i); + if (object instanceof XCreator) { + XCreator temp = (XCreator) object; + temp.adjustCompSize(percent); + traverAndAdjust(temp, percent); + } + } + + } + + /** + * 增加刻度条 + */ + public void addFormRuler() { + BaseRuler vRuler = new VerticalRuler(this); + BaseRuler hRuler = new HorizontalRuler(this); + this.add(RulerLayout.VRULER, vRuler); + this.add(RulerLayout.HRULER, hRuler); + } + + /** + * 鼠标滚轮事件 + * 由于表单设计界面要求： 容器大小大于界面时，滚动条才可以拖动，所以不支持滚动无限往下滚 + */ + @Override + protected void processMouseWheelEvent(java.awt.event.MouseWheelEvent evt) { + int id = evt.getID(); + switch (id) { + case MouseEvent.MOUSE_WHEEL: { + int rotations = evt.getWheelRotation(); + int value = this.verScrollBar.getValue() + rotations * ROTATIONS; + value = Math.min(value, verticalMax); + value = Math.max(0, value); + doLayout(); //加dolayout是因为每次滚动都要重置 Max的大小 + this.verScrollBar.setValue(value); + break; + } + } + } + + /** + * 返回表单容器的中心designer + * getFormEditor. + */ + public FormDesigner getFormEditor() { + return designer; + } + + private boolean shouldSetScrollValue(XCreator creator) { + return !isValid || designer.isRoot(creator) || getDesignerWidth() >= designer.getRootComponent().getWidth(); + } + + /** + * 设置界面内的组件可见以及水平垂直滚动条的值 + * （除了根容器，拖入组件进来时如果大小超过当前界面大小，必须设置滚动条值，否则滚动条默认不显示） + * + * @param creator 控件 + */ + public void scrollPathToVisible(XCreator creator) { + creator.seleteRelatedComponent(creator); + + if (!ComponentUtils.isComponentVisible(creator) && !designer.isRoot(creator) && (creator.toData()).isVisible()) { + designer.makeVisible(creator); + } + + if (shouldSetScrollValue(creator)) { + return; + } + //获取在容器的绝对位置 + Rectangle rec = ComponentUtils.getRelativeBounds(creator); + int dWidth = getDesignerWidth(); + if (rec.width <= dWidth && rec.x < getHorizontalValue()) { + //在边界内部且x位置小于水平滚动条的值 + horScrollBar.setValue(rec.x); + } else if (rec.x + rec.width > dWidth + horizontalValue) { + //超出边界宽度 + horScrollBar.setValue(rec.x + rec.width - dWidth); + } + int dHeight = getDesignerHeight(); + if (rec.height < dHeight && rec.y < getVerticalValue()) { + //在边界内部且y位置小于竖直滚动条的值 + verScrollBar.setValue(rec.y); + } else if (rec.y + rec.height > dHeight + verticalValue) { + //超出边界高度 + verScrollBar.setValue(rec.y + rec.height - dHeight); + } + } + + + /** + * 容器布局 + */ + public void doLayout() { + layout(); + if (isValid) { + XLayoutContainer root = designer.getRootComponent(); + setScrollBarProperties(root.getWidth() - designer.getWidth(), horScrollBar); + //计算滚动条值的时候应该算上参数面板的高度 + setScrollBarProperties(designer.getParaHeight() + root.getHeight() - designer.getHeight(), verScrollBar); + } + } + + /** + * 设置滚动条的属性 + */ + private void setScrollBarProperties(int value, FormScrollBar bar) { + if (value == 0 && isScrollNotVisible(bar)) { + return; + } + if (value <= 0) { + // 界面有滚动条时，手动缩小容器宽度到界面内，重置滚动条值和max + setScrollBarMax(0, bar); + bar.setMaximum(0); + bar.setValue(0); + bar.setEnabled(false); + } else { + //参数面板拖拽过程中value一直为当前value + int oldValue = verticalValue; + setScrollBarMax(value, bar); + bar.setEnabled(true); + bar.setMaximum(value); + bar.setValue(value); + bar.setValue(oldValue); + } + } + + private boolean isScrollNotVisible(FormScrollBar bar) { + if (bar.getOrientation() == Adjustable.VERTICAL) { + return verticalMax == 0; + } else { + return horicalMax == 0; + } + } + + private void setScrollBarMax(int max, FormScrollBar bar) { + if (bar.getOrientation() == Adjustable.VERTICAL) { + verticalMax = max; + } else { + horicalMax = max; + } + } + + /** + * 返回designer的最小高度 + * + * @return int + */ + public int getMinHeight() { + return designer.getDesignerMode().getMinDesignHeight(); + } + + /** + * 返回designer的最小宽度 + * + * @return int + */ + public int getMinWidth() { + return designer.getDesignerMode().getMinDesignWidth(); + } + + /** + * getRulerLengthUnit + * + * @return short + */ + public short getRulerLengthUnit() { + return -1; + } + + /** + * 返回水平滚动条的value + * + * @return int + */ + public int getHorizontalValue() { + return horizontalValue; + } + + /** + * 设置水平滚动条的value + * + * @param newValue + */ + public void setHorizontalValue(int newValue) { + this.horizontalValue = newValue; + } + + /** + * 返回竖直滚动条的value + * + * @return + */ + public int getVerticalValue() { + return verticalValue; + } + + /** + * 竖直滚动条赋值 + * + * @param newValue + */ + public void setVerticalValue(int newValue) { + this.verticalValue = newValue; + } + + /** + * 返回当前designer的高度 + * + * @return height + */ + public int getDesignerHeight() { + return designer.getHeight(); + } + + /** + * 返回当前designer的宽度 + * + * @return + */ + public int getDesignerWidth() { + return designer.getWidth(); + } + + /** + * 返回宽度控件的value + * + * @return 宽度 + */ + public double getWidthPaneValue() { + return widthPane.getValue(); + } + + /** + * 设置宽度值 + * + * @param value 值 + */ + public void setWidthPaneValue(int value) { + widthPane.setValue(value); + } + + /** + * 设置高度值 + * + * @param value 值 + */ + public void setHeightPaneValue(int value) { + heightPane.setValue(value); + } + + /** + * 返回高度控件的value + * + * @return 高度 + */ + public double getHeightPaneValue() { + return heightPane.getValue(); + } + + /** + * 返回界面大小的百分比值 + * + * @return 百分比值 + */ + public double getSlideValue() { // return slidePane.updateBean(); - //7.1.1不加缩放滑块 - return this.screenValue; - } - - /** - * 返回界面区域大小 - * - * @return Dimension - */ - public Dimension getAreaSize() { - return new Dimension(horScrollBar.getMaximum(), verScrollBar.getMaximum()); - } - - /** - * setAreaSize - * - * @param totalSize - * @param horizontalValue - * @param verticalValue - */ - public void setAreaSize(Dimension totalSize, int horizontalValue, int verticalValue, double width, double height, double slide) { - this.verticalMax = (int) totalSize.getHeight(); - this.horicalMax = (int) totalSize.getHeight(); - // 撤销时会refreshRoot，导致layout大小变为默认大小 - // 按照之前设置的宽高和百分比重置下容器size - if (width != widthPane.getValue()) { - widthPane.setValue(width); - reCalculateWidth((int) width); - } - if (height != heightPane.getValue()) { - heightPane.setValue(height); - reCalculateHeight((int) height); - } - if (designer.getRootComponent().acceptType(XWFitLayout.class) && slide == DEFAULT_SLIDER) { - XWFitLayout layout = (XWFitLayout) designer.getRootComponent(); - // 撤销时先refreshRoot了，此处去掉内边距再增加间隔 - layout.moveContainerMargin(); - layout.addCompInterval(layout.getAcualInterval()); - } else if (designer.getRootComponent().acceptType(XWFitLayout.class)){ - START_VALUE = DEFAULT_SLIDER; - reCalculateRoot(slide, true); + //7.1.1不加缩放滑块 + return this.screenValue; + } + + /** + * 返回界面区域大小 + * + * @return Dimension + */ + public Dimension getAreaSize() { + return new Dimension(horScrollBar.getMaximum(), verScrollBar.getMaximum()); + } + + /** + * setAreaSize + * + * @param totalSize + * @param horizontalValue + * @param verticalValue + */ + public void setAreaSize(Dimension totalSize, int horizontalValue, int verticalValue, double width, double height, double slide) { + this.verticalMax = (int) totalSize.getHeight(); + this.horicalMax = (int) totalSize.getHeight(); + // 撤销时会refreshRoot，导致layout大小变为默认大小 + // 按照之前设置的宽高和百分比重置下容器size + if (width != widthPane.getValue()) { + widthPane.setValue(width); + reCalculateWidth((int) width); + } + if (height != heightPane.getValue()) { + heightPane.setValue(height); + reCalculateHeight((int) height); + } + if (designer.getRootComponent().acceptType(XWFitLayout.class) && slide == DEFAULT_SLIDER) { + XWFitLayout layout = (XWFitLayout) designer.getRootComponent(); + // 撤销时先refreshRoot了，此处去掉内边距再增加间隔 + layout.moveContainerMargin(); + layout.addCompInterval(layout.getAcualInterval()); + } else if (designer.getRootComponent().acceptType(XWFitLayout.class)) { + START_VALUE = DEFAULT_SLIDER; + reCalculateRoot(slide, true); // slidePane.populateBean(slide); - } - } - - /** - * 计算滚动条的值和max - * @param oldmax 之前最大值 - * @param max 当前最大值 - * @param newValue 当前value - * @param oldValue 之前value - * @param visi designer的大小 - * @param orientation 滚动条方向 - * @return 计算后的值和max - */ - @Override - public Point calculateScroll(int oldmax, int max, int newValue, int oldValue, int visi, int orientation) { - int scrollMax = orientation==1 ? verticalMax : horicalMax; - //防止滚动条到达低端还可以继续点击移动(滚动条最大范围不变时，newValue要在范围之内) - if ( oldmax == scrollMax+visi && newValue>scrollMax ) { - return new Point(oldValue, oldmax); - } - return new Point(newValue, max); - } - - private class FormRulerLayout extends RulerLayout{ - private int DESIGNERWIDTH = 960; - private int DESIGNERHEIGHT =540; - private int TOPGAP = 8; - - public FormRulerLayout(){ - super(); - } - - /** - * 表单用的layout，当前不需要标尺 - */ - public void layoutContainer(Container target) { - synchronized (target.getTreeLock()) { - Insets insets = target.getInsets(); - int top = insets.top; - int left = insets.left; - int bottom = target.getHeight() - insets.bottom; - int right = target.getWidth() - insets.right; - Dimension resize = resizePane.getPreferredSize(); - Dimension hbarPreferredSize = null; - Dimension vbarPreferredSize = null; - - resizePane.setBounds(left, bottom - resize.height, right, resize.height); - if(horScrollBar != null) { - hbarPreferredSize = horScrollBar.getPreferredSize(); - vbarPreferredSize = verScrollBar.getPreferredSize(); - horScrollBar.setBounds(left , bottom - hbarPreferredSize.height-resize.height, right - BARSIZE, hbarPreferredSize.height); - verScrollBar.setBounds(right - vbarPreferredSize.width, top, vbarPreferredSize.width, bottom - BARSIZE-resize.height); - } - FormDesigner dg = ((FormDesigner) designer); - XLayoutContainer root = dg.getRootComponent(); - if (root.acceptType(XWFitLayout.class)) { - DESIGNERWIDTH = root.getWidth(); - DESIGNERHEIGHT = dg.hasWAbsoluteLayout() ? root.getHeight()+dg.getParaHeight() : root.getHeight(); - } - Rectangle rec = new Rectangle(left+(right - DESIGNERWIDTH)/2, TOPGAP, right, bottom); - //是否为表单 - if (isValid ){ - int maxHeight = bottom - hbarPreferredSize.height - resize.height -TOPGAP*2; - int maxWidth = right - vbarPreferredSize.width; - DESIGNERWIDTH = DESIGNERWIDTH> maxWidth ? maxWidth : DESIGNERWIDTH; - DESIGNERHEIGHT = DESIGNERHEIGHT > maxHeight ? maxHeight : DESIGNERHEIGHT; - int designerLeft = left+(verScrollBar.getX() - DESIGNERWIDTH)/2; - rec = new Rectangle(designerLeft, TOPGAP, DESIGNERWIDTH, DESIGNERHEIGHT); - } - // designer是整个表单设计界面中的面板部分，目前只放自适应布局和参数界面。 - designer.setBounds(rec); - } - } - - } + } + } + + /** + * 计算滚动条的值和max + * + * @param oldmax 之前最大值 + * @param max 当前最大值 + * @param newValue 当前value + * @param oldValue 之前value + * @param visi designer的大小 + * @param orientation 滚动条方向 + * @return 计算后的值和max + */ + @Override + public Point calculateScroll(int oldmax, int max, int newValue, int oldValue, int visi, int orientation) { + int scrollMax = orientation == 1 ? verticalMax : horicalMax; + //防止滚动条到达低端还可以继续点击移动(滚动条最大范围不变时，newValue要在范围之内) + if (oldmax == scrollMax + visi && newValue > scrollMax) { + return new Point(oldValue, oldmax); + } + return new Point(newValue, max); + } + + private class FormRulerLayout extends RulerLayout { + private int DESIGNERWIDTH = 960; + private int DESIGNERHEIGHT = 540; + private int TOPGAP = 8; + + public FormRulerLayout() { + super(); + } + + /** + * 表单用的layout，当前不需要标尺 + */ + public void layoutContainer(Container target) { + synchronized (target.getTreeLock()) { + Insets insets = target.getInsets(); + int top = insets.top; + int left = insets.left; + int bottom = target.getHeight() - insets.bottom; + int right = target.getWidth() - insets.right; + Dimension resize = resizePane.getPreferredSize(); + Dimension hbarPreferredSize = null; + Dimension vbarPreferredSize = null; + + resizePane.setBounds(left, bottom - resize.height, right, resize.height); + if (horScrollBar != null) { + hbarPreferredSize = horScrollBar.getPreferredSize(); + vbarPreferredSize = verScrollBar.getPreferredSize(); + horScrollBar.setBounds(left, bottom - hbarPreferredSize.height - resize.height, right - BARSIZE, hbarPreferredSize.height); + verScrollBar.setBounds(right - vbarPreferredSize.width, top, vbarPreferredSize.width, bottom - BARSIZE - resize.height); + } + FormDesigner dg = ((FormDesigner) designer); + XLayoutContainer root = dg.getRootComponent(); + if (root.acceptType(XWFitLayout.class)) { + DESIGNERWIDTH = root.getWidth(); + DESIGNERHEIGHT = dg.hasWAbsoluteLayout() ? root.getHeight() + dg.getParaHeight() : root.getHeight(); + } + Rectangle rec = new Rectangle(left + (right - DESIGNERWIDTH) / 2, TOPGAP, right, bottom); + //是否为表单 + if (isValid) { + int maxHeight = bottom - hbarPreferredSize.height - resize.height - TOPGAP * 2; + int maxWidth = right - vbarPreferredSize.width; + DESIGNERWIDTH = DESIGNERWIDTH > maxWidth ? maxWidth : DESIGNERWIDTH; + DESIGNERHEIGHT = DESIGNERHEIGHT > maxHeight ? maxHeight : DESIGNERHEIGHT; + int designerLeft = left + (verScrollBar.getX() - DESIGNERWIDTH) / 2; + rec = new Rectangle(designerLeft, TOPGAP, DESIGNERWIDTH, DESIGNERHEIGHT); + } + // designer是整个表单设计界面中的面板部分，目前只放自适应布局和参数界面。 + designer.setBounds(rec); + } + } + + } } \ No newline at end of file diff --git a/designer_form/src/com/fr/design/mainframe/FormDesignerUI.java b/designer_form/src/com/fr/design/mainframe/FormDesignerUI.java index 2cc0cabdf..dfbcfbb2f 100644 --- a/designer_form/src/com/fr/design/mainframe/FormDesignerUI.java +++ b/designer_form/src/com/fr/design/mainframe/FormDesignerUI.java @@ -266,7 +266,7 @@ public class FormDesignerUI extends ComponentUI { bounds.y -= designer.getArea().getVerticalValue(); drawResizingThumbs(g, selectionModel.getSelection().getDirections(), bounds.x, bounds.y, bounds.width, bounds.height); - g.setColor(XCreatorConstants.SELECTION_COLOR); + g.setColor(XCreatorConstants.FORM_BORDER_COLOR); for (XCreator creator : selectionModel.getSelection().getSelectedCreators()) { Rectangle creatorBounds = ComponentUtils.getRelativeBounds(creator); diff --git a/designer_form/src/com/fr/design/mainframe/JForm.java b/designer_form/src/com/fr/design/mainframe/JForm.java index 23299f30b..5e42a3ee2 100644 --- a/designer_form/src/com/fr/design/mainframe/JForm.java +++ b/designer_form/src/com/fr/design/mainframe/JForm.java @@ -210,7 +210,6 @@ public class JForm extends JTemplate implements BaseJForm { FormArea area = new FormArea(formDesign); centerPane.add(area, BorderLayout.CENTER); tabCenterPane.add(centerPane, FORM_CARD, FORM_TAB); - this.add(tabCenterPane, BorderLayout.CENTER); formDesign.addTargetModifiedListener(new TargetModifiedListener() {