mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 06:51:44 +00:00
Using current url in open panel.
This commit is contained in:
parent
1f74bec01c
commit
3b7be08ade
2 changed files with 19 additions and 16 deletions
|
@ -72,9 +72,6 @@ extern "C" {
|
|||
- (void) setDraggingSourceOperationMask: (NSDragOperation)mask
|
||||
forLocal: (BOOL)local;
|
||||
|
||||
- (NSMenu *) menu;
|
||||
- (void) setMenu: (NSMenu *)menu;
|
||||
|
||||
- (NSArray *) allowedTypes;
|
||||
- (void) setAllowedTypes: (NSArray *)allowedTypes;
|
||||
|
||||
|
|
|
@ -85,7 +85,6 @@ Class pathCellClass;
|
|||
if (self != nil)
|
||||
{
|
||||
[self setPathStyle: NSPathStyleStandard];
|
||||
[self setPathComponentCells: nil];
|
||||
[self setURL: nil];
|
||||
[self setDelegate: nil];
|
||||
[self setAllowedTypes: [NSArray arrayWithObject: NSFilenamesPboardType]];
|
||||
|
@ -212,16 +211,6 @@ Class pathCellClass;
|
|||
}
|
||||
}
|
||||
|
||||
- (NSMenu *) menu
|
||||
{
|
||||
return [super menu];
|
||||
}
|
||||
|
||||
- (void) setMenu: (NSMenu *)menu
|
||||
{
|
||||
[super setMenu: menu];
|
||||
}
|
||||
|
||||
- (NSArray *) allowedTypes;
|
||||
{
|
||||
return [_cell allowedTypes];
|
||||
|
@ -303,6 +292,23 @@ Class pathCellClass;
|
|||
{
|
||||
NSOpenPanel *op = [NSOpenPanel openPanel];
|
||||
int result = 0;
|
||||
NSFileManager *fm = [NSFileManager defaultManager];
|
||||
BOOL isDir = NO;
|
||||
NSString *path = nil;
|
||||
NSString *file = nil;
|
||||
|
||||
[fm fileExistsAtPath: [[self URL] path]
|
||||
isDirectory: &isDir];
|
||||
|
||||
if (isDir)
|
||||
{
|
||||
path = [[self URL] path];
|
||||
}
|
||||
else
|
||||
{
|
||||
path = [[[self URL] path] stringByDeletingLastPathComponent];
|
||||
file = [[[self URL] path] lastPathComponent];
|
||||
}
|
||||
|
||||
[op setAllowsMultipleSelection: NO];
|
||||
[op setCanChooseFiles: YES];
|
||||
|
@ -320,8 +326,8 @@ Class pathCellClass;
|
|||
willDisplayOpenPanel: op];
|
||||
}
|
||||
|
||||
result = [op runModalForDirectory: nil
|
||||
file: nil
|
||||
result = [op runModalForDirectory: path
|
||||
file: file
|
||||
types: nil];
|
||||
if (result == NSOKButton)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue