From bac3d27d19167d398cf9bcd1c6c282ad7a3199fe Mon Sep 17 00:00:00 2001
From: Johan Paulsson <gonz@Akita.local>
Date: Mon, 2 Dec 2013 11:48:35 -0800
Subject: osx gui: Cosmetic changes to preference window

Added icons for the three tabs and moved the preamble to be default tab as that is likely to be the one most users will want to go to first.
---
 tikzit/src/osx/PreferenceController.m |  10 ++-
 tikzit/src/osx/Preferences.xib        | 161 ++++++++--------------------------
 2 files changed, 44 insertions(+), 127 deletions(-)

(limited to 'tikzit/src')

diff --git a/tikzit/src/osx/PreferenceController.m b/tikzit/src/osx/PreferenceController.m
index b08cbeb..ab992ed 100644
--- a/tikzit/src/osx/PreferenceController.m
+++ b/tikzit/src/osx/PreferenceController.m
@@ -82,19 +82,23 @@
 }
 
 - (void)awakeFromNib {
-    
+
     [[self window] setContentSize:[generalView frame].size];
     [[[self window] contentView] addSubview:generalView];
     [[[self window] contentView] setWantsLayer:YES];
-    
+
     updateController = [[UpdatePreferenceController alloc] initWithNibName:@"UpdatePreferencePanel" bundle:nil];
     [[updateController view] setFrame:[updateView frame]];
     [[[self window] contentView] replaceSubview:updateView with:[updateController view]];
     updateView = [updateController view];
-    
+
     [[preambleController view] setFrame:[preambleView frame]];
     [[[self window] contentView] replaceSubview:preambleView with:[preambleController view]];
     preambleView = [preambleController view];
+    
+    [[self window] setContentSize:[preambleView frame].size];
+    [[[self window] contentView] addSubview:preambleView];
+    currentViewTag = 3;
 }
 
 - (IBAction)switchView:(id)sender {
diff --git a/tikzit/src/osx/Preferences.xib b/tikzit/src/osx/Preferences.xib
index dc2e979..8247c8d 100644
--- a/tikzit/src/osx/Preferences.xib
+++ b/tikzit/src/osx/Preferences.xib
@@ -42,11 +42,11 @@
 				<string key="NSClassName">NSApplication</string>
 			</object>
 			<object class="NSWindowTemplate" id="1005">
-				<int key="NSWindowStyleMask">15</int>
+				<int key="NSWindowStyleMask">7</int>
 				<int key="NSWindowBacking">2</int>
 				<string key="NSWindowRect">{{196, 240}, {480, 270}}</string>
-				<int key="NSWTFlags">544735232</int>
-				<string key="NSWindowTitle">Window</string>
+				<int key="NSWTFlags">544736256</int>
+				<string key="NSWindowTitle">Preferences</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<object class="NSToolbar" key="NSViewClass" id="338765480">
 					<object class="NSMutableString" key="NSToolbarIdentifier">
@@ -64,13 +64,13 @@
 							<object class="NSMutableString" key="NSToolbarItemIdentifier">
 								<characters key="NS.bytes">197F9408-AFB0-404B-B2B6-4DB1250B0A80</characters>
 							</object>
-							<string key="NSToolbarItemLabel">Update</string>
-							<string key="NSToolbarItemPaletteLabel">Update</string>
+							<string key="NSToolbarItemLabel">Updates</string>
+							<string key="NSToolbarItemPaletteLabel">Updates</string>
 							<string key="NSToolbarItemToolTip"/>
 							<nil key="NSToolbarItemView"/>
 							<object class="NSCustomResource" key="NSToolbarItemImage">
 								<string key="NSClassName">NSImage</string>
-								<string key="NSResourceName">NSUserAccounts</string>
+								<string key="NSResourceName">updates</string>
 							</object>
 							<nil key="NSToolbarItemTarget"/>
 							<nil key="NSToolbarItemAction"/>
@@ -90,7 +90,7 @@
 							<string key="NSToolbarItemPaletteLabel">General</string>
 							<string key="NSToolbarItemToolTip"/>
 							<nil key="NSToolbarItemView"/>
-							<object class="NSCustomResource" key="NSToolbarItemImage" id="31080890">
+							<object class="NSCustomResource" key="NSToolbarItemImage">
 								<string key="NSClassName">NSImage</string>
 								<string key="NSResourceName">NSPreferencesGeneral</string>
 							</object>
@@ -104,7 +104,7 @@
 							<bool key="NSToolbarIsUserRemovable">YES</bool>
 							<int key="NSToolbarItemVisibilityPriority">0</int>
 						</object>
-						<object class="NSToolbarItem" key="A96DC4D4-2171-4D05-8C08-8D01B3829158" id="285819678">
+						<object class="NSToolbarItem" key="A96DC4D4-2171-4D05-8C08-8D01B3829158" id="265637031">
 							<object class="NSMutableString" key="NSToolbarItemIdentifier">
 								<characters key="NS.bytes">A96DC4D4-2171-4D05-8C08-8D01B3829158</characters>
 							</object>
@@ -112,7 +112,10 @@
 							<string key="NSToolbarItemPaletteLabel">Preamble</string>
 							<string key="NSToolbarItemToolTip"/>
 							<nil key="NSToolbarItemView"/>
-							<reference key="NSToolbarItemImage" ref="31080890"/>
+							<object class="NSCustomResource" key="NSToolbarItemImage">
+								<string key="NSClassName">NSImage</string>
+								<string key="NSResourceName">preamble</string>
+							</object>
 							<nil key="NSToolbarItemTarget"/>
 							<nil key="NSToolbarItemAction"/>
 							<string key="NSToolbarItemMinSize">{0, 0}</string>
@@ -131,7 +134,10 @@
 							<string key="NSToolbarItemPaletteLabel">Engine</string>
 							<string key="NSToolbarItemToolTip"/>
 							<nil key="NSToolbarItemView"/>
-							<reference key="NSToolbarItemImage" ref="31080890"/>
+							<object class="NSCustomResource" key="NSToolbarItemImage">
+								<string key="NSClassName">NSImage</string>
+								<string key="NSResourceName">engine</string>
+							</object>
 							<nil key="NSToolbarItemTarget"/>
 							<nil key="NSToolbarItemAction"/>
 							<string key="NSToolbarItemMinSize">{0, 0}</string>
@@ -143,16 +149,15 @@
 							<int key="NSToolbarItemVisibilityPriority">0</int>
 						</object>
 					</dictionary>
-					<array class="NSMutableArray" key="NSToolbarIBAllowedItems">
+					<array key="NSToolbarIBAllowedItems">
 						<reference ref="914743654"/>
 						<reference ref="224936444"/>
 						<reference ref="641338426"/>
-						<reference ref="285819678"/>
+						<reference ref="265637031"/>
 					</array>
 					<array key="NSToolbarIBDefaultItems">
-						<reference ref="914743654"/>
+						<reference ref="265637031"/>
 						<reference ref="641338426"/>
-						<reference ref="285819678"/>
 						<reference ref="224936444"/>
 					</array>
 					<array key="NSToolbarIBSelectableItems" id="0"/>
@@ -163,6 +168,7 @@
 					<string key="NSFrameSize">{480, 270}</string>
 					<reference key="NSSuperview"/>
 					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
@@ -178,6 +184,7 @@
 						<string key="NSFrame">{{18, 15}, {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">
@@ -262,7 +269,7 @@
 							<reference key="NSSupport" ref="924461577"/>
 							<string key="NSCellIdentifier">_NS:1535</string>
 							<reference key="NSControlView" ref="539123669"/>
-							<object class="NSColor" key="NSBackgroundColor" id="1052083660">
+							<object class="NSColor" key="NSBackgroundColor">
 								<int key="NSColorSpace">6</int>
 								<string key="NSCatalogName">System</string>
 								<string key="NSColorName">controlColor</string>
@@ -271,7 +278,7 @@
 									<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
 								</object>
 							</object>
-							<object class="NSColor" key="NSTextColor" id="266723537">
+							<object class="NSColor" key="NSTextColor">
 								<int key="NSColorSpace">6</int>
 								<string key="NSCatalogName">System</string>
 								<string key="NSColorName">controlTextColor</string>
@@ -292,33 +299,11 @@
 			<object class="NSCustomView" id="596032684">
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
-				<array class="NSMutableArray" key="NSSubviews">
-					<object class="NSTextField" id="621229635">
-						<reference key="NSNextResponder" ref="596032684"/>
-						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{214, 40}, {53, 17}}</string>
-						<reference key="NSSuperview" ref="596032684"/>
-						<reference key="NSWindow"/>
-						<string key="NSReuseIdentifierKey">_NS:1535</string>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="653425178">
-							<int key="NSCellFlags">68157504</int>
-							<int key="NSCellFlags2">272630784</int>
-							<string key="NSContents">General</string>
-							<reference key="NSSupport" ref="924461577"/>
-							<string key="NSCellIdentifier">_NS:1535</string>
-							<reference key="NSControlView" ref="621229635"/>
-							<reference key="NSBackgroundColor" ref="1052083660"/>
-							<reference key="NSTextColor" ref="266723537"/>
-						</object>
-						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
-					</object>
-				</array>
+				<array class="NSMutableArray" key="NSSubviews"/>
 				<string key="NSFrameSize">{480, 96}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="621229635"/>
+				<reference key="NSNextKeyView"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<string key="NSClassName">NSView</string>
 			</object>
@@ -329,16 +314,18 @@
 				<string key="NSFrameSize">{480, 115}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<string key="NSClassName">NSView</string>
 			</object>
-			<object class="NSCustomView" id="940688117">
+			<object class="NSCustomView" id="812696929">
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">12</int>
 				<array class="NSMutableArray" key="NSSubviews"/>
 				<string key="NSFrameSize">{557, 354}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<string key="NSClassName">NSView</string>
 			</object>
@@ -408,7 +395,7 @@
 					<object class="IBActionConnection" key="connection">
 						<string key="label">switchView:</string>
 						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="285819678"/>
+						<reference key="destination" ref="265637031"/>
 					</object>
 					<int key="connectionID">120</int>
 				</object>
@@ -416,7 +403,7 @@
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">preambleView</string>
 						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="940688117"/>
+						<reference key="destination" ref="812696929"/>
 					</object>
 					<int key="connectionID">121</int>
 				</object>
@@ -508,7 +495,7 @@
 							<reference ref="641338426"/>
 							<reference ref="914743654"/>
 							<reference ref="224936444"/>
-							<reference ref="285819678"/>
+							<reference ref="265637031"/>
 						</array>
 						<reference key="parent" ref="1005"/>
 					</object>
@@ -654,43 +641,7 @@
 					<object class="IBObjectRecord">
 						<int key="objectID">14</int>
 						<reference key="object" ref="596032684"/>
-						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="536442865">
-								<reference key="firstItem" ref="621229635"/>
-								<int key="firstAttribute">10</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="596032684"/>
-								<int key="secondAttribute">10</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="596032684"/>
-								<int key="scoringType">5</int>
-								<float key="scoringTypeFloat">22</float>
-								<int key="contentType">2</int>
-								<bool key="placeholder">NO</bool>
-							</object>
-							<object class="IBNSLayoutConstraint" id="826972647">
-								<reference key="firstItem" ref="621229635"/>
-								<int key="firstAttribute">9</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="596032684"/>
-								<int key="secondAttribute">9</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="596032684"/>
-								<int key="scoringType">5</int>
-								<float key="scoringTypeFloat">22</float>
-								<int key="contentType">2</int>
-								<bool key="placeholder">NO</bool>
-							</object>
-							<reference ref="621229635"/>
-						</array>
+						<array class="NSMutableArray" key="children"/>
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
@@ -706,29 +657,6 @@
 						<reference key="object" ref="459248896"/>
 						<reference key="parent" ref="539123669"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">19</int>
-						<reference key="object" ref="621229635"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="653425178"/>
-						</array>
-						<reference key="parent" ref="596032684"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">20</int>
-						<reference key="object" ref="653425178"/>
-						<reference key="parent" ref="621229635"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">28</int>
-						<reference key="object" ref="826972647"/>
-						<reference key="parent" ref="596032684"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">29</int>
-						<reference key="object" ref="536442865"/>
-						<reference key="parent" ref="596032684"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">30</int>
 						<reference key="object" ref="559306534"/>
@@ -808,12 +736,12 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">118</int>
-						<reference key="object" ref="940688117"/>
+						<reference key="object" ref="812696929"/>
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">119</int>
-						<reference key="object" ref="285819678"/>
+						<reference key="object" ref="265637031"/>
 						<reference key="parent" ref="338765480"/>
 					</object>
 				</array>
@@ -840,20 +768,11 @@
 					<reference ref="728277728"/>
 				</array>
 				<string key="13.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array class="NSMutableArray" key="14.IBNSViewMetadataConstraints">
-					<reference ref="826972647"/>
-					<reference ref="536442865"/>
-				</array>
 				<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="16.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="19.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="28.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="29.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"/>
@@ -879,14 +798,6 @@
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">NSLayoutConstraint</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
-					</object>
-				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">PreferenceController</string>
 					<string key="superclassName">NSWindowController</string>
@@ -948,7 +859,9 @@
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
 			<string key="NSPreferencesGeneral">{32, 32}</string>
 			<string key="NSSwitch">{15, 15}</string>
-			<string key="NSUserAccounts">{32, 32}</string>
+			<string key="engine">{32, 32}</string>
+			<string key="preamble">{32, 32}</string>
+			<string key="updates">{32, 32}</string>
 		</dictionary>
 		<bool key="IBDocument.UseAutolayout">YES</bool>
 	</data>
-- 
cgit v1.2.3