From 369bd13951c1f51916cb62fed336c8b2d60d42a4 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Mon, 14 Aug 2017 15:53:46 +0800 Subject: [PATCH 01/14] =?UTF-8?q?alphafine=E9=81=97=E7=95=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/manager/ActionSearchManager.java | 11 +++-------- .../search/manager/DocumentSearchManager.java | 10 +++------- .../alphafine/search/manager/FileSearchManager.java | 10 +++------- .../search/manager/PluginSearchManager.java | 12 ++++-------- 4 files changed, 13 insertions(+), 30 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/ActionSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/ActionSearchManager.java index 3756b03ae..33387ffbc 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/ActionSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/ActionSearchManager.java @@ -74,15 +74,10 @@ public class ActionSearchManager implements AlphaFineSearchProcessor { if (!AlphaFineHelper.getFilterResult().contains(object)) { result.add(object); } - } - if (result.size() < AlphaFineConstants.SHOW_SIZE + 1) { + if (result.size() > 0 && result.size() < AlphaFineConstants.SHOW_SIZE + 1) { lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_Set"))); - if (result.size() == 0) { - lessModelList.add(AlphaFineHelper.NO_RESULT_MODEL); - } else { - lessModelList.addAll(result); - } + lessModelList.addAll(result); } else { lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_Set"), Inter.getLocText("FR-Designer_AlphaFine_ShowAll"), true, CellType.ACTION)); lessModelList.addAll(result.subList(0, AlphaFineConstants.SHOW_SIZE)); @@ -97,4 +92,4 @@ public class ActionSearchManager implements AlphaFineSearchProcessor { public SearchResult getMoreSearchResult() { return moreModelList; } -} +} \ No newline at end of file diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java index ebabc9aa2..cbd1d4988 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java @@ -76,13 +76,9 @@ public class DocumentSearchManager implements AlphaFineSearchProcessor { searchResult.add(cellModel); } } - if (searchResult.size() < AlphaFineConstants.SHOW_SIZE + 1) { + if (searchResult.size() > 0 && searchResult.size() < AlphaFineConstants.SHOW_SIZE + 1) { lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_COMMUNITY_HELP"))); - if (searchResult.size() == 0) { - lessModelList.add(AlphaFineHelper.NO_RESULT_MODEL); - } else { - lessModelList.addAll(searchResult); - } + lessModelList.addAll(searchResult); } else { lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_COMMUNITY_HELP"), Inter.getLocText("FR-Designer_AlphaFine_ShowAll"), true, CellType.DOCUMENT)); lessModelList.addAll(searchResult.subList(0, AlphaFineConstants.SHOW_SIZE)); @@ -114,4 +110,4 @@ public class DocumentSearchManager implements AlphaFineSearchProcessor { return moreModelList; } -} +} \ No newline at end of file diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java index 21f2b5fc4..ac7d4fbdc 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java @@ -100,13 +100,9 @@ public class FileSearchManager implements AlphaFineSearchProcessor { } } - if (result.size() < AlphaFineConstants.SHOW_SIZE + 1) { + if (result.size() > 0 && result.size() < AlphaFineConstants.SHOW_SIZE + 1) { lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_Templates"))); - if (result.size() == 0) { - lessModelList.add(AlphaFineHelper.NO_RESULT_MODEL); - } else { - lessModelList.addAll(result); - } + lessModelList.addAll(result); } else { lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_Templates"), Inter.getLocText("FR-Designer_AlphaFine_ShowAll"), true, CellType.FILE)); lessModelList.addAll(result.subList(0, AlphaFineConstants.SHOW_SIZE)); @@ -248,4 +244,4 @@ public class FileSearchManager implements AlphaFineSearchProcessor { public void setContainFrm(boolean containFrm) { isContainFrm = containFrm; } -} +} \ No newline at end of file diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java index 5855168d7..efcb02c4a 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java @@ -109,13 +109,9 @@ public class PluginSearchManager implements AlphaFineSearchProcessor { searchResult.add(cellModel); } } - if (searchResult.size() < AlphaFineConstants.SHOW_SIZE + 1) { - lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer-Plugin_Addon"))); - if (searchResult.size() == 0) { - lessModelList.add(AlphaFineHelper.NO_RESULT_MODEL); - } else { - lessModelList.addAll(searchResult); - } + if (searchResult.size() > 0 && searchResult.size() < AlphaFineConstants.SHOW_SIZE + 1) { + lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_Templates"))); + lessModelList.addAll(searchResult); } else { lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer-Plugin_Addon"), Inter.getLocText("FR-Designer_AlphaFine_ShowAll"), true, CellType.PLUGIN)); lessModelList.addAll(searchResult.subList(0, AlphaFineConstants.SHOW_SIZE)); @@ -142,4 +138,4 @@ public class PluginSearchManager implements AlphaFineSearchProcessor { public SearchResult getMoreSearchResult() { return this.moreModelList; } -} +} \ No newline at end of file From c0cc67020350244dd97b7f3f3ce3be4d8cbf687c Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Mon, 14 Aug 2017 23:24:17 +0800 Subject: [PATCH 02/14] =?UTF-8?q?alphafine=E4=BA=A4=E4=BA=92=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alphafine/search/manager/ActionSearchManager.java | 3 +++ .../alphafine/search/manager/DocumentSearchManager.java | 3 +++ .../mainframe/alphafine/search/manager/FileSearchManager.java | 3 +++ .../alphafine/search/manager/PluginSearchManager.java | 3 +++ 4 files changed, 12 insertions(+) diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/ActionSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/ActionSearchManager.java index 33387ffbc..14135a2b2 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/ActionSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/ActionSearchManager.java @@ -75,6 +75,9 @@ public class ActionSearchManager implements AlphaFineSearchProcessor { result.add(object); } } + if (result.size() == 0) { + return lessModelList; + } if (result.size() > 0 && result.size() < AlphaFineConstants.SHOW_SIZE + 1) { lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_Set"))); lessModelList.addAll(result); diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java index cbd1d4988..7067dd17c 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java @@ -76,6 +76,9 @@ public class DocumentSearchManager implements AlphaFineSearchProcessor { searchResult.add(cellModel); } } + if (searchResult.size() == 0) { + return lessModelList; + } if (searchResult.size() > 0 && searchResult.size() < AlphaFineConstants.SHOW_SIZE + 1) { lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_COMMUNITY_HELP"))); lessModelList.addAll(searchResult); diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java index ac7d4fbdc..d67d434bd 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java @@ -100,6 +100,9 @@ public class FileSearchManager implements AlphaFineSearchProcessor { } } + if (result.size() == 0) { + return lessModelList; + } if (result.size() > 0 && result.size() < AlphaFineConstants.SHOW_SIZE + 1) { lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_Templates"))); lessModelList.addAll(result); diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java index efcb02c4a..04c5074ef 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java @@ -109,6 +109,9 @@ public class PluginSearchManager implements AlphaFineSearchProcessor { searchResult.add(cellModel); } } + if (searchResult.size() == 0) { + return this.lessModelList; + } if (searchResult.size() > 0 && searchResult.size() < AlphaFineConstants.SHOW_SIZE + 1) { lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_Templates"))); lessModelList.addAll(searchResult); From bc1dead4468b260ff3d01f84709017d7916de689 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Tue, 15 Aug 2017 00:41:18 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E7=A7=BB=E5=8A=A8alphafine=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index 5d0cefed2..17d9d6e36 100644 --- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -379,10 +379,9 @@ public abstract class ToolBarMenuDock { // shortCuts.add(new ForumAction()); } shortCuts.add(SeparatorDef.DEFAULT); - shortCuts.add(new AboutAction()); - shortCuts.add(SeparatorDef.DEFAULT); shortCuts.add(new AlphaFineAction()); - + shortCuts.add(SeparatorDef.DEFAULT); + shortCuts.add(new AboutAction()); return shortCuts.toArray(new ShortCut[shortCuts.size()]); } From 557d719bb3ddcb87e79561548d0b75fd661646ea Mon Sep 17 00:00:00 2001 From: MoMeak Date: Tue, 15 Aug 2017 15:53:37 +0800 Subject: [PATCH 04/14] =?UTF-8?q?REPORT-2897=209.0=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E4=BF=AE=E6=94=B9=20=E5=8D=95=E5=85=83=E6=A0=BC?= =?UTF-8?q?=E5=B1=9E=E6=80=A7-=E5=BD=A2=E6=80=81-=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AD=97=E5=85=B8-=E6=95=B0=E6=8D=AE=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E5=AE=9E=E9=99=85=E5=80=BC=E5=92=8C=E6=98=BE=E7=A4=BA=E5=80=BC?= =?UTF-8?q?=E6=9C=AA=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD=E5=88=97=E5=90=8D?= =?UTF-8?q?=EF=BC=9B=20=E7=BC=A9=E6=94=BE=E5=BF=AB=E6=8D=B7=E9=94=AE?= =?UTF-8?q?=E5=90=91=E4=B8=8B=E6=BB=9A=E8=BD=AE=E6=97=B6=EF=BC=8C=E5=9E=82?= =?UTF-8?q?=E7=9B=B4=E6=BB=9A=E5=8A=A8=E6=9D=A1=E4=B9=9F=E8=B7=9F=E7=9D=80?= =?UTF-8?q?=E6=BB=9A=E5=8A=A8=EF=BC=9B=20=E8=81=9A=E5=90=88=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E7=BC=A9=E6=94=BE=E5=BF=AB=E6=8D=B7=E9=94=AE=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=88=E5=BF=AB=E6=8D=B7=E9=94=AE=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=8C=BA=E5=88=86mac=E5=92=8Cwindows=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/ReportComponentComposite.java | 28 ++------- .../fr/design/mainframe/ReportFloatPane.java | 4 +- .../form/FormReportComponentComposite.java | 24 +------ .../src/com/fr/grid/GridMouseAdapter.java | 8 ++- designer/src/com/fr/poly/PolyDesigner.java | 63 ++++++------------- .../editor/DoubleDeckValueEditorPane.java | 5 ++ .../design/present/dict/DatabaseDictPane.java | 7 +++ .../src/com/fr/design/mainframe/FormArea.java | 25 +------- 8 files changed, 47 insertions(+), 117 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/ReportComponentComposite.java b/designer/src/com/fr/design/mainframe/ReportComponentComposite.java index 7a4f24ea6..0e166904c 100644 --- a/designer/src/com/fr/design/mainframe/ReportComponentComposite.java +++ b/designer/src/com/fr/design/mainframe/ReportComponentComposite.java @@ -2,6 +2,7 @@ package com.fr.design.mainframe; import com.fr.base.FRContext; import com.fr.base.ScreenResolution; +import com.fr.common.inputevent.InputEventBaseOnOS; import com.fr.design.designer.EditingState; import com.fr.design.event.TargetModifiedListener; import com.fr.design.file.HistoryTemplateListPane; @@ -11,6 +12,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.general.Inter; import com.fr.grid.Grid; import com.fr.main.impl.WorkBook; +import com.fr.poly.PolyDesigner; import com.fr.report.report.TemplateReport; import javax.swing.*; @@ -45,9 +47,6 @@ public class ReportComponentComposite extends JComponent { private JSliderPane jSliderContainer; - private boolean isCtrl = false; - - /** * Constructor with workbook.. */ @@ -66,29 +65,10 @@ public class ReportComponentComposite extends JComponent { jSliderContainer.getSelfAdaptButton().addItemListener(selfAdaptButtonItemListener); } - KeyListener showValSpinnerKeyListener = new KeyListener() { - @Override - public void keyTyped(KeyEvent e) { - - } - - @Override - public void keyPressed(KeyEvent e) { - if (e.isControlDown()) { - isCtrl = true; - } - } - - @Override - public void keyReleased(KeyEvent e) { - isCtrl = false; - } - }; - MouseWheelListener showValSpinnerMouseWheelListener = new MouseWheelListener() { @Override public void mouseWheelMoved(MouseWheelEvent e) { - if (isCtrl) { + if (InputEventBaseOnOS.isControlDown(e)) { int dir = e.getWheelRotation(); int old_resolution = (int) jSliderContainer.getShowVal().getValue(); jSliderContainer.getShowVal().setValue(old_resolution - (dir * MIN)); @@ -149,12 +129,12 @@ public class ReportComponentComposite extends JComponent { } if (centerCardPane.editingComponet.elementCasePane == null) { + ((PolyDesigner)centerCardPane.editingComponet).polyArea.addMouseWheelListener(showValSpinnerMouseWheelListener); return; } Grid grid = centerCardPane.editingComponet.elementCasePane.getGrid(); this.centerCardPane.editingComponet.elementCasePane.getGrid().addMouseWheelListener(showValSpinnerMouseWheelListener); - this.centerCardPane.editingComponet.elementCasePane.getGrid().addKeyListener(showValSpinnerKeyListener); if (!grid.hasFocus() && grid.isRequestFocusEnabled()) { grid.requestFocus(); diff --git a/designer/src/com/fr/design/mainframe/ReportFloatPane.java b/designer/src/com/fr/design/mainframe/ReportFloatPane.java index b7fead91a..3a2756a13 100644 --- a/designer/src/com/fr/design/mainframe/ReportFloatPane.java +++ b/designer/src/com/fr/design/mainframe/ReportFloatPane.java @@ -49,7 +49,7 @@ public class ReportFloatPane extends JPanel { JPanel toolBarPane = new JPanel(new BorderLayout()); toolBarPane.add(topToolBar, BorderLayout.CENTER); - toolBarPane.setBorder(BorderFactory.createLineBorder(UIConstants.POP_DIALOG_BORDER)); + toolBarPane.setBorder(BorderFactory.createLineBorder(UIConstants.TITLED_BORDER_COLOR)); toolBarPane.setPreferredSize(new Dimension(155,20)); UILabel emptyLabel = new UILabel(); emptyLabel.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 0)); @@ -62,7 +62,7 @@ public class ReportFloatPane extends JPanel { new Component[]{new UILabel(), new UILabel(Inter.getLocText("FR-Designer_Add_FloatElement")), emptyLabel, toolBarPane}, }; JPanel leftTopPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); - leftTopPane.setBorder(BorderFactory.createEmptyBorder(10, 5, 0, 15)); + leftTopPane.setBorder(BorderFactory.createEmptyBorder(12, 5, 0, 15)); this.add(leftTopPane, BorderLayout.NORTH); } diff --git a/designer/src/com/fr/design/mainframe/form/FormReportComponentComposite.java b/designer/src/com/fr/design/mainframe/form/FormReportComponentComposite.java index f091cbe8a..a79f64af4 100644 --- a/designer/src/com/fr/design/mainframe/form/FormReportComponentComposite.java +++ b/designer/src/com/fr/design/mainframe/form/FormReportComponentComposite.java @@ -2,6 +2,7 @@ package com.fr.design.mainframe.form; import com.fr.base.DynamicUnitList; import com.fr.base.ScreenResolution; +import com.fr.common.inputevent.InputEventBaseOnOS; import com.fr.design.cell.bar.DynamicScrollBar; import com.fr.design.event.TargetModifiedEvent; import com.fr.design.event.TargetModifiedListener; @@ -40,7 +41,6 @@ public class FormReportComponentComposite extends JComponent implements TargetMo private FormTabPane sheetNameTab; private JPanel hbarContainer; private JSliderPane jSliderContainer; - private boolean isCtrl = false; public FormReportComponentComposite(BaseJForm jform, FormElementCaseDesigner elementCaseDesign, FormElementCaseContainerProvider ecContainer) { this.jForm = jform; @@ -52,33 +52,13 @@ public class FormReportComponentComposite extends JComponent implements TargetMo jSliderContainer.getShowVal().addChangeListener(showValSpinnerChangeListener); jSliderContainer.getSelfAdaptButton().addItemListener(selfAdaptButtonItemListener); this.elementCaseDesigner.elementCasePane.getGrid().addMouseWheelListener(showValSpinnerMouseWheelListener); - this.elementCaseDesigner.elementCasePane.getGrid().addKeyListener(showValSpinnerKeyListener); elementCaseDesigner.addTargetModifiedListener(this); } - KeyListener showValSpinnerKeyListener = new KeyListener() { - @Override - public void keyTyped(KeyEvent e) { - - } - - @Override - public void keyPressed(KeyEvent e) { - if (e.isControlDown()) { - isCtrl = true; - } - } - - @Override - public void keyReleased(KeyEvent e) { - isCtrl = false; - } - }; - MouseWheelListener showValSpinnerMouseWheelListener = new MouseWheelListener() { @Override public void mouseWheelMoved(MouseWheelEvent e) { - if (isCtrl) { + if (InputEventBaseOnOS.isControlDown(e)) { int dir = e.getWheelRotation(); int old_resolution = (int) jSliderContainer.getShowVal().getValue(); jSliderContainer.getShowVal().setValue(old_resolution - (dir * MIN)); diff --git a/designer/src/com/fr/grid/GridMouseAdapter.java b/designer/src/com/fr/grid/GridMouseAdapter.java index 147155e43..fc88714ad 100644 --- a/designer/src/com/fr/grid/GridMouseAdapter.java +++ b/designer/src/com/fr/grid/GridMouseAdapter.java @@ -807,9 +807,11 @@ public class GridMouseAdapter implements MouseListener, MouseWheelListener, Mous * @param e */ public void mouseWheelMoved(MouseWheelEvent e) { - ElementCasePane reportPane = grid.getElementCasePane(); - if (reportPane.isHorizontalScrollBarVisible()) { - reportPane.getVerticalScrollBar().setValue(reportPane.getVerticalScrollBar().getValue() + e.getWheelRotation() * 3); + if (!InputEventBaseOnOS.isControlDown(e)) { + ElementCasePane reportPane = grid.getElementCasePane(); + if (reportPane.isHorizontalScrollBarVisible()) { + reportPane.getVerticalScrollBar().setValue(reportPane.getVerticalScrollBar().getValue() + e.getWheelRotation() * 3); + } } } diff --git a/designer/src/com/fr/poly/PolyDesigner.java b/designer/src/com/fr/poly/PolyDesigner.java index aa416fc86..03226fbb7 100644 --- a/designer/src/com/fr/poly/PolyDesigner.java +++ b/designer/src/com/fr/poly/PolyDesigner.java @@ -7,6 +7,7 @@ import com.fr.base.BaseUtils; import com.fr.base.FRContext; import com.fr.base.GraphHelper; import com.fr.base.ScreenResolution; +import com.fr.common.inputevent.InputEventBaseOnOS; import com.fr.design.DesignState; import com.fr.design.DesignerEnvManager; import com.fr.design.actions.edit.CopyAction; @@ -51,10 +52,7 @@ import com.fr.stable.unit.UnitRectangle; import javax.swing.*; import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; -import java.awt.event.MouseEvent; +import java.awt.event.*; import java.util.ArrayList; import java.util.List; @@ -98,7 +96,6 @@ public class PolyDesigner extends ReportComponent i this.chooseTable.populateBean(new DataBaseItems(dbName, dbDict.getSchema(), dbDict.getTableName())); if (this.database == null) { + this.keyColumnPane.updateUpButton(); + this.valueDictPane.updateUpButton(); return; } @@ -187,6 +189,9 @@ public class DatabaseDictPane extends FurtherBasicBeanPane i } dbDict.setKeyColumnIndex(keyColumnIndex); dbDict.setKeyColumnName(keyColumnName); + }else { + this.keyColumnPane.updateUpButton(); + this.valueDictPane.updateUpButton(); } Object value = this.valueDictPane.update(); if (value instanceof Integer) { @@ -265,7 +270,9 @@ public class DatabaseDictPane extends FurtherBasicBeanPane i */ public void reset() { keyColumnPane.clearComponentsData(); + keyColumnPane.setCurrentEditor(0); valueDictPane.clearComponentsData(); + valueDictPane.setCurrentEditor(0); chooseTable.resetComponets(); } diff --git a/designer_form/src/com/fr/design/mainframe/FormArea.java b/designer_form/src/com/fr/design/mainframe/FormArea.java index 12188f2da..e35657c23 100644 --- a/designer_form/src/com/fr/design/mainframe/FormArea.java +++ b/designer_form/src/com/fr/design/mainframe/FormArea.java @@ -1,6 +1,7 @@ package com.fr.design.mainframe; import com.fr.base.ScreenResolution; +import com.fr.common.inputevent.InputEventBaseOnOS; import com.fr.design.designer.beans.events.DesignerEvent; import com.fr.design.designer.creator.XCreator; import com.fr.design.designer.creator.XLayoutContainer; @@ -50,7 +51,6 @@ public class FormArea extends JComponent implements ScrollRulerComponent { private double START_VALUE = DEFAULT_SLIDER; private int resolution = ScreenResolution.getScreenResolution(); private double screenValue; - private boolean isCtrl = false; public FormScrollBar getHorScrollBar() { return horScrollBar; @@ -86,35 +86,14 @@ public class FormArea extends JComponent implements ScrollRulerComponent { } this.setFocusTraversalKeysEnabled(false); this.designer.addMouseWheelListener(showValSpinnerMouseWheelListener); - this.designer.addKeyListener(showValSpinnerKeyListener); this.setOpaque(true); this.setBackground(Color.WHITE); } - - KeyListener showValSpinnerKeyListener = new KeyListener() { - @Override - public void keyTyped(KeyEvent e) { - - } - - @Override - public void keyPressed(KeyEvent e) { - if (e.isControlDown()) { - isCtrl = true; - } - } - - @Override - public void keyReleased(KeyEvent e) { - isCtrl = false; - } - }; - MouseWheelListener showValSpinnerMouseWheelListener = new MouseWheelListener() { @Override public void mouseWheelMoved(MouseWheelEvent e) { - if (isCtrl) { + if (InputEventBaseOnOS.isControlDown(e)) { int dir = e.getWheelRotation(); int old_resolution = (int) slidePane.getShowVal().getValue(); slidePane.getShowVal().setValue(old_resolution - (dir * SHOWVALMIN)); From 07f57f8677ce42b6bdbe2a368ce1c427bc6fb3f5 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Tue, 15 Aug 2017 16:35:22 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/mainframe/ReportComponentComposite.java | 2 +- designer/src/com/fr/poly/PolyDesigner.java | 11 ++++------- .../fr/design/editor/DoubleDeckValueEditorPane.java | 1 + .../com/fr/design/present/dict/DatabaseDictPane.java | 2 -- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/ReportComponentComposite.java b/designer/src/com/fr/design/mainframe/ReportComponentComposite.java index 0e166904c..09b03c183 100644 --- a/designer/src/com/fr/design/mainframe/ReportComponentComposite.java +++ b/designer/src/com/fr/design/mainframe/ReportComponentComposite.java @@ -129,7 +129,7 @@ public class ReportComponentComposite extends JComponent { } if (centerCardPane.editingComponet.elementCasePane == null) { - ((PolyDesigner)centerCardPane.editingComponet).polyArea.addMouseWheelListener(showValSpinnerMouseWheelListener); + centerCardPane.getPolyDezi().polyArea.addMouseWheelListener(showValSpinnerMouseWheelListener); return; } Grid grid = centerCardPane.editingComponet.elementCasePane.getGrid(); diff --git a/designer/src/com/fr/poly/PolyDesigner.java b/designer/src/com/fr/poly/PolyDesigner.java index 03226fbb7..0c700a7bf 100644 --- a/designer/src/com/fr/poly/PolyDesigner.java +++ b/designer/src/com/fr/poly/PolyDesigner.java @@ -140,13 +140,10 @@ public class PolyDesigner extends ReportComponent i */ public void reset() { keyColumnPane.clearComponentsData(); - keyColumnPane.setCurrentEditor(0); valueDictPane.clearComponentsData(); - valueDictPane.setCurrentEditor(0); chooseTable.resetComponets(); } From e37f47eaef1b73f7c2aed714d3988252afd6bc58 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Wed, 16 Aug 2017 09:47:05 +0800 Subject: [PATCH 06/14] =?UTF-8?q?REPORT-3738=20[9.0=E4=B8=80=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E6=A0=B7=E5=BC=8F=E4=B8=AD=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=A0=BC=E9=A2=9C=E8=89=B2=E4=B8=8B=E6=8B=89=E6=A1=86?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/gui/icombobox/UIComboBoxUI.java | 4 ++-- .../design/gui/itextfield/UITextFieldUI.java | 3 ++- .../com/fr/design/style/AbstractSelectBox.java | 18 +++++------------- 3 files changed, 9 insertions(+), 16 deletions(-) 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 63ef53146..071820e03 100644 --- a/designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java +++ b/designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java @@ -57,12 +57,12 @@ public class UIComboBoxUI extends BasicComboBoxUI implements MouseListener { super.paint(g, c); Graphics2D g2d = (Graphics2D) g; g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - Color linecolor = UIConstants.TITLED_BORDER_COLOR; + Color linecolor = UIConstants.POP_DIALOG_BORDER; if (comboBox.isPopupVisible()) { arrowButton.setSelected(true); } else { - linecolor = UIConstants.TITLED_BORDER_COLOR; + linecolor = UIConstants.POP_DIALOG_BORDER; arrowButton.setSelected(false); } g2d.setColor(linecolor); diff --git a/designer_base/src/com/fr/design/gui/itextfield/UITextFieldUI.java b/designer_base/src/com/fr/design/gui/itextfield/UITextFieldUI.java index 5f0eb3e47..54e9597a0 100644 --- a/designer_base/src/com/fr/design/gui/itextfield/UITextFieldUI.java +++ b/designer_base/src/com/fr/design/gui/itextfield/UITextFieldUI.java @@ -67,7 +67,8 @@ public class UITextFieldUI extends BasicTextFieldUI { g2d.setColor(UIConstants.TEXT_FILED_BORDER_SELECTED); g2d.drawRect(0, 0, width - 1, height - 1); } else { - GUIPaintUtils.drawBorder(g2d, 0, 0, width, height, isRound, rectDirection); + g2d.setColor(UIConstants.POP_DIALOG_BORDER); + g2d.drawRect(0, 0, width - 1, height - 1); } } diff --git a/designer_base/src/com/fr/design/style/AbstractSelectBox.java b/designer_base/src/com/fr/design/style/AbstractSelectBox.java index 58d1ec13d..f354c164f 100644 --- a/designer_base/src/com/fr/design/style/AbstractSelectBox.java +++ b/designer_base/src/com/fr/design/style/AbstractSelectBox.java @@ -38,12 +38,10 @@ public abstract class AbstractSelectBox extends AbstractPopBox implements Mou displayComponent.setEmptyBackground(); displayComponent.setBorder(new TriggleLineBorder()); triggleButton = new UIToggleButton(UIConstants.ARROW_DOWN_ICON); - triggleButton.setRoundBorder(true, Constants.LEFT); - triggleButton.setPreferredSize(new Dimension(21, 20)); + triggleButton.setPreferredSize(new Dimension(20, 20)); JPanel displayPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); displayPane.add(displayComponent, BorderLayout.CENTER); - displayComponent.setPreferredSize(new Dimension(preWidth, displayPane.getPreferredSize().height)); displayComponent.addMouseListener(mouseListener); @@ -59,7 +57,6 @@ public abstract class AbstractSelectBox extends AbstractPopBox implements Mou } public void ancestorRemoved(AncestorEvent evt) { - hidePopupMenu(); } public void ancestorMoved(AncestorEvent event) { @@ -74,8 +71,6 @@ public abstract class AbstractSelectBox extends AbstractPopBox implements Mou displayComponent.setEnabled(enabled); triggleButton.setEnabled(enabled); } - - @Override public JPanel initWindowPane(double preWidth) { @@ -88,8 +83,8 @@ public abstract class AbstractSelectBox extends AbstractPopBox implements Mou super.paint(g); Graphics2D g2d = (Graphics2D)g; g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.setColor(UIConstants.LINE_COLOR); - g2d.drawRoundRect(0, 0, this.getWidth() , this.getHeight() - 1, UIConstants.ARC, UIConstants.ARC); + g2d.setColor(UIConstants.POP_DIALOG_BORDER); + g2d.drawRoundRect(0, 0, this.getWidth() - 1 , this.getHeight() - 1, 4, 4); triggleButton.setSelected(isPopupVisible()); } @@ -105,15 +100,12 @@ public abstract class AbstractSelectBox extends AbstractPopBox implements Mou private class TriggleLineBorder extends AbstractBorder { private static final long serialVersionUID = 1065857667981063530L; - protected Insets borderInsets = new Insets(0, 0, 0, 1); + protected Insets borderInsets = new Insets(0, 0, 0, 0); public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) { g.translate(x, y); - g.setColor(UIConstants.LINE_COLOR); - g.drawLine(3, 0, w-2, 0); - g.drawLine(3, h - 1, w-2, h - 1); - g.drawLine(w - 1, 0, w - 1, h); + g.setColor(UIConstants.POP_DIALOG_BORDER); g.translate(-x, -y); } From 8c7e35b81eae46b43266e74f7e9731b8cb7881d2 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Wed, 16 Aug 2017 09:54:49 +0800 Subject: [PATCH 07/14] =?UTF-8?q?REPORT-3738=20[9.0=E4=B8=80=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E6=A0=B7=E5=BC=8F=E4=B8=AD=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=A0=BC=E9=A2=9C=E8=89=B2=E4=B8=8B=E6=8B=89=E6=A1=86?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/gui/itextfield/UITextFieldUI.java | 3 +-- designer_base/src/com/fr/design/utils/gui/GUIPaintUtils.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/designer_base/src/com/fr/design/gui/itextfield/UITextFieldUI.java b/designer_base/src/com/fr/design/gui/itextfield/UITextFieldUI.java index 54e9597a0..5f0eb3e47 100644 --- a/designer_base/src/com/fr/design/gui/itextfield/UITextFieldUI.java +++ b/designer_base/src/com/fr/design/gui/itextfield/UITextFieldUI.java @@ -67,8 +67,7 @@ public class UITextFieldUI extends BasicTextFieldUI { g2d.setColor(UIConstants.TEXT_FILED_BORDER_SELECTED); g2d.drawRect(0, 0, width - 1, height - 1); } else { - g2d.setColor(UIConstants.POP_DIALOG_BORDER); - g2d.drawRect(0, 0, width - 1, height - 1); + GUIPaintUtils.drawBorder(g2d, 0, 0, width, height, isRound, rectDirection); } } diff --git a/designer_base/src/com/fr/design/utils/gui/GUIPaintUtils.java b/designer_base/src/com/fr/design/utils/gui/GUIPaintUtils.java index 434f60d9c..b6f52e199 100644 --- a/designer_base/src/com/fr/design/utils/gui/GUIPaintUtils.java +++ b/designer_base/src/com/fr/design/utils/gui/GUIPaintUtils.java @@ -19,7 +19,7 @@ public class GUIPaintUtils { if (BaseUtils.isAuthorityEditing() && isAuthorityEdited) { g2d.setColor(UIConstants.AUTHORITY_LINE_COLOR); } else { - g2d.setColor(UIConstants.TITLED_BORDER_COLOR); + g2d.setColor(UIConstants.POP_DIALOG_BORDER); } if (isRound) { g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); From 5f4f608c371f26dfea615934041e0c4392ac19c3 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Wed, 16 Aug 2017 13:43:02 +0800 Subject: [PATCH 08/14] =?UTF-8?q?alphafine=E4=BA=A4=E4=BA=92=E9=AA=8C?= =?UTF-8?q?=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alphafine/component/AlphaFineDialog.java | 32 ++++++++++++--- .../mainframe/alphafine/images/no_result.png | Bin 0 -> 4747 bytes .../alphafine/preview/DefaulPane.java | 37 ++++++++++++++++++ .../com/fr/design/locale/designer.properties | 3 +- .../design/locale/designer_en_US.properties | 3 +- .../design/locale/designer_zh_CN.properties | 3 +- .../design/locale/designer_zh_TW.properties | 1 + 7 files changed, 71 insertions(+), 8 deletions(-) create mode 100644 designer/src/com/fr/design/mainframe/alphafine/images/no_result.png create mode 100644 designer/src/com/fr/design/mainframe/alphafine/preview/DefaulPane.java diff --git a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java index 6b1113f35..32de9a078 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java @@ -16,10 +16,7 @@ import com.fr.design.mainframe.alphafine.cell.model.PluginModel; import com.fr.design.mainframe.alphafine.cell.render.ContentCellRender; import com.fr.design.mainframe.alphafine.listener.DocumentAdapter; import com.fr.design.mainframe.alphafine.model.SearchResult; -import com.fr.design.mainframe.alphafine.preview.ActionPreviewPane; -import com.fr.design.mainframe.alphafine.preview.DocumentPreviewPane; -import com.fr.design.mainframe.alphafine.preview.FilePreviewPane; -import com.fr.design.mainframe.alphafine.preview.PluginPreviewPane; +import com.fr.design.mainframe.alphafine.preview.*; import com.fr.design.mainframe.alphafine.search.manager.*; import com.fr.form.main.Form; import com.fr.form.main.FormIO; @@ -75,6 +72,7 @@ public class AlphaFineDialog extends UIDialog { private JPanel searchResultPane; private Point pressedPoint; private UIScrollPane leftSearchResultPane; + private JPanel defaultPane; private JPanel rightSearchResultPane; private AlphaFineList searchResultList; private SearchListModel searchListModel; @@ -344,6 +342,31 @@ public class AlphaFineDialog extends UIDialog { */ private void fireStopLoading() { searchListModel.resetState(); + replaceLeftPane(); + } + + private void refreshContainer() { + validate(); + repaint(); + revalidate(); + } + + /** + * 重置结果面板 + */ + private void replaceLeftPane() { + if (searchListModel.getSize() > 0 && defaultPane != null) { + searchResultPane.remove(defaultPane); + defaultPane = null; + searchResultPane.add(leftSearchResultPane, BorderLayout.WEST); + refreshContainer(); + } else if (searchListModel.getSize() == 0 && defaultPane == null){ + defaultPane = new DefaulPane(); + searchResultPane.remove(leftSearchResultPane); + searchResultPane.add(defaultPane, BorderLayout.WEST); + refreshContainer(); + } + } /** @@ -625,7 +648,6 @@ public class AlphaFineDialog extends UIDialog { */ private void initGlobalListener() { initAWTEventListener(); - initMouseListener(); } /** diff --git a/designer/src/com/fr/design/mainframe/alphafine/images/no_result.png b/designer/src/com/fr/design/mainframe/alphafine/images/no_result.png new file mode 100644 index 0000000000000000000000000000000000000000..cd3d803af0b8f2e5a440e7673fc6b54dd3723d00 GIT binary patch literal 4747 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 Date: Wed, 16 Aug 2017 15:36:00 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=97=A0=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E6=98=BE=E7=A4=BA=E7=9A=84=E9=9D=A2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alphafine/component/AlphaFineDialog.java | 24 ++++++------ .../alphafine/preview/ActionPreviewPane.java | 37 ------------------- .../alphafine/preview/DefaulPane.java | 37 ------------------- .../alphafine/preview/NoResultPane.java | 31 ++++++++++++++++ 4 files changed, 42 insertions(+), 87 deletions(-) delete mode 100644 designer/src/com/fr/design/mainframe/alphafine/preview/ActionPreviewPane.java delete mode 100644 designer/src/com/fr/design/mainframe/alphafine/preview/DefaulPane.java create mode 100644 designer/src/com/fr/design/mainframe/alphafine/preview/NoResultPane.java diff --git a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java index 32de9a078..8fb2118d9 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java @@ -22,6 +22,7 @@ import com.fr.form.main.Form; import com.fr.form.main.FormIO; import com.fr.general.ComparatorUtils; import com.fr.general.FRLogger; +import com.fr.general.IOUtils; import com.fr.general.Inter; import com.fr.general.http.HttpClient; import com.fr.io.TemplateWorkBookIO; @@ -297,15 +298,10 @@ public class AlphaFineDialog extends UIDialog { leftSearchResultPane.setPreferredSize(new Dimension(AlphaFineConstants.LEFT_WIDTH, AlphaFineConstants.CONTENT_HEIGHT)); rightSearchResultPane = new JPanel(); rightSearchResultPane.setBackground(Color.WHITE); - UILabel splitLine = new UILabel(); - splitLine.setBackground(AlphaFineConstants.GRAY); - splitLine.setPreferredSize(new Dimension(1, AlphaFineConstants.CONTENT_HEIGHT)); rightSearchResultPane.setPreferredSize(new Dimension(AlphaFineConstants.RIGHT_WIDTH - 1, AlphaFineConstants.CONTENT_HEIGHT)); searchResultPane.add(leftSearchResultPane, BorderLayout.WEST); - searchResultPane.add(splitLine, BorderLayout.CENTER); searchResultPane.add(rightSearchResultPane, BorderLayout.EAST); UILabel splitLabel = new UILabel(); - splitLabel.setBackground(AlphaFineConstants.GRAY); splitLabel.setPreferredSize(new Dimension(AlphaFineConstants.HEIGHT, 1)); searchResultPane.add(splitLabel, BorderLayout.NORTH); add(searchResultPane, BorderLayout.SOUTH); @@ -345,6 +341,9 @@ public class AlphaFineDialog extends UIDialog { replaceLeftPane(); } + /** + * 刷新容器 + */ private void refreshContainer() { validate(); repaint(); @@ -355,18 +354,17 @@ public class AlphaFineDialog extends UIDialog { * 重置结果面板 */ private void replaceLeftPane() { - if (searchListModel.getSize() > 0 && defaultPane != null) { + if (searchListModel.getSize() == 0 && defaultPane == null) { + defaultPane = new NoResultPane(Inter.getLocText("FR-Designer-AlphaFine_NO_Result"), IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/no_result.png")); + searchResultPane.remove(leftSearchResultPane); + searchResultPane.add(defaultPane, BorderLayout.WEST); + refreshContainer(); + } else if (searchListModel.getSize() > 0 && defaultPane != null) { searchResultPane.remove(defaultPane); defaultPane = null; searchResultPane.add(leftSearchResultPane, BorderLayout.WEST); refreshContainer(); - } else if (searchListModel.getSize() == 0 && defaultPane == null){ - defaultPane = new DefaulPane(); - searchResultPane.remove(leftSearchResultPane); - searchResultPane.add(defaultPane, BorderLayout.WEST); - refreshContainer(); } - } /** @@ -557,7 +555,7 @@ public class AlphaFineDialog extends UIDialog { break; case ACTION: rightSearchResultPane.removeAll(); - rightSearchResultPane.add(new ActionPreviewPane()); + rightSearchResultPane.add(new NoResultPane(Inter.getLocText("FR-Designer_NoResult"), IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/noresult.png"))); validate(); repaint(); break; diff --git a/designer/src/com/fr/design/mainframe/alphafine/preview/ActionPreviewPane.java b/designer/src/com/fr/design/mainframe/alphafine/preview/ActionPreviewPane.java deleted file mode 100644 index c7286850f..000000000 --- a/designer/src/com/fr/design/mainframe/alphafine/preview/ActionPreviewPane.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.fr.design.mainframe.alphafine.preview; - - -import com.fr.design.gui.ilable.UILabel; -import com.fr.design.mainframe.alphafine.AlphaFineConstants; -import com.fr.general.IOUtils; -import com.fr.general.Inter; - -import javax.swing.*; -import java.awt.*; - - -/** - * Created by XiaXiang on 2017/5/5. - */ -public class ActionPreviewPane extends JPanel { - private static final Font NAME = new Font("Song_TypeFace", 0, 14); - - public ActionPreviewPane() { - setLayout(new BorderLayout()); - setBackground(null); - setBorder(BorderFactory.createEmptyBorder(135, 0, 0, 0)); - UILabel image = new UILabel(); - image.setPreferredSize(new Dimension(150, 111)); - image.setHorizontalAlignment(SwingConstants.CENTER); - image.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0)); - image.setIcon(IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/noresult.png")); - UILabel description = new UILabel(Inter.getLocText("FR-Designer_NoResult")); - description.setForeground(AlphaFineConstants.MEDIUM_GRAY); - description.setFont(NAME); - description.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0)); - description.setHorizontalAlignment(SwingConstants.CENTER); - this.add(image, BorderLayout.CENTER); - this.add(description, BorderLayout.SOUTH); - } - -} diff --git a/designer/src/com/fr/design/mainframe/alphafine/preview/DefaulPane.java b/designer/src/com/fr/design/mainframe/alphafine/preview/DefaulPane.java deleted file mode 100644 index 88572a002..000000000 --- a/designer/src/com/fr/design/mainframe/alphafine/preview/DefaulPane.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.fr.design.mainframe.alphafine.preview; - -import com.fr.design.gui.ilable.UILabel; -import com.fr.design.mainframe.alphafine.AlphaFineConstants; -import com.fr.general.IOUtils; -import com.fr.general.Inter; - -import javax.swing.*; -import java.awt.*; - -/** - * Created by XiaXiang on 2017/8/14. - */ -public class DefaulPane extends JPanel { - private static final Font NAME = new Font("Song_TypeFace", 0, 14); - public DefaulPane() { - setLayout(new BorderLayout()); - setBackground(Color.WHITE); - setBorder(BorderFactory.createEmptyBorder(135, 80, 135, 80)); - UILabel image = new UILabel(); - image.setPreferredSize(new Dimension(150, 111)); - image.setHorizontalAlignment(SwingConstants.CENTER); - image.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0)); - image.setIcon(IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/no_result.png")); - UILabel description = new UILabel(Inter.getLocText("FR-Designer-AlphaFine_NO_Result")); - description.setForeground(AlphaFineConstants.MEDIUM_GRAY); - description.setFont(NAME); - description.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0)); - description.setHorizontalAlignment(SwingConstants.CENTER); - this.add(image, BorderLayout.CENTER); - this.add(description, BorderLayout.SOUTH); - UILabel splitLine = new UILabel(); - splitLine.setBackground(AlphaFineConstants.GRAY); - splitLine.setPreferredSize(new Dimension(10, AlphaFineConstants.CONTENT_HEIGHT)); - this.add(splitLine, BorderLayout.EAST); - } -} diff --git a/designer/src/com/fr/design/mainframe/alphafine/preview/NoResultPane.java b/designer/src/com/fr/design/mainframe/alphafine/preview/NoResultPane.java new file mode 100644 index 000000000..5ed9004f2 --- /dev/null +++ b/designer/src/com/fr/design/mainframe/alphafine/preview/NoResultPane.java @@ -0,0 +1,31 @@ +package com.fr.design.mainframe.alphafine.preview; + +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.mainframe.alphafine.AlphaFineConstants; + +import javax.swing.*; +import java.awt.*; + +/** + * Created by XiaXiang on 2017/8/14. + */ +public class NoResultPane extends JPanel { + private static final Font MEDIUM_FONT = new Font("Song_TypeFace", 0, 14); + public NoResultPane(String title, Icon icon) { + setLayout(new BorderLayout()); + setBackground(Color.white); + setPreferredSize(new Dimension(AlphaFineConstants.LEFT_WIDTH, AlphaFineConstants.CONTENT_HEIGHT)); + UILabel image = new UILabel(); + image.setPreferredSize(new Dimension(150, 111)); + image.setHorizontalAlignment(SwingConstants.CENTER); + image.setIcon(icon); + image.setBorder(BorderFactory.createEmptyBorder(100,0,0,0)); + UILabel description = new UILabel(title); + description.setForeground(AlphaFineConstants.MEDIUM_GRAY); + description.setFont(MEDIUM_FONT); + description.setBorder(BorderFactory.createEmptyBorder(0, 0, 135, 0)); + description.setHorizontalAlignment(SwingConstants.CENTER); + add(image, BorderLayout.CENTER); + add(description, BorderLayout.SOUTH); + } +} From ef5e7fe3e61ac5e568486913e79f1f95a0425011 Mon Sep 17 00:00:00 2001 From: plough Date: Wed, 16 Aug 2017 15:56:15 +0800 Subject: [PATCH 10/14] =?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=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=BC=B9=E5=87=BA=E5=AD=90=E5=AF=B9=E8=AF=9D=E6=A1=86=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=82=AC=E6=B5=AE=E5=BC=B9=E7=AA=97=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/gui/controlpane/UIControlPane.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java b/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java index 5908f06e1..74c64de32 100644 --- a/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java +++ b/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java @@ -301,6 +301,12 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH return; } } + // 如果有可见模态对话框，则不隐藏 + for (Window window : DesignerContext.getDesignerFrame().getOwnedWindows()) { + if (window instanceof JDialog && window.isVisible() && ((JDialog)window).isModal()) { + return; + } + } saveSettings(); setVisible(false); } From dd38ed8c6e985ecb61912fa591ebb92046572192 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Wed, 16 Aug 2017 16:02:03 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E9=94=AE=E7=9B=98=E9=80=80=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/alphafine/component/AlphaFineDialog.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java index 8fb2118d9..83945d324 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java @@ -358,13 +358,12 @@ public class AlphaFineDialog extends UIDialog { defaultPane = new NoResultPane(Inter.getLocText("FR-Designer-AlphaFine_NO_Result"), IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/no_result.png")); searchResultPane.remove(leftSearchResultPane); searchResultPane.add(defaultPane, BorderLayout.WEST); - refreshContainer(); } else if (searchListModel.getSize() > 0 && defaultPane != null) { searchResultPane.remove(defaultPane); defaultPane = null; searchResultPane.add(leftSearchResultPane, BorderLayout.WEST); - refreshContainer(); } + refreshContainer(); } /** @@ -932,6 +931,8 @@ public class AlphaFineDialog extends UIDialog { if (getSelectedIndex() == 1) { searchTextField.requestFocus(); } + } else if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { + searchTextField.requestFocus(); } } }); From 9a850ab6f9c852897f57244f8ea827d50323f25a Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Wed, 16 Aug 2017 16:19:30 +0800 Subject: [PATCH 12/14] rt --- .../fr/design/mainframe/alphafine/preview/NoResultPane.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/preview/NoResultPane.java b/designer/src/com/fr/design/mainframe/alphafine/preview/NoResultPane.java index 5ed9004f2..67157aee2 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/preview/NoResultPane.java +++ b/designer/src/com/fr/design/mainframe/alphafine/preview/NoResultPane.java @@ -2,6 +2,7 @@ package com.fr.design.mainframe.alphafine.preview; import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.alphafine.AlphaFineConstants; +import com.fr.general.FRFont; import javax.swing.*; import java.awt.*; @@ -10,7 +11,6 @@ import java.awt.*; * Created by XiaXiang on 2017/8/14. */ public class NoResultPane extends JPanel { - private static final Font MEDIUM_FONT = new Font("Song_TypeFace", 0, 14); public NoResultPane(String title, Icon icon) { setLayout(new BorderLayout()); setBackground(Color.white); @@ -22,7 +22,7 @@ public class NoResultPane extends JPanel { image.setBorder(BorderFactory.createEmptyBorder(100,0,0,0)); UILabel description = new UILabel(title); description.setForeground(AlphaFineConstants.MEDIUM_GRAY); - description.setFont(MEDIUM_FONT); + description.setFont(FRFont.getInstance("SimSun", Font.PLAIN, 14)); description.setBorder(BorderFactory.createEmptyBorder(0, 0, 135, 0)); description.setHorizontalAlignment(SwingConstants.CENTER); add(image, BorderLayout.CENTER); From 30024e7fe1b3e6d5029b67091d800f1ca2578e2e Mon Sep 17 00:00:00 2001 From: plough Date: Wed, 16 Aug 2017 16:34:16 +0800 Subject: [PATCH 13/14] =?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=88=87=E6=8D=A2?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=8A=B6=E6=80=81=E6=97=B6=EF=BC=8C=E6=A0=A1?= =?UTF-8?q?=E6=AD=A3tab=E6=8C=89=E9=92=AE=E7=9A=84=E9=80=89=E4=B8=AD?= =?UTF-8?q?=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/EastRegionContainerPane.java | 41 +++++-------------- 1 file changed, 11 insertions(+), 30 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java index b5bf0fc1a..ab2dff8b2 100644 --- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java +++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java @@ -77,7 +77,6 @@ public class EastRegionContainerPane extends UIEastResizableContainer { public static final EastRegionContainerPane getInstance() { if (THIS == null) { THIS = new EastRegionContainerPane(); -// THIS.setLastToolPaneY(DesignerEnvManager.getEnvManager().getLastEastRegionToolPaneY()); THIS.setLastContainerWidth(DesignerEnvManager.getEnvManager().getLastEastRegionContainerWidth()); } return THIS; @@ -85,13 +84,10 @@ public class EastRegionContainerPane extends UIEastResizableContainer { public EastRegionContainerPane() { super(); -// setVerticalDragEnabled(false); initPropertyItemList(); defaultPane = getDefaultPane(Inter.getLocText("FR-Designer_No_Settings_Available")); defaultAuthorityPane = getDefaultPane(Inter.getLocText("FR-Designer_Not_Support_Authority_Edit")); switchMode(PropertyMode.REPORT); -// initContentPane(); -// super(leftPane, rightPane); setContainerWidth(CONTAINER_WIDTH); } @@ -230,8 +226,6 @@ public class EastRegionContainerPane extends UIEastResizableContainer { public EastRegionContainerPane(JPanel leftPane, JPanel rightPane) { super(leftPane, rightPane); -// setVerticalDragEnabled(false); -// setContainerWidth(260); } public void replaceUpPane(JComponent pane) { @@ -377,29 +371,23 @@ public class EastRegionContainerPane extends UIEastResizableContainer { hasEnabledTab = true; if (!propertyItem.isPoppedOut()) { propertyCard.show(rightPane, name); // 显示第一个可用tab + propertyItem.setTabButtonSelected(); hasAvailableTab = true; break; } } } if (!hasAvailableTab) { + resetPropertyIcons(); if (!hasEnabledTab && BaseUtils.isAuthorityEditing()) { propertyCard.show(rightPane, DEFAULT_AUTHORITY_PANE); } else { propertyCard.show(rightPane, DEFAULT_PANE); } } - -// if (this.getRightPane() instanceof DockingView) { -// ((DockingView) this.getRightPane()).refreshDockingView(); -// } } public void refreshDownPane() { -// JComponent pane = propertyItemList.get(1).getContentPane(); -// if (pane instanceof DockingView) { -// ((DockingView) pane).refreshDockingView(); -// } } private void refreshContainer() { @@ -460,7 +448,6 @@ public class EastRegionContainerPane extends UIEastResizableContainer { this.btnIconName = btnIconName; initButton(); initPropertyPanel(); -// this.visibleModes = new ArrayList(visibleModes); initModes(visibleModes, enableModes); } @@ -576,11 +563,6 @@ public class EastRegionContainerPane extends UIEastResizableContainer { } } -// private void refreshContainer() { -// propertyPanel.validate(); -// propertyPanel.repaint(); -// propertyPanel.revalidate(); -// } private String getBtnIconUrl() { return ICON_BASE_DIR + btnIconName + iconSuffix; } @@ -594,6 +576,14 @@ public class EastRegionContainerPane extends UIEastResizableContainer { } } + public void setTabButtonSelected() { + resetPropertyIcons(); + iconSuffix = ICON_SUFFIX_SELECTED; + button.setIcon(BaseUtils.readIcon(getBtnIconUrl())); + button.setBackground(selectedBtnBackground); + button.setOpaque(true); + } + private void initButton() { button = new UIButton(BaseUtils.readIcon(getBtnIconUrl())) { public Dimension getPreferredSize() { @@ -614,11 +604,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { } else { popupFixedPane(); } - resetPropertyIcons(); - iconSuffix = ICON_SUFFIX_SELECTED; - button.setIcon(BaseUtils.readIcon(getBtnIconUrl())); - button.setBackground(selectedBtnBackground); - button.setOpaque(true); + setTabButtonSelected(); } }); } @@ -655,7 +641,6 @@ public class EastRegionContainerPane extends UIEastResizableContainer { // 弹出对话框 public void popupDialog() { -// setIsPoppedOut(true); if (isPoppedOut) { return; } @@ -667,15 +652,12 @@ public class EastRegionContainerPane extends UIEastResizableContainer { popupDialog.adjustLocation(); popupDialog.setVisible(true); } -// initContentPane(); -// refreshContainer(); removeItem(this); } public void popToFrame() { if (isPoppedOut) { isPoppedOut = false; -// popupDialog.dispose(); popupDialog.setVisible(false); initContentPane(); onResize(); @@ -892,7 +874,6 @@ public class EastRegionContainerPane extends UIEastResizableContainer { container.add(popupToolPane, BorderLayout.NORTH); container.add(contentPane, BorderLayout.CENTER); setSize(CONTENT_WIDTH, POPUP_DEFAULT_HEIGHT); -// validate(); adjustLocation(); initListener(); From b2f2ed3704f2f4f534089b93cef03fdc96c7e13f Mon Sep 17 00:00:00 2001 From: MoMeak Date: Wed, 16 Aug 2017 16:58:57 +0800 Subject: [PATCH 14/14] =?UTF-8?q?REPORT-2897=209.0=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E4=BF=AE=E6=94=B9=20=E7=BC=A9=E6=94=BE=E6=97=B6?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E7=BC=A9=E6=94=BE=E8=A1=8C=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/ReportFloatPane.java | 2 +- designer/src/com/fr/grid/GridColumn.java | 4 ++-- designer/src/com/fr/grid/GridColumnUI.java | 15 +++++++++------ designer/src/com/fr/grid/GridCorner.java | 13 +++++++------ designer/src/com/fr/grid/GridRow.java | 4 ++-- designer/src/com/fr/grid/GridRowUI.java | 11 +++++++---- 6 files changed, 28 insertions(+), 21 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/ReportFloatPane.java b/designer/src/com/fr/design/mainframe/ReportFloatPane.java index 3a2756a13..9f579f4f9 100644 --- a/designer/src/com/fr/design/mainframe/ReportFloatPane.java +++ b/designer/src/com/fr/design/mainframe/ReportFloatPane.java @@ -49,7 +49,7 @@ public class ReportFloatPane extends JPanel { JPanel toolBarPane = new JPanel(new BorderLayout()); toolBarPane.add(topToolBar, BorderLayout.CENTER); - toolBarPane.setBorder(BorderFactory.createLineBorder(UIConstants.TITLED_BORDER_COLOR)); + toolBarPane.setBorder(BorderFactory.createLineBorder(UIConstants.POP_DIALOG_BORDER)); toolBarPane.setPreferredSize(new Dimension(155,20)); UILabel emptyLabel = new UILabel(); emptyLabel.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 0)); diff --git a/designer/src/com/fr/grid/GridColumn.java b/designer/src/com/fr/grid/GridColumn.java index 165a5727a..b6644df91 100644 --- a/designer/src/com/fr/grid/GridColumn.java +++ b/designer/src/com/fr/grid/GridColumn.java @@ -68,11 +68,11 @@ public class GridColumn extends GridHeader { @Override public Dimension getPreferredSize() { ElementCasePane reportPane = this.getElementCasePane(); - + float time = (float)reportPane.getResolution()/ ScreenResolution.getScreenResolution(); if (!reportPane.isColumnHeaderVisible()) { return new Dimension(0, 0); } - return new Dimension(super.getPreferredSize().width, GraphHelper.getFontMetrics(this.getFont()).getHeight() + SIZE_ADJUST); + return new Dimension(super.getPreferredSize().width, (int) (GraphHelper.getFontMetrics(this.getFont()).getHeight() * time + SIZE_ADJUST)); } } \ No newline at end of file diff --git a/designer/src/com/fr/grid/GridColumnUI.java b/designer/src/com/fr/grid/GridColumnUI.java index 227de3194..971282168 100644 --- a/designer/src/com/fr/grid/GridColumnUI.java +++ b/designer/src/com/fr/grid/GridColumnUI.java @@ -48,6 +48,9 @@ public class GridColumnUI extends ComponentUI { Grid gird = reportPane.getGrid(); // size Dimension size = gridColumn.getSize(); + float time = (float)resolution/ScreenResolution.getScreenResolution(); + g2d.setFont(gridColumn.getFont().deriveFont(gridColumn.getFont().getSize2D() * time)); + ElementCase elementCase = reportPane.getEditingElementCase(); DynamicUnitList columnWidthList = ReportHelper.getColumnWidthList(elementCase); int horizontalValue = gird.getHorizontalValue(); @@ -77,7 +80,7 @@ public class GridColumnUI extends ComponentUI { g2d.setPaint(gridColumn.getSeparatorLineColor()); GraphHelper.drawLine(g2d, 0, 0, 0, size.getHeight()); double tmpWidth2 = 0; - drawColumn(horizontalBeginValue, horizontalEndValue, columnWidthList, tmpWidth2, reportPane, g2d, gridColumn); + drawColumn(horizontalBeginValue, horizontalEndValue, columnWidthList, tmpWidth2, reportPane, g2d, gridColumn, size); // 画上边的边框线. g2d.setColor(gridColumn.getSeparatorLineColor()); GraphHelper.drawLine(g2d, 0, 0, tmpWidth2, 0); @@ -85,14 +88,13 @@ public class GridColumnUI extends ComponentUI { private void drawColumn(int horizontalBeginValue, int horizontalEndValue, DynamicUnitList columnWidthList, double tmpWidth2, - ElementCasePane reportPane, Graphics2D g2d, GridColumn gridColumn) { + ElementCasePane reportPane, Graphics2D g2d, GridColumn gridColumn, Dimension size) { // draw column. boolean isSelectedBounds; double tmpWidth1 = 0; double tmpIncreaseWidth = 0; ElementCase elementCase = reportPane.getEditingElementCase(); - Dimension size = gridColumn.getSize(); // FontMetrics FontRenderContext fontRenderContext = g2d.getFontRenderContext(); LineMetrics fm = gridColumn.getFont().getLineMetrics("", fontRenderContext); @@ -158,8 +160,9 @@ public class GridColumnUI extends ComponentUI { columnContent += "(FR)"; } } + float time = (float)resolution/ScreenResolution.getScreenResolution(); - double stringWidth = gridColumn.getFont().getStringBounds(columnContent, fontRenderContext).getWidth(); + double stringWidth = gridColumn.getFont().getStringBounds(columnContent, fontRenderContext).getWidth() * time; // if (stringWidth > tmpIncreaseWidth) { // paintMoreContent(i, g2d, tmpWidth1, size, tmpIncreaseWidth, isSelectedBounds, gridColumn, elementCase, columnContent, stringWidth, fmAscent); // } else { @@ -203,8 +206,8 @@ public class GridColumnUI extends ComponentUI { g2d.setPaint(UIManager.getColor("controlShadow")); } } - - GraphHelper.drawString(g2d, columnContent, tmpWidth1 + (tmpIncreaseWidth - stringWidth) / 2, fmAscent + GridHeader.SIZE_ADJUST / 2 + 1); + GraphHelper.drawString(g2d, columnContent, tmpWidth1 + (tmpIncreaseWidth - stringWidth) / 2, + (gridColumn.getSize().height/2 + g2d.getFont().getSize2D()/2)); } diff --git a/designer/src/com/fr/grid/GridCorner.java b/designer/src/com/fr/grid/GridCorner.java index a3f79b933..91891fd44 100644 --- a/designer/src/com/fr/grid/GridCorner.java +++ b/designer/src/com/fr/grid/GridCorner.java @@ -12,6 +12,7 @@ import java.awt.geom.Rectangle2D; import javax.swing.event.MouseInputListener; import com.fr.base.GraphHelper; +import com.fr.base.ScreenResolution; import com.fr.design.mainframe.ElementCasePane; /** @@ -37,7 +38,7 @@ public class GridCorner extends BaseGridComponent { Graphics2D g2d = (Graphics2D) g; ElementCasePane reportPane = this.getElementCasePane(); - + float time = (float)reportPane.getResolution()/ ScreenResolution.getScreenResolution(); //size Dimension size = this.getSize(); Rectangle2D rect2D = new Rectangle2D.Double(0, 0, size.getWidth(), size.getHeight()); @@ -50,7 +51,7 @@ public class GridCorner extends BaseGridComponent { GraphHelper.fill(g2d, rect2D); } - paintArc(g2d, size); + paintArc(g2d, size, time); //画左边的边框线. g2d.setColor(reportPane.getGridColumn().getSeparatorLineColor()); @@ -85,15 +86,15 @@ public class GridCorner extends BaseGridComponent { } - private void paintArc(Graphics2D g2d, Dimension size) { + private void paintArc(Graphics2D g2d, Dimension size, float time) { g2d.setColor(Color.gray); - int width = size.width - 16; + int width = (int) (size.width - (16 * time)); int avgWidth = width / 3; - int height = size.height - 8; + int height = (int) (size.height - (8 * time)); int avgHeight = height / 3; for (int i = 0; i < 3; i ++) { for (int j = 0; j < 3; j ++) { - GraphHelper.fillArc(g2d, 8 + i * avgWidth, 4 + j * avgHeight, 3, 3, 0, 360); + GraphHelper.fillArc(g2d, (8 * time) + (i * avgWidth), (4 * time) + (j * avgHeight), 3, 3, 0, 360); } } } diff --git a/designer/src/com/fr/grid/GridRow.java b/designer/src/com/fr/grid/GridRow.java index c80d08a4e..70679b91b 100644 --- a/designer/src/com/fr/grid/GridRow.java +++ b/designer/src/com/fr/grid/GridRow.java @@ -65,13 +65,13 @@ public class GridRow extends GridHeader { @Override public Dimension getPreferredSize() { ElementCasePane reportPane = this.getElementCasePane(); - + float time = (float)reportPane.getResolution()/ ScreenResolution.getScreenResolution(); if (!(reportPane.isRowHeaderVisible())) { return new Dimension(0, 0); } int maxCharNumber = this.caculateMaxCharNumber(reportPane); - return new Dimension(maxCharNumber * GraphHelper.getFontMetrics(this.getFont()).charWidth('M'), super.getPreferredSize().height); + return new Dimension((int) (maxCharNumber * GraphHelper.getFontMetrics(this.getFont()).charWidth('M') * time), super.getPreferredSize().height); } /** diff --git a/designer/src/com/fr/grid/GridRowUI.java b/designer/src/com/fr/grid/GridRowUI.java index 4c0694a21..016cfe637 100644 --- a/designer/src/com/fr/grid/GridRowUI.java +++ b/designer/src/com/fr/grid/GridRowUI.java @@ -46,6 +46,9 @@ public class GridRowUI extends ComponentUI { ElementCasePane reportPane = gridRow.getElementCasePane(); // size Dimension size = gridRow.getSize(); + float time = (float)resolution/ScreenResolution.getScreenResolution(); + g2d.setFont(gridRow.getFont().deriveFont(gridRow.getFont().getSize2D() * time)); + ElementCase elementCase = reportPane.getEditingElementCase(); DynamicUnitList rowHeightList = ReportHelper.getRowHeightList(elementCase); int verticalValue = reportPane.getGrid().getVerticalValue(); @@ -152,10 +155,10 @@ public class GridRowUI extends ComponentUI { , ElementCase elementCase, Dimension size, double tmpHeight1) { // FontMetrics FontRenderContext fontRenderContext = g2d.getFontRenderContext(); - - float fmAscent = GraphHelper.getFontMetrics(gridRow.getFont()).getAscent(); - double stringWidth = gridRow.getFont().getStringBounds(paintText, fontRenderContext).getWidth(); - double stringHeight = gridRow.getFont().getStringBounds(paintText, fontRenderContext).getHeight(); + float time = (float)resolution/ScreenResolution.getScreenResolution(); + float fmAscent = GraphHelper.getFontMetrics(gridRow.getFont()).getAscent() * time; + double stringWidth = gridRow.getFont().getStringBounds(paintText, fontRenderContext).getWidth() * time; + double stringHeight = gridRow.getFont().getStringBounds(paintText, fontRenderContext).getHeight() * time; if (isSelectedBounds) { g2d.setColor(gridRow.getSelectedForeground()); } else {