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

Removed unnecessary document property on custom window controllers

Browse Source
This commit is contained in:
michael starke
2015-06-03 11:17:12 +02:00
parent 1e7d24d4ff
commit 0be2b677b8
5 changed files with 17 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
MacPass/MPDatabaseSettingsWindowController.m
View File

@@ -32,7 +32,6 @@
NSString *_missingFeature;
}
@property (nonatomic, weak) MPDocument *document;
@property (nonatomic,assign) BOOL trashEnabled;
@end
@@ -43,15 +42,9 @@
return @"DatabaseSettingsWindow";
}
- (id)init {
self = [self initWithDocument:nil];
return self;
}
- (id)initWithDocument:(MPDocument *)document {
self = [super initWithWindow:nil];
- (id)initWithWindow:(NSWindow *)window {
self = [super initWithWindow:window];
if(self) {
self.document = document;
_missingFeature = NSLocalizedString(@"KDBX_ONLY_FEATURE", "Feature only available in kdbx databases");
}
return self;
@@ -70,7 +63,7 @@
- (IBAction)save:(id)sender {
/* General */
KPKMetaData *metaData = self.document.tree.metaData;
KPKMetaData *metaData = ((MPDocument *)self.document).tree.metaData;
metaData.databaseDescription = [self.databaseDescriptionTextView string];
metaData.databaseName = [self.databaseNameTextField stringValue];
@@ -90,11 +83,11 @@
metaData.recycleBinEnabled = self.trashEnabled;
NSMenuItem *trashMenuItem = [self.selectRecycleBinGroupPopUpButton selectedItem];
KPKGroup *trashGroup = [trashMenuItem representedObject];
self.document.trash = trashGroup;
((MPDocument *)self.document).trash = trashGroup;
NSMenuItem *templateMenuItem = [self.templateGroupPopUpButton selectedItem];
KPKGroup *templateGroup = [templateMenuItem representedObject];
self.document.templates = templateGroup;
((MPDocument *)self.document).templates = templateGroup;
BOOL enforceMasterKeyChange = HNHBoolForState([self.enforceKeyChangeCheckButton state]);
@@ -152,10 +145,10 @@
return;
}
/* Update all stuff that might have changed */
KPKMetaData *metaData = self.document.tree.metaData;
KPKMetaData *metaData = ((MPDocument *)self.document).tree.metaData;
[self _setupDatabaseTab:metaData];
[self _setupProtectionTab:metaData];
[self _setupAdvancedTab:self.document.tree];
[self _setupAdvancedTab:((MPDocument *)self.document).tree];
self.isDirty = NO;
}