Revamp toolbars

English.lproj/VLPDFWindow.xib

@@ -11,12 +11,14 @@
 			<string key="NS.object.0">1617</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
-			<string>NSCustomView</string>
-			<string>NSWindowTemplate</string>
 			<string>NSView</string>
-			<string>NSButtonCell</string>
+			<string>NSWindowTemplate</string>
+			<string>NSToolbarItem</string>
+			<string>NSToolbarSpaceItem</string>
+			<string>NSCustomView</string>
+			<string>NSToolbar</string>
+			<string>NSToolbarFlexibleSpaceItem</string>
 			<string>NSCustomObject</string>
-			<string>NSButton</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -41,13 +43,211 @@
 				<object class="NSMutableString" key="NSWindowClass">
 					<characters key="NS.bytes">NSWindow</characters>
 				</object>
-				<object class="NSMutableString" key="NSViewClass">
+				<object class="NSToolbar" key="NSViewClass" id="829973717">
-					<characters key="NS.bytes">View</characters>
+					<object class="NSMutableString" key="NSToolbarIdentifier">
+						<characters key="NS.bytes">56D7246E-8274-496F-A057-3D71A2E6C460</characters>
+					</object>
+					<nil key="NSToolbarDelegate"/>
+					<bool key="NSToolbarPrefersToBeShown">YES</bool>
+					<bool key="NSToolbarShowsBaselineSeparator">YES</bool>
+					<bool key="NSToolbarAllowsUserCustomization">YES</bool>
+					<bool key="NSToolbarAutosavesConfiguration">NO</bool>
+					<int key="NSToolbarDisplayMode">1</int>
+					<int key="NSToolbarSizeMode">1</int>
+					<dictionary class="NSMutableDictionary" key="NSToolbarIBIdentifiedItems">
+						<object class="NSToolbarItem" key="04B5A1CB-0E26-4490-8A48-EE1373EA7D10" id="348484085">
+							<object class="NSMutableString" key="NSToolbarItemIdentifier">
+								<characters key="NS.bytes">04B5A1CB-0E26-4490-8A48-EE1373EA7D10</characters>
+							</object>
+							<string key="NSToolbarItemLabel">In</string>
+							<string key="NSToolbarItemPaletteLabel">Zoom In</string>
+							<string key="NSToolbarItemToolTip"/>
+							<nil key="NSToolbarItemView"/>
+							<object class="NSCustomResource" key="NSToolbarItemImage">
+								<string key="NSClassName">NSImage</string>
+								<string key="NSResourceName">zoomin</string>
+							</object>
+							<nil key="NSToolbarItemTarget"/>
+							<nil key="NSToolbarItemAction"/>
+							<string key="NSToolbarItemMinSize">{0, 0}</string>
+							<string key="NSToolbarItemMaxSize">{0, 0}</string>
+							<bool key="NSToolbarItemEnabled">YES</bool>
+							<bool key="NSToolbarItemAutovalidates">YES</bool>
+							<int key="NSToolbarItemTag">-1</int>
+							<bool key="NSToolbarIsUserRemovable">YES</bool>
+							<int key="NSToolbarItemVisibilityPriority">0</int>
+						</object>
+						<object class="NSToolbarItem" key="14127016-2429-42EC-A13C-A5CC54E1E862" id="690659124">
+							<object class="NSMutableString" key="NSToolbarItemIdentifier">
+								<characters key="NS.bytes">14127016-2429-42EC-A13C-A5CC54E1E862</characters>
+							</object>
+							<string key="NSToolbarItemLabel">Prev</string>
+							<string key="NSToolbarItemPaletteLabel">Prev</string>
+							<string key="NSToolbarItemToolTip"/>
+							<nil key="NSToolbarItemView"/>
+							<object class="NSCustomResource" key="NSToolbarItemImage">
+								<string key="NSClassName">NSImage</string>
+								<string key="NSResourceName">prev</string>
+							</object>
+							<nil key="NSToolbarItemTarget"/>
+							<nil key="NSToolbarItemAction"/>
+							<string key="NSToolbarItemMinSize">{0, 0}</string>
+							<string key="NSToolbarItemMaxSize">{0, 0}</string>
+							<bool key="NSToolbarItemEnabled">YES</bool>
+							<bool key="NSToolbarItemAutovalidates">YES</bool>
+							<int key="NSToolbarItemTag">-1</int>
+							<bool key="NSToolbarIsUserRemovable">YES</bool>
+							<int key="NSToolbarItemVisibilityPriority">0</int>
+						</object>
+						<object class="NSToolbarItem" key="A8A600C7-B3FB-40A2-B2F4-F434D6C8C474" id="899819248">
+							<object class="NSMutableString" key="NSToolbarItemIdentifier">
+								<characters key="NS.bytes">A8A600C7-B3FB-40A2-B2F4-F434D6C8C474</characters>
+							</object>
+							<string key="NSToolbarItemLabel">Out</string>
+							<string key="NSToolbarItemPaletteLabel">Zoom Out</string>
+							<string key="NSToolbarItemToolTip"/>
+							<nil key="NSToolbarItemView"/>
+							<object class="NSCustomResource" key="NSToolbarItemImage">
+								<string key="NSClassName">NSImage</string>
+								<string key="NSResourceName">zoomout</string>
+							</object>
+							<nil key="NSToolbarItemTarget"/>
+							<nil key="NSToolbarItemAction"/>
+							<string key="NSToolbarItemMinSize">{0, 0}</string>
+							<string key="NSToolbarItemMaxSize">{0, 0}</string>
+							<bool key="NSToolbarItemEnabled">YES</bool>
+							<bool key="NSToolbarItemAutovalidates">YES</bool>
+							<int key="NSToolbarItemTag">-1</int>
+							<bool key="NSToolbarIsUserRemovable">YES</bool>
+							<int key="NSToolbarItemVisibilityPriority">0</int>
+						</object>
+						<object class="NSToolbarItem" key="ECFCD666-BB8C-4A33-916E-1E8C707ED66A" id="166761534">
+							<object class="NSMutableString" key="NSToolbarItemIdentifier">
+								<characters key="NS.bytes">ECFCD666-BB8C-4A33-916E-1E8C707ED66A</characters>
+							</object>
+							<string key="NSToolbarItemLabel">Next</string>
+							<string key="NSToolbarItemPaletteLabel">Next</string>
+							<string key="NSToolbarItemToolTip"/>
+							<nil key="NSToolbarItemView"/>
+							<object class="NSCustomResource" key="NSToolbarItemImage">
+								<string key="NSClassName">NSImage</string>
+								<string key="NSResourceName">next</string>
+							</object>
+							<nil key="NSToolbarItemTarget"/>
+							<nil key="NSToolbarItemAction"/>
+							<string key="NSToolbarItemMinSize">{0, 0}</string>
+							<string key="NSToolbarItemMaxSize">{0, 0}</string>
+							<bool key="NSToolbarItemEnabled">YES</bool>
+							<bool key="NSToolbarItemAutovalidates">YES</bool>
+							<int key="NSToolbarItemTag">-1</int>
+							<bool key="NSToolbarIsUserRemovable">YES</bool>
+							<int key="NSToolbarItemVisibilityPriority">0</int>
+						</object>
+						<object class="NSToolbarFlexibleSpaceItem" key="NSToolbarFlexibleSpaceItem" id="186551480">
+							<string key="NSToolbarItemIdentifier">NSToolbarFlexibleSpaceItem</string>
+							<string key="NSToolbarItemLabel"/>
+							<string key="NSToolbarItemPaletteLabel">Flexible Space</string>
+							<nil key="NSToolbarItemToolTip"/>
+							<nil key="NSToolbarItemView"/>
+							<nil key="NSToolbarItemImage"/>
+							<nil key="NSToolbarItemTarget"/>
+							<nil key="NSToolbarItemAction"/>
+							<string key="NSToolbarItemMinSize">{1, 5}</string>
+							<string key="NSToolbarItemMaxSize">{20000, 32}</string>
+							<bool key="NSToolbarItemEnabled">YES</bool>
+							<bool key="NSToolbarItemAutovalidates">YES</bool>
+							<int key="NSToolbarItemTag">-1</int>
+							<bool key="NSToolbarIsUserRemovable">YES</bool>
+							<int key="NSToolbarItemVisibilityPriority">0</int>
+							<object class="NSMenuItem" key="NSToolbarItemMenuFormRepresentation">
+								<bool key="NSIsDisabled">YES</bool>
+								<bool key="NSIsSeparator">YES</bool>
+								<string key="NSTitle"/>
+								<string key="NSKeyEquiv"/>
+								<int key="NSKeyEquivModMask">1048576</int>
+								<int key="NSMnemonicLoc">2147483647</int>
+								<object class="NSCustomResource" key="NSOnImage" id="428744907">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">NSMenuCheckmark</string>
+								</object>
+								<object class="NSCustomResource" key="NSMixedImage" id="306505762">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">NSMenuMixedState</string>
+								</object>
+							</object>
+						</object>
+						<object class="NSToolbarItem" key="NSToolbarPrintItem" id="698985119">
+							<string key="NSToolbarItemIdentifier">NSToolbarPrintItem</string>
+							<string key="NSToolbarItemLabel">Print</string>
+							<string key="NSToolbarItemPaletteLabel">Print</string>
+							<string key="NSToolbarItemToolTip">Print</string>
+							<nil key="NSToolbarItemView"/>
+							<object class="NSCustomResource" key="NSToolbarItemImage">
+								<string key="NSClassName">NSImage</string>
+								<string key="NSResourceName">NSToolbarPrint</string>
+							</object>
+							<nil key="NSToolbarItemTarget"/>
+							<string key="NSToolbarItemAction">printDocument:</string>
+							<string key="NSToolbarItemMinSize">{0, 0}</string>
+							<string key="NSToolbarItemMaxSize">{0, 0}</string>
+							<bool key="NSToolbarItemEnabled">YES</bool>
+							<bool key="NSToolbarItemAutovalidates">YES</bool>
+							<int key="NSToolbarItemTag">-1</int>
+							<bool key="NSToolbarIsUserRemovable">YES</bool>
+							<int key="NSToolbarItemVisibilityPriority">0</int>
+						</object>
+						<object class="NSToolbarSpaceItem" key="NSToolbarSpaceItem" id="160768419">
+							<string key="NSToolbarItemIdentifier">NSToolbarSpaceItem</string>
+							<string key="NSToolbarItemLabel"/>
+							<string key="NSToolbarItemPaletteLabel">Space</string>
+							<nil key="NSToolbarItemToolTip"/>
+							<nil key="NSToolbarItemView"/>
+							<nil key="NSToolbarItemImage"/>
+							<nil key="NSToolbarItemTarget"/>
+							<nil key="NSToolbarItemAction"/>
+							<string key="NSToolbarItemMinSize">{32, 5}</string>
+							<string key="NSToolbarItemMaxSize">{32, 32}</string>
+							<bool key="NSToolbarItemEnabled">YES</bool>
+							<bool key="NSToolbarItemAutovalidates">YES</bool>
+							<int key="NSToolbarItemTag">-1</int>
+							<bool key="NSToolbarIsUserRemovable">YES</bool>
+							<int key="NSToolbarItemVisibilityPriority">0</int>
+							<object class="NSMenuItem" key="NSToolbarItemMenuFormRepresentation">
+								<bool key="NSIsDisabled">YES</bool>
+								<bool key="NSIsSeparator">YES</bool>
+								<string key="NSTitle"/>
+								<string key="NSKeyEquiv"/>
+								<int key="NSKeyEquivModMask">1048576</int>
+								<int key="NSMnemonicLoc">2147483647</int>
+								<reference key="NSOnImage" ref="428744907"/>
+								<reference key="NSMixedImage" ref="306505762"/>
+							</object>
+						</object>
+					</dictionary>
+					<array class="NSMutableArray" key="NSToolbarIBAllowedItems">
+						<reference ref="698985119"/>
+						<reference ref="160768419"/>
+						<reference ref="186551480"/>
+						<reference ref="690659124"/>
+						<reference ref="166761534"/>
+						<reference ref="348484085"/>
+						<reference ref="899819248"/>
+					</array>
+					<array key="NSToolbarIBDefaultItems">
+						<reference ref="348484085"/>
+						<reference ref="899819248"/>
+						<reference ref="160768419"/>
+						<reference ref="690659124"/>
+						<reference ref="166761534"/>
+						<reference ref="186551480"/>
+						<reference ref="698985119"/>
+					</array>
+					<array key="NSToolbarIBSelectableItems" id="0"/>
 				</object>
 				<nil key="NSUserInterfaceItemIdentifier"/>
 				<string key="NSWindowContentMinSize">{200, 300}</string>
 				<object class="NSView" key="NSWindowView" id="202172628">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<array class="NSMutableArray" key="NSSubviews">
 						<object class="NSCustomView" id="502862344">
