From 7ad87076d345b810d9915d9fa717433b730c28c7 Mon Sep 17 00:00:00 2001 From: bancika Date: Mon, 17 Jan 2011 19:20:02 +0000 Subject: [PATCH] added icons, fixed donate option --- .../DIYLC/src/org/diylc/gui/MainFrame.java | 8 +++++-- .../src/org/diylc/images/IconLoader.java | 20 ++++++++++++++++-- .../{about_dialog.png => icon_large.png} | Bin .../src/org/diylc/images/icon_medium.png | Bin 0 -> 2306 bytes .../DIYLC/src/org/diylc/images/icon_small.png | Bin 0 -> 898 bytes .../org/diylc/plugins/help/HelpManager.java | 4 ++-- .../src/org/diylc/presenter/Presenter.java | 7 ++++++ 7 files changed, 33 insertions(+), 6 deletions(-) rename diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/images/{about_dialog.png => icon_large.png} (100%) create mode 100644 diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/images/icon_medium.png create mode 100644 diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/images/icon_small.png diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/MainFrame.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/MainFrame.java index 2cdea0e3..6f1862a0 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/MainFrame.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/MainFrame.java @@ -7,6 +7,7 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.util.Arrays; import java.util.EnumSet; import java.util.HashMap; import java.util.Map; @@ -27,6 +28,7 @@ import org.diylc.common.BadPositionException; import org.diylc.common.EventType; import org.diylc.common.IPlugIn; import org.diylc.common.IPlugInPort; +import org.diylc.images.IconLoader; import org.diylc.plugins.canvas.CanvasPlugin; import org.diylc.plugins.clipboard.ClipboardManager; import org.diylc.plugins.file.FileManager; @@ -58,6 +60,8 @@ public class MainFrame extends JFrame implements IView { setPreferredSize(new Dimension(800, 600)); createBasePanels(); menuMap = new HashMap(); + setIconImages(Arrays.asList(IconLoader.IconSmall.getImage(), IconLoader.IconMedium + .getImage(), IconLoader.IconLarge.getImage())); DialogFactory.getInstance().initialize(this); this.presenter = new Presenter(this); @@ -248,8 +252,8 @@ public class MainFrame extends JFrame implements IView { fileName = "Untitled"; } String modified = (Boolean) params[1] ? " (modified)" : ""; - setTitle(String.format("DIYLC %s alpha - %s %s", plugInPort.getCurrentVersionNumber(), - fileName, modified)); + setTitle(String.format("DIYLC %s alpha - %s %s", plugInPort + .getCurrentVersionNumber(), fileName, modified)); } } } diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/images/IconLoader.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/images/IconLoader.java index 4df65037..e5d3c061 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/images/IconLoader.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/images/IconLoader.java @@ -1,5 +1,10 @@ package org.diylc.images; +import java.awt.Image; +import java.awt.image.BufferedImage; +import java.io.IOException; + +import javax.imageio.ImageIO; import javax.swing.Icon; import javax.swing.ImageIcon; @@ -23,8 +28,9 @@ public enum IconLoader { "id_card.png"), IdCardAdd("id_card_add.png"), Chest("chest.png"), Upload("upload.png"), Wrench( "wrench.png"), Group("group.png"), Ungroup("ungroup.png"), TraceMask("trace_mask.png"), Faq( "faq.png"), Component("component.png"), Plugin("plugin.png"), Manual("manual.png"), Donate( - "donate.png"), Bug("bug.png"), AboutDialog("about_dialog.png"), DocumentEdit( - "document_edit.png"), EditComponent("edit_component.png"); + "donate.png"), Bug("bug.png"), IconLarge("icon_large.png"), IconMedium( + "icon_medium.png"), IconSmall("icon_small.png"), DocumentEdit("document_edit.png"), EditComponent( + "edit_component.png"); protected String name; @@ -41,4 +47,14 @@ public enum IconLoader { return null; } } + + public Image getImage() { + BufferedImage img = null; + try { + img = ImageIO.read(getClass().getResourceAsStream(name)); + } catch (IOException e) { + System.err.println("Couldn't find file: " + name); + } + return img; + } } diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/images/about_dialog.png b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/images/icon_large.png similarity index 100% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/images/about_dialog.png rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/images/icon_large.png diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/images/icon_medium.png b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/images/icon_medium.png new file mode 100644 index 0000000000000000000000000000000000000000..d55596527d03a25248f27c1f8331954fec593e60 GIT binary patch literal 2306 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 Y1Gu9@n4CrZ3jhEB07*qoM6N<$f+aAQ{Qv*} literal 0 HcmV?d00001 diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/help/HelpManager.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/help/HelpManager.java index cd46da4d..08537897 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/help/HelpManager.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/help/HelpManager.java @@ -50,7 +50,7 @@ public class HelpManager implements IPlugIn { BUG_URL), HELP_TITLE); plugInPort.injectMenuAction(null, HELP_TITLE); plugInPort.injectMenuAction(new NavigateURLAction("Donate", IconLoader.Donate.getIcon(), - BUG_URL), HELP_TITLE); + DONATE_URL), HELP_TITLE); plugInPort.injectMenuAction(new AboutAction(), HELP_TITLE); } @@ -66,7 +66,7 @@ public class HelpManager implements IPlugIn { private AboutDialog getAboutDialog() { if (aboutDialog == null) { aboutDialog = DialogFactory.getInstance().createAboutDialog("DIY Layout Creator 4", - IconLoader.AboutDialog.getIcon(), + IconLoader.IconLarge.getIcon(), plugInPort.getCurrentVersionNumber().toString(), "Branislav Stojkovic", "diylc.org", "bancika@gmail.com", ""); } diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/Presenter.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/Presenter.java index 279f75a2..bd5bdd77 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/Presenter.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/Presenter.java @@ -365,6 +365,13 @@ public class Presenter implements IPlugInPort { break; case POINT_BY_POINT: if (controlPointSlot != null) { + snapPointToGrid(scaledPoint); + if (scaledPoint.equals(controlPointSlot)) { + String message = "Cannot create the component because both controls points match. Choose the second control point."; + LOG.warn(message); + view.showMessage(message, "Error", JOptionPane.ERROR_MESSAGE); + return; + } try { instantiateComponent(componentSlot, controlPointSlot, scaledPoint); } catch (Exception e) {