gui: adding a couple of preference options

Added preference options for autocompletion and inspectors on top.

5 files changed, 283 insertions, 42 deletions

diff --git a/tikzit/src/osx/PreferenceController.m b/tikzit/src/osx/PreferenceController.m
index 099bf48..e785358 100644
--- a/tikzit/src/osx/PreferenceController.m
+++ b/tikzit/src/osx/PreferenceController.m
@@ -104,9 +104,9 @@
     [[[self window] contentView] replaceSubview:customNodeView with:[customNodeController view]];
     customNodeView = [customNodeController view];
     
-    [[self window] setContentSize:[preambleView frame].size];
-    [[[self window] contentView] addSubview:preambleView];
-    currentViewTag = 3;
+    [[self window] setContentSize:[engineView frame].size];
+    [[[self window] contentView] addSubview:engineView];
+    currentViewTag = 1;
 }
 
 - (IBAction)switchView:(id)sender {
diff --git a/tikzit/src/osx/Preferences.xib b/tikzit/src/osx/Preferences.xib
index 155cf71..1be3f9f 100644
--- a/tikzit/src/osx/Preferences.xib
+++ b/tikzit/src/osx/Preferences.xib
@@ -2,13 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1070</int>
-		<string key="IBDocument.SystemVersion">13A603</string>
-		<string key="IBDocument.InterfaceBuilderVersion">4514</string>
-		<string key="IBDocument.AppKitVersion">1265</string>
-		<string key="IBDocument.HIToolboxVersion">695.00</string>
+		<string key="IBDocument.SystemVersion">13C64</string>
+		<string key="IBDocument.InterfaceBuilderVersion">5053</string>
+		<string key="IBDocument.AppKitVersion">1265.19</string>
+		<string key="IBDocument.HIToolboxVersion">697.40</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">4514</string>
+			<string key="NS.object.0">5053</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>IBNSLayoutConstraint</string>
@@ -100,7 +100,7 @@
 							<string key="NSToolbarItemMaxSize">{0, 0}</string>
 							<bool key="NSToolbarItemEnabled">YES</bool>
 							<bool key="NSToolbarItemAutovalidates">YES</bool>
-							<int key="NSToolbarItemTag">0</int>
+							<int key="NSToolbarItemTag">1</int>
 							<bool key="NSToolbarIsUserRemovable">YES</bool>
 							<int key="NSToolbarItemVisibilityPriority">0</int>
 						</object>
@@ -179,8 +179,8 @@
 						<reference ref="845520355"/>
 					</array>
 					<array key="NSToolbarIBDefaultItems">
+						<reference ref="914743654"/>
 						<reference ref="265637031"/>
-						<reference ref="641338426"/>
 						<reference ref="845520355"/>
 						<reference ref="224936444"/>
 					</array>
@@ -202,33 +202,33 @@
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<array class="NSMutableArray" key="NSSubviews">
-					<object class="NSButton" id="764495169">
+					<object class="NSButton" id="521024449">
 						<reference key="NSNextResponder" ref="103531975"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{18, 15}, {214, 18}}</string>
+						<string key="NSFrame">{{18, 106}, {219, 18}}</string>
 						<reference key="NSSuperview" ref="103531975"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="292348615">
+						<object class="NSButtonCell" key="NSCell" id="550678479">
 							<int key="NSCellFlags">-2080374784</int>
 							<int key="NSCellFlags2">268435456</int>
-							<string key="NSContents">Bring preview window to focus</string>
+							<string key="NSContents">Keep inspector windows on top</string>
 							<object class="NSFont" key="NSSupport" id="924461577">
 								<string key="NSName">.LucidaGrandeUI</string>
 								<double key="NSSize">13</double>
 								<int key="NSfFlags">1044</int>
 							</object>
 							<string key="NSCellIdentifier">_NS:9</string>
-							<reference key="NSControlView" ref="764495169"/>
+							<reference key="NSControlView" ref="521024449"/>
 							<int key="NSButtonFlags">1211912448</int>
 							<int key="NSButtonFlags2">2</int>
-							<object class="NSCustomResource" key="NSNormalImage">
+							<object class="NSCustomResource" key="NSNormalImage" id="959728078">
 								<string key="NSClassName">NSImage</string>
 								<string key="NSResourceName">NSSwitch</string>
 							</object>