@@ -55,142 +255,19 @@
 							<int key="NSvFlags">274</int>
 							<string key="NSFrameSize">{650, 720}</string>
 							<reference key="NSSuperview" ref="202172628"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView"/>
 							<string key="NSClassName">VLPDFView</string>
 							<string key="NSExtension">PDFView</string>
 						</object>
 					</array>
-					<string key="NSFrame">{{1, 9}, {650, 720}}</string>
+					<string key="NSFrameSize">{650, 720}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="502862344"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
-				<string key="NSMinSize">{200, 322}</string>
+				<string key="NSMinSize">{200, 378}</string>
-				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
-				<bool key="NSWindowIsRestorable">YES</bool>
-			</object>
-			<object class="NSWindowTemplate" id="784826222">
-				<int key="NSWindowStyleMask">15</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{82, 350}, {480, 360}}</string>
-				<int key="NSWTFlags">1886912512</int>
-				<object class="NSMutableString" key="NSWindowTitle">
-					<characters key="NS.bytes">Window</characters>
-				</object>
-				<object class="NSMutableString" key="NSWindowClass">
-					<characters key="NS.bytes">NSWindow</characters>
-				</object>
-				<object class="NSMutableString" key="NSViewClass">
-					<characters key="NS.bytes">View</characters>
-				</object>
-				<nil key="NSUserInterfaceItemIdentifier"/>
-				<string key="NSWindowContentMinSize">{213, 107}</string>
-				<object class="NSView" key="NSWindowView" id="858835351">
-					<nil key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<array class="NSMutableArray" key="NSSubviews">
-						<object class="NSButton" id="896819005">
-							<reference key="NSNextResponder" ref="858835351"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{23, 286}, {58, 56}}</string>
-							<reference key="NSSuperview" ref="858835351"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="892652882">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Previous</string>
-								<object class="NSFont" key="NSSupport" id="24">
-									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">10</double>
-									<int key="NSfFlags">16</int>
-								</object>
-								<reference key="NSControlView" ref="896819005"/>
-								<int key="NSButtonFlags">-2037628673</int>
-								<int key="NSButtonFlags2">2</int>
-								<object class="NSCustomResource" key="NSNormalImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">prevpage</string>
-								</object>
-								<string key="NSAlternateContents">Previous</string>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-							</object>
-						</object>
-						<object class="NSButton" id="850654445">
-							<reference key="NSNextResponder" ref="858835351"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{85, 286}, {58, 56}}</string>
-							<reference key="NSSuperview" ref="858835351"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="933713419">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Next</string>
-								<reference key="NSSupport" ref="24"/>
-								<reference key="NSControlView" ref="850654445"/>
-								<int key="NSButtonFlags">-2037628673</int>
-								<int key="NSButtonFlags2">2</int>
-								<object class="NSCustomResource" key="NSNormalImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">nextpage</string>
-								</object>
-								<string key="NSAlternateContents">Next</string>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-							</object>
-						</object>
-						<object class="NSButton" id="907144165">
-							<reference key="NSNextResponder" ref="858835351"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{147, 286}, {58, 56}}</string>
-							<reference key="NSSuperview" ref="858835351"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="707532010">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Zoom In</string>
-								<reference key="NSSupport" ref="24"/>
-								<reference key="NSControlView" ref="907144165"/>
-								<int key="NSButtonFlags">-2037628673</int>
-								<int key="NSButtonFlags2">2</int>
-								<object class="NSCustomResource" key="NSNormalImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">zoomin</string>
-								</object>
-								<string key="NSAlternateContents">Zoom In</string>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-							</object>
-						</object>
-						<object class="NSButton" id="36041173">
-							<reference key="NSNextResponder" ref="858835351"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{216, 286}, {58, 56}}</string>
-							<reference key="NSSuperview" ref="858835351"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="758689764">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Zoom Out</string>
-								<reference key="NSSupport" ref="24"/>
-								<reference key="NSControlView" ref="36041173"/>
-								<int key="NSButtonFlags">-2037628673</int>
-								<int key="NSButtonFlags2">2</int>
-								<object class="NSCustomResource" key="NSNormalImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">zoomout</string>
-								</object>
-								<string key="NSAlternateContents">Zoom Out</string>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-							</object>
-						</object>
-					</array>
-					<string key="NSFrame">{{1, 9}, {480, 360}}</string>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
-				<string key="NSMinSize">{213, 129}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
@@ -205,38 +282,6 @@
 					</object>
 					<int key="connectionID">10</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">prevPageItem</string>
