gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 12:00:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSOpenPanel.m: Rewrite/simplify selection handling,

Browse source 
fix bug reported by Riccardo where OK button is disabled when
selecting directories after selecting a file.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@34480 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Eric Wasylishen 2012-01-10 18:42:04 +00:00
parent bfd7621ba5
commit f2fe6fead5
2 changed files with 32 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2012-01-10 Eric Wasylishen <ewasylishen@gmail.com>
* Source/NSOpenPanel.m: Rewrite/simplify selection handling,
fix bug reported by Riccardo where OK button is disabled when
selecting directories after selecting a file.
2012-01-10 Eric Wasylishen <ewasylishen@gmail.com>
* Source/GSGhostscriptImageRep.m: Add missing ASSIGN

99
Source/NSOpenPanel.m
View file

@ -113,87 +113,40 @@ static NSOpenPanel *_gs_gui_open_panel = nil;
if (column == -1)
return;
if (_delegateHasSelectionDidChange)
{
[_delegate panelSelectionDidChange: self];
}
matrix = [_browser matrixInColumn: column];
if ([_browser allowsMultipleSelection])
// Validate selection
BOOL selectionValid = YES;
NSArray *selectedCells = [matrix selectedCells];
NSEnumerator *e = [selectedCells objectEnumerator];
id o;
while ((o = [e nextObject]) != nil)
{
NSArray *selectedCells;
selectedCells = [matrix selectedCells];
if ([selectedCells count] <= 1)
if ((![o isLeaf] && !_canChooseDirectories) ||
([o isLeaf] && !_canChooseFiles))
{
if (_canChooseDirectories == NO ||
[[matrix selectedCell] isLeaf] == YES)
[super _selectTextInColumn: column];
else
[self _selectCellName: [[_form cellAtIndex: 0] stringValue]];
}
else
{
[_form abortEditing];
[[_form cellAtIndex: 0] setStringValue: @""];
[_form setNeedsDisplay: YES];
[_okButton setEnabled: YES];
selectionValid = NO;
}
}
[_okButton setEnabled: selectionValid];
// Set form label
if ([selectedCells count] > 1)
{
[[_form cellAtIndex: 0] setStringValue: @""];
}
else
{
if (_canChooseDirectories == NO || [[matrix selectedCell] isLeaf] == YES)
[super _selectTextInColumn: column];
else
[self _selectCellName: [[_form cellAtIndex: 0] stringValue]];
}
}
- (void) _selectCellName: (NSString *)title
{
NSString *cellString;
NSArray *cells;
NSMatrix *matrix;
NSComparisonResult result;
NSRange range;
int i, titleLength, cellLength, numberOfCells;
matrix = [_browser matrixInColumn: [_browser lastColumn]];
if ([matrix selectedCell])
return;
titleLength = [title length];
if (!titleLength)
{
[_okButton setEnabled: _canChooseDirectories];
return;
}
range.location = 0;
range.length = titleLength;
cells = [matrix cells];
numberOfCells = [cells count];
for (i = 0; i < numberOfCells; i++)
{
cellString = [[matrix cellAtRow: i column: 0] stringValue];
cellLength = [cellString length];
if (cellLength < titleLength)
continue;
result = [self _compareFilename: [cellString substringWithRange: range]
with: title];
if (result == NSOrderedSame)
{
[matrix selectCellAtRow: i column: 0];
[matrix scrollCellToVisibleAtRow: i column: 0];
[_okButton setEnabled: YES];
return;
}
else if (result == NSOrderedDescending)
break;
}
[_okButton setEnabled: NO];
[[_form cellAtIndex: 0] setStringValue: [[matrix selectedCell] stringValue]];
}
}
- (void) _setupForDirectory: (NSString *)path file: (NSString *)filename