From 26fe7472860806acb947b328635a33ce7eecb07a Mon Sep 17 00:00:00 2001 From: plough Date: Mon, 21 Aug 2017 11:22:13 +0800 Subject: [PATCH 01/15] =?UTF-8?q?REPORT-3894=20[9.0=E4=B8=80=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E9=A2=9C=E8=89=B2=E5=AF=B9=E8=AF=9D?= =?UTF-8?q?=E6=A1=86=E5=90=8D=E7=A7=B0=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/locale/designer.properties | 3 ++- .../src/com/fr/design/locale/designer_en_US.properties | 3 ++- .../src/com/fr/design/locale/designer_ja_JP.properties | 1 + .../src/com/fr/design/locale/designer_ko_KR.properties | 3 ++- .../src/com/fr/design/locale/designer_zh_CN.properties | 3 ++- .../src/com/fr/design/locale/designer_zh_TW.properties | 1 + .../src/com/fr/design/style/color/ColorSelectDetailPane.java | 2 +- .../src/com/fr/design/style/color/ColorSelectDialog.java | 3 ++- 8 files changed, 13 insertions(+), 6 deletions(-) diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties index 34857cbec..d4aa147fa 100644 --- a/designer_base/src/com/fr/design/locale/designer.properties +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -2126,4 +2126,5 @@ FS-Designer_DS_Filter_Even_Tip=Even_Tip FS-Designer_DS_Filter_Specify_Tip=Specify_Tip FR-Designer_Mobile-Height-Percent=Max Percent FR-Designer_Mobile-Height-Limit=Height Limit -FR-Designer-AlphaFine_NO_Result=no search result \ No newline at end of file +FR-Designer-AlphaFine_NO_Result=no search result +FR-Designer_Select_Color=Select Color \ No newline at end of file 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 e92cb1119..b91d1d5b8 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 @@ -2122,4 +2122,5 @@ FR-Designer_Barcode_Size=Barcode_Size FS-Designer_DS_Filter_Odd_Tip=Odd_Tip FS-Designer_DS_Filter_Even_Tip=Even_Tip FS-Designer_DS_Filter_Specify_Tip=Specify_Tip -FR-Designer-AlphaFine_NO_Result=no search result \ No newline at end of file +FR-Designer-AlphaFine_NO_Result=no search result +FR-Designer_Select_Color=Select Color \ No newline at end of file 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 a6a3a7aa3..9a7fce54d 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 @@ -2121,3 +2121,4 @@ FS-Designer_DS_Filter_Even_Tip= FS-Designer_DS_Filter_Specify_Tip= FR-Designer_Mobile-Height-Percent= FR-Designer_Mobile-Height-Limit= +FR-Designer_Select_Color= 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 db819f430..625f2aa42 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 @@ -2121,4 +2121,5 @@ FS-Designer_DS_Filter_Odd_Tip= FS-Designer_DS_Filter_Even_Tip= FS-Designer_DS_Filter_Specify_Tip= FR-Designer_Mobile-Height-Percent= -FR-Designer_Mobile-Height-Limit= \ No newline at end of file +FR-Designer_Mobile-Height-Limit= +FR-Designer_Select_Color= \ No newline at end of file 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 19bfad99a..b8ce55213 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 @@ -2133,4 +2133,5 @@ FR-Designer_Barcode_Size=\u6761\u5F62\u7801\u5927\u5C0F FS-Designer_DS_Filter_Odd_Tip=\u63D0\u793A\uFF1A\u5E8F\u53F7\u4ECE1\u5F00\u59CB\uFF0C\u9009\u62E9\u4E86\u5947\u6570\u96C6(1,3,5...) FS-Designer_DS_Filter_Even_Tip=\u63D0\u793A\uFF1A\u5E8F\u53F7\u4ECE1\u5F00\u59CB\uFF0C\u9009\u62E9\u4E86\u5076\u6570\u96C6(2,4,6...) FS-Designer_DS_Filter_Specify_Tip=\u63D0\u793A\uFF1A\u683C\u5F0F\u4E3A1,2-3,5,8\uFF0C\u5E8F\u53F7\u4ECE1\u5F00\u59CB\uFF0C\u5185\u503C\u53C2\u6570$_count_\u8868\u793A\u603B\u4E2A\u6570 -FR-Designer-AlphaFine_NO_Result=\u65E0\u641C\u7D22\u7ED3\u679C \ No newline at end of file +FR-Designer-AlphaFine_NO_Result=\u65E0\u641C\u7D22\u7ED3\u679C +FR-Designer_Select_Color=\u9009\u62E9\u989C\u8272 \ No newline at end of file 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 4ae23d014..86e2aeb7a 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 @@ -2126,3 +2126,4 @@ FS-Designer_DS_Filter_Even_Tip=\u63D0\u793A\uFF1A\u5E8F\u865F\u5F9E1\u958B\u59CB FS-Designer_DS_Filter_Specify_Tip=\u63D0\u793A\uFF1A\u683C\u5F0F\u70BA1,2-3,5,8\uFF0C\u5E8F\u865F\u5F9E1\u958B\u59CB\uFF0C\u5185\u7F6E\u53C3\u6578$_count_\u8868\u793A\u7E02\u500B\u6578 M-New_FormBook=\u65B0\u589E\u6C7A\u7B56\u5831\u8868 FR-Designer-AlphaFine_NO_Result=\u7121\u641C\u7D22\u7D50\u679C +FR-Designer_Select_Color= diff --git a/designer_base/src/com/fr/design/style/color/ColorSelectDetailPane.java b/designer_base/src/com/fr/design/style/color/ColorSelectDetailPane.java index d2f4028f8..58671be0a 100644 --- a/designer_base/src/com/fr/design/style/color/ColorSelectDetailPane.java +++ b/designer_base/src/com/fr/design/style/color/ColorSelectDetailPane.java @@ -56,7 +56,7 @@ public class ColorSelectDetailPane extends BasicPane { @Override protected String title4PopupWindow() { - return null; + return Inter.getLocText("FR-Designer_Select_Color"); } protected void initComponents() { diff --git a/designer_base/src/com/fr/design/style/color/ColorSelectDialog.java b/designer_base/src/com/fr/design/style/color/ColorSelectDialog.java index 11a243b6c..3d986fa71 100644 --- a/designer_base/src/com/fr/design/style/color/ColorSelectDialog.java +++ b/designer_base/src/com/fr/design/style/color/ColorSelectDialog.java @@ -112,7 +112,8 @@ public class ColorSelectDialog extends MiddleChartDialog{ doCancel(); } }); - + + this.setTitle(pane.title4PopupWindow()); GUICoreUtils.setWindowCenter(getOwner(), this); } From 1cf98eee4ef22e5742be5915b7097467727fd234 Mon Sep 17 00:00:00 2001 From: plough Date: Mon, 21 Aug 2017 14:51:32 +0800 Subject: [PATCH 02/15] =?UTF-8?q?REPORT-3736=20[9.0=E4=B8=80=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E8=AE=BE=E8=AE=A1=E5=99=A8=E8=AF=AD?= =?UTF-8?q?=E8=A8=80=E8=AE=BE=E7=BD=AE=E7=AE=80=E4=BD=93=E4=B8=AD=E6=96=87?= =?UTF-8?q?=E5=90=8E=E6=8B=AC=E5=8F=B7=E5=86=85=E5=AE=B9=E6=9C=AA=E7=BF=BB?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/actions/file/PreferencePane.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/designer_base/src/com/fr/design/actions/file/PreferencePane.java b/designer_base/src/com/fr/design/actions/file/PreferencePane.java index bae141452..51b8c374a 100644 --- a/designer_base/src/com/fr/design/actions/file/PreferencePane.java +++ b/designer_base/src/com/fr/design/actions/file/PreferencePane.java @@ -75,13 +75,6 @@ public class PreferencePane extends BasicPane { private static final FRLevel[] LOG = {FRLevel.SEVERE, FRLevel.WARNING, FRLevel.INFO, FRLevel.DEBUG}; private static java.util.List LANGUAGE = new ArrayList<>(); - static { - Map map = Inter.getSupportLocaleMap(); - LANGUAGE.add(Inter.getLocText("FR-Designer_Language_Default")); - for(Locale locale : map.keySet()){ - LANGUAGE.add(getLocaledLanguage(map.get(locale), locale)); - } - }; private static int designerEnvLanguageIndex; // 打开设置对话框时，设计器使用的语言 private boolean languageChanged; // 是否修改了设计器语言设置 @@ -116,6 +109,17 @@ public class PreferencePane extends BasicPane { public PreferencePane() { this.initComponents(); + this.initLanguageItems(); + } + + // 语言选项 + private void initLanguageItems() { + LANGUAGE.clear(); + Map map = Inter.getSupportLocaleMap(); + LANGUAGE.add(Inter.getLocText("FR-Designer_Language_Default")); + for(Locale locale : map.keySet()){ + LANGUAGE.add(getLocaledLanguage(map.get(locale), locale)); + } } protected void initComponents() { From 564109f5e320f74b353cb6a96a4bcd521f222a77 Mon Sep 17 00:00:00 2001 From: plough Date: Mon, 21 Aug 2017 17:19:30 +0800 Subject: [PATCH 03/15] =?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>=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=3D=E3=80=8B=E7=BB=A7=E6=89=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/mainframe/EastRegionContainerPane.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java index 3aec09d45..a8daa2dc2 100644 --- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java +++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java @@ -53,6 +53,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { private JPanel defaultPane; // "无可用配置项"面板 private JPanel defaultAuthorityPane; // "该元素不支持权限编辑" + private PropertyItem selectedItem; // 当前被选中的属性配置项 public enum PropertyMode { REPORT, // 报表 @@ -374,6 +375,13 @@ public class EastRegionContainerPane extends UIEastResizableContainer { * 刷新右面板 */ public void refreshRightPane() { + // 可继承，就继承 + if (selectedItem != null && selectedItem.isVisible() && selectedItem.isEnabled() && !selectedItem.isPoppedOut()) { + propertyCard.show(rightPane, selectedItem.getName()); + return; + } + + // 不可继承时，选中第一个可用 tab boolean hasAvailableTab = false; boolean hasEnabledTab = false; for (String name : propertyItemMap.keySet()) { @@ -388,6 +396,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { } } } + // 无可用 tab 时，显示提示文字 if (!hasAvailableTab) { resetPropertyIcons(); if (!hasEnabledTab && BaseUtils.isAuthorityEditing()) { @@ -593,6 +602,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { button.setIcon(BaseUtils.readIcon(getBtnIconUrl())); button.setBackground(selectedBtnBackground); button.setOpaque(true); + selectedItem = this; } private void initButton() { From d624d79e52c31ddbeac65f05888a3facfc7038b9 Mon Sep 17 00:00:00 2001 From: plough Date: Mon, 21 Aug 2017 19:27:48 +0800 Subject: [PATCH 04/15] =?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>=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=3D=E3=80=8B=E5=B1=9E=E6=80=A7=E6=A0=8F?= =?UTF-8?q?=E6=94=B6=E8=B5=B7=EF=BC=8C=E6=B2=A1=E6=9C=89tab=E6=98=AF?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/EastRegionContainerPane.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java index a8daa2dc2..a45b5db0f 100644 --- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java +++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java @@ -220,6 +220,11 @@ public class EastRegionContainerPane extends UIEastResizableContainer { @Override public void onResize() { + if (!isRightPaneVisible()) { + resetPropertyIcons(); + } else { + refreshRightPane(); + } for (PropertyItem item : propertyItemMap.values()) { item.onResize(); } @@ -377,6 +382,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { public void refreshRightPane() { // 可继承，就继承 if (selectedItem != null && selectedItem.isVisible() && selectedItem.isEnabled() && !selectedItem.isPoppedOut()) { + selectedItem.setTabButtonSelected(); propertyCard.show(rightPane, selectedItem.getName()); return; } @@ -426,6 +432,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { } } + private void resetPropertyIcons() { for (PropertyItem item : propertyItemMap.values()) { item.resetButtonIcon(); From f40e85f646442dbf3cfe8a017477e6849fdc0c5b Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 22 Aug 2017 09:28:18 +0800 Subject: [PATCH 05/15] =?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>=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=3D=E3=80=8B=E5=B1=9E=E6=80=A7=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E5=BC=B9=E5=87=BA=E6=97=B6=EF=BC=8C=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E5=8A=A0=E8=BE=B9=E6=A1=86=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/constants/UIConstants.java | 1 + .../com/fr/design/mainframe/EastRegionContainerPane.java | 9 +++++++-- 2 files changed, 8 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 a96e64c3c..758b3bf79 100644 --- a/designer_base/src/com/fr/design/constants/UIConstants.java +++ b/designer_base/src/com/fr/design/constants/UIConstants.java @@ -104,6 +104,7 @@ public interface UIConstants { 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 Color PROPERTY_DIALOG_BORDER = new Color(0xc9c9cd); public static final BufferedImage DRAG_BAR = BaseUtils.readImage("com/fr/design/images/control/bar.png"); diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java index a45b5db0f..ce4c81b37 100644 --- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java +++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java @@ -899,8 +899,13 @@ public class EastRegionContainerPane extends UIEastResizableContainer { PopupToolPane popupToolPane = new PopupToolPane(propertyItem, PopupToolPane.UP_BUTTON); popupToolPane.setParentDialog(this); contentPane = propertyItem.getContentPane(); - container.add(popupToolPane, BorderLayout.NORTH); - container.add(contentPane, BorderLayout.CENTER); + + JPanel contentWrapper = new JPanel(new BorderLayout()); + contentWrapper.add(popupToolPane, BorderLayout.NORTH); + contentWrapper.add(contentPane, BorderLayout.CENTER); + contentWrapper.setBorder(BorderFactory.createLineBorder(UIConstants.PROPERTY_DIALOG_BORDER)); + + container.add(contentWrapper, BorderLayout.CENTER); setSize(CONTENT_WIDTH, POPUP_DEFAULT_HEIGHT); adjustLocation(); From c096d6be9998d750bb120c916a01e0cb491fd0e0 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 22 Aug 2017 09:46:39 +0800 Subject: [PATCH 06/15] =?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>=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=3D=E3=80=8B=E5=B1=9E=E6=80=A7=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E5=BC=B9=E5=87=BA=E6=97=B6=EF=BC=8C=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E6=9C=89=E4=B8=80=E4=B8=AA=E7=BB=9F=E4=B8=80=E7=9A=84=E5=9B=BA?= =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/EastRegionContainerPane.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java index ce4c81b37..1dfa918f1 100644 --- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java +++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java @@ -914,8 +914,10 @@ public class EastRegionContainerPane extends UIEastResizableContainer { } public void adjustLocation() { - Point btnCoords = propertyItem.getButton().getLocationOnScreen(); - this.setLocation(btnCoords.x - CONTENT_WIDTH, btnCoords.y); + this.setLocation( + getLeftPane().getLocationOnScreen().x - CONTENT_WIDTH, + DesignerContext.getDesignerFrame().getLocationOnScreen().y + 228 + ); } public void replaceContentPane(PropertyItem propertyItem) { From 1bef79d9ab3c0d88b533ac5cb650f14a3bfb021a Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 22 Aug 2017 09:57:53 +0800 Subject: [PATCH 07/15] =?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>=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=3D=E3=80=8B=E9=BC=A0=E6=A0=87=E6=82=AC?= =?UTF-8?q?=E5=81=9C=E6=97=B6=E5=BA=94=E6=97=A0=E9=A2=9C=E8=89=B2=E5=8F=98?= =?UTF-8?q?=E5=8C=96?= 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 deletion(-) diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java index 1dfa918f1..272eaa7b9 100644 --- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java +++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java @@ -780,7 +780,6 @@ public class EastRegionContainerPane extends UIEastResizableContainer { setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); } else if (isMovable) { setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR)); - setBackground(Color.pink); } else { setCursor(Cursor.getDefaultCursor()); } From 9b0444cbba3d7bd92c8e2e785d07c8c3f3c72f17 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 22 Aug 2017 10:58:20 +0800 Subject: [PATCH 08/15] =?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>=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=3D=E3=80=8B=E5=B1=9E=E6=80=A7=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E5=BC=B9=E5=87=BA=E6=97=B6=EF=BC=8C=E5=BA=95=E9=83=A8?= =?UTF-8?q?=E6=9C=89=E4=B8=80=E4=B8=AA=E8=A1=A8=E7=A4=BA=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E7=BC=A9=E6=94=BE=E7=9A=84=E6=8E=A7=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/mainframe/EastRegionContainerPane.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java index 272eaa7b9..a9edafd92 100644 --- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java +++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java @@ -38,7 +38,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { // 弹出对话框高度 private static final int POPUP_MIN_HEIGHT = 145; private static final int POPUP_MAX_HEIGHT = 480; - private static final int POPUP_DEFAULT_HEIGHT = 360; + private static final int POPUP_DEFAULT_HEIGHT = 356; public static final String KEY_CELL_ELEMENT = "cellElement"; public static final String KEY_CELL_ATTR = "cellAttr"; public static final String KEY_FLOAT_ELEMENT = "floatElement"; @@ -883,7 +883,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { private class PopupDialog extends JDialog { private Container container; - private static final int RESIZE_RANGE = 4; + private static final int RESIZE_RANGE = 8; private Cursor originCursor; private Cursor southResizeCursor = Cursor.getPredefinedCursor(Cursor.S_RESIZE_CURSOR); private Point mouseDownCompCoords; @@ -904,8 +904,17 @@ public class EastRegionContainerPane extends UIEastResizableContainer { contentWrapper.add(contentPane, BorderLayout.CENTER); contentWrapper.setBorder(BorderFactory.createLineBorder(UIConstants.PROPERTY_DIALOG_BORDER)); + JPanel horizontalToolPane = new JPanel() { + @Override + public void paint(Graphics g) { + g.drawImage(UIConstants.DRAG_BAR, 0, 0, getWidth(), getHeight(), null); + g.drawImage(UIConstants.DRAG_DOT, (getWidth() - RESIZE_RANGE) / 2, 3, RESIZE_RANGE, 5, null); + } + }; + contentWrapper.add(horizontalToolPane, BorderLayout.SOUTH); + container.add(contentWrapper, BorderLayout.CENTER); - setSize(CONTENT_WIDTH, POPUP_DEFAULT_HEIGHT); + setSize(CONTENT_WIDTH, POPUP_DEFAULT_HEIGHT + RESIZE_RANGE); adjustLocation(); initListener(); From 40832a88d3bef56a377b70f621b745c2a2026d1e Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 22 Aug 2017 11:20:42 +0800 Subject: [PATCH 09/15] =?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>=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=3D=E3=80=8B=E5=BC=B9=E5=87=BA=E7=9A=84?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E9=9D=A2=E6=9D=BF=E8=A2=AB=E5=BC=B9=E5=9B=9E?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=85=B6=E5=AF=B9=E5=BA=94tab=E5=BA=94?= =?UTF-8?q?=E4=B8=BA=E9=80=89=E4=B8=AD=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/mainframe/EastRegionContainerPane.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java index a9edafd92..389ce61ed 100644 --- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java +++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java @@ -689,6 +689,8 @@ public class EastRegionContainerPane extends UIEastResizableContainer { popupDialog.setVisible(false); initContentPane(); onResize(); + propertyCard.show(rightPane, getName()); + setTabButtonSelected(); refreshContainer(); } } From 6d226c2752b20bd24e4dc2f0477b9fc0a549f7e0 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 22 Aug 2017 11:28:23 +0800 Subject: [PATCH 10/15] =?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>=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=3D=E3=80=8B=E4=BF=AE=E5=A4=8D=E4=B8=80?= =?UTF-8?q?=E4=BA=9Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/EastRegionContainerPane.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java index 389ce61ed..1aa525368 100644 --- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java +++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java @@ -689,8 +689,10 @@ public class EastRegionContainerPane extends UIEastResizableContainer { popupDialog.setVisible(false); initContentPane(); onResize(); - propertyCard.show(rightPane, getName()); - setTabButtonSelected(); + if (isEnabled()) { + propertyCard.show(rightPane, getName()); + setTabButtonSelected(); + } refreshContainer(); } } @@ -889,6 +891,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { private Cursor originCursor; private Cursor southResizeCursor = Cursor.getPredefinedCursor(Cursor.S_RESIZE_CURSOR); private Point mouseDownCompCoords; + private JPanel contentWrapper; private JComponent contentPane; private PropertyItem propertyItem; @@ -901,7 +904,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { popupToolPane.setParentDialog(this); contentPane = propertyItem.getContentPane(); - JPanel contentWrapper = new JPanel(new BorderLayout()); + contentWrapper = new JPanel(new BorderLayout()); contentWrapper.add(popupToolPane, BorderLayout.NORTH); contentWrapper.add(contentPane, BorderLayout.CENTER); contentWrapper.setBorder(BorderFactory.createLineBorder(UIConstants.PROPERTY_DIALOG_BORDER)); @@ -933,12 +936,8 @@ public class EastRegionContainerPane extends UIEastResizableContainer { public void replaceContentPane(PropertyItem propertyItem) { this.propertyItem = propertyItem; JComponent contentPane = propertyItem.getContentPane(); - container.remove(this.contentPane); - container.add(this.contentPane = contentPane); -// pack(); - if (getSize().height < container.getPreferredSize().height) { - setSize(CONTENT_WIDTH, container.getPreferredSize().height); - } + contentWrapper.remove(this.contentPane); + contentWrapper.add(this.contentPane = contentPane, BorderLayout.CENTER); refreshContainer(); } From 7e62dea1cf6366390367fb3c77bcc8d916be831a Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 22 Aug 2017 11:42:11 +0800 Subject: [PATCH 11/15] =?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=E5=87=BA?= =?UTF-8?q?=E6=A1=86=E4=B8=8D=E5=8F=AF=E7=94=A8=E6=97=B6=EF=BC=8C=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/EastRegionContainerPane.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java index 1aa525368..595e301f3 100644 --- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java +++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java @@ -13,6 +13,7 @@ import com.fr.general.FRFont; import com.fr.general.Inter; import com.fr.stable.StringUtils; import com.fr.third.fr.pdf.kernel.utils.CompareTool; +import com.sap.conn.jco.JCo; import javax.swing.*; import javax.swing.border.EmptyBorder; @@ -493,6 +494,9 @@ public class EastRegionContainerPane extends UIEastResizableContainer { public void updateStatus() { setEnabled(enableModes.contains(currentMode)); setVisible(visibleModes.contains(currentMode)); + if (!isEnabled() && isPoppedOut()) { + popupDialog.showDefaultPane(); + } } public boolean isVisible() { @@ -894,6 +898,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { private JPanel contentWrapper; private JComponent contentPane; + private JPanel defaultPane; // 无可用配置项 private PropertyItem propertyItem; public PopupDialog(PropertyItem propertyItem) { super(DesignerContext.getDesignerFrame()); @@ -924,6 +929,12 @@ public class EastRegionContainerPane extends UIEastResizableContainer { initListener(); this.setVisible(true); + + defaultPane = getDefaultPane(Inter.getLocText("FR-Designer_No_Settings_Available")); + } + + public void showDefaultPane() { + replaceContentPane(defaultPane); } public void adjustLocation() { @@ -935,7 +946,10 @@ public class EastRegionContainerPane extends UIEastResizableContainer { public void replaceContentPane(PropertyItem propertyItem) { this.propertyItem = propertyItem; - JComponent contentPane = propertyItem.getContentPane(); + replaceContentPane(propertyItem.getContentPane()); + } + + public void replaceContentPane(JComponent contentPane) { contentWrapper.remove(this.contentPane); contentWrapper.add(this.contentPane = contentPane, BorderLayout.CENTER); refreshContainer(); From 543f9ce96fd14b58d4a7978f0fe45953042c102e Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 22 Aug 2017 11:49:08 +0800 Subject: [PATCH 12/15] =?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=8E=A7=E4=BB=B6?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=BA=8B=E4=BB=B6=E7=BC=96=E8=BE=91=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E8=BE=B9=E6=A1=86=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/design/widget/WidgetEventPane.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/designer/src/com/fr/design/widget/WidgetEventPane.java b/designer/src/com/fr/design/widget/WidgetEventPane.java index 3d37770b0..c5a34f5bc 100644 --- a/designer/src/com/fr/design/widget/WidgetEventPane.java +++ b/designer/src/com/fr/design/widget/WidgetEventPane.java @@ -30,11 +30,14 @@ import com.fr.report.elementcase.TemplateElementCase; import com.fr.report.stable.ReportConstants; import com.fr.stable.Nameable; +import javax.swing.*; + public class WidgetEventPane extends ObjectUIControlPane { public WidgetEventPane(ElementCasePane pane) { super(pane); this.setNameListEditable(false); + setBorder(BorderFactory.createEmptyBorder(10, 0, 15, 0)); } @Override From 4c3ed1fcba66e1654cc5b17709225f127dbdb584 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 22 Aug 2017 11:54:06 +0800 Subject: [PATCH 13/15] =?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>=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=3D=E3=80=8B=E7=94=A8=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E7=9A=84=E5=B1=9E=E6=80=A7=E9=9D=A2=E6=9D=BF=E4=B8=8D=E7=BB=A7?= =?UTF-8?q?=E6=89=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/EastRegionContainerPane.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java index 595e301f3..c5f81a9d8 100644 --- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java +++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java @@ -494,8 +494,12 @@ public class EastRegionContainerPane extends UIEastResizableContainer { public void updateStatus() { setEnabled(enableModes.contains(currentMode)); setVisible(visibleModes.contains(currentMode)); - if (!isEnabled() && isPoppedOut()) { - popupDialog.showDefaultPane(); + if (isPoppedOut()) { + if (!isVisible()) { + popToFrame(); + } else if (!isEnabled()) { + popupDialog.showDefaultPane(); + } } } From ee65aee0e25cd8ffdb50b7c75897f84d39abdbf3 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 22 Aug 2017 14:26:12 +0800 Subject: [PATCH 14/15] =?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>=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=3D=E3=80=8B=E7=82=B9=E5=87=BB=E6=8F=92?= =?UTF-8?q?=E5=85=A5=E6=8C=89=E9=92=AE=EF=BC=8C=E5=B8=A6=E6=8C=87=E5=90=91?= =?UTF-8?q?=E7=AE=AD=E5=A4=B4=E7=9A=84=E5=BC=B9=E7=AA=97=E8=A2=AB=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/file/FILEChooserPane.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/designer_base/src/com/fr/file/FILEChooserPane.java b/designer_base/src/com/fr/file/FILEChooserPane.java index 64205f919..29d018398 100644 --- a/designer_base/src/com/fr/file/FILEChooserPane.java +++ b/designer_base/src/com/fr/file/FILEChooserPane.java @@ -1,10 +1,6 @@ package com.fr.file; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.Insets; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; @@ -510,7 +506,7 @@ public class FILEChooserPane extends BasicPane { this.suffix = suffix; - dialog = showWindow(SwingUtilities.getWindowAncestor(parent), false); + dialog = showWindow((Window)parent, false); JPanel contentPane = (JPanel) dialog.getContentPane(); contentPane.setLayout(FRGUIPaneFactory.createM_BorderLayout()); contentPane.add(this, BorderLayout.CENTER); From 8fbebb70ac78955b83f12d4b026a1443b52ff1df Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 22 Aug 2017 14:32:38 +0800 Subject: [PATCH 15/15] =?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>=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=3D=E3=80=8B=E7=BB=9F=E4=B8=80=E6=94=B9?= =?UTF-8?q?=E6=88=90=E2=80=9C=E4=BA=8B=E4=BB=B6=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/design/widget/CellWidgetCardPane.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer/src/com/fr/design/widget/CellWidgetCardPane.java b/designer/src/com/fr/design/widget/CellWidgetCardPane.java index bfae04186..1fbe28b5a 100644 --- a/designer/src/com/fr/design/widget/CellWidgetCardPane.java +++ b/designer/src/com/fr/design/widget/CellWidgetCardPane.java @@ -81,8 +81,8 @@ public class CellWidgetCardPane extends BasicPane { eventTabPane.add(eventPane, BorderLayout.CENTER); //k center.add(attriTabPane, Inter.getLocText("FR-Designer_Attribute")); - center.add(eventTabPane, Inter.getLocText("FR-Designer_Form_Editing_Listeners")); - final String[] tabTitles = new String[]{Inter.getLocText("FR-Designer_Attribute"), Inter.getLocText("FR-Designer_Form_Editing_Listeners")}; + center.add(eventTabPane, Inter.getLocText("FR-Designer_Event")); + final String[] tabTitles = new String[]{Inter.getLocText("FR-Designer_Attribute"), Inter.getLocText("FR-Designer_Event")}; tabsHeaderIconPane = new UIHeadGroup(tabTitles) { @Override