From 4ded7b5fec713a9583cccdf5fffd02d339217524 Mon Sep 17 00:00:00 2001 From: fanglei <294531121> Date: Tue, 27 Dec 2016 13:58:32 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=B0=86=E2=80=9Capp=E8=87=AA=E9=80=82?= =?UTF-8?q?=E5=BA=94=E2=80=9D=E6=94=B9=E6=88=90=E2=80=9C=E8=87=AA=E9=80=82?= =?UTF-8?q?=E5=BA=94=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/report/mobile/AppFitBrowserPane.java | 2 +- .../report/mobile/MobileRadioGroupPane.java | 1 + .../report/mobile/ReportMobileAttrPane.java | 2 +- .../com/fr/design/images/dialog/appfit/H4.png | Bin 0 -> 1581 bytes .../com/fr/design/images/dialog/appfit/V4.png | Bin 0 -> 1645 bytes .../src/com/fr/design/locale/designer.properties | 2 +- .../fr/design/locale/designer_en_US.properties | 2 +- .../fr/design/locale/designer_ja_JP.properties | 2 +- .../fr/design/locale/designer_ko_KR.properties | 4 ++-- .../fr/design/locale/designer_zh_CN.properties | 4 ++-- .../fr/design/locale/designer_zh_TW.properties | 2 +- .../mobile/ElementCasePropertyTable.java | 8 ++++---- 12 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 designer_base/src/com/fr/design/images/dialog/appfit/H4.png create mode 100644 designer_base/src/com/fr/design/images/dialog/appfit/V4.png diff --git a/designer/src/com/fr/design/report/mobile/AppFitBrowserPane.java b/designer/src/com/fr/design/report/mobile/AppFitBrowserPane.java index 2b1f44f38..d51a237fe 100644 --- a/designer/src/com/fr/design/report/mobile/AppFitBrowserPane.java +++ b/designer/src/com/fr/design/report/mobile/AppFitBrowserPane.java @@ -75,7 +75,7 @@ public class AppFitBrowserPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Fit-App"); + return Inter.getLocText("FR-Designer_Fit"); } private ActionListener getAppPreviewActionListener() { diff --git a/designer/src/com/fr/design/report/mobile/MobileRadioGroupPane.java b/designer/src/com/fr/design/report/mobile/MobileRadioGroupPane.java index 85cee58e8..7a8b02012 100644 --- a/designer/src/com/fr/design/report/mobile/MobileRadioGroupPane.java +++ b/designer/src/com/fr/design/report/mobile/MobileRadioGroupPane.java @@ -34,6 +34,7 @@ public class MobileRadioGroupPane extends BasicBeanPane{ defaultRadio.setSelected(true); UIRadioButton horizonRadio = new UIRadioButton(MobileFitAttrState.HORIZONTAL.description()); UIRadioButton verticalRadio = new UIRadioButton(MobileFitAttrState.VERTICAL.description()); +// UIRadioButton bidirectionalRadio = new UIRadioButton(MobileFitAttrState.BIDIRECTIONAL.description()); UIRadioButton notFitRadio = new UIRadioButton(MobileFitAttrState.NONE.description()); addToButtonGroup(defaultRadio, horizonRadio, verticalRadio, notFitRadio); diff --git a/designer/src/com/fr/design/report/mobile/ReportMobileAttrPane.java b/designer/src/com/fr/design/report/mobile/ReportMobileAttrPane.java index 5b9713710..8f8f74437 100644 --- a/designer/src/com/fr/design/report/mobile/ReportMobileAttrPane.java +++ b/designer/src/com/fr/design/report/mobile/ReportMobileAttrPane.java @@ -65,6 +65,6 @@ public class ReportMobileAttrPane extends BasicBeanPane{ @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Fit-App"); + return Inter.getLocText("FR-Designer_Mobile-Attr"); } } diff --git a/designer_base/src/com/fr/design/images/dialog/appfit/H4.png b/designer_base/src/com/fr/design/images/dialog/appfit/H4.png new file mode 100644 index 0000000000000000000000000000000000000000..4712003bdf4e0111f9bc7763fab0e60a5b937b18 GIT binary patch literal 1581 zcmeAS@N?(olHy`uVBq!ia0vp^AAooP2NRIoyR*y)NJ*BsMwA5Srr5%(GQ`zk9!uLS~AsQn;zFfp39xYDT62(s|s5su(?)1Hb_`sNdc^+B->UA;;0DU00rm#qErP_JyYFe10zEPb4xu# zQ&V$uBOL`J149#i14Dg7V_ic_D-#nd0|NypPy*Ukl#*r@PvvothxHM4ZHG^MGl-2$;B+|7EaktaqG?9K)+@O5r@F+h}i2#F zDT`j&t-HS3QRY?IZplxU#s5rLy_7Ooc$?T9n->V0a7clf${7L>rrQMt2(x#ABa{hL z2VsJ>I9?FYd9f|`d)2@E_*ZM+m_Glec*Q?_@6W4ApXa>ZHE%uZU)>{rEdA3xiYqMU zJ*Y68_v}fvWyv|grBmJ+n)q(sbFTa3VflEiCJX0#<>xNC-95XLYv1&q(%nug%C`sQ zU%GbQ^1;&%=`S@wl{K^YjGoUBe{|{Xr9wW-+Nyl>`^Ifw|J=*lbf0Br#g@q_-1Cap zEbxAs@#ONeH}cvdt{2Ggi~=Mm4yXN{D6-7K@K^8#ng4|*>1*bgrEizn(GChEN0_-} zgxC5@+urJ(&zFz6>->Dr+pB$HQ_Hu$0)|rOhut6D9G_o&a(?Hb#E8R(3s*iqx+98p zzVY*iGat_K)4ZFUF)OWduK48k^>JAbS3mDIezN!3o@ZKrPR?0f|D|l&_h!@T4>g+; zzgzZye{WIT2MjQ`!_{{V{cx!{H|Oxbg_q`km3@BY-tzBdpKX&P_V3!>U1l%)HseX` zGZ}*ydFM7Z=}q0d&wuvj`ZWO}j?l=*9plhI!V(m-zq$v_U^@CkD1o76@|6H_V+Po~;1FfeOmhD4M^`1)8S=jZArg4F0$^BXQ!4Z zB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3jDm&RSMakYy!KT6rXh3di zNuokUZcbjYRfVk**jy_h8zii+qySb@l5ML5aa4qFfP!;=QL2Keo~drKfsvttxuu?= zsj0cSk&c3qfuV`MfuX*kv96(|m5GU!fq?=PC;@FNN=dT{a&d#&1?1T(Wt5Z@Sn2DR zmzV368|&p4rRy77T3YHG80i}s=>k>g7FXt#Bv$C=6)VF`a7isrF3Kz@$;{7F0GXJW zlwVq6s|0i@#0$9vaAWg|p}_R zVB+2x*2K%ez;xTw#WAGf)|#fNhDN0wPs@&NB{7W(4 z@mlI!4ae+zXWYGBF8F)xY5eiWA8Xm{=K8%i&X@ak*>vA~24=AYMhIflIlu%#JP{47 zFvQ5cfdPWBsnj`uqVk?>h0O64-~WGI92azD&*P;xF2DY^F)LdC{O#|5KmGV$yJQMe zIg@tcvdwe;r_@FI1^v7IG-TsqzoYMJ#H{mwT&cX_%=V8fSEB9r@yiFVo{qQIS~cxC zue>GyZQK88v-QtQ#h*=+*XutYogBG}`Tnkt@2*yS-7{58<%eWU+|ls!OP+4Ek)Qtl z|K-Q8o}Pbj?D^TlVT^f}w@;tqw_<^KM*`*-ppUS5hv$Y61L5$9dbek7U+9g(=X1}$ znZ4z4;@w5I&3MC0ECCj>XyFA7S#ASZ96(jBdCS!QSmM*ak3o;MB~0J%^8dYc-ObR~ zzw0XZyw8d`8`~Q^r*3}8v&r+~rxiVQT)9K^;)=@W<;SF#Pub@r-S+U`$C84tpRT#z z{dv1|tL1y;)f@9}y!*L*?n|rMC)T_E2<3b<`~6_g)9=;=_g)=1T|D=_Yx%Jo?~2Rs z?)m!faN#|Bi<;e6<>z~z&aSlE_tj_BN1JsU_vW0~W7_a}Luf defaultList = new ArrayList<>(); @@ -96,7 +96,7 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{ } - groups.add(new PropertyGroup(new ReportAppPropertyGroupModel(Inter.getLocText("FR-Designer_Fit-App"), xCreator, propertyTableEditor, designer))); + groups.add(new PropertyGroup(new ReportAppPropertyGroupModel(Inter.getLocText("FR-Designer_Fit"), xCreator, propertyTableEditor, designer))); TableModel model = new BeanTableModel(); setModel(model); From 41191d8024398fa024a6fd1ed9168e41adc9f2e4 Mon Sep 17 00:00:00 2001 From: fanglei <294531121> Date: Tue, 27 Dec 2016 14:00:11 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/locale/designer_ko_KR.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 a84ff40a6..981cffc7b 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 @@ -100,7 +100,7 @@ FR-Designer_FS_Close_Other_Templates=\uAE30\uD0C0\uD15C\uD50C\uB9BF\uB2EB\uAE30 FR-Designer_File=\uD30C\uC77C FR-Designer_Filter_Conditions=\uD544\uD130\uC870\uAC74 FR-Designer_Finish-Modify-Share=\uC218\uC815\uC644\uB8CC\uBC0F\uACF5\uC720 -FR-Designer_Fit-App=App\uC790\uAE30\uC801\uC751 +FR-Designer_Fit=App\uC790\uAE30\uC801\uC751 FR-Designer_Font-Family=\uAE00\uAF34\uBA85\uCE6D FR-Designer_Font-Size=\uAE00\uAF34\uD06C\uAE30 FR-Designer_Forbid_Drag_into_Adapt_Pane=\uD574\uB2F9\uAC1D\uCCB4\uB294\uD3FC\uD14C\uC774\uBE14\uBC14\uB514\uB4DC\uB798\uADF8\uB97C\uD5C8\uC6A9\uD558\uC9C0\uC54A\uC2B5\uB2C8\uB2E4. @@ -466,4 +466,4 @@ FR-Designer_Exported_successfully=\uB0B4\uBCF4\uB0B4\uAE30\uC131\uACF5 FR-Designer_Exporting=\uB0B4\uBCF4\uB0B4\uAE30\uC911 FR-Designer_Export-PDF=PDF\uC11C\uC2DDFR-Designer_Properties=\uFFFD FR-Designer_Button_OK=\uD655\uC778FR-Designer_Button_Cancel=\uCDE8\uC18C -\ \ No newline at end of file +\uFFFD \ No newline at end of file From 9309c76f1a03cd9355d695a89ddd0a8dfec1169e Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Tue, 27 Dec 2016 17:56:59 +0800 Subject: [PATCH 3/9] =?UTF-8?q?oracle=20=E5=AD=98=E5=82=A8=E8=BF=87?= =?UTF-8?q?=E7=A8=8B=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/env/RemoteEnv.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/env/RemoteEnv.java b/designer_base/src/com/fr/env/RemoteEnv.java index a0bdc0e13..e3fefd04e 100644 --- a/designer_base/src/com/fr/env/RemoteEnv.java +++ b/designer_base/src/com/fr/env/RemoteEnv.java @@ -1656,12 +1656,12 @@ public class RemoteEnv implements Env { } @Override - public StoreProcedureParameter[] getStoreProcedureDeclarationParameters(String connectionName, String databaseName, String parameterDefaultValue) throws Exception { + public StoreProcedureParameter[] getStoreProcedureDeclarationParameters(String connectionName, String[] databaseName, String parameterDefaultValue) throws Exception { ByteArrayOutputStream out = new ByteArrayOutputStream(); HashMap para = new HashMap(); para.put("op", "fr_remote_design"); para.put("cmd", "design_get_sp_parameters"); - para.put("__name__", databaseName); + para.put("__name__", StringUtils.join(".", databaseName)); para.put("__default_value__", parameterDefaultValue); para.put("connectionName", connectionName); From 57ebd42fcbfa769c2aa328552b2dab1e5d0fd8e9 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Tue, 27 Dec 2016 17:58:14 +0800 Subject: [PATCH 4/9] rt --- .../design/data/tabledata/tabledatapane/ProcedureDataPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java b/designer_base/src/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java index 600481428..f3e8dcd5a 100644 --- a/designer_base/src/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java +++ b/designer_base/src/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java @@ -316,7 +316,7 @@ public class ProcedureDataPane extends AbstractTableDataPane imp } StoreProcedureParameter[] newparameters; - newparameters = FRContext.getCurrentEnv().getStoreProcedureDeclarationParameters(connectionname, tableName[tableName.length - 1], parameterDefaultValue); + newparameters = FRContext.getCurrentEnv().getStoreProcedureDeclarationParameters(connectionname, tableName, parameterDefaultValue); editorPane.populate(newparameters); From efda5a486ffdca44437e9c84bbd830784823e7d1 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Wed, 28 Dec 2016 14:26:18 +0800 Subject: [PATCH 5/9] rt --- .../tabledata/tabledatapane/ProcedureDataPane.java | 13 ++++++------- designer_base/src/com/fr/env/RemoteEnv.java | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/designer_base/src/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java b/designer_base/src/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java index f3e8dcd5a..6f2ee4da3 100644 --- a/designer_base/src/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java +++ b/designer_base/src/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java @@ -299,7 +299,6 @@ public class ProcedureDataPane extends AbstractTableDataPane imp text = StringUtils.EMPTY; } text = text.trim(); - String[] tableName = text.split("\\."); String connectionname = this.connectionTableProcedurePane.getSelectedDatabaseConnnectonName(); try { String procedureText = FRContext.getCurrentEnv().getProcedureText(this.connectionTableProcedurePane.getSelectedDatabaseConnnectonName(), text); @@ -307,16 +306,16 @@ public class ProcedureDataPane extends AbstractTableDataPane imp // 获取参数默认值，例如：NAME in varchar2 default 'SCOTT'，默认值为SCOTT String parameterDefaultValue = ""; if (StringUtils.isNotEmpty(procedureText)) { - int index_begin = procedureText.indexOf("BEGIN"); - - //from sam: 默认值只会在begin之前声明, 不然会把所有的存储过程里带'xx'的都作为默认值 - String defaulValueStr = index_begin == -1 ? procedureText : procedureText.substring(0, index_begin); - String[] strs = defaulValueStr.split("\'"); + int index_begin = procedureText.indexOf("BEGIN"); + + //from sam: 默认值只会在begin之前声明, 不然会把所有的存储过程里带'xx'的都作为默认值 + String defaulValueStr = index_begin == -1 ? procedureText : procedureText.substring(0, index_begin); + String[] strs = defaulValueStr.split("\'"); parameterDefaultValue = strs.length > 1 ? strs[1] : parameterDefaultValue; } StoreProcedureParameter[] newparameters; - newparameters = FRContext.getCurrentEnv().getStoreProcedureDeclarationParameters(connectionname, tableName, parameterDefaultValue); + newparameters = FRContext.getCurrentEnv().getStoreProcedureDeclarationParameters(connectionname, text, parameterDefaultValue); editorPane.populate(newparameters); diff --git a/designer_base/src/com/fr/env/RemoteEnv.java b/designer_base/src/com/fr/env/RemoteEnv.java index e3fefd04e..a0bdc0e13 100644 --- a/designer_base/src/com/fr/env/RemoteEnv.java +++ b/designer_base/src/com/fr/env/RemoteEnv.java @@ -1656,12 +1656,12 @@ public class RemoteEnv implements Env { } @Override - public StoreProcedureParameter[] getStoreProcedureDeclarationParameters(String connectionName, String[] databaseName, String parameterDefaultValue) throws Exception { + public StoreProcedureParameter[] getStoreProcedureDeclarationParameters(String connectionName, String databaseName, String parameterDefaultValue) throws Exception { ByteArrayOutputStream out = new ByteArrayOutputStream(); HashMap para = new HashMap(); para.put("op", "fr_remote_design"); para.put("cmd", "design_get_sp_parameters"); - para.put("__name__", StringUtils.join(".", databaseName)); + para.put("__name__", databaseName); para.put("__default_value__", parameterDefaultValue); para.put("connectionName", connectionName); From 276a06350e02cf755b15632ad66c94f50e983bf3 Mon Sep 17 00:00:00 2001 From: fanglei <294531121> Date: Wed, 28 Dec 2016 15:44:14 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E5=B1=9E=E6=80=A7->=E5=8F=8C=E5=90=91?= =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/mobile/AppFitPreviewPane.java | 2 ++ .../report/mobile/MobileRadioGroupPane.java | 11 +++++------ .../com/fr/design/images/dialog/appfit/H3.png | Bin 779 -> 1581 bytes .../com/fr/design/images/dialog/appfit/H4.png | Bin 1581 -> 779 bytes .../com/fr/design/images/dialog/appfit/V3.png | Bin 842 -> 1645 bytes .../com/fr/design/images/dialog/appfit/V4.png | Bin 1645 -> 842 bytes 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/designer/src/com/fr/design/report/mobile/AppFitPreviewPane.java b/designer/src/com/fr/design/report/mobile/AppFitPreviewPane.java index 3625e4ba4..bbb44f612 100644 --- a/designer/src/com/fr/design/report/mobile/AppFitPreviewPane.java +++ b/designer/src/com/fr/design/report/mobile/AppFitPreviewPane.java @@ -35,10 +35,12 @@ public class AppFitPreviewPane extends BasicPane{ cachedVerticalPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/V1.png"))); cachedVerticalPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/V2.png"))); cachedVerticalPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/V3.png"))); + cachedVerticalPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/V4.png"))); cachedHorizonPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/H0.png"))); cachedHorizonPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/H1.png"))); cachedHorizonPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/H2.png"))); cachedHorizonPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/H3.png"))); + cachedHorizonPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/H4.png"))); } private void initComponents() { diff --git a/designer/src/com/fr/design/report/mobile/MobileRadioGroupPane.java b/designer/src/com/fr/design/report/mobile/MobileRadioGroupPane.java index 7a8b02012..25571c811 100644 --- a/designer/src/com/fr/design/report/mobile/MobileRadioGroupPane.java +++ b/designer/src/com/fr/design/report/mobile/MobileRadioGroupPane.java @@ -1,11 +1,11 @@ package com.fr.design.report.mobile; +import com.fr.base.mobile.MobileFitAttrState; import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.ibutton.UIRadioButton; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.base.mobile.MobileFitAttrState; import com.fr.stable.StringUtils; import javax.swing.*; @@ -28,23 +28,22 @@ public class MobileRadioGroupPane extends BasicBeanPane{ private void initComponents(String title) { double p = TableLayout.PREFERRED; double[] rowSize = {p}; - double[] columnSize = {p, p, p, p, p}; + double[] columnSize = {p, p, p, p, p, p}; UIRadioButton defaultRadio = new UIRadioButton(MobileFitAttrState.DEFAULT.description()); defaultRadio.setSelected(true); UIRadioButton horizonRadio = new UIRadioButton(MobileFitAttrState.HORIZONTAL.description()); UIRadioButton verticalRadio = new UIRadioButton(MobileFitAttrState.VERTICAL.description()); -// UIRadioButton bidirectionalRadio = new UIRadioButton(MobileFitAttrState.BIDIRECTIONAL.description()); + UIRadioButton bidirectionalRadio = new UIRadioButton(MobileFitAttrState.BIDIRECTIONAL.description()); UIRadioButton notFitRadio = new UIRadioButton(MobileFitAttrState.NONE.description()); - addToButtonGroup(defaultRadio, horizonRadio, verticalRadio, notFitRadio); + addToButtonGroup(defaultRadio, horizonRadio, verticalRadio, bidirectionalRadio, notFitRadio); Component[][] components = new Component[][]{ - new Component[]{new UILabel(title), defaultRadio, horizonRadio, verticalRadio, notFitRadio} + new Component[]{new UILabel(title), defaultRadio, horizonRadio, verticalRadio, bidirectionalRadio, notFitRadio} }; JPanel fitOpsPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); fitOpsPane.setBorder(BorderFactory.createEmptyBorder(10, 13, 10, 10)); - this.add(fitOpsPane); } diff --git a/designer_base/src/com/fr/design/images/dialog/appfit/H3.png b/designer_base/src/com/fr/design/images/dialog/appfit/H3.png index 16dfca0da437d151dbe329966246ea5f026b255e..4712003bdf4e0111f9bc7763fab0e60a5b937b18 100644 GIT binary patch literal 1581 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 Date: Wed, 28 Dec 2016 15:52:36 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E6=96=87=E4=BB=B6=E5=86=B2=E7=AA=81=E4=B9=8B=E5=90=8E?= =?UTF-8?q?=E2=80=9Capp=E2=80=9D=E5=BF=98=E8=AE=B0=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/locale/designer_ko_KR.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 644cdf8f9..42c24b7df 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 @@ -100,7 +100,7 @@ FR-Designer_FS_Close_Other_Templates=\uAE30\uD0C0\uD15C\uD50C\uB9BF\uB2EB\uAE30 FR-Designer_File=\uD30C\uC77C FR-Designer_Filter_Conditions=\uD544\uD130\uC870\uAC74 FR-Designer_Finish-Modify-Share=\uC218\uC815\uC644\uB8CC\uBC0F\uACF5\uC720 -FR-Designer_Fit=App\uC790\uAE30\uC801\uC751 +FR-Designer_Fit=\uC790\uAE30\uC801\uC751 FR-Designer_Font-Family=\uAE00\uAF34\uBA85\uCE6D FR-Designer_Font-Size=\uAE00\uAF34\uD06C\uAE30 FR-Designer_Forbid_Drag_into_Adapt_Pane=\uD574\uB2F9\uAC1D\uCCB4\uB294\uD3FC\uD14C\uC774\uBE14\uBC14\uB514\uB4DC\uB798\uADF8\uB97C\uD5C8\uC6A9\uD558\uC9C0\uC54A\uC2B5\uB2C8\uB2E4. From 84518414e4d9d379cb2d3969b8779de662ed5411 Mon Sep 17 00:00:00 2001 From: fanglei <294531121> Date: Wed, 28 Dec 2016 17:28:28 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E5=B1=9E=E6=80=A7->=E8=87=AA=E9=80=82=E5=BA=94->?= =?UTF-8?q?=E5=8F=8C=E5=90=91=E8=87=AA=E9=80=82=E5=BA=94=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=92=8C=E4=B8=8D=E8=87=AA=E9=80=82=E5=BA=94=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/report/mobile/MobileRadioGroupPane.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer/src/com/fr/design/report/mobile/MobileRadioGroupPane.java b/designer/src/com/fr/design/report/mobile/MobileRadioGroupPane.java index 25571c811..f03b72626 100644 --- a/designer/src/com/fr/design/report/mobile/MobileRadioGroupPane.java +++ b/designer/src/com/fr/design/report/mobile/MobileRadioGroupPane.java @@ -37,10 +37,10 @@ public class MobileRadioGroupPane extends BasicBeanPane{ UIRadioButton bidirectionalRadio = new UIRadioButton(MobileFitAttrState.BIDIRECTIONAL.description()); UIRadioButton notFitRadio = new UIRadioButton(MobileFitAttrState.NONE.description()); - addToButtonGroup(defaultRadio, horizonRadio, verticalRadio, bidirectionalRadio, notFitRadio); + addToButtonGroup(defaultRadio, horizonRadio, verticalRadio, notFitRadio, bidirectionalRadio); Component[][] components = new Component[][]{ - new Component[]{new UILabel(title), defaultRadio, horizonRadio, verticalRadio, bidirectionalRadio, notFitRadio} + new Component[]{new UILabel(title), defaultRadio, horizonRadio, verticalRadio, notFitRadio, bidirectionalRadio} }; JPanel fitOpsPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); fitOpsPane.setBorder(BorderFactory.createEmptyBorder(10, 13, 10, 10)); From 42cb8251b6d809f669cee597004cfa938b0398c3 Mon Sep 17 00:00:00 2001 From: fanglei <294531121> Date: Wed, 28 Dec 2016 17:38:13 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E4=BF=AE=E6=94=B9=E4=BA=86=EF=BC=8C=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E5=9B=BE=E7=89=87=E7=9A=84=E9=A1=BA=E5=BA=8F=E4=B9=9F?= =?UTF-8?q?=E8=A6=81=E7=9B=B8=E5=BA=94=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/images/dialog/appfit/H3.png | Bin 1581 -> 779 bytes .../com/fr/design/images/dialog/appfit/H4.png | Bin 779 -> 1581 bytes .../com/fr/design/images/dialog/appfit/V3.png | Bin 1645 -> 842 bytes .../com/fr/design/images/dialog/appfit/V4.png | Bin 842 -> 1645 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/designer_base/src/com/fr/design/images/dialog/appfit/H3.png b/designer_base/src/com/fr/design/images/dialog/appfit/H3.png index 4712003bdf4e0111f9bc7763fab0e60a5b937b18..16dfca0da437d151dbe329966246ea5f026b255e 100644 GIT binary patch delta 572 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 Tt$Cs>$N&VMu6{1-oD!M