diff --git a/Classes/IJInventoryWindowController.h b/Classes/IJInventoryWindowController.h index b4e1314..1b131d9 100644 --- a/Classes/IJInventoryWindowController.h +++ b/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; diff --git a/Classes/IJInventoryWindowController.m b/Classes/IJInventoryWindowController.m index 6c50e69..8f1d4ae 100644 --- a/Classes/IJInventoryWindowController.m +++ b/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 - diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib index 272d3fd..1948196 100644 --- a/English.lproj/MainMenu.xib +++ b/English.lproj/MainMenu.xib @@ -554,6 +554,7 @@ 266 {{303, 369}, {274, 14}} + YES @@ -591,6 +592,7 @@ 268 {{101, 327}, {85, 19}} + YES @@ -686,6 +688,7 @@ 268 {{56, 329}, {40, 14}} + YES @@ -703,6 +706,7 @@ 268 {{203, 329}, {43, 14}} + YES @@ -720,6 +724,7 @@ 10 {{0, 355}, {585, 5}} + {0, 0} @@ -747,6 +752,7 @@ 268 {{11, 364}, {195, 25}} + YES @@ -795,6 +801,7 @@ 268 {{11, 58}, {360, 120}} + IJInventoryView @@ -803,6 +810,7 @@ 268 {{11, 10}, {360, 40}} + IJInventoryView @@ -811,6 +819,7 @@ 268 {{11, 186}, {40, 160}} + IJInventoryView @@ -819,6 +828,7 @@ 265 {{379, 327}, {195, 22}} + YES @@ -892,6 +902,7 @@ 4352 {193, 307} + YES @@ -1071,6 +1082,7 @@ {{1, 1}, {193, 307}} + @@ -1081,6 +1093,7 @@ -2147483392 {{191, 17}, {15, 365}} + _doScroller: @@ -1091,6 +1104,7 @@ -2147483392 {{1, 382}, {190, 15}} + 1 @@ -1100,6 +1114,7 @@ {{379, 10}, {195, 309}} + 562 @@ -1112,6 +1127,7 @@ -2147483380 {{212, 368}, {88, 18}} + YES @@ -1140,6 +1156,7 @@ 268 {{351, 326}, {20, 21}} + YES @@ -1165,11 +1182,12 @@ 268 {{251, 327}, {96, 19}} + YES -1804468671 - 272630784 + 272761856 LucidaGrande @@ -1185,6 +1203,7 @@ {{7, 11}, {585, 396}} + {{0, 0}, {1440, 878}} @@ -2640,7 +2659,255 @@ 710 - + + + YES + + IJInventoryView + NSView + + IBProjectSource + ./Classes/IJInventoryView.h + + + + IJInventoryWindowController + NSWindowController + + YES + + YES + itemTableViewDoubleClicked: + makeSearchFieldFirstResponder: + menuSelectWorld: + menuSelectWorldFromPath: + updateItemSearchFilter: + worldSelectionChanged: + + + YES + id + id + id + id + id + id + + + + YES + + YES + itemTableViewDoubleClicked: + makeSearchFieldFirstResponder: + menuSelectWorld: + menuSelectWorldFromPath: + updateItemSearchFilter: + worldSelectionChanged: + + + YES + + itemTableViewDoubleClicked: + id + + + makeSearchFieldFirstResponder: + id + + + menuSelectWorld: + id + + + menuSelectWorldFromPath: + id + + + updateItemSearchFilter: + id + + + worldSelectionChanged: + id + + + + + YES + + YES + armorView + inventoryView + itemSearchField + itemTableView + playerNameTextField + quickView + statusTextField + worldSelectionControl + + + YES + IJInventoryView + IJInventoryView + NSSearchField + NSTableView + NSTextField + IJInventoryView + NSTextField + NSSegmentedControl + + + + YES + + YES + armorView + inventoryView + itemSearchField + itemTableView + playerNameTextField + quickView + statusTextField + worldSelectionControl + + + YES + + armorView + IJInventoryView + + + inventoryView + IJInventoryView + + + itemSearchField + NSSearchField + + + itemTableView + NSTableView + + + playerNameTextField + NSTextField + + + quickView + IJInventoryView + + + statusTextField + NSTextField + + + worldSelectionControl + NSSegmentedControl + + + + + IBProjectSource + ./Classes/IJInventoryWindowController.h + + + + IJTableView + NSTableView + + IBProjectSource + ./Classes/IJTableView.h + + + + InsideJobAppDelegate + NSObject + + inventoryWindowController + IJInventoryWindowController + + + inventoryWindowController + + inventoryWindowController + IJInventoryWindowController + + + + IBProjectSource + ./Classes/InsideJobAppDelegate.h + + + + NSDocument + + YES + + YES + printDocument: + revertDocumentToSaved: + runPageLayout: + saveDocument: + saveDocumentAs: + saveDocumentTo: + + + YES + id + id + id + id + id + id + + + + YES + + YES + printDocument: + revertDocumentToSaved: + runPageLayout: + saveDocument: + saveDocumentAs: + saveDocumentTo: + + + YES + + printDocument: + id + + + revertDocumentToSaved: + id + + + runPageLayout: + id + + + saveDocument: + id + + + saveDocumentAs: + id + + + saveDocumentTo: + id + + + + + IBProjectSource + ./Classes/NSDocument.h + + + + 0 IBCocoaFramework