From c9d9d60b6e8f4fe48b2f6f308d347465f998c556 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Mon, 31 Jul 2017 11:35:52 +0800
Subject: [PATCH 1/8] =?UTF-8?q?REPORT-3163=20=E5=90=88=E4=BD=9C=E5=BC=80?=
 =?UTF-8?q?=E5=8F=919.0=E8=AE=BE=E8=AE=A1=E5=99=A8=3D>=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=3D=E3=80=8B=E6=95=B4=E5=90=88=E6=A1=86?=
 =?UTF-8?q?=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cell/ConditionAttributesAction.java       |  2 +-
 .../mainframe/ElementCasePaneDelegate.java    | 30 +++++++++++++++++--
 .../present/ConditionAttributesGroupPane.java | 20 ++++++++++++-
 .../mainframe/EastRegionContainerPane.java    |  8 +++++
 4 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/designer/src/com/fr/design/actions/cell/ConditionAttributesAction.java b/designer/src/com/fr/design/actions/cell/ConditionAttributesAction.java
index 61fe9fefe..0b32a05eb 100644
--- a/designer/src/com/fr/design/actions/cell/ConditionAttributesAction.java
+++ b/designer/src/com/fr/design/actions/cell/ConditionAttributesAction.java
@@ -24,7 +24,7 @@ public class ConditionAttributesAction extends AbstractCellElementAction {
 
 	@Override
 	protected BasicPane populateBasicPane(TemplateCellElement cellElement) {
-        ConditionAttributesGroupPane pane = new ConditionAttributesGroupPane();
+        ConditionAttributesGroupPane pane = ConditionAttributesGroupPane.getInstance();
         pane.populate(cellElement.getHighlightGroup());
         
 		return pane;
diff --git a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
index b0f7f50b7..49ace17a9 100644
--- a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
+++ b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
@@ -4,8 +4,11 @@ import com.fr.base.BaseUtils;
 import com.fr.design.fun.MenuHandler;
 import com.fr.design.gui.frpane.HyperlinkGroupPane;
 import com.fr.design.menu.KeySetUtils;
+import com.fr.design.present.ConditionAttributesGroupPane;
 import com.fr.general.Inter;
+import com.fr.grid.selection.CellSelection;
 import com.fr.grid.selection.FloatSelection;
+import com.fr.grid.selection.Selection;
 import com.fr.page.ReportSettingsProvider;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.DesignState;
@@ -23,6 +26,10 @@ import com.fr.design.event.TargetModifiedListener;
 import com.fr.design.mainframe.cell.QuickEditorRegion;
 import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.SeparatorDef;
+import com.fr.report.cell.DefaultTemplateCellElement;
+import com.fr.report.cell.TemplateCellElement;
+import com.fr.report.core.SheetUtils;
+import com.fr.report.elementcase.TemplateElementCase;
 import com.fr.report.worksheet.WorkSheet;
 import com.fr.design.selection.SelectionEvent;
 import com.fr.design.selection.SelectionListener;
@@ -58,18 +65,23 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
                 QuickEditorRegion.getInstance().populate(getCurrentEditor());
                 JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
                 if (editingTemplate != null && !editingTemplate.isUpMode()) {
+                    Selection editingSelection = ((ElementCasePaneDelegate)e.getSource()).getSelection();
                     // 模板初始化完成后，才能初始化超级链接面板
-//                    HyperlinkGroupPane hyperlinkGroupPane = ReportHyperlinkGroupPane.getInstance(HyperlinkGroupPaneActionImpl.getInstance());
                     HyperlinkGroupPane hyperlinkGroupPane = editingTemplate.getHyperLinkPane(HyperlinkGroupPaneActionImpl.getInstance());
                     hyperlinkGroupPane.populate(ElementCasePaneDelegate.this);
-                    if (((ElementCasePaneDelegate)e.getSource()).getSelection() instanceof FloatSelection) {
+                    if (editingSelection instanceof FloatSelection) {
                         EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.REPORT_FLOAT);
 //                        EastRegionContainerPane.getInstance().replaceCellAttrPane(CellElementPropertyPane.getInstance());
                         EastRegionContainerPane.getInstance().replaceFloatElementPane(QuickEditorRegion.getInstance());
                     } else {
+                        // 条件属性
+                        ConditionAttributesGroupPane conditionAttributesGroupPane = ConditionAttributesGroupPane.getInstance();
+                        conditionAttributesGroupPane.populate(getEditingCellElement((CellSelection)editingSelection).getHighlightGroup());
+
                         EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.REPORT);
                         EastRegionContainerPane.getInstance().replaceCellAttrPane(CellElementPropertyPane.getInstance());
                         EastRegionContainerPane.getInstance().replaceCellElementPane(QuickEditorRegion.getInstance());
+                        EastRegionContainerPane.getInstance().replaceConditionAttrPane(conditionAttributesGroupPane);
                     }
                     EastRegionContainerPane.getInstance().replaceHyperlinkPane(hyperlinkGroupPane);
                     EastRegionContainerPane.getInstance().removeParameterPane();
@@ -84,6 +96,20 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
         });
     }
 
