[Macattrick-commit] macattrick PlayerList.h,1.12,1.13 PlayerList.m,1.14,1.15 PlayerListsViewController.h,1.2,1.3

[Geisschaes <gei...@us...>]

Update of /cvsroot/macattrick/macattrick
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30199

Modified Files:
	PlayerList.h PlayerList.m PlayerListsViewController.h 
Log Message:
player images added

Index: PlayerList.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/PlayerList.m,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** PlayerList.m	20 Jul 2005 19:30:58 -0000	1.14
--- PlayerList.m	14 Sep 2005 16:20:08 -0000	1.15
***************
*** 41,51 ****
  
  -(PlayerList*) init {
! 	self = [super init];
! 	if(self) {
! 		playerList = [[NSMutableArray alloc] init];
! 		formerDates = [[NSMutableArray alloc] init];
! 		[self setListName:NSLocalizedString(@"New List", @"New List")];		
! 	}
! 	return self;
  }
  -(PlayerList*) initWithListName:(NSString*) aListName {
--- 41,46 ----
  
  -(PlayerList*) init {
! 	self = [[PlayerList alloc] initWithListName:@"New List"];	
!     return self;
  }
  -(PlayerList*) initWithListName:(NSString*) aListName {
***************
*** 55,58 ****
--- 50,56 ----
  		formerDates = [[NSMutableArray alloc] init];
  		[self setListName:aListName];		
+         NSImage *img = [[NSImage alloc] initByReferencingFile: [NSString stringWithFormat: @"%@/customlist.icns",[[NSBundle mainBundle] resourcePath]]];
+         [self setListImage:img];
+         [img release];
  	}
  	return self;   
***************
*** 82,85 ****
--- 80,87 ----
  		}
  		[self setListName:NSLocalizedString(@"Team", @"Team")];
+         NSImage *img = [[NSImage alloc] initByReferencingFile: [NSString stringWithFormat: @"%@/alllist.icns",[[NSBundle mainBundle] resourcePath]]];
+         [self setListImage:img];
+         [img release];
+         
  	}
  	return self;
***************
*** 87,90 ****
--- 89,93 ----
  
  
+ 
  -(NSString*) playerIDsAsString {
      NSMutableString *str = [[NSMutableString alloc] init];
***************
*** 130,133 ****
--- 133,145 ----
  }
  
+ 
+ - (NSImage *) listImage { return listImage; }
+ - (void) setListImage: (NSImage *) newListImage {
+     [newListImage retain];
+     [listImage release];
+     listImage = newListImage;
+ }
+ 
+ 
  - (BOOL) addPlayersWithIDs: (NSArray*) ids {
      PlayerList *mainList = [[Team currentTeam] allPlayersList];

Index: PlayerListsViewController.h
===================================================================
RCS file: /cvsroot/macattrick/macattrick/PlayerListsViewController.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PlayerListsViewController.h	19 Jul 2005 17:58:57 -0000	1.2
--- PlayerListsViewController.h	14 Sep 2005 16:20:08 -0000	1.3
***************
*** 30,34 ****
  
  @interface PlayerListsViewController : NSObject {
! //	NSMutableArray *playerLists;
  	IBOutlet NSView *playerListsView;
  	IBOutlet NSTableView *tableView;
--- 30,34 ----
  
  @interface PlayerListsViewController : NSObject {
! //	NSMutableArray *playerLists; managed by team
  	IBOutlet NSView *playerListsView;
  	IBOutlet NSTableView *tableView;

Index: PlayerList.h
===================================================================
RCS file: /cvsroot/macattrick/macattrick/PlayerList.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** PlayerList.h	20 Jul 2005 19:30:57 -0000	1.12
--- PlayerList.h	14 Sep 2005 16:20:08 -0000	1.13
***************
*** 38,41 ****
--- 38,42 ----
  @interface PlayerList : NSObject {
  	NSString *listName;
+     NSImage *listImage;
  	
  	NSMutableArray* playerList;
***************
*** 71,74 ****
--- 72,78 ----
  - (NSString *) listName;
  - (void) setListName: (NSString *) newListName;
+ - (NSImage *) listImage;
+ - (void) setListImage: (NSImage *) newListImage;
+ 
  
  /*!
***************
*** 135,137 ****
--- 139,142 ----
  - (BOOL) removePlayerWithID: (int) aPlayerID;
  - (BOOL) removePlayers: (NSArray*) players;
+ 
  @end