Added icns file for mac os x.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@557 b956fd51-792f-4845-bead-9b4dfca2ff2c

6 files changed, 156 insertions, 226 deletions

diff --git a/Game/Code/MacOSX/Info.plist b/Game/Code/MacOSX/Info.plist
index dd9c079f..fab56642 100644
--- a/Game/Code/MacOSX/Info.plist
+++ b/Game/Code/MacOSX/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundleIconFile</key>
-	<string>UltraStar.icns</string>
+	<string>ustar-icon_v01.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.ultrastardeluxe.ultrastardeluxe</string>
 	<key>CFBundleInfoDictionaryVersion</key>
diff --git a/Game/Code/MacOSX/UltraStarDX.icns b/Game/Code/MacOSX/UltraStarDX.icns
deleted file mode 100644
index fd7b8745..00000000
--- a/Game/Code/MacOSX/UltraStarDX.icns
+++ /dev/null
diff --git a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1 b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1
index 12cc23e0..b8f1379d 100644
--- a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1
+++ b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1
@@ -190,24 +190,24 @@
 			<key>Content</key>
 			<dict>
 				<key>PBXProjectModuleGUID</key>
-				<string>2CDC71470CDB9AAB0018F966</string>
+				<string>2CF552990CDA426600627463</string>
 				<key>PBXProjectModuleLabel</key>
-				<string>USongs.pas</string>
+				<string>UMain.pas</string>
 				<key>PBXSplitModuleInNavigatorKey</key>
 				<dict>
 					<key>Split0</key>
 					<dict>
 						<key>PBXProjectModuleGUID</key>
-						<string>2CDC71480CDB9AAB0018F966</string>
+						<string>2CF5529A0CDA426600627463</string>
 						<key>PBXProjectModuleLabel</key>
-						<string>USongs.pas</string>
+						<string>UMain.pas</string>
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2CDC71AB0CDBA6300018F966</string>
+						<string>2C4FA2BB0CDBB0F2002CC3B0</string>
 						<key>history</key>
 						<array>
-							<string>2CDC71650CDB9BCE0018F966</string>
+							<string>2C4FA2B10CDBB0CF002CC3B0</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -219,11 +219,11 @@
 			<key>Geometry</key>
 			<dict>
 				<key>Frame</key>
-				<string>{{0, 20}, {797, 748}}</string>
+				<string>{{0, 20}, {1052, 646}}</string>
 				<key>PBXModuleWindowStatusBarHidden2</key>
 				<false/>
 				<key>RubberWindowFrame</key>
-				<string>84 171 797 789 0 0 1680 1028 </string>
+				<string>222 147 1052 687 0 0 1680 1028 </string>
 			</dict>
 		</dict>
 		<dict>
@@ -244,10 +244,10 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2CDC71AC0CDBA6300018F966</string>
+						<string>2C4FA2BC0CDBB0F2002CC3B0</string>
 						<key>history</key>
 						<array>
-							<string>2CDC717C0CDB9D150018F966</string>
+							<string>2CDC71AC0CDBA6300018F966</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -270,46 +270,6 @@
 			<key>Content</key>
 			<dict>
 				<key>PBXProjectModuleGUID</key>
-				<string>2CF552990CDA426600627463</string>
-				<key>PBXProjectModuleLabel</key>
-				<string>UMain.pas</string>
-				<key>PBXSplitModuleInNavigatorKey</key>
-				<dict>
-					<key>Split0</key>
-					<dict>
-						<key>PBXProjectModuleGUID</key>
-						<string>2CF5529A0CDA426600627463</string>
-						<key>PBXProjectModuleLabel</key>
-						<string>UMain.pas</string>
-						<key>_historyCapacity</key>
-						<integer>0</integer>
-						<key>bookmark</key>
-						<string>2CDC71AD0CDBA6300018F966</string>
-						<key>history</key>
-						<array>
-							<string>2CDE61980CDB99D400E8B3D1</string>
-						</array>
-					</dict>
-					<key>SplitCount</key>
-					<string>1</string>
-				</dict>
-				<key>StatusBarVisibility</key>
-				<true/>
-			</dict>
-			<key>Geometry</key>
-			<dict>
-				<key>Frame</key>
-				<string>{{0, 20}, {1052, 646}}</string>
-				<key>PBXModuleWindowStatusBarHidden2</key>
-				<false/>
-				<key>RubberWindowFrame</key>
-				<string>222 147 1052 687 0 0 1680 1028 </string>
-			</dict>
-		</dict>
-		<dict>
-			<key>Content</key>
-			<dict>
-				<key>PBXProjectModuleGUID</key>
 				<string>2CF552960CDA426600627463</string>
 				<key>PBXProjectModuleLabel</key>
 				<string>UAudio_FFMpeg.pas</string>
