Commit before merging changes from nickloose

Classes/IJInventoryWindowController.h

@@ -56,6 +56,8 @@
 @property (nonatomic, assign) IBOutlet IJInventoryView *armorView;
 @property (nonatomic, assign) IBOutlet NSSearchField *itemSearchField;
 @property (nonatomic, assign) IBOutlet NSTableView *itemTableView;
+@property (nonatomic, assign) IBOutlet NSTextField *playerNameTextField;
+
 
 @property (nonatomic, retain) NSNumber *worldTime;
 @property (nonatomic, retain) NSString *playerName;

Classes/IJInventoryWindowController.m

@@ -199,7 +199,7 @@
 	
 	[self setDocumentEdited:NO];
 	statusTextField.stringValue = @"";
-	loadedWorldFolder = [worldPath copy];
+	loadedWorldFolder = [worldPath retain];
 }
 
 - (void)loadWorldAtIndex:(int)worldIndex
@@ -413,16 +413,13 @@
 	[self setDocumentEdited:YES];
 }
 
-- (NSNumber *)worldTime
+- (NSString *)playerName
 {
-	return 	[level worldTimeContainer].numberValue;
+	return 	[level ].numberValue;
 }
-- (void)setWorldTime:(NSNumber *)number
+- (void)setPlayerName:(NSString *)playerName
 {
-	[self willChangeValueForKey:@"worldTime"];
-	[level worldTimeContainer].numberValue = number;
-	[self didChangeValueForKey:@"worldTime"];
-	[self setDocumentEdited:YES];
+
 }
 
 #pragma mark -

English.lproj/MainMenu.xib

