From 12f85b505de33a7e169a633455c5e6e8b1ff6ccd Mon Sep 17 00:00:00 2001
From: skylarmt <apocalypselabs@gmail.com>
Date: Thu, 15 Jan 2015 02:14:09 -0700
Subject: [PATCH] Small tweaks.

---
 src/net/apocalypselabs/symat/CodeEditor.java  |  3 +-
 src/net/apocalypselabs/symat/Interpreter.java | 41 ++++++++++---------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/net/apocalypselabs/symat/CodeEditor.java b/src/net/apocalypselabs/symat/CodeEditor.java
index 92d310c..811fd1c 100644
--- a/src/net/apocalypselabs/symat/CodeEditor.java
+++ b/src/net/apocalypselabs/symat/CodeEditor.java
@@ -478,8 +478,9 @@ public class CodeEditor extends javax.swing.JInternalFrame {
             openString(FileUtils.readFile(f.getAbsolutePath()),
                     f.getAbsolutePath(), true);
         } catch (IOException ex) {
-            JOptionPane.showInternalMessageDialog(this,
+            JOptionPane.showInternalMessageDialog(MainGUI.mainPane,
                     "Error:  Cannot load file: " + ex.getMessage());
+            MainGUI.loadRecentFiles();
         }
     }
 
diff --git a/src/net/apocalypselabs/symat/Interpreter.java b/src/net/apocalypselabs/symat/Interpreter.java
index 243b3fa..3b77609 100644
--- a/src/net/apocalypselabs/symat/Interpreter.java
+++ b/src/net/apocalypselabs/symat/Interpreter.java
@@ -1,30 +1,30 @@
-/* 
+/*
  * Copyright (c) 2015, Apocalypse Laboratories
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without modification,
  *  are permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of source code must retain the above copyright notice, this 
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
  * list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright notice, 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
  * this list of conditions and the following disclaimer in the documentation and/or
  *  other materials provided with the distribution.
- * 
- * 3. Neither the name of the copyright holder nor the names of its contributors 
- * may be used to endorse or promote products derived from this software without 
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
  * specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package net.apocalypselabs.symat;
@@ -86,9 +86,9 @@ public class Interpreter extends javax.swing.JInternalFrame {
         }
 
         // Set font
-        int font_size = 15;
+        int font_size = 12;
         try {
-            font_size = Integer.valueOf(PrefStorage.getSetting("editfont"));
+            font_size = Integer.valueOf(PrefStorage.getSetting("shellfontsize", "12"));
         } catch (Exception ex) {
         }
         mainBox.setFont(new Font(Font.MONOSPACED, Font.PLAIN, font_size));
@@ -391,6 +391,7 @@ public class Interpreter extends javax.swing.JInternalFrame {
         if (fo.isModified()) {
             mainBox.setFont(new Font(Font.MONOSPACED, Font.PLAIN, fo.getResult()));
             inputBox.setFont(new Font(Font.MONOSPACED, Font.PLAIN, fo.getResult()));
+            PrefStorage.saveSetting("shellfontsize", String.valueOf(fo.getResult()));
         }
     }//GEN-LAST:event_fontBtnActionPerformed