-						<reference key="source" ref="536165467"/>
-						<reference key="destination" ref="896819005"/>
-					</object>
-					<int key="connectionID">31</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">zoomInItem</string>
-						<reference key="source" ref="536165467"/>
-						<reference key="destination" ref="907144165"/>
-					</object>
-					<int key="connectionID">33</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">zoomOutItem</string>
-						<reference key="source" ref="536165467"/>
-						<reference key="destination" ref="36041173"/>
-					</object>
-					<int key="connectionID">34</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">nextPageItem</string>
-						<reference key="source" ref="536165467"/>
-						<reference key="destination" ref="850654445"/>
-					</object>
-					<int key="connectionID">42</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">pdfView</string>
@@ -249,40 +294,48 @@
 					<object class="IBActionConnection" key="connection">
 						<string key="label">goToPreviousPage:</string>
 						<reference key="source" ref="426282390"/>
-						<reference key="destination" ref="896819005"/>
+						<reference key="destination" ref="690659124"/>
 					</object>
-					<int key="connectionID">49</int>
+					<int key="connectionID">100027</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">goToNextPage:</string>
 						<reference key="source" ref="426282390"/>
-						<reference key="destination" ref="850654445"/>
+						<reference key="destination" ref="166761534"/>
 					</object>
-					<int key="connectionID">50</int>
+					<int key="connectionID">100028</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">zoomIn:</string>
 						<reference key="source" ref="426282390"/>
-						<reference key="destination" ref="907144165"/>
+						<reference key="destination" ref="348484085"/>
 					</object>
-					<int key="connectionID">51</int>
+					<int key="connectionID">100029</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">zoomOut:</string>
 						<reference key="source" ref="426282390"/>
-						<reference key="destination" ref="36041173"/>
+						<reference key="destination" ref="899819248"/>
 					</object>
-					<int key="connectionID">52</int>
+					<int key="connectionID">100030</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">printDocument:</string>
+						<reference key="source" ref="426282390"/>
+						<reference key="destination" ref="698985119"/>
+					</object>
+					<int key="connectionID">100031</int>
 				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
 					<object class="IBObjectRecord">
 						<int key="objectID">0</int>
-						<array key="object" id="0"/>
+						<reference key="object" ref="0"/>
 						<reference key="children" ref="445201742"/>
 						<nil key="parent"/>
 					</object>
@@ -303,6 +356,7 @@
 						<reference key="object" ref="730829871"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="202172628"/>
+							<reference ref="829973717"/>
 						</array>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">Window</string>
@@ -320,132 +374,75 @@
 						<reference key="object" ref="502862344"/>
 						<reference key="parent" ref="202172628"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">11</int>
-						<reference key="object" ref="784826222"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="858835351"/>
-						</array>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Toolbar Items</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">12</int>
-						<reference key="object" ref="858835351"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="896819005"/>
-							<reference ref="850654445"/>
-							<reference ref="907144165"/>
-							<reference ref="36041173"/>
-						</array>
-						<reference key="parent" ref="784826222"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">13</int>
-						<reference key="object" ref="896819005"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="892652882"/>
-						</array>
-						<reference key="parent" ref="858835351"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">14</int>
-						<reference key="object" ref="850654445"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="933713419"/>
-						</array>
-						<reference key="parent" ref="858835351"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">15</int>
-						<reference key="object" ref="907144165"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="707532010"/>
-						</array>
-						<reference key="parent" ref="858835351"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">16</int>
-						<reference key="object" ref="36041173"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="758689764"/>
-						</array>
-						<reference key="parent" ref="858835351"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100013</int>
-						<reference key="object" ref="892652882"/>
-						<reference key="parent" ref="896819005"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100014</int>
-						<reference key="object" ref="933713419"/>
-						<reference key="parent" ref="850654445"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100015</int>
-						<reference key="object" ref="707532010"/>
-						<reference key="parent" ref="907144165"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100016</int>
-						<reference key="object" ref="758689764"/>
-						<reference key="parent" ref="36041173"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">-3</int>
 						<reference key="object" ref="618453189"/>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">Application</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100017</int>
+						<reference key="object" ref="829973717"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="698985119"/>
+							<reference ref="160768419"/>
+							<reference ref="186551480"/>
+							<reference ref="690659124"/>
+							<reference ref="166761534"/>
+							<reference ref="348484085"/>
+							<reference ref="899819248"/>
+						</array>
+						<reference key="parent" ref="730829871"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100020</int>
+						<reference key="object" ref="698985119"/>
+						<reference key="parent" ref="829973717"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100021</int>
+						<reference key="object" ref="160768419"/>
+						<reference key="parent" ref="829973717"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100022</int>
+						<reference key="object" ref="186551480"/>
+						<reference key="parent" ref="829973717"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100023</int>
+						<reference key="object" ref="690659124"/>
+						<reference key="parent" ref="829973717"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100024</int>
+						<reference key="object" ref="166761534"/>
+						<reference key="parent" ref="829973717"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100025</int>
+						<reference key="object" ref="348484085"/>
+						<reference key="parent" ref="829973717"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100026</int>
+						<reference key="object" ref="899819248"/>
+						<reference key="parent" ref="829973717"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
 				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="100013.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100017.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="100014.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100020.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="100015.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100021.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="100016.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100022.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100023.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="12.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100024.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSMutableDictionary" key="13.IBAttributePlaceholdersKey">
+				<string key="100025.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string key="NS.key.0">ToolTip</string>
+				<string key="100026.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="IBToolTipAttribute" key="NS.object.0">
-						<string key="name">ToolTip</string>
-						<reference key="object" ref="896819005"/>
-						<string key="toolTip">Previous Page</string>
-					</object>
-				</object>
-				<string key="13.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSMutableDictionary" key="14.IBAttributePlaceholdersKey">
-					<string key="NS.key.0">ToolTip</string>
-					<object class="IBToolTipAttribute" key="NS.object.0">
-						<string key="name">ToolTip</string>
-						<reference key="object" ref="850654445"/>
-						<string key="toolTip">Next Page</string>
-					</object>
-				</object>
-				<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSMutableDictionary" key="15.IBAttributePlaceholdersKey">
-					<string key="NS.key.0">ToolTip</string>
-					<object class="IBToolTipAttribute" key="NS.object.0">
-						<string key="name">ToolTip</string>
-						<reference key="object" ref="907144165"/>
-						<string key="toolTip">Zoom In</string>
-					</object>
-				</object>
-				<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSMutableDictionary" key="16.IBAttributePlaceholdersKey">
-					<string key="NS.key.0">ToolTip</string>
-					<object class="IBToolTipAttribute" key="NS.object.0">
-						<string key="name">ToolTip</string>
-						<reference key="object" ref="36041173"/>
-						<string key="toolTip">Zoom Out</string>
-					</object>
-				</object>
-				<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -454,7 +451,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">100016</int>
+			<int key="maxID">100031</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -512,6 +509,47 @@
 						<string key="minorKey">./Classes/IKImageView.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSDocument</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="printDocument:">id</string>
