From e32b177d9c6d155c72ef11cfa56242ffec340020 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 8 Aug 2017 17:41:42 +0800 Subject: [PATCH 1/6] =?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=BC=B9=E7=AA=97?= =?UTF-8?q?=3D=E3=80=8B=E8=B6=85=E7=BA=A7=E9=93=BE=E6=8E=A5=3D>JavaScript?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/constants/UIConstants.java | 1 + .../fr/design/gui/itableeditorpane/UITableEditorPane.java | 1 + .../src/com/fr/design/javascript/JavaScriptImplPane.java | 5 +++-- .../src/com/fr/design/scrollruler/ModLineBorder.java | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/designer_base/src/com/fr/design/constants/UIConstants.java b/designer_base/src/com/fr/design/constants/UIConstants.java index e283fce82..c39ee54c4 100644 --- a/designer_base/src/com/fr/design/constants/UIConstants.java +++ b/designer_base/src/com/fr/design/constants/UIConstants.java @@ -100,6 +100,7 @@ public interface UIConstants { public static final Color RULER_SCALE_COLOR = new Color(0x4e504f); public static final Color PROPERTY_PANE_BACKGROUND = new Color(0xdadadd); public static final Color SPLIT_LINE = new Color(201, 198, 184); + public static final Color TITLED_BORDER_COLOR = new Color(0xededee); public static final BufferedImage DRAG_BAR = BaseUtils.readImage("com/fr/design/images/control/bar.png"); diff --git a/designer_base/src/com/fr/design/gui/itableeditorpane/UITableEditorPane.java b/designer_base/src/com/fr/design/gui/itableeditorpane/UITableEditorPane.java index a0c09a848..4e530997e 100644 --- a/designer_base/src/com/fr/design/gui/itableeditorpane/UITableEditorPane.java +++ b/designer_base/src/com/fr/design/gui/itableeditorpane/UITableEditorPane.java @@ -49,6 +49,7 @@ public class UITableEditorPane extends BasicPane { UILabel l = new UILabel(leftLabelName); editTable = tableModel.createTable(); + editTable.getTableHeader().setBackground(UIConstants.DEFAULT_BG_RULER); UIScrollPane scrollPane = new UIScrollPane(editTable); scrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC)); diff --git a/designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java b/designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java index bcd1767d3..f362170be 100644 --- a/designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java +++ b/designer_base/src/com/fr/design/javascript/JavaScriptImplPane.java @@ -73,16 +73,17 @@ public class JavaScriptImplPane extends FurtherBasicBeanPane { }; importedJsPane = new UITableEditorPane(model); importedJsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), Inter.getLocText("ReportServerP-Import_JavaScript"))); - importedJsPane.setPreferredSize(new Dimension(400, 150)); + importedJsPane.setPreferredSize(new Dimension(265, 150)); jsPane = new JSContentPane(args); jsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), Inter.getLocText("FR-Designer_JavaScript"))); - parameterPane.setPreferredSize(new Dimension(200, 150)); + parameterPane.setPreferredSize(new Dimension(265, 150)); JPanel topPane = GUICoreUtils.createBorderLayoutPane( importedJsPane, BorderLayout.CENTER, parameterPane, BorderLayout.EAST ); topPane.setPreferredSize(new Dimension(300, 150)); + topPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 12, 0)); this.setLayout(new BorderLayout()); this.add(topPane,BorderLayout.NORTH) ; diff --git a/designer_base/src/com/fr/design/scrollruler/ModLineBorder.java b/designer_base/src/com/fr/design/scrollruler/ModLineBorder.java index 27cff154c..7d472572e 100644 --- a/designer_base/src/com/fr/design/scrollruler/ModLineBorder.java +++ b/designer_base/src/com/fr/design/scrollruler/ModLineBorder.java @@ -7,6 +7,7 @@ import java.awt.Insets; import javax.swing.border.AbstractBorder; +import com.fr.design.constants.UIConstants; import com.fr.design.utils.gui.GUICoreUtils; /** @@ -31,7 +32,7 @@ public class ModLineBorder extends AbstractBorder { * @param modifiers modifiers */ public ModLineBorder(int modifiers) { - this(modifiers, GUICoreUtils.getTitleLineBorderColor(), 1); + this(modifiers, UIConstants.TITLED_BORDER_COLOR, 1); } /** From e511e0582a4c89669a9342f43263bdf2c9ed1e49 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 8 Aug 2017 21:06:01 +0800 Subject: [PATCH 2/6] =?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=BC=B9=E7=AA=97?= =?UTF-8?q?=3D=E3=80=8B=E6=9D=A1=E4=BB=B6=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/border/UITitledBorder.java | 4 +++- designer_base/src/com/fr/design/constants/UIConstants.java | 1 + .../src/com/fr/design/gui/controlpane/UIControlPane.java | 6 +++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/border/UITitledBorder.java b/designer_base/src/com/fr/design/border/UITitledBorder.java index 6f8fcfea9..48eebbd95 100644 --- a/designer_base/src/com/fr/design/border/UITitledBorder.java +++ b/designer_base/src/com/fr/design/border/UITitledBorder.java @@ -1,5 +1,7 @@ package com.fr.design.border; +import com.fr.design.constants.UIConstants; + import java.awt.Color; import javax.swing.BorderFactory; @@ -19,7 +21,7 @@ public class UITitledBorder extends TitledBorder { } private void init(String title){ - UIRoundedBorder roundedborder = new UIRoundedBorder(new Color(204, 204, 204), 1, 10); + UIRoundedBorder roundedborder = new UIRoundedBorder(UIConstants.TITLED_BORDER_COLOR, 1, 10); this.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(0, 0, 5, 0), roundedborder)); this.setTitle(title); diff --git a/designer_base/src/com/fr/design/constants/UIConstants.java b/designer_base/src/com/fr/design/constants/UIConstants.java index c39ee54c4..916e8e71b 100644 --- a/designer_base/src/com/fr/design/constants/UIConstants.java +++ b/designer_base/src/com/fr/design/constants/UIConstants.java @@ -101,6 +101,7 @@ public interface UIConstants { public static final Color PROPERTY_PANE_BACKGROUND = new Color(0xdadadd); public static final Color SPLIT_LINE = new Color(201, 198, 184); public static final Color TITLED_BORDER_COLOR = new Color(0xededee); + public static final Color POP_DIALOG_BORDER = new Color(218, 218, 221); public static final BufferedImage DRAG_BAR = BaseUtils.readImage("com/fr/design/images/control/bar.png"); diff --git a/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java b/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java index 34d7d0822..dd94f0d96 100644 --- a/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java +++ b/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java @@ -1,5 +1,6 @@ package com.fr.design.gui.controlpane; +import com.fr.design.constants.UIConstants; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itoolbar.UIToolBarUI; @@ -276,7 +277,10 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH setUndecorated(true); pane.setBorder(BorderFactory.createEmptyBorder(20, 10, 10, 10)); this.editPane = pane; - this.getContentPane().add(editPane, BorderLayout.CENTER); + JPanel editPaneWrapper = new JPanel(new BorderLayout()); + editPaneWrapper.add(editPane, BorderLayout.CENTER); + editPaneWrapper.setBorder(BorderFactory.createLineBorder(UIConstants.POP_DIALOG_BORDER, 1)); + this.getContentPane().add(editPaneWrapper, BorderLayout.CENTER); setSize(WIDTH, HEIGHT); // pack(); this.setVisible(false); From 26e15b0e3e07ad10a4e97067416723b9ec935d15 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 8 Aug 2017 21:17:14 +0800 Subject: [PATCH 3/6] =?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=BC=B9=E7=AA=97?= =?UTF-8?q?=3D=E3=80=8B=E8=B6=85=E7=BA=A7=E9=93=BE=E6=8E=A5=3D>=E7=BD=91?= =?UTF-8?q?=E7=BB=9C=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/gui/itableeditorpane/UITableEditorPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/gui/itableeditorpane/UITableEditorPane.java b/designer_base/src/com/fr/design/gui/itableeditorpane/UITableEditorPane.java index 4e530997e..50f441d97 100644 --- a/designer_base/src/com/fr/design/gui/itableeditorpane/UITableEditorPane.java +++ b/designer_base/src/com/fr/design/gui/itableeditorpane/UITableEditorPane.java @@ -52,7 +52,7 @@ public class UITableEditorPane extends BasicPane { editTable.getTableHeader().setBackground(UIConstants.DEFAULT_BG_RULER); UIScrollPane scrollPane = new UIScrollPane(editTable); - scrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC)); + scrollPane.setBorder(new UIRoundedBorder(UIConstants.TITLED_BORDER_COLOR, 1, UIConstants.ARC)); pane.add(scrollPane, BorderLayout.CENTER); initbuttonPane(action); JPanel controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); From 75be4229f606e35150e49cc988d3eba2d3d1c968 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 8 Aug 2017 21:31:15 +0800 Subject: [PATCH 4/6] =?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=BC=B9=E7=AA=97?= =?UTF-8?q?=3D=E3=80=8B=E8=B6=85=E7=BA=A7=E9=93=BE=E6=8E=A5=3D>=E9=82=AE?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/gui/itextfield/UITextFieldUI.java | 3 --- designer_base/src/com/fr/design/javascript/EmailPane.java | 5 +++-- designer_base/src/com/fr/design/utils/gui/GUIPaintUtils.java | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/designer_base/src/com/fr/design/gui/itextfield/UITextFieldUI.java b/designer_base/src/com/fr/design/gui/itextfield/UITextFieldUI.java index 5142c030e..5f0eb3e47 100644 --- a/designer_base/src/com/fr/design/gui/itextfield/UITextFieldUI.java +++ b/designer_base/src/com/fr/design/gui/itextfield/UITextFieldUI.java @@ -51,9 +51,6 @@ public class UITextFieldUI extends BasicTextFieldUI { g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_ON); g2d.clip(roundShape); g2d.setColor(backgroundColor); - if(!textField.isEnabled()){ - g2d.setColor(UIConstants.NORMAL_BACKGROUND); - } g2d.fillRoundRect(1, 1, width - 2, height - 2, 0, 0); g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_OFF); } diff --git a/designer_base/src/com/fr/design/javascript/EmailPane.java b/designer_base/src/com/fr/design/javascript/EmailPane.java index 02719d995..92ac38f52 100644 --- a/designer_base/src/com/fr/design/javascript/EmailPane.java +++ b/designer_base/src/com/fr/design/javascript/EmailPane.java @@ -2,6 +2,7 @@ package com.fr.design.javascript; import com.fr.base.ConfigManager; import com.fr.design.beans.FurtherBasicBeanPane; +import com.fr.design.constants.UIConstants; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; @@ -83,8 +84,8 @@ public class EmailPane extends FurtherBasicBeanPane { tipsPane1.setText(valid ? StringUtils.BLANK : Inter.getLocText("FR-Designer_EmailPane-warnings")); centerPane.setEnabled(valid); mainTextEditor.setEnabled(valid); - mainTextEditor.setBackground(valid ? Color.WHITE : new Color(244, 243, 233)); - mainTextEditor.setBorder(BorderFactory.createLineBorder(valid ? new Color(128, 152, 186) : new Color(201, 198,184))); + mainTextEditor.setBackground(valid ? Color.WHITE : UIConstants.DEFAULT_BG_RULER); + mainTextEditor.setBorder(BorderFactory.createLineBorder(valid ? new Color(128, 152, 186) : UIConstants.TITLED_BORDER_COLOR)); maitoEditor.setEnabled(valid); ccEditor.setEnabled(valid); bccEditor.setEnabled(valid); diff --git a/designer_base/src/com/fr/design/utils/gui/GUIPaintUtils.java b/designer_base/src/com/fr/design/utils/gui/GUIPaintUtils.java index 4c67686ac..434f60d9c 100644 --- a/designer_base/src/com/fr/design/utils/gui/GUIPaintUtils.java +++ b/designer_base/src/com/fr/design/utils/gui/GUIPaintUtils.java @@ -19,7 +19,7 @@ public class GUIPaintUtils { if (BaseUtils.isAuthorityEditing() && isAuthorityEdited) { g2d.setColor(UIConstants.AUTHORITY_LINE_COLOR); } else { - g2d.setColor(UIConstants.LINE_COLOR); + g2d.setColor(UIConstants.TITLED_BORDER_COLOR); } if (isRound) { g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); From 0bd6fa3ca37d4bd2b6709d302d3d1fe430a60b5c Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 8 Aug 2017 22:30:54 +0800 Subject: [PATCH 5/6] =?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=BC=B9=E7=AA=97?= =?UTF-8?q?=3D=E3=80=8B=E8=B6=85=E7=BA=A7=E9=93=BE=E6=8E=A5=3D>=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E8=B6=85=E9=93=BE-=E8=81=94=E5=8A=A8=E6=82=AC?= =?UTF-8?q?=E6=B5=AE=E5=85=83=E7=B4=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java index ce14c0e48..a3f8ecca3 100644 --- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java +++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java @@ -4,6 +4,7 @@ import com.fr.base.Utils; import com.fr.chart.web.ChartHyperRelateFloatLink; import com.fr.design.DesignModelAdapter; import com.fr.design.beans.BasicBeanPane; +import com.fr.design.constants.UIConstants; import com.fr.design.editor.ValueEditorPane; import com.fr.design.editor.ValueEditorPaneFactory; import com.fr.design.gui.frpane.ReportletParameterViewPane; @@ -18,6 +19,7 @@ import com.fr.stable.ParameterProvider; import javax.swing.*; import javax.swing.border.Border; +import javax.swing.border.LineBorder; import javax.swing.border.TitledBorder; import java.awt.*; import java.util.List; @@ -57,7 +59,7 @@ public class ChartHyperRelateFloatLinkPane extends BasicBeanPane Date: Wed, 9 Aug 2017 09:36:23 +0800 Subject: [PATCH 6/6] REPORT-3410 --- designer_base/src/com/fr/design/constants/UIConstants.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/constants/UIConstants.java b/designer_base/src/com/fr/design/constants/UIConstants.java index 916e8e71b..9ad180fd2 100644 --- a/designer_base/src/com/fr/design/constants/UIConstants.java +++ b/designer_base/src/com/fr/design/constants/UIConstants.java @@ -88,8 +88,8 @@ public interface UIConstants { public static final Color AUTHORITY_SHEET_UNSELECTED = new Color(146, 192, 225); public static final Color ATTRIBUTE_PRESS = new Color(0x419BF9); public static final Color NORMAL_BLUE = new Color(0x419BF9); - public static final Color ATTRIBUTE_NORMAL = new Color(0xDADADD); - public static final Color ATTRIBUTE_HOVER = new Color(0xC9C9CD); + public static final Color ATTRIBUTE_NORMAL = Color.WHITE; + public static final Color ATTRIBUTE_HOVER = new Color(0xF5F5F7); public static final Color CHECKBOX_HOVER_SELECTED = new Color(0x3394f0); public static final Color TEXT_FILED_BORDER_SELECTED = new Color(0x3384f0); public static final Color SHEET_NORMAL = new Color(0xc8c8ca);