From db1f70f307b741a6e170b52faf3b61625e8bbdfc Mon Sep 17 00:00:00 2001 From: momeak Date: Fri, 15 Sep 2017 10:02:55 +0800 Subject: [PATCH 1/4] =?UTF-8?q?REPORT-4600=20=E6=97=A0=E6=B3=95=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E8=AE=BE=E7=BD=AE=E5=8D=95=E5=85=83=E6=A0=BC=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/gui/style/FormatPane.java | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/designer_base/src/com/fr/design/gui/style/FormatPane.java b/designer_base/src/com/fr/design/gui/style/FormatPane.java index 49f0ebd15..43fcd247f 100644 --- a/designer_base/src/com/fr/design/gui/style/FormatPane.java +++ b/designer_base/src/com/fr/design/gui/style/FormatPane.java @@ -9,6 +9,8 @@ import com.fr.data.core.FormatField.FormatContents; import com.fr.design.border.UIRoundedBorder; import com.fr.design.constants.LayoutConstants; import com.fr.design.constants.UIConstants; +import com.fr.design.event.GlobalNameListener; +import com.fr.design.event.GlobalNameObserver; import com.fr.design.gui.icombobox.TextFontComboBox; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBoxRenderer; @@ -34,7 +36,7 @@ import java.text.SimpleDateFormat; * @author zhou * @since 2012-5-24上午10:57:00 */ -public class FormatPane extends AbstractBasicStylePane { +public class FormatPane extends AbstractBasicStylePane implements GlobalNameObserver { private static final long serialVersionUID = 724330854437726751L; private static final int LABLE_X = 4; @@ -61,7 +63,7 @@ public class FormatPane extends AbstractBasicStylePane { private FRFontPane frFontPane; private boolean isRightFormate; private boolean isDate = false; - private boolean isFormat = false; + private GlobalNameListener globalNameListener = null; /** * Constructor. @@ -87,13 +89,14 @@ public class FormatPane extends AbstractBasicStylePane { UIComboBoxRenderer render = createComBoxRender(); typeComboBox.setRenderer(render); typeComboBox.addItemListener(itemListener); + typeComboBox.setGlobalName("typeComboBox"); contentPane.add(sampleLabel, BorderLayout.NORTH); txtCenterPane = new JPanel(new BorderLayout()); textField = new TextFontComboBox(); -// textField.setItemArray(FormatField.getInstance().getFormatArray(getFormatContents())); textField.addItemListener(textFieldItemListener); textField.setEditable(true); + textField.setGlobalName("textField"); txtCenterPane.add(textField, BorderLayout.NORTH); contentPane.add(txtCenterPane, BorderLayout.CENTER); @@ -333,7 +336,6 @@ public class FormatPane extends AbstractBasicStylePane { centerPane.setPreferredSize(new Dimension(270, 65)); cardLayout.show(centerPane, "show"); } - isFormat = true; } } @@ -343,7 +345,6 @@ public class FormatPane extends AbstractBasicStylePane { @Override public void itemStateChanged(ItemEvent e) { if (e.getStateChange() == ItemEvent.SELECTED) { - isFormat = true; refreshPreviewLabel(); } } @@ -355,7 +356,6 @@ public class FormatPane extends AbstractBasicStylePane { */ public void populateBean(Style style) { this.populateBean(style.getFormat()); - isFormat = false; this.frFontPane.populateBean(style.getFRFont()); } @@ -364,8 +364,7 @@ public class FormatPane extends AbstractBasicStylePane { * update */ public Style update(Style style) { - if (isFormat) { - isFormat = false; + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), "textField") || ComparatorUtils.equals(globalNameListener.getGlobalName(), "typeComboBox")) { return style.deriveFormat(this.update()); } else { return style.deriveFRFont(this.frFontPane.update(style.getFRFont())); @@ -424,4 +423,18 @@ public class FormatPane extends AbstractBasicStylePane { } } + @Override + public void registerNameListener(GlobalNameListener listener) { + globalNameListener = listener; + } + + @Override + public boolean shouldResponseNameListener() { + return false; + } + + @Override + public void setGlobalName(String name) { + + } } \ No newline at end of file From bd87f51b923519b3deda833342b485c138b35ff8 Mon Sep 17 00:00:00 2001 From: momeak Date: Fri, 15 Sep 2017 13:41:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?REPORT-4610=20=E6=A0=B7=E5=BC=8F-=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E7=BA=BF=EF=BC=8C=E6=95=B0=E5=AD=97=E6=A1=86=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E6=B2=A1=E6=9C=89=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/present/CurrencyLinePane.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/designer/src/com/fr/design/present/CurrencyLinePane.java b/designer/src/com/fr/design/present/CurrencyLinePane.java index ab4af1645..60c96bd7c 100644 --- a/designer/src/com/fr/design/present/CurrencyLinePane.java +++ b/designer/src/com/fr/design/present/CurrencyLinePane.java @@ -6,6 +6,7 @@ import com.fr.design.constants.LayoutConstants; import com.fr.design.constants.UIConstants; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UIBasicSpinner; +import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; @@ -33,8 +34,8 @@ public class CurrencyLinePane extends FurtherBasicBeanPane private static final int VS_NUM = 4; private static final int VG_NUM = 6; private static final Dimension NORMAL_DIMENSION = new Dimension(155, 20); - private UIBasicSpinner intPartSpinner; - private UIBasicSpinner deciPartSpinner; + private UISpinner intPartSpinner; + private UISpinner deciPartSpinner; private UITextField textField; private CurrencyLinePreviewPane CurrencyLinePreviewPane; private int intPart = 9; @@ -73,11 +74,11 @@ public class CurrencyLinePane extends FurtherBasicBeanPane protected void initComponents() { // 整数位选择 - intPartSpinner = new UIBasicSpinner(new SpinnerNumberModel(9, 1, 20, 1)); + intPartSpinner = new UISpinner(1, 20, 1, 9); intPartSpinner.setPreferredSize(NORMAL_DIMENSION); // 小数位选择 - deciPartSpinner = new UIBasicSpinner(new SpinnerNumberModel(2, 1, 10, 1)); + deciPartSpinner = new UISpinner(1, 10, 1, 2); deciPartSpinner.setPreferredSize(NORMAL_DIMENSION); // 预览区域 textField = new UITextField(10); @@ -132,8 +133,8 @@ public class CurrencyLinePane extends FurtherBasicBeanPane */ public CurrencyLineAttr update() { CurrencyLineAttr currencylineAttr = new CurrencyLineAttr(); - currencylineAttr.setintPart(((Integer) this.intPartSpinner.getValue()).intValue()); - currencylineAttr.setdeciPart(((Integer) this.deciPartSpinner.getValue()).intValue()); + currencylineAttr.setintPart((int) this.intPartSpinner.getValue()); + currencylineAttr.setdeciPart((int) this.deciPartSpinner.getValue()); return currencylineAttr; } @@ -225,8 +226,8 @@ public class CurrencyLinePane extends FurtherBasicBeanPane @Override public CurrencyLinePresent updateBean() { CurrencyLineAttr currencylineAttr = new CurrencyLineAttr(); - currencylineAttr.setintPart(((Integer) this.intPartSpinner.getValue()).intValue()); - currencylineAttr.setdeciPart(((Integer) this.deciPartSpinner.getValue()).intValue()); + currencylineAttr.setintPart((int) this.intPartSpinner.getValue()); + currencylineAttr.setdeciPart((int) this.deciPartSpinner.getValue()); return new CurrencyLinePresent(currencylineAttr); } From 197e290fe3107c47e4ad04617e15a689ef843a6d Mon Sep 17 00:00:00 2001 From: momeak Date: Fri, 15 Sep 2017 15:06:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?REPORT-4604=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E8=A7=86=E8=A7=89=E4=BF=AE=E6=94=B9=20=E7=BC=A9=E6=94=BE?= =?UTF-8?q?=E7=9A=84JSpinner=E7=9A=84UI=E6=94=B9=E4=BA=86=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/gui/ispinner/UISpinnerUI.java | 10 ++++++---- .../src/com/fr/design/mainframe/JSliderPane.java | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/designer_base/src/com/fr/design/gui/ispinner/UISpinnerUI.java b/designer_base/src/com/fr/design/gui/ispinner/UISpinnerUI.java index 3a333bbf1..2c32a00ae 100644 --- a/designer_base/src/com/fr/design/gui/ispinner/UISpinnerUI.java +++ b/designer_base/src/com/fr/design/gui/ispinner/UISpinnerUI.java @@ -5,7 +5,9 @@ package com.fr.design.gui.ispinner; +import com.fr.design.constants.UIConstants; import com.fr.design.gui.ibutton.SpecialUIButton; +import com.fr.design.gui.ibutton.UIButton; import javax.swing.*; import javax.swing.plaf.ComponentUI; @@ -42,8 +44,8 @@ public class UISpinnerUI extends BasicSpinnerUI { } protected Component createPreviousButton() { - JButton b = new SpecialUIButton(new UISpinnerButtonUI(SwingConstants.SOUTH)); - +// JButton b = new SpecialUIButton(new UISpinnerButtonUI(SwingConstants.SOUTH)); + JButton b = new UIButton(UIConstants.ARROW_DOWN_ICON); b.putClientProperty("isSpinnerButton", Boolean.TRUE); b.setFocusable(false); b.addActionListener(PREVIOUS_BUTTON_HANDLER); @@ -53,8 +55,8 @@ public class UISpinnerUI extends BasicSpinnerUI { } protected Component createNextButton() { - JButton b = new SpecialUIButton(new UISpinnerButtonUI(SwingConstants.NORTH)); - +// JButton b = new SpecialUIButton(new UISpinnerButtonUI(SwingConstants.NORTH)); + JButton b = new UIButton(UIConstants.ARROW_UP_ICON); b.putClientProperty("isSpinnerButton", Boolean.TRUE); b.setFocusable(false); b.addActionListener(NEXT_BUTTON_HANDLER); diff --git a/designer_base/src/com/fr/design/mainframe/JSliderPane.java b/designer_base/src/com/fr/design/mainframe/JSliderPane.java index 1583ca770..bccf3c8f8 100644 --- a/designer_base/src/com/fr/design/mainframe/JSliderPane.java +++ b/designer_base/src/com/fr/design/mainframe/JSliderPane.java @@ -8,6 +8,7 @@ import com.fr.design.gui.ibutton.UISliderButton; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.islider.UISlider; import com.fr.design.gui.ispinner.UIBasicSpinner; +import com.fr.design.gui.ispinner.UISpinnerUI; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; @@ -132,6 +133,7 @@ public class JSliderPane extends JPanel { return new Point(event.getX(), event.getY() - TOOLTIP_Y); } }; + showValSpinner.setUI(new UISpinnerUI()); showValSpinner.setEnabled(true); showValSpinner.addChangeListener(showValSpinnerChangeListener); showValSpinner.setPreferredSize(new Dimension(SPINNER_WIDTH, SPINNER_HEIGHT)); From da5c28534a23df820c77cd209cc6eb3c1c549a3f Mon Sep 17 00:00:00 2001 From: momeak Date: Fri, 15 Sep 2017 15:33:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?REPORT-4604=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E8=A7=86=E8=A7=89=E4=BF=AE=E6=94=B9=20=E6=82=AC=E6=B5=AE?= =?UTF-8?q?=E5=85=83=E7=B4=A0=E4=B8=8B=E6=8B=89=E6=A1=86=E5=92=8C=E8=B6=85?= =?UTF-8?q?=E7=BA=A7=E9=93=BE=E6=8E=A5=E4=B8=8B=E6=8B=89=E6=A1=86=E8=A7=86?= =?UTF-8?q?=E8=A7=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/gui/imenu/UIMenuEastAttrItem.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/designer_base/src/com/fr/design/gui/imenu/UIMenuEastAttrItem.java b/designer_base/src/com/fr/design/gui/imenu/UIMenuEastAttrItem.java index 0df132caf..e27446bec 100644 --- a/designer_base/src/com/fr/design/gui/imenu/UIMenuEastAttrItem.java +++ b/designer_base/src/com/fr/design/gui/imenu/UIMenuEastAttrItem.java @@ -62,7 +62,7 @@ public class UIMenuEastAttrItem extends JMenuItem { if (menuItem.isOpaque()) { if (model.isArmed() || (menuItem instanceof JMenu && model.isSelected())) { - GUIPaintUtils.fillPaint((Graphics2D) g, 0, 0, menuWidth, menuHeight, true, Constants.NULL, UIConstants.FLESH_BLUE, 0); + GUIPaintUtils.fillPaint((Graphics2D) g, 0, 0, menuWidth, menuHeight, true, Constants.NULL, UIConstants.POPUP_TITLE_BACKGROUND, 0); } else { GUIPaintUtils.fillPaint((Graphics2D) g, 0, 0, menuWidth, menuHeight, true, Constants.NULL, UIConstants.TOOLBARUI_BACKGROUND, 0); } @@ -70,7 +70,7 @@ public class UIMenuEastAttrItem extends JMenuItem { } else if (model.isArmed() || (menuItem instanceof JMenu && model.isSelected())) { - GUIPaintUtils.fillPaint((Graphics2D)g, 0, 0, menuWidth, menuHeight, true, Constants.NULL, UIConstants.FLESH_BLUE, 7); + GUIPaintUtils.fillPaint((Graphics2D)g, 0, 0, menuWidth, menuHeight, true, Constants.NULL, UIConstants.POPUP_TITLE_BACKGROUND, 7); g.setColor(oldColor); } } @@ -95,7 +95,6 @@ public class UIMenuEastAttrItem extends JMenuItem { fm.getAscent() - 1); } } else { - menuItem.setForeground(isArmed() ? Color.white : Color.black); SwingUtilities2.drawStringUnderlineCharAt(menuItem, g, text, -1, 0, textRect.y + fm.getAscent()); }