diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml b/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml index 438b84b1..c3950f4e 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml @@ -17,4 +17,12 @@ + + showTemplatesAtStartup + false + + + exportGrid + true + \ No newline at end of file diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java index baf1c725..ef3feb3c 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java @@ -112,7 +112,7 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner { private RulerScrollPane getScrollPane() { if (scrollPane == null) { scrollPane = new RulerScrollPane(getCanvasPanel(), new ProjectDrawingProvider( - plugInPort, true), new Size(1d, SizeUnit.cm).convertToPixels(), new Size(1d, + plugInPort, true, false), new Size(1d, SizeUnit.cm).convertToPixels(), new Size(1d, SizeUnit.in).convertToPixels()); boolean metric = ConfigurationManager.getInstance().readBoolean(Presenter.METRIC_KEY, true); diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/FileMenuPlugin.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/FileMenuPlugin.java index 9ebeeb1c..aacd1d81 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/FileMenuPlugin.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/FileMenuPlugin.java @@ -31,7 +31,7 @@ public class FileMenuPlugin implements IPlugIn { @Override public void connect(IPlugInPort plugInPort) { - this.drawingProvider = new ProjectDrawingProvider(plugInPort, false); + this.drawingProvider = new ProjectDrawingProvider(plugInPort, false, true); this.traceMaskDrawingProvider = new TraceMaskDrawingProvider(plugInPort); ActionFactory actionFactory = ActionFactory.getInstance(); diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/ProjectDrawingProvider.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/ProjectDrawingProvider.java index 6d8cdbd2..6e34eb89 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/ProjectDrawingProvider.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/ProjectDrawingProvider.java @@ -21,11 +21,14 @@ public class ProjectDrawingProvider implements IDrawingProvider { private IPlugInPort plugInPort; private boolean useZoom; + private boolean showGridWhenNeeded; - public ProjectDrawingProvider(IPlugInPort plugInPort, boolean useZoom) { + public ProjectDrawingProvider(IPlugInPort plugInPort, boolean useZoom, + boolean showGridWhenNeeded) { super(); this.plugInPort = plugInPort; this.useZoom = useZoom; + this.showGridWhenNeeded = showGridWhenNeeded; } @Override @@ -34,7 +37,9 @@ public class ProjectDrawingProvider implements IDrawingProvider { if (useZoom) { options.add(DrawOption.ZOOM); } - if (ConfigurationManager.getInstance().readBoolean(IPlugInPort.EXPORT_GRID_KEY, false)) { + if (showGridWhenNeeded + && ConfigurationManager.getInstance().readBoolean(IPlugInPort.EXPORT_GRID_KEY, + false)) { options.add(DrawOption.GRID); } plugInPort.draw((Graphics2D) g, options, null);