+						<string key="revertDocumentToSaved:">id</string>
+						<string key="runPageLayout:">id</string>
+						<string key="saveDocument:">id</string>
+						<string key="saveDocumentAs:">id</string>
+						<string key="saveDocumentTo:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="printDocument:">
+							<string key="name">printDocument:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="revertDocumentToSaved:">
+							<string key="name">revertDocumentToSaved:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="runPageLayout:">
+							<string key="name">runPageLayout:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="saveDocument:">
+							<string key="name">saveDocument:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="saveDocumentAs:">
+							<string key="name">saveDocumentAs:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="saveDocumentTo:">
+							<string key="name">saveDocumentTo:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NSDocument.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">VLPDFView</string>
 					<string key="superclassName">PDFView</string>
@@ -568,10 +606,13 @@
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="nextpage">{32, 32}</string>
+			<string key="NSMenuCheckmark">{9, 8}</string>
-			<string key="prevpage">{32, 32}</string>
+			<string key="NSMenuMixedState">{7, 2}</string>
-			<string key="zoomin">{32, 32}</string>
+			<string key="NSToolbarPrint">{32, 32}</string>
-			<string key="zoomout">{32, 32}</string>
+			<string key="next">{512, 512}</string>
+			<string key="prev">{512, 512}</string>
+			<string key="zoomin">{512, 512}</string>
+			<string key="zoomout">{512, 512}</string>
 		</dictionary>
 	</data>
 </archive>

Sources/VLDocument.mm

@@ -579,10 +579,20 @@
 {	
 	if (VLSoundOut::Instance()->Playing()) {
 		[self stop:sender];
-		[sender setTitle:@"Play"];
+        if ([sender isKindOfClass:[NSMenuItem class]]) {
+            [sender setTitle:@"Play"];
+        } else {
+            [sender setLabel:@"Play"];
+            [sender setImage:[NSImage imageNamed:@"play.icns"]];
+        }
 	} else {
 		[self play:sender];
-		[sender setTitle:@"Stop"];
+        if ([sender isKindOfClass:[NSMenuItem class]]) {
+            [sender setTitle:@"Stop"];
+        } else {
+            [sender setLabel:@"Stop"];
+            [sender setImage:[NSImage imageNamed:@"stop.icns"]];
+        }
 	}
 }
 

Sources/VLPDFWindow.h

@@ -5,17 +5,14 @@
 //
 //      (MN)    Matthias Neeracher
 //
-// Copyright © 2005-2007 Matthias Neeracher
+// Copyright © 2005-2011 Matthias Neeracher
 //
 
 #import <Cocoa/Cocoa.h>
+#import <Quartz/Quartz.h>
 
 @interface VLPDFWindow : NSWindowController <NSToolbarDelegate> {
-	IBOutlet id	pdfView;
+	IBOutlet PDFView *	pdfView;
-	IBOutlet id prevPageItem;
-	IBOutlet id nextPageItem;
-	IBOutlet id zoomInItem;
-	IBOutlet id zoomOutItem;
 }
 
 - (void)reloadPDF;

Sources/VLPDFWindow.mm

@@ -5,7 +5,7 @@
 //
 //      (MN)    Matthias Neeracher
 //
-// Copyright © 2005-2007 Matthias Neeracher
+// Copyright © 2005-2011 Matthias Neeracher
 //
 
 #import "VLPDFWindow.h"
@@ -14,12 +14,6 @@
 
 @implementation VLPDFWindow
 
-static NSString* 	sOutputToolbarIdentifier		= @"Lilypond Output Toolbar Identifier";
-static NSString*	sPrevPageToolbarItemIdentifier	= @"Prev Page Toolbar Item Identifier";
-static NSString*	sNextPageToolbarItemIdentifier	= @"Next Page Toolbar Item Identifier";
-static NSString*	sZoomInToolbarItemIdentifier	= @"Zoom In Toolbar Item Identifier";
-static NSString*	sZoomOutToolbarItemIdentifier	= @"Zoom Out Toolbar Item Identifier";
-
 - (NSString *)windowTitleForDocumentDisplayName:(NSString *)displayName
 {
 	return [displayName stringByAppendingString: @" - Output"];
@@ -83,96 +77,6 @@ static NSString*	sZoomOutToolbarItemIdentifier	= @"Zoom Out Toolbar Item Identif
 
 - (void)windowDidLoad
 {
-	// Create a new toolbar instance, and attach it to our document window 
-    NSToolbar *toolbar = [[[NSToolbar alloc] initWithIdentifier: sOutputToolbarIdentifier] autorelease];
-    
-    // Set up toolbar properties: Allow customization, give a default display mode, and remember state in user defaults 
-    [toolbar setAllowsUserCustomization: YES];
-    [toolbar setAutosavesConfiguration: YES];
-    
-    // We are the delegate
-    [toolbar setDelegate: self];
-    
-    // Attach the toolbar to the document window 
-    [[self window] setToolbar: toolbar];
-}
-
-
-- (NSToolbarItem *) toolbar: (NSToolbar *)toolbar itemForItemIdentifier: (NSString *) itemIdent willBeInsertedIntoToolbar:(BOOL) willBeInserted {
-    // Required delegate method:  Given an item identifier, this method returns an item 
-    // The toolbar will use this method to obtain toolbar items that can be displayed in the customization sheet, or in the toolbar itself 
-    NSToolbarItem *	toolbarItem = nil;
-    id				prototype   = nil;
-	
-    if ([itemIdent isEqual: sPrevPageToolbarItemIdentifier]) 
-		prototype = prevPageItem;
-    else if ([itemIdent isEqual: sNextPageToolbarItemIdentifier]) 
-		prototype = nextPageItem;
-    else if ([itemIdent isEqual: sZoomInToolbarItemIdentifier]) 
-		prototype = zoomInItem;
-    else if ([itemIdent isEqual: sZoomOutToolbarItemIdentifier]) 
-		prototype = zoomOutItem;
-	
-	if (prototype) {
-        toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: itemIdent] autorelease];
-	
-        // Set the text label to be displayed in the toolbar and customization palette 
-		[toolbarItem setLabel: [prototype title]];
-		[toolbarItem setPaletteLabel: [prototype alternateTitle]];
-	
-		// Set up a reasonable tooltip, and image   Note, these aren't localized, but you will likely want to localize many of the item's properties 
-		[toolbarItem setToolTip: [prototype toolTip]];
-		[toolbarItem setImage: [prototype image]];
-	
-		// Tell the item what message to send when it is clicked 
-		[toolbarItem setTarget: [prototype target]];
-		[toolbarItem setAction: [prototype action]];
-    } else {
-		// itemIdent refered to a toolbar item that is not provide or supported by us or cocoa 
-		// Returning nil will inform the toolbar this kind of item is not supported 
-		toolbarItem = nil;
-    }
-    return toolbarItem;
-}
-
-- (NSArray *) toolbarDefaultItemIdentifiers: (NSToolbar *) toolbar {
-    // Required delegate method:  Returns the ordered list of items to be shown in the toolbar by default    
-    // If during the toolbar's initialization, no overriding values are found in the user defaults, or if the
-    // user chooses to revert to the default items this set will be used 
-    return [NSArray arrayWithObjects: NSToolbarPrintItemIdentifier, NSToolbarSeparatorItemIdentifier,
-		sPrevPageToolbarItemIdentifier, sNextPageToolbarItemIdentifier, NSToolbarSeparatorItemIdentifier, 
-		sZoomInToolbarItemIdentifier, sZoomOutToolbarItemIdentifier, nil];
-}
-
-- (NSArray *) toolbarAllowedItemIdentifiers: (NSToolbar *) toolbar {
-    // Required delegate method:  Returns the list of all allowed items by identifier.  By default, the toolbar 
-    // does not assume any items are allowed, even the separator.  So, every allowed item must be explicitly listed   
-    // The set of allowed items is used to construct the customization palette 
-    return [NSArray arrayWithObjects: 	sPrevPageToolbarItemIdentifier, sNextPageToolbarItemIdentifier, 
-			sZoomInToolbarItemIdentifier, sZoomOutToolbarItemIdentifier,
-			NSToolbarPrintItemIdentifier, NSToolbarCustomizeToolbarItemIdentifier, 
-			NSToolbarFlexibleSpaceItemIdentifier, NSToolbarSpaceItemIdentifier, NSToolbarSeparatorItemIdentifier, nil];
-}
-
-- (void) toolbarWillAddItem: (NSNotification *) notif {
-    // Optional delegate method:  Before an new item is added to the toolbar, this notification is posted.
-    // This is the best place to notice a new item is going into the toolbar.  For instance, if you need to 
-    // cache a reference to the toolbar item or need to set up some initial state, this is the best place 
-    // to do it.  The notification object is the toolbar to which the item is being added.  The item being 
-    // added is found by referencing the @"item" key in the userInfo 
-}  
-
-- (void) toolbarDidRemoveItem: (NSNotification *) notif {
-    // Optional delegate method:  After an item is removed from a toolbar, this notification is sent.   This allows 
-    // the chance to tear down information related to the item that may have been cached.   The notification object
-    // is the toolbar from which the item is being removed.  The item being added is found by referencing the @"item"
-    // key in the userInfo 
-}
-
-- (BOOL) validateToolbarItem: (NSToolbarItem *) toolbarItem {
-    // Optional method:  This message is sent to us since we are the target of some toolbar item actions 
-    // (for example:  of the save items action) 
-	return YES;
 }
 
 @end

