summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Paulsson <gonz@users.sourceforge.net>2013-02-26 17:07:05 +0000
committerJohan Paulsson <gonz@users.sourceforge.net>2013-02-26 17:07:05 +0000
commit44fc6c6fc022b7262175a71a981ddc3969132ed5 (patch)
tree677ded4cf5d5c61ff0375b7025e77300b4382950
parent814372e88b23ce7956b2322d6f382742e2277ea5 (diff)
osx gui parsing errors
-rw-r--r--tikzit/English.lproj/TikzDocument.xib392
-rw-r--r--tikzit/TikZiT.xcodeproj/project.pbxproj6
-rw-r--r--tikzit/src/osx/ParseErrorView.h13
-rw-r--r--tikzit/src/osx/ParseErrorView.m40
-rw-r--r--tikzit/src/osx/TikzSourceController.h10
-rw-r--r--tikzit/src/osx/TikzSourceController.m15
6 files changed, 360 insertions, 116 deletions
diff --git a/tikzit/English.lproj/TikzDocument.xib b/tikzit/English.lproj/TikzDocument.xib
index ff544b8..446cb7e 100644
--- a/tikzit/English.lproj/TikzDocument.xib
+++ b/tikzit/English.lproj/TikzDocument.xib
@@ -1,32 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
- <int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">11B26</string>
- <string key="IBDocument.InterfaceBuilderVersion">1617</string>
- <string key="IBDocument.AppKitVersion">1138</string>
- <string key="IBDocument.HIToolboxVersion">566.00</string>
+ <int key="IBDocument.SystemTarget">1070</int>
+ <string key="IBDocument.SystemVersion">12C60</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2843</string>
+ <string key="IBDocument.AppKitVersion">1187.34</string>
+ <string key="IBDocument.HIToolboxVersion">625.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">1617</string>
+ <string key="NS.object.0">2843</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
- <string>NSView</string>
- <string>NSSplitView</string>
+ <string>NSButton</string>
+ <string>NSButtonCell</string>
+ <string>NSCustomObject</string>
+ <string>NSCustomView</string>
<string>NSScrollView</string>
- <string>NSWindowTemplate</string>
+ <string>NSScroller</string>
+ <string>NSSplitView</string>
<string>NSTextField</string>
<string>NSTextFieldCell</string>
- <string>NSCustomView</string>
<string>NSTextView</string>
<string>NSUserDefaultsController</string>
- <string>NSScroller</string>
- <string>NSCustomObject</string>
+ <string>NSView</string>
+ <string>NSWindowTemplate</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</array>
- <dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+ <integer value="1" key="NS.object.0"/>
+ </object>
<array class="NSMutableArray" key="IBDocument.RootObjects" id="580458321">
<object class="NSCustomObject" id="512844837">
<string key="NSClassName">TikzWindowController</string>
@@ -56,15 +61,105 @@
<reference key="NSNextResponder" ref="129838346"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
+ <object class="NSCustomView" id="1058910169">
+ <reference key="NSNextResponder" ref="664387074"/>
+ <int key="NSvFlags">266</int>
+ <array class="NSMutableArray" key="NSSubviews">
+ <object class="NSButton" id="908350871">
+ <reference key="NSNextResponder" ref="1058910169"/>
+ <int key="NSvFlags">265</int>
+ <array class="NSMutableArray" key="NSSubviews"/>
+ <string key="NSFrame">{{422, 18}, {17, 19}}</string>
+ <reference key="NSSuperview" ref="1058910169"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="363276524"/>
+ <bool key="NSViewIsLayerTreeHost">YES</bool>
+ <string key="NSReuseIdentifierKey">_NS:1574</string>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="869516400">
+ <int key="NSCellFlags">-2080374784</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents"/>
+ <object class="NSFont" key="NSSupport">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">13</double>
+ <int key="NSfFlags">1044</int>
+ </object>
+ <string key="NSCellIdentifier">_NS:1574</string>
+ <reference key="NSControlView" ref="908350871"/>
+ <int key="NSButtonFlags">105119744</int>
+ <int key="NSButtonFlags2">160</int>
+ <object class="NSCustomResource" key="NSNormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSStopProgressFreestandingTemplate</string>
+ </object>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ </object>
+ <object class="NSTextField" id="664005102">
+ <reference key="NSNextResponder" ref="1058910169"/>
+ <int key="NSvFlags">270</int>
+ <string key="NSFrame">{{5, 10}, {438, 27}}</string>
+ <reference key="NSSuperview" ref="1058910169"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="908350871"/>
+ <string key="NSReuseIdentifierKey">_NS:1535</string>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="902332144">
+ <int key="NSCellFlags">68157504</int>
+ <int key="NSCellFlags2">272630784</int>
+ <string key="NSContents"/>
+ <object class="NSFont" key="NSSupport" id="929913442">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">11</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <string key="NSPlaceholderString">parser information</string>
+ <string key="NSCellIdentifier">_NS:1535</string>
+ <reference key="NSControlView" ref="664005102"/>
+ <object class="NSColor" key="NSBackgroundColor">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">controlBackgroundColor</string>
+ <object class="NSColor" key="NSColor" id="278327836">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+ </object>
+ </object>
+ <object class="NSColor" key="NSTextColor" id="399529952">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">controlTextColor</string>
+ <object class="NSColor" key="NSColor" id="847486390">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MAA</bytes>
+ </object>
+ </object>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ </object>
+ </array>
+ <string key="NSFrame">{{0, 330}, {446, 42}}</string>
+ <reference key="NSSuperview" ref="664387074"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="664005102"/>
+ <bool key="NSViewIsLayerTreeHost">YES</bool>
+ <string key="NSReuseIdentifierKey">_NS:9</string>
+ <string key="NSClassName">ParseErrorView</string>
+ </object>
<object class="NSCustomView" id="607081948">
<reference key="NSNextResponder" ref="664387074"/>
<int key="NSvFlags">274</int>
- <string key="NSFrameSize">{447, 373}</string>
+ <array class="NSMutableArray" key="NSSubviews"/>
+ <string key="NSFrameSize">{447, 372}</string>
<reference key="NSSuperview" ref="664387074"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="363276524"/>
+ <reference key="NSNextKeyView" ref="1058910169"/>
<bool key="NSViewIsLayerTreeHost">YES</bool>
- <int key="NSViewLayerContentsRedrawPolicy">2</int>
<string key="NSClassName">GraphicsView</string>
</object>
</array>
@@ -108,10 +203,10 @@
<string>WebURLsWithTitlesPboardType</string>
<string>public.url</string>
</set>
- <string key="NSFrame">{{0, -14}, {430, 14}}</string>
+ <string key="NSFrame">{{0, -14}, {445, 14}}</string>
<reference key="NSSuperview" ref="1053475928"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="845088135"/>
+ <reference key="NSNextKeyView" ref="316980985"/>
<object class="NSTextContainer" key="NSTextContainer" id="655316054">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
@@ -119,51 +214,14 @@
<bytes key="NS.bytes">XGJlZ2lue3Rpa3pwaWN0dXJlfQoKXGVuZHt0aWt6cGljdHVyZX0</bytes>
</object>
<dictionary key="NSAttributes">
- <object class="NSFont" key="NSFont" id="929913442">
+ <object class="NSFont" key="NSFont">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">11</double>
- <int key="NSfFlags">16</int>
+ <int key="NSfFlags">3100</int>
</object>
<object class="NSParagraphStyle" key="NSParagraphStyle">
<int key="NSAlignment">4</int>
- <array key="NSTabStops">
- <object class="NSTextTab">
- <double key="NSLocation">28</double>
- </object>
- <object class="NSTextTab">
- <double key="NSLocation">56</double>
- </object>
- <object class="NSTextTab">
- <double key="NSLocation">84</double>
- </object>
- <object class="NSTextTab">
- <double key="NSLocation">112</double>
- </object>
- <object class="NSTextTab">
- <double key="NSLocation">140</double>
- </object>
- <object class="NSTextTab">
- <double key="NSLocation">168</double>
- </object>
- <object class="NSTextTab">
- <double key="NSLocation">196</double>
- </object>
- <object class="NSTextTab">
- <double key="NSLocation">224</double>
- </object>
- <object class="NSTextTab">
- <double key="NSLocation">252</double>
- </object>
- <object class="NSTextTab">
- <double key="NSLocation">280</double>
- </object>
- <object class="NSTextTab">
- <double key="NSLocation">308</double>
- </object>
- <object class="NSTextTab">
- <double key="NSLocation">336</double>
- </object>
- </array>
+ <nil key="NSTabStops"/>
</object>
</dictionary>
<nil key="NSDelegate"/>
@@ -171,15 +229,15 @@
<array class="NSMutableArray" key="NSTextContainers">
<reference ref="655316054"/>
</array>
- <int key="NSLMFlags">134</int>
+ <int key="NSLMFlags">166</int>
<nil key="NSDelegate"/>
</object>
<reference key="NSTextView" ref="719846633"/>
- <double key="NSWidth">430</double>
+ <double key="NSWidth">445</double>
<int key="NSTCFlags">1</int>
</object>
<object class="NSTextViewSharedData" key="NSSharedData">
- <int key="NSFlags">12099</int>
+ <int key="NSFlags">67120963</int>
<int key="NSTextCheckingTypes">0</int>
<nil key="NSMarkedAttributes"/>
<object class="NSColor" key="NSBackgroundColor" id="366483647">
@@ -191,19 +249,13 @@
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">selectedTextBackgroundColor</string>
- <object class="NSColor" key="NSColor" id="278327836">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
- </object>
+ <reference key="NSColor" ref="278327836"/>
</object>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">selectedTextColor</string>
- <object class="NSColor" key="NSColor" id="847486390">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MAA</bytes>
- </object>
+ <reference key="NSColor" ref="847486390"/>
</object>
</dictionary>
<reference key="NSInsertionColor" ref="847486390"/>
@@ -224,11 +276,11 @@
</object>
<int key="NSTVFlags">6</int>
<string key="NSMaxSize">{877, 10000000}</string>
- <string key="NSMinize">{223, 0}</string>
+ <string key="NSMinize">{445, 0}</string>
<nil key="NSDelegate"/>
</object>
</array>
- <string key="NSFrame">{{1, 1}, {430, 0}}</string>
+ <string key="NSFrame">{{1, 1}, {445, 0}}</string>
<reference key="NSSuperview" ref="878182966"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="719846633"/>
@@ -263,14 +315,15 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<object class="NSScroller" id="334949682">
<reference key="NSNextResponder" ref="878182966"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{431, 1}, {15, 0}}</string>
+ <string key="NSFrame">{{430, 1}, {16, 0}}</string>
<reference key="NSSuperview" ref="878182966"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1053475928"/>
+ <bool key="NSEnabled">YES</bool>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<reference key="NSTarget" ref="878182966"/>
<string key="NSAction">_doScroller:</string>
<double key="NSCurValue">1</double>
- <double key="NSPercent">0.85256409645080566</double>
</object>
<object class="NSScroller" id="316980985">
<reference key="NSNextResponder" ref="878182966"/>
@@ -279,6 +332,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<reference key="NSSuperview" ref="878182966"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="334949682"/>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="878182966"/>
<string key="NSAction">_doScroller:</string>
@@ -289,11 +343,14 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<string key="NSFrameSize">{447, 0}</string>
<reference key="NSSuperview" ref="363276524"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="316980985"/>
- <int key="NSsFlags">133138</int>
+ <reference key="NSNextKeyView" ref="1053475928"/>
+ <int key="NSsFlags">133202</int>
<reference key="NSVScroller" ref="334949682"/>
<reference key="NSHScroller" ref="316980985"/>
<reference key="NSContentView" ref="1053475928"/>
+ <double key="NSMinMagnification">0.25</double>
+ <double key="NSMaxMagnification">4</double>
+ <double key="NSMagnification">1</double>
</object>
</array>
<string key="NSFrame">{{0, 382}, {447, 0}}</string>
@@ -314,27 +371,23 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<string key="NSFrame">{{305, -184}, {128, 14}}</string>
<reference key="NSSuperview" ref="568628114"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="884817082">
- <int key="NSCellFlags">68288064</int>
+ <int key="NSCellFlags">68157504</int>
<int key="NSCellFlags2">71304192</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="929913442"/>
<reference key="NSControlView" ref="845088135"/>
+ <bool key="NSDrawsBackground">YES</bool>
<object class="NSColor" key="NSBackgroundColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlColor</string>
<reference key="NSColor" ref="278327836"/>
</object>
- <object class="NSColor" key="NSTextColor">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlTextColor</string>
- <reference key="NSColor" ref="847486390"/>
- </object>
+ <reference key="NSTextColor" ref="399529952"/>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</array>
<string key="NSFrameSize">{447, 382}</string>
@@ -342,7 +395,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="129838346"/>
</object>
- <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+ <string key="NSScreenRect">{{0, 0}, {1600, 1178}}</string>
<string key="NSMinSize">{94, 108}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<bool key="NSWindowIsRestorable">YES</bool>
@@ -361,14 +414,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<array class="NSMutableArray" key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="275939982"/>
- <reference key="destination" ref="512844837"/>
- </object>
- <int key="connectionID">17</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">window</string>
<reference key="source" ref="512844837"/>
<reference key="destination" ref="275939982"/>
@@ -385,6 +430,22 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
+ <string key="label">tikzSourceController</string>
+ <reference key="source" ref="512844837"/>
+ <reference key="destination" ref="578925742"/>
+ </object>
+ <int key="connectionID">100044</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="275939982"/>
+ <reference key="destination" ref="512844837"/>
+ </object>
+ <int key="connectionID">17</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
<string key="label">application</string>
<reference key="source" ref="607081948"/>
<reference key="destination" ref="796877042"/>
@@ -393,11 +454,11 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">graphicsView</string>
- <reference key="source" ref="578925742"/>
- <reference key="destination" ref="607081948"/>
+ <string key="label">tikzSourceController</string>
+ <reference key="source" ref="607081948"/>
+ <reference key="destination" ref="578925742"/>
</object>
- <int key="connectionID">100040</int>
+ <int key="connectionID">100049</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
@@ -429,19 +490,19 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">sourceView</string>
+ <string key="label">graphicsView</string>
<reference key="source" ref="578925742"/>
- <reference key="destination" ref="719846633"/>
+ <reference key="destination" ref="607081948"/>
</object>
- <int key="connectionID">100043</int>
+ <int key="connectionID">100040</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">tikzSourceController</string>
- <reference key="source" ref="512844837"/>
- <reference key="destination" ref="578925742"/>
+ <string key="label">sourceView</string>
+ <reference key="source" ref="578925742"/>
+ <reference key="destination" ref="719846633"/>
</object>
- <int key="connectionID">100044</int>
+ <int key="connectionID">100043</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -453,11 +514,35 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">tikzSourceController</string>
- <reference key="source" ref="607081948"/>
- <reference key="destination" ref="578925742"/>
+ <string key="label">errorNotification</string>
+ <reference key="source" ref="578925742"/>
+ <reference key="destination" ref="1058910169"/>
</object>
- <int key="connectionID">100049</int>
+ <int key="connectionID">100053</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">errorMessage</string>
+ <reference key="source" ref="578925742"/>
+ <reference key="destination" ref="664005102"/>
+ </object>
+ <int key="connectionID">100054</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">closeParseError:</string>
+ <reference key="source" ref="578925742"/>
+ <reference key="destination" ref="908350871"/>
+ </object>
+ <int key="connectionID">100060</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">closeErrorButton</string>
+ <reference key="source" ref="578925742"/>
+ <reference key="destination" ref="908350871"/>
+ </object>
+ <int key="connectionID">100061</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
@@ -518,6 +603,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<reference key="object" ref="664387074"/>
<array class="NSMutableArray" key="children">
<reference ref="607081948"/>
+ <reference ref="1058910169"/>
</array>
<reference key="parent" ref="129838346"/>
</object>
@@ -530,11 +616,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<reference key="parent" ref="129838346"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">100024</int>
- <reference key="object" ref="607081948"/>
- <reference key="parent" ref="664387074"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">100025</int>
<reference key="object" ref="878182966"/>
<array class="NSMutableArray" key="children">
@@ -582,6 +663,47 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<reference key="object" ref="884817082"/>
<reference key="parent" ref="845088135"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">100050</int>
+ <reference key="object" ref="1058910169"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="664005102"/>
+ <reference ref="908350871"/>
+ </array>
+ <reference key="parent" ref="664387074"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">100051</int>
+ <reference key="object" ref="664005102"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="902332144"/>
+ </array>
+ <reference key="parent" ref="1058910169"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">100052</int>
+ <reference key="object" ref="902332144"/>
+ <reference key="parent" ref="664005102"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">100024</int>
+ <reference key="object" ref="607081948"/>
+ <array class="NSMutableArray" key="children"/>
+ <reference key="parent" ref="664387074"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">100058</int>
+ <reference key="object" ref="908350871"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="869516400"/>
+ </array>
+ <reference key="parent" ref="1058910169"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">100059</int>
+ <reference key="object" ref="869516400"/>
+ <reference key="parent" ref="908350871"/>
+ </object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -600,6 +722,15 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<string key="100037.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="100045.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="100046.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="100050.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <real value="0.0" key="100050.IBViewIntegration.shadowBlurRadius"/>
+ <reference key="100050.IBViewIntegration.shadowColor" ref="847486390"/>
+ <real value="0.0" key="100050.IBViewIntegration.shadowOffsetHeight"/>
+ <real value="0.0" key="100050.IBViewIntegration.shadowOffsetWidth"/>
+ <string key="100051.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="100052.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="100058.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="100059.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="5.IBNSWindowAutoPositionCentersHorizontal"/>
<boolean value="NO" key="5.IBNSWindowAutoPositionCentersVertical"/>
<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -610,7 +741,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">100049</int>
+ <int key="maxID">100063</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -637,14 +768,43 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">ParseErrorView</string>
+ <string key="superclassName">NSView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/ParseErrorView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">TikzSourceController</string>
<string key="superclassName">NSObject</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">closeParseError:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">closeParseError:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">closeParseError:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
<dictionary class="NSMutableDictionary" key="outlets">
+ <string key="errorMessage">NSTextField</string>
+ <string key="errorNotification">ParseErrorView</string>
<string key="graphicsView">GraphicsView</string>
<string key="sourceView">NSTextView</string>
<string key="status">NSTextField</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="errorMessage">
+ <string key="name">errorMessage</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="errorNotification">
+ <string key="name">errorNotification</string>
+ <string key="candidateClassName">ParseErrorView</string>
+ </object>
<object class="IBToOneOutletInfo" key="graphicsView">
<string key="name">graphicsView</string>
<string key="candidateClassName">GraphicsView</string>
@@ -691,7 +851,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
- <integer value="1050" key="NS.object.0"/>
+ <real value="1070" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
@@ -699,5 +859,9 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <string key="NS.key.0">NSStopProgressFreestandingTemplate</string>
+ <string key="NS.object.0">{83, 83}</string>
+ </object>
</data>
</archive>
diff --git a/tikzit/TikZiT.xcodeproj/project.pbxproj b/tikzit/TikZiT.xcodeproj/project.pbxproj
index 9f165a0..3780cc6 100644
--- a/tikzit/TikZiT.xcodeproj/project.pbxproj
+++ b/tikzit/TikZiT.xcodeproj/project.pbxproj
@@ -129,6 +129,7 @@
7F6E2C8916B0091300BFE20D /* maths.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F6E2C8716B0091300BFE20D /* maths.m */; };
7F6E2C8A16B0096000BFE20D /* SupportDir.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652DF813E1F2030023F4C6 /* SupportDir.m */; };
7F6E2C8C16B00ABA00BFE20D /* SFBInspectors.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; };
+ 7F781C1A16B5DE1400239826 /* ParseErrorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F781C1916B5DE1400239826 /* ParseErrorView.m */; };
7FB9BFEE16B57C2E00773146 /* TikzFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FB9BFED16B57C2E00773146 /* TikzFormatter.m */; };
7FEED45716B1A7C500B056CB /* StyleManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FEED45616B1A7C500B056CB /* StyleManager.m */; };
8D15AC2C0486D014006FF6A4 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */; };
@@ -340,6 +341,8 @@
55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+LatexConstants.m"; path = "src/common/NSString+LatexConstants.m"; sourceTree = "<group>"; };
55FF4E64116A401B000C22B4 /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; };
7F6E2C8716B0091300BFE20D /* maths.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = maths.m; path = src/common/test/maths.m; sourceTree = "<group>"; };
+ 7F781C1816B5DE1400239826 /* ParseErrorView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ParseErrorView.h; path = src/osx/ParseErrorView.h; sourceTree = "<group>"; };
+ 7F781C1916B5DE1400239826 /* ParseErrorView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ParseErrorView.m; path = src/osx/ParseErrorView.m; sourceTree = "<group>"; };
7FB9BFEC16B57C2E00773146 /* TikzFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzFormatter.h; path = src/osx/TikzFormatter.h; sourceTree = "<group>"; };
7FB9BFED16B57C2E00773146 /* TikzFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzFormatter.m; path = src/osx/TikzFormatter.m; sourceTree = "<group>"; };
7FEED45516B1A7C400B056CB /* StyleManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleManager.h; path = src/common/StyleManager.h; sourceTree = "<group>"; };
@@ -628,6 +631,8 @@
55391B0713D326E5007DBE71 /* PropertyInspector */,
55D9468D11659FF00044178C /* StylePalette */,
558F18EF117B043B009863B2 /* TikzDocument.h */,
+ 7F781C1816B5DE1400239826 /* ParseErrorView.h */,
+ 7F781C1916B5DE1400239826 /* ParseErrorView.m */,
558F18F0117B043B009863B2 /* TikzDocument.m */,
558F18F1117B043B009863B2 /* TikzSourceController.h */,
558F18F2117B043B009863B2 /* TikzSourceController.m */,
@@ -895,6 +900,7 @@
55598E351635372E0023450A /* DiamondShape.m in Sources */,
7FEED45716B1A7C500B056CB /* StyleManager.m in Sources */,
7FB9BFEE16B57C2E00773146 /* TikzFormatter.m in Sources */,
+ 7F781C1A16B5DE1400239826 /* ParseErrorView.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/tikzit/src/osx/ParseErrorView.h b/tikzit/src/osx/ParseErrorView.h
new file mode 100644
index 0000000..bb6141f
--- /dev/null
+++ b/tikzit/src/osx/ParseErrorView.h
@@ -0,0 +1,13 @@
+//
+// ParseErrorView.h
+// TikZiT
+//
+// Created by Karl Johan Paulsson on 27/01/2013.
+// Copyright (c) 2013 Aleks Kissinger. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+@interface ParseErrorView : NSView
+
+@end
diff --git a/tikzit/src/osx/ParseErrorView.m b/tikzit/src/osx/ParseErrorView.m
new file mode 100644
index 0000000..97b1b94
--- /dev/null
+++ b/tikzit/src/osx/ParseErrorView.m
@@ -0,0 +1,40 @@
+//
+// ParseErrorView.m
+// TikZiT
+//
+// Created by Karl Johan Paulsson on 27/01/2013.
+// Copyright (c) 2013 Aleks Kissinger. All rights reserved.
+//
+
+#import "ParseErrorView.h"
+
+@implementation ParseErrorView
+
+- (id)initWithFrame:(NSRect)frame
+{
+ self = [super initWithFrame:frame];
+ if (self) {
+ // Initialization code here.
+ }
+
+ return self;
+}
+
+- (void)drawRect:(NSRect)dirtyRect
+{
+ // Drawing code here.
+}
+
+- (void)awakeFromNib{
+ self.layer = [CALayer layer];
+ self.wantsLayer = YES;
+ CALayer *newLayer = [CALayer layer];
+ self.layer.backgroundColor = [[NSColor controlColor] CGColor];
+ //CGColorCreate(CGColorSpaceCreateDeviceRGB(), (CGFloat[]){ 1, .9, .64, 1 });
+// newLayer.backgroundColor = [NSColor redColor].CGColor;
+ newLayer.frame = NSMakeRect(100,100,100,100);//NSMakeRect(0,0,image.size.width,image.size.height);
+ newLayer.position = CGPointMake(20,20);
+ //[self.layer addSublayer:newLayer];
+}
+
+@end
diff --git a/tikzit/src/osx/TikzSourceController.h b/tikzit/src/osx/TikzSourceController.h
index 01c2cf3..c829336 100644
--- a/tikzit/src/osx/TikzSourceController.h
+++ b/tikzit/src/osx/TikzSourceController.h
@@ -25,6 +25,7 @@
#import "GraphicsView.h"
#import "TikzGraphAssembler.h"
+#import "ParseErrorView.h"
@interface TikzSourceController : NSObject {
GraphicsView *graphicsView;
@@ -34,8 +35,9 @@
NSDictionary *textAttrs;
NSColor *successColor;
NSColor *failedColor;
-
-
+ NSTextField *errorMessage;
+ ParseErrorView *errorNotification;
+
NSUndoManager *documentUndoManager;
BOOL tikzChanged;
@@ -51,10 +53,14 @@
@property NSUndoManager *documentUndoManager;
@property (copy) NSAttributedString *source;
@property (copy) NSString *tikz;
+@property IBOutlet ParseErrorView *errorNotification;
+@property IBOutlet NSTextField *errorMessage;
- (void)updateTikzFromGraph;
- (void)graphChanged:(NSNotification*)n;
+- (IBAction)closeParseError:(id)pId;
+
// called by code, these do not register an undo
- (BOOL)tryParseTikz;
- (void)doRevertTikz;
diff --git a/tikzit/src/osx/TikzSourceController.m b/tikzit/src/osx/TikzSourceController.m
index 6d1580c..428c6ba 100644
--- a/tikzit/src/osx/TikzSourceController.m
+++ b/tikzit/src/osx/TikzSourceController.m
@@ -28,6 +28,7 @@
@synthesize graphicsView, sourceView, source, status;
@synthesize documentUndoManager, tikzChanged;
+@synthesize errorMessage, errorNotification;
- (void)endEditing {
NSResponder *res = [[sourceView window] firstResponder];
@@ -125,6 +126,10 @@
if ([graphicsView enabled]) [self updateTikzFromGraph];
}
+- (IBAction)closeParseError:(id)pId{
+ [errorNotification setHidden:TRUE];
+}
+
- (void)textDidBeginEditing:(NSNotification *)notification {
if ([graphicsView enabled]) {
[graphicsView setEnabled:NO];
@@ -169,9 +174,19 @@
[status setStringValue:@"success"];
[status setTextColor:successColor];
+
+ [errorNotification setHidden:TRUE];
} else {
[status setStringValue:@"parse error"];
[status setTextColor:failedColor];
+
+
+ NSLog(@"Parse error: %@",[assembler lastError]);
+
+ NSError *e = [assembler lastError];
+
+ [errorMessage setStringValue:[[[assembler lastError] userInfo] valueForKey:NSLocalizedDescriptionKey]];
+ [errorNotification setHidden:FALSE];
}
}
}