@@ -324,10 +284,10 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2CDC71AE0CDBA6300018F966</string>
+						<string>2C4FA2BD0CDBB0F2002CC3B0</string>
 						<key>history</key>
 						<array>
-							<string>2CDE61990CDB99D400E8B3D1</string>
+							<string>2CDC71AE0CDBA6300018F966</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -364,10 +324,10 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2CDC71AF0CDBA6300018F966</string>
+						<string>2C4FA2BE0CDBB0F2002CC3B0</string>
 						<key>history</key>
 						<array>
-							<string>2CDE619A0CDB99D400E8B3D1</string>
+							<string>2CDC71AF0CDBA6300018F966</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -404,10 +364,10 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2CDC71B00CDBA6300018F966</string>
+						<string>2C4FA2BF0CDBB0F2002CC3B0</string>
 						<key>history</key>
 						<array>
-							<string>2CDE619C0CDB99D400E8B3D1</string>
+							<string>2CDC71B00CDBA6300018F966</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -444,10 +404,10 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2CDC71B10CDBA6300018F966</string>
+						<string>2C4FA2C00CDBB0F2002CC3B0</string>
 						<key>history</key>
 						<array>
-							<string>2CDE619D0CDB99D400E8B3D1</string>
+							<string>2CDC71B10CDBA6300018F966</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -484,10 +444,10 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2CDC71B20CDBA6300018F966</string>
+						<string>2C4FA2C10CDBB0F2002CC3B0</string>
 						<key>history</key>
 						<array>
-							<string>2CDE619E0CDB99D400E8B3D1</string>
+							<string>2CDC71B20CDBA6300018F966</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -524,10 +484,10 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2CDC71B30CDBA6300018F966</string>
+						<string>2C4FA2C20CDBB0F2002CC3B0</string>
 						<key>history</key>
 						<array>
-							<string>2CDE619F0CDB99D400E8B3D1</string>
+							<string>2CDC71B30CDBA6300018F966</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -617,24 +577,19 @@
 							<array>
 								<string>DDC6850D09F5717A004E4BFF</string>
 								<string>DD7C45450A6E72DE003FA52B</string>
-								<string>2CF5510C0CDA28F000627463</string>
-								<string>DDC6868A09F571C2004E4BFF</string>
-								<string>2CDD8D0B0CC5539900E4169D</string>
-								<string>DDC6888C09F57243004E4BFF</string>
-								<string>DDC688C809F574E9004E4BFF</string>
 								<string>1C37FBAC04509CD000000102</string>
 								<string>1C37FAAC04509CD000000102</string>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>25</integer>
+									<integer>17</integer>
 									<integer>15</integer>
 									<integer>0</integer>
 								</array>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-							<string>{{0, 0}, {266, 694}}</string>
+							<string>{{0, 20}, {266, 694}}</string>
 						</dict>
 						<key>PBXTopSmartGroupGIDs</key>
 						<array/>
@@ -653,7 +608,7 @@
 							<real>266</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>773 270 817 753 0 0 1680 1028 </string>
+						<string>772 270 817 753 0 0 1680 1028 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -690,7 +645,7 @@
 								<key>Frame</key>
 								<string>{{0, 0}, {529, 0}}</string>
 								<key>RubberWindowFrame</key>
-								<string>773 270 817 753 0 0 1680 1028 </string>
+								<string>772 270 817 753 0 0 1680 1028 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
@@ -712,7 +667,7 @@
 								<key>Frame</key>
 								<string>{{0, 5}, {529, 707}}</string>
 								<key>RubberWindowFrame</key>