Sources/VLSheetWindow.h

@@ -5,7 +5,7 @@
 //
 //      (MN)    Matthias Neeracher
 //
-// Copyright © 2005-2008 Matthias Neeracher
+// Copyright © 2005-2011 Matthias Neeracher
 //
 
 #import <Cocoa/Cocoa.h>
@@ -24,23 +24,13 @@
 
 @end
 
+@class VLSheetView;
+
 @interface VLSheetWindow : NSWindowController <NSToolbarDelegate> {
-	VLEditable *	editTarget;
+	IBOutlet VLSheetView *          sheetView;
+    IBOutlet NSProgressIndicator *  progressIndicator;
     
-	IBOutlet id 	outputToolItem;
+	VLEditable *            editTarget;
-	IBOutlet id 	logToolItem;
-	IBOutlet id		playToolItem;
-	IBOutlet id		stopToolItem;
-	IBOutlet id		fwdToolItem;
-	IBOutlet id		bckToolItem;
-	IBOutlet id		tobegToolItem;
-	IBOutlet id		toendToolItem;
-	IBOutlet id		zoomInToolItem;
-	IBOutlet id		zoomOutToolItem;
-	IBOutlet id		progressToolItem;
-	IBOutlet id		displayToolItem;
-
-	IBOutlet id		sheetView;
 
 	int					editNumTopLedgers;
 	int					editNumBotLedgers;

Sources/VLSheetWindow.mm

@@ -5,7 +5,7 @@
 //
 //      (MN)    Matthias Neeracher
 //
-// Copyright © 2005-2008 Matthias Neeracher
+// Copyright © 2005-2011 Matthias Neeracher
 //
 
 #import "VLSheetWindow.h"
@@ -44,20 +44,6 @@
 
 @implementation VLSheetWindow
 
-static NSString* 	sInputToolbarIdentifier 		= @"Vocalese Sheet Window Toolbar Identifier";
-static NSString*	sOutputToolbarItemIdentifier 	= @"Output Toolbar Item Identifier";
-static NSString*	sLogToolbarItemIdentifier		= @"Log Toolbar Item Identifier";
-static NSString*	sPlayToolbarItemIdentifier		= @"Play Toolbar Item Identifier";
-static NSString*	sStopToolbarItemIdentifier		= @"Stop Toolbar Item Identifier";
-static NSString*	sFwdToolbarItemIdentifier		= @"Fwd Toolbar Item Identifier";
-static NSString*	sBckToolbarItemIdentifier		= @"Rew Toolbar Item Identifier";
-static NSString*	sToBegToolbarItemIdentifier		= @"Begin Toolbar Item Identifier";
-static NSString*	sToEndToolbarItemIdentifier		= @"End Toolbar Item Identifier";
-static NSString*	sZoomInToolbarItemIdentifier	= @"Zoom In Toolbar Item Identifier";
-static NSString*	sZoomOutToolbarItemIdentifier	= @"Zoom Out Toolbar Item Identifier";
-static NSString*	sProgressToolbarItemIdentifier	= @"Progress Toolbar Item Identifier";
-static NSString*	sDisplayToolbarItemIdentifier	= @"Display Toolbar Item Identifier";
-
 - (id)initWithWindow:(NSWindow *)window
 {
 	if (self = [super initWithWindow:window]) {
@@ -78,111 +64,16 @@ static NSString*	sDisplayToolbarItemIdentifier	= @"Display Toolbar Item Identifi
 
 - (void)windowDidLoad
 {
-    NSToolbar *toolbar = [[[NSToolbar alloc] initWithIdentifier: sInputToolbarIdentifier] autorelease];
-
-    [toolbar setAllowsUserCustomization: YES];
-    [toolbar setAutosavesConfiguration: YES];    
-    [toolbar setDelegate: self];
-    
-    [[self window] setToolbar: toolbar];
-}
-
-
-- (NSToolbarItem *) toolbar: (NSToolbar *)toolbar itemForItemIdentifier: (NSString *) itemIdent willBeInsertedIntoToolbar:(BOOL) willBeInserted {
-    NSToolbarItem *	toolbarItem = nil;
-    id				prototype   = nil;
-	
-    if ([itemIdent isEqual: sOutputToolbarItemIdentifier]) 
-		prototype = outputToolItem;
-    else if ([itemIdent isEqual: sLogToolbarItemIdentifier]) 
-		prototype = logToolItem;
-    else if ([itemIdent isEqual: sPlayToolbarItemIdentifier]) 
-		prototype = playToolItem;
-    else if ([itemIdent isEqual: sStopToolbarItemIdentifier]) 
-		prototype = stopToolItem;
-    else if ([itemIdent isEqual: sFwdToolbarItemIdentifier]) 
-		prototype = fwdToolItem;
-    else if ([itemIdent isEqual: sBckToolbarItemIdentifier]) 
-		prototype = bckToolItem;
-    else if ([itemIdent isEqual: sToBegToolbarItemIdentifier]) 
-		prototype = tobegToolItem;
-    else if ([itemIdent isEqual: sToEndToolbarItemIdentifier]) 
-		prototype = toendToolItem;
-    else if ([itemIdent isEqual: sZoomInToolbarItemIdentifier]) 
-		prototype = zoomInToolItem;
-    else if ([itemIdent isEqual: sZoomOutToolbarItemIdentifier]) 
-		prototype = zoomOutToolItem;
-	else if ([itemIdent isEqual: sDisplayToolbarItemIdentifier]) 
-		prototype = displayToolItem;
-	
-	if (prototype) {
-        toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: itemIdent] autorelease];
-	
-		[toolbarItem setLabel: [prototype title]];
-		[toolbarItem setPaletteLabel: [prototype alternateTitle]];
-		[toolbarItem setToolTip: [prototype toolTip]];
-		[toolbarItem setImage: [prototype image]];
-		[toolbarItem setTarget: [prototype target]];
-		[toolbarItem setAction: [prototype action]];
-		[toolbarItem setTag: [prototype tag]];
-	} else if ([itemIdent isEqual: sProgressToolbarItemIdentifier]) {
-        toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: itemIdent] autorelease];
-		
-		[toolbarItem setView: progressToolItem];
-    } else {
-		toolbarItem = nil;
-    }
-    return toolbarItem;
-}
-
-- (NSArray *) toolbarDefaultItemIdentifiers: (NSToolbar *) toolbar {
-    return [NSArray arrayWithObjects:	
-						sOutputToolbarItemIdentifier, 
-					NSToolbarSeparatorItemIdentifier,
-					sToBegToolbarItemIdentifier,
-					sBckToolbarItemIdentifier,
-					sPlayToolbarItemIdentifier,
-					sStopToolbarItemIdentifier,
-					sFwdToolbarItemIdentifier,
-					sToEndToolbarItemIdentifier,
-					NSToolbarSeparatorItemIdentifier,
-					sZoomInToolbarItemIdentifier, 
-					sZoomOutToolbarItemIdentifier, 
-					NSToolbarFlexibleSpaceItemIdentifier, 
-					sDisplayToolbarItemIdentifier,
-					sLogToolbarItemIdentifier, 
-					sProgressToolbarItemIdentifier,
-					nil];
-}
-
-- (NSArray *) toolbarAllowedItemIdentifiers: (NSToolbar *) toolbar {
-    return [NSArray arrayWithObjects: 	
-					sToBegToolbarItemIdentifier,
-					sBckToolbarItemIdentifier,
-					sPlayToolbarItemIdentifier,
-					sStopToolbarItemIdentifier,
-					sFwdToolbarItemIdentifier,
-					sToEndToolbarItemIdentifier,
-					sZoomInToolbarItemIdentifier, 
-					sZoomOutToolbarItemIdentifier, 
-					sOutputToolbarItemIdentifier, 
-					sLogToolbarItemIdentifier, 
-					sDisplayToolbarItemIdentifier,
-					sProgressToolbarItemIdentifier,
-					NSToolbarCustomizeToolbarItemIdentifier, 
-					NSToolbarFlexibleSpaceItemIdentifier, 
-					NSToolbarSpaceItemIdentifier, 
-					NSToolbarSeparatorItemIdentifier, nil];
 }
 
 - (void) startAnimation
 {
-	[progressToolItem startAnimation:self];
+	[progressIndicator startAnimation:self];
 }
 
 - (void) stopAnimation
 {
-	[progressToolItem stopAnimation:self];
+	[progressIndicator stopAnimation:self];
 }
 
 - (IBAction) zoomIn: (id) sender

