nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-20 08:19:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added cancel button to icon selection view

Browse Source
This commit is contained in:
michael starke
2013-12-13 01:13:52 +01:00
parent 6b1aff9449
commit 21355101ed
5 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
MacPass/MPInspectorViewController.m
View File

@@ -175,19 +175,22 @@ typedef NS_ENUM(NSUInteger, MPContentTab) {
- (void)popoverDidClose:(NSNotification *)notification {
MPIconSelectViewController *viewController = (MPIconSelectViewController *)_popover.contentViewController;
MPDocument *document = [[self windowController] document];
BOOL useDefault = (viewController.selectedIcon == -1);
switch (self.activeTab) {
case MPGroupTab:
document.selectedGroup.iconId = useDefault ? [KPKGroup defaultIcon] : viewController.selectedIcon;
break;
case MPEntryTab:
document.selectedEntry.iconId = useDefault ? [KPKEntry defaultIcon]: viewController.selectedIcon;
break;
default:
break;
if(!viewController.didCancel) {
MPDocument *document = [[self windowController] document];
BOOL useDefault = (viewController.selectedIcon == -1);
switch (self.activeTab) {
case MPGroupTab:
document.selectedGroup.iconId = useDefault ? [KPKGroup defaultIcon] : viewController.selectedIcon;
break;
case MPEntryTab:
document.selectedEntry.iconId = useDefault ? [KPKEntry defaultIcon]: viewController.selectedIcon;
break;
default:
break;
}
}
_popover = nil;
}
@@ -207,10 +210,10 @@ typedef NS_ENUM(NSUInteger, MPContentTab) {
[self.itemNameTextField setHidden:YES];
[self.itemImageView unbind:NSValueBinding];
[self.itemImageView setHidden:YES];
return;
}
[self.itemImageView bind:NSValueBinding toObject:item withKeyPath:@"iconImage" options:nil];
if([item respondsToSelector:@selector(title)]) {