ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cocoa Port: 

- Do a major revamp of the File Migration Assistant. It has been renamed "Game Data Migration Assistant". All following notes will pertain to the new Game Data Migration Assistant.
- Files no longer appear in a single list. They are now organized by app version and file type.
- Users can now select multiple files at once by clicking the checkbox of their corresponding app version or file type.
- File selection is much smarter. If the same file exists in multiple versions, then if the user selects one version of a file, all other versions of that same file are automatically deselected. This also works in multiple selection cases.
- Remove the Select All and Select None buttons. With the smarter selection UI, these buttons are no longer necessary.
- Provide better user feedback when no files need to be migrated.
- Rework the outline view to be more space efficient.
This commit is contained in:
rogerman 2015-02-18 05:48:25 +00:00
parent 634d1ba89b
commit 06ece0cb07
6 changed files with 60639 additions and 60535 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
desmume/src/cocoa/cocoa_file.h
View File

@ -70,9 +70,6 @@
#if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4
+ (BOOL) moveFileToCurrentDirectory:(NSURL *)fileURL;
+ (BOOL) copyFileToCurrentDirectory:(NSURL *)fileURL;
+ (BOOL) moveFileListToCurrent:(NSMutableArray *)fileList;
+ (BOOL) copyFileListToCurrent:(NSMutableArray *)fileList;
+ (NSMutableArray *) completeFileList;
+ (NSMutableArray *) appFileList:(NSURL *)directoryURL;
+ (NSMutableArray *) appFileList:(NSURL *)directoryURL fileKind:(NSString *)theFileKind;
#endif

95
desmume/src/cocoa/cocoa_file.mm
View File

