From 802d5c83a6a7f327b67c7c5b801048b68537d225 Mon Sep 17 00:00:00 2001 From: hneemann Date: Fri, 1 Apr 2016 17:40:11 +0200 Subject: [PATCH] Library inserts element if it is imported, added icons --- src/main/java/de/neemann/digital/gui/LibrarySelector.java | 6 +++++- src/main/java/de/neemann/digital/gui/Main.java | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/neemann/digital/gui/LibrarySelector.java b/src/main/java/de/neemann/digital/gui/LibrarySelector.java index 58176201b..994eb9992 100644 --- a/src/main/java/de/neemann/digital/gui/LibrarySelector.java +++ b/src/main/java/de/neemann/digital/gui/LibrarySelector.java @@ -54,7 +54,11 @@ public class LibrarySelector implements ElementNotFoundNotification { JFileChooser fc = new JFileChooser(filePath); fc.addChoosableFileFilter(new FileNameExtensionFilter("Circuit", "dig")); if (fc.showOpenDialog(null) == JFileChooser.APPROVE_OPTION) { - importElement(fc.getSelectedFile()); + ElementTypeDescription des = importElement(fc.getSelectedFile()); + if (des != null) { + VisualElement visualElement = new VisualElement(des.getName()).setPos(new Vector(10, 10)).setShapeFactory(shapeFactory); + circuitComponent.setPartToDrag(visualElement); + } } } }.setToolTip(Lang.get("menu_import_tt"))); diff --git a/src/main/java/de/neemann/digital/gui/Main.java b/src/main/java/de/neemann/digital/gui/Main.java index f524837c8..a0711abb8 100644 --- a/src/main/java/de/neemann/digital/gui/Main.java +++ b/src/main/java/de/neemann/digital/gui/Main.java @@ -67,8 +67,9 @@ public class Main extends JFrame implements ClosingWindowListener.ConfirmSave { public Main(Component parent, File fileToOpen, SavedListener savedListener) { super(Lang.get("digital")); - this.savedListener = savedListener; setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); + setIconImages(IconCreator.createImages("icon32.png", "icon64.png", "icon128.png")); + this.savedListener = savedListener; library = new ElementLibrary(); shapeFactory = new ShapeFactory(library); @@ -103,7 +104,6 @@ public class Main extends JFrame implements ClosingWindowListener.ConfirmSave { JMenuBar bar = new JMenuBar(); - ToolTipAction newFile = new ToolTipAction(Lang.get("menu_new"), iconNew) { @Override public void actionPerformed(ActionEvent e) {