-							<object class="NSButtonImageSource" key="NSAlternateImage">
+							<object class="NSButtonImageSource" key="NSAlternateImage" id="808033943">
 								<string key="NSImageName">NSSwitch</string>
 							</object>
 							<string key="NSAlternateContents"/>
@@ -238,10 +238,64 @@
 						</object>
 						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
+					<object class="NSButton" id="118735803">
+						<reference key="NSNextResponder" ref="103531975"/>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{18, 126}, {168, 18}}</string>
+						<reference key="NSSuperview" ref="103531975"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="521024449"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSButtonCell" key="NSCell" id="63691474">
+							<int key="NSCellFlags">-2080374784</int>
+							<int key="NSCellFlags2">268435456</int>
+							<string key="NSContents">Autocomplete brackets</string>
+							<reference key="NSSupport" ref="924461577"/>
+							<string key="NSCellIdentifier">_NS:9</string>
+							<reference key="NSControlView" ref="118735803"/>
+							<int key="NSButtonFlags">1211912448</int>
+							<int key="NSButtonFlags2">2</int>
+							<reference key="NSNormalImage" ref="959728078"/>
+							<reference key="NSAlternateImage" ref="808033943"/>
+							<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="NSButton" id="764495169">
+						<reference key="NSNextResponder" ref="103531975"/>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{18, 18}, {214, 18}}</string>
+						<reference key="NSSuperview" ref="103531975"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSButtonCell" key="NSCell" id="292348615">
+							<int key="NSCellFlags">-2080374784</int>
+							<int key="NSCellFlags2">268435456</int>
+							<string key="NSContents">Bring preview window to focus</string>
+							<reference key="NSSupport" ref="924461577"/>
+							<string key="NSCellIdentifier">_NS:9</string>
+							<reference key="NSControlView" ref="764495169"/>
+							<int key="NSButtonFlags">1211912448</int>
+							<int key="NSButtonFlags2">2</int>
+							<reference key="NSNormalImage" ref="959728078"/>
+							<reference key="NSAlternateImage" ref="808033943"/>
+							<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="762565485">
 						<reference key="NSNextResponder" ref="103531975"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{20, 39}, {440, 22}}</string>
+						<string key="NSFrame">{{20, 42}, {440, 22}}</string>
 						<reference key="NSSuperview" ref="103531975"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="764495169"/>
@@ -280,7 +334,7 @@
 					<object class="NSTextField" id="539123669">
 						<reference key="NSNextResponder" ref="103531975"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{18, 69}, {140, 17}}</string>
+						<string key="NSFrame">{{18, 72}, {140, 17}}</string>
 						<reference key="NSSuperview" ref="103531975"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="762565485"/>
@@ -313,10 +367,10 @@
 						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 					</object>
 				</array>
-				<string key="NSFrameSize">{480, 96}</string>
+				<string key="NSFrameSize">{480, 162}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="539123669"/>
+				<reference key="NSNextKeyView" ref="118735803"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<string key="NSClassName">NSView</string>
 			</object>
@@ -498,6 +552,38 @@
 					</object>
 					<int key="connectionID">62</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: values.net.sourceforge.tikzit.autocomplete</string>
+						<reference key="source" ref="118735803"/>
+						<reference key="destination" ref="706090457"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="118735803"/>
+							<reference key="NSDestination" ref="706090457"/>
+							<string key="NSLabel">value: values.net.sourceforge.tikzit.autocomplete</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">values.net.sourceforge.tikzit.autocomplete</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">149</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: values.net.sourceforge.tikzit.inspectorsontop</string>
+						<reference key="source" ref="521024449"/>
+						<reference key="destination" ref="706090457"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="521024449"/>
+							<reference key="NSDestination" ref="706090457"/>
+							<string key="NSLabel">value: values.net.sourceforge.tikzit.inspectorsontop</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">values.net.sourceforge.tikzit.inspectorsontop</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">150</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -565,6 +651,24 @@
 						<int key="objectID">13</int>
 						<reference key="object" ref="103531975"/>
 						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="727314944">
+								<reference key="firstItem" ref="103531975"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="764495169"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<string key="multiplierString">1</string>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="103531975"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">23</float>
+								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
+							</object>
 							<object class="IBNSLayoutConstraint" id="728277728">
 								<reference key="firstItem" ref="764495169"/>
 								<int key="firstAttribute">3</int>
