Added custom nib for Cmd-Q on OSX

3 files changed, 118 insertions, 89 deletions

diff --git a/themanaworld.xcodeproj/garfield.mode1v3 b/themanaworld.xcodeproj/garfield.mode1v3
index 1b941b63..0076a8bc 100644
--- a/themanaworld.xcodeproj/garfield.mode1v3
+++ b/themanaworld.xcodeproj/garfield.mode1v3
@@ -267,15 +267,12 @@
 								<string>20286C29FDCF999611CA2CEA</string>
 								<string>5048396909E3304600765E4B</string>
 								<string>20286C2CFDCF999611CA2CEA</string>
-								<string>1C37FBAC04509CD000000102</string>
-								<string>927F62010ED4EA4500D919E6</string>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>16</integer>
-									<integer>15</integer>
-									<integer>14</integer>
+									<integer>1</integer>
+									<integer>0</integer>
 								</array>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
@@ -326,19 +323,27 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>927F623A0ED4EBEB00D919E6</string>
+										<string>927F62650ED4F41700D919E6</string>
 										<key>history</key>
 										<array>
-											<string>92B1EBDD0ED4E43D009AF197</string>
 											<string>92B1EBDE0ED4E43D009AF197</string>
 											<string>92B1EBF30ED4E5C5009AF197</string>
-											<string>92B1EC470ED4EA36009AF197</string>
+											<string>927F625B0ED4F41700D919E6</string>
+											<string>927F625C0ED4F41700D919E6</string>
+											<string>927F625D0ED4F41700D919E6</string>
 										</array>
 										<key>prevStack</key>
 										<array>
 											<string>92B1EBE00ED4E43D009AF197</string>
 											<string>92B1EBE10ED4E43D009AF197</string>
 											<string>92B1EBF50ED4E5C5009AF197</string>
+											<string>927F625E0ED4F41700D919E6</string>
+											<string>927F625F0ED4F41700D919E6</string>
+											<string>927F62600ED4F41700D919E6</string>
+											<string>927F62610ED4F41700D919E6</string>
+											<string>927F62620ED4F41700D919E6</string>
+											<string>927F62630ED4F41700D919E6</string>
+											<string>927F62640ED4F41700D919E6</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -531,8 +536,8 @@
 	<key>WindowOrderList</key>
 	<array>
 		<string>92A4CC8A0D1C5F1E00CA28FB</string>
-		<string>1C78EAAD065D492600B07095</string>
 		<string>1CD10A99069EF8BA00B06720</string>
+		<string>1C78EAAD065D492600B07095</string>
 		<string>/Users/garfield/programming/tmwclient/themanaworld.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