-								<string>773 270 817 753 0 0 1680 1028 </string>
+								<string>772 270 817 753 0 0 1680 1028 </string>
 							</dict>
 							<key>Module</key>
 							<string>XCDetailModule</string>
@@ -736,9 +691,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>2CDC71380CDB9A4A0018F966</string>
+				<string>2C4FA2940CDBAB21002CC3B0</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>2CDC71390CDB9A4A0018F966</string>
+				<string>2C4FA2950CDBAB21002CC3B0</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -872,25 +827,21 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>2CDC71910CDB9D2D0018F966</string>
-		<string>2CDC71920CDB9D2D0018F966</string>
-		<string>2CDD4BFC0CB948FC00549FAC</string>
-		<string>2CDC718F0CDB9D2D0018F966</string>
+		<string>2CDD4B730CB935C700549FAC</string>
+		<string>2C4FA2A50CDBAB21002CC3B0</string>
 		<string>2CF5528D0CDA426600627463</string>
 		<string>2CF553750CDA575B00627463</string>
 		<string>2CF553720CDA575B00627463</string>
 		<string>2CF5536F0CDA575B00627463</string>
 		<string>2CF552930CDA426600627463</string>
 		<string>2CF552960CDA426600627463</string>
-		<string>2CF552990CDA426600627463</string>
-		<string>/Users/eddie/Projekte/UltraStarDX/trunk/Game/Code/MacOSX/UltraStarDX.xcodeproj</string>
-		<string>2CDD4B730CB935C700549FAC</string>
 		<string>2CF5536C0CDA575B00627463</string>
 		<string>1CD10A99069EF8BA00B06720</string>
-		<string>2CDC71470CDB9AAB0018F966</string>
+		<string>2CF552990CDA426600627463</string>
+		<string>/Users/eddie/Projekte/UltraStarDX/trunk/Game/Code/MacOSX/UltraStarDX.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>773 270 817 753 0 0 1680 1028 </string>
+	<string>772 270 817 753 0 0 1680 1028 </string>
 	<key>WindowTools</key>
 	<array>
 		<dict>
@@ -911,7 +862,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CD0528F0623707200166675</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>UltraStarDX.pas</string>
+								<string></string>
 								<key>StatusBarVisibility</key>
 								<true/>
 							</dict>
@@ -928,8 +879,6 @@
 							<string>344pt</string>
 						</dict>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -969,7 +918,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>2CDD4B730CB935C700549FAC</string>
-				<string>2CDC71520CDB9AAB0018F966</string>
+				<string>2C4FA2BA0CDBB0CF002CC3B0</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
@@ -980,7 +929,7 @@
 			<key>WindowToolGUID</key>
 			<string>2CDD4B730CB935C700549FAC</string>
 			<key>WindowToolIsVisible</key>
-			<true/>
+			<false/>
 		</dict>
 		<dict>
 			<key>FirstTimeWindowDisplayed</key>
@@ -1011,8 +960,8 @@
 										<string>yes</string>
 										<key>sizes</key>
 										<array>
-											<string>{{0, 0}, {356, 414}}</string>
-											<string>{{356, 0}, {608, 414}}</string>
+											<string>{{0, 0}, {354, 414}}</string>
+											<string>{{354, 0}, {610, 414}}</string>
 										</array>
 									</dict>
 									<key>VerticalSplitView</key>
@@ -1075,14 +1024,14 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1CD10A99069EF8BA00B06720</string>
-				<string>2CDC71890CDB9D2D0018F966</string>
+				<string>2C4FA29F0CDBAB21002CC3B0</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>2CDC718A0CDB9D2D0018F966</string>
-				<string>2CDC718B0CDB9D2D0018F966</string>
-				<string>2CDC718C0CDB9D2D0018F966</string>
-				<string>2CDC718D0CDB9D2D0018F966</string>
-				<string>2CDC718E0CDB9D2D0018F966</string>
-				<string>2CDC718F0CDB9D2D0018F966</string>
+				<string>2C4FA2A00CDBAB21002CC3B0</string>
+				<string>2C4FA2A10CDBAB21002CC3B0</string>
+				<string>2C4FA2A20CDBAB21002CC3B0</string>
+				<string>2C4FA2A30CDBAB21002CC3B0</string>
+				<string>2C4FA2A40CDBAB21002CC3B0</string>
+				<string>2C4FA2A50CDBAB21002CC3B0</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.debug</string>
diff --git a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser
index 545200c9..3bb5dffc 100644
--- a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser
+++ b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser
@@ -196,7 +196,7 @@
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {1013, 15078}}";
 			sepNavSelRange = "{3441, 0}";
