added icons, fixed donate option

This commit is contained in:
bancika
2011-01-17 19:20:02 +00:00
parent 6dba12eab8
commit 7ad87076d3
7 changed files with 33 additions and 6 deletions
@@ -7,6 +7,7 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.awt.event.WindowAdapter; import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent; import java.awt.event.WindowEvent;
import java.util.Arrays;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@@ -27,6 +28,7 @@ import org.diylc.common.BadPositionException;
import org.diylc.common.EventType; import org.diylc.common.EventType;
import org.diylc.common.IPlugIn; import org.diylc.common.IPlugIn;
import org.diylc.common.IPlugInPort; import org.diylc.common.IPlugInPort;
import org.diylc.images.IconLoader;
import org.diylc.plugins.canvas.CanvasPlugin; import org.diylc.plugins.canvas.CanvasPlugin;
import org.diylc.plugins.clipboard.ClipboardManager; import org.diylc.plugins.clipboard.ClipboardManager;
import org.diylc.plugins.file.FileManager; import org.diylc.plugins.file.FileManager;
@@ -58,6 +60,8 @@ public class MainFrame extends JFrame implements IView {
setPreferredSize(new Dimension(800, 600)); setPreferredSize(new Dimension(800, 600));
createBasePanels(); createBasePanels();
menuMap = new HashMap<String, JMenu>(); menuMap = new HashMap<String, JMenu>();
setIconImages(Arrays.asList(IconLoader.IconSmall.getImage(), IconLoader.IconMedium
.getImage(), IconLoader.IconLarge.getImage()));
DialogFactory.getInstance().initialize(this); DialogFactory.getInstance().initialize(this);
this.presenter = new Presenter(this); this.presenter = new Presenter(this);
@@ -248,8 +252,8 @@ public class MainFrame extends JFrame implements IView {
fileName = "Untitled"; fileName = "Untitled";
} }
String modified = (Boolean) params[1] ? " (modified)" : ""; String modified = (Boolean) params[1] ? " (modified)" : "";
setTitle(String.format("DIYLC %s alpha - %s %s", plugInPort.getCurrentVersionNumber(), setTitle(String.format("DIYLC %s alpha - %s %s", plugInPort
fileName, modified)); .getCurrentVersionNumber(), fileName, modified));
} }
} }
} }
@@ -1,5 +1,10 @@
package org.diylc.images; 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.Icon;
import javax.swing.ImageIcon; 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( "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( "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( "faq.png"), Component("component.png"), Plugin("plugin.png"), Manual("manual.png"), Donate(
"donate.png"), Bug("bug.png"), AboutDialog("about_dialog.png"), DocumentEdit( "donate.png"), Bug("bug.png"), IconLarge("icon_large.png"), IconMedium(
"document_edit.png"), EditComponent("edit_component.png"); "icon_medium.png"), IconSmall("icon_small.png"), DocumentEdit("document_edit.png"), EditComponent(
"edit_component.png");
protected String name; protected String name;
@@ -41,4 +47,14 @@ public enum IconLoader {
return null; 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;
}
} }
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 898 B

@@ -50,7 +50,7 @@ public class HelpManager implements IPlugIn {
BUG_URL), HELP_TITLE); BUG_URL), HELP_TITLE);
plugInPort.injectMenuAction(null, HELP_TITLE); plugInPort.injectMenuAction(null, HELP_TITLE);
plugInPort.injectMenuAction(new NavigateURLAction("Donate", IconLoader.Donate.getIcon(), plugInPort.injectMenuAction(new NavigateURLAction("Donate", IconLoader.Donate.getIcon(),
BUG_URL), HELP_TITLE); DONATE_URL), HELP_TITLE);
plugInPort.injectMenuAction(new AboutAction(), HELP_TITLE); plugInPort.injectMenuAction(new AboutAction(), HELP_TITLE);
} }
@@ -66,7 +66,7 @@ public class HelpManager implements IPlugIn {
private AboutDialog getAboutDialog() { private AboutDialog getAboutDialog() {
if (aboutDialog == null) { if (aboutDialog == null) {
aboutDialog = DialogFactory.getInstance().createAboutDialog("DIY Layout Creator 4", aboutDialog = DialogFactory.getInstance().createAboutDialog("DIY Layout Creator 4",
IconLoader.AboutDialog.getIcon(), IconLoader.IconLarge.getIcon(),
plugInPort.getCurrentVersionNumber().toString(), "Branislav Stojkovic", plugInPort.getCurrentVersionNumber().toString(), "Branislav Stojkovic",
"diylc.org", "bancika@gmail.com", ""); "diylc.org", "bancika@gmail.com", "");
} }
@@ -365,6 +365,13 @@ public class Presenter implements IPlugInPort {
break; break;
case POINT_BY_POINT: case POINT_BY_POINT:
if (controlPointSlot != null) { 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 { try {
instantiateComponent(componentSlot, controlPointSlot, scaledPoint); instantiateComponent(componentSlot, controlPointSlot, scaledPoint);
} catch (Exception e) { } catch (Exception e) {