diff --git a/themanaworld.xcodeproj/garfield.pbxuser b/themanaworld.xcodeproj/garfield.pbxuser
index ada25426..42957a89 100644
--- a/themanaworld.xcodeproj/garfield.pbxuser
+++ b/themanaworld.xcodeproj/garfield.pbxuser
@@ -134,23 +134,26 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 248834629;
-			PBXWorkspaceStateSaveDate = 248834629;
+			PBXPerProjectTemplateStateSaveDate = 249045476;
+			PBXWorkspaceStateSaveDate = 249045476;
 		};
 		perUserProjectItems = {
-			927F62190ED4EA6A00D919E6 /* PlistBookmark */ = 927F62190ED4EA6A00D919E6 /* PlistBookmark */;
-			927F621C0ED4EA6A00D919E6 /* PlistBookmark */ = 927F621C0ED4EA6A00D919E6 /* PlistBookmark */;
-			927F623A0ED4EBEB00D919E6 /* PlistBookmark */ = 927F623A0ED4EBEB00D919E6 /* PlistBookmark */;
-			92B1EBDD0ED4E43D009AF197 = 92B1EBDD0ED4E43D009AF197 /* PBXTextBookmark */;
+			927F625B0ED4F41700D919E6 = 927F625B0ED4F41700D919E6 /* PBXTextBookmark */;
+			927F625C0ED4F41700D919E6 = 927F625C0ED4F41700D919E6 /* PBXTextBookmark */;
+			927F625D0ED4F41700D919E6 = 927F625D0ED4F41700D919E6 /* PlistBookmark */;
+			927F625E0ED4F41700D919E6 = 927F625E0ED4F41700D919E6 /* PlistBookmark */;
+			927F625F0ED4F41700D919E6 = 927F625F0ED4F41700D919E6 /* PBXTextBookmark */;
+			927F62600ED4F41700D919E6 = 927F62600ED4F41700D919E6 /* PBXTextBookmark */;
+			927F62610ED4F41700D919E6 = 927F62610ED4F41700D919E6 /* PlistBookmark */;
+			927F62620ED4F41700D919E6 = 927F62620ED4F41700D919E6 /* PBXTextBookmark */;
+			927F62630ED4F41700D919E6 = 927F62630ED4F41700D919E6 /* PlistBookmark */;
+			927F62640ED4F41700D919E6 = 927F62640ED4F41700D919E6 /* PBXTextBookmark */;
+			927F62650ED4F41700D919E6 = 927F62650ED4F41700D919E6 /* PlistBookmark */;
 			92B1EBDE0ED4E43D009AF197 = 92B1EBDE0ED4E43D009AF197 /* PBXTextBookmark */;
 			92B1EBE00ED4E43D009AF197 = 92B1EBE00ED4E43D009AF197 /* PBXTextBookmark */;
 			92B1EBE10ED4E43D009AF197 = 92B1EBE10ED4E43D009AF197 /* PBXTextBookmark */;
-			92B1EBE90ED4E547009AF197 = 92B1EBE90ED4E547009AF197 /* PBXBookmark */;
 			92B1EBF30ED4E5C5009AF197 = 92B1EBF30ED4E5C5009AF197 /* PBXTextBookmark */;
 			92B1EBF50ED4E5C5009AF197 = 92B1EBF50ED4E5C5009AF197 /* PBXTextBookmark */;
-			92B1EC440ED4EA36009AF197 = 92B1EC440ED4EA36009AF197 /* PlistBookmark */;
-			92B1EC470ED4EA36009AF197 = 92B1EC470ED4EA36009AF197 /* PlistBookmark */;
-			92B1EC480ED4EA36009AF197 = 92B1EC480ED4EA36009AF197 /* PlistBookmark */;
 		};
 		sourceControlManager = 92BC3EC80BAEE3C8000DAB7F /* Source Control */;
 		userBuildSettings = {
@@ -172,9 +175,10 @@
 	};
 	92037A190ED2035A00D3712D /* SDLMain.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {511, 348}}";
+			sepNavIntBoundsRect = "{{0, 0}, {802, 506}}";
 			sepNavSelRange = "{0, 0}";
 			sepNavVisRange = "{0, 307}";
+			sepNavWindowFrame = "{{15, 389}, {861, 634}}";
 		};
 	};
 	924A42600C0874D00066885E /* Info.plist */ = {
@@ -193,7 +197,38 @@
 			sepNavVisRange = "{1251, 209}";
 		};
 	};
-	927F62190ED4EA6A00D919E6 /* PlistBookmark */ = {
+	927F625B0ED4F41700D919E6 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 92037A190ED2035A00D3712D /* SDLMain.h */;
+		name = "SDLMain.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 307;
+		vrLoc = 0;
+	};
+	927F625C0ED4F41700D919E6 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 92BC40E50BAEF54B000DAB7F /* SDLMain.m */;
+		name = "SDLMain.m: 14";
+		rLen = 0;
+		rLoc = 440;
+		rType = 0;
+		vrLen = 759;
+		vrLoc = 0;
+	};
+	927F625D0ED4F41700D919E6 /* PlistBookmark */ = {
+		isa = PlistBookmark;
+		fRef = 924A42600C0874D00066885E /* Info.plist */;
+		fallbackIsa = PBXBookmark;
+		isK = 0;
+		kPath = (
+		);
+		name = /Users/garfield/programming/tmwclient/Info.plist;
+		rLen = 0;
+		rLoc = 2147483647;
+	};
+	927F625E0ED4F41700D919E6 /* PlistBookmark */ = {
 		isa = PlistBookmark;
 		fRef = 924A42600C0874D00066885E /* Info.plist */;
 		fallbackIsa = PBXBookmark;
@@ -205,24 +240,76 @@
 		rLen = 0;
 		rLoc = 2147483647;
 	};