@@ -572,6 +676,7 @@
 								<reference key="secondItem" ref="762565485"/>
 								<int key="secondAttribute">4</int>
 								<float key="multiplier">1</float>
+								<string key="multiplierString">1</string>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
 									<double key="value">8</double>
 								</object>
@@ -589,6 +694,7 @@
 								<reference key="secondItem" ref="103531975"/>
 								<int key="secondAttribute">5</int>
 								<float key="multiplier">1</float>
+								<string key="multiplierString">1</string>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
 									<double key="value">20</double>
 								</object>
@@ -606,6 +712,7 @@
 								<reference key="secondItem" ref="762565485"/>
 								<int key="secondAttribute">6</int>
 								<float key="multiplier">1</float>
+								<string key="multiplierString">1</string>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
 									<double key="value">20</double>
 								</object>
@@ -623,6 +730,7 @@
 								<reference key="secondItem" ref="539123669"/>
 								<int key="secondAttribute">4</int>
 								<float key="multiplier">1</float>
+								<string key="multiplierString">1</string>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
 									<double key="value">8</double>
 								</object>
@@ -640,6 +748,7 @@
 								<reference key="secondItem" ref="103531975"/>
 								<int key="secondAttribute">5</int>
 								<float key="multiplier">1</float>
+								<string key="multiplierString">1</string>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
 									<double key="value">20</double>
 								</object>
@@ -650,43 +759,101 @@
 								<int key="contentType">3</int>
 								<bool key="placeholder">NO</bool>
 							</object>
-							<object class="IBNSLayoutConstraint" id="338893657">
+							<object class="IBNSLayoutConstraint" id="559306534">
 								<reference key="firstItem" ref="539123669"/>
-								<int key="firstAttribute">3</int>
+								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="103531975"/>
-								<int key="secondAttribute">3</int>
+								<int key="secondAttribute">5</int>
 								<float key="multiplier">1</float>
+								<string key="multiplierString">1</string>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="103531975"/>
+								<int key="scoringType">0</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
+							</object>
+							<object class="IBNSLayoutConstraint" id="852545348">
+								<reference key="firstItem" ref="521024449"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="539123669"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<string key="multiplierString">1</string>
 								<object class="IBLayoutConstant" key="constant">
-									<double key="value">10</double>
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="103531975"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+								<bool key="placeholder">NO</bool>
+							</object>
+							<object class="IBNSLayoutConstraint" id="750010708">
+								<reference key="firstItem" ref="521024449"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="118735803"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<string key="multiplierString">1</string>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">6</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="103531975"/>
-								<int key="scoringType">3</int>
-								<float key="scoringTypeFloat">9</float>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">3</int>
 								<bool key="placeholder">NO</bool>
 							</object>
-							<object class="IBNSLayoutConstraint" id="559306534">
-								<reference key="firstItem" ref="539123669"/>
+							<object class="IBNSLayoutConstraint" id="295298081">
+								<reference key="firstItem" ref="521024449"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="103531975"/>
+								<reference key="secondItem" ref="118735803"/>
 								<int key="secondAttribute">5</int>
 								<float key="multiplier">1</float>
+								<string key="multiplierString">1</string>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="103531975"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+								<bool key="placeholder">NO</bool>
+							</object>
+							<object class="IBNSLayoutConstraint" id="956205451">
+								<reference key="firstItem" ref="118735803"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="103531975"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<string key="multiplierString">1</string>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
 									<double key="value">20</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="103531975"/>
-								<int key="scoringType">0</int>
-								<float key="scoringTypeFloat">29</float>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">23</float>
 								<int key="contentType">3</int>
 								<bool key="placeholder">NO</bool>
 							</object>
 							<reference ref="539123669"/>
 							<reference ref="762565485"/>
 							<reference ref="764495169"/>
+							<reference ref="118735803"/>
+							<reference ref="521024449"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -715,11 +882,6 @@
 						<reference key="parent" ref="103531975"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">31</int>
-						<reference key="object" ref="338893657"/>
-						<reference key="parent" ref="103531975"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">32</int>
 						<reference key="object" ref="762565485"/>
 						<array class="NSMutableArray" key="children">
