nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-14 12:52:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaner code

Browse Source
This commit is contained in:
Michael Starke
2018-08-27 12:13:15 +02:00
parent bc60ca0174
commit c74254f171
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
MacPass/MPTreeDelegate.m
View File

@@ -94,15 +94,12 @@
panel.contentViewController = pickFieldViewController; panel.contentViewController = pickFieldViewController;
panel.title = NSLocalizedString(@"PICKFIELD_WINDOW_TITLE", @"Window displayed to the user to pick an amout of characters"); panel.title = NSLocalizedString(@"PICKFIELD_WINDOW_TITLE", @"Window displayed to the user to pick an amout of characters");
[panel center]; [panel center];
if(NSModalResponseOK == [NSApp runModalForWindow:panel]) { NSModalResponse response = [NSApp runModalForWindow:panel];
/* add appropriate key press commands? or let the pick-char view-controller handel this? */ [panel orderOut:nil];
return pickFieldViewController.pickedValue; return (response == NSModalResponseOK) ? pickFieldViewController.pickedValue : @"";
}
return @"";
} }
- (NSString *)tree:(KPKTree *)tree resolvePickCharsPlaceholderForEntry:(KPKEntry *)entry field:(NSString *)field options:(NSString *)options { - (NSString *)tree:(KPKTree *)tree resolvePickCharsPlaceholderForEntry:(KPKEntry *)entry field:(NSString *)field options:(NSString *)options {
NSString *value = [[entry valueForAttributeWithKey:field] kpk_finalValueForEntry:entry]; NSString *value = [[entry valueForAttributeWithKey:field] kpk_finalValueForEntry:entry];
if(value.length == 0) { if(value.length == 0) {
return @""; // error while retrieving source value return @""; // error while retrieving source value
@@ -122,10 +119,8 @@
panel.contentViewController = pickCharViewController; panel.contentViewController = pickCharViewController;
panel.title = NSLocalizedString(@"PICKCHAR_WINDOW_TITLE", @"Window displayed to the user to pick an amout of characters"); panel.title = NSLocalizedString(@"PICKCHAR_WINDOW_TITLE", @"Window displayed to the user to pick an amout of characters");
[panel center]; [panel center];
if(NSModalResponseOK == [NSApp runModalForWindow:panel]) { NSModalResponse response = [NSApp runModalForWindow:panel];
/* add appropriate key press comamnds? or let the pick-char view-controller handel this? */ [panel orderOut:nil];
return pickCharViewController.pickedValue; return (response == NSModalResponseOK) ? pickCharViewController.pickedValue : @"";
}
return @"";
} }
@end @end