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

Fixed auto-update of database settings on cancelation

Browse Source 
Signed-off-by: michael starke <michael.starke@hicknhack-software.com>
This commit is contained in:
michael starke
2015-10-01 17:15:15 +02:00
parent 6d3a021cb6
commit 3b24904f7e
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
MacPass/MPDatabaseSettingsWindowController.m
View File

@@ -199,10 +199,9 @@
} }
- (void)_setupAdvancedTab:(KPKTree *)tree { - (void)_setupAdvancedTab:(KPKTree *)tree {
/* TODO Do not use bindings, as the user should be able to cancel */ HNHSetStateFromBool(self.enableTrashCheckButton, tree.metaData.useTrash);
//[self bind:NSStringFromSelector(@selector(trashEnabled)) toObject:tree.metaData withKeyPath:NSStringFromSelector(@selector(useTrash)) options:nil]; self.selectTrashGoupPopUpButton.enabled = tree.metaData.useTrash;
[self.enableTrashCheckButton bind:NSValueBinding toObject:tree.metaData withKeyPath:NSStringFromSelector(@selector(useTrash)) options:nil]; [self.enableTrashCheckButton bind:NSValueBinding toObject:self.selectTrashGoupPopUpButton withKeyPath:NSEnabledBinding options:nil];
[self.selectTrashGoupPopUpButton bind:NSEnabledBinding toObject:tree.metaData withKeyPath:NSStringFromSelector(@selector(useTrash)) options:nil];
[self _updateTrashFolders:tree]; [self _updateTrashFolders:tree];
self.defaultUsernameTextField.stringValue = tree.metaData.defaultUserName; self.defaultUsernameTextField.stringValue = tree.metaData.defaultUserName;
@@ -214,25 +213,21 @@
[self.enforceKeyChangeIntervalTextField setEnabled:tree.metaData.enforceMasterKeyChange]; [self.enforceKeyChangeIntervalTextField setEnabled:tree.metaData.enforceMasterKeyChange];
[self.recommendKeyChangeIntervalTextField setEnabled:tree.metaData.recommendMasterKeyChange]; [self.recommendKeyChangeIntervalTextField setEnabled:tree.metaData.recommendMasterKeyChange];
self.enforceKeyChangeIntervalTextField.stringValue = @"";
if(tree.metaData.enforceMasterKeyChange) { if(tree.metaData.enforceMasterKeyChange) {
[self.enforceKeyChangeIntervalTextField setIntegerValue:tree.metaData.masterKeyChangeEnforcementInterval]; self.enforceKeyChangeIntervalTextField.integerValue = tree.metaData.masterKeyChangeEnforcementInterval;
}
else {
[self.enforceKeyChangeIntervalTextField setStringValue:@""];
} }
self.recommendKeyChangeIntervalTextField.stringValue = @"";
if(tree.metaData.recommendMasterKeyChange) { if(tree.metaData.recommendMasterKeyChange) {
[self.recommendKeyChangeIntervalTextField setIntegerValue:tree.metaData.masterKeyChangeRecommendationInterval]; self.recommendKeyChangeIntervalTextField.integerValue = tree.metaData.masterKeyChangeRecommendationInterval;
}
else {
[self.recommendKeyChangeIntervalTextField setStringValue:@""];
} }
[self.enforceKeyChangeCheckButton bind:NSValueBinding toObject:self.enforceKeyChangeIntervalTextField withKeyPath:NSEnabledBinding options:nil]; [self.enforceKeyChangeCheckButton bind:NSValueBinding toObject:self.enforceKeyChangeIntervalTextField withKeyPath:NSEnabledBinding options:nil];
[self.recommendKeyChangeCheckButton bind:NSValueBinding toObject:self.recommendKeyChangeIntervalTextField withKeyPath:NSEnabledBinding options:nil]; [self.recommendKeyChangeCheckButton bind:NSValueBinding toObject:self.recommendKeyChangeIntervalTextField withKeyPath:NSEnabledBinding options:nil];
} }
- (void)_updateFirstResponder { - (void)_updateFirstResponder {
NSTabViewItem *selected = [self.sectionTabView selectedTabViewItem]; NSTabViewItem *selected = self.sectionTabView.selectedTabViewItem;
MPDatabaseSettingsTab tab = [[self.sectionTabView tabViewItems] indexOfObject:selected]; MPDatabaseSettingsTab tab = [self.sectionTabView.tabViewItems indexOfObject:selected];
switch(tab) { switch(tab) {
case MPDatabaseSettingsTabAdvanced: case MPDatabaseSettingsTabAdvanced: