You can subscribe to this list here.
| 2005 |
Jan
(13) |
Feb
(37) |
Mar
(12) |
Apr
(15) |
May
(46) |
Jun
(40) |
Jul
(27) |
Aug
|
Sep
(35) |
Oct
(15) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(6) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Geisschaes <gei...@us...> - 2005-05-30 20:00:39
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31105 Modified Files: PlayerList.h PlayerList.m PlayerTableController.h PlayerTableController.m Team.m Log Message: combo box added to player table view Index: PlayerTableController.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerTableController.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PlayerTableController.h 16 Jan 2005 18:04:00 -0000 1.2 --- PlayerTableController.h 30 May 2005 19:59:59 -0000 1.3 *************** *** 32,35 **** --- 32,36 ---- @interface PlayerTableController : TeamController { + NSString* selectedDate; IBOutlet NSView *playerTableView; IBOutlet NSTableView *playerTable; *************** *** 40,42 **** --- 41,46 ---- -(Player*) selectedPlayer; + - (NSString *) selectedDate; + + @end Index: PlayerList.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerList.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PlayerList.h 29 May 2005 19:15:59 -0000 1.6 --- PlayerList.h 30 May 2005 19:59:59 -0000 1.7 *************** *** 39,42 **** --- 39,43 ---- NSMutableArray* playerList; + NSMutableArray* formerDates; // used only for XML Parsing *************** *** 66,69 **** --- 67,73 ---- - (NSArray *)playerList; + - (NSMutableArray *) formerDates; + + /*! @method playerWithInjured:disqualified Index: PlayerList.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerList.m,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PlayerList.m 29 May 2005 19:15:59 -0000 1.6 --- PlayerList.m 30 May 2005 19:59:59 -0000 1.7 *************** *** 31,34 **** --- 31,35 ---- @interface PlayerList (Private) - (void) loadStatesFromFormerPlayerList: (PlayerList*) playerList date: (NSString*) date; + - (void) setFormerDates: (NSMutableArray *) newFormerDates; @end *************** *** 43,46 **** --- 44,48 ---- self = [super init]; playerList = [[NSMutableArray alloc] init]; + formerDates = [[NSMutableArray alloc] init]; NSXMLParser *parser = [[NSXMLParser alloc] initWithContentsOfURL: url]; [parser setDelegate:self]; *************** *** 60,63 **** --- 62,66 ---- if([[NSFileManager defaultManager] fileExistsAtPath:filename]) { NSString *date = [currentPath lastPathComponent]; + [formerDates addObject:date]; PlayerList *formerPlayerList = [[PlayerList alloc] initFromXML:[NSURL URLWithString:filename]]; if(formerPlayerList) { *************** *** 109,112 **** --- 112,125 ---- // Accessors + + + - (NSMutableArray *) formerDates { return formerDates; } + - (void) setFormerDates: (NSMutableArray *) newFormerDates { + [newFormerDates retain]; + [formerDates release]; + formerDates = newFormerDates; + } + + - (NSArray *)playerList { return playerList; *************** *** 197,201 **** - (void)dealloc { [playerList release]; ! [super dealloc]; } --- 210,214 ---- - (void)dealloc { [playerList release]; ! [formerDates release]; [super dealloc]; } Index: PlayerTableController.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerTableController.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PlayerTableController.m 18 Jan 2005 19:37:26 -0000 1.3 --- PlayerTableController.m 30 May 2005 19:59:59 -0000 1.4 *************** *** 32,35 **** --- 32,36 ---- @interface PlayerTableController (Private) - (void) doubleClicked; + - (void) setSelectedDate: (NSString *) newSelectedDate; @end *************** *** 40,46 **** -(PlayerTableController*) init { self = [super init]; ! [NSBundle loadNibNamed:@"PlayerTableView" owner: self]; ! [playerTable setTarget:self]; ! [playerTable setDoubleAction:@selector(doubleClicked)]; return self; } --- 41,49 ---- -(PlayerTableController*) init { self = [super init]; ! if(self) { ! [NSBundle loadNibNamed:@"PlayerTableView" owner: self]; ! [playerTable setTarget:self]; ! [playerTable setDoubleAction:@selector(doubleClicked)]; ! } return self; } *************** *** 59,64 **** --- 62,80 ---- } + + - (NSString *) selectedDate { return selectedDate; } + - (void) setSelectedDate: (NSString *) newSelectedDate { + [newSelectedDate retain]; + [selectedDate release]; + selectedDate = newSelectedDate; + } + + + -(void) doubleClicked { [[MainController mainController] showPlayerDetailsWindowWithPlayer:[self selectedPlayer]]; + NSLog(selectedDate); } + + @end Index: Team.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Team.m,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Team.m 27 Apr 2005 19:36:38 -0000 1.22 --- Team.m 30 May 2005 19:59:59 -0000 1.23 *************** *** 59,62 **** --- 59,63 ---- success = [parser parse]; playerList = [[PlayerList alloc] init]; + [playerList loadFormerPlayerStates]; arena = [[Arena alloc] init]; league = [[League alloc] init]; |
|
From: Geisschaes <gei...@us...> - 2005-05-30 20:00:27
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31105/Macattrick.xcode Modified Files: roman.mode1 roman.pbxuser Log Message: combo box added to player table view Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.mode1,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** roman.mode1 30 May 2005 17:46:31 -0000 1.40 --- roman.mode1 30 May 2005 20:00:02 -0000 1.41 *************** *** 193,197 **** <string>30FA06CB084A4BD40005E57E</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerStateTest.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 193,197 ---- <string>30FA06CB084A4BD40005E57E</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerTableController.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 201,212 **** <string>30FA06CF084A4C2F0005E57E</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerStateTest.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30F01D9D084B887D009C068B</string> <key>history</key> <array> - <string>30F01D87084B887D009C068B</string> <string>30F01D88084B887D009C068B</string> <string>30F01D89084B887D009C068B</string> --- 201,211 ---- <string>30FA06CF084A4C2F0005E57E</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerTableController.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30F01E07084BA78B009C068B</string> <key>history</key> <array> <string>30F01D88084B887D009C068B</string> <string>30F01D89084B887D009C068B</string> *************** *** 214,222 **** <string>30F01D8B084B887D009C068B</string> <string>30F01D8C084B887D009C068B</string> ! <string>30F01D8D084B887D009C068B</string> ! </array> ! <key>nextStack</key> ! <array> ! <string>30F01D9C084B887D009C068B</string> </array> <key>prevStack</key> --- 213,223 ---- <string>30F01D8B084B887D009C068B</string> <string>30F01D8C084B887D009C068B</string> ! <string>30F01DB1084B9EE6009C068B</string> ! <string>30F01DB4084B9EE6009C068B</string> ! <string>30F01DB5084B9EE6009C068B</string> ! <string>30F01DB6084B9EE6009C068B</string> ! <string>30F01DE3084BA032009C068B</string> ! <string>30F01DFA084BA15D009C068B</string> ! <string>30F01DFB084BA15D009C068B</string> </array> <key>prevStack</key> *************** *** 236,239 **** --- 237,253 ---- <string>30F01D9A084B887D009C068B</string> <string>30F01D9B084B887D009C068B</string> + <string>30F01DB8084B9EE6009C068B</string> + <string>30F01DB9084B9EE6009C068B</string> + <string>30F01DBA084B9EE6009C068B</string> + <string>30F01DBB084B9EE6009C068B</string> + <string>30F01DBC084B9EE6009C068B</string> + <string>30F01DBD084B9EE6009C068B</string> + <string>30F01DBE084B9EE6009C068B</string> + <string>30F01DBF084B9EE6009C068B</string> + <string>30F01DC0084B9EE6009C068B</string> + <string>30F01DE4084BA032009C068B</string> + <string>30F01DEF084BA0B0009C068B</string> + <string>30F01DFC084BA15D009C068B</string> + <string>30F01DFD084BA15D009C068B</string> </array> </dict> *************** *** 324,332 **** <array> <string>29B97314FDCFA39411CA2CEA</string> - <string>080E96DDFE201D6D7F000001</string> - <string>30D78B650849D36100112C09</string> - <string>307D956A063D9208008E2586</string> - <string>30B355F80690131C00571DE8</string> - <string>30D78B7E0849D4EF00112C09</string> <string>29B97323FDCFA39411CA2CEA</string> <string>30A438AD068C2923001BFB41</string> --- 338,341 ---- *************** *** 338,343 **** <array> <array> ! <integer>23</integer> ! <integer>18</integer> <integer>0</integer> </array> --- 347,351 ---- <array> <array> ! <integer>9</integer> <integer>0</integer> </array> *************** *** 363,367 **** </array> <key>RubberWindowFrame</key> ! <string>6 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> --- 371,375 ---- </array> <key>RubberWindowFrame</key> ! <string>3 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 379,383 **** <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Player.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 387,391 ---- <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerDetailsController.h</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 387,395 **** <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Player.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30F01D86084B887D009C068B</string> <key>history</key> <array> --- 395,403 ---- <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerDetailsController.h</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30F01E06084BA78B009C068B</string> <key>history</key> <array> *************** *** 406,413 **** <string>30D78B880849D50F00112C09</string> <string>30D78B890849D50F00112C09</string> - <string>30D78B8B0849D50F00112C09</string> <string>30D78B8C0849D50F00112C09</string> - <string>30D78B8D0849D50F00112C09</string> - <string>30D78B8E0849D50F00112C09</string> <string>30D78B8F0849D50F00112C09</string> <string>30D78B900849D50F00112C09</string> --- 414,418 ---- *************** *** 457,461 **** <string>30F01D7F084B887D009C068B</string> <string>30F01D80084B887D009C068B</string> ! <string>30F01D81084B887D009C068B</string> </array> <key>prevStack</key> --- 462,471 ---- <string>30F01D7F084B887D009C068B</string> <string>30F01D80084B887D009C068B</string> ! <string>30F01DD7084BA032009C068B</string> ! <string>30F01DD8084BA032009C068B</string> ! <string>30F01DD9084BA032009C068B</string> ! <string>30F01DE9084BA0B0009C068B</string> ! <string>30F01DEA084BA0B0009C068B</string> ! <string>30F01DDA084BA032009C068B</string> </array> <key>prevStack</key> *************** *** 529,532 **** --- 539,549 ---- <string>30F01D84084B887D009C068B</string> <string>30F01D85084B887D009C068B</string> + <string>30F01DDD084BA032009C068B</string> + <string>30F01DDE084BA032009C068B</string> + <string>30F01DDF084BA032009C068B</string> + <string>30F01DE0084BA032009C068B</string> + <string>30F01DE1084BA032009C068B</string> + <string>30F01DEB084BA0B0009C068B</string> + <string>30F01DEC084BA0B0009C068B</string> </array> </dict> *************** *** 542,546 **** <string>{{0, 0}, {1072, 433}}</string> <key>RubberWindowFrame</key> ! <string>6 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> --- 559,563 ---- <string>{{0, 0}, {1072, 433}}</string> <key>RubberWindowFrame</key> ! <string>3 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 564,568 **** <string>{{0, 438}, {1072, 249}}</string> <key>RubberWindowFrame</key> ! <string>6 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> --- 581,585 ---- <string>{{0, 438}, {1072, 249}}</string> <key>RubberWindowFrame</key> ! <string>3 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 729,739 **** <string>30F01D35084B7ED3009C068B</string> <string>1CD10A99069EF8BA00B06720</string> - <string>1C0AD2B3069F1EA900FABCE6</string> <string>30A82A48082E9E83003C97DB</string> <string>30FA06CB084A4BD40005E57E</string> <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> </array> <key>WindowString</key> ! <string>6 104 1280 728 0 0 1280 832 </string> <key>WindowTools</key> <array> --- 746,756 ---- <string>30F01D35084B7ED3009C068B</string> <string>1CD10A99069EF8BA00B06720</string> <string>30A82A48082E9E83003C97DB</string> <string>30FA06CB084A4BD40005E57E</string> + <string>1C0AD2B3069F1EA900FABCE6</string> <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> </array> <key>WindowString</key> ! <string>3 104 1280 728 0 0 1280 832 </string> <key>WindowTools</key> <array> *************** *** 1157,1161 **** <string>{{0, 0}, {1095, 323}}</string> <key>RubberWindowFrame</key> ! <string>58 197 1095 364 0 0 1280 832 </string> </dict> <key>Module</key> --- 1174,1178 ---- <string>{{0, 0}, {1095, 323}}</string> <key>RubberWindowFrame</key> ! <string>230 193 1095 364 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 1187,1191 **** <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>58 197 1095 364 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> --- 1204,1208 ---- <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>230 193 1095 364 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> Index: roman.pbxuser =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.pbxuser,v retrieving revision 1.105 retrieving revision 1.106 diff -C2 -d -r1.105 -r1.106 *** roman.pbxuser 30 May 2005 17:46:32 -0000 1.105 --- roman.pbxuser 30 May 2005 20:00:02 -0000 1.106 *************** *** 40,44 **** activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA; activeExecutable = 30744BA6069560A70039B82A; ! activeTarget = 30DFA496082018F2000CE74D; addToTargets = ( 30DFA496082018F2000CE74D, --- 40,44 ---- activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA; activeExecutable = 30744BA6069560A70039B82A; ! activeTarget = 30744BA4069560A70039B82A; addToTargets = ( [...1166 lines suppressed...] - name = "Player.h: 102"; - rLen = 0; - rLoc = 3500; - rType = 0; - vrLen = 794; - vrLoc = 3292; - }; - 30FA06D0084A4C2F0005E57E = { - fRef = 3041B58B06F623640055CB6D; - isa = PBXTextBookmark; - name = "PlayerList.m: 80"; - rLen = 0; - rLoc = 3786; - rType = 0; - vrLen = 927; - vrLoc = 3347; - }; 32CA4F630368D1EE00C91783 = { uiCtxt = { --- 5182,5185 ---- |
|
From: Geisschaes <gei...@us...> - 2005-05-30 17:47:14
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23981 Modified Files: Player.h Player.m PlayerState.h PlayerState.m Properties.m Log Message: initwithchanges added Index: Properties.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Properties.m,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Properties.m 29 May 2005 19:15:59 -0000 1.16 --- Properties.m 30 May 2005 17:46:31 -0000 1.17 *************** *** 56,60 **** BOOL isDir = TRUE; if([[NSFileManager defaultManager] fileExistsAtPath: path isDirectory: &isDir] && isDir) { - NSLog(path); [formerDates addObject:path]; } --- 56,59 ---- Index: PlayerState.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerState.m,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PlayerState.m 30 May 2005 16:15:38 -0000 1.1 --- PlayerState.m 30 May 2005 17:46:31 -0000 1.2 *************** *** 33,37 **** --- 33,58 ---- @implementation PlayerState + - (void) init { + self = [super init]; + return self; + } + - (PlayerState*) initWithChangesFrom: (PlayerState*) formerState to: (PlayerState*) currentState { + self = [super init]; + if (self) { + NSArray *fields = [[NSArray alloc] initWithObjects:@"tsi", @"salary", @"age", @"injuryLevel",@"cards", + @"experience", @"playerForm", @"staminaSkill", @"keeperSkill", + @"playmakerSkill", @"scorerSkill", @"passingSkill", + @"wingerSkill", @"defenderSkill", @"setPiecesSkill", nil]; + NSEnumerator *en = [fields objectEnumerator]; + NSString *current = nil; + while(current = [en nextObject]) { + NSNumber *difference = [[NSNumber alloc] initWithInt:[[currentState valueForKey:current] intValue] - [[formerState valueForKey:current] intValue]]; + [self setValue: difference forKey:current]; + [difference release]; + } + } + return self; + } - (int) tsi { return tsi; } Index: Player.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Player.m,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Player.m 29 May 2005 19:15:59 -0000 1.24 --- Player.m 30 May 2005 17:46:31 -0000 1.25 *************** *** 84,87 **** --- 84,92 ---- } + - (PlayerState*) stateChangeToDate: (NSString*)date { + PlayerState *former = [self stateAtDate:date]; + return [[PlayerState alloc] initWithChangesFrom: former to: currentState]; + } + // NSCopying Protocal Index: PlayerState.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerState.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PlayerState.h 30 May 2005 16:15:38 -0000 1.1 --- PlayerState.h 30 May 2005 17:46:31 -0000 1.2 *************** *** 34,37 **** --- 34,38 ---- @superclass NSObject @abstract contains all changeable properties of a player + but is also used to carry the differences between two player states */ @interface PlayerState : NSObject { *************** *** 57,60 **** --- 58,65 ---- } + + - (PlayerState*) initWithChangesFrom: (PlayerState*) former to: (PlayerState*) current; + + - (int) tsi; - (void) setTsi: (int) newTsi; Index: Player.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/Player.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Player.h 29 May 2005 19:15:49 -0000 1.20 --- Player.h 30 May 2005 17:46:31 -0000 1.21 *************** *** 116,119 **** --- 116,127 ---- - (PlayerState*) stateAtDate: (NSString*) date; + /*! + @method differenceToDate:date: + @abstract returns the difference of the state at date to the current state + @discussion difference is stored in a player state object + @result player state object containing the differences + */ + - (PlayerState*) differenceToDate: (NSString*)date; + -(NSArray*) possiblePlayerSkillsAbilities; -(NSArray*) possiblePlayerStaminaAbilities; |
|
From: Geisschaes <gei...@us...> - 2005-05-30 17:46:49
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23981/Macattrick.xcode Modified Files: roman.mode1 roman.pbxuser Log Message: initwithchanges added Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.mode1,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** roman.mode1 29 May 2005 19:16:00 -0000 1.39 --- roman.mode1 30 May 2005 17:46:31 -0000 1.40 *************** *** 193,197 **** <string>30FA06CB084A4BD40005E57E</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerList.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 193,197 ---- <string>30FA06CB084A4BD40005E57E</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerStateTest.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 201,212 **** <string>30FA06CF084A4C2F0005E57E</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerList.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30FA06D0084A4C2F0005E57E</string> <key>history</key> <array> ! <string>30FA06CA084A4BD40005E57E</string> </array> </dict> --- 201,239 ---- <string>30FA06CF084A4C2F0005E57E</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerStateTest.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30F01D9D084B887D009C068B</string> <key>history</key> <array> ! <string>30F01D87084B887D009C068B</string> ! <string>30F01D88084B887D009C068B</string> ! <string>30F01D89084B887D009C068B</string> ! <string>30F01D8A084B887D009C068B</string> ! <string>30F01D8B084B887D009C068B</string> ! <string>30F01D8C084B887D009C068B</string> ! <string>30F01D8D084B887D009C068B</string> ! </array> ! <key>nextStack</key> ! <array> ! <string>30F01D9C084B887D009C068B</string> ! </array> ! <key>prevStack</key> ! <array> ! <string>30F01D8E084B887D009C068B</string> ! <string>30F01D8F084B887D009C068B</string> ! <string>30F01D90084B887D009C068B</string> ! <string>30F01D91084B887D009C068B</string> ! <string>30F01D92084B887D009C068B</string> ! <string>30F01D93084B887D009C068B</string> ! <string>30F01D94084B887D009C068B</string> ! <string>30F01D95084B887D009C068B</string> ! <string>30F01D96084B887D009C068B</string> ! <string>30F01D97084B887D009C068B</string> ! <string>30F01D98084B887D009C068B</string> ! <string>30F01D99084B887D009C068B</string> ! <string>30F01D9A084B887D009C068B</string> ! <string>30F01D9B084B887D009C068B</string> </array> </dict> *************** *** 220,228 **** <dict> <key>Frame</key> ! <string>{{0, 20}, {750, 461}}</string> <key>PBXModuleWindowStatusBarHidden2</key> <false/> <key>RubberWindowFrame</key> ! <string>15 325 750 502 0 0 1280 832 </string> </dict> </dict> --- 247,255 ---- <dict> <key>Frame</key> ! <string>{{0, 20}, {921, 583}}</string> <key>PBXModuleWindowStatusBarHidden2</key> <false/> <key>RubberWindowFrame</key> ! <string>347 132 921 624 0 0 1280 832 </string> </dict> </dict> *************** *** 298,301 **** --- 325,329 ---- <string>29B97314FDCFA39411CA2CEA</string> <string>080E96DDFE201D6D7F000001</string> + <string>30D78B650849D36100112C09</string> <string>307D956A063D9208008E2586</string> <string>30B355F80690131C00571DE8</string> *************** *** 310,315 **** <array> <array> ! <integer>6</integer> ! <integer>2</integer> <integer>0</integer> </array> --- 338,343 ---- <array> <array> ! <integer>23</integer> ! <integer>18</integer> <integer>0</integer> </array> *************** *** 335,339 **** </array> <key>RubberWindowFrame</key> ! <string>2 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> --- 363,367 ---- </array> <key>RubberWindowFrame</key> ! <string>6 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 351,355 **** <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Player.h</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 379,383 ---- <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Player.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 359,367 **** <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Player.h</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30FA06CE084A4C2F0005E57E</string> <key>history</key> <array> --- 387,395 ---- <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Player.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30F01D86084B887D009C068B</string> <key>history</key> <array> *************** *** 407,416 **** <string>30D78C910849ED0500112C09</string> <string>30D78CE1084A00C100112C09</string> - <string>30D78CE2084A00C100112C09</string> <string>30D78CE3084A00C100112C09</string> <string>30D78CE4084A00C100112C09</string> <string>30D78CE6084A00C100112C09</string> <string>30D78CE7084A00C100112C09</string> - <string>30D78CE8084A00C100112C09</string> <string>30D78CE9084A00C100112C09</string> <string>30D78CEA084A00C100112C09</string> --- 435,442 ---- *************** *** 429,433 **** <string>30FA0694084A45A40005E57E</string> <string>30FA06B9084A49F80005E57E</string> ! <string>30FA06C2084A4A520005E57E</string> </array> <key>prevStack</key> --- 455,461 ---- <string>30FA0694084A45A40005E57E</string> <string>30FA06B9084A49F80005E57E</string> ! <string>30F01D7F084B887D009C068B</string> ! <string>30F01D80084B887D009C068B</string> ! <string>30F01D81084B887D009C068B</string> </array> <key>prevStack</key> *************** *** 488,507 **** <string>30D78CFB084A00C100112C09</string> <string>30FA04D8084A03320005E57E</string> - <string>30FA0545084A10E40005E57E</string> <string>30FA0568084A119F0005E57E</string> <string>30FA05AF084A17FF0005E57E</string> - <string>30FA05B0084A17FF0005E57E</string> <string>30FA05B1084A17FF0005E57E</string> - <string>30FA05B2084A17FF0005E57E</string> <string>30FA05B3084A17FF0005E57E</string> - <string>30FA05B4084A17FF0005E57E</string> - <string>30FA05B6084A17FF0005E57E</string> <string>30FA05B7084A17FF0005E57E</string> - <string>30FA0623084A20E50005E57E</string> <string>30FA067A084A3FFF0005E57E</string> <string>30FA067B084A3FFF0005E57E</string> <string>30FA067C084A3FFF0005E57E</string> <string>30FA0695084A45A40005E57E</string> ! <string>30FA06BA084A49F80005E57E</string> </array> </dict> --- 516,532 ---- <string>30D78CFB084A00C100112C09</string> <string>30FA04D8084A03320005E57E</string> <string>30FA0568084A119F0005E57E</string> <string>30FA05AF084A17FF0005E57E</string> <string>30FA05B1084A17FF0005E57E</string> <string>30FA05B3084A17FF0005E57E</string> <string>30FA05B7084A17FF0005E57E</string> <string>30FA067A084A3FFF0005E57E</string> <string>30FA067B084A3FFF0005E57E</string> <string>30FA067C084A3FFF0005E57E</string> <string>30FA0695084A45A40005E57E</string> ! <string>30F01D82084B887D009C068B</string> ! <string>30F01D83084B887D009C068B</string> ! <string>30F01D84084B887D009C068B</string> ! <string>30F01D85084B887D009C068B</string> </array> </dict> *************** *** 517,521 **** <string>{{0, 0}, {1072, 433}}</string> <key>RubberWindowFrame</key> ! <string>2 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> --- 542,546 ---- <string>{{0, 0}, {1072, 433}}</string> <key>RubberWindowFrame</key> ! <string>6 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 539,543 **** <string>{{0, 438}, {1072, 249}}</string> <key>RubberWindowFrame</key> ! <string>2 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> --- 564,568 ---- <string>{{0, 438}, {1072, 249}}</string> <key>RubberWindowFrame</key> ! <string>6 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 563,569 **** <key>TableOfContents</key> <array> ! <string>30FA04DA084A03320005E57E</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>30FA04DB084A03320005E57E</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> --- 588,594 ---- <key>TableOfContents</key> <array> ! <string>30F01D2C084B7ED3009C068B</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>30F01D2D084B7ED3009C068B</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> *************** *** 701,717 **** <key>WindowOrderList</key> <array> - <string>30FA05BA084A17FF0005E57E</string> - <string>30FA05BB084A17FF0005E57E</string> <string>1C530D57069F1CE1000CFCEE</string> ! <string>30FA04E3084A03320005E57E</string> ! <string>30BE4823082FED6F00826659</string> <string>1CD10A99069EF8BA00B06720</string> <string>1C0AD2B3069F1EA900FABCE6</string> - <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> <string>30A82A48082E9E83003C97DB</string> <string>30FA06CB084A4BD40005E57E</string> </array> <key>WindowString</key> ! <string>2 104 1280 728 0 0 1280 832 </string> <key>WindowTools</key> <array> --- 726,739 ---- <key>WindowOrderList</key> <array> <string>1C530D57069F1CE1000CFCEE</string> ! <string>30F01D35084B7ED3009C068B</string> <string>1CD10A99069EF8BA00B06720</string> <string>1C0AD2B3069F1EA900FABCE6</string> <string>30A82A48082E9E83003C97DB</string> <string>30FA06CB084A4BD40005E57E</string> + <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> </array> <key>WindowString</key> ! <string>6 104 1280 728 0 0 1280 832 </string> <key>WindowTools</key> <array> *************** *** 734,738 **** <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerList.m</string> <key>StatusBarVisibility</key> <true/> --- 756,760 ---- <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerStateTest.m</string> <key>StatusBarVisibility</key> <true/> *************** *** 756,760 **** <dict> <key>PBXBuildLogShowsTranscriptDefaultKey</key> ! <string>{{0, 211}, {787, 152}}</string> <key>PBXProjectModuleGUID</key> <string>XCMainBuildResultsModuleGUID</string> --- 778,782 ---- <dict> <key>PBXBuildLogShowsTranscriptDefaultKey</key> ! <string>{{0, 203}, {787, 160}}</string> <key>PBXProjectModuleGUID</key> <string>XCMainBuildResultsModuleGUID</string> *************** *** 794,798 **** <array> <string>30A82A48082E9E83003C97DB</string> ! <string>30FA055D084A10E40005E57E</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> --- 816,820 ---- <array> <string>30A82A48082E9E83003C97DB</string> ! <string>30F01D75084B87F0009C068B</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> *************** *** 836,841 **** <key>sizes</key> <array> ! <string>{{0, 0}, {222, 147}}</string> ! <string>{{222, 0}, {472, 147}}</string> </array> </dict> --- 858,863 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {208, 144}}</string> ! <string>{{208, 0}, {486, 144}}</string> </array> </dict> *************** *** 852,857 **** <key>sizes</key> <array> ! <string>{{0, 0}, {694, 147}}</string> ! <string>{{0, 147}, {694, 234}}</string> </array> </dict> --- 874,879 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {694, 144}}</string> ! <string>{{0, 144}, {694, 237}}</string> </array> </dict> *************** *** 900,911 **** <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>30FA04DD084A03320005E57E</string> <string>1C162984064C10D400B95A72</string> ! <string>30FA04DE084A03320005E57E</string> ! <string>30FA04DF084A03320005E57E</string> ! <string>30FA04E0084A03320005E57E</string> ! <string>30FA04E1084A03320005E57E</string> ! <string>30FA04E2084A03320005E57E</string> ! <string>30FA04E3084A03320005E57E</string> </array> <key>ToolbarConfiguration</key> --- 922,933 ---- <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>30F01D2F084B7ED3009C068B</string> <string>1C162984064C10D400B95A72</string> ! <string>30F01D30084B7ED3009C068B</string> ! <string>30F01D31084B7ED3009C068B</string> ! <string>30F01D32084B7ED3009C068B</string> ! <string>30F01D33084B7ED3009C068B</string> ! <string>30F01D34084B7ED3009C068B</string> ! <string>30F01D35084B7ED3009C068B</string> </array> <key>ToolbarConfiguration</key> *************** *** 934,937 **** --- 956,961 ---- <array> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> *************** *** 939,943 **** <string>1CDD528C0622207200134675</string> <key>PBXProjectModuleLabel</key> ! <string>Properties.m</string> <key>StatusBarVisibility</key> <true/> --- 963,967 ---- <string>1CDD528C0622207200134675</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerState.m</string> <key>StatusBarVisibility</key> <true/> *************** *** 948,952 **** <string>{{0, 0}, {781, 212}}</string> <key>RubberWindowFrame</key> ! <string>307 319 781 470 0 0 1280 832 </string> </dict> <key>Module</key> --- 972,976 ---- <string>{{0, 0}, {781, 212}}</string> <key>RubberWindowFrame</key> ! <string>160 313 781 470 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 960,965 **** </dict> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> --- 984,987 ---- *************** *** 974,978 **** <string>{{0, 217}, {781, 212}}</string> <key>RubberWindowFrame</key> ! <string>307 319 781 470 0 0 1280 832 </string> </dict> <key>Module</key> --- 996,1000 ---- <string>{{0, 217}, {781, 212}}</string> <key>RubberWindowFrame</key> ! <string>160 313 781 470 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 997,1007 **** <array> <string>1C530D57069F1CE1000CFCEE</string> ! <string>30FA055E084A10E40005E57E</string> ! <string>30FA055F084A10E40005E57E</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> </array> <key>WindowString</key> ! <string>307 319 781 470 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C530D57069F1CE1000CFCEE</string> --- 1019,1029 ---- <array> <string>1C530D57069F1CE1000CFCEE</string> ! <string>30F01D7B084B87F0009C068B</string> ! <string>30F01D7C084B87F0009C068B</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> </array> <key>WindowString</key> ! <string>160 313 781 470 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C530D57069F1CE1000CFCEE</string> *************** *** 1108,1113 **** <key>sizes</key> <array> ! <string>{{0, 0}, {493, 168}}</string> ! <string>{{0, 173}, {493, 270}}</string> </array> </dict> --- 1130,1135 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {491, 168}}</string> ! <string>{{0, 173}, {491, 270}}</string> </array> </dict> *************** *** 1158,1164 **** <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30FA04E4084A03320005E57E</string> <string>1CD0528B0623707200166675</string> ! <string>30FA04E5084A03320005E57E</string> </array> <key>ToolbarConfiguration</key> --- 1180,1186 ---- <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30F01D36084B7ED3009C068B</string> <string>1CD0528B0623707200166675</string> ! <string>30F01D37084B7ED3009C068B</string> </array> <key>ToolbarConfiguration</key> Index: roman.pbxuser =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.pbxuser,v retrieving revision 1.104 retrieving revision 1.105 diff -C2 -d -r1.104 -r1.105 *** roman.pbxuser 29 May 2005 19:16:00 -0000 1.104 --- roman.pbxuser 30 May 2005 17:46:32 -0000 1.105 *************** *** 40,44 **** activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA; activeExecutable = 30744BA6069560A70039B82A; ! activeTarget = 309914160820019C00FBF240; addToTargets = ( 30DFA496082018F2000CE74D, --- 40,44 ---- activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA; activeExecutable = 30744BA6069560A70039B82A; ! activeTarget = 30DFA496082018F2000CE74D; addToTargets = ( 30DFA496082018F2000CE74D, *************** *** 197,201 **** ); }; ! PBXPerProjectTemplateStateSaveDate = 139068194; PBXPrepackagedSmartGroups_v2 = ( { --- 197,201 ---- ); }; ! PBXPerProjectTemplateStateSaveDate = 139165369; PBXPrepackagedSmartGroups_v2 = ( { *************** *** 1041,1045 **** RubberWindowFrame = "496 457 599 209 0 0 1280 832 "; }; ! PBXWorkspaceStateSaveDate = 139068194; }; perUserProjectItems = { --- 1041,1045 ---- RubberWindowFrame = "496 457 599 209 0 0 1280 832 "; }; ! PBXWorkspaceStateSaveDate = 139165369; }; perUserProjectItems = { *************** *** 1149,1152 **** --- 1149,1193 ---- 30D78CFA084A00C100112C09 = 30D78CFA084A00C100112C09; 30D78CFB084A00C100112C09 = 30D78CFB084A00C100112C09; + 30F01D2B084B7ED3009C068B = 30F01D2B084B7ED3009C068B; + 30F01D2E084B7ED3009C068B = 30F01D2E084B7ED3009C068B; + 30F01D71084B87F0009C068B = 30F01D71084B87F0009C068B; + 30F01D72084B87F0009C068B = 30F01D72084B87F0009C068B; + 30F01D73084B87F0009C068B = 30F01D73084B87F0009C068B; + 30F01D74084B87F0009C068B = 30F01D74084B87F0009C068B; + 30F01D77084B87F0009C068B = 30F01D77084B87F0009C068B; + 30F01D78084B87F0009C068B = 30F01D78084B87F0009C068B; + 30F01D79084B87F0009C068B = 30F01D79084B87F0009C068B; + 30F01D7A084B87F0009C068B = 30F01D7A084B87F0009C068B; + 30F01D7F084B887D009C068B = 30F01D7F084B887D009C068B; + 30F01D80084B887D009C068B = 30F01D80084B887D009C068B; + 30F01D81084B887D009C068B = 30F01D81084B887D009C068B; + 30F01D82084B887D009C068B = 30F01D82084B887D009C068B; + 30F01D83084B887D009C068B = 30F01D83084B887D009C068B; + 30F01D84084B887D009C068B = 30F01D84084B887D009C068B; + 30F01D85084B887D009C068B = 30F01D85084B887D009C068B; + 30F01D86084B887D009C068B = 30F01D86084B887D009C068B; + 30F01D87084B887D009C068B = 30F01D87084B887D009C068B; + 30F01D88084B887D009C068B = 30F01D88084B887D009C068B; + 30F01D89084B887D009C068B = 30F01D89084B887D009C068B; + 30F01D8A084B887D009C068B = 30F01D8A084B887D009C068B; + 30F01D8B084B887D009C068B = 30F01D8B084B887D009C068B; + 30F01D8C084B887D009C068B = 30F01D8C084B887D009C068B; + 30F01D8D084B887D009C068B = 30F01D8D084B887D009C068B; + 30F01D8E084B887D009C068B = 30F01D8E084B887D009C068B; + 30F01D8F084B887D009C068B = 30F01D8F084B887D009C068B; + 30F01D90084B887D009C068B = 30F01D90084B887D009C068B; + 30F01D91084B887D009C068B = 30F01D91084B887D009C068B; + 30F01D92084B887D009C068B = 30F01D92084B887D009C068B; + 30F01D93084B887D009C068B = 30F01D93084B887D009C068B; + 30F01D94084B887D009C068B = 30F01D94084B887D009C068B; + 30F01D95084B887D009C068B = 30F01D95084B887D009C068B; + 30F01D96084B887D009C068B = 30F01D96084B887D009C068B; + 30F01D97084B887D009C068B = 30F01D97084B887D009C068B; + 30F01D98084B887D009C068B = 30F01D98084B887D009C068B; + 30F01D99084B887D009C068B = 30F01D99084B887D009C068B; + 30F01D9A084B887D009C068B = 30F01D9A084B887D009C068B; + 30F01D9B084B887D009C068B = 30F01D9B084B887D009C068B; + 30F01D9C084B887D009C068B = 30F01D9C084B887D009C068B; + 30F01D9D084B887D009C068B = 30F01D9D084B887D009C068B; 30FA04D6084A03320005E57E = 30FA04D6084A03320005E57E; 30FA04D8084A03320005E57E = 30FA04D8084A03320005E57E; *************** *** 1230,1236 **** 301CEB8F06746643001C1E37 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {740, 2562}}"; ! sepNavSelRange = "{3240, 0}"; ! sepNavVisRect = "{{0, 648}, {740, 258}}"; sepNavWindowFrame = "{{38, 272}, {750, 534}}"; }; --- 1271,1277 ---- 301CEB8F06746643001C1E37 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {876, 2548}}"; ! sepNavSelRange = "{3216, 0}"; ! sepNavVisRect = "{{0, 631}, {876, 551}}"; sepNavWindowFrame = "{{38, 272}, {750, 534}}"; }; *************** *** 1374,1379 **** uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1148, 2898}}"; ! sepNavSelRange = "{3616, 0}"; ! sepNavVisRect = "{{0, 984}, {740, 258}}"; sepNavWindowFrame = "{{15, 293}, {750, 534}}"; }; --- 1415,1420 ---- uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1148, 2898}}"; ! sepNavSelRange = "{3786, 0}"; ! sepNavVisRect = "{{0, 812}, {705, 429}}"; sepNavWindowFrame = "{{15, 293}, {750, 534}}"; }; *************** *** 2940,2946 **** 30A1800D0640E5C300D2836F = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1025, 1736}}"; sepNavSelRange = "{3500, 0}"; ! sepNavVisRect = "{{0, 1326}, {1025, 401}}"; sepNavWindowFrame = "{{164, 95}, {927, 685}}"; }; --- 2981,2987 ---- 30A1800D0640E5C300D2836F = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1025, 1848}}"; sepNavSelRange = "{3500, 0}"; ! sepNavVisRect = "{{0, 1316}, {1025, 401}}"; sepNavWindowFrame = "{{164, 95}, {927, 685}}"; }; *************** *** 2956,2962 **** 30A1800F0640E5C300D2836F = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1058, 5460}}"; ! sepNavSelRange = "{3557, 0}"; ! sepNavVisRect = "{{0, 857}, {705, 429}}"; sepNavWindowFrame = "{{61, 251}, {750, 534}}"; }; --- 2997,3003 ---- 30A1800F0640E5C300D2836F = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1058, 5530}}"; ! sepNavSelRange = "{3870, 76}"; ! sepNavVisRect = "{{0, 2257}, {1025, 401}}"; sepNavWindowFrame = "{{61, 251}, {750, 534}}"; }; *************** *** 3350,3363 **** 30D78B510849D0AF00112C09 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1025, 1288}}"; ! sepNavSelRange = "{2323, 0}"; ! sepNavVisRect = "{{0, 227}, {1025, 401}}"; }; }; 30D78B520849D0AF00112C09 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1171, 1792}}"; ! sepNavSelRange = "{2173, 0}"; ! sepNavVisRect = "{{0, 395}, {1171, 564}}"; }; }; --- 3391,3404 ---- 30D78B510849D0AF00112C09 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {876, 1358}}"; ! sepNavSelRange = "{2705, 0}"; ! sepNavVisRect = "{{0, 360}, {876, 551}}"; }; }; 30D78B520849D0AF00112C09 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {974, 2086}}"; ! sepNavSelRange = "{2800, 0}"; ! sepNavVisRect = "{{0, 645}, {734, 180}}"; }; }; *************** *** 3497,3501 **** name = "Player.m: setValue:forUndefinedKey:"; rLen = 0; ! rLoc = 9915; rType = 0; vrLen = 1064; --- 3538,3542 ---- name = "Player.m: setValue:forUndefinedKey:"; rLen = 0; ! rLoc = 10096; rType = 0; vrLen = 1064; *************** *** 3961,3967 **** 30D78C390849E53C00112C09 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1025, 630}}"; ! sepNavSelRange = "{2146, 0}"; ! sepNavVisRect = "{{0, 229}, {1025, 401}}"; }; }; --- 4002,4008 ---- 30D78C390849E53C00112C09 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {876, 896}}"; ! sepNavSelRange = "{2876, 0}"; ! sepNavVisRect = "{{0, 327}, {876, 551}}"; }; }; *************** *** 4061,4065 **** name = "PlayerState.h: 37"; rLen = 0; ! rLoc = 2323; rType = 0; vrLen = 1140; --- 4102,4106 ---- name = "PlayerState.h: 37"; rLen = 0; ! rLoc = 2395; rType = 0; vrLen = 1140; *************** *** 4101,4105 **** name = "Player.m: setValue:forUndefinedKey:"; rLen = 0; ! rLoc = 9915; rType = 0; vrLen = 973; --- 4142,4146 ---- name = "Player.m: setValue:forUndefinedKey:"; rLen = 0; ! rLoc = 10096; rType = 0; vrLen = 973; *************** *** 4376,4379 **** --- 4417,4823 ---- }; }; + 30F01D2B084B7ED3009C068B = { + fRef = 30A1800D0640E5C300D2836F; + isa = PBXTextBookmark; + name = "Player.h: 102"; + rLen = 0; + rLoc = 3500; + rType = 0; + vrLen = 794; + vrLoc = 3292; + }; + 30F01D2E084B7ED3009C068B = { + fRef = 3041B58B06F623640055CB6D; + isa = PBXTextBookmark; + name = "PlayerList.m: 80"; + rLen = 0; + rLoc = 3786; + rType = 0; + vrLen = 1060; + vrLoc = 2965; + }; + 30F01D71084B87F0009C068B = { + fRef = 30A1800F0640E5C300D2836F; + isa = PBXTextBookmark; + name = "return [[PlayerState alloc] initWithChangesFrom: former to: currentState];"; + rLen = 76; + rLoc = 3870; + rType = 0; + vrLen = 529; + vrLoc = 3626; + }; + 30F01D72084B87F0009C068B = { + comments = "error: void value not ignored as it ought to be"; + fRef = 30D78C390849E53C00112C09; + isa = PBXTextBookmark; + rLen = 1; + rLoc = 51; + rType = 1; + }; + 30F01D73084B87F0009C068B = { + fRef = 30A1800F0640E5C300D2836F; + isa = PBXTextBookmark; + name = "return [[PlayerState alloc] initWithChangesFrom: former to: currentState];"; + rLen = 76; + rLoc = 3870; + rType = 0; + vrLen = 529; + vrLoc = 3626; + }; + 30F01D74084B87F0009C068B = { + fRef = 30D78C390849E53C00112C09; + isa = PBXTextBookmark; + name = "PlayerState *changes = [[PlayerState alloc] initWithChangesFrom:former to:current];"; + rLen = 85; + rLoc = 2877; + rType = 0; + vrLen = 623; + vrLoc = 2455; + }; + 30F01D77084B87F0009C068B = { + fRef = 301CEB8F06746643001C1E37; + isa = PBXTextBookmark; + name = "Properties.m: 58"; + rLen = 0; + rLoc = 3278; + rType = 0; + vrLen = 428; + vrLoc = 2915; + }; + 30F01D78084B87F0009C068B = { + fRef = 30D78B520849D0AF00112C09; + isa = PBXTextBookmark; + rLen = 0; + rLoc = 2800; + rType = 0; + }; + 30F01D79084B87F0009C068B = { + fRef = 301CEB8F06746643001C1E37; + isa = PBXTextBookmark; + name = "Properties.m: 58"; + rLen = 0; + rLoc = 3278; + rType = 0; + vrLen = 428; + vrLoc = 2915; + }; + 30F01D7A084B87F0009C068B = { + fRef = 30D78B520849D0AF00112C09; + isa = PBXTextBookmark; + name = "PlayerState.m: 50"; + rLen = 0; + rLoc = 2800; + rType = 0; + vrLen = 420; + vrLoc = 2686; + }; + 30F01D7F084B887D009C068B = { + fRef = 30A1800D0640E5C300D2836F; + isa = PBXTextBookmark; + name = "Player.h: 102"; + rLen = 0; + rLoc = 3500; + rType = 0; + vrLen = 911; + vrLoc = 3292; + }; + 30F01D80084B887D009C068B = { + fRef = 30D78C390849E53C00112C09; + isa = PBXTextBookmark; + name = "PlayerStateTest.m: 56"; + rLen = 0; + rLoc = 3054; + rType = 0; + vrLen = 844; + vrLoc = 2234; + }; + 30F01D81084B887D009C068B = { + comments = "error: void value not ignored as it ought to be"; + fRef = 30A1800F0640E5C300D2836F; + isa = PBXTextBookmark; + rLen = 1; + rLoc = 87; + rType = 1; + }; + 30F01D82084B887D009C068B = { + fRef = 30A1800D0640E5C300D2836F; + isa = PBXTextBookmark; + name = "Player.h: 102"; + rLen = 0; + rLoc = 3500; + rType = 0; + vrLen = 794; + vrLoc = 3292; + }; + 30F01D83084B887D009C068B = { + fRef = 30A1800F0640E5C300D2836F; + isa = PBXTextBookmark; + name = "Player.m: setValue:forUndefinedKey:"; + rLen = 0; + rLoc = 10096; + rType = 0; + vrLen = 1375; + vrLoc = 9897; + }; + 30F01D84084B887D009C068B = { + fRef = 30A1800D0640E5C300D2836F; + isa = PBXTextBookmark; + name = "Player.h: 102"; + rLen = 0; + rLoc = 3500; + rType = 0; + vrLen = 911; + vrLoc = 3292; + }; + 30F01D85084B887D009C068B = { + fRef = 30D78C390849E53C00112C09; + isa = PBXTextBookmark; + name = "PlayerStateTest.m: 56"; + rLen = 0; + rLoc = 3054; + rType = 0; + vrLen = 844; + vrLoc = 2234; + }; + 30F01D86084B887D009C068B = { + fRef = 30A1800F0640E5C300D2836F; + isa = PBXTextBookmark; + name = "return [[PlayerState alloc] initWithChangesFrom: former to: currentState];"; + rLen = 76; + rLoc = 3870; + rType = 0; + vrLen = 602; + vrLoc = 5997; + }; + 30F01D87084B887D009C068B = { + fRef = 3041B58B06F623640055CB6D; + isa = PBXTextBookmark; + name = "PlayerList.m: 80"; + rLen = 0; + rLoc = 3786; + rType = 0; + vrLen = 1060; + vrLoc = 2965; + }; + 30F01D88084B887D009C068B = { + fRef = 30A1800D0640E5C300D2836F; + isa = PBXTextBookmark; + name = "- (PlayerState*) differenceToDate: (NSString*)date;"; + rLen = 51; + rLoc = 4203; + rType = 0; + vrLen = 919; + vrLoc = 3467; + }; + 30F01D89084B887D009C068B = { + fRef = 30A1800F0640E5C300D2836F; + isa = PBXTextBookmark; + name = "return [[PlayerState alloc] initWithChangesFrom: former to: currentState];"; + rLen = 76; + rLoc = 3870; + rType = 0; + vrLen = 1236; + vrLoc = 3347; + }; + 30F01D8A084B887D009C068B = { + fRef = 30D78B510849D0AF00112C09; + isa = PBXTextBookmark; + name = "PlayerState.h: initWithChangesFrom:to:"; + rLen = 0; + rLoc = 2705; + rType = 0; + vrLen = 855; + vrLoc = 1985; + }; + 30F01D8B084B887D009C068B = { + fRef = 30D78B520849D0AF00112C09; + isa = PBXTextBookmark; + name = "PlayerState.m: 53"; + rLen = 0; + rLoc = 3020; + rType = 0; + vrLen = 1122; + vrLoc = 2204; + }; + 30F01D8C084B887D009C068B = { + fRef = 301CEB8F06746643001C1E37; + isa = PBXTextBookmark; + name = "Properties.m: 57"; + rLen = 0; + rLoc = 3216; + rType = 0; + vrLen = 1291; + vrLoc = 2718; + }; + 30F01D8D084B887D009C068B = { + fRef = 30D78C390849E53C00112C09; + isa = PBXTextBookmark; + name = "PlayerStateTest.m: 51"; + rLen = 0; + rLoc = 2876; + rType = 0; + vrLen = 1336; + vrLoc = 1742; + }; + 30F01D8E084B887D009C068B = { + fRef = 3041B58B06F623640055CB6D; + isa = PBXTextBookmark; + name = "PlayerList.m: 80"; + rLen = 0; + rLoc = 3786; + rType = 0; + vrLen = 1060; + vrLoc = 2965; + }; + 30F01D8F084B887D009C068B = { + fRef = 301CEB8F06746643001C1E37; + isa = PBXTextBookmark; + name = "Properties.m: 57"; + rLen = 0; + rLoc = 3240; + rType = 0; + vrLen = 1093; + vrLoc = 2419; + }; + 30F01D90084B887D009C068B = { + fRef = 30A1800D0640E5C300D2836F; + isa = PBXTextBookmark; + name = "- (PlayerState*) differenceToDate: (NSString*)date;"; + rLen = 51; + rLoc = 4203; + rType = 0; + vrLen = 919; + vrLoc = 3467; + }; + 30F01D91084B887D009C068B = { + fRef = 30A1800F0640E5C300D2836F; + isa = PBXTextBookmark; + name = "initWithChangesFrom: former to: currentState];"; + rLen = 46; + rLoc = 3899; + rType = 0; + vrLen = 853; + vrLoc = 3347; + }; + 30F01D92084B887D009C068B = { + fRef = 30D78B510849D0AF00112C09; + isa = PBXTextBookmark; + name = "PlayerState.h: injuryLevel"; + rLen = 229; + rLoc = 2456; + rType = 0; + vrLen = 736; + vrLoc = 2173; + }; + 30F01D93084B887D009C068B = { + fRef = 30D78B510849D0AF00112C09; + isa = PBXTextBookmark; + name = "PlayerState.h: 36"; + rLen = 0; + rLoc = 2369; + rType = 0; + vrLen = 1110; + vrLoc = 1661; + }; + 30F01D94084B887D009C068B = { + fRef = 30D78B520849D0AF00112C09; + isa = PBXTextBookmark; + name = initWithChangesFrom; + rLen = 19; + rLoc = 2276; + rType = 0; + vrLen = 1039; + vrLoc = 2066; + }; + 30F01D95084B887D009C068B = { + fRef = 30A1800F0640E5C300D2836F; + isa = PBXTextBookmark; + name = "return [[PlayerState alloc] initWithChangesFrom: former to: currentState];"; + rLen = 76; + rLoc = 3870; + rType = 0; + vrLen = 1236; + vrLoc = 3347; + }; + 30F01D96084B887D009C068B = { + fRef = 30D78B510849D0AF00112C09; + isa = PBXTextBookmark; + name = "PlayerState.h: initWithChangesFrom:to:"; + rLen = 0; + rLoc = 2705; + rType = 0; + vrLen = 796; + vrLoc = 2373; + }; + 30F01D97084B887D009C068B = { + fRef = 30D78B520849D0AF00112C09; + isa = PBXTextBookmark; + name = "PlayerState.m: init"; + rLen = 0; + rLoc = 2274; + rType = 0; + vrLen = 1047; + vrLoc = 2066; + }; + 30F01D98084B887D009C068B = { + fRef = 30D78B510849D0AF00112C09; + isa = PBXTextBookmark; + name = "PlayerState.h: initWithChangesFrom:to:"; + rLen = 0; + rLoc = 2705; + rType = 0; + vrLen = 796; + vrLoc = 2373; + }; + 30F01D99084B887D009C068B = { + fRef = 30D78B520849D0AF00112C09; + isa = PBXTextBookmark; + name = "PlayerState.m: init"; + rLen = 0; + rLoc = 2274; + rType = 0; + vrLen = 1036; + vrLoc = 2204; + }; + 30F01D9A084B887D009C068B = { + fRef = 30D78B510849D0AF00112C09; + isa = PBXTextBookmark; + name = "PlayerState.h: initWithChangesFrom:to:"; + rLen = 0; + rLoc = 2705; + rType = 0; + vrLen = 855; + vrLoc = 1985; + }; + 30F01D9B084B887D009C068B = { + fRef = 30D78B520849D0AF00112C09; + isa = PBXTextBookmark; + name = "PlayerState.m: 53"; + rLen = 0; + rLoc = 3020; + rType = 0; + vrLen = 1122; + vrLoc = 2204; + }; + 30F01D9C084B887D009C068B = { + fRef = 301CEB8F06746643001C1E37; + isa = PBXTextBookmark; + name = "Properties.m: 57"; + rLen = 0; + rLoc = 3216; + rType = 0; + vrLen = 1291; + vrLoc = 2718; + }; + 30F01D9D084B887D009C068B = { + fRef = 30D78C390849E53C00112C09; + isa = PBXTextBookmark; + name = "PlayerStateTest.m: 51"; + rLen = 0; + rLoc = 2876; + rType = 0; + vrLen = 1409; + vrLoc = 1823; + }; 30FA04D6084A03320005E57E = { fRef = 30C8623C064681A00016E5B3; |
|
From: Geisschaes <gei...@us...> - 2005-05-30 17:46:49
|
Update of /cvsroot/macattrick/macattrick/Test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23981/Test Modified Files: PlayerStateTest.m Log Message: initwithchanges added Index: PlayerStateTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/PlayerStateTest.m,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PlayerStateTest.m 30 May 2005 16:15:38 -0000 1.1 --- PlayerStateTest.m 30 May 2005 17:46:36 -0000 1.2 *************** *** 41,44 **** } ! @end --- 41,63 ---- } ! - (void) testInitWithChangesFromTo { ! PlayerState *current = [[PlayerState alloc] init]; ! PlayerState *former = [[PlayerState alloc] init]; ! [current setTsi:900]; [former setTsi:788]; ! [current setAge:31]; [former setAge:30]; ! [current setExperience:9]; [former setExperience:5]; ! [current setSalary:10000]; [former setSalary:9870]; ! [current setDefenderSkill:12]; [former setDefenderSkill:13]; ! [current setPlaymakerSkill:3]; [former setPlaymakerSkill:1]; ! PlayerState *changes = [[PlayerState alloc] initWithChangesFrom:former to:current]; ! UKEqual([changes tsi], 112); ! UKEqual([changes age], 1); ! UKEqual([changes experience], 4); ! UKEqual([changes salary], 130); ! UKEqual([changes defenderSkill], -1); ! UKEqual([changes playmakerSkill], 2); ! [current release]; ! [former release]; ! [changes release]; ! } @end |
|
From: Geisschaes <gei...@us...> - 2005-05-30 16:15:47
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8535 Added Files: PlayerState.h PlayerState.m Log Message: PlayerState added --- NEW FILE: PlayerState.m --- //---- license ---------------------------------------------------------------// // // // Macattrick: a Manager Assistant Tool for the online Game Hattrick.org // // Copyright (C) 2004 Roman Bertolami // // // // this file is part of Macattrick application // // http://sourceforge.net/macattrick // // // // Macattrick is free software; you can redistribute it and/or // // modify it under the terms of the GNU General Public License // // as published by the Free Software Foundation; either version 2 // // of the License, or (at your option) any later version. // // // // Macattrick is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // // along with this program; if not, write to the Free Software // // Foundation, Inc., 59 Temple Place - Suite 330, // // Boston, MA 02111-1307, USA. // // // // Macattrick, Copyright (C) 2004 Roman Bertolami // // Macattrick comes with ABSOLUTELY NO WARRANTY! // // // //---- eo licence ------------------------------------------------------------// #import "PlayerState.h" @implementation PlayerState - (int) tsi { return tsi; } - (void) setTsi: (int) newTsi { tsi = newTsi; } - (int) salary { return salary; } - (void) setSalary: (int) newSalary { salary = newSalary; } - (int) age { return age; } - (void) setAge: (int) newAge { age = newAge; } - (int) injuryLevel { return injuryLevel; } - (void) setInjuryLevel: (int) newInjuryLevel { injuryLevel = newInjuryLevel; } - (int) cards { return cards; } - (void) setCards: (int) newCards { cards = newCards; } - (int) experience { return experience; } - (void) setExperience: (int) newExperience { experience = newExperience; } - (int) playerForm { return playerForm; } - (void) setPlayerForm: (int) newPlayerForm { playerForm = newPlayerForm; } - (int) staminaSkill { return staminaSkill; } - (void) setStaminaSkill: (int) newStaminaSkill { staminaSkill = newStaminaSkill; } - (int) keeperSkill { return keeperSkill; } - (void) setKeeperSkill: (int) newKeeperSkill { keeperSkill = newKeeperSkill; } - (int) playmakerSkill { return playmakerSkill; } - (void) setPlaymakerSkill: (int) newPlaymakerSkill { playmakerSkill = newPlaymakerSkill; } - (int) scorerSkill { return scorerSkill; } - (void) setScorerSkill: (int) newScorerSkill { scorerSkill = newScorerSkill; } - (int) passingSkill { return passingSkill; } - (void) setPassingSkill: (int) newPassingSkill { passingSkill = newPassingSkill; } - (int) wingerSkill { return wingerSkill; } - (void) setWingerSkill: (int) newWingerSkill { wingerSkill = newWingerSkill; } - (int) defenderSkill { return defenderSkill; } - (void) setDefenderSkill: (int) newDefenderSkill { defenderSkill = newDefenderSkill; } - (int) setPiecesSkill { return setPiecesSkill; } - (void) setSetPiecesSkill: (int) newSetPiecesSkill { setPiecesSkill = newSetPiecesSkill; } @end --- NEW FILE: PlayerState.h --- //---- license ---------------------------------------------------------------// // // // Macattrick: a Manager Assistant Tool for the online Game Hattrick.org // // Copyright (C) 2004 Roman Bertolami // // // // this file is part of Macattrick application // // http://sourceforge.net/macattrick // // // // Macattrick is free software; you can redistribute it and/or // // modify it under the terms of the GNU General Public License // // as published by the Free Software Foundation; either version 2 // // of the License, or (at your option) any later version. // // // // Macattrick is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // // along with this program; if not, write to the Free Software // // Foundation, Inc., 59 Temple Place - Suite 330, // // Boston, MA 02111-1307, USA. // // // // Macattrick, Copyright (C) 2004 Roman Bertolami // // Macattrick comes with ABSOLUTELY NO WARRANTY! // // // //---- eo licence ------------------------------------------------------------// #import <Cocoa/Cocoa.h> /*! @class PlayerState @superclass NSObject @abstract contains all changeable properties of a player */ @interface PlayerState : NSObject { // general int tsi; int salary; int age; int injuryLevel; int cards; // skills int experience; int playerForm; int staminaSkill; int keeperSkill; int playmakerSkill; int scorerSkill; int passingSkill; int wingerSkill; int defenderSkill; int setPiecesSkill; } - (int) tsi; - (void) setTsi: (int) newTsi; - (int) salary; - (void) setSalary: (int) newSalary; - (int) age; - (void) setAge: (int) newAge; - (int) injuryLevel; - (void) setInjuryLevel: (int) newInjuryLevel; - (int) cards; - (void) setCards: (int) newCards; - (int) experience; - (void) setExperience: (int) newExperience; - (int) playerForm; - (void) setPlayerForm: (int) newPlayerForm; - (int) staminaSkill; - (void) setStaminaSkill: (int) newStaminaSkill; - (int) keeperSkill; - (void) setKeeperSkill: (int) newKeeperSkill; - (int) playmakerSkill; - (void) setPlaymakerSkill: (int) newPlaymakerSkill; - (int) scorerSkill; - (void) setScorerSkill: (int) newScorerSkill; - (int) passingSkill; - (void) setPassingSkill: (int) newPassingSkill; - (int) wingerSkill; - (void) setWingerSkill: (int) newWingerSkill; - (int) defenderSkill; - (void) setDefenderSkill: (int) newDefenderSkill; - (int) setPiecesSkill; - (void) setSetPiecesSkill: (int) newSetPiecesSkill; @end |
|
From: Geisschaes <gei...@us...> - 2005-05-30 16:15:47
|
Update of /cvsroot/macattrick/macattrick/Test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8535/Test Added Files: PlayerStateTest.h PlayerStateTest.m Log Message: PlayerState added --- NEW FILE: PlayerStateTest.h --- //---- license ---------------------------------------------------------------// // // // Macattrick: a Manager Assistant Tool for the online Game Hattrick.org // // Copyright (C) 2004 Roman Bertolami // // // // this file is part of Macattrick application // // http://sourceforge.net/macattrick // // // // Macattrick is free software; you can redistribute it and/or // // modify it under the terms of the GNU General Public License // // as published by the Free Software Foundation; either version 2 // // of the License, or (at your option) any later version. // // // // Macattrick is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // // along with this program; if not, write to the Free Software // // Foundation, Inc., 59 Temple Place - Suite 330, // // Boston, MA 02111-1307, USA. // // // // Macattrick, Copyright (C) 2004 Roman Bertolami // // Macattrick comes with ABSOLUTELY NO WARRANTY! // // // //---- eo licence ------------------------------------------------------------// #import <Foundation/Foundation.h> #import <UnitKit/UnitKit.h> @interface PlayerStateTest : NSObject <UKTest> { } @end --- NEW FILE: PlayerStateTest.m --- //---- license ---------------------------------------------------------------// // // // Macattrick: a Manager Assistant Tool for the online Game Hattrick.org // // Copyright (C) 2004 Roman Bertolami // // // // this file is part of Macattrick application // // http://sourceforge.net/macattrick // // // // Macattrick is free software; you can redistribute it and/or // // modify it under the terms of the GNU General Public License // // as published by the Free Software Foundation; either version 2 // // of the License, or (at your option) any later version. // // // // Macattrick is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // // along with this program; if not, write to the Free Software // // Foundation, Inc., 59 Temple Place - Suite 330, // // Boston, MA 02111-1307, USA. // // // // Macattrick, Copyright (C) 2004 Roman Bertolami // // Macattrick comes with ABSOLUTELY NO WARRANTY! // // // //---- eo licence ------------------------------------------------------------// #import "PlayerStateTest.h" #import "PlayerState.h" @implementation PlayerStateTest -(void) testInit { PlayerState *state = [[PlayerState alloc] init]; UKNotNil(state); UKEqual([state playerForm], 0); [state setPlayerForm:3]; UKEqual([state playerForm], 3); } @end |
|
From: Geisschaes <gei...@us...> - 2005-05-29 19:16:38
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11037 Modified Files: Player.h Player.m PlayerList.h PlayerList.m Properties.h Properties.m Log Message: loadFormerPlayerStates added to playerlist, but no testing yet. Properties provides a list of former data directories Index: Properties.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Properties.m,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Properties.m 29 May 2005 16:23:54 -0000 1.15 --- Properties.m 29 May 2005 19:15:59 -0000 1.16 *************** *** 46,49 **** --- 46,67 ---- } + +(NSArray*) formerDatesPathes { + NSArray *directoryContents = [[NSFileManager defaultManager] directoryContentsAtPath:[self libraryPath]]; + NSMutableArray *formerDates = [NSMutableArray array]; + NSString *current = nil; + NSEnumerator *en = [directoryContents objectEnumerator]; + while(current = [en nextObject]) { + if([current length] == 8) { + NSString *path = [[NSString alloc] initWithFormat:@"%@/%@", [self libraryPath], current]; + BOOL isDir = TRUE; + if([[NSFileManager defaultManager] fileExistsAtPath: path isDirectory: &isDir] && isDir) { + NSLog(path); + [formerDates addObject:path]; + } + } + } + return formerDates; + } + +(NSString*) playersFile { NSString *path = [self libraryPath]; *************** *** 132,136 **** +(NSString*) dateFormat { ! return @"%Y-%m-%d"; } --- 150,154 ---- +(NSString*) dateFormat { ! return @"%Y%m%d"; } Index: Player.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/Player.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Player.h 29 May 2005 16:23:54 -0000 1.19 --- Player.h 29 May 2005 19:15:49 -0000 1.20 *************** *** 99,102 **** --- 99,104 ---- -(Position*) bestPosition; + - (PlayerState *) currentState; + /*! @method addState Index: Player.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Player.m,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Player.m 29 May 2005 16:23:54 -0000 1.23 --- Player.m 29 May 2005 19:15:59 -0000 1.24 *************** *** 74,77 **** --- 74,78 ---- + - (PlayerState *) currentState { return currentState; } - (void) addState: (PlayerState*)state forDate: (NSString*) date { Index: Properties.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/Properties.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Properties.h 29 May 2005 16:23:54 -0000 1.9 --- Properties.h 29 May 2005 19:15:59 -0000 1.10 *************** *** 131,134 **** --- 131,136 ---- +(NSString*) worldDetailsFileInPath: (NSString*)path; + +(NSArray*) formerDatesPathes; + /*! @method currentVersion *************** *** 157,161 **** @method dateFormat @abstract get the format for macattrick dates ! @discussion used to store the former data, usually @"%Y-%m-%d" */ +(NSString*) dateFormat; --- 159,163 ---- @method dateFormat @abstract get the format for macattrick dates ! @discussion used to store the former data, usually @"%Y%m%d" */ +(NSString*) dateFormat; Index: PlayerList.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerList.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PlayerList.h 28 Nov 2004 14:07:02 -0000 1.5 --- PlayerList.h 29 May 2005 19:15:59 -0000 1.6 *************** *** 58,61 **** --- 58,62 ---- - (PlayerList*) init; + - (void) loadFormerPlayerStates; /*! Index: PlayerList.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerList.m,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PlayerList.m 28 Nov 2004 14:07:02 -0000 1.5 --- PlayerList.m 29 May 2005 19:15:59 -0000 1.6 *************** *** 29,32 **** --- 29,35 ---- #import "PlayerList.h" + @interface PlayerList (Private) + - (void) loadStatesFromFormerPlayerList: (PlayerList*) playerList date: (NSString*) date; + @end @implementation PlayerList *************** *** 48,51 **** --- 51,86 ---- } + - (void) loadFormerPlayerStates { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + NSArray *directories = [Properties formerDatesPathes]; + NSString *currentPath = nil; + NSEnumerator *en = [directories objectEnumerator]; + while(currentPath = [en nextObject]) { + NSString *filename = [Properties playersFileInPath:currentPath]; + if([[NSFileManager defaultManager] fileExistsAtPath:filename]) { + NSString *date = [currentPath lastPathComponent]; + PlayerList *formerPlayerList = [[PlayerList alloc] initFromXML:[NSURL URLWithString:filename]]; + if(formerPlayerList) { + [self loadStatesFromFormerPlayerList:formerPlayerList date:date]; + [formerPlayerList release]; + } + } + } + [pool release]; + } + + + - (void) loadStatesFromFormerPlayerList: (PlayerList*) formerPlayerList date: (NSString*) date{ + NSEnumerator *en = [[self playerList] objectEnumerator]; + Player *currentPlayer = nil; + while(currentPlayer = [en nextObject]) { + int playerID = [currentPlayer playerID]; + Player *formerPlayer = [formerPlayerList playerWithID:playerID]; + if(formerPlayer) { + [currentPlayer addState:[formerPlayer currentState] forDate:date]; + } + } + } + - (PlayerList*) init{ NSURL *url = [[NSURL alloc] initFileURLWithPath: [Properties playersFile]]; |
|
From: Geisschaes <gei...@us...> - 2005-05-29 19:16:22
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11037/Macattrick.xcode Modified Files: project.pbxproj roman.mode1 roman.pbxuser Log Message: loadFormerPlayerStates added to playerlist, but no testing yet. Properties provides a list of former data directories Index: project.pbxproj =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/project.pbxproj,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** project.pbxproj 29 May 2005 13:17:03 -0000 1.75 --- project.pbxproj 29 May 2005 19:15:59 -0000 1.76 *************** *** 3427,3430 **** --- 3427,3431 ---- 30D78B590849D0AF00112C09, 30D78C3C0849E53C00112C09, + 30FA0658084A3CC50005E57E, ); isa = PBXHeadersBuildPhase; *************** *** 3480,3483 **** --- 3481,3485 ---- 30D78B5A0849D0AF00112C09, 30D78C3D0849E53C00112C09, + 30FA0657084A3CC40005E57E, ); isa = PBXSourcesBuildPhase; *************** *** 8038,8041 **** --- 8040,8055 ---- sourceTree = "<group>"; }; + 30FA0657084A3CC40005E57E = { + fileRef = 306796E506BED27F00161E78; + isa = PBXBuildFile; + settings = { + }; + }; + 30FA0658084A3CC50005E57E = { + fileRef = 30EC0BEC06425140008B3F6B; + isa = PBXBuildFile; + settings = { + }; + }; //300 //301 Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.mode1,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** roman.mode1 29 May 2005 16:23:54 -0000 1.38 --- roman.mode1 29 May 2005 19:16:00 -0000 1.39 *************** *** 191,197 **** <dict> <key>PBXProjectModuleGUID</key> ! <string>30D78C440849E57900112C09</string> <key>PBXProjectModuleLabel</key> ! <string>HattrickOrg.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 191,197 ---- <dict> <key>PBXProjectModuleGUID</key> ! <string>30FA06CB084A4BD40005E57E</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerList.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 199,261 **** <dict> <key>PBXProjectModuleGUID</key> ! <string>30D78C610849EA3B00112C09</string> <key>PBXProjectModuleLabel</key> ! <string>HattrickOrg.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30FA064B084A233E0005E57E</string> <key>history</key> <array> ! <string>30D78C980849ED0500112C09</string> ! <string>30D78C990849ED0500112C09</string> ! <string>30D78C9A0849ED0500112C09</string> ! <string>30D78C9B0849ED0500112C09</string> ! <string>30D78CFF084A00C100112C09</string> ! <string>30FA0547084A10E40005E57E</string> ! <string>30FA0548084A10E40005E57E</string> ! <string>30FA0549084A10E40005E57E</string> ! <string>30FA054A084A10E40005E57E</string> ! <string>30FA0581084A13020005E57E</string> ! <string>30FA05E9084A1D1A0005E57E</string> ! <string>30FA0625084A20E50005E57E</string> ! <string>30FA0626084A20E50005E57E</string> ! <string>30FA0647084A233E0005E57E</string> ! <string>30FA0648084A233E0005E57E</string> ! </array> ! <key>prevStack</key> ! <array> ! <string>30D78C9E0849ED0500112C09</string> ! <string>30D78C9F0849ED0500112C09</string> ! <string>30D78CA00849ED0500112C09</string> ! <string>30D78CA20849ED0500112C09</string> ! <string>30D78D07084A00C100112C09</string> ! <string>30D78D0C084A00C100112C09</string> ! <string>30FA0510084A0A2E0005E57E</string> ! <string>30FA0513084A0A2E0005E57E</string> ! <string>30FA054E084A10E40005E57E</string> ! <string>30FA054F084A10E40005E57E</string> ! <string>30FA0550084A10E40005E57E</string> ! <string>30FA0551084A10E40005E57E</string> ! <string>30FA0552084A10E40005E57E</string> ! <string>30FA0553084A10E40005E57E</string> ! <string>30FA0554084A10E40005E57E</string> ! <string>30FA0555084A10E40005E57E</string> ! <string>30FA0556084A10E40005E57E</string> ! <string>30FA0557084A10E40005E57E</string> ! <string>30FA0559084A10E40005E57E</string> ! <string>30FA055B084A10E40005E57E</string> ! <string>30FA056D084A119F0005E57E</string> ! <string>30FA0583084A13020005E57E</string> ! <string>30FA0584084A13020005E57E</string> ! <string>30FA05EA084A1D1A0005E57E</string> ! <string>30FA05EB084A1D1A0005E57E</string> ! <string>30FA05F3084A1DB60005E57E</string> ! <string>30FA0628084A20E50005E57E</string> ! <string>30FA0629084A20E50005E57E</string> ! <string>30FA062A084A20E50005E57E</string> ! <string>30FA062B084A20E50005E57E</string> ! <string>30FA0649084A233E0005E57E</string> ! <string>30FA064A084A233E0005E57E</string> </array> </dict> --- 199,212 ---- <dict> <key>PBXProjectModuleGUID</key> ! <string>30FA06CF084A4C2F0005E57E</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerList.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30FA06D0084A4C2F0005E57E</string> <key>history</key> <array> ! <string>30FA06CA084A4BD40005E57E</string> </array> </dict> *************** *** 269,277 **** <dict> <key>Frame</key> ! <string>{{0, 20}, {1216, 596}}</string> <key>PBXModuleWindowStatusBarHidden2</key> <false/> <key>RubberWindowFrame</key> ! <string>72 78 1216 637 0 0 1280 832 </string> </dict> </dict> --- 220,228 ---- <dict> <key>Frame</key> ! <string>{{0, 20}, {750, 461}}</string> <key>PBXModuleWindowStatusBarHidden2</key> <false/> <key>RubberWindowFrame</key> ! <string>15 325 750 502 0 0 1280 832 </string> </dict> </dict> *************** *** 347,350 **** --- 298,302 ---- <string>29B97314FDCFA39411CA2CEA</string> <string>080E96DDFE201D6D7F000001</string> + <string>307D956A063D9208008E2586</string> <string>30B355F80690131C00571DE8</string> <string>30D78B7E0849D4EF00112C09</string> *************** *** 358,362 **** <array> <array> ! <integer>3</integer> <integer>2</integer> <integer>0</integer> --- 310,314 ---- <array> <array> ! <integer>6</integer> <integer>2</integer> <integer>0</integer> *************** *** 364,368 **** </array> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> ! <string>{{0, 34}, {186, 669}}</string> </dict> <key>PBXTopSmartGroupGIDs</key> --- 316,320 ---- </array> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> ! <string>{{0, 0}, {186, 669}}</string> </dict> <key>PBXTopSmartGroupGIDs</key> *************** *** 383,387 **** </array> <key>RubberWindowFrame</key> ! <string>9 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> --- 335,339 ---- </array> <key>RubberWindowFrame</key> ! <string>2 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 394,399 **** <array> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> --- 346,349 ---- *************** *** 401,405 **** <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>HattrickOrgTest.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 351,355 ---- <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Player.h</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 409,417 **** <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>HattrickOrgTest.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30FA0646084A233E0005E57E</string> <key>history</key> <array> --- 359,367 ---- <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Player.h</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30FA06CE084A4C2F0005E57E</string> <key>history</key> <array> *************** *** 468,472 **** <string>30D78CEC084A00C100112C09</string> <string>30FA04D6084A03320005E57E</string> - <string>30FA0543084A10E40005E57E</string> <string>30FA05A7084A17FF0005E57E</string> <string>30FA05A8084A17FF0005E57E</string> --- 418,421 ---- *************** *** 476,481 **** <string>30FA05AD084A17FF0005E57E</string> <string>30FA0622084A20E50005E57E</string> ! <string>30FA0643084A233E0005E57E</string> ! <string>30FA0644084A233E0005E57E</string> </array> <key>prevStack</key> --- 425,433 ---- <string>30FA05AD084A17FF0005E57E</string> <string>30FA0622084A20E50005E57E</string> ! <string>30FA0676084A3FFF0005E57E</string> ! <string>30FA0677084A3FFF0005E57E</string> ! <string>30FA0694084A45A40005E57E</string> ! <string>30FA06B9084A49F80005E57E</string> ! <string>30FA06C2084A4A520005E57E</string> </array> <key>prevStack</key> *************** *** 544,552 **** <string>30FA05B3084A17FF0005E57E</string> <string>30FA05B4084A17FF0005E57E</string> - <string>30FA05B5084A17FF0005E57E</string> <string>30FA05B6084A17FF0005E57E</string> <string>30FA05B7084A17FF0005E57E</string> <string>30FA0623084A20E50005E57E</string> ! <string>30FA0645084A233E0005E57E</string> </array> </dict> --- 496,507 ---- <string>30FA05B3084A17FF0005E57E</string> <string>30FA05B4084A17FF0005E57E</string> <string>30FA05B6084A17FF0005E57E</string> <string>30FA05B7084A17FF0005E57E</string> <string>30FA0623084A20E50005E57E</string> ! <string>30FA067A084A3FFF0005E57E</string> ! <string>30FA067B084A3FFF0005E57E</string> ! <string>30FA067C084A3FFF0005E57E</string> ! <string>30FA0695084A45A40005E57E</string> ! <string>30FA06BA084A49F80005E57E</string> </array> </dict> *************** *** 562,566 **** <string>{{0, 0}, {1072, 433}}</string> <key>RubberWindowFrame</key> ! <string>9 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> --- 517,521 ---- <string>{{0, 0}, {1072, 433}}</string> <key>RubberWindowFrame</key> ! <string>2 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 570,573 **** --- 525,530 ---- </dict> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> *************** *** 582,586 **** <string>{{0, 438}, {1072, 249}}</string> <key>RubberWindowFrame</key> ! <string>9 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> --- 539,543 ---- <string>{{0, 438}, {1072, 249}}</string> <key>RubberWindowFrame</key> ! <string>2 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 721,725 **** <false/> <key>PinnedNavigatorIdentifier</key> ! <string>30D78C440849E57900112C09</string> <key>ShelfIsVisible</key> <false/> --- 678,682 ---- <false/> <key>PinnedNavigatorIdentifier</key> ! <string>30FA06CB084A4BD40005E57E</string> <key>ShelfIsVisible</key> <false/> *************** *** 746,760 **** <string>30FA05BA084A17FF0005E57E</string> <string>30FA05BB084A17FF0005E57E</string> - <string>30FA04E3084A03320005E57E</string> <string>1C530D57069F1CE1000CFCEE</string> <string>30BE4823082FED6F00826659</string> <string>1CD10A99069EF8BA00B06720</string> - <string>30A82A48082E9E83003C97DB</string> - <string>30D78C440849E57900112C09</string> - <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> <string>1C0AD2B3069F1EA900FABCE6</string> </array> <key>WindowString</key> ! <string>9 104 1280 728 0 0 1280 832 </string> <key>WindowTools</key> <array> --- 703,717 ---- <string>30FA05BA084A17FF0005E57E</string> <string>30FA05BB084A17FF0005E57E</string> <string>1C530D57069F1CE1000CFCEE</string> + <string>30FA04E3084A03320005E57E</string> <string>30BE4823082FED6F00826659</string> <string>1CD10A99069EF8BA00B06720</string> <string>1C0AD2B3069F1EA900FABCE6</string> + <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> + <string>30A82A48082E9E83003C97DB</string> + <string>30FA06CB084A4BD40005E57E</string> </array> <key>WindowString</key> ! <string>2 104 1280 728 0 0 1280 832 </string> <key>WindowTools</key> <array> *************** *** 777,781 **** <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>HattrickOrg.m</string> <key>StatusBarVisibility</key> <true/> --- 734,738 ---- <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>PlayerList.m</string> <key>StatusBarVisibility</key> <true/> *************** *** 786,790 **** <string>{{0, 0}, {787, 290}}</string> <key>RubberWindowFrame</key> ! <string>244 122 787 699 0 0 1280 832 </string> </dict> <key>Module</key> --- 743,747 ---- <string>{{0, 0}, {787, 290}}</string> <key>RubberWindowFrame</key> ! <string>244 123 787 699 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 814,818 **** <string>{{0, 295}, {787, 363}}</string> <key>RubberWindowFrame</key> ! <string>244 122 787 699 0 0 1280 832 </string> </dict> <key>Module</key> --- 771,775 ---- <string>{{0, 295}, {787, 363}}</string> <key>RubberWindowFrame</key> ! <string>244 123 787 699 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 844,848 **** <string>xcode.toolbar.config.build</string> <key>WindowString</key> ! <string>244 122 787 699 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>30A82A48082E9E83003C97DB</string> --- 801,805 ---- <string>xcode.toolbar.config.build</string> <key>WindowString</key> ! <string>244 123 787 699 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>30A82A48082E9E83003C97DB</string> *************** *** 1050,1054 **** <string>1C530D57069F1CE1000CFCEE</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> --- 1007,1011 ---- <string>1C530D57069F1CE1000CFCEE</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> Index: roman.pbxuser =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.pbxuser,v retrieving revision 1.103 retrieving revision 1.104 diff -C2 -d -r1.103 -r1.104 *** roman.pbxuser 29 May 2005 16:23:55 -0000 1.103 --- roman.pbxuser 29 May 2005 19:16:00 -0000 1.104 *************** *** 1062,1071 **** 30D0C99C083915F700AFB5E5 = 30D0C99C083915F700AFB5E5; 30D0C99E083915F700AFB5E5 = 30D0C99E083915F700AFB5E5; - 30D78B850849D50F00112C09 = 30D78B850849D50F00112C09; 30D78B860849D50F00112C09 = 30D78B860849D50F00112C09; 30D78B870849D50F00112C09 = 30D78B870849D50F00112C09; 30D78B880849D50F00112C09 = 30D78B880849D50F00112C09; 30D78B890849D50F00112C09 = 30D78B890849D50F00112C09; - 30D78B8A0849D50F00112C09 = 30D78B8A0849D50F00112C09; 30D78B8B0849D50F00112C09 = 30D78B8B0849D50F00112C09; 30D78B8C0849D50F00112C09 = 30D78B8C0849D50F00112C09; [...2746 lines suppressed...] ! fRef = 30A1800D0640E5C300D2836F; isa = PBXTextBookmark; ! name = "Player.h: 102"; rLen = 0; ! rLoc = 3500; rType = 0; ! vrLen = 794; ! vrLoc = 3292; }; ! 30FA06D0084A4C2F0005E57E = { ! fRef = 3041B58B06F623640055CB6D; isa = PBXTextBookmark; ! name = "PlayerList.m: 80"; rLen = 0; ! rLoc = 3786; rType = 0; ! vrLen = 927; ! vrLoc = 3347; }; 32CA4F630368D1EE00C91783 = { |
|
From: Geisschaes <gei...@us...> - 2005-05-29 19:16:22
|
Update of /cvsroot/macattrick/macattrick/Test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11037/Test Modified Files: PropertiesTest.m Log Message: loadFormerPlayerStates added to playerlist, but no testing yet. Properties provides a list of former data directories Index: PropertiesTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/PropertiesTest.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PropertiesTest.m 27 Apr 2005 19:36:45 -0000 1.3 --- PropertiesTest.m 29 May 2005 19:16:11 -0000 1.4 *************** *** 35,38 **** --- 35,43 ---- } + -(void) testFormerDatesPathes { + NSArray *array = [Properties formerDatesPathes]; + UKNotNil(array); + UKTrue([array count] > 0); + } @end |
|
From: Geisschaes <gei...@us...> - 2005-05-29 16:24:45
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14757 Modified Files: Devel Macattrick-Info.plist HattrickOrg.m Player.h Player.m Properties.h Properties.m Log Message: downloaded files are now copied to ~Library/Application Support/Macattrick/, too Index: Properties.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Properties.m,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Properties.m 14 Mar 2005 19:30:52 -0000 1.14 --- Properties.m 29 May 2005 16:23:54 -0000 1.15 *************** *** 30,45 **** #import "Properties.h" @implementation Properties +(NSString*) libraryPath { ! NSString *path = @"~/Library/Application Support/Macattrick"; return [path stringByExpandingTildeInPath]; } +(NSString*) playersFile { NSString *path = [self libraryPath]; return [path stringByAppendingString:@"/players.xml"]; } - +(NSString*) economyFile { NSString *path = [self libraryPath]; --- 30,53 ---- #import "Properties.h" + @interface Properties(Private) + +(NSString*) file:(NSString*) file withPath: (NSString*)path; + @end @implementation Properties +(NSString*) libraryPath { ! NSString *path = [NSString stringWithString:@"~/Library/Application Support/Macattrick"]; return [path stringByExpandingTildeInPath]; } + +(NSString*) currentEnvironmentPath { + NSCalendarDate *now = [NSCalendarDate calendarDate]; + NSString *dateString = [now descriptionWithCalendarFormat:[self dateFormat]]; + return [NSString stringWithFormat:@"%@/%@",[self libraryPath], dateString] ; + } + +(NSString*) playersFile { NSString *path = [self libraryPath]; return [path stringByAppendingString:@"/players.xml"]; } +(NSString*) economyFile { NSString *path = [self libraryPath]; *************** *** 79,82 **** --- 87,119 ---- } + +(NSString*) playersFileInPath: (NSString*)path { + return [self file:@"players.xml" withPath: path]; + } + +(NSString*) economyFileInPath: (NSString*)path { + return [self file:@"economy.xml" withPath: path]; + } + +(NSString*) teamDetailsFileInPath: (NSString*)path { + return [self file:@"teamDetails.xml" withPath: path]; + } + +(NSString*) leagueDetailsFileInPath: (NSString*)path { + return [self file:@"leagueDetails.xml" withPath: path]; + } + +(NSString*) clubFileInPath: (NSString*)path { + return [self file:@"club.xml" withPath: path]; + } + +(NSString*) trainingFileInPath: (NSString*)path { + return [self file:@"training.xml" withPath: path]; + } + +(NSString*) arenaDetailsInPath: (NSString*)path { + return [self file:@"arenaDetails.xml" withPath: path]; + } + +(NSString*) worldDetailsFileInPath: (NSString*)path { + return [self file:@"worldDetails.xml" withPath: path]; + } + + +(NSString*) file:(NSString*) file withPath: (NSString*)path { + return [NSString stringWithFormat: @"%@/%@", path, file]; + } + +(float) currentVersion { NSString *version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]; *************** *** 93,96 **** --- 130,138 ---- } + + +(NSString*) dateFormat { + return @"%Y-%m-%d"; + } + +(void) initializeUserDefaults { NSArray *keys = [[[NSUserDefaults standardUserDefaults] dictionaryRepresentation] allKeys]; Index: Player.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/Player.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Player.h 29 May 2005 13:16:55 -0000 1.18 --- Player.h 29 May 2005 16:23:54 -0000 1.19 *************** *** 36,39 **** --- 36,40 ---- NSString *playerName; PlayerState *currentState; + NSMutableDictionary *formerStates; int countryID; int leadership; *************** *** 42,61 **** int aggressiveness; int honesty; - - /* int tsi; - int salary; - int age; - int injuryLevel; - int cards; - int experience; - int playerForm; - int staminaSkill; - int keeperSkill; - int playmakerSkill; - int scorerSkill; - int passingSkill; - int wingerSkill; - int defenderSkill; - int setPiecesSkill;*/ } --- 43,46 ---- *************** *** 106,118 **** - (int) setPiecesSkill; - - -(double)teamCaptain; - // overall skill setting - - (void)setStaminaSkill: (int) newStaminaSkill keeperSkill: (int) newKeeperSkill - playmakerSkill: (int) newPlaymakerSkill scorerSkill: (int) newScorerSkill - passingSkill: (int) newPassingSkill wingerSkill: (int) newWingerSkill - defenderSkill: (int) newDefenderSkill setPiecesSkill: (int) newSetPiecesSkill; - (double)calculatePositionValue: (Position*)position; --- 91,96 ---- *************** *** 121,124 **** --- 99,117 ---- -(Position*) bestPosition; + /*! + @method addState + @abstract add a former state + @discussion add the state for a given date + */ + - (void) addState: (PlayerState*)state forDate: (NSString*) date ; + + /*! + @method stateAtDate:date: + @abstract get the state of the player at a given date + @discussion nil if there is no state available for the given date + @result state of the player at a given date + */ + - (PlayerState*) stateAtDate: (NSString*) date; + -(NSArray*) possiblePlayerSkillsAbilities; -(NSArray*) possiblePlayerStaminaAbilities; Index: HattrickOrg.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/HattrickOrg.m,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** HattrickOrg.m 20 May 2005 18:30:35 -0000 1.22 --- HattrickOrg.m 29 May 2005 16:23:54 -0000 1.23 *************** *** 34,37 **** --- 34,38 ---- -(int) download: (NSString*) urlString toFile: (NSString*) file; -(NSURLRequest*) buildRequest: (NSString*) urlString ; + - (void) copyToCurrentEnvironment; @end *************** *** 107,113 **** --- 108,133 ---- errorCode = [self downloadTraining]; if(errorCode) {return errorCode;} errorCode = [self logout]; + if(errorCode == 0) { + [self copyToCurrentEnvironment]; + } return errorCode; } + - (void) copyToCurrentEnvironment { + NSFileManager *fileManager = [NSFileManager defaultManager]; + if([fileManager fileExistsAtPath:[Properties currentEnvironmentPath]]) { + [fileManager removeFileAtPath:[Properties currentEnvironmentPath]handler:nil]; + } + [fileManager createDirectoryAtPath:[Properties currentEnvironmentPath] attributes:nil]; + [fileManager copyPath:[Properties playersFile] toPath: [Properties playersFileInPath:[Properties currentEnvironmentPath]] handler: nil]; + [fileManager copyPath:[Properties worldDetailsFile] toPath: [Properties worldDetailsFileInPath:[Properties currentEnvironmentPath]] handler: nil]; + [fileManager copyPath:[Properties arenaDetailsFile] toPath: [Properties arenaDetailsInPath:[Properties currentEnvironmentPath]] handler: nil]; + [fileManager copyPath:[Properties clubFile] toPath: [Properties clubFileInPath:[Properties currentEnvironmentPath]] handler: nil]; + [fileManager copyPath:[Properties economyFile] toPath: [Properties economyFileInPath:[Properties currentEnvironmentPath]] handler: nil]; + [fileManager copyPath:[Properties leagueDetailsFile] toPath: [Properties leagueDetailsFileInPath:[Properties currentEnvironmentPath]] handler: nil]; + [fileManager copyPath:[Properties teamDetailsFile] toPath: [Properties teamDetailsFileInPath:[Properties currentEnvironmentPath]] handler: nil]; + [fileManager copyPath:[Properties trainingFile] toPath: [Properties trainingFileInPath:[Properties currentEnvironmentPath]] handler: nil]; + } + - (int) login { NSString *urlString = [[NSString alloc] initWithFormat:@"http://%s/Common/default.asp?outputType=XML&actionType=login&loginType=CHPP&Loginname=%s&readonlypassword=%s", Index: Properties.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/Properties.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Properties.h 14 Mar 2005 19:30:51 -0000 1.8 --- Properties.h 29 May 2005 16:23:54 -0000 1.9 *************** *** 47,50 **** --- 47,57 ---- /*! + @method currentEnvironmentPath + @abstract path the the current macattrick files + @discussion this path is usually "libraryPath/$date" + */ + +(NSString*) currentEnvironmentPath; + + /*! @method playersFile @abstract local address of the xml file containing the current players.asp *************** *** 115,118 **** --- 122,134 ---- +(NSString*) worldDetailsFile; + +(NSString*) playersFileInPath: (NSString*)path; + +(NSString*) economyFileInPath: (NSString*)path; + +(NSString*) teamDetailsFileInPath: (NSString*)path; + +(NSString*) leagueDetailsFileInPath: (NSString*)path; + +(NSString*) clubFileInPath: (NSString*)path; + +(NSString*) trainingFileInPath: (NSString*)path; + +(NSString*) arenaDetailsInPath: (NSString*)path; + +(NSString*) worldDetailsFileInPath: (NSString*)path; + /*! @method currentVersion *************** *** 138,142 **** +(void) initializeUserDefaults; ! @end --- 154,163 ---- +(void) initializeUserDefaults; ! /*! ! @method dateFormat ! @abstract get the format for macattrick dates ! @discussion used to store the former data, usually @"%Y-%m-%d" ! */ ! +(NSString*) dateFormat; @end Index: Player.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Player.m,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Player.m 29 May 2005 13:17:03 -0000 1.22 --- Player.m 29 May 2005 16:23:54 -0000 1.23 *************** *** 68,71 **** --- 68,72 ---- if (self) { currentState = [[PlayerState alloc] init]; + formerStates = [[NSMutableDictionary alloc] init]; } return self; *************** *** 73,76 **** --- 74,86 ---- + + - (void) addState: (PlayerState*)state forDate: (NSString*) date { + [formerStates setObject:state forKey:date]; + } + + - (PlayerState*) stateAtDate: (NSString*) date { + return [formerStates objectForKey:date]; + } + // NSCopying Protocal *************** *** 206,210 **** } - - (int) aggressiveness { return aggressiveness; } - (void) setAggressiveness: (int) newAggressiveness { --- 216,219 ---- *************** *** 212,216 **** } - - (int) honesty { return honesty; } - (void) setHonesty: (int) newHonesty { --- 221,224 ---- *************** *** 218,223 **** } - - - (int) specialty { return specialty; } - (void) setSpecialty: (int) newSpecialty { --- 226,229 ---- *************** *** 225,231 **** } - - (int)experience {return [currentState experience];} - - (void)setExperience:(int)newExperience { [currentState setExperience: newExperience]; --- 231,235 ---- *************** *** 233,245 **** - (int)leadership { return leadership;} - - (void)setLeadership:(int)newLeadership { ! if (leadership != newLeadership) { ! leadership = newLeadership; ! } } - (int)playerForm {return [currentState playerForm];} - - (void)setPlayerForm:(int)newPlayerForm { [currentState setPlayerForm: newPlayerForm]; --- 237,245 ---- - (int)leadership { return leadership;} - (void)setLeadership:(int)newLeadership { ! leadership = newLeadership; } - (int)playerForm {return [currentState playerForm];} - (void)setPlayerForm:(int)newPlayerForm { [currentState setPlayerForm: newPlayerForm]; *************** *** 248,252 **** - (int)staminaSkill {return [currentState staminaSkill];} - - (void)setStaminaSkill:(int)newStaminaSkill { [currentState setStaminaSkill:newStaminaSkill]; --- 248,251 ---- *************** *** 254,258 **** - (int)keeperSkill {return [currentState keeperSkill];} - - (void)setKeeperSkill:(int)newKeeperSkill { [currentState setKeeperSkill:newKeeperSkill]; --- 253,256 ---- *************** *** 260,264 **** - (int)playmakerSkill {return [currentState playmakerSkill];} - - (void)setPlaymakerSkill:(int)newPlaymakerSkill { [currentState setPlaymakerSkill: newPlaymakerSkill]; --- 258,261 ---- *************** *** 266,270 **** - (int)scorerSkill {return [currentState scorerSkill];} - - (void)setScorerSkill:(int)newScorerSkill { [currentState setScorerSkill:newScorerSkill]; --- 263,266 ---- *************** *** 272,276 **** - (int)passingSkill {return [currentState passingSkill];} - - (void)setPassingSkill:(int)newPassingSkill { [currentState setPassingSkill: newPassingSkill]; --- 268,271 ---- *************** *** 278,282 **** - (int)wingerSkill { return [currentState wingerSkill];} - - (void)setWingerSkill:(int)newWingerSkill { [currentState setWingerSkill:newWingerSkill]; --- 273,276 ---- *************** *** 284,288 **** - (int)defenderSkill {return [currentState defenderSkill];} - - (void)setDefenderSkill:(int)newDefenderSkill { [currentState setDefenderSkill: newDefenderSkill]; --- 278,281 ---- *************** *** 290,294 **** - (int)setPiecesSkill { return [currentState setPiecesSkill];} - - (void)setSetPiecesSkill:(int)newSetPiecesSkill { [currentState setSetPiecesSkill: newSetPiecesSkill]; --- 283,286 ---- *************** *** 300,334 **** - // overall skill accessor - /*- (void)setStaminaSkill: (int) newStaminaSkill keeperSkill: (int) newKeeperSkill - playmakerSkill: (int) newPlaymakerSkill scorerSkill: (int) newScorerSkill - passingSkill: (int) newPassingSkill wingerSkill: (int) newWingerSkill - defenderSkill: (int) newDefenderSkill setPiecesSkill: (int) newSetPiecesSkill { - if (staminaSkill != newStaminaSkill) { - staminaSkill = newStaminaSkill; - } - if (keeperSkill != newKeeperSkill) { - keeperSkill = newKeeperSkill; - } - if (playmakerSkill != newPlaymakerSkill) { - playmakerSkill = newPlaymakerSkill; - } - if (scorerSkill != newScorerSkill) { - scorerSkill = newScorerSkill; - } - if (passingSkill != newPassingSkill) { - passingSkill = newPassingSkill; - } - if (wingerSkill != newWingerSkill) { - wingerSkill = newWingerSkill; - } - if (defenderSkill != newDefenderSkill) { - defenderSkill = newDefenderSkill; - } - if (setPiecesSkill != newSetPiecesSkill) { - setPiecesSkill = newSetPiecesSkill; - } - }*/ - -(void) setValue:(id)value forUndefinedKey: (id) key { // undefined keys are just ignored --- 292,295 ---- *************** *** 341,345 **** - (double) calculatePositionValue: (Position*) position withinState: (PlayerState*) state{ - //(playerForm * 0.075 + 0.4) return ((([state playerForm] * [position playerFormRate] * 0.125 + 0.4) * ([state staminaSkill] * [position staminaRate] + [state keeperSkill] * [position keeperRate] + [state playmakerSkill] * [position playmakingRate] + [state scorerSkill] * [position scorerRate] --- 302,305 ---- *************** *** 420,423 **** --- 380,384 ---- - (void)dealloc { [currentState release]; + [formerStates release]; [playerName release]; [super dealloc]; Index: Devel Macattrick-Info.plist =================================================================== RCS file: /cvsroot/macattrick/macattrick/Devel Macattrick-Info.plist,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Devel Macattrick-Info.plist 27 Feb 2005 15:14:43 -0000 1.5 --- Devel Macattrick-Info.plist 29 May 2005 16:23:54 -0000 1.6 *************** *** 22,26 **** <string>Roman Bertolami</string> <key>CFBundleVersion</key> ! <string>0.5</string> <key>NSMainNibFile</key> <string>MainMenu</string> --- 22,26 ---- <string>Roman Bertolami</string> <key>CFBundleVersion</key> ! <string>0.6</string> <key>NSMainNibFile</key> <string>MainMenu</string> |
|
From: Geisschaes <gei...@us...> - 2005-05-29 16:24:06
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14757/Macattrick.xcode Modified Files: roman.mode1 roman.pbxuser Log Message: downloaded files are now copied to ~Library/Application Support/Macattrick/, too Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.mode1,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** roman.mode1 29 May 2005 13:17:03 -0000 1.37 --- roman.mode1 29 May 2005 16:23:54 -0000 1.38 *************** *** 193,197 **** <string>30D78C440849E57900112C09</string> <key>PBXProjectModuleLabel</key> ! <string>Player.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 193,197 ---- <string>30D78C440849E57900112C09</string> <key>PBXProjectModuleLabel</key> ! <string>HattrickOrg.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 201,209 **** <string>30D78C610849EA3B00112C09</string> <key>PBXProjectModuleLabel</key> ! <string>Player.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30D78CA50849ED0500112C09</string> <key>history</key> <array> --- 201,209 ---- <string>30D78C610849EA3B00112C09</string> <key>PBXProjectModuleLabel</key> ! <string>HattrickOrg.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30FA064B084A233E0005E57E</string> <key>history</key> <array> *************** *** 212,229 **** <string>30D78C9A0849ED0500112C09</string> <string>30D78C9B0849ED0500112C09</string> ! <string>30D78C9C0849ED0500112C09</string> ! <string>30D78C8E0849ECFC00112C09</string> </array> <key>prevStack</key> <array> - <string>30D78C660849EA3B00112C09</string> - <string>30D78C9D0849ED0500112C09</string> <string>30D78C9E0849ED0500112C09</string> <string>30D78C9F0849ED0500112C09</string> <string>30D78CA00849ED0500112C09</string> - <string>30D78CA10849ED0500112C09</string> <string>30D78CA20849ED0500112C09</string> ! <string>30D78CA30849ED0500112C09</string> ! <string>30D78CA40849ED0500112C09</string> </array> </dict> --- 212,261 ---- <string>30D78C9A0849ED0500112C09</string> <string>30D78C9B0849ED0500112C09</string> ! <string>30D78CFF084A00C100112C09</string> ! <string>30FA0547084A10E40005E57E</string> ! <string>30FA0548084A10E40005E57E</string> ! <string>30FA0549084A10E40005E57E</string> ! <string>30FA054A084A10E40005E57E</string> ! <string>30FA0581084A13020005E57E</string> ! <string>30FA05E9084A1D1A0005E57E</string> ! <string>30FA0625084A20E50005E57E</string> ! <string>30FA0626084A20E50005E57E</string> ! <string>30FA0647084A233E0005E57E</string> ! <string>30FA0648084A233E0005E57E</string> </array> <key>prevStack</key> <array> <string>30D78C9E0849ED0500112C09</string> <string>30D78C9F0849ED0500112C09</string> <string>30D78CA00849ED0500112C09</string> <string>30D78CA20849ED0500112C09</string> ! <string>30D78D07084A00C100112C09</string> ! <string>30D78D0C084A00C100112C09</string> ! <string>30FA0510084A0A2E0005E57E</string> ! <string>30FA0513084A0A2E0005E57E</string> ! <string>30FA054E084A10E40005E57E</string> ! <string>30FA054F084A10E40005E57E</string> ! <string>30FA0550084A10E40005E57E</string> ! <string>30FA0551084A10E40005E57E</string> ! <string>30FA0552084A10E40005E57E</string> ! <string>30FA0553084A10E40005E57E</string> ! <string>30FA0554084A10E40005E57E</string> ! <string>30FA0555084A10E40005E57E</string> ! <string>30FA0556084A10E40005E57E</string> ! <string>30FA0557084A10E40005E57E</string> ! <string>30FA0559084A10E40005E57E</string> ! <string>30FA055B084A10E40005E57E</string> ! <string>30FA056D084A119F0005E57E</string> ! <string>30FA0583084A13020005E57E</string> ! <string>30FA0584084A13020005E57E</string> ! <string>30FA05EA084A1D1A0005E57E</string> ! <string>30FA05EB084A1D1A0005E57E</string> ! <string>30FA05F3084A1DB60005E57E</string> ! <string>30FA0628084A20E50005E57E</string> ! <string>30FA0629084A20E50005E57E</string> ! <string>30FA062A084A20E50005E57E</string> ! <string>30FA062B084A20E50005E57E</string> ! <string>30FA0649084A233E0005E57E</string> ! <string>30FA064A084A233E0005E57E</string> </array> </dict> *************** *** 241,245 **** <false/> <key>RubberWindowFrame</key> ! <string>40 150 1216 637 0 0 1280 832 </string> </dict> </dict> --- 273,277 ---- <false/> <key>RubberWindowFrame</key> ! <string>72 78 1216 637 0 0 1280 832 </string> </dict> </dict> *************** *** 315,321 **** <string>29B97314FDCFA39411CA2CEA</string> <string>080E96DDFE201D6D7F000001</string> ! <string>30D78B650849D36100112C09</string> ! <string>307D956A063D9208008E2586</string> ! <string>30D78C0A0849E47A00112C09</string> <string>29B97323FDCFA39411CA2CEA</string> <string>30A438AD068C2923001BFB41</string> --- 347,352 ---- <string>29B97314FDCFA39411CA2CEA</string> <string>080E96DDFE201D6D7F000001</string> ! <string>30B355F80690131C00571DE8</string> ! <string>30D78B7E0849D4EF00112C09</string> <string>29B97323FDCFA39411CA2CEA</string> <string>30A438AD068C2923001BFB41</string> *************** *** 333,337 **** </array> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> ! <string>{{0, 0}, {186, 669}}</string> </dict> <key>PBXTopSmartGroupGIDs</key> --- 364,368 ---- </array> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> ! <string>{{0, 34}, {186, 669}}</string> </dict> <key>PBXTopSmartGroupGIDs</key> *************** *** 352,356 **** </array> <key>RubberWindowFrame</key> ! <string>0 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> --- 383,387 ---- </array> <key>RubberWindowFrame</key> ! <string>9 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 370,374 **** <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>World.h</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 401,405 ---- <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>HattrickOrgTest.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 378,386 **** <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>World.h</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30D78C970849ED0500112C09</string> <key>history</key> <array> --- 409,417 ---- <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>HattrickOrgTest.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30FA0646084A233E0005E57E</string> <key>history</key> <array> *************** *** 393,405 **** <string>305BDB27083E6F1B00FBE0D3</string> <string>305BDB28083E6F1B00FBE0D3</string> - <string>30D78B800849D50F00112C09</string> - <string>30D78B810849D50F00112C09</string> - <string>30D78B840849D50F00112C09</string> - <string>30D78B850849D50F00112C09</string> <string>30D78B860849D50F00112C09</string> <string>30D78B870849D50F00112C09</string> <string>30D78B880849D50F00112C09</string> <string>30D78B890849D50F00112C09</string> - <string>30D78B8A0849D50F00112C09</string> <string>30D78B8B0849D50F00112C09</string> <string>30D78B8C0849D50F00112C09</string> --- 424,431 ---- *************** *** 420,425 **** <string>30D78C170849E51200112C09</string> <string>30D78C180849E51200112C09</string> - <string>30D78C1A0849E51200112C09</string> - <string>30D78C1B0849E51200112C09</string> <string>30D78C1C0849E51200112C09</string> <string>30D78C1D0849E51200112C09</string> --- 446,449 ---- *************** *** 429,439 **** <string>30D78C530849EA3B00112C09</string> <string>30D78C540849EA3B00112C09</string> - <string>30D78C550849EA3B00112C09</string> - <string>30D78C560849EA3B00112C09</string> - <string>30D78C570849EA3B00112C09</string> <string>30D78C8F0849ED0500112C09</string> <string>30D78C900849ED0500112C09</string> <string>30D78C910849ED0500112C09</string> ! <string>30D78C920849ED0500112C09</string> </array> <key>prevStack</key> --- 453,481 ---- <string>30D78C530849EA3B00112C09</string> <string>30D78C540849EA3B00112C09</string> <string>30D78C8F0849ED0500112C09</string> <string>30D78C900849ED0500112C09</string> <string>30D78C910849ED0500112C09</string> ! <string>30D78CE1084A00C100112C09</string> ! <string>30D78CE2084A00C100112C09</string> ! <string>30D78CE3084A00C100112C09</string> ! <string>30D78CE4084A00C100112C09</string> ! <string>30D78CE6084A00C100112C09</string> ! <string>30D78CE7084A00C100112C09</string> ! <string>30D78CE8084A00C100112C09</string> ! <string>30D78CE9084A00C100112C09</string> ! <string>30D78CEA084A00C100112C09</string> ! <string>30D78CEB084A00C100112C09</string> ! <string>30D78CEC084A00C100112C09</string> ! <string>30FA04D6084A03320005E57E</string> ! <string>30FA0543084A10E40005E57E</string> ! <string>30FA05A7084A17FF0005E57E</string> ! <string>30FA05A8084A17FF0005E57E</string> ! <string>30FA05A9084A17FF0005E57E</string> ! <string>30FA05AA084A17FF0005E57E</string> ! <string>30FA05AB084A17FF0005E57E</string> ! <string>30FA05AD084A17FF0005E57E</string> ! <string>30FA0622084A20E50005E57E</string> ! <string>30FA0643084A233E0005E57E</string> ! <string>30FA0644084A233E0005E57E</string> </array> <key>prevStack</key> *************** *** 441,445 **** <string>30A82A6B082EA48F003C97DB</string> <string>30A82A6C082EA48F003C97DB</string> - <string>30A82A9B082EAADC003C97DB</string> <string>30A82A9C082EAADC003C97DB</string> <string>30A82A9F082EAADC003C97DB</string> --- 483,486 ---- *************** *** 454,468 **** <string>30D78B960849D50F00112C09</string> <string>30D78B970849D50F00112C09</string> - <string>30D78B980849D50F00112C09</string> - <string>30D78B990849D50F00112C09</string> <string>30D78B9A0849D50F00112C09</string> - <string>30D78B9B0849D50F00112C09</string> - <string>30D78B9C0849D50F00112C09</string> - <string>30D78B9D0849D50F00112C09</string> - <string>30D78B9E0849D50F00112C09</string> <string>30D78B9F0849D50F00112C09</string> <string>30D78BA00849D50F00112C09</string> - <string>30D78BA10849D50F00112C09</string> - <string>30D78BA20849D50F00112C09</string> <string>30D78BA30849D50F00112C09</string> <string>30D78BA40849D50F00112C09</string> --- 495,501 ---- *************** *** 471,487 **** <string>30D78BA70849D50F00112C09</string> <string>30D78BA80849D50F00112C09</string> - <string>30D78BA90849D50F00112C09</string> - <string>30D78BAA0849D50F00112C09</string> <string>30D78BAB0849D50F00112C09</string> <string>30D78BAC0849D50F00112C09</string> <string>30D78BAD0849D50F00112C09</string> - <string>30D78BAE0849D50F00112C09</string> <string>30D78BAF0849D50F00112C09</string> <string>30D78BB00849D50F00112C09</string> - <string>30D78BB10849D50F00112C09</string> <string>30D78BB20849D50F00112C09</string> - <string>30D78BC80849E09D00112C09</string> - <string>30D78BC90849E09D00112C09</string> - <string>30D78C210849E51200112C09</string> <string>30D78C220849E51200112C09</string> <string>30D78C230849E51200112C09</string> --- 504,513 ---- *************** *** 494,499 **** <string>30D78C2A0849E51200112C09</string> <string>30D78C2B0849E51200112C09</string> - <string>30D78C2C0849E51200112C09</string> - <string>30D78C2D0849E51200112C09</string> <string>30D78C2E0849E51200112C09</string> <string>30D78C2F0849E51200112C09</string> --- 520,523 ---- *************** *** 502,514 **** <string>30D78C590849EA3B00112C09</string> <string>30D78C5A0849EA3B00112C09</string> - <string>30D78C5B0849EA3B00112C09</string> - <string>30D78C5C0849EA3B00112C09</string> <string>30D78C5D0849EA3B00112C09</string> <string>30D78C5E0849EA3B00112C09</string> <string>30D78C5F0849EA3B00112C09</string> - <string>30D78C930849ED0500112C09</string> - <string>30D78C940849ED0500112C09</string> <string>30D78C950849ED0500112C09</string> ! <string>30D78C960849ED0500112C09</string> </array> </dict> --- 526,552 ---- <string>30D78C590849EA3B00112C09</string> <string>30D78C5A0849EA3B00112C09</string> <string>30D78C5D0849EA3B00112C09</string> <string>30D78C5E0849EA3B00112C09</string> <string>30D78C5F0849EA3B00112C09</string> <string>30D78C950849ED0500112C09</string> ! <string>30D78CF1084A00C100112C09</string> ! <string>30D78CF5084A00C100112C09</string> ! <string>30D78CF9084A00C100112C09</string> ! <string>30D78CFA084A00C100112C09</string> ! <string>30D78CFB084A00C100112C09</string> ! <string>30FA04D8084A03320005E57E</string> ! <string>30FA0545084A10E40005E57E</string> ! <string>30FA0568084A119F0005E57E</string> ! <string>30FA05AF084A17FF0005E57E</string> ! <string>30FA05B0084A17FF0005E57E</string> ! <string>30FA05B1084A17FF0005E57E</string> ! <string>30FA05B2084A17FF0005E57E</string> ! <string>30FA05B3084A17FF0005E57E</string> ! <string>30FA05B4084A17FF0005E57E</string> ! <string>30FA05B5084A17FF0005E57E</string> ! <string>30FA05B6084A17FF0005E57E</string> ! <string>30FA05B7084A17FF0005E57E</string> ! <string>30FA0623084A20E50005E57E</string> ! <string>30FA0645084A233E0005E57E</string> </array> </dict> *************** *** 524,528 **** <string>{{0, 0}, {1072, 433}}</string> <key>RubberWindowFrame</key> ! <string>0 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> --- 562,566 ---- <string>{{0, 0}, {1072, 433}}</string> <key>RubberWindowFrame</key> ! <string>9 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 544,548 **** <string>{{0, 438}, {1072, 249}}</string> <key>RubberWindowFrame</key> ! <string>0 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> --- 582,586 ---- <string>{{0, 438}, {1072, 249}}</string> <key>RubberWindowFrame</key> ! <string>9 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 568,574 **** <key>TableOfContents</key> <array> ! <string>30D78BB40849D50F00112C09</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>30D78BB50849D50F00112C09</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> --- 606,612 ---- <key>TableOfContents</key> <array> ! <string>30FA04DA084A03320005E57E</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>30FA04DB084A03320005E57E</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> *************** *** 706,719 **** <key>WindowOrderList</key> <array> <string>30BE4823082FED6F00826659</string> - <string>30D78CAC0849ED0500112C09</string> - <string>1C0AD2B3069F1EA900FABCE6</string> <string>1CD10A99069EF8BA00B06720</string> - <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> <string>30A82A48082E9E83003C97DB</string> <string>30D78C440849E57900112C09</string> </array> <key>WindowString</key> ! <string>0 104 1280 728 0 0 1280 832 </string> <key>WindowTools</key> <array> --- 744,760 ---- <key>WindowOrderList</key> <array> + <string>30FA05BA084A17FF0005E57E</string> + <string>30FA05BB084A17FF0005E57E</string> + <string>30FA04E3084A03320005E57E</string> + <string>1C530D57069F1CE1000CFCEE</string> <string>30BE4823082FED6F00826659</string> <string>1CD10A99069EF8BA00B06720</string> <string>30A82A48082E9E83003C97DB</string> <string>30D78C440849E57900112C09</string> + <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> + <string>1C0AD2B3069F1EA900FABCE6</string> </array> <key>WindowString</key> ! <string>9 104 1280 728 0 0 1280 832 </string> <key>WindowTools</key> <array> *************** *** 736,740 **** <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>Player.m</string> <key>StatusBarVisibility</key> <true/> --- 777,781 ---- <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>HattrickOrg.m</string> <key>StatusBarVisibility</key> <true/> *************** *** 745,749 **** <string>{{0, 0}, {787, 290}}</string> <key>RubberWindowFrame</key> ! <string>463 113 787 699 0 0 1280 832 </string> </dict> <key>Module</key> --- 786,790 ---- <string>{{0, 0}, {787, 290}}</string> <key>RubberWindowFrame</key> ! <string>244 122 787 699 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 758,762 **** <dict> <key>PBXBuildLogShowsTranscriptDefaultKey</key> ! <string>{{0, 219}, {787, 144}}</string> <key>PBXProjectModuleGUID</key> <string>XCMainBuildResultsModuleGUID</string> --- 799,803 ---- <dict> <key>PBXBuildLogShowsTranscriptDefaultKey</key> ! <string>{{0, 211}, {787, 152}}</string> <key>PBXProjectModuleGUID</key> <string>XCMainBuildResultsModuleGUID</string> *************** *** 773,777 **** <string>{{0, 295}, {787, 363}}</string> <key>RubberWindowFrame</key> ! <string>463 113 787 699 0 0 1280 832 </string> </dict> <key>Module</key> --- 814,818 ---- <string>{{0, 295}, {787, 363}}</string> <key>RubberWindowFrame</key> ! <string>244 122 787 699 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 796,800 **** <array> <string>30A82A48082E9E83003C97DB</string> ! <string>30D78C690849EA3B00112C09</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> --- 837,841 ---- <array> <string>30A82A48082E9E83003C97DB</string> ! <string>30FA055D084A10E40005E57E</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> *************** *** 803,807 **** <string>xcode.toolbar.config.build</string> <key>WindowString</key> ! <string>463 113 787 699 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>30A82A48082E9E83003C97DB</string> --- 844,848 ---- <string>xcode.toolbar.config.build</string> <key>WindowString</key> ! <string>244 122 787 699 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>30A82A48082E9E83003C97DB</string> *************** *** 838,843 **** <key>sizes</key> <array> ! <string>{{0, 0}, {235, 149}}</string> ! <string>{{235, 0}, {459, 149}}</string> </array> </dict> --- 879,884 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {222, 147}}</string> ! <string>{{222, 0}, {472, 147}}</string> </array> </dict> *************** *** 854,859 **** <key>sizes</key> <array> ! <string>{{0, 0}, {694, 149}}</string> ! <string>{{0, 149}, {694, 232}}</string> </array> </dict> --- 895,900 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {694, 147}}</string> ! <string>{{0, 147}, {694, 234}}</string> </array> </dict> *************** *** 879,883 **** <string>{{0, 0}, {694, 381}}</string> <key>RubberWindowFrame</key> ! <string>359 287 694 422 0 0 1280 832 </string> </dict> <key>Module</key> --- 920,924 ---- <string>{{0, 0}, {694, 381}}</string> <key>RubberWindowFrame</key> ! <string>558 290 694 422 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 902,918 **** <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>30D78CA60849ED0500112C09</string> <string>1C162984064C10D400B95A72</string> ! <string>30D78CA70849ED0500112C09</string> ! <string>30D78CA80849ED0500112C09</string> ! <string>30D78CA90849ED0500112C09</string> ! <string>30D78CAA0849ED0500112C09</string> ! <string>30D78CAB0849ED0500112C09</string> ! <string>30D78CAC0849ED0500112C09</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.debug</string> <key>WindowString</key> ! <string>359 287 694 422 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1CD10A99069EF8BA00B06720</string> --- 943,959 ---- <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>30FA04DD084A03320005E57E</string> <string>1C162984064C10D400B95A72</string> ! <string>30FA04DE084A03320005E57E</string> ! <string>30FA04DF084A03320005E57E</string> ! <string>30FA04E0084A03320005E57E</string> ! <string>30FA04E1084A03320005E57E</string> ! <string>30FA04E2084A03320005E57E</string> ! <string>30FA04E3084A03320005E57E</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.debug</string> <key>WindowString</key> ! <string>558 290 694 422 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1CD10A99069EF8BA00B06720</string> *************** *** 936,941 **** <array> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> --- 977,980 ---- *************** *** 943,947 **** <string>1CDD528C0622207200134675</string> <key>PBXProjectModuleLabel</key> ! <string>PositionHeapTest.m</string> <key>StatusBarVisibility</key> <true/> --- 982,986 ---- <string>1CDD528C0622207200134675</string> <key>PBXProjectModuleLabel</key> ! <string>Properties.m</string> <key>StatusBarVisibility</key> <true/> *************** *** 964,967 **** --- 1003,1008 ---- </dict> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> *************** *** 999,1004 **** <array> <string>1C530D57069F1CE1000CFCEE</string> ! <string>3067AFFB0838D3E00063180D</string> ! <string>3067AFFC0838D3E00063180D</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> --- 1040,1045 ---- <array> <string>1C530D57069F1CE1000CFCEE</string> ! <string>30FA055E084A10E40005E57E</string> ! <string>30FA055F084A10E40005E57E</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> *************** *** 1009,1013 **** <string>1C530D57069F1CE1000CFCEE</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> --- 1050,1054 ---- <string>1C530D57069F1CE1000CFCEE</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> *************** *** 1028,1031 **** --- 1069,1074 ---- <array> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> *************** *** 1040,1044 **** <string>{{0, 0}, {440, 358}}</string> <key>RubberWindowFrame</key> ! <string>203 336 440 400 0 0 1280 832 </string> </dict> <key>Module</key> --- 1083,1087 ---- <string>{{0, 0}, {440, 358}}</string> <key>RubberWindowFrame</key> ! <string>824 359 440 400 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 1063,1075 **** <array> <string>30BE4823082FED6F00826659</string> ! <string>30D78CAD0849ED0500112C09</string> <string>1C78EAAC065D492600B07095</string> </array> <key>WindowString</key> ! <string>203 336 440 400 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>30BE4823082FED6F00826659</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> --- 1106,1118 ---- <array> <string>30BE4823082FED6F00826659</string> ! <string>30FA057E084A12EB0005E57E</string> <string>1C78EAAC065D492600B07095</string> </array> <key>WindowString</key> ! <string>824 359 440 400 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>30BE4823082FED6F00826659</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> *************** *** 1108,1113 **** <key>sizes</key> <array> ! <string>{{0, 0}, {367, 168}}</string> ! <string>{{0, 173}, {367, 270}}</string> </array> </dict> --- 1151,1156 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {493, 168}}</string> ! <string>{{0, 173}, {493, 270}}</string> </array> </dict> *************** *** 1135,1139 **** <string>{{0, 0}, {1095, 323}}</string> <key>RubberWindowFrame</key> ! <string>39 168 1095 364 0 0 1280 832 </string> </dict> <key>Module</key> --- 1178,1182 ---- <string>{{0, 0}, {1095, 323}}</string> <key>RubberWindowFrame</key> ! <string>58 197 1095 364 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 1158,1169 **** <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30D78BB70849D50F00112C09</string> <string>1CD0528B0623707200166675</string> ! <string>30D78BB80849D50F00112C09</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>39 168 1095 364 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> --- 1201,1212 ---- <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30FA04E4084A03320005E57E</string> <string>1CD0528B0623707200166675</string> ! <string>30FA04E5084A03320005E57E</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>58 197 1095 364 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> Index: roman.pbxuser =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.pbxuser,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -d -r1.102 -r1.103 *** roman.pbxuser 29 May 2005 13:17:03 -0000 1.102 --- roman.pbxuser 29 May 2005 16:23:55 -0000 1.103 *************** *** 39,43 **** 29B97313FDCFA39411CA2CEA = { activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA; ! activeExecutable = 30425557083763A600DDF612; activeTarget = 309914160820019C00FBF240; addToTargets = ( --- 39,43 ---- 29B97313FDCFA39411CA2CEA = { activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA; ! activeExecutable = 30744BA6069560A70039B82A; activeTarget = 309914160820019C00FBF240; [...3773 lines suppressed...] + isa = PBXTextBookmark; + name = "HattrickOrgTest.m: 203"; + rLen = 0; + rLoc = 8855; + rType = 0; + vrLen = 1387; + vrLoc = 2245; + }; + 30FA064B084A233E0005E57E = { + fRef = 30EC0BDF06425043008B3F6B; + isa = PBXTextBookmark; + name = copyToCurrentEnvironment; + rLen = 24; + rLoc = 4300; + rType = 0; + vrLen = 2477; + vrLoc = 3369; + }; 32CA4F630368D1EE00C91783 = { uiCtxt = { |
|
From: Geisschaes <gei...@us...> - 2005-05-29 16:24:05
|
Update of /cvsroot/macattrick/macattrick/Test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14757/Test Modified Files: HattrickOrgTest.m PlayerTest.m Log Message: downloaded files are now copied to ~Library/Application Support/Macattrick/, too Index: PlayerTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/PlayerTest.m,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** PlayerTest.m 27 Apr 2005 19:36:45 -0000 1.16 --- PlayerTest.m 29 May 2005 16:23:57 -0000 1.17 *************** *** 164,166 **** --- 164,188 ---- } + -(void) testAddFormerState { + PlayerState *formerState = [[PlayerState alloc] init]; + [formerState setPassingSkill:9]; + NSMutableDictionary *formerStates = [pirmin valueForKey:@"formerStates"]; + UKNotNil(formerStates); + [pirmin addState:formerState forDate: @"2005-05-29"]; + UKEqual([formerStates count], 1); + [formerState release]; + } + + -(void) testStateAtDate { + PlayerState *formerState = [[PlayerState alloc] init]; + [formerState setPassingSkill:9]; + [walter addState:formerState forDate: @"2005-05-29"]; + PlayerState *formerState2 = [walter stateAtDate:@"2005-05-29"]; + UKNotNil(formerState2); + UKObjectsSame(formerState, formerState2); + PlayerState *formerState3 = [walter stateAtDate:@"2005-01-29"]; + UKNil(formerState3); + [formerState release]; + } + @end Index: HattrickOrgTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/HattrickOrgTest.m,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** HattrickOrgTest.m 27 Apr 2005 19:36:45 -0000 1.13 --- HattrickOrgTest.m 29 May 2005 16:23:57 -0000 1.14 *************** *** 202,204 **** --- 202,208 ---- } + - (void) testCopyToCurrentEnvironment { + [[HattrickOrg uniqueInstance] copyToCurrentEnvironment]; + UKTrue([[NSFileManager defaultManager] fileExistsAtPath:[Properties leagueDetailsFileInPath:[Properties currentEnvironmentPath]]]); + } @end |
|
From: Geisschaes <gei...@us...> - 2005-05-29 13:17:44
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11784 Modified Files: Player.h Player.m World.h World.m Log Message: PlayerState object introduced. Changeable data is now stored in it. Player object uses currentState to access the data Index: World.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/World.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** World.h 14 Mar 2005 19:30:52 -0000 1.2 --- World.h 29 May 2005 13:17:03 -0000 1.3 *************** *** 39,41 **** --- 39,43 ---- } - (Country*) countryWithID: (int) countryID; + + + (World*) uniqueInstance; @end Index: World.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/World.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** World.m 14 Mar 2005 19:30:52 -0000 1.2 --- World.m 29 May 2005 13:17:03 -0000 1.3 *************** *** 35,39 **** @implementation World ! + uniqueInstance { if(!sharedInstance) { sharedInstance = [[self alloc] init]; --- 35,39 ---- @implementation World ! + (World*) uniqueInstance { if(!sharedInstance) { sharedInstance = [[self alloc] init]; Index: Player.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Player.m,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Player.m 7 Feb 2005 21:15:39 -0000 1.21 --- Player.m 29 May 2005 13:17:03 -0000 1.22 *************** *** 64,95 **** @implementation Player // NSCopying Protocal ! -(Player*) copyWithZone: (NSZone*) zone { Player *copy = [[Player alloc] init]; ! [copy setAge:age]; ! [copy setAggressiveness:aggressiveness]; ! [copy setCards:cards]; ! [copy setAgreeability:agreeability]; ! [copy setCountryID:countryID]; ! [copy setDefenderSkill:defenderSkill]; ! [copy setExperience:experience]; ! [copy setHonesty:honesty]; ! [copy setInjuryLevel:injuryLevel]; ! [copy setKeeperSkill:keeperSkill]; ! [copy setLeadership:leadership]; ! [copy setPassingSkill:passingSkill]; ! [copy setSetPiecesSkill:setPiecesSkill]; ! [copy setPlayerForm:playerForm]; ! [copy setPlayerID:playerID]; ! [copy setPlayerName:[playerName copy]]; ! [copy setPlaymakerSkill:playmakerSkill]; ! [copy setSalary:salary]; ! [copy setScorerSkill:scorerSkill]; ! [copy setSpecialty:specialty]; ! [copy setStaminaSkill:staminaSkill]; ! [copy setTsi:tsi]; ! [copy setWingerSkill:wingerSkill]; return copy; } --- 64,103 ---- @implementation Player + -(id) init { + self = [super init]; + if (self) { + currentState = [[PlayerState alloc] init]; + } + return self; + } + // NSCopying Protocal ! -(id) copyWithZone: (NSZone*) zone { Player *copy = [[Player alloc] init]; ! [copy setAge:[self age]]; ! [copy setAggressiveness:[self aggressiveness]]; ! [copy setCards:[self cards]]; ! [copy setAgreeability:[self agreeability]]; ! [copy setCountryID:[self countryID]]; ! [copy setDefenderSkill:[self defenderSkill]]; ! [copy setExperience:[self experience]]; ! [copy setHonesty:[self honesty]]; ! [copy setInjuryLevel:[self injuryLevel]]; ! [copy setKeeperSkill:[self keeperSkill]]; ! [copy setLeadership:[self leadership]]; ! [copy setPassingSkill:[self passingSkill]]; ! [copy setSetPiecesSkill:[self setPiecesSkill]]; ! [copy setPlayerForm:[self playerForm]]; ! [copy setPlayerID:[self playerID]]; ! [copy setPlayerName:[[self playerName] copy]]; ! [copy setPlaymakerSkill:[self playmakerSkill]]; ! [copy setSalary:[self salary]]; ! [copy setScorerSkill:[self scorerSkill]]; ! [copy setSpecialty:[self specialty]]; ! [copy setStaminaSkill:[self staminaSkill]]; ! [copy setTsi:[self tsi]]; ! [copy setWingerSkill:[self wingerSkill]]; return copy; } *************** *** 120,136 **** } ! - (int) tsi { return tsi; } - (void) setTsi: (int) newTsi { ! tsi = newTsi; } ! - (int) salary {return salary;} - (void) setSalary: (int) newSalary { ! salary = newSalary; } - (NSString *)playerName { return playerName; } - - (void)setPlayerName:(NSString *)newPlayerName { [newPlayerName retain]; --- 128,143 ---- } ! - (int) tsi { return [currentState tsi]; } - (void) setTsi: (int) newTsi { ! [currentState setTsi: newTsi]; } ! - (int) salary {return [currentState salary];} - (void) setSalary: (int) newSalary { ! [currentState setSalary: newSalary]; } - (NSString *)playerName { return playerName; } - (void)setPlayerName:(NSString *)newPlayerName { [newPlayerName retain]; *************** *** 139,179 **** } ! - (int)age { ! return age; ! } ! - (void)setAge:(int)newAge { ! if (age != newAge) { ! age = newAge; ! } } ! - (int)injuryLevel { return injuryLevel;} - (void)setInjuryLevel:(int)newInjuryLevel { ! if (injuryLevel != newInjuryLevel) { ! injuryLevel = newInjuryLevel; ! } } ! - (int) cards { return cards;} - (void) setCards: (int) newCards { ! cards = newCards; } - (BOOL) isDisqualified { ! return cards == 3; } - (NSImage*) injuryImage { ! if (injuryLevel == -1) { return [[NSImage alloc] init]; } ! else if (injuryLevel == 0) { return [[NSImage alloc] initByReferencingFile: [NSString stringWithFormat: @"%@/bruised.gif",[[NSBundle mainBundle] resourcePath]]]; } ! else if (injuryLevel <10) { ! return [[NSImage alloc] initByReferencingFile: [NSString stringWithFormat: @"%@/injured%i.gif",[[NSBundle mainBundle] resourcePath],injuryLevel]]; } else { --- 146,180 ---- } ! - (int)age { return [currentState age];} - (void)setAge:(int)newAge { ! [currentState setAge: newAge]; } ! - (int)injuryLevel { return [currentState injuryLevel];} - (void)setInjuryLevel:(int)newInjuryLevel { ! [currentState setInjuryLevel:newInjuryLevel]; } ! - (int) cards { return [currentState cards];} - (void) setCards: (int) newCards { ! [currentState setCards: newCards]; } - (BOOL) isDisqualified { ! return [currentState cards] == 3; } - (NSImage*) injuryImage { ! int level = [currentState injuryLevel]; ! if (level == -1) { return [[NSImage alloc] init]; } ! else if (level == 0) { return [[NSImage alloc] initByReferencingFile: [NSString stringWithFormat: @"%@/bruised.gif",[[NSBundle mainBundle] resourcePath]]]; } ! else if (level <10) { ! return [[NSImage alloc] initByReferencingFile: [NSString stringWithFormat: @"%@/injured%i.gif",[[NSBundle mainBundle] resourcePath],level]]; } else { *************** *** 183,198 **** - (NSImage*) cardsImage { ! if(cards == 0) { return [[NSImage alloc] init]; } ! else if (cards == 1) { return [[NSImage alloc] initByReferencingFile: [NSString stringWithFormat: @"%@/warned_1.gif",[[NSBundle mainBundle] resourcePath]]]; } ! else if (cards == 2) { return [[NSImage alloc] initByReferencingFile: [NSString stringWithFormat: @"%@/warned_2.gif",[[NSBundle mainBundle] resourcePath]]]; } ! else if (cards == 3) { return [[NSImage alloc] initByReferencingFile: [NSString stringWithFormat: @"%@/disqualified.gif",[[NSBundle mainBundle] resourcePath]]]; } } --- 184,201 ---- - (NSImage*) cardsImage { ! int myCards = [currentState cards]; ! if(myCards == 0) { return [[NSImage alloc] init]; } ! else if (myCards == 1) { return [[NSImage alloc] initByReferencingFile: [NSString stringWithFormat: @"%@/warned_1.gif",[[NSBundle mainBundle] resourcePath]]]; } ! else if (myCards == 2) { return [[NSImage alloc] initByReferencingFile: [NSString stringWithFormat: @"%@/warned_2.gif",[[NSBundle mainBundle] resourcePath]]]; } ! else if (myCards == 3) { return [[NSImage alloc] initByReferencingFile: [NSString stringWithFormat: @"%@/disqualified.gif",[[NSBundle mainBundle] resourcePath]]]; } + return nil; } *************** *** 223,232 **** ! - (int)experience {return experience;} - (void)setExperience:(int)newExperience { ! if (experience != newExperience) { ! experience = newExperience; ! } } --- 226,233 ---- ! - (int)experience {return [currentState experience];} - (void)setExperience:(int)newExperience { ! [currentState setExperience: newExperience]; } *************** *** 239,327 **** } ! - (int)playerForm {return playerForm;} - (void)setPlayerForm:(int)newPlayerForm { ! if (playerForm != newPlayerForm) { ! playerForm = newPlayerForm; ! } } ! - (int)staminaSkill {return staminaSkill;} - (void)setStaminaSkill:(int)newStaminaSkill { ! if (staminaSkill != newStaminaSkill) { ! staminaSkill = newStaminaSkill; ! ! } } ! - (int)keeperSkill {return keeperSkill; ! } - (void)setKeeperSkill:(int)newKeeperSkill { ! if (keeperSkill != newKeeperSkill) { ! keeperSkill = newKeeperSkill; ! ! } } ! - (int)playmakerSkill {return playmakerSkill;} - (void)setPlaymakerSkill:(int)newPlaymakerSkill { ! if (playmakerSkill != newPlaymakerSkill) { ! playmakerSkill = newPlaymakerSkill; ! ! } } ! - (int)scorerSkill {return scorerSkill;} - (void)setScorerSkill:(int)newScorerSkill { ! if (scorerSkill != newScorerSkill) { ! scorerSkill = newScorerSkill; ! ! } } ! - (int)passingSkill {return passingSkill;} - (void)setPassingSkill:(int)newPassingSkill { ! if (passingSkill != newPassingSkill) { ! passingSkill = newPassingSkill; ! } } ! - (int)wingerSkill { return wingerSkill;} - (void)setWingerSkill:(int)newWingerSkill { ! if (wingerSkill != newWingerSkill) { ! wingerSkill = newWingerSkill; ! } } ! - (int)defenderSkill {return defenderSkill;} - (void)setDefenderSkill:(int)newDefenderSkill { ! if (defenderSkill != newDefenderSkill) { ! defenderSkill = newDefenderSkill; ! } } ! - (int)setPiecesSkill { return setPiecesSkill;} - (void)setSetPiecesSkill:(int)newSetPiecesSkill { ! if (setPiecesSkill != newSetPiecesSkill) { ! setPiecesSkill = newSetPiecesSkill; ! } } -(double)teamCaptain { ! return (2*[self leadership] + [self experience])/3.0; } // overall skill accessor ! - (void)setStaminaSkill: (int) newStaminaSkill keeperSkill: (int) newKeeperSkill playmakerSkill: (int) newPlaymakerSkill scorerSkill: (int) newScorerSkill passingSkill: (int) newPassingSkill wingerSkill: (int) newWingerSkill --- 240,305 ---- } ! - (int)playerForm {return [currentState playerForm];} - (void)setPlayerForm:(int)newPlayerForm { ! [currentState setPlayerForm: newPlayerForm]; } ! - (int)staminaSkill {return [currentState staminaSkill];} - (void)setStaminaSkill:(int)newStaminaSkill { ! [currentState setStaminaSkill:newStaminaSkill]; } ! - (int)keeperSkill {return [currentState keeperSkill];} - (void)setKeeperSkill:(int)newKeeperSkill { ! [currentState setKeeperSkill:newKeeperSkill]; } ! - (int)playmakerSkill {return [currentState playmakerSkill];} - (void)setPlaymakerSkill:(int)newPlaymakerSkill { ! [currentState setPlaymakerSkill: newPlaymakerSkill]; } ! - (int)scorerSkill {return [currentState scorerSkill];} - (void)setScorerSkill:(int)newScorerSkill { ! [currentState setScorerSkill:newScorerSkill]; } ! - (int)passingSkill {return [currentState passingSkill];} - (void)setPassingSkill:(int)newPassingSkill { ! [currentState setPassingSkill: newPassingSkill]; } ! - (int)wingerSkill { return [currentState wingerSkill];} - (void)setWingerSkill:(int)newWingerSkill { ! [currentState setWingerSkill:newWingerSkill]; } ! - (int)defenderSkill {return [currentState defenderSkill];} - (void)setDefenderSkill:(int)newDefenderSkill { ! [currentState setDefenderSkill: newDefenderSkill]; } ! - (int)setPiecesSkill { return [currentState setPiecesSkill];} - (void)setSetPiecesSkill:(int)newSetPiecesSkill { ! [currentState setSetPiecesSkill: newSetPiecesSkill]; } -(double)teamCaptain { ! return (2*[self leadership] + [currentState experience])/3.0; } // overall skill accessor ! /*- (void)setStaminaSkill: (int) newStaminaSkill keeperSkill: (int) newKeeperSkill playmakerSkill: (int) newPlaymakerSkill scorerSkill: (int) newScorerSkill passingSkill: (int) newPassingSkill wingerSkill: (int) newWingerSkill *************** *** 351,355 **** setPiecesSkill = newSetPiecesSkill; } ! } -(void) setValue:(id)value forUndefinedKey: (id) key { --- 329,333 ---- setPiecesSkill = newSetPiecesSkill; } ! }*/ -(void) setValue:(id)value forUndefinedKey: (id) key { *************** *** 358,369 **** - (double) calculatePositionValue: (Position*) position { ! //(playerForm * 0.075 + 0.4) ! return (((playerForm * [position playerFormRate] * 0.125 + 0.4) * (staminaSkill * [position staminaRate] + keeperSkill * [position keeperRate] ! + playmakerSkill * [position playmakingRate] + scorerSkill * [position scorerRate] ! + passingSkill * [position passingRate] + wingerSkill * [position wingerRate] ! + defenderSkill * [position defenderRate] + setPiecesSkill * [position setPiecesRate])) + log10(experience) * [position experienceRate] * 2); } -(Position*) bestPosition { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; --- 336,351 ---- - (double) calculatePositionValue: (Position*) position { ! return [self calculatePositionValue:position withinState: currentState]; } + - (double) calculatePositionValue: (Position*) position withinState: (PlayerState*) state{ + //(playerForm * 0.075 + 0.4) + return ((([state playerForm] * [position playerFormRate] * 0.125 + 0.4) * ([state staminaSkill] * [position staminaRate] + [state keeperSkill] * [position keeperRate] + + [state playmakerSkill] * [position playmakingRate] + [state scorerSkill] * [position scorerRate] + + [state passingSkill] * [position passingRate] + [state wingerSkill] * [position wingerRate] + + [state defenderSkill] * [position defenderRate] + [state setPiecesSkill] * [position setPiecesRate])) + log10([state experience]) * [position experienceRate] * 2); + } + -(Position*) bestPosition { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; *************** *** 437,440 **** --- 419,423 ---- } - (void)dealloc { + [currentState release]; [playerName release]; [super dealloc]; Index: Player.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/Player.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Player.h 27 Apr 2005 19:36:38 -0000 1.17 --- Player.h 29 May 2005 13:16:55 -0000 1.18 *************** *** 30,49 **** #import <Foundation/Foundation.h> #import "Position.h" @interface Player : NSObject <NSCopying> { int playerID; NSString *playerName; int countryID; ! int tsi; ! int salary; ! int age; ! int injuryLevel; ! int cards; int specialty; int agreeability; int aggressiveness; int honesty; int experience; - int leadership; int playerForm; int staminaSkill; --- 30,52 ---- #import <Foundation/Foundation.h> #import "Position.h" + #import "PlayerState.h" @interface Player : NSObject <NSCopying> { int playerID; NSString *playerName; + PlayerState *currentState; int countryID; ! int leadership; int specialty; int agreeability; int aggressiveness; int honesty; + + /* int tsi; + int salary; + int age; + int injuryLevel; + int cards; int experience; int playerForm; int staminaSkill; *************** *** 54,58 **** int wingerSkill; int defenderSkill; ! int setPiecesSkill; } --- 57,61 ---- int wingerSkill; int defenderSkill; ! int setPiecesSkill;*/ } *************** *** 64,68 **** - (int) playerID; - (NSString *) playerName; ! - (NSString*) countryFlagPath; - (int) countryID; - (NSString*) countryName; --- 67,71 ---- - (int) playerID; - (NSString *) playerName; ! - (NSImage*) countryFlag ; - (int) countryID; - (NSString*) countryName; *************** *** 70,73 **** --- 73,77 ---- - (int) salary; - (int) age; + - (int) leadership; - (int) injuryLevel; *************** *** 89,94 **** 5 Head specialist */ - (int) specialty; - (int) experience; - - (int) leadership; - (int) playerForm; - (int) staminaSkill; --- 93,99 ---- 5 Head specialist */ - (int) specialty; + + - (int) experience; - (int) playerForm; - (int) staminaSkill; *************** *** 102,105 **** --- 107,111 ---- + -(double)teamCaptain; *************** *** 111,114 **** --- 117,121 ---- - (double)calculatePositionValue: (Position*)position; + - (double) calculatePositionValue: (Position*) position withinState: (PlayerState*) state; -(Position*) bestPosition; |
|
From: Geisschaes <gei...@us...> - 2005-05-29 13:17:31
|
Update of /cvsroot/macattrick/macattrick/Test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11784/Test Modified Files: LineUpTreeLayerTest.m LineUpTreeNodeTest.m PlayerSortingTest.m PositionTest.m Log Message: PlayerState object introduced. Changeable data is now stored in it. Player object uses currentState to access the data Index: PositionTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/PositionTest.m,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** PositionTest.m 16 May 2005 13:32:00 -0000 1.13 --- PositionTest.m 29 May 2005 13:17:14 -0000 1.14 *************** *** 44,60 **** positionWinger = [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Winger"]; player1 = [[Player alloc] init]; ! [player1 setStaminaSkill: 6 keeperSkill: 6 ! playmakerSkill: 1 scorerSkill: 1 ! passingSkill: 1 wingerSkill: 1 ! defenderSkill: 1 setPiecesSkill:1]; ! [player1 setExperience:1]; ! [player1 setPlayerForm:8]; player2 = [[Player alloc] init]; ! [player2 setStaminaSkill: 7 keeperSkill: 1 ! playmakerSkill: 8 scorerSkill: 4 ! passingSkill: 3 wingerSkill: 4 ! defenderSkill: 3 setPiecesSkill:8]; ! [player2 setExperience:1]; ! [player2 setPlayerForm:8]; } --- 44,58 ---- positionWinger = [[PositionHeap uniqueInstance] defaultPositionWithIdentifier:@"Winger"]; player1 = [[Player alloc] init]; ! [player1 setStaminaSkill:6]; [player1 setKeeperSkill:6]; ! [player1 setPlaymakerSkill:1]; [player1 setScorerSkill:1]; ! [player1 setPassingSkill:1]; [player1 setWingerSkill:1]; ! [player1 setDefenderSkill:1]; [player1 setSetPiecesSkill:1]; ! [player1 setExperience:1]; [player1 setPlayerForm:8]; player2 = [[Player alloc] init]; ! [player2 setStaminaSkill:7]; [player2 setKeeperSkill:1]; ! [player2 setPlaymakerSkill:8]; [player2 setScorerSkill:4]; ! [player2 setPassingSkill:3]; [player2 setWingerSkill:4]; ! [player2 setDefenderSkill:3]; [player2 setSetPiecesSkill:8]; ! [player2 setExperience:1]; [player2 setPlayerForm:8]; } Index: PlayerSortingTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/PlayerSortingTest.m,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PlayerSortingTest.m 27 Apr 2005 19:36:45 -0000 1.4 --- PlayerSortingTest.m 29 May 2005 13:17:14 -0000 1.5 *************** *** 45,52 **** [player1 setPlayerName:@"player1"]; [player2 setPlayerName:@"PLAYER2"]; ! [player1 setStaminaSkill:4 keeperSkill:7 playmakerSkill:2 scorerSkill:1 ! passingSkill:4 wingerSkill:1 defenderSkill:5 setPiecesSkill:8]; ! [player2 setStaminaSkill:7 keeperSkill:6 playmakerSkill:3 scorerSkill:1 ! passingSkill:6 wingerSkill:3 defenderSkill:6 setPiecesSkill:2]; } --- 45,56 ---- [player1 setPlayerName:@"player1"]; [player2 setPlayerName:@"PLAYER2"]; ! [player1 setStaminaSkill:4]; [player1 setKeeperSkill:7]; ! [player1 setPlaymakerSkill:2]; [player1 setScorerSkill:1]; ! [player1 setPassingSkill:4]; [player1 setWingerSkill:1]; ! [player1 setDefenderSkill:5]; [player1 setSetPiecesSkill:8]; ! [player2 setStaminaSkill:7]; [player2 setKeeperSkill:6]; ! [player2 setPlaymakerSkill:3]; [player2 setScorerSkill:1]; ! [player2 setPassingSkill:6]; [player2 setWingerSkill:3]; ! [player2 setDefenderSkill:6]; [player2 setSetPiecesSkill:2]; } Index: LineUpTreeNodeTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/LineUpTreeNodeTest.m,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** LineUpTreeNodeTest.m 27 Apr 2005 19:36:45 -0000 1.7 --- LineUpTreeNodeTest.m 29 May 2005 13:17:14 -0000 1.8 *************** *** 43,66 **** - (void)setUp { player1 = [[Player alloc] init]; ! [player1 setStaminaSkill: 6 keeperSkill: 6 ! playmakerSkill: 1 scorerSkill: 1 ! passingSkill: 1 wingerSkill: 1 ! defenderSkill: 1 setPiecesSkill:1]; ! [player1 setExperience:1]; ! [player1 setPlayerForm:8]; player2 = [[Player alloc] init]; ! [player2 setStaminaSkill: 7 keeperSkill: 1 ! playmakerSkill: 8 scorerSkill: 4 ! passingSkill: 3 wingerSkill: 4 ! defenderSkill: 3 setPiecesSkill:8]; ! [player2 setExperience:1]; ! [player2 setPlayerForm:8]; player3 = [[Player alloc] init]; ! [player3 setStaminaSkill: 4 keeperSkill: 1 ! playmakerSkill: 5 scorerSkill: 7 ! passingSkill: 4 wingerSkill: 4 ! defenderSkill: 3 setPiecesSkill:6]; ! [player3 setExperience:1]; ! [player3 setPlayerForm:8]; position1 = [[PositionHeap uniqueInstance] positionWithIdentifier:@"Keeper"]; position2 = [[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"]; --- 43,63 ---- - (void)setUp { player1 = [[Player alloc] init]; ! [player1 setStaminaSkill:6]; [player1 setKeeperSkill:6]; ! [player1 setPlaymakerSkill:1]; [player1 setScorerSkill:1]; ! [player1 setPassingSkill:1]; [player1 setWingerSkill:1]; ! [player1 setDefenderSkill:1]; [player1 setSetPiecesSkill:1]; ! [player1 setExperience:1]; [player1 setPlayerForm:8]; player2 = [[Player alloc] init]; ! [player2 setStaminaSkill:7]; [player2 setKeeperSkill:1]; ! [player2 setPlaymakerSkill:8]; [player2 setScorerSkill:4]; ! [player2 setPassingSkill:3]; [player2 setWingerSkill:4]; ! [player2 setDefenderSkill:3]; [player2 setSetPiecesSkill:8]; ! [player2 setExperience:1]; [player2 setPlayerForm:8]; player3 = [[Player alloc] init]; ! [player3 setStaminaSkill:4]; [player3 setKeeperSkill:1]; ! [player3 setPlaymakerSkill:5]; [player3 setScorerSkill:7]; ! [player3 setPassingSkill:4]; [player3 setWingerSkill:4]; ! [player3 setDefenderSkill:3]; [player3 setSetPiecesSkill:6]; ! [player3 setExperience:1]; [player3 setPlayerForm:8]; position1 = [[PositionHeap uniqueInstance] positionWithIdentifier:@"Keeper"]; position2 = [[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"]; Index: LineUpTreeLayerTest.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Test/LineUpTreeLayerTest.m,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** LineUpTreeLayerTest.m 27 Apr 2005 19:36:45 -0000 1.6 --- LineUpTreeLayerTest.m 29 May 2005 13:17:13 -0000 1.7 *************** *** 30,33 **** --- 30,34 ---- #import "PositionHeap.h" + @implementation LineUpTreeLayerTest *************** *** 43,66 **** - (void)setUp { player1 = [[Player alloc] init]; ! [player1 setStaminaSkill: 6 keeperSkill: 6 ! playmakerSkill: 1 scorerSkill: 1 ! passingSkill: 1 wingerSkill: 1 ! defenderSkill: 1 setPiecesSkill:1]; ! [player1 setExperience:1]; ! [player1 setPlayerForm:8]; player2 = [[Player alloc] init]; ! [player2 setStaminaSkill: 7 keeperSkill: 1 ! playmakerSkill: 8 scorerSkill: 4 ! passingSkill: 3 wingerSkill: 4 ! defenderSkill: 3 setPiecesSkill:8]; ! [player2 setExperience:1]; ! [player2 setPlayerForm:8]; player3 = [[Player alloc] init]; ! [player3 setStaminaSkill: 4 keeperSkill: 1 ! playmakerSkill: 5 scorerSkill: 7 ! passingSkill: 4 wingerSkill: 4 ! defenderSkill: 3 setPiecesSkill:6]; ! [player3 setExperience:1]; ! [player3 setPlayerForm:8]; position1 = [[PositionHeap uniqueInstance] positionWithIdentifier:@"Keeper"]; position2 = [[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"]; --- 44,64 ---- - (void)setUp { player1 = [[Player alloc] init]; ! [player1 setStaminaSkill:6]; [player1 setKeeperSkill:6]; ! [player1 setPlaymakerSkill:1]; [player1 setScorerSkill:1]; ! [player1 setPassingSkill:1]; [player1 setWingerSkill:1]; ! [player1 setDefenderSkill:1]; [player1 setSetPiecesSkill:1]; ! [player1 setExperience:1]; [player1 setPlayerForm:8]; player2 = [[Player alloc] init]; ! [player2 setStaminaSkill:7]; [player2 setKeeperSkill:1]; ! [player2 setPlaymakerSkill:8]; [player2 setScorerSkill:4]; ! [player2 setPassingSkill:3]; [player2 setWingerSkill:4]; ! [player2 setDefenderSkill:3]; [player2 setSetPiecesSkill:8]; ! [player2 setExperience:1]; [player2 setPlayerForm:8]; player3 = [[Player alloc] init]; ! [player3 setStaminaSkill:4]; [player3 setKeeperSkill:1]; ! [player3 setPlaymakerSkill:5]; [player3 setScorerSkill:7]; ! [player3 setPassingSkill:4]; [player3 setWingerSkill:4]; ! [player3 setDefenderSkill:3]; [player3 setSetPiecesSkill:6]; ! [player3 setExperience:1]; [player3 setPlayerForm:8]; position1 = [[PositionHeap uniqueInstance] positionWithIdentifier:@"Keeper"]; position2 = [[PositionHeap uniqueInstance] positionWithIdentifier:@"Inner Midfield"]; |
|
From: Geisschaes <gei...@us...> - 2005-05-29 13:17:26
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11784/Macattrick.xcode Modified Files: project.pbxproj roman.mode1 roman.pbxuser Log Message: PlayerState object introduced. Changeable data is now stored in it. Player object uses currentState to access the data Index: project.pbxproj =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/project.pbxproj,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** project.pbxproj 29 May 2005 11:13:58 -0000 1.74 --- project.pbxproj 29 May 2005 13:17:03 -0000 1.75 *************** *** 2513,2554 **** 307D956A063D9208008E2586 = { children = ( ! 306BE2A807B803D6009942ED, ! 306BE2A907B803D6009942ED, ! 30609695079320AC00BAA4CF, ! 30609696079320AC00BAA4CF, ! 30BEEB02070B3EDC00AF64D8, ! 30BEEB03070B3EDC00AF64D8, ! 30D0C7E70709DA6C00710CCA, ! 30D0C7E80709DA6C00710CCA, ! 309422B30706FA1100873206, ! 309422B40706FA1100873206, ! 30CCAFCC0700BAAC0005D3FA, ! 30CCAFCD0700BAAC0005D3FA, ! 3053D58C07008CD0004019F7, ! 3053D58D07008CD0004019F7, ! 3028FC0006FC93F1002DAE54, ! 3028FC0106FC93F1002DAE54, ! 3041B59206F6238C0055CB6D, ! 3041B59306F6238C0055CB6D, ! 307D9590063D9FFD008E2586, ! 307D9591063D9FFD008E2586, ! 307D95C9063DA10E008E2586, ! 307D95CA063DA10E008E2586, ! 307D961E063DA831008E2586, ! 307D961F063DA831008E2586, ! 30EC0BEC06425140008B3F6B, ! 30EC0BED06425140008B3F6B, ! 30D9FB590645030C00390F49, ! 30D9FB5A0645030C00390F49, ! 30D77BEB0645778B0095BAC8, ! 30D77BEC0645778B0095BAC8, ! 30C8606C06464D3D0016E5B3, ! 30C8606D06464D3D0016E5B3, ! 30C8623B064681A00016E5B3, ! 30C8623C064681A00016E5B3, ! 30C863FB0646AAF30016E5B3, ! 30C863FC0646AAF30016E5B3, ! 306796E406BED27F00161E78, ! 306796E506BED27F00161E78, ); isa = PBXGroup; --- 2513,2521 ---- 307D956A063D9208008E2586 = { children = ( ! 30D78C0E0849E4A300112C09, ! 30D78C0D0849E49800112C09, ! 30D78C0C0849E48F00112C09, ! 30D78C0B0849E48100112C09, ! 30D78C0A0849E47A00112C09, ); isa = PBXGroup; *************** *** 3459,3462 **** --- 3426,3430 ---- 30991495082002B800FBF240, 30D78B590849D0AF00112C09, + 30D78C3C0849E53C00112C09, ); isa = PBXHeadersBuildPhase; *************** *** 3511,3514 **** --- 3479,3483 ---- 30991494082002B700FBF240, 30D78B5A0849D0AF00112C09, + 30D78C3D0849E53C00112C09, ); isa = PBXSourcesBuildPhase; *************** *** 4749,4753 **** isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; ! path = PlayerProperties.h; refType = 4; sourceTree = "<group>"; --- 4718,4722 ---- isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; ! path = PlayerState.h; refType = 4; sourceTree = "<group>"; *************** *** 4757,4761 **** isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; ! path = PlayerProperties.m; refType = 4; sourceTree = "<group>"; --- 4726,4730 ---- isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; ! path = PlayerState.m; refType = 4; sourceTree = "<group>"; *************** *** 4988,4991 **** --- 4957,5080 ---- sourceTree = "<group>"; }; + 30D78C0A0849E47A00112C09 = { + children = ( + 30D9FB590645030C00390F49, + 30D9FB5A0645030C00390F49, + 3041B59206F6238C0055CB6D, + 3041B59306F6238C0055CB6D, + 307D95C9063DA10E008E2586, + 307D95CA063DA10E008E2586, + 30D78C380849E53C00112C09, + 30D78C390849E53C00112C09, + ); + isa = PBXGroup; + name = Player; + refType = 4; + sourceTree = "<group>"; + }; + 30D78C0B0849E48100112C09 = { + children = ( + 30C8606C06464D3D0016E5B3, + 30C8606D06464D3D0016E5B3, + 30C8623B064681A00016E5B3, + 30C8623C064681A00016E5B3, + 30C863FB0646AAF30016E5B3, + 30C863FC0646AAF30016E5B3, + ); + isa = PBXGroup; + name = LineUp; + refType = 4; + sourceTree = "<group>"; + }; + 30D78C0C0849E48F00112C09 = { + children = ( + 306BE2A807B803D6009942ED, + 306BE2A907B803D6009942ED, + 30D77BEB0645778B0095BAC8, + 30D77BEC0645778B0095BAC8, + ); + isa = PBXGroup; + name = Position; + refType = 4; + sourceTree = "<group>"; + }; + 30D78C0D0849E49800112C09 = { + children = ( + 30BEEB02070B3EDC00AF64D8, + 30BEEB03070B3EDC00AF64D8, + 30D0C7E70709DA6C00710CCA, + 30D0C7E80709DA6C00710CCA, + 30CCAFCC0700BAAC0005D3FA, + 30CCAFCD0700BAAC0005D3FA, + 3053D58C07008CD0004019F7, + 3053D58D07008CD0004019F7, + 3028FC0006FC93F1002DAE54, + 3028FC0106FC93F1002DAE54, + 307D961E063DA831008E2586, + 307D961F063DA831008E2586, + ); + isa = PBXGroup; + name = Club; + refType = 4; + sourceTree = "<group>"; + }; + 30D78C0E0849E4A300112C09 = { + children = ( + 30609695079320AC00BAA4CF, + 30609696079320AC00BAA4CF, + 309422B30706FA1100873206, + 309422B40706FA1100873206, + 30EC0BEC06425140008B3F6B, + 30EC0BED06425140008B3F6B, + 307D9590063D9FFD008E2586, + 307D9591063D9FFD008E2586, + 306796E406BED27F00161E78, + 306796E506BED27F00161E78, + ); + isa = PBXGroup; + name = Global; + refType = 4; + sourceTree = "<group>"; + }; + 30D78C380849E53C00112C09 = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = PlayerStateTest.h; + refType = 4; + sourceTree = "<group>"; + }; + 30D78C390849E53C00112C09 = { + fileEncoding = 4; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + path = PlayerStateTest.m; + refType = 4; + sourceTree = "<group>"; + }; + 30D78C3A0849E53C00112C09 = { + fileRef = 30D78C380849E53C00112C09; + isa = PBXBuildFile; + settings = { + }; + }; + 30D78C3B0849E53C00112C09 = { + fileRef = 30D78C390849E53C00112C09; + isa = PBXBuildFile; + settings = { + }; + }; + 30D78C3C0849E53C00112C09 = { + fileRef = 30D78C380849E53C00112C09; + isa = PBXBuildFile; + settings = { + }; + }; + 30D78C3D0849E53C00112C09 = { + fileRef = 30D78C390849E53C00112C09; + isa = PBXBuildFile; + settings = { + }; + }; 30D9FB420644FA8300390F49 = { fileEncoding = 4; *************** *** 5087,5090 **** --- 5176,5180 ---- 30DFA4E508201973000CE74D, 30D78B530849D0AF00112C09, + 30D78C3A0849E53C00112C09, ); isa = PBXHeadersBuildPhase; *************** *** 5138,5141 **** --- 5228,5232 ---- 30DFA4E408201972000CE74D, 30D78B540849D0AF00112C09, + 30D78C3B0849E53C00112C09, ); isa = PBXSourcesBuildPhase; Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.mode1,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** roman.mode1 29 May 2005 11:13:59 -0000 1.36 --- roman.mode1 29 May 2005 13:17:03 -0000 1.37 *************** *** 191,197 **** <dict> <key>PBXProjectModuleGUID</key> ! <string>30D0C9A90839163F00AFB5E5</string> <key>PBXProjectModuleLabel</key> ! <string>Toolbar.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 191,197 ---- <dict> <key>PBXProjectModuleGUID</key> ! <string>30D78C440849E57900112C09</string> <key>PBXProjectModuleLabel</key> ! <string>Player.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 199,212 **** <dict> <key>PBXProjectModuleGUID</key> ! <string>30D0C9B20839258600AFB5E5</string> <key>PBXProjectModuleLabel</key> ! <string>Toolbar.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30D78BB60849D50F00112C09</string> <key>history</key> <array> ! <string>30F10ECF083FB6BA00F4A1C5</string> </array> </dict> --- 199,229 ---- <dict> <key>PBXProjectModuleGUID</key> ! <string>30D78C610849EA3B00112C09</string> <key>PBXProjectModuleLabel</key> ! <string>Player.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30D78CA50849ED0500112C09</string> <key>history</key> <array> ! <string>30D78C980849ED0500112C09</string> ! <string>30D78C990849ED0500112C09</string> ! <string>30D78C9A0849ED0500112C09</string> ! <string>30D78C9B0849ED0500112C09</string> ! <string>30D78C9C0849ED0500112C09</string> ! <string>30D78C8E0849ECFC00112C09</string> ! </array> ! <key>prevStack</key> ! <array> ! <string>30D78C660849EA3B00112C09</string> ! <string>30D78C9D0849ED0500112C09</string> ! <string>30D78C9E0849ED0500112C09</string> ! <string>30D78C9F0849ED0500112C09</string> ! <string>30D78CA00849ED0500112C09</string> ! <string>30D78CA10849ED0500112C09</string> ! <string>30D78CA20849ED0500112C09</string> ! <string>30D78CA30849ED0500112C09</string> ! <string>30D78CA40849ED0500112C09</string> </array> </dict> *************** *** 220,228 **** <dict> <key>Frame</key> ! <string>{{0, 20}, {750, 469}}</string> <key>PBXModuleWindowStatusBarHidden2</key> <false/> <key>RubberWindowFrame</key> ! <string>410 206 750 510 0 0 1280 832 </string> </dict> </dict> --- 237,245 ---- <dict> <key>Frame</key> ! <string>{{0, 20}, {1216, 596}}</string> <key>PBXModuleWindowStatusBarHidden2</key> <false/> <key>RubberWindowFrame</key> ! <string>40 150 1216 637 0 0 1280 832 </string> </dict> </dict> *************** *** 261,266 **** <array> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> --- 278,281 ---- *************** *** 300,305 **** <string>29B97314FDCFA39411CA2CEA</string> <string>080E96DDFE201D6D7F000001</string> ! <string>30BB2140067DC1CA00B1C71A</string> <string>307D956A063D9208008E2586</string> <string>29B97323FDCFA39411CA2CEA</string> <string>30A438AD068C2923001BFB41</string> --- 315,321 ---- <string>29B97314FDCFA39411CA2CEA</string> <string>080E96DDFE201D6D7F000001</string> ! <string>30D78B650849D36100112C09</string> <string>307D956A063D9208008E2586</string> + <string>30D78C0A0849E47A00112C09</string> <string>29B97323FDCFA39411CA2CEA</string> <string>30A438AD068C2923001BFB41</string> *************** *** 311,320 **** <array> <array> ! <integer>56</integer> <integer>0</integer> </array> </array> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> ! <string>{{0, 119}, {186, 669}}</string> </dict> <key>PBXTopSmartGroupGIDs</key> --- 327,337 ---- <array> <array> ! <integer>3</integer> ! <integer>2</integer> <integer>0</integer> </array> </array> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> ! <string>{{0, 0}, {186, 669}}</string> </dict> <key>PBXTopSmartGroupGIDs</key> *************** *** 346,349 **** --- 363,368 ---- <array> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> *************** *** 351,355 **** <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>TeamController.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 370,374 ---- <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>World.h</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 359,367 **** <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>TeamController.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30D78BB30849D50F00112C09</string> <key>history</key> <array> --- 378,386 ---- <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>World.h</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30D78C970849ED0500112C09</string> <key>history</key> <array> *************** *** 371,383 **** <string>304255850837E2BB00DDF612</string> <string>3067AFF10838D3E00063180D</string> - <string>3067B0A90838F5580063180D</string> <string>30D0C99C083915F700AFB5E5</string> <string>305BDB27083E6F1B00FBE0D3</string> <string>305BDB28083E6F1B00FBE0D3</string> - <string>30D78B7F0849D50F00112C09</string> <string>30D78B800849D50F00112C09</string> <string>30D78B810849D50F00112C09</string> - <string>30D78B820849D50F00112C09</string> - <string>30D78B830849D50F00112C09</string> <string>30D78B840849D50F00112C09</string> <string>30D78B850849D50F00112C09</string> --- 390,398 ---- *************** *** 395,399 **** <string>30D78B910849D50F00112C09</string> <string>30D78B920849D50F00112C09</string> ! <string>30D78B930849D50F00112C09</string> </array> <key>prevStack</key> --- 410,439 ---- <string>30D78B910849D50F00112C09</string> <string>30D78B920849D50F00112C09</string> ! <string>30D78BC50849E09D00112C09</string> ! <string>30D78C100849E51200112C09</string> ! <string>30D78C110849E51200112C09</string> ! <string>30D78C120849E51200112C09</string> ! <string>30D78C130849E51200112C09</string> ! <string>30D78C140849E51200112C09</string> ! <string>30D78C150849E51200112C09</string> ! <string>30D78C160849E51200112C09</string> ! <string>30D78C170849E51200112C09</string> ! <string>30D78C180849E51200112C09</string> ! <string>30D78C1A0849E51200112C09</string> ! <string>30D78C1B0849E51200112C09</string> ! <string>30D78C1C0849E51200112C09</string> ! <string>30D78C1D0849E51200112C09</string> ! <string>30D78C1E0849E51200112C09</string> ! <string>30D78C1F0849E51200112C09</string> ! <string>30D78C520849EA3B00112C09</string> ! <string>30D78C530849EA3B00112C09</string> ! <string>30D78C540849EA3B00112C09</string> ! <string>30D78C550849EA3B00112C09</string> ! <string>30D78C560849EA3B00112C09</string> ! <string>30D78C570849EA3B00112C09</string> ! <string>30D78C8F0849ED0500112C09</string> ! <string>30D78C900849ED0500112C09</string> ! <string>30D78C910849ED0500112C09</string> ! <string>30D78C920849ED0500112C09</string> </array> <key>prevStack</key> *************** *** 441,444 **** --- 481,514 ---- <string>30D78BB10849D50F00112C09</string> <string>30D78BB20849D50F00112C09</string> + <string>30D78BC80849E09D00112C09</string> + <string>30D78BC90849E09D00112C09</string> + <string>30D78C210849E51200112C09</string> + <string>30D78C220849E51200112C09</string> + <string>30D78C230849E51200112C09</string> + <string>30D78C240849E51200112C09</string> + <string>30D78C250849E51200112C09</string> + <string>30D78C260849E51200112C09</string> + <string>30D78C270849E51200112C09</string> + <string>30D78C280849E51200112C09</string> + <string>30D78C290849E51200112C09</string> + <string>30D78C2A0849E51200112C09</string> + <string>30D78C2B0849E51200112C09</string> + <string>30D78C2C0849E51200112C09</string> + <string>30D78C2D0849E51200112C09</string> + <string>30D78C2E0849E51200112C09</string> + <string>30D78C2F0849E51200112C09</string> + <string>30D78C300849E51200112C09</string> + <string>30D78C310849E51200112C09</string> + <string>30D78C590849EA3B00112C09</string> + <string>30D78C5A0849EA3B00112C09</string> + <string>30D78C5B0849EA3B00112C09</string> + <string>30D78C5C0849EA3B00112C09</string> + <string>30D78C5D0849EA3B00112C09</string> + <string>30D78C5E0849EA3B00112C09</string> + <string>30D78C5F0849EA3B00112C09</string> + <string>30D78C930849ED0500112C09</string> + <string>30D78C940849ED0500112C09</string> + <string>30D78C950849ED0500112C09</string> + <string>30D78C960849ED0500112C09</string> </array> </dict> *************** *** 452,456 **** <dict> <key>Frame</key> ! <string>{{0, 0}, {1072, 391}}</string> <key>RubberWindowFrame</key> <string>0 104 1280 728 0 0 1280 832 </string> --- 522,526 ---- <dict> <key>Frame</key> ! <string>{{0, 0}, {1072, 433}}</string> <key>RubberWindowFrame</key> <string>0 104 1280 728 0 0 1280 832 </string> *************** *** 459,463 **** <string>PBXNavigatorGroup</string> <key>Proportion</key> ! <string>391pt</string> </dict> <dict> --- 529,533 ---- <string>PBXNavigatorGroup</string> <key>Proportion</key> ! <string>433pt</string> </dict> <dict> *************** *** 472,476 **** <dict> <key>Frame</key> ! <string>{{0, 396}, {1072, 291}}</string> <key>RubberWindowFrame</key> <string>0 104 1280 728 0 0 1280 832 </string> --- 542,546 ---- <dict> <key>Frame</key> ! <string>{{0, 438}, {1072, 249}}</string> <key>RubberWindowFrame</key> <string>0 104 1280 728 0 0 1280 832 </string> *************** *** 479,483 **** <string>XCDetailModule</string> <key>Proportion</key> ! <string>291pt</string> </dict> </array> --- 549,553 ---- <string>XCDetailModule</string> <key>Proportion</key> ! <string>249pt</string> </dict> </array> *************** *** 613,617 **** <false/> <key>PinnedNavigatorIdentifier</key> ! <string>30D0C9A90839163F00AFB5E5</string> <key>ShelfIsVisible</key> <false/> --- 683,687 ---- <false/> <key>PinnedNavigatorIdentifier</key> ! <string>30D78C440849E57900112C09</string> <key>ShelfIsVisible</key> <false/> *************** *** 636,642 **** <key>WindowOrderList</key> <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30D0C9A90839163F00AFB5E5</string> <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> </array> <key>WindowString</key> --- 706,716 ---- <key>WindowOrderList</key> <array> + <string>30BE4823082FED6F00826659</string> + <string>30D78CAC0849ED0500112C09</string> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>1CD10A99069EF8BA00B06720</string> <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> + <string>30A82A48082E9E83003C97DB</string> + <string>30D78C440849E57900112C09</string> </array> <key>WindowString</key> *************** *** 662,666 **** <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string></string> <key>StatusBarVisibility</key> <true/> --- 736,740 ---- <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>Player.m</string> <key>StatusBarVisibility</key> <true/> *************** *** 671,675 **** <string>{{0, 0}, {787, 290}}</string> <key>RubberWindowFrame</key> ! <string>458 117 787 699 0 0 1280 832 </string> </dict> <key>Module</key> --- 745,749 ---- <string>{{0, 0}, {787, 290}}</string> <key>RubberWindowFrame</key> ! <string>463 113 787 699 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 684,688 **** <dict> <key>PBXBuildLogShowsTranscriptDefaultKey</key> ! <string>{{0, 225}, {787, 138}}</string> <key>PBXProjectModuleGUID</key> <string>XCMainBuildResultsModuleGUID</string> --- 758,762 ---- <dict> <key>PBXBuildLogShowsTranscriptDefaultKey</key> ! <string>{{0, 219}, {787, 144}}</string> <key>PBXProjectModuleGUID</key> <string>XCMainBuildResultsModuleGUID</string> *************** *** 699,703 **** <string>{{0, 295}, {787, 363}}</string> <key>RubberWindowFrame</key> ! <string>458 117 787 699 0 0 1280 832 </string> </dict> <key>Module</key> --- 773,777 ---- <string>{{0, 295}, {787, 363}}</string> <key>RubberWindowFrame</key> ! <string>463 113 787 699 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 722,726 **** <array> <string>30A82A48082E9E83003C97DB</string> ! <string>30EA935A0838FE9600D1708E</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> --- 796,800 ---- <array> <string>30A82A48082E9E83003C97DB</string> ! <string>30D78C690849EA3B00112C09</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> *************** *** 729,733 **** <string>xcode.toolbar.config.build</string> <key>WindowString</key> ! <string>458 117 787 699 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>30A82A48082E9E83003C97DB</string> --- 803,807 ---- <string>xcode.toolbar.config.build</string> <key>WindowString</key> ! <string>463 113 787 699 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>30A82A48082E9E83003C97DB</string> *************** *** 764,769 **** <key>sizes</key> <array> ! <string>{{0, 0}, {249, 152}}</string> ! <string>{{249, 0}, {445, 152}}</string> </array> </dict> --- 838,843 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {235, 149}}</string> ! <string>{{235, 0}, {459, 149}}</string> </array> </dict> *************** *** 780,785 **** <key>sizes</key> <array> ! <string>{{0, 0}, {694, 152}}</string> ! <string>{{0, 152}, {694, 229}}</string> </array> </dict> --- 854,859 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {694, 149}}</string> ! <string>{{0, 149}, {694, 232}}</string> </array> </dict> *************** *** 805,809 **** <string>{{0, 0}, {694, 381}}</string> <key>RubberWindowFrame</key> ! <string>339 354 694 422 0 0 1280 832 </string> </dict> <key>Module</key> --- 879,883 ---- <string>{{0, 0}, {694, 381}}</string> <key>RubberWindowFrame</key> ! <string>359 287 694 422 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 828,848 **** <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>30D0C963083911E100AFB5E5</string> <string>1C162984064C10D400B95A72</string> ! <string>30D0C964083911E100AFB5E5</string> ! <string>30D0C965083911E100AFB5E5</string> ! <string>30D0C966083911E100AFB5E5</string> ! <string>30D0C967083911E100AFB5E5</string> ! <string>30D0C968083911E100AFB5E5</string> ! <string>30D0C969083911E100AFB5E5</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.debug</string> <key>WindowString</key> ! <string>339 354 694 422 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1CD10A99069EF8BA00B06720</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> --- 902,922 ---- <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>30D78CA60849ED0500112C09</string> <string>1C162984064C10D400B95A72</string> ! <string>30D78CA70849ED0500112C09</string> ! <string>30D78CA80849ED0500112C09</string> ! <string>30D78CA90849ED0500112C09</string> ! <string>30D78CAA0849ED0500112C09</string> ! <string>30D78CAB0849ED0500112C09</string> ! <string>30D78CAC0849ED0500112C09</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.debug</string> <key>WindowString</key> ! <string>359 287 694 422 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1CD10A99069EF8BA00B06720</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> *************** *** 989,993 **** <array> <string>30BE4823082FED6F00826659</string> ! <string>30D0C98F083915B100AFB5E5</string> <string>1C78EAAC065D492600B07095</string> </array> --- 1063,1067 ---- <array> <string>30BE4823082FED6F00826659</string> ! <string>30D78CAD0849ED0500112C09</string> <string>1C78EAAC065D492600B07095</string> </array> Index: roman.pbxuser =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.pbxuser,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** roman.pbxuser 29 May 2005 11:13:59 -0000 1.101 --- roman.pbxuser 29 May 2005 13:17:03 -0000 1.102 *************** *** 38,48 **** }; 29B97313FDCFA39411CA2CEA = { ! activeBuildStyle = 4A9504CDFFE6A4B311CA0CBA; ! activeExecutable = 30950684067C4D100077C270; activeTarget = 309914160820019C00FBF240; addToTargets = ( 30DFA496082018F2000CE74D, - 30950682067C4D100077C270, - 30744BA4069560A70039B82A, 309914160820019C00FBF240, [...2237 lines suppressed...] 30EC0BEC06425140008B3F6B = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1025, 546}}"; sepNavSelRange = "{2147, 0}"; ! sepNavVisRect = "{{0, 0}, {1025, 401}}"; }; }; *************** *** 4013,4017 **** name = "World.m: 99"; rLen = 0; ! rLoc = 4376; rType = 0; vrLen = 292; --- 5520,5524 ---- name = "World.m: 99"; rLen = 0; ! rLoc = 4385; rType = 0; vrLen = 292; |
|
From: Geisschaes <gei...@us...> - 2005-05-29 11:14:12
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7776/Macattrick.xcode Modified Files: project.pbxproj roman.mode1 roman.pbxuser Log Message: files structured in xcode Index: project.pbxproj =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/project.pbxproj,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** project.pbxproj 20 May 2005 18:30:37 -0000 1.73 --- project.pbxproj 29 May 2005 11:13:58 -0000 1.74 *************** *** 8,49 **** 080E96DDFE201D6D7F000001 = { children = ( ! 3060965F07931CA900BAA4CF, ! 3060966007931CA900BAA4CF, ! 306096360793195B00BAA4CF, ! 306096370793195B00BAA4CF, ! 30BEEAAE070B3A8B00AF64D8, ! 30BEEAAF070B3A8B00AF64D8, ! 303E6CFF070708480091C7D3, ! 303E6D00070708480091C7D3, ! 3094220B0706E9C000873206, ! 3094220C0706E9C000873206, ! 30CCAF4C07009E710005D3FA, ! 30CCAF4D07009E710005D3FA, ! 3053D56F07008A6D004019F7, ! 3053D57007008A6D004019F7, ! 3028FABD06FC637D002DAE54, ! 3028FABE06FC637D002DAE54, ! 3041B58A06F623640055CB6D, ! 3041B58B06F623640055CB6D, ! 30A1800D0640E5C300D2836F, ! 30A1800E0640E5C300D2836F, ! 30A1800F0640E5C300D2836F, ! 30A180100640E5C300D2836F, ! 30EC0BDE06425043008B3F6B, ! 30EC0BDF06425043008B3F6B, ! 30D9FB420644FA8300390F49, ! 30D9FB430644FA8300390F49, ! 30D77AA106455BEF0095BAC8, ! 30D77AA206455BEF0095BAC8, ! 3034119E07B7FDB000B92C57, ! 3034119F07B7FDB000B92C57, ! 30C85EC6064647730016E5B3, ! 30C85EC7064647730016E5B3, ! 30C861C8064679F00016E5B3, ! 30C861C9064679F00016E5B3, ! 30C863DA0646A40D0016E5B3, ! 30C863DB0646A40D0016E5B3, ! 301CEB8E06746643001C1E37, ! 301CEB8F06746643001C1E37, ); isa = PBXGroup; --- 8,16 ---- 080E96DDFE201D6D7F000001 = { children = ( ! 30D78B680849D3E400112C09, ! 30D78B670849D3BB00112C09, ! 30D78B660849D3A000112C09, ! 30D78B650849D36100112C09, ! 30D78B640849D35600112C09, ); isa = PBXGroup; *************** *** 259,262 **** --- 226,230 ---- isa = PBXGroup; name = Toolbar; + path = ""; refType = 4; sourceTree = "<group>"; *************** *** 353,357 **** children = ( 30E284D3077EFCA900DB648A, - 10A233D807327EC1007529F7, 080E96DDFE201D6D7F000001, 30BB2140067DC1CA00B1C71A, --- 321,324 ---- *************** *** 467,470 **** --- 434,438 ---- isa = PBXVariantGroup; name = TryPlayer.nib; + path = ""; refType = 4; sourceTree = "<group>"; *************** *** 1610,1613 **** --- 1578,1582 ---- 302FC30207E617E900334603, 302FC30507E617EE00334603, + 30D78B570849D0AF00112C09, ); isa = PBXHeadersBuildPhase; *************** *** 1829,1832 **** --- 1798,1802 ---- 302FC30307E617EA00334603, 302FC30407E617EC00334603, + 30D78B580849D0AF00112C09, ); isa = PBXSourcesBuildPhase; *************** *** 2929,2951 **** 3092DC1307B66C780043063E, 303411A007B7FDB000B92C57, ! 30DFA29D08200F5F000CE74D, ! 30DFA2A108200F67000CE74D, ! 30DFA2A308200F6A000CE74D, ! 30DFA2A508200F6D000CE74D, ! 30DFA2A808200F73000CE74D, ! 30DFA2AB08200F7C000CE74D, ! 30DFA2AD08200F7F000CE74D, ! 30DFA2AF08200F82000CE74D, ! 30DFA2B108200F89000CE74D, ! 30DFA2B308200F8C000CE74D, ! 30DFA2B508200F8F000CE74D, ! 30DFA2B708200F92000CE74D, ! 30DFA2B908200F95000CE74D, ! 30DFA2BB08200F98000CE74D, ! 30DFA2BD08200F9F000CE74D, ! 30DFA2BF08200FA3000CE74D, ! 30DFA2C108200FA6000CE74D, ! 30DFA2C308200FA9000CE74D, ! 30DFA2C508200FAC000CE74D, ); isa = PBXHeadersBuildPhase; --- 2899,2903 ---- 3092DC1307B66C780043063E, 303411A007B7FDB000B92C57, ! 30D78B550849D0AF00112C09, ); isa = PBXHeadersBuildPhase; *************** *** 3148,3170 **** 3092DC1407B66C780043063E, 303411A107B7FDB000B92C57, ! 30DFA29C08200F5D000CE74D, ! 30DFA2A008200F65000CE74D, ! 30DFA2A208200F68000CE74D, ! 30DFA2A408200F6B000CE74D, ! 30DFA2A908200F79000CE74D, ! 30DFA2AA08200F7A000CE74D, ! 30DFA2AC08200F7E000CE74D, ! 30DFA2AE08200F81000CE74D, ! 30DFA2B008200F87000CE74D, ! 30DFA2B208200F8A000CE74D, ! 30DFA2B408200F8D000CE74D, ! 30DFA2B608200F90000CE74D, ! 30DFA2B808200F93000CE74D, ! 30DFA2BA08200F96000CE74D, ! 30DFA2BC08200F9A000CE74D, ! 30DFA2BE08200FA1000CE74D, ! 30DFA2C008200FA4000CE74D, ! 30DFA2C208200FA8000CE74D, ! 30DFA2C408200FAA000CE74D, ); isa = PBXSourcesBuildPhase; --- 3100,3104 ---- 3092DC1407B66C780043063E, 303411A107B7FDB000B92C57, ! 30D78B560849D0AF00112C09, ); isa = PBXSourcesBuildPhase; *************** *** 3178,3182 **** 309506BC067C4D5F0077C270, 3070D2660775D4B000D7C16B, - 30DFA29B08200F58000CE74D, ); isa = PBXFrameworksBuildPhase; --- 3112,3115 ---- *************** *** 3525,3528 **** --- 3458,3462 ---- 30991492082002B400FBF240, 30991495082002B800FBF240, + 30D78B590849D0AF00112C09, ); isa = PBXHeadersBuildPhase; *************** *** 3576,3579 **** --- 3510,3514 ---- 30991493082002B600FBF240, 30991494082002B700FBF240, + 30D78B5A0849D0AF00112C09, ); isa = PBXSourcesBuildPhase; *************** *** 4301,4315 **** 30B355F80690131C00571DE8 = { children = ( ! 300F6E6F06981CE600B74D7B, ! 30B35616069016C600571DE8, ! 30BB20B6067DB6F100B1C71A, ! 3095070A067C4F400077C270, ! 30555220067C479F00163561, ! 30769E24076353B200AA1F39, ! 30769E28076353F900AA1F39, ! 30769E2D0763544300AA1F39, ! 30769E310763548A00AA1F39, ! 107005CF0789739800E7C0CA, ! 102B65730796B99C00CE6B91, ); isa = PBXGroup; --- 4236,4243 ---- 30B355F80690131C00571DE8 = { children = ( ! 30D78B7E0849D4EF00112C09, ! 30D78B7D0849D4DC00112C09, ! 30D78B7C0849D4AA00112C09, ! 30D78B7B0849D49800112C09, ); isa = PBXGroup; *************** *** 4332,4335 **** --- 4260,4264 ---- isa = PBXVariantGroup; name = PreferencesPanel.nib; + path = ""; refType = 4; sourceTree = "<group>"; *************** *** 4387,4414 **** 30BB2140067DC1CA00B1C71A = { children = ( ! 3031CB0807A043B0006539CD, ! 3031CB0907A043B0006539CD, ! 30ADE246078B17660012CF83, ! 30ADE247078B17660012CF83, ! 3084F85907639DEC00DCF936, ! 3084F85A07639DEC00DCF936, ! 306DEE780692C63E008C0937, ! 306DEE770692C63E008C0937, ! 306D2FC3068AC9CB00CB623F, ! 306D2FC4068AC9CB00CB623F, ! 308426AB0643ABD200173CCD, ! 308426AA0643ABD200173CCD, ! 307C35590642738100302C60, ! 307C355A0642738100302C60, ! 30BB2130067DC1BC00B1C71A, ! 30BB2131067DC1BC00B1C71A, ! 301E3B2E064A7C1A00C88C10, ! 301E3B2F064A7C1A00C88C10, ! 3076CB5006675EC000C72BA4, ! 3076CB5106675EC000C72BA4, ! 306D2F79068AC8EB00CB623F, ! 306D2F7A068AC8EB00CB623F, ! 3013839D06AED4B2009387D7, ! 3013839E06AED4B2009387D7, ); isa = PBXGroup; --- 4316,4324 ---- 30BB2140067DC1CA00B1C71A = { children = ( ! 30D78B7A0849D47B00112C09, ! 10A233D807327EC1007529F7, ! 30D78B790849D45B00112C09, ! 30D78B780849D44300112C09, ! 30D78B690849D41400112C09, ); isa = PBXGroup; *************** *** 4835,5127 **** sourceTree = "<group>"; }; ! 30D9FB420644FA8300390F49 = { ! fileEncoding = 4; ! isa = PBXFileReference; ! lastKnownFileType = sourcecode.c.h; ! path = "Player-Sorting.h"; ! refType = 4; ! sourceTree = "<group>"; ! }; ! 30D9FB430644FA8300390F49 = { ! fileEncoding = 4; ! isa = PBXFileReference; ! lastKnownFileType = sourcecode.c.objc; ! path = "Player-Sorting.m"; ! refType = 4; ! sourceTree = "<group>"; ! }; ! 30D9FB590645030C00390F49 = { fileEncoding = 4; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; ! path = PlayerSortingTest.h; refType = 4; sourceTree = "<group>"; }; ! 30D9FB5A0645030C00390F49 = { fileEncoding = 4; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; ! path = PlayerSortingTest.m; ! refType = 4; ! sourceTree = "<group>"; ! }; ! 30D9FE0A06452D8F00390F49 = { ! fileEncoding = 4; ! isa = PBXFileReference; ! lastKnownFileType = text; ! path = "GPL License.txt"; ! refType = 4; ! sourceTree = "<group>"; ! }; ! 30DE3F8C07C3F00700342677 = { ! isa = PBXFileReference; ! lastKnownFileType = image.tiff; ! path = formulas.tiff; refType = 4; sourceTree = "<group>"; }; ! 30DE3F8D07C3F00700342677 = { ! fileRef = 30DE3F8C07C3F00700342677; ! isa = PBXBuildFile; ! settings = { ! }; ! }; ! 30DE3F8E07C3F00800342677 = { ! fileRef = 30DE3F8C07C3F00700342677; ! isa = PBXBuildFile; ! settings = { ! }; ! }; ! 30DFA29B08200F58000CE74D = { ! fileRef = 309913DF0820006E00FBF240; ! isa = PBXBuildFile; ! settings = { ! }; ! }; ! 30DFA29C08200F5D000CE74D = { ! fileRef = 30609696079320AC00BAA4CF; ! isa = PBXBuildFile; ! settings = { ! }; ! }; ! 30DFA29D08200F5F000CE74D = { ! fileRef = 30609695079320AC00BAA4CF; ! isa = PBXBuildFile; ! settings = { ! }; ! }; ! 30DFA2A008200F65000CE74D = { ! fileRef = 30CCAFCD0700BAAC0005D3FA; ! isa = PBXBuildFile; ! settings = { ! }; ! }; ! 30DFA2A108200F67000CE74D = { ! fileRef = 30CCAFCC0700BAAC0005D3FA; ! isa = PBXBuildFile; ! settings = { ! }; ! }; ! 30DFA2A208200F68000CE74D = { ! fileRef = 307D961F063DA831008E2586; ! isa = PBXBuildFile; ! settings = { ! }; ! }; ! 30DFA2A308200F6A000CE74D = { ! fileRef = 307D961E063DA831008E2586; ! isa = PBXBuildFile; ! settings = { ! }; ! }; ! 30DFA2A408200F6B000CE74D = { ! fileRef = 306796E506BED27F00161E78; ! isa = PBXBuildFile; ! settings = { ! }; ! }; ! 30DFA2A508200F6D000CE74D = { ! fileRef = 306796E406BED27F00161E78; ! isa = PBXBuildFile; ! settings = { ! }; ! }; ! 30DFA2A808200F73000CE74D = { ! fileRef = 309422B30706FA1100873206; ! isa = PBXBuildFile; ! settings = { ! }; ! }; ! 30DFA2A908200F79000CE74D = { ! fileRef = 309422B40706FA1100873206; isa = PBXBuildFile; settings = { }; }; ! 30DFA2AA08200F7A000CE74D = { ! fileRef = 30D77BEC0645778B0095BAC8; isa = PBXBuildFile; settings = { }; }; ! 30DFA2AB08200F7C000CE74D = { ! fileRef = 30D77BEB0645778B0095BAC8; isa = PBXBuildFile; settings = { }; }; ! 30DFA2AC08200F7E000CE74D = { ! fileRef = 306BE2A907B803D6009942ED; isa = PBXBuildFile; settings = { }; }; ! 30DFA2AD08200F7F000CE74D = { ! fileRef = 306BE2A807B803D6009942ED; isa = PBXBuildFile; settings = { }; }; ! 30DFA2AE08200F81000CE74D = { ! fileRef = 307D95CA063DA10E008E2586; isa = PBXBuildFile; settings = { }; }; ! 30DFA2AF08200F82000CE74D = { ! fileRef = 307D95C9063DA10E008E2586; isa = PBXBuildFile; settings = { }; }; ! 30DFA2B008200F87000CE74D = { ! fileRef = 30D9FB5A0645030C00390F49; isa = PBXBuildFile; settings = { }; }; ! 30DFA2B108200F89000CE74D = { ! fileRef = 30D9FB590645030C00390F49; ! isa = PBXBuildFile; ! settings = { ! }; }; ! 30DFA2B208200F8A000CE74D = { ! fileRef = 3041B59306F6238C0055CB6D; ! isa = PBXBuildFile; ! settings = { ! }; }; ! 30DFA2B308200F8C000CE74D = { ! fileRef = 3041B59206F6238C0055CB6D; ! isa = PBXBuildFile; ! settings = { ! }; }; ! 30DFA2B408200F8D000CE74D = { ! fileRef = 30C863FC0646AAF30016E5B3; ! isa = PBXBuildFile; ! settings = { ! }; }; ! 30DFA2B508200F8F000CE74D = { ! fileRef = 30C863FB0646AAF30016E5B3; ! isa = PBXBuildFile; ! settings = { ! }; }; ! 30DFA2B608200F90000CE74D = { ! fileRef = 30C8606C06464D3D0016E5B3; ! isa = PBXBuildFile; ! settings = { ! }; }; ! 30DFA2B708200F92000CE74D = { ! fileRef = 30C8606D06464D3D0016E5B3; ! isa = PBXBuildFile; ! settings = { ! }; }; ! 30DFA2B808200F93000CE74D = { ! fileRef = 30C8623C064681A00016E5B3; ! isa = PBXBuildFile; ! settings = { ! }; }; ! 30DFA2B908200F95000CE74D = { ! fileRef = 30C8623B064681A00016E5B3; ! isa = PBXBuildFile; ! settings = { ! }; }; ! 30DFA2BA08200F96000CE74D = { ! fileRef = 30D0C7E80709DA6C00710CCA; ! isa = PBXBuildFile; ! settings = { ! }; }; ! 30DFA2BB08200F98000CE74D = { ! fileRef = 30D0C7E70709DA6C00710CCA; ! isa = PBXBuildFile; ! settings = { ! }; }; ! 30DFA2BC08200F9A000CE74D = { ! fileRef = 30EC0BED06425140008B3F6B; ! isa = PBXBuildFile; ! settings = { ! }; }; ! 30DFA2BD08200F9F000CE74D = { ! fileRef = 30EC0BEC06425140008B3F6B; ! isa = PBXBuildFile; ! settings = { ! }; }; ! 30DFA2BE08200FA1000CE74D = { ! fileRef = 3028FC0106FC93F1002DAE54; ! isa = PBXBuildFile; ! settings = { ! }; }; ! 30DFA2BF08200FA3000CE74D = { ! fileRef = 3028FC0006FC93F1002DAE54; ! isa = PBXBuildFile; ! settings = { ! }; }; ! 30DFA2C008200FA4000CE74D = { ! fileRef = 30BEEB03070B3EDC00AF64D8; ! isa = PBXBuildFile; ! settings = { ! }; }; ! 30DFA2C108200FA6000CE74D = { ! fileRef = 30BEEB02070B3EDC00AF64D8; ! isa = PBXBuildFile; ! settings = { ! }; }; ! 30DFA2C208200FA8000CE74D = { ! fileRef = 3053D58D07008CD0004019F7; ! isa = PBXBuildFile; ! settings = { ! }; }; ! 30DFA2C308200FA9000CE74D = { ! fileRef = 3053D58C07008CD0004019F7; ! isa = PBXBuildFile; ! settings = { ! }; }; ! 30DFA2C408200FAA000CE74D = { ! fileRef = 307D9591063D9FFD008E2586; isa = PBXBuildFile; settings = { }; }; ! 30DFA2C508200FAC000CE74D = { ! fileRef = 307D9590063D9FFD008E2586; isa = PBXBuildFile; settings = { --- 4745,5046 ---- sourceTree = "<group>"; }; ! 30D78B510849D0AF00112C09 = { fileEncoding = 4; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; ! path = PlayerProperties.h; refType = 4; sourceTree = "<group>"; }; ! 30D78B520849D0AF00112C09 = { fileEncoding = 4; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; ! path = PlayerProperties.m; refType = 4; sourceTree = "<group>"; }; ! 30D78B530849D0AF00112C09 = { ! fileRef = 30D78B510849D0AF00112C09; isa = PBXBuildFile; settings = { }; }; ! 30D78B540849D0AF00112C09 = { ! fileRef = 30D78B520849D0AF00112C09; isa = PBXBuildFile; settings = { }; }; ! 30D78B550849D0AF00112C09 = { ! fileRef = 30D78B510849D0AF00112C09; isa = PBXBuildFile; settings = { }; }; ! 30D78B560849D0AF00112C09 = { ! fileRef = 30D78B520849D0AF00112C09; isa = PBXBuildFile; settings = { }; }; ! 30D78B570849D0AF00112C09 = { ! fileRef = 30D78B510849D0AF00112C09; isa = PBXBuildFile; settings = { }; }; ! 30D78B580849D0AF00112C09 = { ! fileRef = 30D78B520849D0AF00112C09; isa = PBXBuildFile; settings = { }; }; ! 30D78B590849D0AF00112C09 = { ! fileRef = 30D78B510849D0AF00112C09; isa = PBXBuildFile; settings = { }; }; ! 30D78B5A0849D0AF00112C09 = { ! fileRef = 30D78B520849D0AF00112C09; isa = PBXBuildFile; settings = { }; }; ! 30D78B640849D35600112C09 = { ! children = ( ! 30D77AA106455BEF0095BAC8, ! 30D77AA206455BEF0095BAC8, ! 3034119E07B7FDB000B92C57, ! 3034119F07B7FDB000B92C57, ! ); ! isa = PBXGroup; ! name = Position; ! refType = 4; ! sourceTree = "<group>"; }; ! 30D78B650849D36100112C09 = { ! children = ( ! 3041B58A06F623640055CB6D, ! 3041B58B06F623640055CB6D, ! 30A1800D0640E5C300D2836F, ! 30A1800F0640E5C300D2836F, ! 30D78B510849D0AF00112C09, ! 30D78B520849D0AF00112C09, ! 30D9FB420644FA8300390F49, ! 30D9FB430644FA8300390F49, ! ); ! isa = PBXGroup; ! name = Player; ! refType = 4; ! sourceTree = "<group>"; }; ! 30D78B660849D3A000112C09 = { ! children = ( ! 30C85EC6064647730016E5B3, ! 30C85EC7064647730016E5B3, ! 30C861C8064679F00016E5B3, ! 30C861C9064679F00016E5B3, ! 30C863DA0646A40D0016E5B3, ! 30C863DB0646A40D0016E5B3, ! ); ! isa = PBXGroup; ! name = LineUp; ! refType = 4; ! sourceTree = "<group>"; }; ! 30D78B670849D3BB00112C09 = { ! children = ( ! 30BEEAAE070B3A8B00AF64D8, ! 30BEEAAF070B3A8B00AF64D8, ! 303E6CFF070708480091C7D3, ! 303E6D00070708480091C7D3, ! 30CCAF4C07009E710005D3FA, ! 30CCAF4D07009E710005D3FA, ! 3053D56F07008A6D004019F7, ! 3053D57007008A6D004019F7, ! 3028FABD06FC637D002DAE54, ! 3028FABE06FC637D002DAE54, ! ); ! isa = PBXGroup; ! name = Club; ! refType = 4; ! sourceTree = "<group>"; }; ! 30D78B680849D3E400112C09 = { ! children = ( ! 30A180100640E5C300D2836F, ! 30A1800E0640E5C300D2836F, ! 3060965F07931CA900BAA4CF, ! 3060966007931CA900BAA4CF, ! 306096360793195B00BAA4CF, ! 306096370793195B00BAA4CF, ! 3094220B0706E9C000873206, ! 3094220C0706E9C000873206, ! 30EC0BDE06425043008B3F6B, ! 30EC0BDF06425043008B3F6B, ! 301CEB8E06746643001C1E37, ! 301CEB8F06746643001C1E37, ! ); ! isa = PBXGroup; ! name = Global; ! refType = 4; ! sourceTree = "<group>"; }; ! 30D78B690849D41400112C09 = { ! children = ( ! 3084F85907639DEC00DCF936, ! 3084F85A07639DEC00DCF936, ! 308426AB0643ABD200173CCD, ! 308426AA0643ABD200173CCD, ! 301E3B2E064A7C1A00C88C10, ! 301E3B2F064A7C1A00C88C10, ! 3076CB5006675EC000C72BA4, ! 3076CB5106675EC000C72BA4, ! 306D2F79068AC8EB00CB623F, ! 306D2F7A068AC8EB00CB623F, ! ); ! isa = PBXGroup; ! name = MainWIndow; ! refType = 4; ! sourceTree = "<group>"; }; ! 30D78B780849D44300112C09 = { ! children = ( ! 3031CB0807A043B0006539CD, ! 3031CB0907A043B0006539CD, ! 306DEE780692C63E008C0937, ! 306DEE770692C63E008C0937, ! ); ! isa = PBXGroup; ! name = Preferences; ! refType = 4; ! sourceTree = "<group>"; }; ! 30D78B790849D45B00112C09 = { ! children = ( ! 30ADE246078B17660012CF83, ! 30ADE247078B17660012CF83, ! 3013839D06AED4B2009387D7, ! 3013839E06AED4B2009387D7, ! ); ! isa = PBXGroup; ! name = SinglePlayer; ! refType = 4; ! sourceTree = "<group>"; }; ! 30D78B7A0849D47B00112C09 = { ! children = ( ! 306D2FC3068AC9CB00CB623F, ! 306D2FC4068AC9CB00CB623F, ! 307C35590642738100302C60, ! 307C355A0642738100302C60, ! 30BB2130067DC1BC00B1C71A, ! 30BB2131067DC1BC00B1C71A, ! ); ! isa = PBXGroup; ! name = Global; ! refType = 4; ! sourceTree = "<group>"; }; ! 30D78B7B0849D49800112C09 = { ! children = ( ! 30769E310763548A00AA1F39, ! 30555220067C479F00163561, ! 30769E24076353B200AA1F39, ! 30769E28076353F900AA1F39, ! 30769E2D0763544300AA1F39, ! ); ! isa = PBXGroup; ! name = MainWindow; ! refType = 4; ! sourceTree = "<group>"; }; ! 30D78B7C0849D4AA00112C09 = { ! children = ( ! 300F6E6F06981CE600B74D7B, ! 107005CF0789739800E7C0CA, ! ); ! isa = PBXGroup; ! name = SinglePlayer; ! refType = 4; ! sourceTree = "<group>"; }; ! 30D78B7D0849D4DC00112C09 = { ! children = ( ! 102B65730796B99C00CE6B91, ! 30B35616069016C600571DE8, ! ); ! isa = PBXGroup; ! name = Preferences; ! refType = 4; ! sourceTree = "<group>"; }; ! 30D78B7E0849D4EF00112C09 = { ! children = ( ! 30BB20B6067DB6F100B1C71A, ! 3095070A067C4F400077C270, ! ); ! isa = PBXGroup; ! name = Global; ! refType = 4; ! sourceTree = "<group>"; }; ! 30D9FB420644FA8300390F49 = { ! fileEncoding = 4; ! isa = PBXFileReference; ! lastKnownFileType = sourcecode.c.h; ! path = "Player-Sorting.h"; ! refType = 4; ! sourceTree = "<group>"; }; ! 30D9FB430644FA8300390F49 = { ! fileEncoding = 4; ! isa = PBXFileReference; ! lastKnownFileType = sourcecode.c.objc; ! path = "Player-Sorting.m"; ! refType = 4; ! sourceTree = "<group>"; }; ! 30D9FB590645030C00390F49 = { ! fileEncoding = 4; ! isa = PBXFileReference; ! lastKnownFileType = sourcecode.c.h; ! path = PlayerSortingTest.h; ! refType = 4; ! sourceTree = "<group>"; }; ! 30D9FB5A0645030C00390F49 = { ! fileEncoding = 4; ! isa = PBXFileReference; ! lastKnownFileType = sourcecode.c.objc; ! path = PlayerSortingTest.m; ! refType = 4; ! sourceTree = "<group>"; }; ! 30D9FE0A06452D8F00390F49 = { ! fileEncoding = 4; ! isa = PBXFileReference; ! lastKnownFileType = text; ! path = "GPL License.txt"; ! refType = 4; ! sourceTree = "<group>"; }; ! 30DE3F8C07C3F00700342677 = { ! isa = PBXFileReference; ! lastKnownFileType = image.tiff; ! path = formulas.tiff; ! refType = 4; ! sourceTree = "<group>"; }; ! 30DE3F8D07C3F00700342677 = { ! fileRef = 30DE3F8C07C3F00700342677; isa = PBXBuildFile; settings = { }; }; ! 30DE3F8E07C3F00800342677 = { ! fileRef = 30DE3F8C07C3F00700342677; isa = PBXBuildFile; settings = { *************** *** 5167,5170 **** --- 5086,5090 ---- 30DFA4E308201972000CE74D, 30DFA4E508201973000CE74D, + 30D78B530849D0AF00112C09, ); isa = PBXHeadersBuildPhase; *************** *** 5217,5220 **** --- 5137,5141 ---- 30DFA4E208201971000CE74D, 30DFA4E408201972000CE74D, + 30D78B540849D0AF00112C09, ); isa = PBXSourcesBuildPhase; Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.mode1,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** roman.mode1 20 May 2005 18:30:37 -0000 1.35 --- roman.mode1 29 May 2005 11:13:59 -0000 1.36 *************** *** 205,212 **** <integer>0</integer> <key>bookmark</key> ! <string>30D0C9B30839258600AFB5E5</string> <key>history</key> <array> ! <string>30D0C9A80839163F00AFB5E5</string> </array> </dict> --- 205,212 ---- <integer>0</integer> <key>bookmark</key> ! <string>30D78BB60849D50F00112C09</string> <key>history</key> <array> ! <string>30F10ECF083FB6BA00F4A1C5</string> </array> </dict> *************** *** 224,228 **** <false/> <key>RubberWindowFrame</key> ! <string>412 168 750 510 0 0 1280 832 </string> </dict> </dict> --- 224,228 ---- <false/> <key>RubberWindowFrame</key> ! <string>410 206 750 510 0 0 1280 832 </string> </dict> </dict> *************** *** 261,264 **** --- 261,266 ---- <array> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> *************** *** 297,302 **** <array> <string>29B97314FDCFA39411CA2CEA</string> ! <string>10A233D807327EC1007529F7</string> ! <string>30B355F80690131C00571DE8</string> <string>29B97323FDCFA39411CA2CEA</string> <string>30A438AD068C2923001BFB41</string> --- 299,305 ---- <array> <string>29B97314FDCFA39411CA2CEA</string> ! <string>080E96DDFE201D6D7F000001</string> ! <string>30BB2140067DC1CA00B1C71A</string> ! <string>307D956A063D9208008E2586</string> <string>29B97323FDCFA39411CA2CEA</string> <string>30A438AD068C2923001BFB41</string> *************** *** 308,318 **** <array> <array> ! <integer>21</integer> ! <integer>12</integer> <integer>0</integer> </array> </array> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> ! <string>{{0, 170}, {186, 338}}</string> </dict> <key>PBXTopSmartGroupGIDs</key> --- 311,320 ---- <array> <array> ! <integer>56</integer> <integer>0</integer> </array> </array> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> ! <string>{{0, 119}, {186, 669}}</string> </dict> <key>PBXTopSmartGroupGIDs</key> *************** *** 326,330 **** <dict> <key>Frame</key> ! <string>{{0, 0}, {203, 356}}</string> <key>GroupTreeTableConfiguration</key> <array> --- 328,332 ---- <dict> <key>Frame</key> ! <string>{{0, 0}, {203, 687}}</string> <key>GroupTreeTableConfiguration</key> <array> *************** *** 333,337 **** </array> <key>RubberWindowFrame</key> ! <string>86 357 690 397 0 0 1280 832 </string> </dict> <key>Module</key> --- 335,339 ---- </array> <key>RubberWindowFrame</key> ! <string>0 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 349,353 **** <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Localizable.strings</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 351,355 ---- <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>TeamController.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 357,365 **** <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Localizable.strings</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30D0C9AF0839258600AFB5E5</string> <key>history</key> <array> --- 359,367 ---- <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>TeamController.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30D78BB30849D50F00112C09</string> <key>history</key> <array> *************** *** 369,377 **** <string>304255850837E2BB00DDF612</string> <string>3067AFF10838D3E00063180D</string> - <string>3067B0140838D6FF0063180D</string> <string>3067B0A90838F5580063180D</string> - <string>30D0C991083915C100AFB5E5</string> <string>30D0C99C083915F700AFB5E5</string> ! <string>30D0C9AE0839258600AFB5E5</string> </array> <key>prevStack</key> --- 371,399 ---- <string>304255850837E2BB00DDF612</string> <string>3067AFF10838D3E00063180D</string> <string>3067B0A90838F5580063180D</string> <string>30D0C99C083915F700AFB5E5</string> ! <string>305BDB27083E6F1B00FBE0D3</string> ! <string>305BDB28083E6F1B00FBE0D3</string> ! <string>30D78B7F0849D50F00112C09</string> ! <string>30D78B800849D50F00112C09</string> ! <string>30D78B810849D50F00112C09</string> ! <string>30D78B820849D50F00112C09</string> ! <string>30D78B830849D50F00112C09</string> ! <string>30D78B840849D50F00112C09</string> ! <string>30D78B850849D50F00112C09</string> ! <string>30D78B860849D50F00112C09</string> ! <string>30D78B870849D50F00112C09</string> ! <string>30D78B880849D50F00112C09</string> ! <string>30D78B890849D50F00112C09</string> ! <string>30D78B8A0849D50F00112C09</string> ! <string>30D78B8B0849D50F00112C09</string> ! <string>30D78B8C0849D50F00112C09</string> ! <string>30D78B8D0849D50F00112C09</string> ! <string>30D78B8E0849D50F00112C09</string> ! <string>30D78B8F0849D50F00112C09</string> ! <string>30D78B900849D50F00112C09</string> ! <string>30D78B910849D50F00112C09</string> ! <string>30D78B920849D50F00112C09</string> ! <string>30D78B930849D50F00112C09</string> </array> <key>prevStack</key> *************** *** 386,389 **** --- 408,444 ---- <string>30D0C993083915C100AFB5E5</string> <string>30D0C99E083915F700AFB5E5</string> + <string>305BDB2A083E6F1B00FBE0D3</string> + <string>305BDB2B083E6F1B00FBE0D3</string> + <string>30D78B940849D50F00112C09</string> + <string>30D78B950849D50F00112C09</string> + <string>30D78B960849D50F00112C09</string> + <string>30D78B970849D50F00112C09</string> + <string>30D78B980849D50F00112C09</string> + <string>30D78B990849D50F00112C09</string> + <string>30D78B9A0849D50F00112C09</string> + <string>30D78B9B0849D50F00112C09</string> + <string>30D78B9C0849D50F00112C09</string> + <string>30D78B9D0849D50F00112C09</string> + <string>30D78B9E0849D50F00112C09</string> + <string>30D78B9F0849D50F00112C09</string> + <string>30D78BA00849D50F00112C09</string> + <string>30D78BA10849D50F00112C09</string> + <string>30D78BA20849D50F00112C09</string> + <string>30D78BA30849D50F00112C09</string> + <string>30D78BA40849D50F00112C09</string> + <string>30D78BA50849D50F00112C09</string> + <string>30D78BA60849D50F00112C09</string> + <string>30D78BA70849D50F00112C09</string> + <string>30D78BA80849D50F00112C09</string> + <string>30D78BA90849D50F00112C09</string> + <string>30D78BAA0849D50F00112C09</string> + <string>30D78BAB0849D50F00112C09</string> + <string>30D78BAC0849D50F00112C09</string> + <string>30D78BAD0849D50F00112C09</string> + <string>30D78BAE0849D50F00112C09</string> + <string>30D78BAF0849D50F00112C09</string> + <string>30D78BB00849D50F00112C09</string> + <string>30D78BB10849D50F00112C09</string> + <string>30D78BB20849D50F00112C09</string> </array> </dict> *************** *** 397,412 **** <dict> <key>Frame</key> ! <string>{{0, 0}, {482, 203}}</string> <key>RubberWindowFrame</key> ! <string>86 357 690 397 0 0 1280 832 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> <key>Proportion</key> ! <string>203pt</string> </dict> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> --- 452,465 ---- <dict> <key>Frame</key> ! <string>{{0, 0}, {1072, 391}}</string> <key>RubberWindowFrame</key> ! <string>0 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> <key>Proportion</key> ! <string>391pt</string> </dict> <dict> <key>ContentConfiguration</key> <dict> *************** *** 419,434 **** <dict> <key>Frame</key> ! <string>{{0, 208}, {482, 148}}</string> <key>RubberWindowFrame</key> ! <string>86 357 690 397 0 0 1280 832 </string> </dict> <key>Module</key> <string>XCDetailModule</string> <key>Proportion</key> ! <string>148pt</string> </dict> </array> <key>Proportion</key> ! <string>482pt</string> </dict> </array> --- 472,487 ---- <dict> <key>Frame</key> ! <string>{{0, 396}, {1072, 291}}</string> <key>RubberWindowFrame</key> ! <string>0 104 1280 728 0 0 1280 832 </string> </dict> <key>Module</key> <string>XCDetailModule</string> <key>Proportion</key> ! <string>291pt</string> </dict> </array> <key>Proportion</key> ! <string>1072pt</string> </dict> </array> *************** *** 445,451 **** <key>TableOfContents</key> <array> ! <string>30D0C9B00839258600AFB5E5</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>30D0C9B10839258600AFB5E5</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> --- 498,504 ---- <key>TableOfContents</key> <array> ! <string>30D78BB40849D50F00112C09</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>30D78BB50849D50F00112C09</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> *************** *** 588,592 **** </array> <key>WindowString</key> ! <string>86 357 690 397 0 0 1280 832 </string> <key>WindowTools</key> <array> --- 641,645 ---- </array> <key>WindowString</key> ! <string>0 104 1280 728 0 0 1280 832 </string> <key>WindowTools</key> <array> *************** *** 981,986 **** <key>sizes</key> <array> ! <string>{{0, 0}, {366, 168}}</string> ! <string>{{0, 173}, {366, 270}}</string> </array> </dict> --- 1034,1039 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {367, 168}}</string> ! <string>{{0, 173}, {367, 270}}</string> </array> </dict> *************** *** 1031,1037 **** <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30D0C9B40839258600AFB5E5</string> <string>1CD0528B0623707200166675</string> ! <string>30D0C9B50839258600AFB5E5</string> </array> <key>ToolbarConfiguration</key> --- 1084,1090 ---- <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30D78BB70849D50F00112C09</string> <string>1CD0528B0623707200166675</string> ! <string>30D78BB80849D50F00112C09</string> </array> <key>ToolbarConfiguration</key> Index: roman.pbxuser =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.pbxuser,v retrieving revision 1.100 retrieving revision 1.101 diff -C2 -d -r1.100 -r1.101 *** roman.pbxuser 20 May 2005 18:30:37 -0000 1.100 --- roman.pbxuser 29 May 2005 11:13:59 -0000 1.101 *************** *** 26,30 **** sepNavIntBoundsRect = "{{0, 0}, {830, 1652}}"; sepNavSelRange = "{5752, 0}"; ! sepNavVisRect = "{{0, 985}, {705, 437}}"; sepNavWindowFrame = "{{412, 136}, {750, 542}}"; }; --- 26,30 ---- sepNavIntBoundsRect = "{{0, 0}, {830, 1652}}"; sepNavSelRange = "{5752, 0}"; ! sepNavVisRect = "{{0, 51}, {705, 437}}"; sepNavWindowFrame = "{{412, 136}, {750, 542}}"; [...1153 lines suppressed...] + isa = PBXTextBookmark; + name = "World.m: 99"; + rLen = 0; + rLoc = 4376; + rType = 0; + vrLen = 292; + vrLoc = 2191; + }; + 30F10ECF083FB6BA00F4A1C5 = { + fRef = 10A233D907327ECF007529F7; + isa = PBXTextBookmark; + name = "Toolbar.m: 115"; + rLen = 0; + rLoc = 5752; + rType = 0; + vrLen = 2217; + vrLoc = 0; + }; 32CA4F630368D1EE00C91783 = { uiCtxt = { |
|
From: Geisschaes <gei...@us...> - 2005-05-20 18:31:19
|
Update of /cvsroot/macattrick/macattrick/English.lproj/MainWindow.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29929/English.lproj/MainWindow.nib Modified Files: info.nib keyedobjects.nib Log Message: before release 0.6 Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/MainWindow.nib/info.nib,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** info.nib 18 Feb 2005 15:40:47 -0000 1.13 --- info.nib 20 May 2005 18:30:36 -0000 1.14 *************** *** 4,10 **** <dict> <key>IBDocumentLocation</key> ! <string>50 201 456 359 0 0 1280 832 </string> <key>IBFramework Version</key> ! <string>364.0</string> <key>IBOpenObjects</key> <array> --- 4,10 ---- <dict> <key>IBDocumentLocation</key> ! <string>54 133 456 359 0 0 1280 832 </string> <key>IBFramework Version</key> ! <string>437.0</string> <key>IBOpenObjects</key> <array> *************** *** 12,16 **** </array> <key>IBSystem Version</key> ! <string>7U16</string> </dict> </plist> --- 12,16 ---- </array> <key>IBSystem Version</key> ! <string>8A428</string> </dict> </plist> Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/MainWindow.nib/keyedobjects.nib,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 Binary files /tmp/cvsasXe4M and /tmp/cvsi6sjKj differ |
|
From: Geisschaes <gei...@us...> - 2005-05-20 18:31:16
|
Update of /cvsroot/macattrick/macattrick/English.lproj/LineUpView.nib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29929/English.lproj/LineUpView.nib Modified Files: info.nib keyedobjects.nib Log Message: before release 0.6 Index: info.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/LineUpView.nib/info.nib,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** info.nib 14 May 2005 10:23:09 -0000 1.5 --- info.nib 20 May 2005 18:30:35 -0000 1.6 *************** *** 4,12 **** <dict> <key>IBDocumentLocation</key> ! <string>32 93 356 240 0 0 1600 1002 </string> <key>IBEditorPositions</key> <dict> <key>5</key> ! <string>194 376 827 517 0 0 1600 1002 </string> </dict> <key>IBFramework Version</key> --- 4,12 ---- <dict> <key>IBDocumentLocation</key> ! <string>24 72 356 240 0 0 1280 832 </string> <key>IBEditorPositions</key> <dict> <key>5</key> ! <string>226 305 827 517 0 0 1280 832 </string> </dict> <key>IBFramework Version</key> Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/LineUpView.nib/keyedobjects.nib,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvsAIDOHl and /tmp/cvsMCtyfR differ |
|
From: Geisschaes <gei...@us...> - 2005-05-20 18:31:16
|
Update of /cvsroot/macattrick/macattrick/English.lproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29929/English.lproj Modified Files: Credits.rtf InfoPlist.strings Localizable.strings Log Message: before release 0.6 Index: Credits.rtf =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/Credits.rtf,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Credits.rtf 27 Feb 2005 15:14:44 -0000 1.4 --- Credits.rtf 20 May 2005 18:30:35 -0000 1.5 *************** *** 1,3 **** ! {\rtf1\mac\ansicpg10000\cocoartf102 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;} {\colortbl;\red255\green255\blue255;} --- 1,3 ---- ! {\rtf1\mac\ansicpg10000\cocoartf824 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;} {\colortbl;\red255\green255\blue255;} *************** *** 12,15 **** --- 12,21 ---- \f1\b0 \ Martijn Broeders\ + \ + + \f0\b Localizations + \f1\b0 \ + Martijn Broeders (Dutch)\ + Roman Bertolami (German)\ \ Index: InfoPlist.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/InfoPlist.strings,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvsV3aUYb and /tmp/cvsXwENpH differ Index: Localizable.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/English.lproj/Localizable.strings,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsLYCVCh and /tmp/cvslma58M differ |
|
From: Geisschaes <gei...@us...> - 2005-05-20 18:31:16
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29929 Modified Files: HattrickOrg.m Info.plist Macattrick-Info.plist Toolbar.m Log Message: before release 0.6 Index: Info.plist =================================================================== RCS file: /cvsroot/macattrick/macattrick/Info.plist,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Info.plist 27 Feb 2005 15:14:44 -0000 1.7 --- Info.plist 20 May 2005 18:30:35 -0000 1.8 *************** *** 18,22 **** <string>????</string> <key>CFBundleVersion</key> ! <string>0.5</string> <key>NSMainNibFile</key> <string>MainWindow</string> --- 18,22 ---- <string>????</string> <key>CFBundleVersion</key> ! <string>0.6</string> <key>NSMainNibFile</key> <string>MainWindow</string> Index: Toolbar.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Toolbar.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Toolbar.m 16 Jan 2005 18:04:00 -0000 1.3 --- Toolbar.m 20 May 2005 18:30:35 -0000 1.4 *************** *** 113,117 **** // This will give the button the activated backgroundcolor - (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar*)toolbar { ! return [NSArray arrayWithObjects: @"TeamInfo", @"PlayerTable", @"PositionTable", @"LineUp",nil]; } --- 113,117 ---- // This will give the button the activated backgroundcolor - (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar*)toolbar { ! return [NSArray arrayWithObjects: nil];//@"TeamInfo", @"PlayerTable", @"PositionTable", @"LineUp",nil]; } Index: HattrickOrg.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/HattrickOrg.m,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** HattrickOrg.m 27 Mar 2005 12:23:33 -0000 1.21 --- HattrickOrg.m 20 May 2005 18:30:35 -0000 1.22 *************** *** 218,222 **** -(NSURLRequest*) buildRequest: (NSString*) urlString { NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString: urlString ]]; ! [request addValue:@"Macattrick v0.5" forHTTPHeaderField:@"User-Agent"]; return request; } --- 218,222 ---- -(NSURLRequest*) buildRequest: (NSString*) urlString { NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString: urlString ]]; ! [request addValue:@"Macattrick v0.6" forHTTPHeaderField:@"User-Agent"]; return request; } Index: Macattrick-Info.plist =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick-Info.plist,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Macattrick-Info.plist 27 Feb 2005 15:14:44 -0000 1.5 --- Macattrick-Info.plist 20 May 2005 18:30:35 -0000 1.6 *************** *** 22,26 **** <string>Roman Bertolami</string> <key>CFBundleVersion</key> ! <string>0.5</string> <key>NSMainNibFile</key> <string>MainMenu</string> --- 22,26 ---- <string>Roman Bertolami</string> <key>CFBundleVersion</key> ! <string>0.6</string> <key>NSMainNibFile</key> <string>MainMenu</string> |
|
From: Geisschaes <gei...@us...> - 2005-05-20 18:31:11
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29929/Macattrick.xcode Modified Files: project.pbxproj roman.mode1 roman.pbxuser Log Message: before release 0.6 Index: project.pbxproj =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/project.pbxproj,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** project.pbxproj 14 May 2005 10:23:11 -0000 1.72 --- project.pbxproj 20 May 2005 18:30:37 -0000 1.73 *************** *** 464,473 **** children = ( 300F6E6C06981CD900B74D7B, - 305B812C06B11DCD00A233B0, - 305B812D06B11DD700A233B0, - 303EA55D06BEA4C900658CE2, - 30FE371A06D79CEC00778BB6, - 30DFB645071FFAEA00D02508, - 30CD779B072138D900DEFDE0, ); isa = PBXVariantGroup; --- 464,467 ---- *************** *** 814,825 **** }; }; - 303AED5406B01BE300D5DF46 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = German; - path = German.lproj/MainMenu.nib; - refType = 4; - sourceTree = "<group>"; - }; 303B4FA50791C5C50056E135 = { fileEncoding = 4; --- 808,811 ---- *************** *** 944,995 **** }; }; - 303EA55D06BEA4C900658CE2 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = Spanish; - path = Spanish.lproj/TryPlayer.nib; - refType = 4; - sourceTree = "<group>"; - }; - 303EA55E06BEA4E700658CE2 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = Swedish; - path = Swedish.lproj/PreferencesPanel.nib; - refType = 4; - sourceTree = "<group>"; - }; - 303EA55F06BEA4EC00658CE2 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = Spanish; - path = Spanish.lproj/PreferencesPanel.nib; - refType = 4; - sourceTree = "<group>"; - }; - 303EA56006BEA4FA00658CE2 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = Spanish; - path = Spanish.lproj/MainMenu.nib; - refType = 4; - sourceTree = "<group>"; - }; - 303EA56106BEA50100658CE2 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = Spanish; - path = Spanish.lproj/Login.nib; - refType = 4; - sourceTree = "<group>"; - }; - 303EA56206BEA50B00658CE2 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = Spanish; - path = Spanish.lproj/MainWindow.nib; - refType = 4; - sourceTree = "<group>"; - }; 304145120711D07F00B323F1 = { isa = PBXFileReference; --- 930,933 ---- *************** *** 1079,1178 **** }; }; - 304D6F100779EC3F00060175 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = Dutch; - path = Dutch.lproj/TeamInfoView.nib; - refType = 4; - sourceTree = "<group>"; - }; - 304D6F110779EC4300060175 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = French; - path = French.lproj/TeamInfoView.nib; - refType = 4; - sourceTree = "<group>"; - }; - 304D6F120779EC4700060175 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = German; - path = German.lproj/TeamInfoView.nib; - refType = 4; - sourceTree = "<group>"; - }; - 304D6F130779EC5600060175 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = German; - path = German.lproj/PlayerTableView.nib; - refType = 4; - sourceTree = "<group>"; - }; - 304D6F140779EC5B00060175 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = French; - path = French.lproj/PlayerTableView.nib; - refType = 4; - sourceTree = "<group>"; - }; - 304D6F150779EC6100060175 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = Dutch; - path = Dutch.lproj/PlayerTableView.nib; - refType = 4; - sourceTree = "<group>"; - }; - 304D6F160779EC8600060175 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = German; - path = German.lproj/PositionTableView.nib; - refType = 4; - sourceTree = "<group>"; - }; - 304D6F170779EC8900060175 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = French; - path = French.lproj/PositionTableView.nib; - refType = 4; - sourceTree = "<group>"; - }; - 304D6F180779EC8F00060175 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = Dutch; - path = Dutch.lproj/PositionTableView.nib; - refType = 4; - sourceTree = "<group>"; - }; - 304D6F190779EC9700060175 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = German; - path = German.lproj/LineUpView.nib; - refType = 4; - sourceTree = "<group>"; - }; - 304D6F1A0779EC9B00060175 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = French; - path = French.lproj/LineUpView.nib; - refType = 4; - sourceTree = "<group>"; - }; - 304D6F1B0779ECA000060175 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = Dutch; - path = Dutch.lproj/LineUpView.nib; - refType = 4; - sourceTree = "<group>"; - }; 3053D56F07008A6D004019F7 = { fileEncoding = 4; --- 1017,1020 ---- *************** *** 1234,1243 **** children = ( 29B97319FDCFA39411CA2CEA, - 30A43892068C1746001BFB41, - 307FC4B7068F416B00B9BA7C, - 303EA56206BEA50B00658CE2, - 30FE371E06D79D2600778BB6, - 30DFB64A071FFB2800D02508, - 30CD77A80721393C00DEFDE0, ); isa = PBXVariantGroup; --- 1076,1079 ---- *************** *** 1247,1266 **** sourceTree = "<group>"; }; - 305B812C06B11DCD00A233B0 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = German; - path = German.lproj/TryPlayer.nib; - refType = 4; - sourceTree = "<group>"; - }; - 305B812D06B11DD700A233B0 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = Swedish; - path = Swedish.lproj/TryPlayer.nib; - refType = 4; - sourceTree = "<group>"; - }; 306095490793018700BAA4CF = { fileEncoding = 4; --- 1083,1086 ---- *************** *** 1637,1664 **** }; }; - 306D43DE072116C40073BC77 = { - isa = PBXFileReference; - lastKnownFileType = text.plist.strings; - name = Dutch; - path = Dutch.lproj/Localizable.strings; - refType = 4; - sourceTree = "<group>"; - }; - 306D43DF072116C90073BC77 = { - isa = PBXFileReference; - lastKnownFileType = text.plist.strings; - name = French; - path = French.lproj/Localizable.strings; - refType = 4; - sourceTree = "<group>"; - }; - 306D43E0072116D10073BC77 = { - isa = PBXFileReference; - lastKnownFileType = text.plist.strings; - name = Spanish; - path = Spanish.lproj/Localizable.strings; - refType = 4; - sourceTree = "<group>"; - }; 306DEE770692C63E008C0937 = { fileEncoding = 30; --- 1457,1460 ---- *************** *** 2596,2602 **** children = ( 30769E25076353B200AA1F39, - 304D6F100779EC3F00060175, - 304D6F110779EC4300060175, - 304D6F120779EC4700060175, ); isa = PBXVariantGroup; --- 2392,2395 ---- *************** *** 2629,2635 **** children = ( 30769E29076353F900AA1F39, - 304D6F130779EC5600060175, - 304D6F140779EC5B00060175, - 304D6F150779EC6100060175, ); isa = PBXVariantGroup; --- 2422,2425 ---- *************** *** 2662,2668 **** children = ( 30769E2E0763544300AA1F39, - 304D6F160779EC8600060175, - 304D6F170779EC8900060175, - 304D6F180779EC8F00060175, ); isa = PBXVariantGroup; --- 2452,2455 ---- *************** *** 2695,2701 **** children = ( 30769E320763548A00AA1F39, - 304D6F190779EC9700060175, - 304D6F1A0779EC9B00060175, - 304D6F1B0779ECA000060175, ); isa = PBXVariantGroup; --- 2482,2485 ---- *************** *** 2851,2886 **** sourceTree = "<group>"; }; - 307DCD56069593130089A5DA = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = German; - path = German.lproj/PreferencesPanel.nib; - refType = 4; - sourceTree = "<group>"; - }; - 307FC4B6068F416200B9BA7C = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = Swedish; - path = Swedish.lproj/Login.nib; - refType = 4; - sourceTree = "<group>"; - }; - 307FC4B7068F416B00B9BA7C = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = Swedish; - path = Swedish.lproj/MainWindow.nib; - refType = 4; - sourceTree = "<group>"; - }; - 307FC4B8068F41F300B9BA7C = { - isa = PBXFileReference; - lastKnownFileType = text.plist.strings; - name = Swedish; - path = Swedish.lproj/Localizable.strings; - refType = 4; - sourceTree = "<group>"; - }; 307FC4C0068F43CB00B9BA7C = { fileRef = 308426AA0643ABD200173CCD; --- 2635,2638 ---- *************** *** 3704,3713 **** children = ( 30950706067C4F300077C270, - 30D1B66F068B2D3300A61D0C, - 307FC4B6068F416200B9BA7C, - 303EA56106BEA50100658CE2, - 30FE371D06D79D1D00778BB6, - 30DFB649071FFB1A00D02508, - 30CD77A70721393000DEFDE0, ); isa = PBXVariantGroup; --- 3456,3459 ---- *************** *** 4481,4501 **** }; }; - 30A43892068C1746001BFB41 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = German; - path = German.lproj/MainWindow.nib; - refType = 4; - sourceTree = "<group>"; - }; 30A438AD068C2923001BFB41 = { children = ( 30A438AE068C2923001BFB41, - 30A438B2068C2A3A001BFB41, - 307FC4B8068F41F300B9BA7C, - 306D43DE072116C40073BC77, - 306D43DF072116C90073BC77, - 306D43E0072116D10073BC77, - 30CD77A90721394A00DEFDE0, ); isa = PBXVariantGroup; --- 4227,4233 ---- *************** *** 4520,4532 **** }; }; - 30A438B2068C2A3A001BFB41 = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text.plist.strings; - name = German; - path = German.lproj/Localizable.strings; - refType = 4; - sourceTree = "<group>"; - }; 30A4D3080678416200BB8F08 = { isa = PBXFileReference; --- 4252,4255 ---- *************** *** 4606,4615 **** children = ( 30B3560C0690169700571DE8, - 307DCD56069593130089A5DA, - 303EA55E06BEA4E700658CE2, - 303EA55F06BEA4EC00658CE2, - 30FE371B06D79D0200778BB6, - 30DFB647071FFB0300D02508, - 30CD77A50721391A00DEFDE0, ); isa = PBXVariantGroup; --- 4329,4332 ---- *************** *** 4627,4636 **** children = ( 3095077C067C56370077C270, - 30DAB1BC068F3FF600651AAE, - 303AED5406B01BE300D5DF46, - 303EA56006BEA4FA00658CE2, - 30FE371C06D79D0F00778BB6, - 30DFB648071FFB1000D02508, - 30CD77A60721392400DEFDE0, ); isa = PBXVariantGroup; --- 4344,4347 ---- *************** *** 4914,4965 **** sourceTree = "<group>"; }; - 30CD779B072138D900DEFDE0 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = Norwegian; - path = Norwegian.lproj/TryPlayer.nib; - refType = 4; - sourceTree = "<group>"; - }; - 30CD77A50721391A00DEFDE0 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = Norwegian; - path = Norwegian.lproj/PreferencesPanel.nib; - refType = 4; - sourceTree = "<group>"; - }; - 30CD77A60721392400DEFDE0 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = Norwegian; - path = Norwegian.lproj/MainMenu.nib; - refType = 4; - sourceTree = "<group>"; - }; - 30CD77A70721393000DEFDE0 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = Norwegian; - path = Norwegian.lproj/Login.nib; - refType = 4; - sourceTree = "<group>"; - }; - 30CD77A80721393C00DEFDE0 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = Norwegian; - path = Norwegian.lproj/MainWindow.nib; - refType = 4; - sourceTree = "<group>"; - }; - 30CD77A90721394A00DEFDE0 = { - isa = PBXFileReference; - lastKnownFileType = text.plist.strings; - name = Norwegian; - path = Norwegian.lproj/Localizable.strings; - refType = 4; - sourceTree = "<group>"; - }; 30D0C7E70709DA6C00710CCA = { fileEncoding = 4; --- 4625,4628 ---- *************** *** 4978,4989 **** sourceTree = "<group>"; }; - 30D1B66F068B2D3300A61D0C = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = German; - path = German.lproj/Login.nib; - refType = 4; - sourceTree = "<group>"; - }; 30D558060674F5590059F8D8 = { children = ( --- 4641,4644 ---- *************** *** 5220,5231 **** sourceTree = "<group>"; }; - 30DAB1BC068F3FF600651AAE = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = Swedish; - path = Swedish.lproj/MainMenu.nib; - refType = 4; - sourceTree = "<group>"; - }; 30DE3F8C07C3F00700342677 = { isa = PBXFileReference; --- 4875,4878 ---- *************** *** 6129,6172 **** }; }; - 30DFB645071FFAEA00D02508 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = Dutch; - path = Dutch.lproj/TryPlayer.nib; - refType = 4; - sourceTree = "<group>"; - }; - 30DFB647071FFB0300D02508 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = Dutch; - path = Dutch.lproj/PreferencesPanel.nib; - refType = 4; - sourceTree = "<group>"; - }; - 30DFB648071FFB1000D02508 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = Dutch; - path = Dutch.lproj/MainMenu.nib; - refType = 4; - sourceTree = "<group>"; - }; - 30DFB649071FFB1A00D02508 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = Dutch; - path = Dutch.lproj/Login.nib; - refType = 4; - sourceTree = "<group>"; - }; - 30DFB64A071FFB2800D02508 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = Dutch; - path = Dutch.lproj/MainWindow.nib; - refType = 4; - sourceTree = "<group>"; - }; 30E284D3077EFCA900DB648A = { children = ( --- 5776,5779 ---- *************** *** 8419,8462 **** sourceTree = "<group>"; }; - 30FE371A06D79CEC00778BB6 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = French; - path = French.lproj/TryPlayer.nib; - refType = 4; - sourceTree = "<group>"; - }; - 30FE371B06D79D0200778BB6 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = French; - path = French.lproj/PreferencesPanel.nib; - refType = 4; - sourceTree = "<group>"; - }; - 30FE371C06D79D0F00778BB6 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = French; - path = French.lproj/MainMenu.nib; - refType = 4; - sourceTree = "<group>"; - }; - 30FE371D06D79D1D00778BB6 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = French; - path = French.lproj/Login.nib; - refType = 4; - sourceTree = "<group>"; - }; - 30FE371E06D79D2600778BB6 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - name = French; - path = French.lproj/MainWindow.nib; - refType = 4; - sourceTree = "<group>"; - }; //300 //301 --- 8026,8029 ---- Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.mode1,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** roman.mode1 16 May 2005 15:43:36 -0000 1.34 --- roman.mode1 20 May 2005 18:30:37 -0000 1.35 *************** *** 191,197 **** <dict> <key>PBXProjectModuleGUID</key> ! <string>3067B0360838D8EF0063180D</string> <key>PBXProjectModuleLabel</key> ! <string>LineUpController.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 191,197 ---- <dict> <key>PBXProjectModuleGUID</key> ! <string>30D0C9A90839163F00AFB5E5</string> <key>PBXProjectModuleLabel</key> ! <string>Toolbar.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 199,232 **** <dict> <key>PBXProjectModuleGUID</key> ! <string>3067B0450838E12D0063180D</string> <key>PBXProjectModuleLabel</key> ! <string>LineUpController.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>3067B0B70838F6DA0063180D</string> <key>history</key> <array> ! <string>3067B0AD0838F5580063180D</string> ! <string>3067B0AE0838F5580063180D</string> ! </array> ! <key>prevStack</key> ! <array> ! <string>3067B0470838E12D0063180D</string> ! <string>3067B0480838E12D0063180D</string> ! <string>3067B0490838E12D0063180D</string> ! <string>3067B04A0838E12D0063180D</string> ! <string>3067B05C0838E92A0063180D</string> ! <string>3067B05D0838E92A0063180D</string> ! <string>3067B05E0838E92A0063180D</string> ! <string>3067B0640838E9470063180D</string> ! <string>3067B06D0838EAA10063180D</string> ! <string>3067B06E0838EAA10063180D</string> ! <string>3067B0830838F0600063180D</string> ! <string>3067B0840838F0600063180D</string> ! <string>3067B0850838F0600063180D</string> ! <string>3067B08B0838F0B40063180D</string> ! <string>3067B0AF0838F5580063180D</string> ! <string>3067B0B00838F5580063180D</string> </array> </dict> --- 199,212 ---- <dict> <key>PBXProjectModuleGUID</key> ! <string>30D0C9B20839258600AFB5E5</string> <key>PBXProjectModuleLabel</key> ! <string>Toolbar.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30D0C9B30839258600AFB5E5</string> <key>history</key> <array> ! <string>30D0C9A80839163F00AFB5E5</string> </array> </dict> *************** *** 240,248 **** <dict> <key>Frame</key> ! <string>{{0, 20}, {1196, 589}}</string> <key>PBXModuleWindowStatusBarHidden2</key> <false/> <key>RubberWindowFrame</key> ! <string>-2 130 1196 630 0 0 1280 832 </string> </dict> </dict> --- 220,228 ---- <dict> <key>Frame</key> ! <string>{{0, 20}, {750, 469}}</string> <key>PBXModuleWindowStatusBarHidden2</key> <false/> <key>RubberWindowFrame</key> ! <string>412 168 750 510 0 0 1280 832 </string> </dict> </dict> *************** *** 317,320 **** --- 297,304 ---- <array> <string>29B97314FDCFA39411CA2CEA</string> + <string>10A233D807327EC1007529F7</string> + <string>30B355F80690131C00571DE8</string> + <string>29B97323FDCFA39411CA2CEA</string> + <string>30A438AD068C2923001BFB41</string> <string>1C37FBAC04509CD000000102</string> <string>1C37FAAC04509CD000000102</string> *************** *** 324,333 **** <array> <array> ! <integer>3</integer> <integer>0</integer> </array> </array> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> ! <string>{{0, 0}, {186, 338}}</string> </dict> <key>PBXTopSmartGroupGIDs</key> --- 308,318 ---- <array> <array> ! <integer>21</integer> ! <integer>12</integer> <integer>0</integer> </array> </array> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> ! <string>{{0, 170}, {186, 338}}</string> </dict> <key>PBXTopSmartGroupGIDs</key> *************** *** 348,352 **** </array> <key>RubberWindowFrame</key> ! <string>406 411 690 397 0 0 1280 832 </string> </dict> <key>Module</key> --- 333,337 ---- </array> <key>RubberWindowFrame</key> ! <string>86 357 690 397 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 364,368 **** <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>LineUpTreeNode.h</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 349,353 ---- <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Localizable.strings</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 372,380 **** <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>LineUpTreeNode.h</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>3067B0B60838F6DA0063180D</string> <key>history</key> <array> --- 357,365 ---- <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>Localizable.strings</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>30D0C9AF0839258600AFB5E5</string> <key>history</key> <array> *************** *** 386,390 **** <string>3067B0140838D6FF0063180D</string> <string>3067B0A90838F5580063180D</string> ! <string>3067B0AA0838F5580063180D</string> </array> <key>prevStack</key> --- 371,377 ---- <string>3067B0140838D6FF0063180D</string> <string>3067B0A90838F5580063180D</string> ! <string>30D0C991083915C100AFB5E5</string> ! <string>30D0C99C083915F700AFB5E5</string> ! <string>30D0C9AE0839258600AFB5E5</string> </array> <key>prevStack</key> *************** *** 397,403 **** <string>30BE4843082FF1B600826659</string> <string>304255860837E2BB00DDF612</string> ! <string>3067AFF30838D3E00063180D</string> ! <string>3067B0160838D6FF0063180D</string> ! <string>3067B0AB0838F5580063180D</string> </array> </dict> --- 384,389 ---- <string>30BE4843082FF1B600826659</string> <string>304255860837E2BB00DDF612</string> ! <string>30D0C993083915C100AFB5E5</string> ! <string>30D0C99E083915F700AFB5E5</string> </array> </dict> *************** *** 413,417 **** <string>{{0, 0}, {482, 203}}</string> <key>RubberWindowFrame</key> ! <string>406 411 690 397 0 0 1280 832 </string> </dict> <key>Module</key> --- 399,403 ---- <string>{{0, 0}, {482, 203}}</string> <key>RubberWindowFrame</key> ! <string>86 357 690 397 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 435,439 **** <string>{{0, 208}, {482, 148}}</string> <key>RubberWindowFrame</key> ! <string>406 411 690 397 0 0 1280 832 </string> </dict> <key>Module</key> --- 421,425 ---- <string>{{0, 208}, {482, 148}}</string> <key>RubberWindowFrame</key> ! <string>86 357 690 397 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 459,465 **** <key>TableOfContents</key> <array> ! <string>3067AFA20838C99F0063180D</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>3067AFA30838C99F0063180D</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> --- 445,451 ---- <key>TableOfContents</key> <array> ! <string>30D0C9B00839258600AFB5E5</string> <string>1CE0B1FE06471DED0097A5F4</string> ! <string>30D0C9B10839258600AFB5E5</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> *************** *** 574,578 **** <false/> <key>PinnedNavigatorIdentifier</key> ! <string>3067B0360838D8EF0063180D</string> <key>ShelfIsVisible</key> <false/> --- 560,564 ---- <false/> <key>PinnedNavigatorIdentifier</key> ! <string>30D0C9A90839163F00AFB5E5</string> <key>ShelfIsVisible</key> <false/> *************** *** 597,610 **** <key>WindowOrderList</key> <array> - <string>1C530D57069F1CE1000CFCEE</string> - <string>3067AFAB0838C99F0063180D</string> - <string>1CD10A99069EF8BA00B06720</string> - <string>30A82A48082E9E83003C97DB</string> - <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> - <string>3067B0360838D8EF0063180D</string> <string>1C0AD2B3069F1EA900FABCE6</string> </array> <key>WindowString</key> ! <string>406 411 690 397 0 0 1280 832 </string> <key>WindowTools</key> <array> --- 583,592 ---- <key>WindowOrderList</key> <array> <string>1C0AD2B3069F1EA900FABCE6</string> + <string>30D0C9A90839163F00AFB5E5</string> + <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> </array> <key>WindowString</key> ! <string>86 357 690 397 0 0 1280 832 </string> <key>WindowTools</key> <array> *************** *** 627,631 **** <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string>LineUpController.m</string> <key>StatusBarVisibility</key> <true/> --- 609,613 ---- <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> ! <string></string> <key>StatusBarVisibility</key> <true/> *************** *** 649,653 **** <dict> <key>PBXBuildLogShowsTranscriptDefaultKey</key> ! <string>{{0, 86}, {787, 277}}</string> <key>PBXProjectModuleGUID</key> <string>XCMainBuildResultsModuleGUID</string> --- 631,635 ---- <dict> <key>PBXBuildLogShowsTranscriptDefaultKey</key> ! <string>{{0, 225}, {787, 138}}</string> <key>PBXProjectModuleGUID</key> <string>XCMainBuildResultsModuleGUID</string> *************** *** 687,691 **** <array> <string>30A82A48082E9E83003C97DB</string> ! <string>3067AFFA0838D3E00063180D</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> --- 669,673 ---- <array> <string>30A82A48082E9E83003C97DB</string> ! <string>30EA935A0838FE9600D1708E</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> *************** *** 729,734 **** <key>sizes</key> <array> ! <string>{{0, 0}, {277, 157}}</string> ! <string>{{277, 0}, {417, 157}}</string> </array> </dict> --- 711,716 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {249, 152}}</string> ! <string>{{249, 0}, {445, 152}}</string> </array> </dict> *************** *** 745,750 **** <key>sizes</key> <array> ! <string>{{0, 0}, {694, 157}}</string> ! <string>{{0, 157}, {694, 224}}</string> </array> </dict> --- 727,732 ---- <key>sizes</key> <array> ! <string>{{0, 0}, {694, 152}}</string> ! <string>{{0, 152}, {694, 229}}</string> </array> </dict> *************** *** 793,804 **** <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>3067AFA50838C99F0063180D</string> <string>1C162984064C10D400B95A72</string> ! <string>3067AFA60838C99F0063180D</string> ! <string>3067AFA70838C99F0063180D</string> ! <string>3067AFA80838C99F0063180D</string> ! <string>3067AFA90838C99F0063180D</string> ! <string>3067AFAA0838C99F0063180D</string> ! <string>3067AFAB0838C99F0063180D</string> </array> <key>ToolbarConfiguration</key> --- 775,786 ---- <array> <string>1CD10A99069EF8BA00B06720</string> ! <string>30D0C963083911E100AFB5E5</string> <string>1C162984064C10D400B95A72</string> ! <string>30D0C964083911E100AFB5E5</string> ! <string>30D0C965083911E100AFB5E5</string> ! <string>30D0C966083911E100AFB5E5</string> ! <string>30D0C967083911E100AFB5E5</string> ! <string>30D0C968083911E100AFB5E5</string> ! <string>30D0C969083911E100AFB5E5</string> </array> <key>ToolbarConfiguration</key> *************** *** 809,813 **** <string>1CD10A99069EF8BA00B06720</string> <key>WindowToolIsVisible</key> ! <true/> </dict> <dict> --- 791,795 ---- <string>1CD10A99069EF8BA00B06720</string> <key>WindowToolIsVisible</key> ! <false/> </dict> <dict> *************** *** 919,924 **** <array> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> --- 901,904 ---- *************** *** 956,960 **** <array> <string>30BE4823082FED6F00826659</string> ! <string>30BE4824082FED6F00826659</string> <string>1C78EAAC065D492600B07095</string> </array> --- 936,940 ---- <array> <string>30BE4823082FED6F00826659</string> ! <string>30D0C98F083915B100AFB5E5</string> <string>1C78EAAC065D492600B07095</string> </array> *************** *** 1028,1032 **** <string>{{0, 0}, {1095, 323}}</string> <key>RubberWindowFrame</key> ! <string>240 227 1095 364 0 0 1280 832 </string> </dict> <key>Module</key> --- 1008,1012 ---- <string>{{0, 0}, {1095, 323}}</string> <key>RubberWindowFrame</key> ! <string>39 168 1095 364 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 1051,1062 **** <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>3067AFAC0838C99F0063180D</string> <string>1CD0528B0623707200166675</string> ! <string>3067AFAD0838C99F0063180D</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>240 227 1095 364 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> --- 1031,1042 ---- <array> <string>1C0AD2B3069F1EA900FABCE6</string> ! <string>30D0C9B40839258600AFB5E5</string> <string>1CD0528B0623707200166675</string> ! <string>30D0C9B50839258600AFB5E5</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>39 168 1095 364 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> Index: roman.pbxuser =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.pbxuser,v retrieving revision 1.99 retrieving revision 1.100 diff -C2 -d -r1.99 -r1.100 *** roman.pbxuser 16 May 2005 15:43:36 -0000 1.99 --- roman.pbxuser 20 May 2005 18:30:37 -0000 1.100 *************** *** 3,9 **** 089C165DFE840E0CC02AAC07 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {606, 326}}"; ! sepNavSelRange = "{173, 0}"; ! sepNavVisRect = "{{0, 0}, {606, 326}}"; sepNavWindowFrame = "{{130, 180}, {750, 542}}"; }; --- 3,9 ---- 089C165DFE840E0CC02AAC07 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {705, 437}}"; ! sepNavSelRange = "{107, 0}"; ! sepNavVisRect = "{{0, 0}, {705, 437}}"; sepNavWindowFrame = "{{130, 180}, {750, 542}}"; }; *************** *** 11,17 **** 101AED7A0712C2CF004F6558 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {984, 600}}"; ! sepNavSelRange = "{72, 0}"; ! sepNavVisRect = "{{0, 0}, {984, 600}}"; sepNavWindowFrame = "{{46, 89}, {1029, 691}}"; }; --- 11,17 ---- 101AED7A0712C2CF004F6558 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {984, 601}}"; ! sepNavSelRange = "{140, 0}"; ! sepNavVisRect = "{{0, 0}, {984, 601}}"; sepNavWindowFrame = "{{46, 89}, {1029, 691}}"; }; *************** *** 25,31 **** uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {830, 1652}}"; ! sepNavSelRange = "{5802, 0}"; ! sepNavVisRect = "{{0, 883}, {705, 428}}"; ! sepNavWindowFrame = "{{119, 183}, {750, 542}}"; }; }; --- 25,31 ---- uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {830, 1652}}"; ! sepNavSelRange = "{5752, 0}"; ! sepNavVisRect = "{{0, 985}, {705, 437}}"; ! sepNavWindowFrame = "{{412, 136}, {750, 542}}"; }; }; *************** *** 38,44 **** }; 29B97313FDCFA39411CA2CEA = { ! activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA; ! activeExecutable = 30744BA6069560A70039B82A; ! activeTarget = 30744BA4069560A70039B82A; addToTargets = ( 30DFA496082018F2000CE74D, --- 38,44 ---- }; 29B97313FDCFA39411CA2CEA = { ! activeBuildStyle = 4A9504CDFFE6A4B311CA0CBA; ! activeExecutable = 30950684067C4D100077C270; ! activeTarget = 30950682067C4D100077C270; addToTargets = ( 30DFA496082018F2000CE74D, *************** *** 196,200 **** ); }; ! PBXPerProjectTemplateStateSaveDate = 137939347; PBXPrepackagedSmartGroups_v2 = ( { --- 196,200 ---- ); }; ! PBXPerProjectTemplateStateSaveDate = 137958954; PBXPrepackagedSmartGroups_v2 = ( { *************** *** 1040,1044 **** RubberWindowFrame = "496 457 599 209 0 0 1280 832 "; }; ! PBXWorkspaceStateSaveDate = 137939347; }; perUserProjectItems = { --- 1040,1044 ---- RubberWindowFrame = "496 457 599 209 0 0 1280 832 "; }; ! PBXWorkspaceStateSaveDate = 137958954; }; perUserProjectItems = { *************** *** 1046,1075 **** 304255860837E2BB00DDF612 = 304255860837E2BB00DDF612; 3067AFF10838D3E00063180D = 3067AFF10838D3E00063180D; - 3067AFF30838D3E00063180D = 3067AFF30838D3E00063180D; 3067B0140838D6FF0063180D = 3067B0140838D6FF0063180D; - 3067B0160838D6FF0063180D = 3067B0160838D6FF0063180D; - 3067B0470838E12D0063180D = 3067B0470838E12D0063180D; - 3067B0480838E12D0063180D = 3067B0480838E12D0063180D; - 3067B0490838E12D0063180D = 3067B0490838E12D0063180D; - 3067B04A0838E12D0063180D = 3067B04A0838E12D0063180D; - 3067B05C0838E92A0063180D = 3067B05C0838E92A0063180D; - 3067B05D0838E92A0063180D = 3067B05D0838E92A0063180D; - 3067B05E0838E92A0063180D = 3067B05E0838E92A0063180D; - 3067B0640838E9470063180D = 3067B0640838E9470063180D; - 3067B06D0838EAA10063180D = 3067B06D0838EAA10063180D; - 3067B06E0838EAA10063180D = 3067B06E0838EAA10063180D; - 3067B0830838F0600063180D = 3067B0830838F0600063180D; - 3067B0840838F0600063180D = 3067B0840838F0600063180D; - 3067B0850838F0600063180D = 3067B0850838F0600063180D; - 3067B08B0838F0B40063180D = 3067B08B0838F0B40063180D; 3067B0A90838F5580063180D = 3067B0A90838F5580063180D; - 3067B0AA0838F5580063180D = 3067B0AA0838F5580063180D; - 3067B0AB0838F5580063180D = 3067B0AB0838F5580063180D; - 3067B0AD0838F5580063180D = 3067B0AD0838F5580063180D; - 3067B0AE0838F5580063180D = 3067B0AE0838F5580063180D; - 3067B0AF0838F5580063180D = 3067B0AF0838F5580063180D; - 3067B0B00838F5580063180D = 3067B0B00838F5580063180D; - 3067B0B60838F6DA0063180D = 3067B0B60838F6DA0063180D; - 3067B0B70838F6DA0063180D = 3067B0B70838F6DA0063180D; 30A82A69082EA48F003C97DB = 30A82A69082EA48F003C97DB; 30A82A6B082EA48F003C97DB = 30A82A6B082EA48F003C97DB; --- 1046,1051 ---- *************** *** 1081,1084 **** --- 1057,1068 ---- 30BE4841082FF1B600826659 = 30BE4841082FF1B600826659; 30BE4843082FF1B600826659 = 30BE4843082FF1B600826659; + 30D0C991083915C100AFB5E5 = 30D0C991083915C100AFB5E5; + 30D0C993083915C100AFB5E5 = 30D0C993083915C100AFB5E5; + 30D0C99C083915F700AFB5E5 = 30D0C99C083915F700AFB5E5; + 30D0C99E083915F700AFB5E5 = 30D0C99E083915F700AFB5E5; + 30D0C9A80839163F00AFB5E5 = 30D0C9A80839163F00AFB5E5; + 30D0C9AE0839258600AFB5E5 = 30D0C9AE0839258600AFB5E5; + 30D0C9AF0839258600AFB5E5 = 30D0C9AF0839258600AFB5E5; + 30D0C9B30839258600AFB5E5 = 30D0C9B30839258600AFB5E5; }; sourceControlManager = 303993D5063C467F00213F4F; *************** *** 1138,1144 **** uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1151, 1414}}"; ! sepNavSelRange = "{3838, 363}"; ! sepNavVisRect = "{{0, 857}, {1151, 557}}"; ! sepNavWindowFrame = "{{107, 221}, {750, 522}}"; }; }; --- 1122,1128 ---- uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1151, 1414}}"; ! sepNavSelRange = "{3979, 0}"; ! sepNavVisRect = "{{0, 619}, {1151, 557}}"; ! sepNavWindowFrame = "{{102, 143}, {1196, 662}}"; }; }; *************** *** 1146,1151 **** uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {2396, 3528}}"; ! sepNavSelRange = "{14229, 0}"; ! sepNavVisRect = "{{0, 2584}, {740, 258}}"; sepNavWindowFrame = "{{84, 230}, {750, 534}}"; }; --- 1130,1135 ---- uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {2396, 3528}}"; ! sepNavSelRange = "{9819, 0}"; ! sepNavVisRect = "{{0, 756}, {1151, 557}}"; sepNavWindowFrame = "{{84, 230}, {750, 534}}"; }; *************** *** 1502,1515 **** vrLoc = 3632; }; - 3067AFF30838D3E00063180D = { - fRef = 306BE2A907B803D6009942ED; - isa = PBXTextBookmark; - name = "PositionHeapTest.m: 40"; - rLen = 0; - rLoc = 2443; - rType = 0; - vrLen = 485; - vrLoc = 3632; - }; 3067B0140838D6FF0063180D = { fRef = 3034119F07B7FDB000B92C57; --- 1486,1489 ---- *************** *** 1522,1675 **** vrLoc = 2990; }; - 3067B0160838D6FF0063180D = { - fRef = 3034119F07B7FDB000B92C57; - isa = PBXTextBookmark; - name = "PositionHeap.m: 64"; - rLen = 0; - rLoc = 3054; - rType = 0; - vrLen = 352; - vrLoc = 2990; - }; - 3067B0470838E12D0063180D = { - fRef = 301E3B2F064A7C1A00C88C10; - isa = PBXTextBookmark; - name = "= NSSelectorFromString("; - rLen = 24; - rLoc = 7576; - rType = 0; - vrLen = 2118; - vrLoc = 4272; - }; - 3067B0480838E12D0063180D = { - fRef = 301E3B2E064A7C1A00C88C10; - isa = PBXTextBookmark; - name = ""; - rLen = 1; - rLoc = 3111; - rType = 0; - vrLen = 1397; - vrLoc = 2500; - }; - 3067B0490838E12D0063180D = { - fRef = 301E3B2F064A7C1A00C88C10; - isa = PBXTextBookmark; - name = "= NSSelectorFromString("; - rLen = 24; - rLoc = 7576; - rType = 0; - vrLen = 2930; - vrLoc = 10726; - }; - 3067B04A0838E12D0063180D = { - fRef = 301E3B2E064A7C1A00C88C10; - isa = PBXTextBookmark; - name = ""; - rLen = 1; - rLoc = 3111; - rType = 0; - vrLen = 1354; - vrLoc = 2646; - }; - 3067B05C0838E92A0063180D = { - fRef = 301E3B2F064A7C1A00C88C10; - isa = PBXTextBookmark; - name = "LineUpController.m: loadBackWings"; - rLen = 0; - rLoc = 14229; - rType = 0; - vrLen = 2199; - vrLoc = 4193; - }; - 3067B05D0838E92A0063180D = { - fRef = 301E3B2E064A7C1A00C88C10; - isa = PBXTextBookmark; - name = ""; - rLen = 1; - rLoc = 3111; - rType = 0; - vrLen = 1467; - vrLoc = 1823; - }; - 3067B05E0838E92A0063180D = { - fRef = 301E3B2F064A7C1A00C88C10; - isa = PBXTextBookmark; - name = "LineUpController.m: 107"; - rLen = 0; - rLoc = 8139; - rType = 0; - vrLen = 2196; - vrLoc = 7474; - }; - 3067B0640838E9470063180D = { - fRef = 301E3B2E064A7C1A00C88C10; - isa = PBXTextBookmark; - name = "LineUpController.h: specForwardList"; - rLen = 148; - rLoc = 3866; - rType = 0; - vrLen = 1279; - vrLoc = 2910; - }; - 3067B06D0838EAA10063180D = { - fRef = 301E3B2F064A7C1A00C88C10; - isa = PBXTextBookmark; - name = "LineUpController.m: 64"; - rLen = 0; - rLoc = 3752; - rType = 0; - vrLen = 1344; - vrLoc = 2291; - }; - 3067B06E0838EAA10063180D = { - fRef = 301E3B2E064A7C1A00C88C10; - isa = PBXTextBookmark; - name = "LineUpController.h: specForwardList"; - rLen = 148; - rLoc = 3866; - rType = 0; - vrLen = 1279; - vrLoc = 2910; - }; - 3067B0830838F0600063180D = { - fRef = 301E3B2F064A7C1A00C88C10; - isa = PBXTextBookmark; - name = "LineUpController.m: 203"; - rLen = 0; - rLoc = 14229; - rType = 0; - vrLen = 1957; - vrLoc = 8738; - }; - 3067B0840838F0600063180D = { - fRef = 301E3B2E064A7C1A00C88C10; - isa = PBXTextBookmark; - name = "LineUpController.h: 78"; - rLen = 177; - rLoc = 3837; - rType = 0; - vrLen = 1270; - vrLoc = 2920; - }; - 3067B0850838F0600063180D = { - fRef = 301E3B2F064A7C1A00C88C10; - isa = PBXTextBookmark; - name = "LineUpController.m: 147"; - rLen = 0; - rLoc = 11168; - rType = 0; - vrLen = 2366; - vrLoc = 3468; - }; - 3067B08B0838F0B40063180D = { - fRef = 301E3B2E064A7C1A00C88C10; - isa = PBXTextBookmark; - name = "LineUpController.h: positions"; - rLen = 363; - rLoc = 3838; - rType = 0; - vrLen = 1228; - vrLoc = 3149; - }; 3067B0A90838F5580063180D = { fRef = 30D77BEC0645778B0095BAC8; --- 1496,1499 ---- *************** *** 1682,1765 **** vrLoc = 9513; }; - 3067B0AA0838F5580063180D = { - fRef = 30C85EC6064647730016E5B3; - isa = PBXTextBookmark; - name = "- (NSString*) playerNameWithPointsForPosition;"; - rLen = 47; - rLoc = 2738; - rType = 0; - vrLen = 323; - vrLoc = 2574; - }; - 3067B0AB0838F5580063180D = { - fRef = 30D77BEC0645778B0095BAC8; - isa = PBXTextBookmark; - name = "UKFloatsEqual([pos total], 1.0, 0.001);"; - rLen = 41; - rLoc = 10326; - rType = 0; - vrLen = 678; - vrLoc = 9513; - }; - 3067B0AD0838F5580063180D = { - fRef = 301E3B2E064A7C1A00C88C10; - isa = PBXTextBookmark; - name = "LineUpController.h: positions"; - rLen = 363; - rLoc = 3838; - rType = 0; - vrLen = 1228; - vrLoc = 3149; - }; - 3067B0AE0838F5580063180D = { - fRef = 301E3B2F064A7C1A00C88C10; - isa = PBXTextBookmark; - name = "LineUpController.m: 146"; - rLen = 0; - rLoc = 10599; - rType = 0; - vrLen = 1924; - vrLoc = 8263; - }; - 3067B0AF0838F5580063180D = { - fRef = 301E3B2F064A7C1A00C88C10; - isa = PBXTextBookmark; - name = "LineUpController.m: 146"; - rLen = 0; - rLoc = 10599; - rType = 0; - vrLen = 1924; - vrLoc = 8263; - }; - 3067B0B00838F5580063180D = { - fRef = 301E3B2E064A7C1A00C88C10; - isa = PBXTextBookmark; - name = "LineUpController.h: positions"; - rLen = 363; - rLoc = 3838; - rType = 0; - vrLen = 1228; - vrLoc = 3149; - }; - 3067B0B60838F6DA0063180D = { - fRef = 30C85EC6064647730016E5B3; - isa = PBXTextBookmark; - name = "- (NSString*) playerNameWithPointsForPosition;"; - rLen = 47; - rLoc = 2738; - rType = 0; - vrLen = 270; - vrLoc = 2632; - }; - 3067B0B70838F6DA0063180D = { - fRef = 301E3B2F064A7C1A00C88C10; - isa = PBXTextBookmark; - name = "LineUpController.m: 146"; - rLen = 0; - rLoc = 9819; - rType = 0; - vrLen = 3228; - vrLoc = 7924; - }; 306BE2A807B803D6009942ED = { uiCtxt = { --- 1506,1509 ---- *************** *** 2526,2537 **** isa = PBXBookmark; }; - 307FC4B8068F41F300B9BA7C = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {705, 449}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRect = "{{0, 0}, {705, 449}}"; - sepNavWindowFrame = "{{15, 305}, {750, 522}}"; - }; - }; 308426AA0643ABD200173CCD = { uiCtxt = { --- 2270,2273 ---- *************** *** 2652,2655 **** --- 2388,2761 ---- ); shlibInfoDictList_v2 = ( + { + level = 0; + path = /Users/roman/Documents/dev/macattrick/build/Macattrick.app/Contents/MacOS/Macattrick; + whenToLoad = 0; + }, + { + level = 0; + path = /usr/lib/system/libmathCommon.A.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /usr/lib/libSystem.B.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /usr/lib/libicucore.A.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /usr/lib/libauto.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /usr/lib/libobjc.A.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation; + whenToLoad = 0; + }, + { + level = 0; + path = /usr/lib/libz.1.2.2.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/IOKit.framework/Versions/A/IOKit; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/Security.framework/Versions/A/Security; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/DiskArbitration.framework/Versions/A/DiskArbitration; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/CarbonCore; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/OSServices.framework/Versions/A/OSServices; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CFNetwork.framework/Versions/A/CFNetwork; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/WebServicesCore.framework/Versions/A/WebServicesCore; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SearchKit.framework/Versions/A/SearchKit; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/Metadata.framework/Versions/A/Metadata; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices; + whenToLoad = 0; + }, + { + level = 0; + path = /usr/lib/libbsm.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/AE.framework/Versions/A/AE; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/ATS; + whenToLoad = 0; + }, + { + level = 0; + path = /usr/lib/libcrypto.0.9.7.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/LaunchServices; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ColorSync.framework/Versions/A/ColorSync; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreText.framework/Versions/A/CoreText; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/QD.framework/Versions/A/QD; + whenToLoad = 0; + }, + { + level = 0; + path = /usr/lib/libcups.2.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A/PrintCore; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/HIServices; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/LangAnalysis.framework/Versions/A/LangAnalysis; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/FindByContent.framework/Versions/A/FindByContent; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/SpeechSynthesis.framework/Versions/A/SpeechSynthesis; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libJPEG.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libJP2.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libGIF.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libRaw.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libTIFF.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libPng.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libRadiance.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /usr/lib/libmx.A.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vImage.framework/Versions/A/vImage; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvMisc.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvDSP.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/vecLib; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/Accelerate.framework/Versions/A/Accelerate; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/ImageIO; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/CoreAudio.framework/Versions/A/CoreAudio; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/CarbonSound.framework/Versions/A/CarbonSound; + whenToLoad = 0; + }, + { + level = 0; + path = /usr/lib/libiconv.2.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /usr/lib/libxml2.2.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/Foundation.framework/Versions/C/Foundation; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/PrivateFrameworks/DesktopServicesPriv.framework/Versions/A/DesktopServicesPriv; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HIToolbox.framework/Versions/A/HIToolbox; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/SpeechRecognition.framework/Versions/A/SpeechRecognition; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/AudioUnit.framework/Versions/A/AudioUnit; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/AudioToolbox.framework/Versions/A/AudioToolbox; + whenToLoad = 0; + }, + { + level = 0; + path = /usr/lib/libsqlite3.0.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/CoreData.framework/Versions/A/CoreData; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLImage.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/QuartzCore.framework/Versions/A/QuartzCore; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/AppKit.framework/Versions/C/AppKit; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa; + whenToLoad = 0; + }, + { + level = 0; + path = /Library/Frameworks/UnitKit.framework/Versions/A/UnitKit; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/Resources/libCSync.A.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/Resources/libRIP.A.dylib; + whenToLoad = 0; + }, + { + level = 0; + path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/Resources/libCGATS.A.dylib; + whenToLoad = 0; + }, ); sourceDirectories = ( *************** *** 2716,2730 **** 30A438AE068C2923001BFB41 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {606, 326}}"; ! sepNavSelRange = "{279, 0}"; ! sepNavVisRect = "{{0, 0}, {606, 326}}"; ! sepNavWindowFrame = "{{38, 264}, {750, 542}}"; ! }; ! }; ! 30A438B2068C2A3A001BFB41 = { ! uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {606, 1064}}"; ! sepNavSelRange = "{278, 0}"; ! sepNavVisRect = "{{0, 497}, {606, 326}}"; }; }; --- 2822,2829 ---- 30A438AE068C2923001BFB41 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1028, 2016}}"; ! sepNavSelRange = "{4261, 0}"; ! sepNavVisRect = "{{0, 1201}, {435, 171}}"; ! sepNavWindowFrame = "{{66, 41}, {1137, 638}}"; }; }; *************** *** 2894,2898 **** sepNavIntBoundsRect = "{{0, 0}, {506, 826}}"; sepNavSelRange = "{2738, 47}"; ! sepNavVisRect = "{{0, 655}, {435, 171}}"; sepNavWindowFrame = "{{176, 122}, {750, 558}}"; }; --- 2993,2997 ---- sepNavIntBoundsRect = "{{0, 0}, {506, 826}}"; sepNavSelRange = "{2738, 47}"; ! sepNavVisRect = "{{0, 641}, {435, 171}}"; sepNavWindowFrame = "{{176, 122}, {750, 558}}"; }; *************** *** 3027,3030 **** --- 3126,3203 ---- }; }; + 30D0C991083915C100AFB5E5 = { + fRef = 30C85EC6064647730016E5B3; + isa = PBXTextBookmark; + name = "- (NSString*) playerNameWithPointsForPosition;"; + rLen = 47; + rLoc = 2738; + rType = 0; + vrLen = 271; + vrLoc = 2631; + }; + 30D0C993083915C100AFB5E5 = { + fRef = 30C85EC6064647730016E5B3; + isa = PBXTextBookmark; + name = "- (NSString*) playerNameWithPointsForPosition;"; + rLen = 47; + rLoc = 2738; + rType = 0; + vrLen = 271; + vrLoc = 2631; + }; + 30D0C99C083915F700AFB5E5 = { + fRef = 8D1107310486CEB800E47090; + isa = PBXTextBookmark; + name = "Info.plist: 20"; + rLen = 0; + rLoc = 633; + rType = 0; + vrLen = 313; + vrLoc = 463; + }; + 30D0C99E083915F700AFB5E5 = { + fRef = 8D1107310486CEB800E47090; + isa = PBXTextBookmark; + name = "Info.plist: 20"; + rLen = 0; + rLoc = 633; + rType = 0; + vrLen = 313; + vrLoc = 463; + }; + 30D0C9A80839163F00AFB5E5 = { + fRef = 10A233D907327ECF007529F7; + isa = PBXBookmark; + }; + 30D0C9AE0839258600AFB5E5 = { + fRef = 30A438AE068C2923001BFB41; + isa = PBXTextBookmark; + name = "English: 144"; + rLen = 0; + rLoc = 4261; + rType = 0; + vrLen = 374; + vrLoc = 2552; + }; + 30D0C9AF0839258600AFB5E5 = { + fRef = 30A438AE068C2923001BFB41; + isa = PBXTextBookmark; + name = "English: 144"; + rLen = 0; + rLoc = 4261; + rType = 0; + vrLen = 374; + vrLoc = 2552; + }; + 30D0C9B30839258600AFB5E5 = { + fRef = 10A233D907327ECF007529F7; + isa = PBXTextBookmark; + name = "Toolbar.m: 115"; + rLen = 0; + rLoc = 5752; + rType = 0; + vrLen = 1202; + vrLoc = 3977; + }; 30D558120674F5590059F8D8 = { uiCtxt = { *************** *** 3173,3179 **** 30EC0BDF06425043008B3F6B = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1052, 3163}}"; ! sepNavSelRange = "{7738, 0}"; ! sepNavVisRect = "{{0, 2425}, {606, 359}}"; sepNavWindowFrame = "{{47, 125}, {1137, 638}}"; }; --- 3346,3352 ---- 30EC0BDF06425043008B3F6B = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {1092, 3164}}"; ! sepNavSelRange = "{8547, 0}"; ! sepNavVisRect = "{{0, 2631}, {1092, 533}}"; sepNavWindowFrame = "{{47, 125}, {1137, 638}}"; }; *************** *** 3203,3209 **** 8D1107310486CEB800E47090 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {686, 377}}"; sepNavSelRange = "{633, 0}"; ! sepNavVisRect = "{{0, 40}, {606, 326}}"; sepNavWindowFrame = "{{107, 201}, {750, 542}}"; }; --- 3376,3382 ---- 8D1107310486CEB800E47090 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {686, 378}}"; sepNavSelRange = "{633, 0}"; ! sepNavVisRect = "{{0, 189}, {435, 171}}"; sepNavWindowFrame = "{{107, 201}, {750, 542}}"; }; |
|
From: Geisschaes <gei...@us...> - 2005-05-20 18:31:11
|
Update of /cvsroot/macattrick/macattrick/doc/localization/german In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29929/doc/localization/german Modified Files: Localizable.strings Log Message: before release 0.6 Index: Localizable.strings =================================================================== RCS file: /cvsroot/macattrick/macattrick/doc/localization/german/Localizable.strings,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 Binary files /tmp/cvslet0HA and /tmp/cvsWK3in0 differ |
|
From: Geisschaes <gei...@us...> - 2005-05-17 01:36:22
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20595 Modified Files: Position.m PositionHeap.h PositionHeap.m Log Message: import bug fixed Index: Position.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Position.m,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Position.m 9 May 2005 19:48:49 -0000 1.11 --- Position.m 16 May 2005 13:31:58 -0000 1.12 *************** *** 34,37 **** --- 34,38 ---- @interface Position (Private) + - (void) setIdentifier: (NSString *) newIdentifier; - (void) setPlayerFormRate: (double) newPlayerFormRate; - (void) setExperienceRate: (double) newExperienceRate; *************** *** 86,90 **** NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSArray* array = [saveString componentsSeparatedByString:@"|"]; ! identifier = [array objectAtIndex:0]; [self setPlayerFormRate:[[array objectAtIndex:1]doubleValue]]; [self setExperienceRate:[[array objectAtIndex:2]doubleValue]]; --- 87,91 ---- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSArray* array = [saveString componentsSeparatedByString:@"|"]; ! [self setIdentifier: [array objectAtIndex:0]]; [self setPlayerFormRate:[[array objectAtIndex:1]doubleValue]]; [self setExperienceRate:[[array objectAtIndex:2]doubleValue]]; *************** *** 110,114 **** defenderRate: (double) newDefenderRate setPiecesRate: (double) newSetPiecesRate { self = [super init]; ! identifier = [newIdentifier copy]; staminaRate = newStaminaRate; keeperRate = newKeeperRate; --- 111,115 ---- defenderRate: (double) newDefenderRate setPiecesRate: (double) newSetPiecesRate { self = [super init]; ! [self setIdentifier: newIdentifier]; staminaRate = newStaminaRate; keeperRate = newKeeperRate; *************** *** 148,151 **** --- 149,159 ---- } + - (void) setIdentifier: (NSString *) newIdentifier { + [newIdentifier retain]; + [identifier release]; + identifier = newIdentifier; + } + + - (double) playerFormRate { return playerFormRate; } - (void) setPlayerFormRate: (double) newPlayerFormRate { *************** *** 428,432 **** - (void)dealloc { ! // [identifier release]; [super dealloc]; } --- 436,440 ---- - (void)dealloc { ! [identifier release]; [super dealloc]; } Index: PositionHeap.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PositionHeap.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PositionHeap.m 9 May 2005 19:48:49 -0000 1.3 --- PositionHeap.m 16 May 2005 13:31:58 -0000 1.4 *************** *** 62,66 **** NSString *value = [dic valueForKey:currentKey]; Position *newPosition = [[Position alloc] initFromSaveString:value]; ! [positionsDictionary setValue: newPosition forKey: currentKey]; [newPosition release]; } --- 62,66 ---- NSString *value = [dic valueForKey:currentKey]; Position *newPosition = [[Position alloc] initFromSaveString:value]; ! [positionsDictionary setObject: newPosition forKey:currentKey]; [newPosition release]; } *************** *** 196,200 **** } ! - savePositionsToUserDefaults { NSEnumerator *en = [positionsDictionary objectEnumerator]; Position *current; --- 196,200 ---- } ! - (void) savePositionsToUserDefaults { NSEnumerator *en = [positionsDictionary objectEnumerator]; Position *current; Index: PositionHeap.h =================================================================== RCS file: /cvsroot/macattrick/macattrick/PositionHeap.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PositionHeap.h 9 May 2005 19:48:49 -0000 1.3 --- PositionHeap.h 16 May 2005 13:31:58 -0000 1.4 *************** *** 56,60 **** - (void) setPosition: (Position*) position; ! - savePositionsToUserDefaults; - (void) saveToFile: (NSString *) filename; --- 56,60 ---- - (void) setPosition: (Position*) position; ! - (void) savePositionsToUserDefaults; - (void) saveToFile: (NSString *) filename; |
|
From: Geisschaes <gei...@us...> - 2005-05-17 01:09:01
|
Update of /cvsroot/macattrick/macattrick/Macattrick.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22466/Macattrick.xcode Modified Files: roman.mode1 roman.pbxuser Log Message: point are now diplayed in pop up buttons. implementational improvement of the lineup controller Index: roman.mode1 =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.mode1,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** roman.mode1 16 May 2005 14:26:58 -0000 1.33 --- roman.mode1 16 May 2005 15:43:36 -0000 1.34 *************** *** 205,213 **** <integer>0</integer> <key>bookmark</key> ! <string>3067B04B0838E12D0063180D</string> <key>history</key> <array> ! <string>3067B0460838E12D0063180D</string> ! <string>3067B03D0838E0600063180D</string> </array> <key>prevStack</key> --- 205,213 ---- <integer>0</integer> <key>bookmark</key> ! <string>3067B0B70838F6DA0063180D</string> <key>history</key> <array> ! <string>3067B0AD0838F5580063180D</string> ! <string>3067B0AE0838F5580063180D</string> </array> <key>prevStack</key> *************** *** 217,220 **** --- 217,232 ---- <string>3067B0490838E12D0063180D</string> <string>3067B04A0838E12D0063180D</string> + <string>3067B05C0838E92A0063180D</string> + <string>3067B05D0838E92A0063180D</string> + <string>3067B05E0838E92A0063180D</string> + <string>3067B0640838E9470063180D</string> + <string>3067B06D0838EAA10063180D</string> + <string>3067B06E0838EAA10063180D</string> + <string>3067B0830838F0600063180D</string> + <string>3067B0840838F0600063180D</string> + <string>3067B0850838F0600063180D</string> + <string>3067B08B0838F0B40063180D</string> + <string>3067B0AF0838F5580063180D</string> + <string>3067B0B00838F5580063180D</string> </array> </dict> *************** *** 228,236 **** <dict> <key>Frame</key> ! <string>{{0, 20}, {1043, 583}}</string> <key>PBXModuleWindowStatusBarHidden2</key> <false/> <key>RubberWindowFrame</key> ! <string>84 140 1043 624 0 0 1280 832 </string> </dict> </dict> --- 240,248 ---- <dict> <key>Frame</key> ! <string>{{0, 20}, {1196, 589}}</string> <key>PBXModuleWindowStatusBarHidden2</key> <false/> <key>RubberWindowFrame</key> ! <string>-2 130 1196 630 0 0 1280 832 </string> </dict> </dict> *************** *** 312,316 **** <array> <array> ! <integer>4</integer> <integer>0</integer> </array> --- 324,328 ---- <array> <array> ! <integer>3</integer> <integer>0</integer> </array> *************** *** 352,356 **** <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>PositionTest.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> --- 364,368 ---- <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>LineUpTreeNode.h</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> *************** *** 360,368 **** <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>PositionTest.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>3067B0440838E12D0063180D</string> <key>history</key> <array> --- 372,380 ---- <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> ! <string>LineUpTreeNode.h</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> ! <string>3067B0B60838F6DA0063180D</string> <key>history</key> <array> *************** *** 373,377 **** <string>3067AFF10838D3E00063180D</string> <string>3067B0140838D6FF0063180D</string> ! <string>3067B0150838D6FF0063180D</string> </array> <key>prevStack</key> --- 385,390 ---- <string>3067AFF10838D3E00063180D</string> <string>3067B0140838D6FF0063180D</string> ! <string>3067B0A90838F5580063180D</string> ! <string>3067B0AA0838F5580063180D</string> </array> <key>prevStack</key> *************** *** 386,389 **** --- 399,403 ---- <string>3067AFF30838D3E00063180D</string> <string>3067B0160838D6FF0063180D</string> + <string>3067B0AB0838F5580063180D</string> </array> </dict> *************** *** 586,593 **** <string>3067AFAB0838C99F0063180D</string> <string>1CD10A99069EF8BA00B06720</string> - <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> <string>30A82A48082E9E83003C97DB</string> ! <string>1C0AD2B3069F1EA900FABCE6</string> <string>3067B0360838D8EF0063180D</string> </array> <key>WindowString</key> --- 600,607 ---- <string>3067AFAB0838C99F0063180D</string> <string>1CD10A99069EF8BA00B06720</string> <string>30A82A48082E9E83003C97DB</string> ! <string>/Users/roman/Documents/dev/macattrick/Macattrick.xcode</string> <string>3067B0360838D8EF0063180D</string> + <string>1C0AD2B3069F1EA900FABCE6</string> </array> <key>WindowString</key> *************** *** 1014,1018 **** <string>{{0, 0}, {1095, 323}}</string> <key>RubberWindowFrame</key> ! <string>181 442 1095 364 0 0 1280 832 </string> </dict> <key>Module</key> --- 1028,1032 ---- <string>{{0, 0}, {1095, 323}}</string> <key>RubberWindowFrame</key> ! <string>240 227 1095 364 0 0 1280 832 </string> </dict> <key>Module</key> *************** *** 1044,1048 **** <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>181 442 1095 364 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> --- 1058,1062 ---- <string>xcode.toolbar.config.run</string> <key>WindowString</key> ! <string>240 227 1095 364 0 0 1280 832 </string> <key>WindowToolGUID</key> <string>1C0AD2B3069F1EA900FABCE6</string> Index: roman.pbxuser =================================================================== RCS file: /cvsroot/macattrick/macattrick/Macattrick.xcode/roman.pbxuser,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** roman.pbxuser 16 May 2005 14:26:59 -0000 1.98 --- roman.pbxuser 16 May 2005 15:43:36 -0000 1.99 *************** *** 1045,1114 **** 304255850837E2BB00DDF612 = 304255850837E2BB00DDF612; 304255860837E2BB00DDF612 = 304255860837E2BB00DDF612; - 304255870837E2BB00DDF612 = 304255870837E2BB00DDF612; - 304255880837E2BB00DDF612 = 304255880837E2BB00DDF612; - 304255890837E2BB00DDF612 = 304255890837E2BB00DDF612; - 3042558A0837E2BB00DDF612 = 3042558A0837E2BB00DDF612; - 3042558B0837E2BB00DDF612 = 3042558B0837E2BB00DDF612; - 3042558C0837E2BB00DDF612 = 3042558C0837E2BB00DDF612; - 3042558D0837E2BB00DDF612 = 3042558D0837E2BB00DDF612; - 3042558E0837E2BB00DDF612 = 3042558E0837E2BB00DDF612; [...1034 lines suppressed...] 30BEEAAE070B3A8B00AF64D8 = { uiCtxt = { --- 2859,2862 ---- *************** *** 3325,3331 **** 30C85EC6064647730016E5B3 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {765, 825}}"; sepNavSelRange = "{2738, 47}"; ! sepNavVisRect = "{{0, 438}, {765, 387}}"; sepNavWindowFrame = "{{176, 122}, {750, 558}}"; }; --- 2892,2898 ---- 30C85EC6064647730016E5B3 = { uiCtxt = { ! sepNavIntBoundsRect = "{{0, 0}, {506, 826}}"; sepNavSelRange = "{2738, 47}"; ! sepNavVisRect = "{{0, 655}, {435, 171}}"; sepNavWindowFrame = "{{176, 122}, {750, 558}}"; }; |