[Radmind-commit] radmind-assistant/rsm RSMPreferences.h,1.10,1.11 RSMPreferences.m,1.12,1.13

[Andrew M. <fit...@us...>]

Update of /cvsroot/radmind/radmind-assistant/rsm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv683

Modified Files:
	RSMPreferences.h RSMPreferences.m 
Log Message:
Removed unnecessary "Enable Compression" switch in favor of pop-up.


Index: RSMPreferences.m
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/rsm/RSMPreferences.m,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** RSMPreferences.m	24 Feb 2006 22:10:42 -0000	1.12
--- RSMPreferences.m	8 Mar 2006 18:03:11 -0000	1.13
***************
*** 309,313 ****
          arglist = [ arglist arrayByAddingObject: @"-U" ];
      }
!     if ( [ rsmPrefEnableCompressionSwitch state ] == NSOnState ) {
  	arglist = [ arglist arrayByAddingObjectsFromArray:
  		    [ NSArray arrayWithObjects: @"-Z",
--- 309,313 ----
          arglist = [ arglist arrayByAddingObject: @"-U" ];
      }
!     if ( zlevel > 0 && zlevel < 10 ) {
  	arglist = [ arglist arrayByAddingObjectsFromArray:
  		    [ NSArray arrayWithObjects: @"-Z",
***************
*** 556,578 ****
  }
  
- - ( 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
  {
--- 556,559 ----
***************
*** 716,720 ****
      NSUserDefaults              *d = [ NSUserDefaults standardUserDefaults ];
      NSString                    *path, *port, *u, *max;
!     BOOL                        userauth, caseInsensitive, compress;
      int                         level = 0, zlevel = 0;
      
--- 697,701 ----
      NSUserDefaults              *d = [ NSUserDefaults standardUserDefaults ];
      NSString                    *path, *port, *u, *max;
!     BOOL                        userauth, caseInsensitive;
      int                         level = 0, zlevel = 0;
      
***************
*** 737,747 ****
  	    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" ];
--- 718,723 ----
  	    column: 0 ];
      
!     zlevel = [ d integerForKey: @"RadmindServerCompressionLevel" ];
!     [ rsmPrefCompressionLevelPopUp selectItemAtIndex: zlevel ];
      
      userauth = [ d boolForKey: @"RadmindServerUserAuthentication" ];

Index: RSMPreferences.h
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/rsm/RSMPreferences.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** RSMPreferences.h	24 Feb 2006 22:10:42 -0000	1.10
--- RSMPreferences.h	8 Mar 2006 18:03:11 -0000	1.11
***************
*** 18,22 ****
  	IBOutlet RASTableView   *rsmPrefAllowedUsersTable;
  	IBOutlet NSPopUpButton	*rsmPrefCompressionLevelPopUp;
- 	IBOutlet NSButton	*rsmPrefEnableCompressionSwitch;
  	IBOutlet NSTextField    *rsmPrefMaxConnections;
  	IBOutlet NSTextField    *rsmPrefRadmindDirectory;
--- 18,21 ----
***************
*** 61,65 ****
  - ( IBAction )setUmask: ( id )sender;
  - ( IBAction )setCaseSensitivity: ( id )sender;
- - ( IBAction )toggleCompression: ( id )sender;
  - ( IBAction )setCompressionLevel: ( id )sender;
  
--- 60,63 ----