From 627d2e4f3a8322214c2181477a5ad0c8ad0c3563 Mon Sep 17 00:00:00 2001 From: kerry Date: Wed, 11 Oct 2017 14:42:04 +0800 Subject: [PATCH 1/5] =?UTF-8?q?REPORT-4717=20[9.0=E5=86=85=E6=B5=8B]=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9D=E5=AF=B9=E5=B8=83=E5=B1=80=E5=86=B3?= =?UTF-8?q?=E7=AD=96=E6=8A=A5=E8=A1=A8body=E6=A0=B7=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=88=97=E8=A1=A8=E4=BC=9A=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E4=B8=A4=E4=B8=AAbody=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/mainframe/widget/ui/FormWidgetCardPane.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java b/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java index ac9e5848d7..14d3eb37a4 100644 --- a/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java +++ b/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java @@ -238,12 +238,15 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { public void fireValueChanged() { XCreator creator = getXCreatorDedicated(); creator.firePropertyChange(); - designer.fireTargetModified(); + firePropertyEdit(); } public String getIconPath() { return StringUtils.EMPTY; } + public void firePropertyEdit() { + designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_EDITED); + } } From 814cf80da44c11062213377df9b8529233f92250 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Wed, 11 Oct 2017 15:00:17 +0800 Subject: [PATCH 2/5] =?UTF-8?q?REPORT-4888=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E4=BA=A4=E4=BA=92=E4=BF=AE=E6=94=B9=201.=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=A0=BC=E5=B1=9E=E6=80=A7-=E6=A0=B7=E5=BC=8F-=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=A0=BC=20=E5=9B=BE=E6=A0=87=E5=8F=8D=E7=99=BD=202.?= =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC=E5=B1=9E=E6=80=A7-=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F-=E5=AF=B9=E9=BD=90=20=E5=9B=BE=E6=A0=87=E5=8F=8D?= =?UTF-8?q?=E7=99=BD=203.=E5=B7=A5=E5=85=B7=E6=A0=8F=E5=80=BE=E6=96=9C?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=9B=BE=E6=A0=87=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cell/style/ReportFontItalicAction.java | 2 +- .../fr/design/gui/ibutton/UIToggleButton.java | 12 ++++++++++++ .../com/fr/design/gui/style/AlignmentPane.java | 14 +++++--------- .../src/com/fr/design/gui/style/BorderPane.java | 16 ++++++++-------- .../images/m_format/cellstyle/bottom_white.png | Bin 0 -> 178 bytes .../cellstyle/defaultAlignment_white.png | Bin 0 -> 124 bytes .../m_format/cellstyle/h_s_normal_white.png | Bin 0 -> 112 bytes .../m_format/cellstyle/horizontal_white.png | Bin 0 -> 187 bytes .../images/m_format/cellstyle/in_white.png | Bin 0 -> 167 bytes .../design/images/m_format/cellstyle/italic.png | Bin 221 -> 206 bytes .../images/m_format/cellstyle/left_white.png | Bin 0 -> 175 bytes .../images/m_format/cellstyle/out_white.png | Bin 0 -> 154 bytes .../images/m_format/cellstyle/right_white.png | Bin 0 -> 172 bytes .../images/m_format/cellstyle/top_white.png | Bin 0 -> 181 bytes .../cellstyle/v_center_normal_white.png | Bin 0 -> 121 bytes .../m_format/cellstyle/v_down_normal_white.png | Bin 0 -> 119 bytes .../m_format/cellstyle/v_top_normal_white.png | Bin 0 -> 123 bytes .../m_format/cellstyle/vertical_white.png | Bin 0 -> 186 bytes 18 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 designer_base/src/com/fr/design/images/m_format/cellstyle/bottom_white.png create mode 100644 designer_base/src/com/fr/design/images/m_format/cellstyle/defaultAlignment_white.png create mode 100644 designer_base/src/com/fr/design/images/m_format/cellstyle/h_s_normal_white.png create mode 100644 designer_base/src/com/fr/design/images/m_format/cellstyle/horizontal_white.png create mode 100644 designer_base/src/com/fr/design/images/m_format/cellstyle/in_white.png create mode 100644 designer_base/src/com/fr/design/images/m_format/cellstyle/left_white.png create mode 100644 designer_base/src/com/fr/design/images/m_format/cellstyle/out_white.png create mode 100644 designer_base/src/com/fr/design/images/m_format/cellstyle/right_white.png create mode 100644 designer_base/src/com/fr/design/images/m_format/cellstyle/top_white.png create mode 100644 designer_base/src/com/fr/design/images/m_format/cellstyle/v_center_normal_white.png create mode 100644 designer_base/src/com/fr/design/images/m_format/cellstyle/v_down_normal_white.png create mode 100644 designer_base/src/com/fr/design/images/m_format/cellstyle/v_top_normal_white.png create mode 100644 designer_base/src/com/fr/design/images/m_format/cellstyle/vertical_white.png diff --git a/designer/src/com/fr/design/actions/cell/style/ReportFontItalicAction.java b/designer/src/com/fr/design/actions/cell/style/ReportFontItalicAction.java index 66e2d97cf0..9fdf217dae 100644 --- a/designer/src/com/fr/design/actions/cell/style/ReportFontItalicAction.java +++ b/designer/src/com/fr/design/actions/cell/style/ReportFontItalicAction.java @@ -22,7 +22,7 @@ public class ReportFontItalicAction extends ReportFontBoldAction { public ReportFontItalicAction(ElementCasePane t) { super(t); - this.setName(Inter.getLocText("FRFont-italic")); + this.setName(Inter.getLocText("FR-Designer-FRFont_Italic")); this.setSmallIcon(ICONS, true); } diff --git a/designer_base/src/com/fr/design/gui/ibutton/UIToggleButton.java b/designer_base/src/com/fr/design/gui/ibutton/UIToggleButton.java index 0a5351048d..b47975b3f0 100644 --- a/designer_base/src/com/fr/design/gui/ibutton/UIToggleButton.java +++ b/designer_base/src/com/fr/design/gui/ibutton/UIToggleButton.java @@ -76,6 +76,18 @@ public class UIToggleButton extends UIButton implements GlobalNameObserver{ super(icons[0], null, icons[1]); setSelectedIcon(icons[1]); setExtraPainted(true); + if (!needRelease) { + addActionListener(new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + if (UIToggleButton.super.isSelected()) { + UIToggleButton.super.setSelected(false); + } else { + UIToggleButton.super.setSelected(true); + } + } + }); + } addMouseListener(getMouseListener()); } diff --git a/designer_base/src/com/fr/design/gui/style/AlignmentPane.java b/designer_base/src/com/fr/design/gui/style/AlignmentPane.java index f0e760cfd0..9939ab2e19 100644 --- a/designer_base/src/com/fr/design/gui/style/AlignmentPane.java +++ b/designer_base/src/com/fr/design/gui/style/AlignmentPane.java @@ -83,12 +83,8 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO Icon[][] hAlignmentIconArray = {{BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal_white.png")}, {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal_white.png")}, {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal_white.png")}, - {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_s_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_s_normal.png")}, - {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment.png")}}; -// BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.png"), -// BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"), -// BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_s_normal.png"), -// BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment.png")}; + {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_s_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_s_normal_white.png")}, + {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment_white.png")}}; Integer[] hAlignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT, Integer.valueOf(Constants.DISTRIBUTED), Constants.NULL}; hAlignmentPane = new UIButtonGroup(hAlignmentIconArray, hAlignment); hAlignmentPane.setAllToolTips(new String[]{Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Left"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Center"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Right"), @@ -96,9 +92,9 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO hPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); vPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); - Icon[] vAlignmentIconArray = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_top_normal.png"), - BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_center_normal.png"), - BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_down_normal.png")}; + Icon[][] vAlignmentIconArray = {{BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_top_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_top_normal_white.png")}, + {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_center_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_center_normal_white.png")}, + {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_down_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_down_normal_white.png")}}; Integer[] vAlignment = new Integer[]{Constants.TOP, Constants.CENTER, Constants.BOTTOM}; vAlignmentPane = new UIButtonGroup(vAlignmentIconArray, vAlignment); vAlignmentPane.setAllToolTips(new String[]{Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Top"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Center"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Bottom")}); diff --git a/designer_base/src/com/fr/design/gui/style/BorderPane.java b/designer_base/src/com/fr/design/gui/style/BorderPane.java index a78c4fd7e2..e05d7f5292 100644 --- a/designer_base/src/com/fr/design/gui/style/BorderPane.java +++ b/designer_base/src/com/fr/design/gui/style/BorderPane.java @@ -82,10 +82,10 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse new Component[]{null, null}, new Component[]{new UILabel(Inter.getLocText("FR-Designer_Color") + " ", SwingConstants.LEFT), currentLineColorPane}, new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_outBorder") + " ", SwingConstants.LEFT), outerToggleButton = new UIToggleButton(BaseUtils.readIcon("com/fr/design/images/m_format/out.png"))}, + new Component[]{new UILabel(Inter.getLocText("FR-Designer_outBorder") + " ", SwingConstants.LEFT), outerToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("com/fr/design/images/m_format/out.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/out_white.png")}, false)}, new Component[]{null, externalPane}, new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_inBorder") + " ", SwingConstants.LEFT), innerToggleButton = new UIToggleButton(BaseUtils.readIcon("com/fr/design/images/m_format/in.png"))}, + new Component[]{new UILabel(Inter.getLocText("FR-Designer_inBorder") + " ", SwingConstants.LEFT), innerToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("com/fr/design/images/m_format/in.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/in_white.png")}, false)}, new Component[]{null, insidePane}, new Component[]{null, null} }; @@ -125,12 +125,12 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse }; private void initButtonsWithIcon() { - topToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/top.png")); - leftToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/left.png")); - bottomToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/bottom.png")); - rightToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/right.png")); - horizontalToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/horizontal.png")); - verticalToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/vertical.png")); + topToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("/com/fr/base/images/dialog/border/top.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/top_white.png")}, false); + leftToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("/com/fr/base/images/dialog/border/left.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/left_white.png")}, false); + bottomToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("/com/fr/base/images/dialog/border/bottom.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bottom_white.png")}, false); + rightToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("/com/fr/base/images/dialog/border/right.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/right_white.png")}, false); + horizontalToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("/com/fr/base/images/dialog/border/horizontal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/horizontal_white.png")}, false); + verticalToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("/com/fr/base/images/dialog/border/vertical.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/vertical_white.png")}, false); this.currentLineCombo = new LineComboBox(CoreConstants.UNDERLINE_STYLE_ARRAY); this.currentLineColorPane = new NewColorSelectBox(100); } diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/bottom_white.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/bottom_white.png new file mode 100644 index 0000000000000000000000000000000000000000..a87cd273adae1ab66a261f9305a1249d4e2e9c4c GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^q9Dw{1|(OCFP#RY7>k44ofy`glX(f`rd}j_ugMTxo_)#GbxJ4Aa=O?vB?MmAuR3xnLn6UjQl*QLAyQs~ Uxx+1^8fXH8r>mdKI;Vst0IYT+rT_o{ literal 0 HcmV?d00001 diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/h_s_normal_white.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/h_s_normal_white.png new file mode 100644 index 0000000000000000000000000000000000000000..e776e2efc31896a1c94299c8f4fc27967773a0d0 GIT binary patch literal 112 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|v^-rLLo5W7 z6C^%02tH~4@8HnqFVWZ_Q>#(s7JJ};ffQS_B2U01RZAHL!wVAZ!Y@KT0(CKXy85}S Ib4q9e0LUmFDF6Tf literal 0 HcmV?d00001 diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/horizontal_white.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/horizontal_white.png new file mode 100644 index 0000000000000000000000000000000000000000..2be4ab8959b9efde826bf85c41bfccfc0bda2775 GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^q9Dw{1|(OCFP#RY7>k44ofy`glX(f`lzO^2hFA!` z4RYiyX& ztk|{MXW^|A-!|EbTvI-MH)2isr+4}3akEq3hkZ10*Dl*S@$K5OOpDjg&RQEuOLSeV kKO_43p!3|!8j0PEn|X78?Qq(n2y_60r>mdKI;Vst0CyBe;s5{u literal 0 HcmV?d00001 diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/in_white.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/in_white.png new file mode 100644 index 0000000000000000000000000000000000000000..6936456ad5958ae8d5cc163f10ad5bb92d7faa39 GIT binary patch literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|5vnMwJdD&TdYZm(q-S2`y|&_a+<@ zs$1do!$~+^;n8LG?Tqso6?9m3bELiV;FSrk%nV=n8kk-s|LFu; O#^CAd=d#Wzp$Py5F*(Wr literal 0 HcmV?d00001 diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/italic.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/italic.png index 6b36a5c1ac8a1ec68f29c00914ccbfef13eec912..5fbc0dc432b6049be54c593b3fffaf3b367a3108 100644 GIT binary patch delta 178 zcmV;j08Rhh0nP!CB!2;OQb$4nuFf3k0001pNkl7f5u;h@*&$)$L`hnImc)I$ztaD0e0ssbBL)QQR diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/left_white.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/left_white.png new file mode 100644 index 0000000000000000000000000000000000000000..ed850955f40af0733b8747be0a75aecde15b86e2 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^q9Dw{1|(OCFP#RY7>k44ofy`glX(f`WO}+dhFAzD zCrGev5ct8*xKF`uf~N^@Ft;&#E8EOYB?qQuIN z<`eoK7!(^BFPTemhj1{v1uU2>&8^}hk++n=!zOED)UMj+K=Tk44ofy`glX(f`q05#}RsR9VQApPCM*-?0@CjD?>&>Nv$mRf~Q-FM62Z8Asymd97ATdbYD UcLis+9MDDvPgg&ebxsLQ0A&V0yZ`_I literal 0 HcmV?d00001 diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/top_white.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/top_white.png new file mode 100644 index 0000000000000000000000000000000000000000..7bf97dcf16af54b9226cc746b576bb1e5b06b7d3 GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^q9Dw{1|(OCFP#RY7>k44ofy`glX(f`bjdFY{JgqHdQ&=-|S9T}c#2WAW7jblF@w~7P`zrN3Bu*5~oZq%N zQ)})tjo@(UNWI%jAI@ugd+S@@Eny|z(~A1C$(KW{Y($E70o%s!SdvV^F`-L+$)llyS_T`dFmaw;L~g1U|yo~iBZ~sho!+p RLlUT+!PC{xWt~$(69AuCAF==d literal 0 HcmV?d00001 diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/v_down_normal_white.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/v_down_normal_white.png new file mode 100644 index 0000000000000000000000000000000000000000..d86816f87276afbbbcca6a5ad66b03f85a2a03d3 GIT binary patch literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|3_V>OLo5W7 z6C_v{D;h{RH3&ZG`0wD*mn_lPAXBSRgTe~DWM4fa_t}v literal 0 HcmV?d00001 diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/v_top_normal_white.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/v_top_normal_white.png new file mode 100644 index 0000000000000000000000000000000000000000..2ea2412eac10b325186c5055c6591c7a50ae723c GIT binary patch literal 123 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Og&v3Lo5W7 z6BY;k44ofy`glX(f`lz6&0hFA!` z4RYi=pul1L`~JWGGE`F4xBc_E4*vvwlH}ifr-)6ud%2;Sj%pgDdQ}6+2`=q zu7X`tPrup!EmNj6Xx@kHWdZ^`^F`!MBP9$k{t%D5vaY{Ua=WqV#XDE5zjl836~1hT jXTQYL%C!d_i!I7rcqZ@NDVLWHw4cG#)z4*}Q$iB}_^Cy$ literal 0 HcmV?d00001 From f3e73419a49200363d7f643b2530119e6fd8e917 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Wed, 11 Oct 2017 15:04:49 +0800 Subject: [PATCH 3/5] =?UTF-8?q?REPORT-4888=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E4=BA=A4=E4=BA=92=E4=BF=AE=E6=94=B9=20=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E6=A0=8F=E5=80=BE=E6=96=9C=E6=8C=89=E9=92=AE=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/images/m_format/cellstyle/italic.png | Bin 206 -> 226 bytes .../images/m_format/cellstyle/italic_white.png | Bin 158 -> 190 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/italic.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/italic.png index 5fbc0dc432b6049be54c593b3fffaf3b367a3108..5e48d763365f95de4ebff0e565ed07dc2efa3960 100644 GIT binary patch delta 185 zcmV;q07n1L0pbCWF@Ky%L_t(I5o2H&@_-Sa4~&gX{v*quJ$nX2JrlA5bT%6st149N z4mQmoIlKn^`t{cnq==D`VLOP%2Jjld$oL;@08k_823T5Jaso9vFfuZJXJutQfX#N0 z7)}@b{{7qG|Ns9WLk=82e*8Ph1^_jHo&WzoBTnao48`e!|1$p}2C%U)<28T_hTb?=dg7MF7zQP#&tS0@6f(|KS1`X`mqv T1HnI500000NkvXXu0mjfGV4b& diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/italic_white.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/italic_white.png index 936a3e7840ec699dd360a78dd735e3ac2b9ec9e7..e32c6eaefc2246ff6321ae94f979121ce6c9b020 100644 GIT binary patch delta 149 zcmV;G0BZl90loo{F@JbTL_t(I5o2H&@_-Sa5B>uIvOFUYAoD?NCUgNbzABV|2b*S) z93cZdp$2S+(ijxQ24I*7699Uj6NtY-F(*tMoyO+^2cTk*#sfhAe@E8{=0iFSnF>P2$L_t(I5o2H&1$aZ?|Ns9gKnw!6aVccNB>@%pgwoq_siW8c zTm~}$oy`fv-=LTimqL6lZ~$roX*|Hl$oQQc0|@#bm!V*BP{;!@2&mvyI4Vhb2mk;8 WjwtAJ^x0Sd0000 Date: Wed, 11 Oct 2017 16:05:12 +0800 Subject: [PATCH 4/5] =?UTF-8?q?REPORT-4992=20=E6=8F=92=E4=BB=B6=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E8=84=9A=E6=9C=ACindex.html=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/extra/LoginWebPane.java | 2 +- .../src/com/fr/design/extra/QQLoginWebPane.java | 2 +- .../src/com/fr/design/extra/WebViewDlgHelper.java | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/designer_base/src/com/fr/design/extra/LoginWebPane.java b/designer_base/src/com/fr/design/extra/LoginWebPane.java index ee0a3275aa..a5138544c6 100644 --- a/designer_base/src/com/fr/design/extra/LoginWebPane.java +++ b/designer_base/src/com/fr/design/extra/LoginWebPane.java @@ -27,7 +27,7 @@ public class LoginWebPane extends JFXPanel { LoginWebPane.this.setScene(scene); WebView webView = new WebView(); WebEngine webEngine = webView.getEngine(); - webEngine.load("file:///" + installHome + "/scripts/qqLogin/web/login.html"); + webEngine.load("file:///" + installHome + "/scripts/login.html"); webEngine.setOnAlert(new EventHandler>() { @Override public void handle(WebEvent event) { diff --git a/designer_base/src/com/fr/design/extra/QQLoginWebPane.java b/designer_base/src/com/fr/design/extra/QQLoginWebPane.java index 096f9bb258..82648531c4 100644 --- a/designer_base/src/com/fr/design/extra/QQLoginWebPane.java +++ b/designer_base/src/com/fr/design/extra/QQLoginWebPane.java @@ -62,7 +62,7 @@ public class QQLoginWebPane extends JFXPanel { QQLoginWebPane.this.setScene(scene); final WebView webView = new WebView(); webEngine = webView.getEngine(); - url = "file:///" + installHome + "/scripts/qqLogin/web/qqLogin.html"; + url = "file:///" + installHome + "/scripts/qqLogin.html"; webEngine.load(url); final Stage primaryStage = new Stage(); diff --git a/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java b/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java index 43e1dbae5e..cef4c2d964 100644 --- a/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java +++ b/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java @@ -37,7 +37,7 @@ public class WebViewDlgHelper { public static void createPluginDialog() { if (StableUtils.getMajorJavaVersion() >= VERSION_8) { - String relativePath = "/scripts/store/web/index.html"; + String relativePath = "/scripts/plugin.html"; String mainJsPath = StableUtils.pathJoin(installHome, relativePath); File file = new File(mainJsPath); if (!file.exists()) { @@ -52,7 +52,7 @@ public class WebViewDlgHelper { downloadShopScripts(SHOP_SCRIPTS); } } else { - String indexPath = "index.html"; + String indexPath = "plugin.html"; String mainIndexPath = StableUtils.pathJoin(installHome, indexPath); checkAndCopyMainFile(mainIndexPath, mainJsPath); showPluginDlg(mainIndexPath); @@ -73,7 +73,7 @@ public class WebViewDlgHelper { } /** - * 检查script文件夹中的index.html文件 + * 检查script文件夹中的plugin.html文件 * */ public static void checkAndCopyMainFile(String indexPath, String mainJsPath){ @@ -84,7 +84,7 @@ public class WebViewDlgHelper { } /** - * 將script文件夹中的index.html文件复制到webreport下 + * 將script文件夹中的plugin.html文件复制到webreport下 * */ public static void copyMainFile(String indexPath, String mainJsPath){ @@ -191,9 +191,9 @@ public class WebViewDlgHelper { try { if (get()) { - String relativePath = "/scripts/store/web/index.html"; + String relativePath = "/scripts/plugin.html"; IOUtils.unzip(new File(StableUtils.pathJoin(PluginConstants.DOWNLOAD_PATH, PluginConstants.TEMP_FILE)), installHome); - copyMainFile(StableUtils.pathJoin(installHome, "index.html"), StableUtils.pathJoin(installHome, relativePath)); + copyMainFile(StableUtils.pathJoin(installHome, "plugin.html"), StableUtils.pathJoin(installHome, relativePath)); // TODO: 2017/4/17 删除之前存放在安装目录下的script PluginStoreConstants.refreshProps(); // 下载完刷新一下版本号等 JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Shop_Installed"), Inter.getLocText("FR-Designer_Tooltips"), JOptionPane.INFORMATION_MESSAGE); From 7f2b3eec2ab5278ba37ce503baee1cc94d688bf8 Mon Sep 17 00:00:00 2001 From: plough Date: Wed, 11 Oct 2017 16:06:21 +0800 Subject: [PATCH 5/5] =?UTF-8?q?REPORT-4978=20[9.0=E4=BA=8C=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E8=AE=BE=E8=AE=A1=E5=99=A8=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2=EF=BC=8C=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=E5=9B=BE=E6=A0=87=E6=98=BE=E7=A4=BA=E6=9C=89=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E5=B7=A6=E8=BE=B9=E8=A2=AB=E9=81=AE=E6=8C=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/gui/icombobox/UIComboBoxUI.java | 6 +++++- .../src/com/fr/design/mainframe/widget/UITreeComboBox.java | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java b/designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java index cebf2a07a7..9912594c89 100644 --- a/designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java +++ b/designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java @@ -94,6 +94,10 @@ public class UIComboBoxUI extends BasicComboBoxUI implements MouseListener { */ @Override public void paintCurrentValue(Graphics g, Rectangle bounds, boolean hasFocus) { + paintCurrentValue(g, bounds, hasFocus, 0); + } + + public void paintCurrentValue(Graphics g, Rectangle bounds, boolean hasFocus, int paddingLeft) { ListCellRenderer renderer = comboBox.getRenderer(); Component c; @@ -142,7 +146,7 @@ public class UIComboBoxUI extends BasicComboBoxUI implements MouseListener { int x = bounds.x, y = bounds.y, w = bounds.width, h = bounds.height; - currentValuePane.paintComponent(g, c, comboBox, x, y, w, h, shouldValidate); + currentValuePane.paintComponent(g, c, comboBox, x + paddingLeft, y, w, h, shouldValidate); } @Override diff --git a/designer_form/src/com/fr/design/mainframe/widget/UITreeComboBox.java b/designer_form/src/com/fr/design/mainframe/widget/UITreeComboBox.java index 31be76569b..749bdceb74 100644 --- a/designer_form/src/com/fr/design/mainframe/widget/UITreeComboBox.java +++ b/designer_form/src/com/fr/design/mainframe/widget/UITreeComboBox.java @@ -121,6 +121,11 @@ public class UITreeComboBox extends UIComboBox { protected ComboPopup createPopup() { return new TreePopup(comboBox); } + + @Override + public void paintCurrentValue(Graphics g, Rectangle bounds, boolean hasFocus) { + paintCurrentValue(g, bounds, hasFocus, 3); + } } class MotifJTreeComboBoxUI extends MotifComboBoxUI{