@@ -806,6 +968,57 @@
 						<reference key="object" ref="845520355"/>
 						<reference key="parent" ref="338765480"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">126</int>
+						<reference key="object" ref="727314944"/>
+						<reference key="parent" ref="103531975"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">127</int>
+						<reference key="object" ref="118735803"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="63691474"/>
+						</array>
+						<reference key="parent" ref="103531975"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">128</int>
+						<reference key="object" ref="63691474"/>
+						<reference key="parent" ref="118735803"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">130</int>
+						<reference key="object" ref="956205451"/>
+						<reference key="parent" ref="103531975"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">131</int>
+						<reference key="object" ref="521024449"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="550678479"/>
+						</array>
+						<reference key="parent" ref="103531975"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">132</int>
+						<reference key="object" ref="550678479"/>
+						<reference key="parent" ref="521024449"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">134</int>
+						<reference key="object" ref="295298081"/>
+						<reference key="parent" ref="103531975"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">135</int>
+						<reference key="object" ref="750010708"/>
+						<reference key="parent" ref="103531975"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">153</int>
+						<reference key="object" ref="852545348"/>
+						<reference key="parent" ref="103531975"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -822,23 +1035,37 @@
 				<string key="12.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="122.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="124.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="126.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="127.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="127.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="128.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<array key="13.IBNSViewMetadataConstraints">
+					<reference ref="956205451"/>
+					<reference ref="295298081"/>
+					<reference ref="750010708"/>
+					<reference ref="852545348"/>
 					<reference ref="559306534"/>
-					<reference ref="338893657"/>
 					<reference ref="783720041"/>
 					<reference ref="921593038"/>
 					<reference ref="206376115"/>
 					<reference ref="116293249"/>
 					<reference ref="728277728"/>
+					<reference ref="727314944"/>
 				</array>
 				<string key="13.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="130.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="131.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="131.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="132.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="134.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="135.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="15.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="153.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="30.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="31.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="32.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="32.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="33.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -858,7 +1085,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">125</int>
+			<int key="maxID">153</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/tikzit/src/osx/PropertyInspectorController.m b/tikzit/src/osx/PropertyInspectorController.m
index 981f746..039a30f 100644
--- a/tikzit/src/osx/PropertyInspectorController.m
+++ b/tikzit/src/osx/PropertyInspectorController.m
@@ -56,7 +56,12 @@
     [self setTargetAnchorNames: [[NSMutableArray alloc] initWithArray:[@"north south west east" componentsSeparatedByString:@" "]]];
 
     
-    [[self window] setLevel:NSNormalWindowLevel];
+    if ([[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.inspectorsontop"] == YES) {
+        [[self window] setLevel:NSFloatingWindowLevel];
+    } else {
+        [[self window] setLevel:NSNormalWindowLevel];
+    }
+
     [self showWindow:self];
 	return self;
 }
diff --git a/tikzit/src/osx/StylePaletteController.m b/tikzit/src/osx/StylePaletteController.m
index 8f87bd9..4fe46be 100644
--- a/tikzit/src/osx/StylePaletteController.m
+++ b/tikzit/src/osx/StylePaletteController.m
@@ -50,7 +50,12 @@
         if (nodeStyles == nil) nodeStyles = [NSMutableArray array];
 		if (edgeStyles == nil) edgeStyles = [NSMutableArray array];
         
-		[[self window] setLevel:NSNormalWindowLevel];
+        if ([[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.inspectorsontop"] == YES) {
+            [[self window] setLevel:NSFloatingWindowLevel];
+        } else {
+            [[self window] setLevel:NSNormalWindowLevel];
+        }
+        
 		[self showWindow:self];
 	}
 	
diff --git a/tikzit/src/osx/TikzFormatter.m b/tikzit/src/osx/TikzFormatter.m
index 9e45cb6..cb0865d 100644
--- a/tikzit/src/osx/TikzFormatter.m
+++ b/tikzit/src/osx/TikzFormatter.m
@@ -50,6 +50,10 @@
     NSRange addedRange;
     NSString *addedString;
     
+    if(![[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.autocomplete"]){
+        return YES;
+    }
+    
     addedRange = NSMakeRange(origSelRange.location, proposedSelRangePtr->location - origSelRange.location);
     addedString = [*partialStringPtr substringWithRange: addedRange];