-			sepNavVisRect = "{{0, 1680}, {1013, 614}}";
+			sepNavVisRect = "{{0, 1682}, {1013, 614}}";
 			sepNavWindowFrame = "{{222, 91}, {1052, 743}}";
 		};
 	};
@@ -300,7 +300,7 @@
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {950, 14616}}";
 			sepNavSelRange = "{7664, 0}";
-			sepNavVisRect = "{{0, 3743}, {758, 716}}";
+			sepNavVisRect = "{{0, 3738}, {758, 716}}";
 			sepNavWindowFrame = "{{84, 115}, {797, 845}}";
 		};
 	};
@@ -503,13 +503,95 @@
 			sepNavWindowFrame = "{{15, 282}, {616, 741}}";
 		};
 	};
-	2CDC71650CDB9BCE0018F966 /* PBXTextBookmark */ = {
+	2C4FA2B10CDBB0CF002CC3B0 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		comments = "error:column  23 - Identifier not found \"oldlinux\"";
-		fRef = 2C4D9C890CC9EC8C0031092D /* USongs.pas */;
+		fRef = 2C4D9C7B0CC9EC8C0031092D /* UMain.pas */;
+		name = "UMain.pas: 148";
+		rLen = 0;
+		rLoc = 3441;
+		rType = 0;
+		vrLen = 1295;
+		vrLoc = 2495;
+	};
+	2C4FA2BB0CDBB0F2002CC3B0 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9C7B0CC9EC8C0031092D /* UMain.pas */;
+		name = "UMain.pas: 148";
+		rLen = 0;
+		rLoc = 3441;
+		rType = 0;
+		vrLen = 1295;
+		vrLoc = 2495;
+	};
+	2C4FA2BC0CDBB0F2002CC3B0 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = DDC6851B09F57195004E4BFF /* UltraStarDX.pas */;
+		name = "UltraStarDX.pas: 6";
+		rLen = 0;
+		rLoc = 117;
+		rType = 0;
+		vrLen = 131;
+		vrLoc = 0;
+	};
+	2C4FA2BD0CDBB0F2002CC3B0 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9C640CC9EC8C0031092D /* UAudio_FFMpeg.pas */;
+		name = "UAudio_FFMpeg.pas: 952";
+		rLen = 0;
+		rLoc = 22697;
+		rType = 0;
+		vrLen = 1224;
+		vrLoc = 21473;
+	};
+	2C4FA2BE0CDBB0F2002CC3B0 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9C630CC9EC8C0031092D /* UAudio_bass.pas */;
+		name = "nux ... is t";
+		rLen = 12;
+		rLoc = 3202;
+		rType = 0;
+		vrLen = 1266;
+		vrLoc = 15619;
+	};
+	2C4FA2BF0CDBB0F2002CC3B0 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9DEC0CC9EF0A0031092D /* sdl_image.pas */;
+		name = "sdl_image.pas: 130";
+		rLen = 0;
+		rLoc = 8020;
+		rType = 0;
+		vrLen = 832;
+		vrLoc = 7978;
+	};
+	2C4FA2C00CDBB0F2002CC3B0 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 98B8BE5C0B1F974F00162019 /* sdl.pas */;
+		name = "sdl.pas: 250";
+		rLen = 0;
+		rLoc = 16506;
+		rType = 0;
+		vrLen = 886;
+		vrLoc = 16376;
+	};
+	2C4FA2C10CDBB0F2002CC3B0 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9C8B0CC9EC8C0031092D /* UTexture.pas */;
+		name = "TempSurface:=TexSur";
+		rLen = 20;
+		rLoc = 11823;
+		rType = 0;
+		vrLen = 1220;
+		vrLoc = 11066;
+	};
+	2C4FA2C20CDBB0F2002CC3B0 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9E090CC9EF840031092D /* Windows.pas */;
+		name = "Windows.pas: 114";
 		rLen = 0;
