Merge pull request #239 from RobertBColton/16b5

Adds print support to Game Information editor
IsmAvatar · Jan 25, 2016 · 564cfd3 · 564cfd3
2 parents b96f99c + c489039
commit 564cfd3
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/org/lateralgm/icons/README b/org/lateralgm/icons/README
@@ -20,7 +20,7 @@ This directory contains the following icons (.png extension omitted):
  Nuvola icon theme for KDE 3.x:
    actions/
      accept cancel colorize copy cut find
-     new next open paste previous redo save
+     new next open paste previous print redo save
      save-as sound-play sound-stop undo
    restree/
      gm group group-open info

diff --git a/org/lateralgm/icons/actions/print.png b/org/lateralgm/icons/actions/print.png
diff --git a/org/lateralgm/main/icons.properties b/org/lateralgm/main/icons.properties
@@ -72,6 +72,7 @@ EventNode.GROUP10=events/keyreleasefolder.png
 
 GameInformationFrame.LOAD=actions/open.png
 GameInformationFrame.FILESAVE=actions/save.png
+GameInformationFrame.PRINT=actions/print.png
 GameInformationFrame.FONTCOLOR=restree/font.png
 GameInformationFrame.COLOR=actions/colorize.png
 GameInformationFrame.CUT=actions/cut.png

diff --git a/org/lateralgm/subframes/GameInformationFrame.java b/org/lateralgm/subframes/GameInformationFrame.java
@@ -32,6 +32,7 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
+import java.awt.print.PrinterException;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -126,6 +127,10 @@ private JMenuBar makeMenuBar()
 		item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S,KeyEvent.CTRL_DOWN_MASK));
 		menu.add(item);
 		menu.addSeparator();
+		item = addItem("GameInformationFrame.PRINT"); //$NON-NLS-1$
+		item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_P,KeyEvent.CTRL_DOWN_MASK));
+		menu.add(item);
+		menu.addSeparator();
 		item = addItem("GameInformationFrame.CLOSESAVE"); //$NON-NLS-1$
 		menu.add(item);
 
@@ -574,6 +579,18 @@ public void actionPerformed(ActionEvent ev)
 			saveToFile();
 			return;
 			}
+		if (com.equals("GameInformationFrame.PRINT")) //$NON-NLS-1$
+			{
+			try
+				{
+				editor.print();
+				}
+			catch (PrinterException e)
+				{
+				e.printStackTrace();
+				}
+			return;
+			}
 		if (com.equals("GameInformationFrame.FONTCOLOR")) //$NON-NLS-1$
 			{
 			String colorStr = Messages.getString("GameInformationFrame.FONTCOLOR"); //$NON-NLS-1$