From 357d715be16fcc533d6f6181f81c0cb685221fee Mon Sep 17 00:00:00 2001
From: Kim Wittenburg <Kim@Kims-MacBook-Pro.local>
Date: Sun, 28 Sep 2014 23:53:50 +0200
Subject: [PATCH] Some Code Improvements

---
 MathPad/Base.lproj/MainMenu.xib | 6 +++---
 MathPad/MPDocument.m            | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/MathPad/Base.lproj/MainMenu.xib b/MathPad/Base.lproj/MainMenu.xib
index 1da953a..9852a38 100644
--- a/MathPad/Base.lproj/MainMenu.xib
+++ b/MathPad/Base.lproj/MainMenu.xib
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5023" systemVersion="13A603" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6245" systemVersion="13F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5023"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6245"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication"/>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
         <menu title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
             <items>
diff --git a/MathPad/MPDocument.m b/MathPad/MPDocument.m
index 2765fc0..6b35a30 100644
--- a/MathPad/MPDocument.m
+++ b/MathPad/MPDocument.m
@@ -63,7 +63,10 @@
     MPParseError *error;
     NSDecimalNumber *result = [self.expressionView.expressionStorage evaluateWithError:&error];
     self.resultLabel.stringValue = result != nil ? result.description : @"Error!";
-    self.errorLabel.stringValue = error != nil ? error.description : @"No Error";
+    self.errorLabel.stringValue = error != nil ? [NSString stringWithFormat:@"%@, %@", error, error.pathToExpression] : @"No Error";
+    if (error) {
+        self.expressionView.error = error;
+    }
 }
 
 @end