-		rLoc = 289;
-		rType = 1;
+		rLoc = 2832;
+		rType = 0;
+		vrLen = 1182;
+		vrLoc = 2090;
 	};
 	2CDC716B0CDB9CB70018F966 /* StrUtils.pas */ = {
 		uiCtxt = {
@@ -519,14 +601,6 @@
 			sepNavWindowFrame = "{{38, 259}, {1052, 743}}";
 		};
 	};
-	2CDC717C0CDB9D150018F966 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "warning:column  5 - Local variable \"i\" is assigned but never used";
-		fRef = DDC6851B09F57195004E4BFF /* UltraStarDX.pas */;
-		rLen = 1;
-		rLoc = 4;
-		rType = 1;
-	};
 	2CDC71950CDB9D430018F966 /* UMain.pas:156 */ = {
 		isa = PBXFileBreakpoint;
 		actions = (
@@ -541,16 +615,6 @@
 		modificationTime = 215719249.543694;
 		state = 1;
 	};
-	2CDC71AB0CDBA6300018F966 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9C890CC9EC8C0031092D /* USongs.pas */;
-		name = "USongs.pas: 288";
-		rLen = 0;
-		rLoc = 7664;
-		rType = 0;
-		vrLen = 1174;
-		vrLoc = 7219;
-	};
 	2CDC71AC0CDBA6300018F966 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = DDC6851B09F57195004E4BFF /* UltraStarDX.pas */;
@@ -561,16 +625,6 @@
 		vrLen = 131;
 		vrLoc = 0;
 	};
-	2CDC71AD0CDBA6300018F966 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9C7B0CC9EC8C0031092D /* UMain.pas */;
-		name = "UMain.pas: 148";
-		rLen = 0;
-		rLoc = 3441;
-		rType = 0;
-		vrLen = 1295;
-		vrLoc = 2495;
-	};
 	2CDC71AE0CDBA6300018F966 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 2C4D9C640CC9EC8C0031092D /* UAudio_FFMpeg.pas */;
@@ -688,76 +742,6 @@
 			2CDC71950CDB9D430018F966 /* UMain.pas:156 */,
 		);
 	};