Sources/VLToolbarButton.h

@@ -0,0 +1,13 @@
+//
+//  VLToolbarButton.h
+//  VocalEasel
+//
+//  Created by Matthias Neeracher on 8/23/11.
+//  Copyright 2011 Matthias Neeracher. All rights reserved.
+//
+
+#import <AppKit/AppKit.h>
+
+@interface VLToolbarButton : NSButton
+
+@end

Sources/VLToolbarButton.mm

@@ -0,0 +1,21 @@
+//
+//  VLToolbarButton.mm
+//  VocalEasel
+//
+//  Created by Matthias Neeracher on 8/23/11.
+//  Copyright 2011 Matthias Neeracher. All rights reserved.
+//
+
+#import "VLToolbarButton.h"
+
+@implementation VLToolbarButton
+
+- (void)awakeFromNib
+{
+    NSButtonCell * cell = [self cell];
+    [cell setHighlightsBy:NSPushInCellMask];
+    [cell setShowsStateBy:NSContentsCellMask];
+    [cell setBackgroundStyle:NSBackgroundStyleRaised];
+}
+
+@end

VocalEasel.xcodeproj/project.pbxproj

@@ -35,7 +35,6 @@
 		952CBB9F095FD1D900434E43 /* TVLSoundOut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 952CBB9E095FD1D900434E43 /* TVLSoundOut.cpp */; };
 		952CBBB6095FD37300434E43 /* VLModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 955E58E4095658AB0045FDA5 /* VLModel.cpp */; };
 		952DCD78096BBB11001C2316 /* VLSheetViewChords.mm in Sources */ = {isa = PBXBuildFile; fileRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; };
-		9530A7020BD9E16700635FEC /* display.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 9530A7010BD9E16700635FEC /* display.tiff */; };
 		9531F3510DE2B4CD004F78C2 /* VLAIFFDocument.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9531F34E0DE2B4CD004F78C2 /* VLAIFFDocument.mm */; };
 		9531F3520DE2B4CD004F78C2 /* VLMP3Document.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9531F3500DE2B4CD004F78C2 /* VLMP3Document.mm */; };
 		9531F3670DE2B872004F78C2 /* lameWrapper in Copy Tools */ = {isa = PBXBuildFile; fileRef = 9531F3660DE2B872004F78C2 /* lameWrapper */; };
@@ -47,6 +46,12 @@
 		953F4B511409C42100C627F9 /* TVLPitchGrid.h in Resources */ = {isa = PBXBuildFile; fileRef = 953F4B501409C42100C627F9 /* TVLPitchGrid.h */; };
 		953F4B531409C42100C627F9 /* TVLPitchGrid.mm in Sources */ = {isa = PBXBuildFile; fileRef = 953F4B521409C42100C627F9 /* TVLPitchGrid.mm */; };
 		953F4B591409C54600C627F9 /* VLPitchGrid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 953F4B3C1409B01200C627F9 /* VLPitchGrid.cpp */; };
+		953F4B60140AFA4B00C627F9 /* VLToolbarButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = 953F4B5F140AFA4A00C627F9 /* VLToolbarButton.mm */; };
+		953F4B68140AFCE500C627F9 /* zoomin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 953F4B66140AFCE500C627F9 /* zoomin.icns */; };
+		953F4B69140AFCE500C627F9 /* zoomout.icns in Resources */ = {isa = PBXBuildFile; fileRef = 953F4B67140AFCE500C627F9 /* zoomout.icns */; };
+		953F4B6B140AFF2A00C627F9 /* display.icns in Resources */ = {isa = PBXBuildFile; fileRef = 953F4B6A140AFF2A00C627F9 /* display.icns */; };
+		953F4B6E140B040100C627F9 /* next.icns in Resources */ = {isa = PBXBuildFile; fileRef = 953F4B6C140B040000C627F9 /* next.icns */; };
+		953F4B6F140B040100C627F9 /* prev.icns in Resources */ = {isa = PBXBuildFile; fileRef = 953F4B6D140B040000C627F9 /* prev.icns */; };
 		9545C5C30C092F4600251547 /* VLMMAWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9545C5C10C092F4600251547 /* VLMMAWriter.cpp */; };
 		95498DBD0AE3812F006B5F81 /* VLSoundSched.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95498DBC0AE3812F006B5F81 /* VLSoundSched.mm */; };
 		954BBD860AEDDE5300BBFD5F /* VLAppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 954BBD850AEDDE5300BBFD5F /* VLAppController.mm */; };
@@ -71,8 +76,6 @@
 		959A3A140DE64BA300EF207B /* stop.icns in Resources */ = {isa = PBXBuildFile; fileRef = 959A3A120DE64BA300EF207B /* stop.icns */; };
 		959A3A260DE78BCD00EF207B /* bck.icns in Resources */ = {isa = PBXBuildFile; fileRef = 959A3A220DE78BCD00EF207B /* bck.icns */; };
 		959A3A270DE78BCD00EF207B /* fwd.icns in Resources */ = {isa = PBXBuildFile; fileRef = 959A3A230DE78BCD00EF207B /* fwd.icns */; };
-		959A3A280DE78BCD00EF207B /* tobeg.icns in Resources */ = {isa = PBXBuildFile; fileRef = 959A3A240DE78BCD00EF207B /* tobeg.icns */; };
-		959A3A290DE78BCD00EF207B /* toend.icns in Resources */ = {isa = PBXBuildFile; fileRef = 959A3A250DE78BCD00EF207B /* toend.icns */; };
 		959A3A6E0DE8CB5B00EF207B /* VLMIDIWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 959A3A6C0DE8CB5B00EF207B /* VLMIDIWriter.cpp */; };
 		959B77C20DE3139F004432E0 /* installLame.scpt in Resources */ = {isa = PBXBuildFile; fileRef = 958139C20DE2FBE4003C00B4 /* installLame.scpt */; };
 		95A1C3860AF2ACE20076597D /* VLSheetWindow.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95A1C3850AF2ACE20076597D /* VLSheetWindow.mm */; };
