nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2026-01-30 19:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Using modern Objective-C

Browse Source
This commit is contained in:
michael starke
2016-09-05 12:17:13 +02:00
parent f0d4b2f835
commit e06cf82368
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
MacPass/MPOutlineDataSource.m
View File

@@ -83,7 +83,7 @@
KPKGroup *targetGroup = targetItem; KPKGroup *targetGroup = targetItem;
BOOL validTarget = YES; BOOL validTarget = YES;
MPDocument *document = [[[outlineView window] windowController] document]; MPDocument *document = outlineView.window.windowController.document;
/* Dragging Groups */ /* Dragging Groups */
if(draggedGroup) { if(draggedGroup) {
self.localDraggedGroup = [document findGroup:draggedGroup.uuid]; self.localDraggedGroup = [document findGroup:draggedGroup.uuid];
@@ -177,18 +177,18 @@
/* 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;
} }
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;
} }
*group = [groups lastObject]; *group = groups.lastObject;
return YES; return YES;
} }
else if([draggedType isEqualToString:KPKEntryUTI]) { else if([draggedType isEqualToString:KPKEntryUTI]) {
@@ -196,7 +196,7 @@
if([entries count] != 1) { if([entries count] != 1) {
return NO; // NO entry readable return NO; // NO entry readable
} }
*entry = [entries lastObject]; *entry = entries.lastObject;
return YES; return YES;
} }
return NO; return NO;

4
MacPass/MPSavePanelAccessoryViewController.m
View File

@@ -30,7 +30,7 @@
NSString *extension = [self.document fileNameExtensionForType:uti saveOperation:NSSaveOperation]; NSString *extension = [self.document fileNameExtensionForType:uti saveOperation:NSSaveOperation];
NSString *title = [NSString stringWithFormat:@"%@ (%@)", description, extension]; NSString *title = [NSString stringWithFormat:@"%@ (%@)", description, extension];
[menu addItemWithTitle:title action:@selector(setFileType:) keyEquivalent:@""]; [menu addItemWithTitle:title action:@selector(setFileType:) keyEquivalent:@""];
NSMenuItem *item = [[menu itemArray] lastObject]; NSMenuItem *item = menu.itemArray.lastObject;
item.target = self; item.target = self;
item.representedObject = uti; item.representedObject = uti;
} }
@@ -81,7 +81,7 @@
} }
- (void)_updateNote { - (void)_updateNote {
NSString *uti = [[self.fileTypePopupButton selectedItem] representedObject]; NSString *uti = self.fileTypePopupButton.selectedItem.representedObject;
BOOL showInfoText = (self.document.tree.minimumType == KPKDatabaseTypeXml && [uti isEqualToString:MPLegacyDocumentUTI]); BOOL showInfoText = (self.document.tree.minimumType == KPKDatabaseTypeXml && [uti isEqualToString:MPLegacyDocumentUTI]);
self.infoTextField.hidden = !showInfoText; self.infoTextField.hidden = !showInfoText;
} }