@ -1,6 +1,6 @@
/*
Copyright (C) 2011 Roger Manuel
Copyright (C) 2012 DeSmuME team
Copyright (C) 2012-2015 DeSmuME team
This file is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -1183,97 +1183,6 @@ static NSMutableDictionary *_gURLDictionary = nil;
return result;
}
+ (BOOL) moveFileListToCurrent:(NSMutableArray *)fileList
{
BOOL result = NO;
if (fileList == nil)
{
return result;
}
for (NSDictionary *fileDict in fileList)
{
BOOL willMigrate = [[fileDict valueForKey:@"willMigrate"] boolValue];
if (!willMigrate)
{
continue;
}
NSURL *fileURL = [NSURL URLWithString:[fileDict valueForKey:@"URL"]];
[CocoaDSFile moveFileToCurrentDirectory:fileURL];
}
result = YES;
return result;
}
+ (BOOL) copyFileListToCurrent:(NSMutableArray *)fileList
{
BOOL result = NO;
if (fileList == nil)
{
return result;
}
for (NSDictionary *fileDict in fileList)
{
BOOL willMigrate = [[fileDict valueForKey:@"willMigrate"] boolValue];
if (!willMigrate)
{
continue;
}
NSURL *fileURL = [NSURL URLWithString:[fileDict valueForKey:@"URL"]];
[CocoaDSFile copyFileToCurrentDirectory:fileURL];
}
result = YES;
return result;
}
+ (NSMutableArray *) completeFileList
{
NSMutableArray *fileList = [NSMutableArray arrayWithCapacity:100];
if (fileList == nil)
{
return fileList;
}
NSString *currentVersion = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"];
NSDictionary *fileTypeInfoRootDict = [NSDictionary dictionaryWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"FileTypeInfo" ofType:@"plist"]];
NSArray *versionList = [fileTypeInfoRootDict valueForKey:@"VersionStrings"];
NSDictionary *filePathsDict = (NSDictionary *)[fileTypeInfoRootDict valueForKey:@"DefaultPaths"];
for (NSString *versionKey in versionList)
{
if ([currentVersion isEqualToString:versionKey])
{
continue;
}
NSDictionary *versionDict = (NSDictionary *)[filePathsDict valueForKey:versionKey];
NSArray *portArray = [versionDict allKeys];
for (NSString *portKey in portArray)
{
NSDictionary *portDict = (NSDictionary *)[versionDict valueForKey:portKey];
NSArray *fileKindList = [portDict allKeys];
for (NSString *fileKind in fileKindList)
{
NSURL *dirURL = [CocoaDSFile directoryURLByKind:fileKind version:versionKey port:portKey];
[fileList addObjectsFromArray:[CocoaDSFile appFileList:dirURL fileKind:fileKind]];
}
}
}
return fileList;
}
+ (NSMutableArray *) appFileList:(NSURL *)directoryURL
{
return [self appFileList:directoryURL fileKind:nil];
@ -1308,7 +1217,7 @@ static NSMutableDictionary *_gURLDictionary = nil;
for (NSString *fileName in fileList)
{
NSNumber *willMigrate = [NSNumber numberWithBool:YES];
NSNumber *willMigrate = [NSNumber numberWithBool:NO];
NSString *filePath = [directoryPath stringByAppendingPathComponent:fileName];
NSURL *fileURL = [NSURL fileURLWithPath:filePath];
NSString *fileVersion = [CocoaDSFile fileVersionByURL:fileURL];

BIN
desmume/src/cocoa/translations/English.lproj/MainMenu.strings
View File

Binary file not shown.

120633
desmume/src/cocoa/translations/English.lproj/MainMenu.xib
View File

File diff suppressed because it is too large Load Diff

15
desmume/src/cocoa/userinterface/FileMigrationDelegate.h
View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2013 DeSmuME team
Copyright (C) 2013-2015 DeSmuME team
This file is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -25,24 +25,27 @@
{
NSObject *dummyObject;
NSWindow *window;
NSArrayController *fileListController;
NSOutlineView *fileTreeOutlineView;
NSArray *_versionList;
NSMutableDictionary *_portStringsDict;
//NSMutableDictionary *_fileTree;
NSMutableDictionary *_fileTree;
NSMutableDictionary *_fileTreeSelection;
NSMutableArray *_fileTreeVersionList;
BOOL filesPresent;
}
@property (readonly) IBOutlet NSObject *dummyObject;
@property (readonly) IBOutlet NSWindow *window;
@property (readonly) IBOutlet NSArrayController *fileListController;
@property (readonly) IBOutlet NSOutlineView *fileTreeOutlineView;
@property (assign) BOOL filesPresent;
- (void) updateFileList;
- (void) setFileSelectionInOutlineView:(NSOutlineView *)outlineView file:(NSMutableDictionary *)fileItem isSelected:(BOOL)isSelected;
- (void) moveSelectedFilesToCurrent;
- (void) copySelectedFilesToCurrent;
- (IBAction) updateAndShowWindow:(id)sender;
- (IBAction) handleChoice:(id)sender;
- (IBAction) selectAll:(id)sender;
- (IBAction) selectNone:(id)sender;
@end

428
desmume/src/cocoa/userinterface/FileMigrationDelegate.mm
View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2013 DeSmuME team
Copyright (C) 2013-2015 DeSmuME team
This file is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -23,7 +23,7 @@
@synthesize dummyObject;
@synthesize window;
@synthesize fileListController;
@synthesize fileTreeOutlineView;
@synthesize filesPresent;
- (id)init
@ -53,7 +53,9 @@
[_portStringsDict setObject:newPortStringsList forKey:versionKey];
}
//_fileTree = [[NSMutableDictionary alloc] initWithCapacity:100];
_fileTree = [[NSMutableDictionary alloc] initWithCapacity:100];
_fileTreeSelection = [[NSMutableDictionary alloc] initWithCapacity:1024];
_fileTreeVersionList = [[NSMutableArray alloc] initWithCapacity:[_versionList count] * [_portStringsDict count]];
filesPresent = NO;
@ -64,28 +66,22 @@
{
[_versionList release];
[_portStringsDict release];
//[_fileTree release];
[_fileTree release];
[_fileTreeSelection release];
[_fileTreeVersionList release];
[super dealloc];
}
- (void) updateFileList
{
NSMutableArray *fileList = [CocoaDSFile completeFileList];
if (fileList != nil)
{
[self setFilesPresent:([fileList count] == 0) ? NO : YES];
}
[fileListController setContent:fileList];
// Refresh the file tree.
/*
NSDictionary *fileTypeInfoRootDict = [NSDictionary dictionaryWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"FileTypeInfo" ofType:@"plist"]];
NSDictionary *defaultPaths = (NSDictionary *)[fileTypeInfoRootDict valueForKey:@"DefaultPaths"];
NSFileManager *fileManager = [[NSFileManager alloc] init];
[_fileTree removeAllObjects];
[_fileTreeSelection removeAllObjects];
[_fileTreeVersionList removeAllObjects];
for (NSString *versionKey in _versionList)
{
@ -95,8 +91,6 @@
continue;
}
NSMutableDictionary *newVersionTree = [NSMutableDictionary dictionaryWithCapacity:[portStringsList count]];
for (NSString *portKey in portStringsList)
{
NSDictionary *pathsDict = (NSDictionary *)[(NSDictionary *)[defaultPaths valueForKey:versionKey] valueForKey:portKey];
@ -105,27 +99,122 @@
continue;
}
NSMutableArray *newPortTree = [NSMutableArray arrayWithCapacity:128];
NSMutableDictionary *newVersionTree = [NSMutableDictionary dictionaryWithCapacity:[pathsDict count]];
for (NSString *pathKey in pathsDict)
for (NSString *kindKey in pathsDict)
{
NSString *pathString = (NSString *)[pathsDict valueForKey:pathKey];
NSArray *fileList = [fileManager contentsOfDirectoryAtPath:pathString error:nil];
NSMutableArray *fileList = [NSMutableArray arrayWithCapacity:128];
NSURL *pathURL = [CocoaDSFile directoryURLByKind:kindKey version:versionKey port:portKey];
[fileList addObjectsFromArray:[CocoaDSFile appFileList:pathURL fileKind:kindKey]];
for (NSString *filePath in fileList)
if ([fileList count] > 0)
{
[newPortTree addObject:[NSMutableDictionary dictionaryWithObject:filePath forKey:@"FileName"]];
[newVersionTree setObject:fileList forKey:kindKey];
}
}
[newVersionTree setObject:newPortTree forKey:portKey];
if ([newVersionTree count] > 0)
{
NSString *versionAndPortKey = [NSString stringWithFormat:@"%@ %@", versionKey, portKey];
[_fileTree setObject:newVersionTree forKey:versionAndPortKey];
[_fileTreeVersionList addObject:versionAndPortKey];
}
}
[_fileTree setObject:newVersionTree forKey:versionKey];
}
[fileManager release];
*/
[self setFilesPresent:([_fileTree count] > 0)];
NSButton *closeButton = [[self window] standardWindowButton:NSWindowCloseButton];
[closeButton setEnabled:![self filesPresent]];
[fileTreeOutlineView reloadItem:nil reloadChildren:YES];
}
- (void) setFileSelectionInOutlineView:(NSOutlineView *)outlineView file:(NSMutableDictionary *)fileItem isSelected:(BOOL)isSelected
{
[fileItem setValue:[NSNumber numberWithBool:isSelected] forKey:@"willMigrate"];
NSString *fileName = (NSString *)[fileItem objectForKey:@"name"];
if (isSelected)
{
NSMutableDictionary *oldSelection = (NSMutableDictionary *)[_fileTreeSelection objectForKey:fileName];
if (oldSelection != nil && oldSelection != fileItem)
{
[oldSelection setValue:[NSNumber numberWithBool:NO] forKey:@"willMigrate"];
[outlineView reloadItem:oldSelection];
[outlineView reloadItem:[outlineView parentForItem:oldSelection]];
[outlineView reloadItem:[outlineView parentForItem:[outlineView parentForItem:oldSelection]]];
}
[_fileTreeSelection setValue:fileItem forKey:fileName];
}
else
{
[_fileTreeSelection removeObjectForKey:fileName];
}
}
+ (NSMutableDictionary *) fileItemFromURL:(NSURL *)fileURL fileManager:(NSFileManager *)fileManager
{
if (fileURL == nil || fileManager == nil)
{
return nil;
}
NSNumber *willMigrate = [NSNumber numberWithBool:YES];
NSString *filePath = [fileURL path];
NSString *fileName = [filePath lastPathComponent];
NSString *fileVersion = [CocoaDSFile fileVersionByURL:fileURL];
NSString *fileKind = [CocoaDSFile fileKindByURL:fileURL];
NSDictionary *fileAttributes = [fileManager attributesOfItemAtPath:filePath error:nil];
return [NSMutableDictionary dictionaryWithObjectsAndKeys:
willMigrate, @"willMigrate",
fileName, @"name",
fileVersion, @"version",
fileKind, @"kind",
[fileAttributes fileModificationDate], @"dateModified",
[fileURL absoluteString], @"URL",
nil];
}
- (void) moveSelectedFilesToCurrent
{
NSArray *fileList = [_fileTreeSelection allKeys];
for (NSString *fileName in fileList)
{
NSDictionary *fileItem = (NSDictionary *)[_fileTreeSelection objectForKey:fileName];
const BOOL willMigrate = [[fileItem valueForKey:@"willMigrate"] boolValue];
if (!willMigrate)
{
continue;
}
NSURL *fileURL = [NSURL URLWithString:[fileItem valueForKey:@"URL"]];
[CocoaDSFile moveFileToCurrentDirectory:fileURL];
}
}
- (void) copySelectedFilesToCurrent
{
NSArray *fileList = [_fileTreeSelection allKeys];
for (NSString *fileName in fileList)
{
NSDictionary *fileItem = (NSDictionary *)[_fileTreeSelection objectForKey:fileName];
const BOOL willMigrate = [[fileItem valueForKey:@"willMigrate"] boolValue];
if (!willMigrate)
{
continue;
}
NSURL *fileURL = [NSURL URLWithString:[fileItem valueForKey:@"URL"]];
[CocoaDSFile copyFileToCurrentDirectory:fileURL];
}
}
#pragma mark NSOutlineViewDelegate Protocol
@ -137,7 +226,7 @@
- (BOOL)outlineView:(NSOutlineView *)outlineView shouldTrackCell:(NSCell *)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
{
if ([(NSString *)[tableColumn identifier] isEqualToString:@"FileWillMigrateColumn"])
if ([(NSString *)[tableColumn identifier] isEqualToString:@"FileNameColumn"])
{
return YES;
}
@ -152,13 +241,28 @@
if ([columnID isEqualToString:@"FileNameColumn"])
{
NSFont *newFont = [[NSFontManager sharedFontManager] fontWithFamily:[[outCell font] familyName]
traits:([item isKindOfClass:[NSString class]]) ? NSBoldFontMask : 0
weight:5
size:[[outCell font] pointSize]];
[outCell setFont:newFont];
if ([item isKindOfClass:[NSString class]])
{
NSFont *newFont = [[NSFontManager sharedFontManager] fontWithFamily:[[outCell font] familyName]
traits:NSBoldFontMask
weight:0
size:[[outCell font] pointSize]];
[outCell setFont:newFont];
[outCell setTitle:(NSString *)item];
[outCell setAllowsMixedState:YES];
}
else if ([item isKindOfClass:[NSArray class]])
{
NSString *parentItem = [outlineView parentForItem:item];
NSArray *allKeys = [(NSDictionary *)[_fileTree objectForKey:parentItem] allKeysForObject:item];
[outCell setTitle:(NSString *)[allKeys objectAtIndex:0]];
[outCell setAllowsMixedState:YES];
}
else if ([item isKindOfClass:[NSDictionary class]])
{
[outCell setTitle:(NSString *)[(NSDictionary *)item objectForKey:@"name"]];
[outCell setAllowsMixedState:NO];
}
}
@ -170,20 +274,16 @@
{
if (item == nil)
{
return [_versionList objectAtIndex:index];
return [_fileTreeVersionList objectAtIndex:index];
}
else if ([item isKindOfClass:[NSString class]])
{
if ([_versionList containsObject:item])
{
return [(NSArray *)[_portStringsDict valueForKey:item] objectAtIndex:index];
}
else
{
NSString *versionKey = (NSString *)[outlineView parentForItem:item];
//return [(NSArray *)[(NSDictionary *)[_fileTree valueForKey:versionKey] valueForKey:item] objectAtIndex:index];
return nil;
}
NSArray *versionKeys = [(NSDictionary *)[_fileTree objectForKey:(NSString *)item] allKeys];
return [(NSDictionary *)[_fileTree objectForKey:(NSString *)item] objectForKey:[versionKeys objectAtIndex:index]];
}
else if ([item isKindOfClass:[NSArray class]])
{
return [(NSArray *)item objectAtIndex:index];
}
return nil;
@ -191,7 +291,7 @@
- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item
{
if ([item isKindOfClass:[NSString class]])
if ([item isKindOfClass:[NSString class]] || [item isKindOfClass:[NSArray class]])
{
return YES;
}
@ -205,20 +305,15 @@
if (item == nil)
{
numberChildren = [_versionList count];
numberChildren = [_fileTreeVersionList count];
}
else if ([item isKindOfClass:[NSString class]])
{
if ([_versionList containsObject:item])
{
return [[_portStringsDict valueForKey:item] count];
}
else
{
NSString *versionKey = (NSString *)[outlineView parentForItem:item];
//return [(NSArray *)[(NSDictionary *)[_fileTree valueForKey:versionKey] valueForKey:item] count];
return 0;
}
numberChildren = [(NSDictionary *)[_fileTree objectForKey:(NSString *)item] count];
}
else if ([item isKindOfClass:[NSArray class]])
{
numberChildren = [(NSArray *)item count];
}
return numberChildren;
@ -228,20 +323,108 @@
{
NSString *columnID = (NSString *)[tableColumn identifier];
if ([columnID isEqualToString:@"FileWillMigrateColumn"])
{
return nil;
}
else if ([columnID isEqualToString:@"FileNameColumn"])
if ([columnID isEqualToString:@"FileNameColumn"])
{
if ([item isKindOfClass:[NSString class]])
{
return item;
NSString *parentKey = [outlineView parentForItem:item];
if (parentKey == nil)
{
NSDictionary *versionDict = (NSDictionary *)[_fileTree objectForKey:(NSString *)item];
NSArray *kindKeyList = [versionDict allKeys];
NSUInteger kindCount = [kindKeyList count];
NSUInteger willMigrateKindCount = 0;
for (NSString *kindKey in kindKeyList)
{
NSArray *fileList = (NSArray *)[versionDict objectForKey:kindKey];
NSUInteger fileCount = [fileList count];
NSUInteger willMigrateFileCount = 0;
for (NSDictionary *fileAttr in fileList)
{
if ([(NSNumber *)[fileAttr objectForKey:@"willMigrate"] boolValue])
{
willMigrateFileCount++;
}
else
{
if (willMigrateFileCount > 0)
{
return [NSNumber numberWithInteger:NSMixedState];
}
}
}
if (willMigrateFileCount == 0)
{
if (willMigrateKindCount > 0)
{
return [NSNumber numberWithInteger:NSMixedState];
}
}
else if (willMigrateFileCount == fileCount)
{
willMigrateKindCount++;
}
else
{
return [NSNumber numberWithInteger:NSMixedState];
}
}
if (willMigrateKindCount == 0)
{
return [NSNumber numberWithInteger:NSOffState];
}
else if (willMigrateKindCount == kindCount)
{
return [NSNumber numberWithInteger:NSOnState];
}
else
{
return [NSNumber numberWithInteger:NSMixedState];
}
}
}
else if ([item isKindOfClass:[NSArray class]])
{
NSArray *fileList = (NSArray *)item;
NSUInteger fileCount = [fileList count];
NSUInteger willMigrateFileCount = 0;
for (NSDictionary *fileAttr in fileList)
{
if ([(NSNumber *)[fileAttr objectForKey:@"willMigrate"] boolValue])
{
willMigrateFileCount++;
}
else
{
if (willMigrateFileCount > 0)
{
return [NSNumber numberWithInteger:NSMixedState];
}
}
}
if (willMigrateFileCount == 0)
{
return [NSNumber numberWithInteger:NSOffState];
}
else if (willMigrateFileCount == fileCount)
{
return [NSNumber numberWithInteger:NSOnState];
}
else
{
return [NSNumber numberWithInteger:NSMixedState];
}
}
else if ([item isKindOfClass:[NSDictionary class]])
{
NSString *fileName = [item valueForKey:@"FileName"];
return (fileName != nil) ? fileName : @"";
return [(NSDictionary *)item objectForKey:@"willMigrate"];
}
else
{
@ -250,13 +433,9 @@
}
else if ([columnID isEqualToString:@"FileKindColumn"])
{
if ([item isKindOfClass:[NSString class]])
if ([item isKindOfClass:[NSDictionary class]])
{
return @"";
}
else if ([item isKindOfClass:[NSDictionary class]])
{
return @"";
return [(NSDictionary *)item objectForKey:@"kind"];
}
else
{
@ -265,13 +444,9 @@
}
else if ([columnID isEqualToString:@"FileDateModifiedColumn"])
{
if ([item isKindOfClass:[NSString class]])
if ([item isKindOfClass:[NSDictionary class]])
{
return @"";
}
else if ([item isKindOfClass:[NSDictionary class]])
{
return @"";
return [(NSDictionary *)item objectForKey:@"dateModified"];
}
else
{
@ -282,6 +457,84 @@
return item;
}
- (void)outlineView:(NSOutlineView *)outlineView setObjectValue:(id)object forTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
{
NSString *columnID = (NSString *)[tableColumn identifier];
NSCell *itemCell = [tableColumn dataCellForRow:[outlineView rowForItem:item]];
if ([columnID isEqualToString:@"FileNameColumn"])
{
if ([item isKindOfClass:[NSString class]])
{
NSMutableDictionary *versionDict = (NSMutableDictionary *)[_fileTree objectForKey:(NSString *)item];
const BOOL newSelectState = !([itemCell state] == NSOnState);
for (NSString *kindKey in versionDict)
{
NSArray *fileList = (NSArray *)[versionDict objectForKey:kindKey];
if ([outlineView isItemExpanded:item])
{
if ([outlineView isItemExpanded:fileList])
{
for (NSMutableDictionary *fileAttr in fileList)
{
[self setFileSelectionInOutlineView:outlineView file:fileAttr isSelected:newSelectState];
[outlineView reloadItem:fileAttr];
}
}
else
{
for (NSMutableDictionary *fileAttr in fileList)
{
[self setFileSelectionInOutlineView:outlineView file:fileAttr isSelected:newSelectState];
}
}
[outlineView reloadItem:fileList];
}
else
{
for (NSMutableDictionary *fileAttr in fileList)
{
[self setFileSelectionInOutlineView:outlineView file:fileAttr isSelected:newSelectState];
}
}
}
}
else if ([item isKindOfClass:[NSArray class]])
{
const BOOL newSelectState = !([itemCell state] == NSOnState);
NSArray *fileList = (NSArray *)item;
if ([outlineView isItemExpanded:item])
{
for (NSMutableDictionary *fileAttr in fileList)
{
[self setFileSelectionInOutlineView:outlineView file:fileAttr isSelected:newSelectState];
[outlineView reloadItem:fileAttr];
}
}
else
{
for (NSMutableDictionary *fileAttr in fileList)
{
[self setFileSelectionInOutlineView:outlineView file:fileAttr isSelected:newSelectState];
}
}
[outlineView reloadItem:[outlineView parentForItem:item]];
}
else if ([item isKindOfClass:[NSDictionary class]])
{
const BOOL newSelectState = !([itemCell state] == NSOnState);
[self setFileSelectionInOutlineView:outlineView file:(NSMutableDictionary *)item isSelected:newSelectState];
[outlineView reloadItem:[outlineView parentForItem:item]];
[outlineView reloadItem:[outlineView parentForItem:[outlineView parentForItem:item]]];
}
}
}
#pragma mark IBActions
- (IBAction) updateAndShowWindow:(id)sender
@ -294,16 +547,15 @@
- (IBAction) handleChoice:(id)sender
{
const NSInteger option = [(NSControl *)sender tag];
NSMutableArray *fileList = [fileListController content];
switch (option)
{
case COCOA_DIALOG_DEFAULT:
[CocoaDSFile copyFileListToCurrent:fileList];
[self copySelectedFilesToCurrent];
break;
case COCOA_DIALOG_OPTION:
[CocoaDSFile moveFileListToCurrent:fileList];
[self moveSelectedFilesToCurrent];
break;
default:
@ -313,24 +565,4 @@
[[(NSControl *)sender window] close];
}
- (IBAction) selectAll:(id)sender
{
NSMutableArray *fileList = [fileListController content];
for (NSMutableDictionary *fileAttr in fileList)
{
[fileAttr setValue:[NSNumber numberWithBool:YES] forKey:@"willMigrate"];
}
}
- (IBAction) selectNone:(id)sender
{
NSMutableArray *fileList = [fileListController content];
for (NSMutableDictionary *fileAttr in fileList)
{
[fileAttr setValue:[NSNumber numberWithBool:NO] forKey:@"willMigrate"];
}
}
@end