-	2CDE61980CDB99D400E8B3D1 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9C7B0CC9EC8C0031092D /* UMain.pas */;
-		name = "UMain.pas: 142";
-		rLen = 0;
-		rLoc = 3295;
-		rType = 0;
-		vrLen = 1288;
-		vrLoc = 2495;
-	};
-	2CDE61990CDB99D400E8B3D1 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9C640CC9EC8C0031092D /* UAudio_FFMpeg.pas */;
-		name = "UAudio_FFMpeg.pas: 952";
-		rLen = 0;
-		rLoc = 22697;
-		rType = 0;
-		vrLen = 1224;
-		vrLoc = 21473;
-	};
-	2CDE619A0CDB99D400E8B3D1 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9C630CC9EC8C0031092D /* UAudio_bass.pas */;
-		name = "nux ... is t";
-		rLen = 12;
-		rLoc = 3202;
-		rType = 0;
-		vrLen = 1266;
-		vrLoc = 15619;
-	};
-	2CDE619C0CDB99D400E8B3D1 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9DEC0CC9EF0A0031092D /* sdl_image.pas */;
-		name = "sdl_image.pas: 130";
-		rLen = 0;
-		rLoc = 8020;
-		rType = 0;
-		vrLen = 832;
-		vrLoc = 7978;
-	};
-	2CDE619D0CDB99D400E8B3D1 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 98B8BE5C0B1F974F00162019 /* sdl.pas */;
-		name = "sdl.pas: 250";
-		rLen = 0;
-		rLoc = 16506;
-		rType = 0;
-		vrLen = 886;
-		vrLoc = 16376;
-	};
-	2CDE619E0CDB99D400E8B3D1 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9C8B0CC9EC8C0031092D /* UTexture.pas */;
-		name = "TempSurface:=TexSur";
-		rLen = 20;
-		rLoc = 11823;
-		rType = 0;
-		vrLen = 1220;
-		vrLoc = 11066;
-	};
-	2CDE619F0CDB99D400E8B3D1 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9E090CC9EF840031092D /* Windows.pas */;
-		name = "Windows.pas: 114";
-		rLen = 0;
-		rLoc = 2832;
-		rType = 0;
-		vrLen = 1182;
-		vrLoc = 2090;
-	};
 	2CDEA8080CBD7D920096994C /* UMain.pas:293 */ = {
 		isa = PBXFileBreakpoint;
 		actions = (
@@ -1143,7 +1127,7 @@
 		hitCount = 1;
 		lineNumber = 6;
 		location = UltraStarDX;
-		modificationTime = 215719246.517251;
+		modificationTime = 215719246.5172511;
 		state = 1;
 	};
 	9845B6590B1F9B9E0084DD62 /* SDL.h */ = {
@@ -1179,7 +1163,6 @@
 		activeTarget = DDC688C709F574E9004E4BFF /* UltraStarDX */;
 		addToTargets = (
 			DDC688C709F574E9004E4BFF /* UltraStarDX */,
-			DDC688D409F57523004E4BFF /* Put all program sources also in this target */,
 		);
 		breakpoints = (
 			2CDEA8080CBD7D920096994C /* UMain.pas:293 */,
@@ -1290,28 +1273,26 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 215718463;
-			PBXWorkspaceStateSaveDate = 215718463;
+			PBXPerProjectTemplateStateSaveDate = 215722768;
+			PBXWorkspaceStateSaveDate = 215722768;
 		};
 		perUserProjectItems = {
-			2CDC71650CDB9BCE0018F966 /* PBXTextBookmark */ = 2CDC71650CDB9BCE0018F966 /* PBXTextBookmark */;
-			2CDC717C0CDB9D150018F966 /* PBXTextBookmark */ = 2CDC717C0CDB9D150018F966 /* PBXTextBookmark */;
-			2CDC71AB0CDBA6300018F966 /* PBXTextBookmark */ = 2CDC71AB0CDBA6300018F966 /* PBXTextBookmark */;
+			2C4FA2B10CDBB0CF002CC3B0 /* PBXTextBookmark */ = 2C4FA2B10CDBB0CF002CC3B0 /* PBXTextBookmark */;
+			2C4FA2BB0CDBB0F2002CC3B0 /* PBXTextBookmark */ = 2C4FA2BB0CDBB0F2002CC3B0 /* PBXTextBookmark */;
+			2C4FA2BC0CDBB0F2002CC3B0 /* PBXTextBookmark */ = 2C4FA2BC0CDBB0F2002CC3B0 /* PBXTextBookmark */;
+			2C4FA2BD0CDBB0F2002CC3B0 /* PBXTextBookmark */ = 2C4FA2BD0CDBB0F2002CC3B0 /* PBXTextBookmark */;
+			2C4FA2BE0CDBB0F2002CC3B0 /* PBXTextBookmark */ = 2C4FA2BE0CDBB0F2002CC3B0 /* PBXTextBookmark */;
+			2C4FA2BF0CDBB0F2002CC3B0 /* PBXTextBookmark */ = 2C4FA2BF0CDBB0F2002CC3B0 /* PBXTextBookmark */;
+			2C4FA2C00CDBB0F2002CC3B0 /* PBXTextBookmark */ = 2C4FA2C00CDBB0F2002CC3B0 /* PBXTextBookmark */;
+			2C4FA2C10CDBB0F2002CC3B0 /* PBXTextBookmark */ = 2C4FA2C10CDBB0F2002CC3B0 /* PBXTextBookmark */;
+			2C4FA2C20CDBB0F2002CC3B0 /* PBXTextBookmark */ = 2C4FA2C20CDBB0F2002CC3B0 /* PBXTextBookmark */;
 			2CDC71AC0CDBA6300018F966 /* PBXTextBookmark */ = 2CDC71AC0CDBA6300018F966 /* PBXTextBookmark */;
-			2CDC71AD0CDBA6300018F966 /* PBXTextBookmark */ = 2CDC71AD0CDBA6300018F966 /* PBXTextBookmark */;
 			2CDC71AE0CDBA6300018F966 /* PBXTextBookmark */ = 2CDC71AE0CDBA6300018F966 /* PBXTextBookmark */;
 			2CDC71AF0CDBA6300018F966 /* PBXTextBookmark */ = 2CDC71AF0CDBA6300018F966 /* PBXTextBookmark */;
 			2CDC71B00CDBA6300018F966 /* PBXTextBookmark */ = 2CDC71B00CDBA6300018F966 /* PBXTextBookmark */;
 			2CDC71B10CDBA6300018F966 /* PBXTextBookmark */ = 2CDC71B10CDBA6300018F966 /* PBXTextBookmark */;
 			2CDC71B20CDBA6300018F966 /* PBXTextBookmark */ = 2CDC71B20CDBA6300018F966 /* PBXTextBookmark */;
 			2CDC71B30CDBA6300018F966 /* PBXTextBookmark */ = 2CDC71B30CDBA6300018F966 /* PBXTextBookmark */;
-			2CDE61980CDB99D400E8B3D1 /* PBXTextBookmark */ = 2CDE61980CDB99D400E8B3D1 /* PBXTextBookmark */;
-			2CDE61990CDB99D400E8B3D1 /* PBXTextBookmark */ = 2CDE61990CDB99D400E8B3D1 /* PBXTextBookmark */;
-			2CDE619A0CDB99D400E8B3D1 /* PBXTextBookmark */ = 2CDE619A0CDB99D400E8B3D1 /* PBXTextBookmark */;
-			2CDE619C0CDB99D400E8B3D1 /* PBXTextBookmark */ = 2CDE619C0CDB99D400E8B3D1 /* PBXTextBookmark */;
-			2CDE619D0CDB99D400E8B3D1 /* PBXTextBookmark */ = 2CDE619D0CDB99D400E8B3D1 /* PBXTextBookmark */;
-			2CDE619E0CDB99D400E8B3D1 /* PBXTextBookmark */ = 2CDE619E0CDB99D400E8B3D1 /* PBXTextBookmark */;
-			2CDE619F0CDB99D400E8B3D1 /* PBXTextBookmark */ = 2CDE619F0CDB99D400E8B3D1 /* PBXTextBookmark */;
 		};
 		sourceControlManager = 2CDD4B690CB9357000549FAC /* Source Control */;
 		userBuildSettings = {
@@ -1327,10 +1308,10 @@
 	};
 	DDC6868B09F571C2004E4BFF /* Info.plist */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {686, 612}}";
-			sepNavSelRange = "{337, 0}";
-			sepNavVisRect = "{{0, 0}, {577, 612}}";
-			sepNavWindowFrame = "{{15, 282}, {616, 741}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1013, 614}}";
+			sepNavSelRange = "{366, 0}";
+			sepNavVisRect = "{{0, 0}, {1013, 614}}";
+			sepNavWindowFrame = "{{15, 280}, {1052, 743}}";
 		};
 	};
 	DDC688C709F574E9004E4BFF /* UltraStarDX */ = {
diff --git a/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj b/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj
index 8caca2d2..f8cd06e7 100644
--- a/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj
+++ b/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj
@@ -139,6 +139,7 @@
 		2C4D9E210CC9EF840031092D /* Windows.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9E090CC9EF840031092D /* Windows.pas */; };
 		2C4D9E450CC9F0ED0031092D /* switches.inc in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9E440CC9F0ED0031092D /* switches.inc */; };
 		2C4D9E460CC9F0ED0031092D /* switches.inc in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9E440CC9F0ED0031092D /* switches.inc */; };