-	927F621C0ED4EA6A00D919E6 /* PlistBookmark */ = {
+	927F625F0ED4F41700D919E6 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 92037A190ED2035A00D3712D /* SDLMain.h */;
+		name = "SDLMain.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 307;
+		vrLoc = 0;
+	};
+	927F62600ED4F41700D919E6 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 92BC40E50BAEF54B000DAB7F /* SDLMain.m */;
+		name = "SDLMain.m: 14";
+		rLen = 0;
+		rLoc = 440;
+		rType = 0;
+		vrLen = 635;
+		vrLoc = 124;
+	};
+	927F62610ED4F41700D919E6 /* PlistBookmark */ = {
 		isa = PlistBookmark;
 		fRef = 924A42600C0874D00066885E /* Info.plist */;
 		fallbackIsa = PBXBookmark;
 		isK = 0;
 		kPath = (
+			NSPrincipalClass,
 		);
 		name = /Users/garfield/programming/tmwclient/Info.plist;
 		rLen = 0;
 		rLoc = 2147483647;
 	};
-	927F623A0ED4EBEB00D919E6 /* PlistBookmark */ = {
+	927F62620ED4F41700D919E6 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 92BC40E50BAEF54B000DAB7F /* SDLMain.m */;
+		name = "SDLMain.m: 14";
+		rLen = 0;
+		rLoc = 440;
+		rType = 0;
+		vrLen = 643;
+		vrLoc = 7053;
+	};
+	927F62630ED4F41700D919E6 /* PlistBookmark */ = {
 		isa = PlistBookmark;
 		fRef = 924A42600C0874D00066885E /* Info.plist */;
 		fallbackIsa = PBXBookmark;
 		isK = 0;
 		kPath = (
-			NSPrincipleClass,
+		);
+		name = /Users/garfield/programming/tmwclient/Info.plist;
+		rLen = 0;
+		rLoc = 2147483647;
+	};
+	927F62640ED4F41700D919E6 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 92BC40E50BAEF54B000DAB7F /* SDLMain.m */;
+		name = "SDLMain.m: 14";
+		rLen = 0;
+		rLoc = 440;
+		rType = 0;
+		vrLen = 759;
+		vrLoc = 0;
+	};
+	927F62650ED4F41700D919E6 /* PlistBookmark */ = {
+		isa = PlistBookmark;
+		fRef = 924A42600C0874D00066885E /* Info.plist */;
+		fallbackIsa = PBXBookmark;
+		isK = 0;
+		kPath = (
+			CFBundleVersion,
 		);
 		name = /Users/garfield/programming/tmwclient/Info.plist;
 		rLen = 0;
@@ -252,16 +339,6 @@
 			sepNavWindowFrame = "{{180, 8}, {627, 714}}";
 		};
 	};
-	92B1EBDD0ED4E43D009AF197 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 92BC40E50BAEF54B000DAB7F /* SDLMain.m */;
-		name = "SDLMain.m: 14";
-		rLen = 0;
-		rLoc = 440;
-		rType = 0;
-		vrLen = 759;
-		vrLoc = 0;
-	};
 	92B1EBDE0ED4E43D009AF197 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 92BC3F660BAEE55B000DAB7F /* viewport.cpp */;
@@ -292,10 +369,6 @@
 		vrLen = 780;
 		vrLoc = 7501;
 	};
-	92B1EBE90ED4E547009AF197 /* PBXBookmark */ = {
-		isa = PBXBookmark;
-		fRef = 924A42600C0874D00066885E /* Info.plist */;
-	};
 	92B1EBF30ED4E5C5009AF197 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 92BC3EEF0BAEE55A000DAB7F /* graphics.h */;
@@ -316,40 +389,6 @@
 		vrLen = 692;
 		vrLoc = 434;
 	};
-	92B1EC440ED4EA36009AF197 /* PlistBookmark */ = {
-		isa = PlistBookmark;
-		fRef = 924A42600C0874D00066885E /* Info.plist */;
-		fallbackIsa = PBXBookmark;
-		isK = 0;
-		kPath = (
-		);
-		name = /Users/garfield/programming/tmwclient/Info.plist;
-		rLen = 0;
-		rLoc = 2147483647;
-	};
-	92B1EC470ED4EA36009AF197 /* PlistBookmark */ = {
-		isa = PlistBookmark;
-		fRef = 924A42600C0874D00066885E /* Info.plist */;
-		fallbackIsa = PBXBookmark;
-		isK = 0;
-		kPath = (
-			NSPrincipalClass,
-		);
-		name = /Users/garfield/programming/tmwclient/Info.plist;
-		rLen = 0;
-		rLoc = 2147483647;
-	};
-	92B1EC480ED4EA36009AF197 /* PlistBookmark */ = {
-		isa = PlistBookmark;
-		fRef = 924A42600C0874D00066885E /* Info.plist */;
-		fallbackIsa = PBXBookmark;
-		isK = 0;
-		kPath = (
-		);
-		name = /Users/garfield/programming/tmwclient/Info.plist;
-		rLen = 0;
-		rLoc = 2147483647;
-	};
 	92BC3EBC0BAEE3BB000DAB7F /* themanaworld */ = {
 		isa = PBXExecutable;
 		activeArgIndices = (
@@ -862,8 +901,8 @@
 	92BC40E50BAEF54B000DAB7F /* SDLMain.m */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {726, 3906}}";
-			sepNavSelRange = "{440, 0}";
-			sepNavVisRange = "{7053, 643}";
+			sepNavSelRange = "{3069, 0}";
+			sepNavVisRange = "{2696, 949}";
 			sepNavWindowFrame = "{{583, 96}, {627, 714}}";
 		};
 	};
