Menu
▾
▴
[Radmind-commit] radmind-assistant RCMPreferences.h, 1.25, 1.26 RCMPreferences.m, 1.44, 1.45
|
From: Andrew M. <fit...@us...> - 2006-07-14 14:30:55
|
Update of /cvsroot/radmind/radmind-assistant In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30150 Modified Files: RCMPreferences.h RCMPreferences.m Log Message: Using NSUserDefaultsController bindings for most preferences. Index: RCMPreferences.m =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/RCMPreferences.m,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** RCMPreferences.m 1 May 2006 18:39:38 -0000 1.44 --- RCMPreferences.m 14 Jul 2006 14:30:45 -0000 1.45 *************** *** 39,44 **** --- 39,46 ---- [ prefRadmindHost removeAllItems ]; + #ifdef notdef [ prefRadmindServerTable setDataSource: self ]; [ prefRadmindServerTable setDelegate: self ]; + #endif notdef [ self toolbarSetup ]; [ self showGeneralPreferences: nil ]; *************** *** 234,241 **** - ( void )prefsReload { ! NSUserDefaults *defaults = ! [ NSUserDefaults standardUserDefaults ]; ! NSString *fsdiffpath = [ defaults objectForKey: ! @"runfrompath" ]; NSString *radmind = [ defaults objectForKey: @"radmindhost" ]; --- 236,240 ---- - ( void )prefsReload { ! NSUserDefaults *defaults = [ NSUserDefaults standardUserDefaults ]; NSString *radmind = [ defaults objectForKey: @"radmindhost" ]; *************** *** 243,266 **** NSString *editor = [ defaults objectForKey: @"transeditor" ]; - BOOL userauth = [ defaults boolForKey: - @"userauth" ]; - BOOL dontremovelocks = [ defaults boolForKey: @"DontRemoveFileLocks" ]; - BOOL errors = [ defaults boolForKey: @"DieOnErrorsDuringUpload" ]; - BOOL preapply = [ defaults boolForKey: @"RAAlwaysPreProcess" ]; - BOOL postapply = [ defaults boolForKey: @"RAAlwaysPostProcess" ]; - BOOL caseInsensitive = [ defaults boolForKey: @"RACaseInsensitive" ]; BOOL rum = [ defaults boolForKey: @"RadmindUpdateMonitorEnabled" ]; - NSString *username = [ defaults stringForKey: - @"username" ]; NSArray *alteditors = [ defaults objectForKey: @"alteditors" ]; - NSNumber *tlsLevel = [ defaults objectForKey: - @"tlslevel" ]; NSDictionary *serverInfo = nil; int i = 0; - if ( tlsLevel != nil ) { - [ prefTLSLevel selectItemAtIndex: [ tlsLevel intValue ]]; - } - [ prefRadmindHost removeAllItems ]; [ prefRadmindHost setEnabled: NO ]; --- 242,250 ---- *************** *** 332,347 **** [ prefEnableRadmindUpdateMonitor setState: NSOffState ]; } ! ! if ( userauth ) { ! [ prefEnableUserAuth setState: NSOnState ]; ! [ prefUserAuthName setEnabled: YES ]; ! } ! if ( username != nil ) { ! [ prefUserAuthName setStringValue: username ]; ! } ! ! if ( fsdiffpath != nil ) { ! [ prefFsdiffPath selectItemWithTitle: fsdiffpath ]; ! } if ( alteditors != nil ) { for ( i = 0; i < [ alteditors count ]; i++ ) { --- 316,320 ---- [ prefEnableRadmindUpdateMonitor setState: NSOffState ]; } ! if ( alteditors != nil ) { for ( i = 0; i < [ alteditors count ]; i++ ) { *************** *** 354,382 **** [ prefTransEditor selectItemWithTitle: editor ]; } - if ( caseInsensitive == NO ) { - [ prefCaseSensitivityPopUp selectItemAtIndex: 1 ]; - } - - if ( [ defaults boolForKey: @"cksum" ] ) { - [ prefGlobalCksum selectCellAtRow: 1 column: 0 ]; - } else { - [ prefGlobalCksum selectCellAtRow: 0 column: 0 ]; - } - - if ( dontremovelocks == NO ) { - [ prefLapplyForce setState: NSOnState ]; - } - if ( errors == NO ) { - [ prefIgnoreLcreateErrors setState: NSOnState ]; - } - - if ( preapply == YES ) { - [ prefAlwaysPreApply setState: NSOnState ]; - } - if ( postapply == YES ) { - [ prefAlwaysPostApply setState: NSOnState ]; - } - - [ defaults synchronize ]; } --- 327,330 ---- *************** *** 455,491 **** - ( void )showUserManagementSettings: ( id )sender { - NSString *templateUserName = nil; - int maxlife, maxusage; - if ( [[ prefPanel contentView ] isEqualTo: userManagementView ] ) { return; } - - [ prefUserManagementSwitch setState: - [[ NSUserDefaults standardUserDefaults ] - boolForKey: @"RAUserManagementEnabled" ]]; - - if (( templateUserName = [[ NSUserDefaults standardUserDefaults ] - objectForKey: @"UMTemplateUserName" ] ) != nil ) { - [ prefTemplateUserNameField setStringValue: templateUserName ]; - } - - if (( maxlife = [[[[[ NSUserDefaults standardUserDefaults ] - objectForKey: @"UMMaxHomeLife" ] - componentsSeparatedByString: @" " ] - objectAtIndex: 0 ] intValue ] ) == 0 ) { - maxlife = 24; - } - - if (( maxusage = [[ NSUserDefaults standardUserDefaults ] - integerForKey: @"UMMaxDiskUsage" ] ) == 0 ) { - maxusage = 75; - } - - [ prefMaxHomeLifeField setStringValue: - [ NSString stringWithFormat: @"%d", maxlife ]]; - [ prefMaxDiskUsageField setStringValue: - [ NSString stringWithFormat: @"%d", maxusage ]]; - [ contentBox setContentView: nil ]; [ prefPanel resizeForContentView: userManagementView ]; --- 403,409 ---- *************** *** 544,567 **** - ( void )showAutomationPreferences: ( id )sender { ! NSUserDefaults *defaults = [ NSUserDefaults standardUserDefaults ]; ! ! [ autoEnableScheduleSwitch setState: ! [ defaults boolForKey: @"RAEnablePeriodic" ]]; ! if ( [ autoEnableScheduleSwitch state ] == NSOnState ) { ! [ autoSchedulePopUpButton setEnabled: YES ]; ! } else { ! [ autoSchedulePopUpButton setEnabled: NO ]; ! } ! ! [ autoSchedulePopUpButton selectItemAtIndex: ! [ defaults integerForKey: @"RAPeriodicType" ]]; ! ! [ autoEnableLoginHookSwitch setState: ! [ defaults boolForKey: @"RAEnableLoginHook" ]]; ! [ autoEnableLogoutHookSwitch setState: ! [ defaults boolForKey: @"RAEnableLogoutHook" ]]; ! [ autoContinueIfInterruptedSwitch setState: ! [ defaults boolForKey: @"RAContinueOnReboot" ]]; ! if ( [[ prefPanel contentView ] isEqualTo: automationPrefsView ] ) { return; --- 462,466 ---- - ( void )showAutomationPreferences: ( id )sender { ! if ( [[ prefPanel contentView ] isEqualTo: automationPrefsView ] ) { return; *************** *** 582,586 **** @"Radmind Assistant: Automation Preferences" ) ]; ! if ( ! [ defaults boolForKey: @"RAHideAutomationWarning" ] ) { NSBeginAlertSheet( NSLocalizedString( @"Warning: Setting up Radmind automation " @"involves installing several components " --- 481,486 ---- @"Radmind Assistant: Automation Preferences" ) ]; ! if ( ! [[ NSUserDefaults standardUserDefaults ] ! boolForKey: @"RAHideAutomationWarning" ] ) { NSBeginAlertSheet( NSLocalizedString( @"Warning: Setting up Radmind automation " @"involves installing several components " *************** *** 628,692 **** } - - ( IBAction )toggleUserAuth: ( id )sender - { - if ( ! [ prefUserAuthName isEnabled ] ) { - [ prefUserAuthName setEnabled: YES ]; - [[ NSUserDefaults standardUserDefaults ] setBool: YES forKey: @"userauth" ]; - } else { - [ prefUserAuthName setEnabled: NO ]; - [[ NSUserDefaults standardUserDefaults ] setBool: NO forKey: @"userauth" ]; - } - } - - - ( IBAction )toggleForceLockRemoval: ( id )sender - { - BOOL force = NO; - - if ( [ prefLapplyForce state ] == NSOnState ) { - force = NO; - } else { - force = YES; - } - - [[ NSUserDefaults standardUserDefaults ] setBool: force forKey: @"DontRemoveFileLocks" ]; - } - - - ( IBAction )toggleIgnoreUploadErrors: ( id )sender - { - BOOL errors = NO; - - if ( [ prefIgnoreLcreateErrors state ] == NSOnState ) { - errors = NO; - } else { - errors = YES; - } - - [[ NSUserDefaults standardUserDefaults ] setBool: errors forKey: @"DieOnErrorsDuringUpload" ]; - } - - - ( IBAction )toggleAlwaysPreApplySwitch: ( id )sender - { - BOOL always = YES; - - if ( [ prefAlwaysPreApply state ] == NSOnState ) { - always = NO; - } - - [[ NSUserDefaults standardUserDefaults ] setBool: always - forKey: @"RAAlwaysPreProcess" ]; - } - - - ( IBAction )toggleAlwaysPostApplySwitch: ( id )sender - { - BOOL always = YES; - - if ( [ prefAlwaysPostApply state ] == NSOnState ) { - always = NO; - } - - [[ NSUserDefaults standardUserDefaults ] setBool: always - forKey: @"RAAlwaysPostProcess" ]; - } - - ( IBAction )manageScripts: ( id )sender { --- 528,531 ---- *************** *** 700,716 **** } - - ( IBAction )setUsername: ( id )sender - { - [[ NSUserDefaults standardUserDefaults ] setObject: [ prefUserAuthName stringValue ] - forKey: @"username" ]; - } - - - ( IBAction )setTLSLevel: ( id )sender - { - [[ NSUserDefaults standardUserDefaults ] - setObject: [ NSNumber numberWithInt: [ prefTLSLevel indexOfSelectedItem ]] - forKey: @"tlslevel" ]; - } - - ( IBAction )manageCertificates: ( id )sender { --- 539,542 ---- *************** *** 724,735 **** } - - ( IBAction )setUseChecksums: ( id )sender - { - BOOL useCksums = ( BOOL )[ sender selectedRow ]; - - [[ NSUserDefaults standardUserDefaults ] setBool: useCksums - forKey: @"cksum" ]; - } - - ( IBAction )editRadmindServerList: ( id )sender { --- 550,553 ---- *************** *** 973,1000 **** } - - ( IBAction )setCaseSensitivity: ( id )sender - { - BOOL caseInsensitive; - int index; - - index = [ sender indexOfSelectedItem ]; - caseInsensitive = ( BOOL )( ! index ); - - [[ NSUserDefaults standardUserDefaults ] - setBool: caseInsensitive forKey: @"RACaseInsensitive" ]; - } - - /* automation configuration actions */ - - ( IBAction )toggleEnableScheduleSwitch: ( id )sender - { - BOOL enabled = NO; - - if ( [ sender state ] == NSOnState ) { - enabled = YES; - } - - [ autoSchedulePopUpButton setEnabled: enabled ]; - } - - ( IBAction )visitiHookHomepage: ( id )sender { --- 791,794 ---- *************** *** 1007,1014 **** - ( IBAction )setAutomationConfiguration: ( id )sender { ! BOOL enableSchedule = [ autoEnableScheduleSwitch state ]; ! BOOL enableLoginHook = [ autoEnableLoginHookSwitch state ]; ! BOOL enableLogoutHook = [ autoEnableLogoutHookSwitch state ]; ! BOOL continueOnReboot = [ autoContinueIfInterruptedSwitch state ]; int periodicType = 0; int rc; --- 801,809 ---- - ( IBAction )setAutomationConfiguration: ( id )sender { ! NSUserDefaults *defaults = [ NSUserDefaults standardUserDefaults ]; ! BOOL enableSchedule = [ defaults boolForKey: @"RAEnablePeriodic" ]; ! BOOL enableLoginHook = [ defaults boolForKey: @"RAEnableLoginHook" ]; ! BOOL enableLogoutHook = [ defaults boolForKey: @"RAEnableLogoutHook" ]; ! BOOL continueOnReboot = [ defaults boolForKey: @"RAContinueOnReboot" ]; int periodicType = 0; int rc; *************** *** 1033,1039 **** [[ NSUserDefaults standardUserDefaults ] setBool: YES forKey: @"RAEnableLoginHook" ]; - } else { - [[ NSUserDefaults standardUserDefaults ] setBool: NO - forKey: @"RAEnableLoginHook" ]; } --- 828,831 ---- *************** *** 1083,1095 **** /* install or remove scripts in periodic dir */ if ( enableSchedule ) { ! periodicType = ( [ autoSchedulePopUpButton indexOfSelectedItem ] + 1 ); ! [[ NSUserDefaults standardUserDefaults ] setBool: YES ! forKey: @"RAEnablePeriodic" ]; ! [[ NSUserDefaults standardUserDefaults ] ! setInteger: [ autoSchedulePopUpButton indexOfSelectedItem ] ! forKey: @"RAPeriodicType" ]; } else { - [[ NSUserDefaults standardUserDefaults ] setBool: NO - forKey: @"RAEnablePeriodic" ]; [[ NSUserDefaults standardUserDefaults ] setInteger: 0 --- 875,881 ---- /* install or remove scripts in periodic dir */ if ( enableSchedule ) { ! periodicType = [[ NSUserDefaults standardUserDefaults ] ! integerForKey: @"RAPeriodicType" ] + 1; } else { [[ NSUserDefaults standardUserDefaults ] setInteger: 0 *************** *** 1141,1157 **** } - - ( IBAction )toggleUserManagement: ( id )sender - { - BOOL userManagement = ( BOOL )[ sender state ]; - - [[ NSUserDefaults standardUserDefaults ] setBool: userManagement - forKey: @"RAUserManagementEnabled" ]; - [[ NSUserDefaults standardUserDefaults ] synchronize ]; - } - - ( IBAction )saveUserManagementSettings: ( id )sender { ! NSString *templateUserName = nil; ! unsigned int maxlife, maxusage; int rc; NSArray *array = nil; --- 927,933 ---- } - ( IBAction )saveUserManagementSettings: ( id )sender { ! NSUserDefaults *defaults = [ NSUserDefaults standardUserDefaults ]; int rc; NSArray *array = nil; *************** *** 1159,1203 **** RAAuthExec *rae = nil; ! if ( ! [[ prefTemplateUserNameField stringValue ] length ] ) { ! [ prefTemplateUserNameField setStringValue: @"template" ]; } ! if ( ! [[ prefMaxHomeLifeField stringValue ] length ] || ! [ prefMaxHomeLifeField intValue ] == 0 ) { ! [ prefMaxHomeLifeField setStringValue: @"24" ]; } ! if ( ! [[ prefMaxDiskUsageField stringValue ] length ] || ! [ prefMaxDiskUsageField intValue ] < 25 ) { ! [ prefMaxHomeLifeField setStringValue: @"75" ]; } ! templateUserName = [ prefTemplateUserNameField stringValue ]; ! maxlife = [ prefMaxHomeLifeField intValue ]; ! maxusage = [ prefMaxDiskUsageField intValue ]; ! ! if ( [[ NSUserDefaults standardUserDefaults ] ! boolForKey: @"RAUserManagementEnabled" ] ) { ! [[ NSUserDefaults standardUserDefaults ] setObject: templateUserName ! forKey: @"UMTemplateUserName" ]; ! [[ NSUserDefaults standardUserDefaults ] setObject: [ NSString stringWithFormat: ! @"/var/%@", templateUserName ] ! forKey: @"UMTemplateHome" ]; ! [[ NSUserDefaults standardUserDefaults ] setObject: [ NSString stringWithFormat: ! @"%d hours ago", maxlife ] ! forKey: @"UMMaxHomeLife" ]; ! [[ NSUserDefaults standardUserDefaults ] setInteger: maxusage ! forKey: @"UMMaxDiskUsage" ]; ! /* make sure scripts ignore current user */ ! [[ NSUserDefaults standardUserDefaults ] setObject: NSUserName() ! forKey: @"UMIgnoredUser" ]; ! [[ NSUserDefaults standardUserDefaults ] synchronize ]; /* create user and install scripts */ ! [ autoEnableLoginHookSwitch setState: NSOnState ]; ! [ autoEnableLogoutHookSwitch setState: NSOnState]; ! [ autoEnableScheduleSwitch setState: NSOnState ]; [ self setAutomationConfiguration: nil ]; --- 935,967 ---- RAAuthExec *rae = nil; ! if ( ![ defaults stringForKey: @"UMTemplateUserName" ] ) { ! [ defaults setObject: @"templateuser" forKey: @"UMTemplateUserName" ]; } ! if ( ![ defaults stringForKey: @"UMMaxHomeLife" ] ) { ! [ defaults setObject: @"24 hours ago" forKey: @"UMMaxHomeLife" ]; } ! if ( ![ defaults integerForKey: @"UMMaxDiskUsage" ] || ! [ defaults integerForKey: @"UMMaxDiskUsage" ] < 25 ) { ! [ defaults setInteger: 75 forKey: @"UMMaxDiskUsage" ]; } ! if ( [ defaults boolForKey: @"RAUserManagementEnabled" ] ) { ! [ defaults setObject: ! [ NSString stringWithFormat: @"/var/%@", ! [ defaults stringForKey: @"UMTemplateUserName" ]] ! forKey: @"UMTemplateHome" ]; ! /* make sure scripts ignore current user */ ! [ defaults setObject: NSUserName() forKey: @"UMIgnoredUser" ]; ! [ defaults synchronize ]; /* create user and install scripts */ ! [ defaults setBool: YES forKey: @"RAEnablePeriodic" ]; ! [ defaults setBool: YES forKey: @"RAEnableLoginHook" ]; ! [ defaults setBool: YES forKey: @"RAEnableLogoutHook" ]; ! [ defaults setBool: YES forKey: @"RAContinueOnReboot" ]; [ self setAutomationConfiguration: nil ]; *************** *** 1205,1209 **** scriptpath = [[ NSBundle mainBundle ] pathForResource: @"useradd" ofType: @"sh" ]; array = [ NSArray arrayWithObjects: @"-A", ! @"ExecuteCommand", @"--", scriptpath, templateUserName, nil ]; rc = [ rae executeTool: -1 --- 969,974 ---- scriptpath = [[ NSBundle mainBundle ] pathForResource: @"useradd" ofType: @"sh" ]; array = [ NSArray arrayWithObjects: @"-A", ! @"ExecuteCommand", @"--", scriptpath, ! [ defaults stringForKey: @"UMTemplateUserName" ], nil ]; rc = [ rae executeTool: -1 *************** *** 1268,1272 **** @"e.g., after a certain period of time has passed, " @"the copy will be removed." ), ! NSLocalizedString( @"OK", @"OK" ), @"", @"", templateUserName ); } else { [[ NSUserDefaults standardUserDefaults ] removeObjectForKey: @"UMTemplateUserName" ]; --- 1033,1037 ---- @"e.g., after a certain period of time has passed, " @"the copy will be removed." ), ! NSLocalizedString( @"OK", @"OK" ), @"", @"", [ defaults stringForKey: @"UMTemplateUserName" ] ); } else { [[ NSUserDefaults standardUserDefaults ] removeObjectForKey: @"UMTemplateUserName" ]; *************** *** 1279,1283 **** scriptpath = [[ NSBundle mainBundle ] pathForResource: @"userdelete" ofType: @"sh" ]; ! array = [ NSArray arrayWithObjects: @"-x", scriptpath, templateUserName, nil ]; rc = [ rae executeTool: -1 --- 1044,1050 ---- scriptpath = [[ NSBundle mainBundle ] pathForResource: @"userdelete" ofType: @"sh" ]; ! array = [ NSArray arrayWithObjects: @"-x", scriptpath, ! [[ NSUserDefaults standardUserDefaults ] ! stringForKey: @"UMTemplateUserName" ], nil ]; rc = [ rae executeTool: -1 Index: RCMPreferences.h =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/RCMPreferences.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** RCMPreferences.h 24 Apr 2006 15:20:16 -0000 1.25 --- RCMPreferences.h 14 Jul 2006 14:30:44 -0000 1.26 *************** *** 36,58 **** /* general prefs view */ IBOutlet NSView *generalPrefsView; - IBOutlet NSMatrix *prefGlobalCksum; IBOutlet NSPopUpButton *prefRadmindHost; IBOutlet NSTextField *prefServerCompressionSummary; IBOutlet NSTextField *prefServerPortSummary; IBOutlet NSButton *prefEnableRadmindUpdateMonitor; - IBOutlet NSButton *prefLapplyForce; - IBOutlet NSButton *prefIgnoreLcreateErrors; - IBOutlet NSButton *prefAlwaysPreApply; - IBOutlet NSButton *prefAlwaysPostApply; /* security prefs view */ IBOutlet NSView *securityPrefsView; - IBOutlet NSPopUpButton *prefTLSLevel; - IBOutlet NSButton *prefEnableUserAuth; - IBOutlet NSTextField *prefUserAuthName; /* transcript prefs view */ IBOutlet NSView *transcriptPrefsView; - IBOutlet NSPopUpButton *prefFsdiffPath; IBOutlet NSPopUpButton *prefTransEditor; IBOutlet NSPopUpButton *prefCaseSensitivityPopUp; --- 36,49 ---- *************** *** 60,75 **** /* automation prefs view */ IBOutlet NSView *automationPrefsView; - IBOutlet NSButton *autoEnableScheduleSwitch; - IBOutlet NSPopUpButton *autoSchedulePopUpButton; - IBOutlet NSButton *autoEnableLoginHookSwitch; - IBOutlet NSButton *autoEnableLogoutHookSwitch; - IBOutlet NSButton *autoContinueIfInterruptedSwitch; /* user management view */ IBOutlet NSView *userManagementView; - IBOutlet NSButton *prefUserManagementSwitch; - IBOutlet NSTextField *prefTemplateUserNameField; - IBOutlet NSTextField *prefMaxHomeLifeField; - IBOutlet NSTextField *prefMaxDiskUsageField; /* advanced prefs view */ --- 51,57 ---- *************** *** 80,85 **** IBOutlet NSStepper *prefTimeoutStepper; - @private NSMutableArray *radmindServerList; RACertificateManager *certificateManager; RAScriptManager *scriptManager; --- 62,68 ---- IBOutlet NSStepper *prefTimeoutStepper; NSMutableArray *radmindServerList; + + @private RACertificateManager *certificateManager; RAScriptManager *scriptManager; *************** *** 94,102 **** - ( IBAction )setDefaultServer: ( id )sender; - ( IBAction )setPort: ( id )sender; - - ( IBAction )setUseChecksums: ( id )sender; - - ( IBAction )toggleForceLockRemoval: ( id )sender; - - ( IBAction )toggleIgnoreUploadErrors: ( id )sender; - - ( IBAction )toggleAlwaysPreApplySwitch: ( id )sender; - - ( IBAction )toggleAlwaysPostApplySwitch: ( id )sender; - ( IBAction )manageScripts: ( id )sender; --- 77,80 ---- *************** *** 107,127 **** /* security prefs actions */ - - ( IBAction )toggleUserAuth: ( id )sender; - - ( IBAction )setUsername: ( id )sender; - - ( IBAction )setTLSLevel: ( id )sender; - ( IBAction )manageCertificates: ( id )sender; /* transcript prefs actions */ - ( IBAction )setTranscriptEditor: ( id )sender; - - ( IBAction )setFsdiffPath: ( id )sender; - - ( IBAction )setCaseSensitivity: ( id )sender; /* automation configuration actions */ - - ( IBAction )toggleEnableScheduleSwitch: ( id )sender; - ( IBAction )visitiHookHomepage: ( id )sender; - ( IBAction )setAutomationConfiguration: ( id )sender; /* user management actions */ - - ( IBAction )toggleUserManagement: ( id )sender; - ( IBAction )saveUserManagementSettings: ( id )sender; --- 85,98 ---- |