+		2C4FA2A80CDBAD1E002CC3B0 /* ustar-icon_v01.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2C4FA2A70CDBAD1E002CC3B0 /* ustar-icon_v01.icns */; };
 		2CDC716C0CDB9CB70018F966 /* StrUtils.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CDC716B0CDB9CB70018F966 /* StrUtils.pas */; };
 		2CDC716D0CDB9CB70018F966 /* StrUtils.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CDC716B0CDB9CB70018F966 /* StrUtils.pas */; };
 		2CDD4BDE0CB947A400549FAC /* sdl.pas in Sources */ = {isa = PBXBuildFile; fileRef = 98B8BE5C0B1F974F00162019 /* sdl.pas */; };
@@ -146,7 +147,6 @@
 		2CDD4BE20CB947BE00549FAC /* UltraStarDX.pas in Sources */ = {isa = PBXBuildFile; fileRef = DDC6851B09F57195004E4BFF /* UltraStarDX.pas */; };
 		2CDEA4F70CBD725B0096994C /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CDEA4F60CBD725B0096994C /* OpenGL.framework */; };
 		2CDEC4960CC5264600FFA244 /* SDL.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 98B8BE570B1F972400162019 /* SDL.framework */; };
-		2CDEC4CD0CC52E7F00FFA244 /* UltraStarDX.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2CDEC4CC0CC52E7F00FFA244 /* UltraStarDX.icns */; };
 		2CF54F650CDA1B2B00627463 /* UScreenCredits.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CF54F430CDA1B2B00627463 /* UScreenCredits.pas */; };
 		2CF54F660CDA1B2B00627463 /* UScreenEdit.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CF54F440CDA1B2B00627463 /* UScreenEdit.pas */; };
 		2CF54F670CDA1B2B00627463 /* UScreenEditConvert.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CF54F450CDA1B2B00627463 /* UScreenEditConvert.pas */; };
