- fixed: Crash when clicking on a text shape while editing another te…

…xt shape https://bugs.launchpad.net/latexdraw/+bug/1362187
latexdraw · Sep 7, 2014 · ee06bfd · ee06bfd
1 parent b77cb87
commit ee06bfd
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/latexdraw-core/net.sf.latexdraw/release_note.txt b/latexdraw-core/net.sf.latexdraw/release_note.txt
@@ -31,4 +31,6 @@ Version 3.2.0
   https://bugs.launchpad.net/latexdraw/+bug/1359810
 - fixed: clicking on an already selected shape, does not unselect all the other selected shapes anymore
 - fixed: Crash when clicking on a text shape while editing another text shape
-  https://bugs.launchpad.net/latexdraw/+bug/1362187
+  https://bugs.launchpad.net/latexdraw/+bug/1362187
+- fixed: After having loaded a drawing, exporting it as a picture does not infer the file name
+  https://bugs.launchpad.net/latexdraw/+bug/1361516
diff --git a/latexdraw-core/net.sf.latexdraw/src/main/net/sf/latexdraw/instruments/Exporter.java b/latexdraw-core/net.sf.latexdraw/src/main/net/sf/latexdraw/instruments/Exporter.java
@@ -1,6 +1,7 @@
 package net.sf.latexdraw.instruments;
 
 import java.awt.event.KeyEvent;
+import java.io.File;
 import java.util.Objects;
 
 import javax.swing.JLabel;
@@ -116,7 +117,7 @@ public class Exporter extends WidgetInstrument {
 
 	/** The field where messages are displayed. */
 	protected JLabel statusBar;
-
+protected FileLoaderSaver loader;
 
 
 	/**
@@ -128,13 +129,14 @@ public class Exporter extends WidgetInstrument {
 	 * @throws IllegalArgumentException If one of the given arguments is null.
 	 * @since 3.0
 	 */
-	public Exporter(final SwingUIComposer<?> composerUI, final ICanvas theCanvas, final JLabel bar, final PSTCodeGenerator gen) {
+	public Exporter(final SwingUIComposer<?> composerUI, final ICanvas theCanvas, final JLabel bar, final PSTCodeGenerator gen, final FileLoaderSaver fls) {
 		super(composerUI);
 
 		defaultPackages	= ""; //$NON-NLS-1$
 		statusBar		= Objects.requireNonNull(bar);
 		canvas 			= Objects.requireNonNull(theCanvas);
 		pstGen 			= Objects.requireNonNull(gen);
+		loader = fls;
 
 		initialiseWidgets();
 		reinit();
@@ -276,6 +278,13 @@ protected ExportDialog getExportDialog(final ExportFormat format) {
 		fileChooserExport.setFileFilter(format.getFilter());
 		fileChooserExport.setDialogTitle(Exporter.TITLE_DIALOG_EXPORT);
 
+		if(loader.currentFile!=null && fileChooserExport.getSelectedFile()==null) {
+			String path = loader.currentFile.getPath();
+			if(path.contains(".")) path = path.substring(0, path.lastIndexOf('.'));
+			path += format.getFileExtension();
+			fileChooserExport.setSelectedFile(new File(path));
+		}
+
 		return fileChooserExport;
 	}
 

diff --git a/latexdraw-core/net.sf.latexdraw/src/main/net/sf/latexdraw/instruments/FileLoaderSaver.java b/latexdraw-core/net.sf.latexdraw/src/main/net/sf/latexdraw/instruments/FileLoaderSaver.java
@@ -134,6 +134,7 @@ public FileLoaderSaver(final LFrame ui, final JLabel statusBar, final Preference
 	@Override
 	public void reinit() {
 		currentFile	= null;
+		fileChooser = null;
 	}
 
 

diff --git a/latexdraw-core/net.sf.latexdraw/src/main/net/sf/latexdraw/ui/LFrame.java b/latexdraw-core/net.sf.latexdraw/src/main/net/sf/latexdraw/ui/LFrame.java
@@ -256,8 +256,6 @@ private void instantiateInstruments(final LCanvas canvas, final IDrawing drawing
 		catch(final IllegalArgumentException ex) {BadaboomCollector.INSTANCE.add(ex); }
 		try { pencil 		= new Pencil(canvas, textSetter, layeredPanel); }
 		catch(final IllegalArgumentException ex) {BadaboomCollector.INSTANCE.add(ex); }
-		try { exporter		= new Exporter(composer, canvas, statusBar, gen); }
-		catch(final IllegalArgumentException ex) {BadaboomCollector.INSTANCE.add(ex); }
 		try {
 			metaShapeCustomiser = new MetaShapeCustomiser(composer, hand, pencil, canvas.getBorderInstrument());
 			canvas.getBorderInstrument().setMetaCustomiser(metaShapeCustomiser);
@@ -276,6 +274,8 @@ private void instantiateInstruments(final LCanvas canvas, final IDrawing drawing
 		catch(final IllegalArgumentException ex) {BadaboomCollector.INSTANCE.add(ex); }
 		try { fileLoader	= new FileLoaderSaver(this, statusBar, prefSetters); }
 		catch(final IllegalArgumentException ex) {BadaboomCollector.INSTANCE.add(ex); }
+		try { exporter		= new Exporter(composer, canvas, statusBar, gen, fileLoader); }
+		catch(final IllegalArgumentException ex) {BadaboomCollector.INSTANCE.add(ex); }
 		try { tabSelector	= new TabSelector(this); }
 		catch(final IllegalArgumentException ex) {BadaboomCollector.INSTANCE.add(ex); }
 		try { templateManager = new TemplateManager(composer, this); }