+    private TemplateCellElement getEditingCellElement(CellSelection cs) {
+        final ElementCasePane ePane = ElementCasePaneDelegate.this;
+        final TemplateElementCase tplEC = ePane.getEditingElementCase();
+        TemplateCellElement editCellElement = tplEC.getTemplateCellElement(cs.getColumn(), cs.getRow());
+        if (editCellElement == null) {
+            editCellElement = new DefaultTemplateCellElement(cs.getColumn(), cs.getRow());
+            tplEC.addCellElement(editCellElement);
+        }
+        if (tplEC != null) {
+            SheetUtils.calculateDefaultParent(tplEC);
+        }
+        return editCellElement;
+    }
+
     @Override
     protected boolean supportRepeatedHeaderFooter() {
         return true;
diff --git a/designer/src/com/fr/design/present/ConditionAttributesGroupPane.java b/designer/src/com/fr/design/present/ConditionAttributesGroupPane.java
index 5cfcb6261..822b7d0b3 100644
--- a/designer/src/com/fr/design/present/ConditionAttributesGroupPane.java
+++ b/designer/src/com/fr/design/present/ConditionAttributesGroupPane.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.fr.base.FRContext;
+import com.fr.design.gui.controlpane.UIListControlPane;
 import com.fr.general.NameObject;
 import com.fr.design.condition.HighLightConditionAttributesPane;
 import com.fr.design.gui.controlpane.JListControlPane;
@@ -15,13 +16,29 @@ import com.fr.report.cell.cellattr.highlight.Highlight;
 import com.fr.report.cell.cellattr.highlight.HighlightGroup;
 import com.fr.stable.Nameable;
 
-public class ConditionAttributesGroupPane extends JListControlPane {
+public class ConditionAttributesGroupPane extends UIListControlPane {
+    private static ConditionAttributesGroupPane singleton;
+
+	private ConditionAttributesGroupPane() {
+        super();
+    }
+
+    public static ConditionAttributesGroupPane getInstance() {
+        if (singleton == null) {
+            singleton = new ConditionAttributesGroupPane();
+        }
+        return singleton;
+    }
 
 	@Override
 	public NameableCreator[] createNameableCreators() {
 		return new NameableCreator[] { new NameObjectCreator(Inter.getLocText("Condition_Attributes"), DefaultHighlight.class, HighLightConditionAttributesPane.class) };
 	}
 
+	@Override
+	public void saveSettings() {
+	}
+
 	@Override
 	public String title4PopupWindow() {
 		return Inter.getLocText("Condition_Attributes");
@@ -33,6 +50,7 @@ public class ConditionAttributesGroupPane extends JListControlPane {
 	public void populate(HighlightGroup highlightGroup) {
 		// marks这个必须放在前面，不论是否有高亮分组都可以操作
 		if (highlightGroup == null || highlightGroup.size() <= 0) {
+            this.populate(new NameObject[0]);
 			return;
 		}
 		List<NameObject> nameObjectList = new ArrayList<NameObject>();
diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
index 72be5fb33..a040bad36 100644
--- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
+++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
@@ -268,6 +268,14 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         return propertyItemMap.get(KEY_WIDGET_SETTINGS).getContentPane();
     }
 
+    public void replaceConditionAttrPane(JComponent pane) {
+        propertyItemMap.get(KEY_CONDITION_ATTR).replaceContentPane(pane);
+    }
+
+    public JComponent getConditionAttrPane() {
+        return propertyItemMap.get(KEY_CONDITION_ATTR).getContentPane();
+    }
+
     public void replaceHyperlinkPane(JComponent pane) {
         propertyItemMap.get(KEY_HYPERLINK).replaceContentPane(pane);
     }

From 34ae0c223dc3e3180617e0056ade60a4d30585d9 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Mon, 31 Jul 2017 12:04:39 +0800
Subject: [PATCH 2/8] =?UTF-8?q?REPORT-3163=20=E5=90=88=E4=BD=9C=E5=BC=80?=
 =?UTF-8?q?=E5=8F=919.0=E8=AE=BE=E8=AE=A1=E5=99=A8=3D>=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=3D=E3=80=8B=E8=A1=A8=E5=8D=95=E9=83=A8?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainframe/ElementCasePaneDelegate.java    | 16 +--------------
 .../form/FormElementCaseDesigner.java         |  7 +++++++
 .../form/FormElementCasePaneDelegate.java     |  6 +++++-
 .../present/ConditionAttributesGroupPane.java | 20 +++++++++++++++++++
 .../form/FormECDesignerProvider.java          |  6 ++++++
 .../src/com/fr/design/mainframe/JForm.java    |  1 +
 6 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
index 49ace17a9..dc9532272 100644
--- a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
+++ b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
@@ -76,7 +76,7 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
                     } else {
                         // 条件属性
                         ConditionAttributesGroupPane conditionAttributesGroupPane = ConditionAttributesGroupPane.getInstance();
-                        conditionAttributesGroupPane.populate(getEditingCellElement((CellSelection)editingSelection).getHighlightGroup());
+                        conditionAttributesGroupPane.populate(ElementCasePaneDelegate.this);
 
                         EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.REPORT);
                         EastRegionContainerPane.getInstance().replaceCellAttrPane(CellElementPropertyPane.getInstance());
@@ -96,20 +96,6 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
         });
     }
 
-    private TemplateCellElement getEditingCellElement(CellSelection cs) {
-        final ElementCasePane ePane = ElementCasePaneDelegate.this;
-        final TemplateElementCase tplEC = ePane.getEditingElementCase();
-        TemplateCellElement editCellElement = tplEC.getTemplateCellElement(cs.getColumn(), cs.getRow());
-        if (editCellElement == null) {
-            editCellElement = new DefaultTemplateCellElement(cs.getColumn(), cs.getRow());
-            tplEC.addCellElement(editCellElement);
-        }
-        if (tplEC != null) {
-            SheetUtils.calculateDefaultParent(tplEC);
-        }
-        return editCellElement;
-    }
-
     @Override
     protected boolean supportRepeatedHeaderFooter() {
         return true;
diff --git a/designer/src/com/fr/design/mainframe/form/FormElementCaseDesigner.java b/designer/src/com/fr/design/mainframe/form/FormElementCaseDesigner.java
index d1c756e90..a93604dcb 100644
--- a/designer/src/com/fr/design/mainframe/form/FormElementCaseDesigner.java
+++ b/designer/src/com/fr/design/mainframe/form/FormElementCaseDesigner.java
@@ -28,6 +28,7 @@ import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.NameSeparator;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.menu.ToolBarDef;
+import com.fr.design.present.ConditionAttributesGroupPane;
 import com.fr.form.FormElementCaseProvider;
 import com.fr.general.Inter;
 import com.fr.grid.selection.CellSelection;
@@ -222,6 +223,12 @@ public class FormElementCaseDesigner<T extends FormElementCaseProvider, E extend
         return elementCasePane.getEastDownPane();
     }
 
+    public JPanel getConditionAttrPane() {
+        ConditionAttributesGroupPane conditionAttributesGroupPane = ConditionAttributesGroupPane.getInstance();
+        conditionAttributesGroupPane.populate(elementCasePane);
+        return conditionAttributesGroupPane;
+    }
+
     public JPanel getHyperlinkPane() {
         return DesignerContext.getDesignerFrame().getSelectedJTemplate().getHyperLinkPane(HyperlinkGroupPaneActionImpl.getInstance());
     }
diff --git a/designer/src/com/fr/design/mainframe/form/FormElementCasePaneDelegate.java b/designer/src/com/fr/design/mainframe/form/FormElementCasePaneDelegate.java
index 3a0d0e049..5fb20154b 100644
--- a/designer/src/com/fr/design/mainframe/form/FormElementCasePaneDelegate.java
+++ b/designer/src/com/fr/design/mainframe/form/FormElementCasePaneDelegate.java
@@ -19,6 +19,7 @@ import com.fr.design.menu.KeySetUtils;
 import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.menu.ToolBarDef;
+import com.fr.design.present.ConditionAttributesGroupPane;
 import com.fr.js.NameJavaScriptGroup;
 import com.fr.page.ReportSettingsProvider;
 import com.fr.report.elementcase.TemplateElementCase;
@@ -37,10 +38,13 @@ public class FormElementCasePaneDelegate extends ElementCasePane<FormElementCase
             public void selectionChanged(SelectionEvent e) {
                 CellElementPropertyPane.getInstance().populate(FormElementCasePaneDelegate.this);
                 QuickEditorRegion.getInstance().populate(getCurrentEditor());
-
+                // 超级链接
                 HyperlinkGroupPane hyperlinkGroupPane = DesignerContext.getDesignerFrame().getSelectedJTemplate().
                         getHyperLinkPane(HyperlinkGroupPaneActionImpl.getInstance());
                 hyperlinkGroupPane.populate(FormElementCasePaneDelegate.this);
+                // 条件属性
+                ConditionAttributesGroupPane conditionAttributesGroupPane = ConditionAttributesGroupPane.getInstance();
+                conditionAttributesGroupPane.populate(FormElementCasePaneDelegate.this);
 
 //                populateHyperLinkGroupPane();
             }
diff --git a/designer/src/com/fr/design/present/ConditionAttributesGroupPane.java b/designer/src/com/fr/design/present/ConditionAttributesGroupPane.java
index 822b7d0b3..fb08c1828 100644
--- a/designer/src/com/fr/design/present/ConditionAttributesGroupPane.java
+++ b/designer/src/com/fr/design/present/ConditionAttributesGroupPane.java
@@ -5,15 +5,21 @@ import java.util.List;
 
 import com.fr.base.FRContext;
 import com.fr.design.gui.controlpane.UIListControlPane;
+import com.fr.design.mainframe.ElementCasePane;
 import com.fr.general.NameObject;
 import com.fr.design.condition.HighLightConditionAttributesPane;
 import com.fr.design.gui.controlpane.JListControlPane;
 import com.fr.design.gui.controlpane.NameObjectCreator;
 import com.fr.design.gui.controlpane.NameableCreator;
 import com.fr.general.Inter;
+import com.fr.grid.selection.CellSelection;
+import com.fr.report.cell.DefaultTemplateCellElement;
+import com.fr.report.cell.TemplateCellElement;
 import com.fr.report.cell.cellattr.highlight.DefaultHighlight;
 import com.fr.report.cell.cellattr.highlight.Highlight;
 import com.fr.report.cell.cellattr.highlight.HighlightGroup;
+import com.fr.report.core.SheetUtils;
+import com.fr.report.elementcase.TemplateElementCase;
 import com.fr.stable.Nameable;
 
 public class ConditionAttributesGroupPane extends UIListControlPane {
@@ -44,6 +50,20 @@ public class ConditionAttributesGroupPane extends UIListControlPane {
 		return Inter.getLocText("Condition_Attributes");
 	}
 
+    public void populate(ElementCasePane ePane) {
+        CellSelection cs = (CellSelection) ePane.getSelection();
+        final TemplateElementCase tplEC = ePane.getEditingElementCase();
+        TemplateCellElement editCellElement = tplEC.getTemplateCellElement(cs.getColumn(), cs.getRow());
+        if (editCellElement == null) {
+            editCellElement = new DefaultTemplateCellElement(cs.getColumn(), cs.getRow());
+            tplEC.addCellElement(editCellElement);
+        }
+
+        SheetUtils.calculateDefaultParent(tplEC);  // 不知道这行代码的作用，怕去掉之后会出问题，先放在这里
+
+        populate(editCellElement.getHighlightGroup());
+    }
+
 	/**
 	 * Populate
 	 */
diff --git a/designer_base/src/com/fr/design/mainframe/form/FormECDesignerProvider.java b/designer_base/src/com/fr/design/mainframe/form/FormECDesignerProvider.java
index d3a5374dc..81ac3e7fb 100644
--- a/designer_base/src/com/fr/design/mainframe/form/FormECDesignerProvider.java
+++ b/designer_base/src/com/fr/design/mainframe/form/FormECDesignerProvider.java
@@ -62,6 +62,12 @@ public interface FormECDesignerProvider {
      */
 	public JComponent getEastUpPane();
 
+    /**
+     *   条件属性面板
+     * @return    属性面板
+     */
+    public JComponent getConditionAttrPane();
+
     /**
      *   超级链接面板
      * @return    属性面板
diff --git a/designer_form/src/com/fr/design/mainframe/JForm.java b/designer_form/src/com/fr/design/mainframe/JForm.java
index 56e3c5d87..23299f30b 100644
--- a/designer_form/src/com/fr/design/mainframe/JForm.java
+++ b/designer_form/src/com/fr/design/mainframe/JForm.java
@@ -663,6 +663,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
                 EastRegionContainerPane.getInstance().removeParameterPane();
                 EastRegionContainerPane.getInstance().replaceCellAttrPane(elementCaseDesign.getEastDownPane());
                 EastRegionContainerPane.getInstance().replaceCellElementPane(elementCaseDesign.getEastUpPane());
+                EastRegionContainerPane.getInstance().replaceConditionAttrPane(elementCaseDesign.getConditionAttrPane());
                 EastRegionContainerPane.getInstance().replaceHyperlinkPane(elementCaseDesign.getHyperlinkPane());
                 return;
             }

From 3cdbc39f5bbc72cb8d3846aa8f6c2646758f1bc7 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Mon, 31 Jul 2017 13:54:02 +0800
Subject: [PATCH 3/8] =?UTF-8?q?REPORT-3163=20=E5=90=88=E4=BD=9C=E5=BC=80?=
 =?UTF-8?q?=E5=8F=919.0=E8=AE=BE=E8=AE=A1=E5=99=A8=3D>=E5=A4=96=E6=A1=86?=
 =?UTF-8?q?=E6=9E=B6=E9=81=97=E7=95=99=3D=E3=80=8B=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E9=A1=B6=E9=83=A8=E9=9D=A2=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/mainframe/EastRegionContainerPane.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
index a040bad36..97b94d1fd 100644
--- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
+++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
@@ -466,6 +466,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
             contentPane = generateContentPane();
             popupToolPane = new PopupToolPane(this, PopupToolPane.DOWN_BUTTON);
             headerPane = new JPanel();
+            headerPane.setPreferredSize(new Dimension(headerPane.getPreferredSize().width, 0));  // 默认隐藏
             contentArea = new JPanel(new BorderLayout());
             contentArea.add(headerPane, BorderLayout.NORTH);
             contentArea.add(contentPane, BorderLayout.CENTER);

From 1c5efe79e4a69033838489a651d1360fa898ae31 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Mon, 31 Jul 2017 14:35:24 +0800
Subject: [PATCH 4/8] =?UTF-8?q?REPORT-3163=20=E5=90=88=E4=BD=9C=E5=BC=80?=
 =?UTF-8?q?=E5=8F=919.0=E8=AE=BE=E8=AE=A1=E5=99=A8=3D>=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=3D=E3=80=8B=E5=AE=9E=E6=97=B6=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=EF=BC=8C=E5=8F=AF=E6=92=A4=E9=94=80=E3=80=81=E9=87=8D?=
 =?UTF-8?q?=E5=81=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../present/ConditionAttributesGroupPane.java | 10 ++++-
 .../gui/controlpane/UIListControlPane.java    | 39 +++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/designer/src/com/fr/design/present/ConditionAttributesGroupPane.java b/designer/src/com/fr/design/present/ConditionAttributesGroupPane.java
index fb08c1828..59e8dae7e 100644
--- a/designer/src/com/fr/design/present/ConditionAttributesGroupPane.java
+++ b/designer/src/com/fr/design/present/ConditionAttributesGroupPane.java
@@ -5,7 +5,9 @@ import java.util.List;
 
 import com.fr.base.FRContext;
 import com.fr.design.gui.controlpane.UIListControlPane;
+import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.ElementCasePane;
+import com.fr.design.mainframe.JTemplate;
 import com.fr.general.NameObject;
 import com.fr.design.condition.HighLightConditionAttributesPane;
 import com.fr.design.gui.controlpane.JListControlPane;
@@ -24,6 +26,7 @@ import com.fr.stable.Nameable;
 
 public class ConditionAttributesGroupPane extends UIListControlPane {
     private static ConditionAttributesGroupPane singleton;
+    private TemplateCellElement editCellElement;  // 当前单元格对象
 
 	private ConditionAttributesGroupPane() {
         super();
@@ -43,6 +46,11 @@ public class ConditionAttributesGroupPane extends UIListControlPane {
 
 	@Override
 	public void saveSettings() {
+        if (isPopulating) {
+            return;
+        }
+        editCellElement.setHighlightGroup(updateHighlightGroup());
+        DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
 	}
 
 	@Override
@@ -53,7 +61,7 @@ public class ConditionAttributesGroupPane extends UIListControlPane {
     public void populate(ElementCasePane ePane) {
         CellSelection cs = (CellSelection) ePane.getSelection();
         final TemplateElementCase tplEC = ePane.getEditingElementCase();
-        TemplateCellElement editCellElement = tplEC.getTemplateCellElement(cs.getColumn(), cs.getRow());
+        editCellElement = tplEC.getTemplateCellElement(cs.getColumn(), cs.getRow());
         if (editCellElement == null) {
             editCellElement = new DefaultTemplateCellElement(cs.getColumn(), cs.getRow());
             tplEC.addCellElement(editCellElement);
diff --git a/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java b/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java
index 5d48980a9..1968dc635 100644
--- a/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java
+++ b/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java
@@ -3,6 +3,7 @@ package com.fr.design.gui.controlpane;
 import com.fr.base.BaseUtils;
 import com.fr.base.FRContext;
 import com.fr.design.actions.UpdateAction;
+import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.data.tabledata.tabledatapane.GlobalMultiTDTableDataPane;
 import com.fr.design.data.tabledata.tabledatapane.GlobalTreeTableDataPane;
@@ -26,6 +27,7 @@ import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Nameable;
+import com.fr.stable.StringUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
 
 import javax.swing.*;
@@ -436,6 +438,43 @@ public abstract class UIListControlPane extends UIControlPane {
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/add.png"));
         }
 
+        /**
+         * Gets component on toolbar.
+         *
+         * @return the created components on toolbar.
+         */
+        @Override
+        public JComponent createToolBarComponent() {
+            Object object = this.getValue(UIButton.class.getName());
+            if (!(object instanceof AbstractButton)) {
+                // 直接使用默认UI
+                UIButton button =  new UIButton();
+                // 添加一个名字作为自动化测试用
+                button.setName(getName());
+
+                //设置属性.
+                Integer mnemonicInteger = (Integer) this.getValue(Action.MNEMONIC_KEY);
+                if (mnemonicInteger != null) {
+                    button.setMnemonic((char) mnemonicInteger.intValue());
+                }
+
+                button.setIcon((Icon) this.getValue(Action.SMALL_ICON));
+                button.addActionListener(this);
+
+                button.registerKeyboardAction(this, this.getAccelerator(), JComponent.WHEN_IN_FOCUSED_WINDOW);
+
+                this.putValue(UIButton.class.getName(), button);
+                button.setText(StringUtils.EMPTY);
+                button.setEnabled(this.isEnabled());
+
+                //peter:产生tooltip
+                button.setToolTipText(ActionFactory.createButtonToolTipText(this));
+                object = button;
+            }
+
+            return (JComponent) object;
+        }
+
         @Override
         public void actionPerformed(ActionEvent e) {
             Nameable nameable = creator.createNameable(UIListControlPane.this);

From 8524568e36f386be5eac13df0e99a4b2a6af5e70 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Mon, 31 Jul 2017 14:43:45 +0800
Subject: [PATCH 5/8] =?UTF-8?q?REPORT-3163=20=E5=90=88=E4=BD=9C=E5=BC=80?=
 =?UTF-8?q?=E5=8F=919.0=E8=AE=BE=E8=AE=A1=E5=99=A8=3D>=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=3D=E3=80=8B=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/present/ConditionAttributesGroupPane.java  | 5 +++++
 designer_base/src/com/fr/design/locale/designer.properties   | 1 +
 .../src/com/fr/design/locale/designer_en_US.properties       | 1 +
 .../src/com/fr/design/locale/designer_ja_JP.properties       | 1 +
 .../src/com/fr/design/locale/designer_ko_KR.properties       | 1 +
 .../src/com/fr/design/locale/designer_zh_CN.properties       | 1 +
 .../src/com/fr/design/locale/designer_zh_TW.properties       | 1 +
 7 files changed, 11 insertions(+)

diff --git a/designer/src/com/fr/design/present/ConditionAttributesGroupPane.java b/designer/src/com/fr/design/present/ConditionAttributesGroupPane.java
index 59e8dae7e..5cc05777d 100644
--- a/designer/src/com/fr/design/present/ConditionAttributesGroupPane.java
+++ b/designer/src/com/fr/design/present/ConditionAttributesGroupPane.java
@@ -58,6 +58,11 @@ public class ConditionAttributesGroupPane extends UIListControlPane {
 		return Inter.getLocText("Condition_Attributes");
 	}
 
+    @Override
+    public String getAddItemText() {
+        return Inter.getLocText("FR-Designer_Add_Condition");
+    }
+
     public void populate(ElementCasePane ePane) {
         CellSelection cs = (CellSelection) ePane.getSelection();
         final TemplateElementCase tplEC = ePane.getEditingElementCase();
diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties
index 0cb4ae2ef..7c490faf7 100644
--- a/designer_base/src/com/fr/design/locale/designer.properties
+++ b/designer_base/src/com/fr/design/locale/designer.properties
@@ -2092,3 +2092,4 @@ FR-Designer_CellWrite_Show_As_HTML=CellWrite_Show_As_HTML
 FR-Designer_Datasource_Other_Attributes=Other_Attributes
 FR-Designer_Not_use_a_cell_attribute_table_editing=Not_use_a_cell_attribute_table_editing
 FR-Designer_CellElement_Property_Table=CellElement_Property_Table
+FR-Designer_Add_Condition=Add Condition
diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties
index c794b6466..d03bea7cc 100644
--- a/designer_base/src/com/fr/design/locale/designer_en_US.properties
+++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties
@@ -2093,3 +2093,4 @@ FR-Designer_CellWrite_Show_As_HTML=CellWrite_Show_As_HTML
 FR-Designer_Datasource_Other_Attributes=Other_Attributes
 FR-Designer_Not_use_a_cell_attribute_table_editing=Not_use_a_cell_attribute_table_editing
 FR-Designer_CellElement_Property_Table=CellElement_Property_Table
+FR-Designer_Add_Condition=Add Condition
diff --git a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
index 6b8dccb0b..f04b1a83d 100644
--- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
+++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
@@ -2075,3 +2075,4 @@ FR-Designer_CellWrite_Show_As_HTML=
 FR-Designer_Datasource_Other_Attributes=
 FR-Designer_Not_use_a_cell_attribute_table_editing=
 FR-Designer_CellElement_Property_Table=
+FR-Designer_Add_Condition=
diff --git a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
index c3b44998d..3ec412767 100644
--- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
+++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
@@ -2073,3 +2073,4 @@ FR-Designer_CellWrite_Show_As_HTML=
 FR-Designer_Datasource_Other_Attributes=
 FR-Designer_Not_use_a_cell_attribute_table_editing=
 FR-Designer_CellElement_Property_Table=
+FR-Designer_Add_Condition=
diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
index 7f4fc313c..35ff0e699 100644
--- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
@@ -2092,3 +2092,4 @@ FR-Designer_CellWrite_Show_As_HTML=\u7528HTML\u663E\u793A\u5185\u5BB9
 FR-Designer_Datasource_Other_Attributes=\u5176\u4ED6\u5C5E\u6027
 FR-Designer_Not_use_a_cell_attribute_table_editing=\u60A8\u4E0D\u53EF\u4EE5\u7528\u5355\u5143\u683C\u5C5E\u6027\u8868\u7F16\u8F91
 FR-Designer_CellElement_Property_Table=\u5355\u5143\u683C\u5C5E\u6027\u8868
+FR-Designer_Add_Condition=\u6DFB\u52A0\u6761\u4EF6
diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
index 9eb688192..580806c38 100644
--- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
@@ -2092,3 +2092,4 @@ FR-Designer_CellWrite_Show_As_HTML=
 FR-Designer_Datasource_Other_Attributes=
 FR-Designer_Not_use_a_cell_attribute_table_editing=
 FR-Designer_CellElement_Property_Table=
+FR-Designer_Add_Condition=
\ No newline at end of file

From 1d7f5bcc6df866ee37f85967b0f27d80240d07ef Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Mon, 31 Jul 2017 14:48:55 +0800
Subject: [PATCH 6/8] =?UTF-8?q?REPORT-3163=20=E5=90=88=E4=BD=9C=E5=BC=80?=
 =?UTF-8?q?=E5=8F=919.0=E8=AE=BE=E8=AE=A1=E5=99=A8=3D>=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=3D=E3=80=8B=E8=81=9A=E5=90=88=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer/src/com/fr/poly/creator/ECBlockEditor.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/designer/src/com/fr/poly/creator/ECBlockEditor.java b/designer/src/com/fr/poly/creator/ECBlockEditor.java
index 50a6bc92c..fa59daf1b 100644
--- a/designer/src/com/fr/poly/creator/ECBlockEditor.java
+++ b/designer/src/com/fr/poly/creator/ECBlockEditor.java
@@ -14,6 +14,7 @@ import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.frpane.HyperlinkGroupPane;
 import com.fr.design.mainframe.*;
 import com.fr.design.mainframe.cell.QuickEditorRegion;
+import com.fr.design.present.ConditionAttributesGroupPane;
 import com.fr.grid.GridUtils;
 import com.fr.poly.PolyConstants;
 import com.fr.poly.PolyDesigner;
@@ -147,8 +148,12 @@ public class ECBlockEditor extends BlockEditor<ECBlockPane, PolyECBlock> {
 		CellElementPropertyPane.getInstance().populate(editComponent);
 		EastRegionContainerPane.getInstance().replaceCellAttrPane(CellElementPropertyPane.getInstance());
 
+		// 超级链接
 		HyperlinkGroupPane hyperlinkGroupPane = DesignerContext.getDesignerFrame().getSelectedJTemplate()
 				.getHyperLinkPane(HyperlinkGroupPaneActionImpl.getInstance());
 		hyperlinkGroupPane.populate(editComponent);
+		// 条件属性
+		ConditionAttributesGroupPane conditionAttributesGroupPane = ConditionAttributesGroupPane.getInstance();
+		conditionAttributesGroupPane.populate(editComponent);
 	}
 }
\ No newline at end of file

From d5a439c9063f708532aef72c81b017bbb472b0aa Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Mon, 31 Jul 2017 17:01:31 +0800
Subject: [PATCH 7/8] =?UTF-8?q?REPORT-3163=20=E5=90=88=E4=BD=9C=E5=BC=80?=
 =?UTF-8?q?=E5=8F=919.0=E8=AE=BE=E8=AE=A1=E5=99=A8=3D>=E5=A4=96=E6=A1=86?=
 =?UTF-8?q?=E6=9E=B6=E9=81=97=E7=95=99=3D=E3=80=8B=E6=9B=BF=E6=8D=A2tab?=
 =?UTF-8?q?=E6=8C=89=E9=92=AEicon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../propertiestab/authorityedit_disabled.png  | Bin 0 -> 667 bytes
 .../propertiestab/authorityedit_normal.png    | Bin 0 -> 624 bytes
 .../propertiestab/authorityedit_selected.png  | Bin 0 -> 639 bytes
 .../propertiestab/cellattr_disabled.png       | Bin 0 -> 380 bytes
 .../propertiestab/cellattr_normal.png         | Bin 0 -> 363 bytes
 .../propertiestab/cellattr_selected.png       | Bin 0 -> 373 bytes
 .../propertiestab/cellelement_disabled.png    | Bin 0 -> 156 bytes
 .../propertiestab/cellelement_normal.png      | Bin 0 -> 156 bytes
 .../propertiestab/cellelement_selected.png    | Bin 0 -> 156 bytes
 .../propertiestab/conditionattr_disabled.png  | Bin 0 -> 344 bytes
 .../propertiestab/conditionattr_normal.png    | Bin 0 -> 352 bytes
 .../propertiestab/conditionattr_selected.png  | Bin 0 -> 361 bytes
 .../configuredroles_disabled.png              | Bin 0 -> 574 bytes
 .../propertiestab/configuredroles_normal.png  | Bin 0 -> 542 bytes
 .../configuredroles_selected.png              | Bin 0 -> 559 bytes
 .../propertiestab/floatelement_disabled.png   | Bin 0 -> 135 bytes
 .../propertiestab/floatelement_normal.png     | Bin 0 -> 143 bytes
 .../propertiestab/floatelement_selected.png   | Bin 0 -> 143 bytes
 .../propertiestab/hyperlink_disabled.png      | Bin 0 -> 708 bytes
 .../propertiestab/hyperlink_normal.png        | Bin 0 -> 740 bytes
 .../propertiestab/hyperlink_selected.png      | Bin 0 -> 729 bytes
 .../propertiestab/widgetlib_disabled.png      | Bin 0 -> 619 bytes
 .../propertiestab/widgetlib_normal.png        | Bin 0 -> 614 bytes
 .../propertiestab/widgetlib_selected.png      | Bin 0 -> 628 bytes
 .../propertiestab/widgetsettings_diabled.png  | Bin 0 -> 394 bytes
 .../propertiestab/widgetsettings_normal.png   | Bin 0 -> 393 bytes
 .../propertiestab/widgetsettings_selected.png | Bin 0 -> 408 bytes
 .../mainframe/EastRegionContainerPane.java    |  72 ++++++++++++++----
 28 files changed, 56 insertions(+), 16 deletions(-)
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.png
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_normal.png
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_selected.png
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.png
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_normal.png
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.png
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.png
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_normal.png
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_selected.png
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_disabled.png
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.png
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.png
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.png
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_normal.png
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_selected.png
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.png
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.png
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.png
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_disabled.png
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_normal.png
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.png
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_disabled.png
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.png
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_selected.png
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_diabled.png
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.png
 create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.png

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
new file mode 100644
index 0000000000000000000000000000000000000000..3e103533306e854a8e69156ba3bddef4488998b8
GIT binary patch
literal 667
zcmV;M0%ZM(P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px%RY^oaR5%fRQ%!HvKoIq;9ZOB+ON*d&ONk7j<xr&NLs4==;(~JMDgP&bsV8zH
zQi)QNx`+yi!l4-D!zvW2U`U$S-eo7vL~ctu(qv}eyqP?E$DrI{#bR+O48tv?XqtA?
zY&L(*qXQLkx#AAziVpySvA~ETFoY0#A_1q!2?Als+E`VE&w0X^HDF9J4iB5}v993{
z8t37<qOflO5eHy>fMmyU-u%SDSeK1%F85*?U|`63i$bW3b1r+7>w}PdbYvf6B$GoZ
zRi*>aC4fG$OeX(`@|hw6C|0Xgwzv0sOUlQ8m5P<l?(VA-iF4w_Ba0v6`PC3Gbe-*^
zGX@4?aZWs+I|!BNIvmTJ8lq!P>f!?^pF0R|g-8_thf!_rJCfJj8IQ$txl5A^z#K7Z
zycy$)f=Z>L6QNu#e_|~9Ga7|2(J@Di>Qin&XO$Au+*tPgKJRwBzY(j~>!R1|{a9UH
z+r+cuwB90yIoiU)(weG9Omcd7o+;8a;mU1(a@Tvn1~jQg<$RQu3;Fd5i4C%C`z(t1
zD4Q)krXofF^*eeTb6r>NmwMqi&TKhnijc_IgAV}Q%4W0osL^o_Y;-yo3WfDBR8}nO
z;YY$S&fXCoJnu_jn(4j}QPwn{oqOKt2ywD}KEEP|Y$ucYL9JFB5{~iOAOt+m9hjyy
zP?TXNmD;%IbUKrUsgiBZlXk1MKe-U(ligZ6DwIm4`<IvDj{H16M^Uthk0X`5Ycv`@
zapLioA}Y4q?Z2Cw>9gT5cq%^)u&h+;=Hn0-<3FOF36UQXj}ZU>002ovPDHLkV1kUY
BGq3;v

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..d2e0a2b430ef0d0da3461bb17273f6c7517596ed
GIT binary patch
literal 624
zcmV-$0+0QPP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px%DoI2^R5%fhQ$24JK@i<te@F<W38h_F3W`MICg-!w9|#ipYAjIzrCX$=NQ4j|
z1U)DP5*4^fB)5Sog`vpV=Zhk_AQiGDY%4TCZToh4ll5NKA%|FLHM4KtJk9RRa`ul^
zC=_l>sa_IA2>ztqZXd<bxd}LqTjN}Hq+|;A7GpfGl$wXc8_kiAIOjhZQyr!FsSu3A
z=7Ye0NO56=l#&mSxWGBf0y{wkJFBZJi^s?QE^YD&qZo0BOF1S#vP(;jiVpwj*g46#
zoJysV?)7>v@J70H!E3o(?rFVVA6=CbUF~v^M3iFrWHRB>CZDj&Jadi}qDm48QEjza
zecI%k>P)h2V}(FU*~F=T6?PtqeIvC0Lm0|;#bU8aO!5hv3jSrRiukW`xs18dYi{m3
zTCGkelkhuj@-?R8uIt{=bEVIb5Qfkjjlw%q9oA?xCP5HvnKSu>nX{B~9kcYsoFgG2
z#9PMXHrk#r!8nV`uc3>NF`%yvClc~~{{R#FqucFnnjl$VpI|=P*myjCg-8p3@3X<9
zzeYf*RLbE!JS5+<Nrp@oANfAU;CVWoay`$(-_vX68vTC%cQ%_nLD~D6Oy+Pn9G)2>
zS;ukKP|0p8m0WH%n`pqrnh_#+Fc@?p_6=ft5c42*o<Nn52nO>m2DEb_p}m=_*+H~-
zISf?|$<NUGo7fxpDr*q=YV(XAD?|i{E#f`i!yV!}Rr^gSZm&O&^6kq#EOpTU0000<
KMNUMnLSTYVY8u!8

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..c4b71b8533e555bd8c205164eafc2a11248ed409
GIT binary patch
literal 639
zcmV-_0)YLAP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px%IY~r8R5%fpRL^S@K@@&(lAWd(5B47rDMBy7Qx6`BX_Z!rZ7+&o5gO8<CqWO2
zhz8M{2R&K(D^2jCUezkvRC};^?ZI3;2#O%s3iV*JyV>V^N#43OS;2wX_vZV)`DS+K
z?I8T44KI5~AfVe#iNWiYtn)5Tj!FzKx@7>|LIMha2AD_#(0(v@zo`l6BJ(>0uw?+N
zguoI?S9128@S#y=p)TAUV>LAJkr1mxGs!mv#6W}vBC}ESk0Q|kuhh>_iq|~9KHC#|
zhz`W4nf%8iIwu)7@6=<m+q>>9B4}+Lq1?C6-gt5v-EMPCH&8G!;gC-C+Ck}(w=tnR
zTC9=mq$g$btJC;Jy5zdM4i^Sujrbg#&I#SHmMZoe@yV6yHFy5RL&}R(ax_@#G;bl1
z9pR7BMXsB68#?G*C9ap+FZZ)_$puq>q(ps)xTE9H2$42jaL1G=WYAyF*~>bXTreF6
zo;S$_xuN4fMkeuq3-SsddqT;$$eLa*%xei_?x`j;TFWM%GWhNLPydpV5)t7!*Z;F9
zw!Q1!VdDL(tn*g!J>@-CqyzPayO}iROjM*|i6aa3Y5oNY4%)$&xh~&GL@#FW6B={2
z5zwRKMfb2^(Uw{AC-@({Yrvk2nusQRHJ!j$MFr4Y@Ef$+yhhrD>;x&8=b{{cJ&RS<
zYuxi{3Q9b-?2QHuD)Uk|dDzeQ(iA4_#99_VM0J|S8i{~w<q&z^3SSprE!h0uucIas
Ze*>@$*+O18;>Q30002ovPDHLkV1f)ZD3t&J

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..7ea07bb9a19647d6e77481bf2b0b37475d5ef919
GIT binary patch
literal 380
zcmV-?0fYXDP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px$Hc3Q5R5%gMlCe(1Fc5~FxKhf7P(m4bf)1?^$-=~vfv07NgqT<oRJ8+7kdZbK
z0}G_WHvSSCRcf0ewGy0U`~2VC@4NE}aU^lz8I7*)4&j^4CiivxHll4<*Q4$snXJeD
zKcc^B_IMm#v(|gF(t9gq*BOT4rBW*Jeg9=XFVFFd<Jc?9aww%NvMkHN_7Xv&l(;C0
zw^ITTtKVoX`a&qKIosY}BNNwkKaFwTJ+Jr3LI=YJ3DVhY$B_$TR9y}PX_|fz6h+ZV
zRejyo1lDId&7RxR+A+s!W!Gdk*3G@MG+r7E{0GWdF3pfkSm<Eb@PW3?X!DH*;df}P
z4HQ+S>T)2_TKBP8uL+)=8R5VeODSH1;OvPzf)0kQL4J|Z&z$50*kN37CP`A+qt1l;
aQRN$4zkZf*`v6=30000<MNUMnLSTXhX{&<(

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..73ee5b87a7618f79eeef2f9d2054fd69de551491
GIT binary patch
literal 363
zcmV-x0hIoUP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px$B}qg<R5%gMQaf_OKnz_Ghr#Yc1(#s`sa(>Kj$DExK@LF&ML2;oOPbsu;S87p
zTha3d4-B>`oEf5-wY5*uTm6*!BO&l;?Q<Kx?bZ}Ll|*&qb$F*uCg-vLkLW(l_I-ba
zbKaYi?wpjmzt-W5h{vwmo9*}M1b%TGKc(qmt`xl)^S%IflL#ctJe9x@0T9tY1RIdu
zo`UG+)Q|}g?IixwaUO;^(1F1QVn}1N<;69#D#`&tk|ZEhK@be{oWBYJ@iE3cm!*|!
z4y#Dr23za(x3M(5<aur%Wn@|Y8b#3nN3vW1gAG2QEi<})!y=fDZ7iwdG5ZDz5@2?6
z>IGP1MsQ%JjRY>Gu_N3e-R`3XhVfhE_gmGEDy(TCF9_RQegMkHbySuL&YS=M002ov
JPDHLkV1j+4n`8h0

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..87c812f7946c7d320d6bedf71bd89bee649061a2
GIT binary patch
literal 373
zcmV-*0gC>KP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px$FG)l}R5%gMQo&BbKoFfl+~Nnosr-Z_-XXyRyup<tCVUbKa^ma_NHppnaN!T6
z|3JG6%e=L1AhhLB6P;vtXWz`cotYh?UlImSeH55Hd>{9Y<w+z;BTvH%c``YS{eMJ%
z)9l7Lm|-3ECen+Ml6E$p^ni?MIt4ZGx4I3#*2I*9ogOmr%UfSP06R+r5@V<%BsU0v
zh`yA=CAQ;diO&8SGLayUnO3DMRmFl1EVPMAl-X<vm`gUc91tve>>=oOVya(T{b>or
z=e_UT#ihk#4y#Do1pio1_sr7pQt3ifB+LtZ{n(ls7wdbc(H9Rk_<%Of2$v+m?+ETn
ziR5qeI`lz_ZfNTQ%go3IF~3T$p5^sxdzbCfQ8i%r{s^;YQa_Tgtbsft%yZcTekXno
TO*1(y00000NkvXXu0mjfw3eZ)

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..2e450c35bc36daa1dfdc68e04a05919d8a6ecb45
GIT binary patch
literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|#^NA%Cx&(BWL|>AJY5_^ECiDi
z76>J<%uG&6dF9<%`TX46dpy_tyBv31F$#Pnl(M(^yn<NDbHUSY{OSP-lT!t3rcKC^
zt4VY*6~CySy7)MsM$X30#v?1AZB5J((3rD=iQ(6F;q7+!gsXuzFnGH9xvX<aXaWH2
CcQlv)

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..22fb4eb688c1cfcebc33de66da7abd50f43f8c1d
GIT binary patch
literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|#^NA%Cx&(BWL|>AJY5_^ECiDi
z76>J<%uLS7`7~eX^SODp%x3K>%>|LCTsplceC4xij+ijlT}Rq>jzgpGG{+ASPMaz}
zv<hC0ahX4*SI&CDhNEh1Ld$1eZ`<g&pkNWu_Qy41&Dyo+{DC$wc)I$ztaD0e0syU3
BGvojO

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..11e5aefbf15ea31377099264349cec07090d3b77
GIT binary patch
literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|#^NA%Cx&(BWL|>AJY5_^ECiDi
z76>J<%zSL|`+2?BncMSE@tL)&G#5mka_RJ*@RiT5Iby<GcO7ZlIS!4!(;PoUIBlx@
z&?<N}#%2DLUODRp8;+{62`!&>y=|l8f`Uar+ppG3=eLN6sR3<Z@O1TaS?83{1OOWQ
BG(Z3V

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..70b2dbd9b4cfa6e7ccd5c0e18550d74bff9de7c0
GIT binary patch
literal 344
zcmV-e0jK_nP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px$5=lfsR5%f1V4xCUB*z>>Lu)BU#@`yu%uGzItW1}V9Xs}liBy9^LqnMv7=Ft$
zF#PBK`}Z&B@8AFQKxU9+kh!_J%$++A9JshxuP`$+yagHX@8AEwBpC!U1ZcY<BO?RX
zuU~)7+1S`F|NqbU=HEY-n;?UL&Lj+AhQL(*|No!$_wT=ADk=&`_wL>C2_#N1u+a^H
z83qjG^CwT9d;;U+HHcV4@VbZ;LvR{Isv#hQFrwes*o7YyJ0MA9fF35uav(N_K@1Gv
zM9>uxG6btZ|Ni|EL^g;RLqO_TkTrqWzy!w$OlZ%Um{{I3FmSy&d2-K3bTu^PgVT|b
qk*O~wwwyb6dNY>5ro>1p=mh|WRCPAzQ~Ij_0000<MNUMnLSTYS=#laO

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..14ff765e43e622ca8e13d6d9b3db141625ea1942
GIT binary patch
literal 352
zcmV-m0iXVfP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px$8c9S!R5%f1V4xCUB*z?MW3y03#{bR#|NrM?U|>!?d-mimCQ=P@aB$#YWc-&3
zG(;V!SB`<<?`)76BpGCCY8w6d^Oq~k%*+K042=7rj`#+mS)d$(6v&YO{}~nn6*B+%
z^LHBy3$xeXzketE|IY+=5m8|TGX&@zW+WT$^78WN95`^`2S|*d*RUDF$jJB?sI?Ae
z2*@D3F2ZHV|No3}XV0Em1~LE!aJmSWA&iU+@#uzt48!Uoe1@DpeR?U(705J(K|n(c
zfU$E1IbcCy0&)p1LqG;%cn#=(M^X*JVbFg|n3IWd2}~`v1Sty)y465Kjsx@4exP?Q
yz!cMk1_!pWvB`f*Y&(1Q3?oKhQ(_=h^a21GQiRnmR(xXs0000<MNUMnLSTYyagE#n

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..082dce2e824f35498055bd77aad534bfdd56ebf5
GIT binary patch
literal 361
zcmV-v0ha!WP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px$BS}O-R5%g6)3Hv2P!tB>|A)5dL)g{D!PT)E7k4KUwW;hrfr~HT-Zs@i7k3AZ
zWpr_HaCPw^j9}q-P8HJ#R3MFK;3ja-m;W9BSWvN!vpEQNweJ*yWjKyM?lo_ns?gy`
zmH_%9SQVg+B<Y(`3ECQld#{t|nNIVV;Mf4g-fV5yrA!$j!V7`8NTM6MtsNvEXG%>I
zm738HB8q&MHomkQt+n$m-|g0)N6SUXScsDpF=%e0LIkoO9C=p;q*a)x2qER*H)2?B
zqIt-D&$~=h%&r+|dlaq5F&<@husRb<QiK?odHs_Z9aKaN%FKw64SQh45=p*x<|NXO
zZbgrAE#QOeBDm{%PwD1=S*OG9^h5n+>Q~@<%*?1hx1i2XtK^5y1Kcl700000NkvXX
Hu0mjfu1uX6

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..136dc6568592def91ef3b5f54a703162dc8274da
GIT binary patch
literal 574
zcmV-E0>S->P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px$_(?=TR5%f>Qr~M6K@h&(yUXTRH3=R?kPvEpQK1jl5KScHHUEfzl>bOxLojU#
zIf`i7*P^6QwXHGDmA&llxRZ8e<r46r_wvnr-^|DC%sI{jePokQ7{042#cQrhi&Cl^
zO4(Tyef+wq-d!g&8jY7y%BR_^H_7L-CxpOE2=Ss?eO8=Kr$5&9q$X;$T3eipHvoJ6
zDEhE8O=0-nC*)IyG4E(N9L^1Ikea|?979D)_->n^hB@-6n_3%FM!qjnoZYZVPc`|z
z|C3U(jZd)+Fh?GBn>TT4M=0#?H(x6y%8a=a#@KJp`6JHdD@wiV@%Z42X|{2#5daW0
z0}wS+Oo(@eCPbgma5kol^y#;yB)du}=6TMg5H!(G$|@zx+9YvZI30~fm$nJUo=t>d
z^Z9Zqb^*N4$HzzKwuV!-+wCVBmCc*@??m-_eFwm;20{6-*XwapU}LA#DP}SmxVoA(
zE0xCwNs^F$zkh=@t3SKj?Xvm&Hgp^@9t;KxyV;I|AlO?hxZWN3am;H%B)N0_Va@9N
z7Z=w%zE8eIQ8cp~?O0D!(s^E++!CS=5i!5#?~GhmmO0P;vlH9of8y0d`bt}+lCyg2
zrY60MUs{Xx<#GV@Eh6Uk{N2^`vnHAln@kK}C=^chvQO+~8|}gH4_ANU)FbIXN&o-=
M07*qoM6N<$g0NH&uK)l5

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..1cbf98153510e00ceabb71a64d83bfd20cb18edc
GIT binary patch
literal 542
zcmV+(0^$9MP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px$*hxe|R5%f>Q$0%qK@gq2O)iLnHd-l2Km-#+yu?5X32196f`z4EWg!@`P_z)V
zvenW`$q%rTAfhDZ)F1}z?X*$P!kEoEb05hW_X2_g%f6kDw=?hd0RG8X5Kk(V>K8)n
zNeLOsVGQz|^VLG3@T98IR8EJael4X|2Iw$o5w6ulkz%Tvkjm+FqV1bzan~2$HH-<M
z82aXYej6$~a>j`qwI%~Zj=WJ@V@e{%nBJP`or7XZBE0ns;B&z%ZtkB8PORzikWwRE
z53N_LU+1I=jpHN}aeZ0W!;@aIe-Hfpi9{mq-rnmLJOhNMO!MmAPvGHSM43#c$Fe>)
zkz^K=ZgD;03gbH(!hIb5$I<BEN-mcZcy8E_(UQsJ0Fs<yas{As%rx^ajZ6gTbh@uv
zt<A(@F^NR}5Hvc%PP*RTtp~=mol>cI@FUAT7{+3l^Scot<Q%y;XD338RZR2ntI?5V
zS!?(s6oN>cLL#Z(;1iH^Mw~_BafD@?$S|h60bZAIoMB1`GU~)3ksAOSLfCS<E8Fjg
z^S4pd<+4?iAVQVj?g&}q7^JV$)*MahS!`t+K!TK#aju<Ek*iVY0x_+&M#7RNO|dmw
gY=C0hx<3WK0X0Uv%7us68vp<R07*qoM6N<$f*3URy8r+H

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..f9cea74c9b12a7a738ce395e6b90bf5e568d6233
GIT binary patch
literal 559
zcmV+~0?_@5P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px$=}AOER5%f>Q%y)zQ4~JsI`2(CVu9qUmTpQ?v~@_ufD56`6i5Vt1hr`qsJKXQ
z5$MWoB1PgNb=ks=4G|IaLoq}`v~5=|62h5x$N4<x#+BRizD@Mt%{})!-}&Zz=gbiO
zr-zGlMpkgTxohV^7*-Awzbqe3CN^&H_gIaIfhy8yWbcW&o*qeu^wqero4wOqtfmwL
zwG(EuP#aI?g8ba2B}<wUY%IWC80|>yB<0d_o~)R+n$Jarm^sZ8{k<p`6(T~-Hd{A+
zu|NM{sQG(%MrV{zI-MbVr8DssRRn0?OF6w53i!Bi{gtI=pCzslaLSRHe{^)<^5(7b
zXI~tihlH*^!O5MLoe_IgA$}smUqO^G&?~>DLBXDNcP01Nukl_e^p~~DW1JC@4PtB^
zKb8(WALE}Pxw4F&J!?nLRSD~1LgIsts%z-n{*`@^tvq}&o<7R)-1YVcB;V@xtO2eo
z&}Lrk?N7EAFR(r6XnQA{64|#!B3h^-+@_CU7Przxn<fQQyLGqzD{D9*@Ex&pR|!Rr
z>x4;k_<?-R$QQ$R=Y;UPbzZjfCO?xR!5HqWp@lx(PK*#@Iuo@cf0J1^U5GowtIBa5
xnG#+bgQsCpEY`uo(4aV)*H>f3V%&em_5rhny-#w7QYioc002ovPDHLkV1lGD11$gm

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..5525977557eb3eb0d8add7487941021de1224e6e
GIT binary patch
literal 135
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|#^NA%Cx&(BWL^R}j-D=#Ar^wk
z2@A{&jEugjUiC?_?NK;;f@z5qTTuPGJ1@@`)IO1DThq>&C)C;#*v!HHAVY%psDV_?
g%xMK0LMxdVu37TdR%Xrf02;>N>FVdQ&MBb@0A`~o<p2Nx

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..a84c636d34c56314b25142427fa1254dcafc6479
GIT binary patch
literal 143
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|#^NA%Cx&(BWL^R}o}Mm_Ar^wk
z2@A{&%*=lJubO$HO2Tp0L{<+|o+ba@+%!%oK2UYikSCH~*i!Gnvh*toISZS#%%t2_
pJZ$VW|8XeeLuypcL$_%X3<}DE>vu1Ip#U_L!PC{xWt~$(695s>E{^~J

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..477e9d448d2e221b1b2c5307931bc38f7f841a42
GIT binary patch
literal 143
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|#^NA%Cx&(BWL^R}o}Mm_Ar^wk
z2@A{$=KTF^zcNkfbs|fqo0!5?g9*R>u6&bFe4y&2Ax|W~u%+ICW$9NGauzmenMt{=
pc-Yu${^L-_ht#N?hi=m(7<#@*3YugHYXJ>q@O1TaS?83{1OS9|FH`^k

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..cde4d783a5221b4fa818905c767d51ecd74ab424
GIT binary patch
literal 708
zcmV;#0z3VQP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px%en~_@R5%f>Qe8_MQ4qZ!n`~EYQQAleQju0@sZcdBF$%?(Qhe}V6#N<be|!ug
zeUp~75EB=nc@Y{BT3ZrDg4S)adv`i#?Jh~RPwj=vojY^R%-l0qi2t<YZF!cLm+yAF
z-AN*yky1Fo5D8C8)3$B<xKgQH{K?b(j?K+Yb#c+1@qK?*2t7m;ri8E#g-~ZiW}JN^
zz8^fvW+(0S^*5)xySo(gRcs*1_V)Io5ayBA!qb}SN-0yTRhrna;X@1<V8My`iBT@U
zeQu284y7LicMgI;k8uazq?CjW8$QH<0T!HrM9_p=&vM1DT)FGI@7sJIO{M5O2Ev99
zF<>l9d;tesU?Q>e`K1{mlB`Ku>kwV~L@EnF7*f==QZmF{%J77blrbulQuU<tsaC6f
zvJm9VJRS9elZ_KuEtaFhQ_7BvIPWr<3~M4pyWMs!FTI!i%uX0$n&u%-lsnhMh)31p
z5pzm8H8oMMR;x$oWMyULYHMrDV8ezFF<`jp05`e-kjac5U^2~SGxDLz-xhZ#fdwad
z`fqTj)jFSLr?D(6`heVB&}cNGrvr0sQvjR)nFB01JfP@vMq=l3rKd{K1h<<uMmJpd
z!!g9a9y_Qv7vlN+t9xPS4ZCjTBua!4dY->z+j_6p>-}UgU$AcXq1nw8v4@9D;*4K-
zP_Ngo5+J%V#{Mql)w6V3p02L0e&(MWjXb9IpZL`~J3EhiJ$m4})sKk=Yiq9$H#RnC
zVPSF1ahyFQnV(-+>nHcy953@EkBsrA`~8VsC=^P?VsRQ36Xz`k;=s+#6-o#vPm8g+
qTyE$#jrRBV%7YyaY83PT`TPYX8eQg7ExRWG0000<MNUMnLSTYsKS)3T

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..b81a666d5ace4362ea458964dba1c0d33ac12747
GIT binary patch
literal 740
zcmV<A0vr8_P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px%o=HSOR5%f>Q%!3VQ51b|Vq$2GA~wMgOxxh5h;A~$l7hPm+HMqL7eYa-KS1b4
zcl`&taiP(LU;}1b4cI_~hz&_*rB+w@C>XRLhS*>}=XuT~8ER=)`pBJo-o59(oOkDr
z5dUe(gU*RWBIlG6OR&pAs9>KXx1|(sVDWrD|7m}nV{af9i@8QdMjtAro=GVuQFKB|
zZ3TD(_$s(l$Snr~0pHBbOnPf;t2eB-74eW_v7ACd6iU819CFb#)r<N0xe1cj)?Sr0
zP2TMF)N^o7gY!NVnz)ioCfm&0il_wpagf}aCT;=iAXgKK)l?>vQGS150yz)t3361|
zsMTs0s@3XiV4?BR?}=IfOrZEXdXP3v5s^}DGS5ZK7<1$xvWjaiu-3}+5e`Ql;Gd2F
zj)CMtPkt(8-hc;J9kqy3wtx}RUc#RQzlHb@Sf^0P-?bEBGYdNd!ZjX<dINjS;n2c9
zpZ7S8m@($aA-7+{H#@l6;1#p+POo<?2KkSOgTY`Wl}fc}#EdaV4lxWh{qe9AL9g58
zaxNk9duONPhCgg6ChGON3$6*3cUa4qbr574tybqL_6_{30R-V!rBd;b#6^tQE^)JI
z2H+aqt{I2_$QT<eFdyrfnMJ@+A$k|#KjibdF%((~$jRk$Z0spw!`S?Sx$~FH<?~8u
zXBlH(#Psy^RJYsX^j>#5onPDSP8=#PA;l{kw%Yikw|J?y4ddOmr6`-te#QtqR?5-j
zA!y)6C^R`YoZ5p<;+Ie=m6kCTY{{&ph(spfdc|U?=J6c!W14rvVcotOIeV936ePYk
zPqW#o0^7Z`Il3N6V_NSG4z}a_0rR@9-v@u4Ia|??7>!2959$#W>{IwxkB0UC?Ee7f
Wx-kBTvz<u*0000<MNUMnLSTYF|5;rC

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..80135b0465765178bc637cd6a2027c6534cff812
GIT binary patch
literal 729
zcmV;~0w(>5P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px%lSxEDR5%f>Q%z_SQ4pSa+1(UNTD3uJ#h-&05l<oo4@#;PR1hk(9)$Rl<lwR5
z(SrxCiYEn|fCwtogU3Qm40_O0PbzxUg1?xWl7wb=n;pN|WMeHk2>RgdoA=E(-<z5D
zmgqkX?xmBu=k8^nv&3>tgm);1Sr$onUTn#i&&S`ckNZPta#oxl%l=J(mxSdz6FWk5
zJrp9kDkL5YZvl2EIcQ&gJjGrl*cDQd%CbKvOb3bNtBIL(&<Y+L&N#c2{Jh|O0CpDG
zedM>5g<cK~+Q%a?6DevYIB5e!sxf17(xOq+^W++Hpi^zd)TbQfYD^R#3TaOOoWbT1
z%K28jXctN3fDw7sC8`Zfeac}&4>hI}OJQkadGD48S=c36#9`*2fzTB8sFdO=h74SM
z*f7nC$R=dyBBlbr|19TBcS@6S+{$)<69~2tw*cE%F?)Y}#2(P8wqoiFIYJW}qc^Ju
zg+iSxM*ql;k2sU1taDrKjs5g-?gYC!)mBV>%0aA+i2~ZsqmvQ!S&oy1(u!ZFK0Tq=
zV3ex3{e>JXO%?}@Z}ZziObe^7S3pA=)bKhFkZMaSl+ZvO9lNe})6h2M3VC^K-zcX2
z(4IcUl14`TL5oLWzb<9$B$^&(pq$b<u3#Bbd;S8y$GaP@HvD~onB9t@e?&)TWKY0;
znGBz%!1^TO=TXKX+>VyebKnpUxAr0yw==~wFNPTvbNuc|!M%&)n<`=qmp3P@lhLc~
zrKEqtQf>80%k>NJkB1p4Q5{%Xc&%0ZN5c@Qr)J!4Y06nU%DFh7DoCOh_@B!;C(#v(
zNU6M6M8&1#fOX?<G717oLFjizk<eIPcJ}I#X0SHH^*xH>|9Sldo*gVMuqTo|00000
LNkvXXu0mjf)XYs6

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..ac9163d6c413e19463cc664b4033153292741b09
GIT binary patch
literal 619
zcmV-x0+juUP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px%B}qg<R5%f>Q_pJ?K@^^u-7#i2GzbAb6`=>ALP55+ga+{-d+^X({-69&y_l1r
zv6_S}_ybSIpb#vC#wuCc-OW7Tx9cw3q@{=s?9R;l@y(m>eIvww8uB_E&+{5esZAnP
zGe(>=8ufSGZg;+%r<M)nJ%cz>+B;Ipua%1ZLP|BCPQUMVI-Qlgm5MmIUaeNsz%Wei
z2toBAc=H+u5Rvq}U0-YYL2I2><v31+3hku|>U@PqVHicZT`4`z*IXHGZ#QRgytp67
zSqR5!_8(jTLL~qRg8s8Sd3hcV5Bs^T*=$zN&yy$EuiP~c`rEmv2*hTbTo2K1w{MKc
z$G77+bcD!gPJuk{aYM>qJ51(DnUl*Px3+wDH2Si~zL5E36p9g-0x31$WFkKfhyBl&
zC6{el|F}mazHukt!j4Yz$T))7xSi8-!c}V`;}Y3LEINtUv?3_>?9AL{^!K^rDj=oI
z%$Q`Ic{)bSWHNDjz2481Dc|>9D3<M7DQi}4F*wPtV_bmnVIwK^1CCwei%DZhv0M()
z_CuNb`%j-kvBoTJ;Uo-nN9)r)PELsQCu6J{Kn8=uSCxwOQc4p546%id`2Cn%_HbaJ
z#XN-|_UNcL+1OYg@P4h;YSnNZ+qO>;hf(M#+h%_#7Axo^YjN32GKwOXV-m}<ZVHj4
z&I>?zfOtE(>@%@Z{HMhPV!;V#K3psSfKL|hGDZB?-*0vo{z|i0xZ3~#002ovPDHLk
FV1flkAesOG

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..38979ca5f930143c07fa3bf3f23bccbdf18e763c
GIT binary patch
literal 614
zcmV-s0-61ZP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px%AW1|)R5%f>Q_pJ?Q4oIfvPqB@g`Nb_mQbOBAh^3R5y5!$VoT4xdGg1_zrc7G
z@g#Wi(5r`Pde&UZBD>q07k@zTqzD$;Q<BX-zwd2dXriVb`XHG%Gv9nOZ)R4h6FPDn
zPZ)+b^V~cWk&DKds8T6Eh@$Arbex_x9MygQ#sy<kM?}98QB9D29uBkZR;%S5#qs_}
zMfH093NlydG)C6&e>F+s+tl0bw(fMcziTazpnjsw^SnJ)I6*{`(J0?V=AQ)dprV&)
z8b2;HrGg-QgZs6@XG)N#(=@40l*md*f(p*Mz-bBJs<WYg=h44!)Mxg{1^ka3S5!21
zz@8i%*K9TyvMjrU7c4rkB?^K@OR4@_7<bqc=lq+*b848}4ibLFFiM!_uQAT|gER>0
z566ZX7c_g*_rn(sf~xGmY>&8XBIdnw&XNcOR=;x?#M)k1A~+*F=^ppQ0sbWs7%7$C
zMW0Ub*Jv~@5o^nWVVN5X!UY1SMqERZCq*T~Pvm*OKioubxVTJQ#U52`1>DT}`MJx7
z8*7)1SvVb#Z~zA)rKd2hkfc^yx&@-^ux-FrCU*RkZnv93w`)%a4@b=DV6*Qh$%ohF
zvbWAkdcEFC9LFC;^4$W7PsLrFWVzf}>bNg*#LjnUL-NuxF#B5Tb9p|p?g=7(fP=yC
zj9YsmxF;Y)>jc6q!BjP7w1wv?lED6hxDz|S0XIDDK8UiFzyJUM07*qoM6N<$f&hsf
AegFUf

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..88315dc208457ae1f58ec7e3c4eb852989c46d46
GIT binary patch
literal 628
zcmV-)0*n2LP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px%E=fc|R5%f>Q@?8zK@@&(_I4MW1fqo?{y-x{5CS%$g?h)S*k};!EJV-3AC3RP
z*{fIya+ecKCl;bM7T#hJt}>mCn#M{|3@QlO*_r427U$TDda=mB?##UR&9~pY_bt%|
z4PKAuc+VbnPVNZPUM3mDlw5n!;`eLMnYDrHzWGpg6keVY(*vr>ArXFODSzJ1q*ldY
z{fDCZd_HRoB}n>0<`i)tYo({KZ;O~$^Y)`*xj}~CB35(p3KWhogM>XTiO^?&nDsIw
z_p!!kGy6t&b)d>_lOs}GWZ6z=Djgw$5|H#;$=34ZUtaxIdM1QV^klnr`3LOB)+ikK
zpLwVVg>|d>9Imt8IN6mcz0&DIik$&l5;Z&an9J=`E$m{oCIM8Pn?2c``+Sjvm$gWd
ze)#J!-{|D88{Pc+FfeAJxCMRg1&C<nu`X)_vq?>|kQ_G)sWFY|2aGDx&~G9*mMmX^
zPXgdyvmP6G?=GEtB%AOwJF*YhQkE8P8jcm>DUeoMjGB0FZ<b1wggCxSVi)w}tXc&h
zPP5BNQYwHmkL*eImyRVq7}TIU4uvK9VT`#YEHfb4JQ>%u6o;e8oL5`Mzz?s|u5%G=
zABfOm6}_wmz54QE?eUh0<SdkY`I*mT7t%L|qNRWx`X~hS3I>kFzVwN<IOH(nI+2g2
z74zM*-4=2qMEC(M*~wsgfZ!9f7~NU<M!PhWI_I7^{A@Zj{;6DS)aw_hZS)X(mkGE4
O0000<MNUMnLSTYqOeKc^

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..3a2cdfed56e954530a639f497770792c20095c22
GIT binary patch
literal 394
zcmV;50d@X~P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px$L`g(JR5%gMlCe(1Kn#X+mn#%iKr`INz=XsGkr40*8F*TTJVC`k6h;)L4oFDN
z&;Vk9CO+<O<;p1v9m0SY+h_aB@4E!SADIFtjxTQd@bdirb~)b%#Iw4O5;<#R!gNUG
zSk^h#dgm$2CIxcD@GTGyq^)<Chdxe{WH*j4ue5F=W12^lTcEB%$pNIQs*!UvB2uQV
z>r-E!wm@<Kv0M);SbH!n%lWlZff)?c!(!pih{6x_c7it5K?xv4%{~UhFgza)RX!e%
ze}Y(nylkn2ApkiS)PR)b+p$lJU!Na9UPnT-4&SYf?$R{<B>Fl5xV4&G2TC^A!GMGy
zXX{k7O$h_ow-oUq{A~7m<lO3Fk#{LU4c4iMsE$@G+ac&%E8-W^+WFr<EBwE*=bU=c
o+RUvze8%hep5?{z2mZJJ1}L1R#+?k<>;M1&07*qoM6N<$f_bm4W&i*H

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..f67375cdeaaee4edf1df81079e19ddb23cf7d01d
GIT binary patch
literal 393
zcmV;40e1e0P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px$LrFwIR5%gMlA%rnF%X7ljw57O5DXGUf<rBYAXf1hz!Sg|VAwM}0hf~qaJ&Ep
zwSt876pn-^z#+CF1j_u)b~9bBm_<<0PCGMS{=Y5J9}NblD0bWs-h6I6XAmfe7!6UP
zd&hbc=#Uy>oewedXkyG`g*{@d5eNr*bl&x$#AR8o7sc)!k=t|5ogp28QjMAeh_xSE
z0@;-FHCZoYokbwsfLPmug)Cc{HjTZP)GE=^5z*(Bn0rBO64X}*B`stdjRLu09v^1e
z@-uc3C@9dE-BZ#+&`NKBSo?k=arNu-1E}n1$WxwY2X$S)I`?%BYNSZpfs&tg&_W%=
z@7gJ;$hrJ7z7yZE5Q0n+#M~T9exV(Y>`h6Ke6)R4n^Y2Nx;qLl#!Qtl2H$=|{>Uve
nKZwn1YnxN4@fRDK|M&V0$O4DwH9~8q00000NkvXXu0mjfrLv)4

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..c36f293f99fbe92df372a0927e97e7dd902c5e09
GIT binary patch
literal 408
zcmV;J0cZY+P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px$Qb|NXR5%gMkv&esKoEsz{1Z!9LNt_ANOY+YC8FXCKm$qzC!mSbZ~_no5){yJ
z0B8s$2cSdZ1aycXIf*^YbF$Vf$PrQ~n8G_dJM-;(Yob32250jkmw9-PouuN-1#%*S
zd6d}M$Zi}RQeAG(U9LWQ{Z5i$j~uH9LcvDu-4-?9zLaIX=$@F@N$42I9;j*1asU~Z
z<29ACN+L_be4^*)9>@+LxAtHm30r4*F?t}D#gK#Dg32p}y`r}f^j#g403sx9wL>M9
zHxUIpQ5e1a067Krv8|E{f+>XXJ0N*6Jk(t_^Y;Vj>{tjBKPO?lb+^xNDy|EzXU*Dy
z63-60H7sOOnS2`+rD^N5ev|1$69mVeqG^A%e0+}f^dZ`=HVcBDMnz1r@mmP`YDMmk
zaS&wvgSaQcE6j2$#82r$d_5QpkF=+HSa-qyUcUeZyp{0$+FqLg0000<MNUMnLSTZ^
C$f%wG

literal 0
HcmV?d00001

diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
index 97b94d1fd..b0d87fc85 100644
--- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
+++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java
@@ -30,6 +30,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
     private FixedPopupPane currentPopupPane;
     private static final int CONTAINER_WIDTH = 290;
     private static final int TAB_WIDTH = 40;
+    private static final int TAB_BUTTON_WIDTH = 32;
     private static final int CONTENT_WIDTH = CONTAINER_WIDTH - TAB_WIDTH;
     private static final int POPUP_TOOLPANE_HEIGHT = 25;
     private static final int ARROW_RANGE_START = CONTENT_WIDTH - 30;
@@ -86,39 +87,39 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         propertyItemMap = new LinkedHashMap<>();  // 有序map
         // 单元格元素
         PropertyItem cellElement = new PropertyItem(KEY_CELL_ELEMENT, Inter.getLocText("FR-Designer_Cell_Element"),
-                "/com/fr/design/images/buttonicon/add.png", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
+                "cellelement", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
                 new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
         // 单元格属性
         PropertyItem cellAttr = new PropertyItem(KEY_CELL_ATTR, Inter.getLocText("FR-Designer_Cell_Attributes"),
-                "/com/fr/design/images/buttonicon/add.png", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
+                "cellattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
                 new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
         // 悬浮元素
         PropertyItem floatElement = new PropertyItem(KEY_FLOAT_ELEMENT, Inter.getLocText("FR-Designer_Float_Element"),
-                "/com/fr/design/images/buttonicon/add.png", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
+                "floatelement", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
                 new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_FLOAT, PropertyMode.POLY_REPORT});
         // 控件设置
         PropertyItem widgetSettings = new PropertyItem(KEY_WIDGET_SETTINGS, Inter.getLocText("FR-Designer-Widget_Settings"),
-                "/com/fr/design/images/buttonicon/add.png", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.FORM, PropertyMode.POLY},
+                "widgetsettings", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.FORM, PropertyMode.POLY},
                 new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.FORM, PropertyMode.POLY_REPORT, PropertyMode.POLY_CHART});
         // 条件属性
         PropertyItem conditionAttr = new PropertyItem(KEY_CONDITION_ATTR, Inter.getLocText("FR-Designer_Condition_Attributes"),
-                "/com/fr/design/images/buttonicon/add.png", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
+                "conditionattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
                 new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
         // 超级链接
         PropertyItem hyperlink = new PropertyItem(KEY_HYPERLINK, Inter.getLocText("FR-Designer_Hyperlink"),
-                "/com/fr/design/images/buttonicon/add.png", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
+                "hyperlink", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
                 new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_FLOAT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
         // 组件库
         PropertyItem widgetLib = new PropertyItem(KEY_WIDGET_LIB, Inter.getLocText("FR-Designer_Widget_Library"),
-                "/com/fr/design/images/buttonicon/add.png", new PropertyMode[]{PropertyMode.FORM},
+                "widgetlib", new PropertyMode[]{PropertyMode.FORM},
                 new PropertyMode[]{PropertyMode.FORM});
         // 权限编辑
         PropertyItem authorityEdition = new PropertyItem(KEY_AUTHORITY_EDITION, Inter.getLocText("FR-Designer_Permissions_Edition"),
-                "/com/fr/design/images/buttonicon/add.png", new PropertyMode[]{PropertyMode.AUTHORITY_EDITION},
+                "authorityedit", new PropertyMode[]{PropertyMode.AUTHORITY_EDITION},
                 new PropertyMode[]{PropertyMode.AUTHORITY_EDITION});
         // 已配置角色
         PropertyItem configuredRoles = new PropertyItem(KEY_CONFIGURED_ROLES, Inter.getLocText("FR-Designer_Configured_Roles"),
-                "/com/fr/design/images/buttonicon/add.png", new PropertyMode[]{PropertyMode.AUTHORITY_EDITION},
+                "configuredroles", new PropertyMode[]{PropertyMode.AUTHORITY_EDITION},
                 new PropertyMode[]{PropertyMode.AUTHORITY_EDITION});
 
         propertyItemMap.put(KEY_CELL_ELEMENT, cellElement);
@@ -167,7 +168,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
     // 左侧按钮面板
     private void initLeftPane() {
         leftPane = new JPanel();
-        leftPane.setLayout(new VerticalFlowLayout(VerticalFlowLayout.TOP, 0, 0));
+        leftPane.setLayout(new VerticalFlowLayout(VerticalFlowLayout.TOP, 4, 4));
         for (PropertyItem item : propertyItemMap.values()) {
             if (item.isPoppedOut() || !item.isVisible()) {
                 continue;
@@ -176,7 +177,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         }
 
 //        leftPane.setLayout(new BoxLayout(leftPane, BoxLayout.Y_AXIS));
-        leftPane.setBackground(new Color(210, 210, 210));
+        leftPane.setBackground(new Color(226, 226, 226));
         replaceLeftPane(leftPane);
     }
 
@@ -396,6 +397,12 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         }
     }
 
+    private void resetPropertyIcons() {
+        for (PropertyItem item : propertyItemMap.values()) {
+            item.resetButtonIcon();
+        }
+    }
+
 
 
     class PropertyItem {
@@ -416,10 +423,21 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         private Set<PropertyMode> enableModes;
         private static final int MAX_PARA_HEIGHT = 240;
 
-        public PropertyItem(String name, String title, String btnUrl, PropertyMode[] visibleModes, PropertyMode[] enableModes) {
+        // 完整icon路径为 ICON_BASE_DIR + btnIconName + iconSuffix
+        private static final String ICON_BASE_DIR = "/com/fr/design/images/buttonicon/propertiestab/";
+        private static final String ICON_SUFFIX_NORMAL = "_normal.png";
+        private static final String ICON_SUFFIX_DISABLED = "_disabled.png";
+        private static final String ICON_SUFFIX_SELECTED = "_selected.png";
+        private String btnIconName;
+        private String iconSuffix = ICON_SUFFIX_NORMAL;  // normal, diabled, selected, 三者之一
+        private final Color selectedBtnBackground = new Color(240, 240, 240);
+        private Color originBtnBackground;
+
+        public PropertyItem(String name, String title, String btnIconName, PropertyMode[] visibleModes, PropertyMode[] enableModes) {
             this.name = name;
             this.title = title;
-            initButton(btnUrl);
+            this.btnIconName = btnIconName;
+            initButton();
             initPropertyPanel();
 //            this.visibleModes = new ArrayList<PropertyMode>(visibleModes);
             initModes(visibleModes, enableModes);
@@ -542,14 +560,31 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
 //            propertyPanel.repaint();
 //            propertyPanel.revalidate();
 //        }
+        private String getBtnIconUrl() {
+            return ICON_BASE_DIR + btnIconName + iconSuffix;
+        }
 
-        private void initButton(String btnUrl) {
-            button = new UIButton(BaseUtils.readIcon(btnUrl)) {
+        public void resetButtonIcon() {
+            if (iconSuffix.equals(ICON_SUFFIX_SELECTED)) {
+                iconSuffix = ICON_SUFFIX_NORMAL;
+                button.setIcon(BaseUtils.readIcon(getBtnIconUrl()));
+                button.setBackground(originBtnBackground);
+                button.setOpaque(false);
+            }
+        }
+
+        private void initButton() {
+            button = new UIButton(BaseUtils.readIcon(getBtnIconUrl())) {
                 public Dimension getPreferredSize() {
-                    return new Dimension(TAB_WIDTH, TAB_WIDTH);
+                    return new Dimension(TAB_BUTTON_WIDTH, TAB_BUTTON_WIDTH);
+                }
+                @Override
+                public void paintComponent(Graphics g) {
+                    super.paintComponent(g);
                 }
             };
             button.set4LargeToolbarButton();
+            originBtnBackground = button.getBackground();
             button.addActionListener(new ActionListener() {
                 @Override
                 public void actionPerformed(ActionEvent e) {
@@ -558,6 +593,11 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                     } else {
                         popupFixedPane();
                     }
+                    resetPropertyIcons();
+                    iconSuffix = ICON_SUFFIX_SELECTED;
+                    button.setIcon(BaseUtils.readIcon(getBtnIconUrl()));
+                    button.setBackground(selectedBtnBackground);
+                    button.setOpaque(true);
                 }
             });
         }

From dcce3eccb1d20acf4204b27c29800b6376af08e0 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Mon, 31 Jul 2017 17:27:14 +0800
Subject: [PATCH 8/8] =?UTF-8?q?REPORT-3163=20=E5=90=88=E4=BD=9C=E5=BC=80?=
 =?UTF-8?q?=E5=8F=919.0=E8=AE=BE=E8=AE=A1=E5=99=A8=3D>=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=3D=E3=80=8B=E5=8E=BB=E6=8E=89=E5=8E=9F?=
 =?UTF-8?q?=E6=9D=A5=E7=9A=84=E8=8F=9C=E5=8D=95=E9=A1=B9=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cell/ConditionAttributesAction.java       | 37 -------------------
 .../mainframe/ElementCasePaneDelegate.java    |  1 -
 .../com/fr/grid/selection/CellSelection.java  |  1 -
 .../src/com/fr/poly/creator/ECBlockPane.java  |  1 -
 4 files changed, 40 deletions(-)
 delete mode 100644 designer/src/com/fr/design/actions/cell/ConditionAttributesAction.java

diff --git a/designer/src/com/fr/design/actions/cell/ConditionAttributesAction.java b/designer/src/com/fr/design/actions/cell/ConditionAttributesAction.java
deleted file mode 100644
index 0b32a05eb..000000000
--- a/designer/src/com/fr/design/actions/cell/ConditionAttributesAction.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright(c) 2001-2010, FineReport Inc, All Rights Reserved.
- */
-package com.fr.design.actions.cell;
-
-import com.fr.base.BaseUtils;
-import com.fr.design.menu.KeySetUtils;
-import com.fr.design.present.ConditionAttributesGroupPane;
-import com.fr.design.dialog.BasicPane;
-import com.fr.design.mainframe.ElementCasePane;
-import com.fr.report.cell.TemplateCellElement;
-
-/**
- * Condition Attributes.
- */
-public class ConditionAttributesAction extends AbstractCellElementAction {
-	public ConditionAttributesAction(ElementCasePane t) {
-		super(t);
-        this.setMenuKeySet(KeySetUtils.CONDITION_ATTR);
-        this.setName(getMenuKeySet().getMenuKeySetName());
-        this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_format/highlight.png"));
-    }
-
-	@Override
-	protected BasicPane populateBasicPane(TemplateCellElement cellElement) {
-        ConditionAttributesGroupPane pane = ConditionAttributesGroupPane.getInstance();
-        pane.populate(cellElement.getHighlightGroup());
-        
-		return pane;
-	}
-
-	@Override
-	protected void updateBasicPane(BasicPane bp, TemplateCellElement cellElement) {
-        cellElement.setHighlightGroup(((ConditionAttributesGroupPane)bp).updateHighlightGroup());		
-	}
-}
\ No newline at end of file
diff --git a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
index d94270e3e..7cd32d627 100644
--- a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
+++ b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
@@ -183,7 +183,6 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
         menuDef.addShortCut(new CellExpandAttrAction());
         menuDef.addShortCut(new CellWidgetAttrAction(this));
         menuDef.addShortCut(new GlobalStyleMenuDef(this));
-        menuDef.addShortCut(new ConditionAttributesAction(this));
 
         // 单元格形态
         menuDef.addShortCut(DeprecatedActionManager.getPresentMenu(this));
diff --git a/designer/src/com/fr/grid/selection/CellSelection.java b/designer/src/com/fr/grid/selection/CellSelection.java
index 6a7adbd9d..a5b139af5 100644
--- a/designer/src/com/fr/grid/selection/CellSelection.java
+++ b/designer/src/com/fr/grid/selection/CellSelection.java
@@ -458,7 +458,6 @@ public class CellSelection extends Selection {
         }
         popup.add(new CellExpandAttrAction().createMenuItem());
         popup.add(DeprecatedActionManager.getPresentMenu(ePane).createJMenu());
-        popup.add(new ConditionAttributesAction(ePane).createMenuItem());
         popup.add(new CellAttributeAction().createMenuItem());
         // cut, copy and paste
         popup.addSeparator();
diff --git a/designer/src/com/fr/poly/creator/ECBlockPane.java b/designer/src/com/fr/poly/creator/ECBlockPane.java
index fbc5e1f8a..f6e8eb9be 100644
--- a/designer/src/com/fr/poly/creator/ECBlockPane.java
+++ b/designer/src/com/fr/poly/creator/ECBlockPane.java
@@ -142,7 +142,6 @@ public class ECBlockPane extends PolyElementCasePane {
         menuDef.addShortCut(new CellExpandAttrAction());
         menuDef.addShortCut(new CellWidgetAttrAction(this));
         menuDef.addShortCut(new GlobalStyleMenuDef(this));
-        menuDef.addShortCut(new ConditionAttributesAction(this));
 
         // 单元格形态
         menuDef.addShortCut(DeprecatedActionManager.getPresentMenu(this));