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

Using properties where possible

Browse Source
This commit is contained in:
Michael Starke
2018-08-30 21:38:42 +02:00
parent 0274b32356
commit c46a7c0dc7
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MacPass/MPAddEntryContextMenuDelegate.m
View File

@@ -37,17 +37,14 @@
It's possible nicer to cache the entries and just update It's possible nicer to cache the entries and just update
the menu entries, that actually need updating the menu entries, that actually need updating
*/ */
MPDocument *document = [[NSDocumentController sharedDocumentController] currentDocument]; MPDocument *document = NSDocumentController.sharedDocumentController.currentDocument;
if(!document) {
[menu removeAllItems];
}
[menu removeAllItems]; [menu removeAllItems];
[menu addItemWithTitle:NSLocalizedString(@"EDIT_TEMPLATE_GROUP", "Menu item on the add entry context menu to edit template groups") action:[MPActionHelper actionOfType:MPActionEditTemplateGroup] keyEquivalent:@""]; [menu addItemWithTitle:NSLocalizedString(@"EDIT_TEMPLATE_GROUP", "Menu item on the add entry context menu to edit template groups") action:[MPActionHelper actionOfType:MPActionEditTemplateGroup] keyEquivalent:@""];
[menu addItem:[NSMenuItem separatorItem]]; [menu addItem:[NSMenuItem separatorItem]];
for(KPKEntry *entry in [document.templates childEntries]) { for(KPKEntry *entry in document.templates.childEntries) {
NSString *templateMask = NSLocalizedString(@"NEW_ENTRY_WITH_TEMPLATE_%@", "Submenu to add an entry via template"); NSString *templateMask = NSLocalizedString(@"NEW_ENTRY_WITH_TEMPLATE_%@", "Submenu to add an entry via template");
NSMenuItem *templateItem = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:[NSString stringWithFormat:templateMask, entry.title] NSMenuItem *templateItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:templateMask, entry.title]
action:@selector(createEntryFromTemplate:) action:@selector(createEntryFromTemplate:)
keyEquivalent:@""]; keyEquivalent:@""];
templateItem.representedObject = entry.uuid; templateItem.representedObject = entry.uuid;

15
MacPass/MPOutlineDataSource.m
View File

@@ -39,8 +39,9 @@
if(items.count != 1) { if(items.count != 1) {
return NO; return NO;
} }
self.localDraggedGroup = nil; id item = [items.lastObject representedObject]; self.localDraggedGroup = nil;
if(![item isKindOfClass:[KPKGroup class]]) { id item = [items.lastObject representedObject];
if(![item isKindOfClass:KPKGroup.class]) {
return NO; return NO;
} }
KPKGroup *draggedGroup = item; KPKGroup *draggedGroup = item;
@@ -69,7 +70,7 @@
/* Check if the Target is the root group */ /* Check if the Target is the root group */
id targetItem = [item representedObject]; id targetItem = [item representedObject];
if( ![targetItem isKindOfClass:[KPKGroup class]] ) { if( ![targetItem isKindOfClass:KPKGroup.class] ) {
return NSDragOperationNone; // Block all unknown types return NSDragOperationNone; // Block all unknown types
} }
@@ -122,7 +123,7 @@
info.animatesToDestination = YES; info.animatesToDestination = YES;
id targetItem = [item representedObject]; id targetItem = [item representedObject];
if(![targetItem isKindOfClass:[KPKGroup class]]) { if(![targetItem isKindOfClass:KPKGroup.class]) {
return NO; // Wrong return NO; // Wrong
} }
@@ -176,7 +177,7 @@
} }
/* Cleanup old stuff */ /* Cleanup old stuff */
NSArray *types = [pasteboard types]; NSArray *types = pasteboard.types;
if(types.count > 1 || types.count == 0) { if(types.count > 1 || types.count == 0) {
return NO; return NO;
} }
@@ -184,7 +185,7 @@
NSString *draggedType = types.lastObject; NSString *draggedType = types.lastObject;
if([draggedType isEqualToString:KPKGroupUTI]) { if([draggedType isEqualToString:KPKGroupUTI]) {
// dragging group // dragging group
NSArray *groups = [pasteboard readObjectsForClasses:@[[KPKGroup class]] options:nil]; NSArray *groups = [pasteboard readObjectsForClasses:@[KPKGroup.class] options:nil];
if(groups.count != 1) { if(groups.count != 1) {
return NO; return NO;
} }
@@ -192,7 +193,7 @@
return YES; return YES;
} }
else if([draggedType isEqualToString:KPKEntryUTI]) { else if([draggedType isEqualToString:KPKEntryUTI]) {
NSArray *entries = [pasteboard readObjectsForClasses:@[[KPKEntry class]] options:nil]; NSArray *entries = [pasteboard readObjectsForClasses:@[KPKEntry.class] options:nil];
if([entries count] != 1) { if([entries count] != 1) {
return NO; // NO entry readable return NO; // NO entry readable
} }