diff --git a/themanaworld.xcodeproj/project.pbxproj b/themanaworld.xcodeproj/project.pbxproj
index 7bd2a8e0..5bd59f57 100644
--- a/themanaworld.xcodeproj/project.pbxproj
+++ b/themanaworld.xcodeproj/project.pbxproj
@@ -88,7 +88,6 @@
 		926F9CF80DB005FA00AACD26 /* itemshortcut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 926F9CF60DB005FA00AACD26 /* itemshortcut.cpp */; };
 		926F9D450DB00AFC00AACD26 /* itemshortcutcontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 926F9D410DB00AFC00AACD26 /* itemshortcutcontainer.cpp */; };
 		926F9D460DB00AFC00AACD26 /* itemshortcutwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 926F9D430DB00AFC00AACD26 /* itemshortcutwindow.cpp */; };
-		927F62590ED4F1D100D919E6 /* main.nib in Resources */ = {isa = PBXBuildFile; fileRef = 927F62570ED4F1D100D919E6 /* main.nib */; };
 		9294DA9B0C17E70400FCEDE9 /* physfs.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3FAB0BAEE55B000DAB7F /* physfs.c */; };
 		9294DA9C0C17E70600FCEDE9 /* physfs_byteorder.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3FAD0BAEE55B000DAB7F /* physfs_byteorder.c */; };
 		9294DAA10C17E73200FCEDE9 /* libpng.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9294DAA00C17E73200FCEDE9 /* libpng.framework */; };
@@ -474,7 +473,6 @@
 		926F9D420DB00AFC00AACD26 /* itemshortcutcontainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = itemshortcutcontainer.h; sourceTree = "<group>"; };
 		926F9D430DB00AFC00AACD26 /* itemshortcutwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = itemshortcutwindow.cpp; sourceTree = "<group>"; };
 		926F9D440DB00AFC00AACD26 /* itemshortcutwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = itemshortcutwindow.h; sourceTree = "<group>"; };
-		927F62580ED4F1D100D919E6 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/main.nib; sourceTree = "<group>"; };
 		9294DAA00C17E73200FCEDE9 /* libpng.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libpng.framework; path = /Library/Frameworks/libpng.framework; sourceTree = "<absolute>"; };
 		92A4CC9D0D1C622E00CA28FB /* dye.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dye.cpp; path = src/resources/dye.cpp; sourceTree = "<group>"; };
 		92A4CCE00D1DA58D00CA28FB /* dir.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dir.c; sourceTree = "<group>"; };
@@ -905,7 +903,6 @@
 		20286C2CFDCF999611CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				927F62570ED4F1D100D919E6 /* main.nib */,
 				92A4CCFE0D1DA8E500CA28FB /* LICENSE.rtf */,
 				924A42590C0871EC0066885E /* The Mana World.icns */,
 				924A3E590C085ED70066885E /* data */,
@@ -1405,7 +1402,6 @@
 			files = (
 				924A425A0C0871EC0066885E /* The Mana World.icns in Resources */,
 				92A4CCFF0D1DA8E500CA28FB /* LICENSE.rtf in Resources */,
-				927F62590ED4F1D100D919E6 /* main.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1577,17 +1573,6 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXVariantGroup section */
-		927F62570ED4F1D100D919E6 /* main.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				927F62580ED4F1D100D919E6 /* English */,
-			);
-			name = main.nib;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
 /* Begin XCBuildConfiguration section */
 		C0E91AC608A95435008D54AB /* Debug */ = {
 			isa = XCBuildConfiguration;