Update of /cvsroot/radmind/radmind-assistant/rsm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22113
Modified Files:
RSMPreferences.h RSMPreferences.m
Log Message:
Support for server compression settings.
Index: RSMPreferences.m
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/rsm/RSMPreferences.m,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** RSMPreferences.m 14 Dec 2005 18:35:11 -0000 1.11
--- RSMPreferences.m 24 Feb 2006 22:10:42 -0000 1.12
***************
*** 277,280 ****
--- 277,281 ----
{
int ssllevel = [ rsmPrefSSLLevel indexOfSelectedItem ];
+ int zlevel = [ rsmPrefCompressionLevelPopUp indexOfSelectedItem ];
NSArray *arglist = nil;
NSString *directory = [ rsmPrefRadmindDirectory stringValue ],
***************
*** 308,311 ****
--- 309,317 ----
arglist = [ arglist arrayByAddingObject: @"-U" ];
}
+ if ( [ rsmPrefEnableCompressionSwitch state ] == NSOnState ) {
+ arglist = [ arglist arrayByAddingObjectsFromArray:
+ [ NSArray arrayWithObjects: @"-Z",
+ [ NSString stringWithFormat: @"%d", zlevel ], nil ]];
+ }
return( arglist );
***************
*** 550,553 ****
--- 556,585 ----
}
+ - ( IBAction )toggleCompression: ( id )sender
+ {
+ BOOL compress = NO;
+
+ if ( [ sender state ] == NSOnState ) {
+ compress = YES;
+ [[ NSUserDefaults standardUserDefaults ]
+ setInteger: [ rsmPrefCompressionLevelPopUp indexOfSelectedItem ]
+ forKey: @"RadmindServerCompressionLevel" ];
+ } else {
+ [[ NSUserDefaults standardUserDefaults ]
+ removeObjectForKey: @"RadmindServerCompressionLevel" ];
+ }
+
+ [ rsmPrefCompressionLevelPopUp setEnabled: compress ];
+ [[ NSUserDefaults standardUserDefaults ]
+ setBool: compress forKey: @"RadmindServerCompressionEnabled" ];
+ }
+
+ - ( IBAction )setCompressionLevel: ( id )sender
+ {
+ [[ NSUserDefaults standardUserDefaults ]
+ setInteger: [ sender indexOfSelectedItem ]
+ forKey: @"RadmindServerCompressionLevel" ];
+ }
+
- ( IBAction )setCaseSensitivity: ( id )sender
{
***************
*** 684,689 ****
NSUserDefaults *d = [ NSUserDefaults standardUserDefaults ];
NSString *path, *port, *u, *max;
! BOOL userauth, caseInsensitive;
! int level = 0;
if (( path = [ d objectForKey: @"RadmindServerDirectoryPath" ] ) != nil ) {
--- 716,721 ----
NSUserDefaults *d = [ NSUserDefaults standardUserDefaults ];
NSString *path, *port, *u, *max;
! BOOL userauth, caseInsensitive, compress;
! int level = 0, zlevel = 0;
if (( path = [ d objectForKey: @"RadmindServerDirectoryPath" ] ) != nil ) {
***************
*** 705,708 ****
--- 737,748 ----
column: 0 ];
+ compress = [ d boolForKey: @"RadmindServerCompressionEnabled" ];
+ [ rsmPrefEnableCompressionSwitch setState: compress ];
+ if ( compress ) {
+ zlevel = [ d integerForKey: @"RadmindServerCompressionLevel" ];
+ [ rsmPrefCompressionLevelPopUp selectItemAtIndex: zlevel ];
+ [ rsmPrefCompressionLevelPopUp setEnabled: YES ];
+ }
+
userauth = [ d boolForKey: @"RadmindServerUserAuthentication" ];
[ rsmPrefUserAuthenticationSwitch setState: userauth ];
Index: RSMPreferences.h
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/rsm/RSMPreferences.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** RSMPreferences.h 14 Dec 2005 03:39:33 -0000 1.9
--- RSMPreferences.h 24 Feb 2006 22:10:42 -0000 1.10
***************
*** 17,20 ****
--- 17,22 ----
IBOutlet NSPanel *rsmPrefAllowedUsersPanel;
IBOutlet RASTableView *rsmPrefAllowedUsersTable;
+ IBOutlet NSPopUpButton *rsmPrefCompressionLevelPopUp;
+ IBOutlet NSButton *rsmPrefEnableCompressionSwitch;
IBOutlet NSTextField *rsmPrefMaxConnections;
IBOutlet NSTextField *rsmPrefRadmindDirectory;
***************
*** 59,62 ****
--- 61,66 ----
- ( IBAction )setUmask: ( id )sender;
- ( IBAction )setCaseSensitivity: ( id )sender;
+ - ( IBAction )toggleCompression: ( id )sender;
+ - ( IBAction )setCompressionLevel: ( id )sender;
- ( IBAction )toggleSessionRights: ( id )sender;
|