@@ -117,11 +120,6 @@
 		95FC668F0AF0A08C003D9C11 /* VLLogWindow.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95FC668E0AF0A08C003D9C11 /* VLLogWindow.mm */; };
 		95FC66A60AF0A24C003D9C11 /* VLPDFWindow.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95FC66A50AF0A24C003D9C11 /* VLPDFWindow.mm */; };
 		95FC66C30AF0A4D4003D9C11 /* console.icns in Resources */ = {isa = PBXBuildFile; fileRef = 95FC66BC0AF0A4D4003D9C11 /* console.icns */; };
-		95FC66C40AF0A4D4003D9C11 /* music.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 95FC66BD0AF0A4D4003D9C11 /* music.tiff */; };
-		95FC66C50AF0A4D5003D9C11 /* nextpage.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 95FC66BE0AF0A4D4003D9C11 /* nextpage.tiff */; };
-		95FC66C60AF0A4D5003D9C11 /* prevpage.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 95FC66BF0AF0A4D4003D9C11 /* prevpage.tiff */; };
-		95FC66C80AF0A4D5003D9C11 /* zoomin.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 95FC66C10AF0A4D4003D9C11 /* zoomin.tiff */; };
-		95FC66C90AF0A4D5003D9C11 /* zoomout.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 95FC66C20AF0A4D4003D9C11 /* zoomout.tiff */; };
 		95FC66CE0AF0A591003D9C11 /* VLPDFView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95FC66CC0AF0A591003D9C11 /* VLPDFView.mm */; };
 /* End PBXBuildFile section */
 
@@ -209,7 +207,6 @@
 		952CBB9E095FD1D900434E43 /* TVLSoundOut.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = TVLSoundOut.cpp; path = Tests/TVLSoundOut.cpp; sourceTree = "<group>"; };
 		952DCD76096BBB11001C2316 /* VLSheetViewChords.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLSheetViewChords.h; path = Sources/VLSheetViewChords.h; sourceTree = "<group>"; };
 		952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = VLSheetViewChords.mm; path = Sources/VLSheetViewChords.mm; sourceTree = "<group>"; };
-		9530A7010BD9E16700635FEC /* display.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = display.tiff; path = Resources/display.tiff; sourceTree = "<group>"; };
 		9531F34D0DE2B4CD004F78C2 /* VLAIFFDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLAIFFDocument.h; path = Sources/VLAIFFDocument.h; sourceTree = "<group>"; };
 		9531F34E0DE2B4CD004F78C2 /* VLAIFFDocument.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = VLAIFFDocument.mm; path = Sources/VLAIFFDocument.mm; sourceTree = "<group>"; };
 		9531F34F0DE2B4CD004F78C2 /* VLMP3Document.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLMP3Document.h; path = Sources/VLMP3Document.h; sourceTree = "<group>"; };
@@ -228,6 +225,13 @@
 		953F4B501409C42100C627F9 /* TVLPitchGrid.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = TVLPitchGrid.h; path = Tests/TVLPitchGrid/TVLPitchGrid.h; sourceTree = SOURCE_ROOT; };
 		953F4B521409C42100C627F9 /* TVLPitchGrid.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = TVLPitchGrid.mm; path = Tests/TVLPitchGrid/TVLPitchGrid.mm; sourceTree = SOURCE_ROOT; };
 		953F4B541409C42100C627F9 /* TVLPitchGrid-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "TVLPitchGrid-Prefix.pch"; path = "Tests/TVLPitchGrid/TVLPitchGrid-Prefix.pch"; sourceTree = SOURCE_ROOT; };
+		953F4B5E140AFA4900C627F9 /* VLToolbarButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLToolbarButton.h; path = Sources/VLToolbarButton.h; sourceTree = "<group>"; };
+		953F4B5F140AFA4A00C627F9 /* VLToolbarButton.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = VLToolbarButton.mm; path = Sources/VLToolbarButton.mm; sourceTree = "<group>"; };
+		953F4B66140AFCE500C627F9 /* zoomin.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = zoomin.icns; path = Resources/zoomin.icns; sourceTree = "<group>"; };
+		953F4B67140AFCE500C627F9 /* zoomout.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = zoomout.icns; path = Resources/zoomout.icns; sourceTree = "<group>"; };
+		953F4B6A140AFF2A00C627F9 /* display.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = display.icns; path = Resources/display.icns; sourceTree = "<group>"; };
+		953F4B6C140B040000C627F9 /* next.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = next.icns; path = Resources/next.icns; sourceTree = "<group>"; };
+		953F4B6D140B040000C627F9 /* prev.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = prev.icns; path = Resources/prev.icns; sourceTree = "<group>"; };
 		9545C5C10C092F4600251547 /* VLMMAWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = VLMMAWriter.cpp; path = Sources/VLMMAWriter.cpp; sourceTree = "<group>"; };
 		9545C5C20C092F4600251547 /* VLMMAWriter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = VLMMAWriter.h; path = Sources/VLMMAWriter.h; sourceTree = "<group>"; };
 		95498DBB0AE3812F006B5F81 /* VLSoundSched.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = VLSoundSched.h; path = Sources/VLSoundSched.h; sourceTree = "<group>"; };
@@ -265,8 +269,6 @@
 		959A3A120DE64BA300EF207B /* stop.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = stop.icns; path = Resources/stop.icns; sourceTree = "<group>"; };
 		959A3A220DE78BCD00EF207B /* bck.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = bck.icns; path = Resources/bck.icns; sourceTree = "<group>"; };
 		959A3A230DE78BCD00EF207B /* fwd.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = fwd.icns; path = Resources/fwd.icns; sourceTree = "<group>"; };
-		959A3A240DE78BCD00EF207B /* tobeg.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = tobeg.icns; path = Resources/tobeg.icns; sourceTree = "<group>"; };
-		959A3A250DE78BCD00EF207B /* toend.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = toend.icns; path = Resources/toend.icns; sourceTree = "<group>"; };
 		959A3A6C0DE8CB5B00EF207B /* VLMIDIWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = VLMIDIWriter.cpp; path = Sources/VLMIDIWriter.cpp; sourceTree = "<group>"; };
 		959A3A6D0DE8CB5B00EF207B /* VLMIDIWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLMIDIWriter.h; path = Sources/VLMIDIWriter.h; sourceTree = "<group>"; };
 		95A1C3840AF2ACE20076597D /* VLSheetWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = VLSheetWindow.h; path = Sources/VLSheetWindow.h; sourceTree = "<group>"; };
@@ -323,11 +325,6 @@
 		95FC66A40AF0A24C003D9C11 /* VLPDFWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = VLPDFWindow.h; path = Sources/VLPDFWindow.h; sourceTree = "<group>"; };
 		95FC66A50AF0A24C003D9C11 /* VLPDFWindow.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = VLPDFWindow.mm; path = Sources/VLPDFWindow.mm; sourceTree = "<group>"; };
 		95FC66BC0AF0A4D4003D9C11 /* console.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = console.icns; path = Resources/console.icns; sourceTree = "<group>"; };
-		95FC66BD0AF0A4D4003D9C11 /* music.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = music.tiff; path = Resources/music.tiff; sourceTree = "<group>"; };
-		95FC66BE0AF0A4D4003D9C11 /* nextpage.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = nextpage.tiff; path = Resources/nextpage.tiff; sourceTree = "<group>"; };
-		95FC66BF0AF0A4D4003D9C11 /* prevpage.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = prevpage.tiff; path = Resources/prevpage.tiff; sourceTree = "<group>"; };
-		95FC66C10AF0A4D4003D9C11 /* zoomin.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = zoomin.tiff; path = Resources/zoomin.tiff; sourceTree = "<group>"; };
-		95FC66C20AF0A4D4003D9C11 /* zoomout.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = zoomout.tiff; path = Resources/zoomout.tiff; sourceTree = "<group>"; };
 		95FC66CC0AF0A591003D9C11 /* VLPDFView.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = VLPDFView.mm; path = Sources/VLPDFView.mm; sourceTree = "<group>"; };
 		95FC66CD0AF0A591003D9C11 /* VLPDFView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = VLPDFView.h; path = Sources/VLPDFView.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -449,32 +446,11 @@
 		2A37F4B8FDCFA73011CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				959A3A220DE78BCD00EF207B /* bck.icns */,