@@ -425,9 +425,9 @@
 		2C4D9E040CC9EF840031092D /* OpenGL12.pas */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.pascal; name = OpenGL12.pas; path = Wrapper/OpenGL12.pas; sourceTree = "<group>"; };
 		2C4D9E090CC9EF840031092D /* Windows.pas */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.pascal; name = Windows.pas; path = Wrapper/Windows.pas; sourceTree = "<group>"; };
 		2C4D9E440CC9F0ED0031092D /* switches.inc */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.pascal; name = switches.inc; path = ../switches.inc; sourceTree = SOURCE_ROOT; };
+		2C4FA2A70CDBAD1E002CC3B0 /* ustar-icon_v01.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = "ustar-icon_v01.icns"; path = "../../Graphics/ustar-icon_v01.icns"; sourceTree = SOURCE_ROOT; };
 		2CDC716B0CDB9CB70018F966 /* StrUtils.pas */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.pascal; name = StrUtils.pas; path = ../../../Modis/SDK/StrUtils.pas; sourceTree = SOURCE_ROOT; };
 		2CDEA4F60CBD725B0096994C /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
-		2CDEC4CC0CC52E7F00FFA244 /* UltraStarDX.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = UltraStarDX.icns; sourceTree = "<group>"; };
 		2CF54F430CDA1B2B00627463 /* UScreenCredits.pas */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.pascal; name = UScreenCredits.pas; path = ../Screens/UScreenCredits.pas; sourceTree = SOURCE_ROOT; };
 		2CF54F440CDA1B2B00627463 /* UScreenEdit.pas */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.pascal; name = UScreenEdit.pas; path = ../Screens/UScreenEdit.pas; sourceTree = SOURCE_ROOT; };
 		2CF54F450CDA1B2B00627463 /* UScreenEditConvert.pas */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.pascal; name = UScreenEditConvert.pas; path = ../Screens/UScreenEditConvert.pas; sourceTree = SOURCE_ROOT; };
@@ -769,7 +769,7 @@
 		DDC6868A09F571C2004E4BFF /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				2CDEC4CC0CC52E7F00FFA244 /* UltraStarDX.icns */,
+				2C4FA2A70CDBAD1E002CC3B0 /* ustar-icon_v01.icns */,
 				DDC689B309F57C69004E4BFF /* InfoPlist.strings */,
 				DDC689B409F57C69004E4BFF /* SDLMain.nib */,
 				DDC6868B09F571C2004E4BFF /* Info.plist */,
@@ -874,7 +874,7 @@
 			files = (
 				DDC689B509F57C69004E4BFF /* InfoPlist.strings in Resources */,
 				DDC689B609F57C69004E4BFF /* SDLMain.nib in Resources */,
-				2CDEC4CD0CC52E7F00FFA244 /* UltraStarDX.icns in Resources */,
+				2C4FA2A80CDBAD1E002CC3B0 /* ustar-icon_v01.icns in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/Game/Graphics/ustar-icon_v01.icns b/Game/Graphics/ustar-icon_v01.icns
new file mode 100644
index 00000000..76bfe2b6
--- /dev/null
+++ b/Game/Graphics/ustar-icon_v01.icns