@@ -554,6 +554,7 @@
 							<int key="NSvFlags">266</int>
 							<string key="NSFrame">{{303, 369}, {274, 14}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="263108995"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="828498206">
@@ -591,6 +592,7 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{101, 327}, {85, 19}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="741930684"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="52955396">
@@ -686,6 +688,7 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{56, 329}, {40, 14}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="395301483"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="421186712">
@@ -703,6 +706,7 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{203, 329}, {43, 14}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="239710738"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="592159044">
@@ -720,6 +724,7 @@
 							<int key="NSvFlags">10</int>
 							<string key="NSFrame">{{0, 355}, {585, 5}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="784892978"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
@@ -747,6 +752,7 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{11, 364}, {195, 25}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="335227372"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSSegmentedCell" key="NSCell" id="587756353">
@@ -795,6 +801,7 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{11, 58}, {360, 120}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="183792805"/>
 							<string key="NSClassName">IJInventoryView</string>
 						</object>
@@ -803,6 +810,7 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{11, 10}, {360, 40}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="896048265"/>
 							<string key="NSClassName">IJInventoryView</string>
 						</object>
@@ -811,6 +819,7 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{11, 186}, {40, 160}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="924742053"/>
 							<string key="NSClassName">IJInventoryView</string>
 						</object>
@@ -819,6 +828,7 @@
 							<int key="NSvFlags">265</int>
 							<string key="NSFrame">{{379, 327}, {195, 22}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="30251356"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSSearchFieldCell" key="NSCell" id="802847124">
@@ -892,6 +902,7 @@
 											<int key="NSvFlags">4352</int>
 											<string key="NSFrameSize">{193, 307}</string>
 											<reference key="NSSuperview" ref="666454848"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="324287214"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="_NSCornerView" key="NSCornerView">
@@ -1071,6 +1082,7 @@
 									</object>
 									<string key="NSFrame">{{1, 1}, {193, 307}}</string>
 									<reference key="NSSuperview" ref="896048265"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="497206092"/>
 									<reference key="NSDocView" ref="497206092"/>
 									<reference key="NSBGColor" ref="451382550"/>
@@ -1081,6 +1093,7 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{191, 17}, {15, 365}}</string>
 									<reference key="NSSuperview" ref="896048265"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="1005482342"/>
 									<reference key="NSTarget" ref="896048265"/>
 									<string key="NSAction">_doScroller:</string>
@@ -1091,6 +1104,7 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{1, 382}, {190, 15}}</string>
 									<reference key="NSSuperview" ref="896048265"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView"/>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="896048265"/>
@@ -1100,6 +1114,7 @@
 							</object>
 							<string key="NSFrame">{{379, 10}, {195, 309}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="666454848"/>
 							<int key="NSsFlags">562</int>
 							<reference key="NSVScroller" ref="324287214"/>
@@ -1112,6 +1127,7 @@
 							<int key="NSvFlags">-2147483380</int>
 							<string key="NSFrame">{{212, 368}, {88, 18}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="574149520"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="569740595">
@@ -1140,6 +1156,7 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{351, 326}, {20, 21}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="17633893"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="508646862">
@@ -1165,11 +1182,12 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{251, 327}, {96, 19}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="822639519"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="265135017">
 								<int key="NSCellFlags">-1804468671</int>
-								<int key="NSCellFlags2">272630784</int>
+								<int key="NSCellFlags2">272761856</int>
 								<string key="NSContents"/>
 								<object class="NSFont" key="NSSupport">
 									<string key="NSName">LucidaGrande</string>
@@ -1185,6 +1203,7 @@
 					</object>
 					<string key="NSFrame">{{7, 11}, {585, 396}}</string>
 					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="626341130"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
@@ -2640,7 +2659,255 @@
 			<nil key="sourceID"/>
 			<int key="maxID">710</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">IJInventoryView</string>
+					<string key="superclassName">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/IJInventoryView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">IJInventoryWindowController</string>
+					<string key="superclassName">NSWindowController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>itemTableViewDoubleClicked:</string>
+							<string>makeSearchFieldFirstResponder:</string>
+							<string>menuSelectWorld:</string>
+							<string>menuSelectWorldFromPath:</string>
+							<string>updateItemSearchFilter:</string>
+							<string>worldSelectionChanged:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>itemTableViewDoubleClicked:</string>
+							<string>makeSearchFieldFirstResponder:</string>
+							<string>menuSelectWorld:</string>
+							<string>menuSelectWorldFromPath:</string>
+							<string>updateItemSearchFilter:</string>
+							<string>worldSelectionChanged:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBActionInfo">
+								<string key="name">itemTableViewDoubleClicked:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">makeSearchFieldFirstResponder:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">menuSelectWorld:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">menuSelectWorldFromPath:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">updateItemSearchFilter:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">worldSelectionChanged:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>armorView</string>
+							<string>inventoryView</string>
+							<string>itemSearchField</string>
+							<string>itemTableView</string>
+							<string>playerNameTextField</string>
+							<string>quickView</string>
+							<string>statusTextField</string>
+							<string>worldSelectionControl</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>IJInventoryView</string>
+							<string>IJInventoryView</string>
+							<string>NSSearchField</string>
+							<string>NSTableView</string>
+							<string>NSTextField</string>
+							<string>IJInventoryView</string>
+							<string>NSTextField</string>
+							<string>NSSegmentedControl</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>armorView</string>
+							<string>inventoryView</string>
+							<string>itemSearchField</string>
+							<string>itemTableView</string>
+							<string>playerNameTextField</string>
+							<string>quickView</string>
+							<string>statusTextField</string>
+							<string>worldSelectionControl</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">armorView</string>
+								<string key="candidateClassName">IJInventoryView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">inventoryView</string>
+								<string key="candidateClassName">IJInventoryView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">itemSearchField</string>
+								<string key="candidateClassName">NSSearchField</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">itemTableView</string>
+								<string key="candidateClassName">NSTableView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">playerNameTextField</string>
+								<string key="candidateClassName">NSTextField</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">quickView</string>
+								<string key="candidateClassName">IJInventoryView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">statusTextField</string>
+								<string key="candidateClassName">NSTextField</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">worldSelectionControl</string>
+								<string key="candidateClassName">NSSegmentedControl</string>
+							</object>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/IJInventoryWindowController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">IJTableView</string>
+					<string key="superclassName">NSTableView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/IJTableView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">InsideJobAppDelegate</string>
+					<string key="superclassName">NSObject</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">inventoryWindowController</string>
+						<string key="NS.object.0">IJInventoryWindowController</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">inventoryWindowController</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">inventoryWindowController</string>
+							<string key="candidateClassName">IJInventoryWindowController</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/InsideJobAppDelegate.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSDocument</string>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>printDocument:</string>
+							<string>revertDocumentToSaved:</string>
+							<string>runPageLayout:</string>
+							<string>saveDocument:</string>
+							<string>saveDocumentAs:</string>
+							<string>saveDocumentTo:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>printDocument:</string>
+							<string>revertDocumentToSaved:</string>
+							<string>runPageLayout:</string>
+							<string>saveDocument:</string>
+							<string>saveDocumentAs:</string>
+							<string>saveDocumentTo:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBActionInfo">
+								<string key="name">printDocument:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">revertDocumentToSaved:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">runPageLayout:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">saveDocument:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">saveDocumentAs:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">saveDocumentTo:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NSDocument.h</string>
+					</object>
+				</object>
+			</object>
+		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">