+				953F4B70140B041800C627F9 /* Icons */,
-				959A3A230DE78BCD00EF207B /* fwd.icns */,
-				959A3A240DE78BCD00EF207B /* tobeg.icns */,
-				959A3A250DE78BCD00EF207B /* toend.icns */,
 				9524DAF70BE569C50002AC03 /* Help */,
-				95003B3F0D4B9A5D00C9849C /* MainMenu.xib */,
+				953F4B72140B044800C627F9 /* Windows */,
-				95003B410D4B9A5D00C9849C /* VLDocument.xib */,
+				953F4B71140B043500C627F9 /* Scripts */,
-				95003B430D4B9A5D00C9849C /* VLGroove.xib */,
-				95003B450D4B9A5D00C9849C /* VLLogWindow.xib */,
-				95003B470D4B9A5D00C9849C /* VLMirrorWindow.xib */,
-				95003B490D4B9A5D00C9849C /* VLPDFWindow.xib */,
-				95049CF20BDC32CD0015EE6E /* installLilypond.scpt */,
-				958139C20DE2FBE4003C00B4 /* installLame.scpt */,
-				95049D010BDC43510015EE6E /* installPython.scpt */,
-				95FC66BC0AF0A4D4003D9C11 /* console.icns */,
-				9530A7010BD9E16700635FEC /* display.tiff */,
-				959A3A110DE64BA300EF207B /* play.icns */,
-				959A3A120DE64BA300EF207B /* stop.icns */,
-				95FC66BD0AF0A4D4003D9C11 /* music.tiff */,
-				95FC66BE0AF0A4D4003D9C11 /* nextpage.tiff */,
-				95FC66BF0AF0A4D4003D9C11 /* prevpage.tiff */,
-				95FC66C10AF0A4D4003D9C11 /* zoomin.tiff */,
-				95FC66C20AF0A4D4003D9C11 /* zoomout.tiff */,
 				95E04DCA0AEB4D9B006F30A0 /* Templates */,
-				9593E4E60AE0ED1F00035816 /* vlsong.icns */,
-				9593E4E70AE0ED1F00035816 /* vlapp.icns */,
 				95B3E1980960E58B000E9C0D /* Music */,
 				2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */,
 				8D15AC360486D014006FF6A4 /* Info.plist */,
@@ -527,6 +503,48 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
+		953F4B70140B041800C627F9 /* Icons */ = {
+			isa = PBXGroup;
+			children = (
+				953F4B6C140B040000C627F9 /* next.icns */,
+				953F4B6D140B040000C627F9 /* prev.icns */,
+				953F4B6A140AFF2A00C627F9 /* display.icns */,
+				953F4B66140AFCE500C627F9 /* zoomin.icns */,
+				953F4B67140AFCE500C627F9 /* zoomout.icns */,
+				959A3A220DE78BCD00EF207B /* bck.icns */,
+				959A3A230DE78BCD00EF207B /* fwd.icns */,
+				95FC66BC0AF0A4D4003D9C11 /* console.icns */,
+				959A3A110DE64BA300EF207B /* play.icns */,
+				959A3A120DE64BA300EF207B /* stop.icns */,
+				9593E4E60AE0ED1F00035816 /* vlsong.icns */,
+				9593E4E70AE0ED1F00035816 /* vlapp.icns */,
+			);
+			name = Icons;
+			sourceTree = "<group>";
+		};
+		953F4B71140B043500C627F9 /* Scripts */ = {
+			isa = PBXGroup;
+			children = (
+				95049CF20BDC32CD0015EE6E /* installLilypond.scpt */,
+				958139C20DE2FBE4003C00B4 /* installLame.scpt */,
+				95049D010BDC43510015EE6E /* installPython.scpt */,
+			);
+			name = Scripts;
+			sourceTree = "<group>";
+		};
+		953F4B72140B044800C627F9 /* Windows */ = {
+			isa = PBXGroup;
+			children = (
+				95003B3F0D4B9A5D00C9849C /* MainMenu.xib */,
+				95003B410D4B9A5D00C9849C /* VLDocument.xib */,
+				95003B430D4B9A5D00C9849C /* VLGroove.xib */,
+				95003B450D4B9A5D00C9849C /* VLLogWindow.xib */,
+				95003B470D4B9A5D00C9849C /* VLMirrorWindow.xib */,
+				95003B490D4B9A5D00C9849C /* VLPDFWindow.xib */,
+			);
+			name = Windows;
+			sourceTree = "<group>";
+		};
 		9546A1090B08B47A0028503B /* CoreAudio SDK Sources */ = {
 			isa = PBXGroup;
 			children = (
@@ -664,6 +682,8 @@
 				95E299BE0B2006F5001977D2 /* VLSheetViewLyrics.mm */,
 				954DD4B70B444B220056C504 /* VLSheetViewSelection.h */,
 				954DD4E50B44E67F0056C504 /* VLSheetViewSelection.mm */,
+				953F4B5E140AFA4900C627F9 /* VLToolbarButton.h */,
+				953F4B5F140AFA4A00C627F9 /* VLToolbarButton.mm */,
 			);
 			name = Views;
 			sourceTree = "<group>";
@@ -891,12 +911,6 @@
 				9593E4E90AE0ED1F00035816 /* vlapp.icns in Resources */,
 				95E04DCE0AEB4D9B006F30A0 /* Templates in Resources */,
 				95FC66C30AF0A4D4003D9C11 /* console.icns in Resources */,
-				95FC66C40AF0A4D4003D9C11 /* music.tiff in Resources */,
-				95FC66C50AF0A4D5003D9C11 /* nextpage.tiff in Resources */,
-				95FC66C60AF0A4D5003D9C11 /* prevpage.tiff in Resources */,
-				95FC66C80AF0A4D5003D9C11 /* zoomin.tiff in Resources */,
-				95FC66C90AF0A4D5003D9C11 /* zoomout.tiff in Resources */,
-				9530A7020BD9E16700635FEC /* display.tiff in Resources */,
 				9524DAFB0BE569C50002AC03 /* Help in Resources */,
 				95003B4B0D4B9A5D00C9849C /* MainMenu.xib in Resources */,
 				95003B4C0D4B9A5D00C9849C /* VLDocument.xib in Resources */,
@@ -908,8 +922,11 @@
 				959A3A140DE64BA300EF207B /* stop.icns in Resources */,
 				959A3A260DE78BCD00EF207B /* bck.icns in Resources */,
 				959A3A270DE78BCD00EF207B /* fwd.icns in Resources */,
-				959A3A280DE78BCD00EF207B /* tobeg.icns in Resources */,
+				953F4B68140AFCE500C627F9 /* zoomin.icns in Resources */,
-				959A3A290DE78BCD00EF207B /* toend.icns in Resources */,
+				953F4B69140AFCE500C627F9 /* zoomout.icns in Resources */,
+				953F4B6B140AFF2A00C627F9 /* display.icns in Resources */,
+				953F4B6E140B040100C627F9 /* next.icns in Resources */,
+				953F4B6F140B040100C627F9 /* prev.icns in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1018,6 +1035,7 @@
 				959A3A6E0DE8CB5B00EF207B /* VLMIDIWriter.cpp in Sources */,
 				95CFA83814091B7800D0DB0D /* VLPitchName.cpp in Sources */,
 				953F4B3D1409B01200C627F9 /* VLPitchGrid.cpp in Sources */,
+				953F4B60140AFA4B00C627F9 /* VLToolbarButton.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};