[Radmind-commit] radmind-assistant RCMStepController.m,1.101,1.102

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

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

Modified Files:
	RCMStepController.m 
Log Message:
Compression settings support.
Use bundle ID to locate and launch Server Manager.


Index: RCMStepController.m
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/RCMStepController.m,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** RCMStepController.m	2 Dec 2005 16:32:20 -0000	1.101
--- RCMStepController.m	24 Feb 2006 22:20:43 -0000	1.102
***************
*** 1151,1154 ****
--- 1151,1155 ----
      int             toolforstep = 0, uauth = 0, rc;
      int             tlslevel = 0, port;
+     int		    zlevel = 0;
  
      NSNumber        *tL = [[ NSUserDefaults standardUserDefaults ]
***************
*** 1189,1193 ****
  			[ NSString stringWithFormat: @"%d", port ], nil ]];
  	}
! 	
          [ argv retain ];
          break;
--- 1190,1201 ----
  			[ NSString stringWithFormat: @"%d", port ], nil ]];
  	}
! 	if ( [[ NSUserDefaults standardUserDefaults ]
! 		boolForKey: @"RadmindServerEnableCompression" ] == YES ) {
! 	    zlevel = [[ NSUserDefaults standardUserDefaults ]
! 			integerForKey: @"RadmindServerCompressionLevel" ];
! 	    argv = [ argv arrayByAddingObjectsFromArray:
! 			[ NSArray arrayWithObjects: @"-Z",
! 			[ NSString stringWithFormat: @"%d", zlevel ], nil ]];
! 	}
          [ argv retain ];
          break;
***************
*** 1329,1332 ****
--- 1337,1348 ----
  				[ NSString stringWithFormat: @"%d", port ], nil ]];
  		}
+ 		if ( [[ NSUserDefaults standardUserDefaults ]
+ 			boolForKey: @"RadmindServerEnableCompression" ] == YES ) {
+ 		    zlevel = [[ NSUserDefaults standardUserDefaults ]
+ 				integerForKey: @"RadmindServerCompressionLevel" ];
+ 		    argv = [ argv arrayByAddingObjectsFromArray:
+ 				[ NSArray arrayWithObjects: @"-Z",
+ 				[ NSString stringWithFormat: @"%d", zlevel ], nil ]];
+ 		}
                  
                  argv = [ argv arrayByAddingObjectsFromArray:
***************
*** 1368,1371 ****
--- 1384,1395 ----
  			    [ NSString stringWithFormat: @"%d", port ], nil ]];
  	    }
+ 	    if ( [[ NSUserDefaults standardUserDefaults ]
+ 		    boolForKey: @"RadmindServerEnableCompression" ] == YES ) {
+ 		zlevel = [[ NSUserDefaults standardUserDefaults ]
+ 			    integerForKey: @"RadmindServerCompressionLevel" ];
+ 		argv = [ argv arrayByAddingObjectsFromArray:
+ 			    [ NSArray arrayWithObjects: @"-Z",
+ 			    [ NSString stringWithFormat: @"%d", zlevel ], nil ]];
+ 	    }
              
              argv = [ argv arrayByAddingObjectsFromArray: [ NSArray arrayWithObjects:
***************
*** 2067,2080 ****
  - ( IBAction )openServerManager: ( id )sender
  {
!     NSString		*smpath = [[ NSBundle mainBundle ] pathForResource:
  					@"Radmind Server Manager"
  					ofType: @"app" ];
! 					
!     if ( smpath == nil ) {
! 	NSRunAlertPanel( @"Couldn't locate Radmind Server Manager!",
! 		@"The Radmind Assistant couldn't open the Radmind Server Manager "
! 		@"because the Server Manager could not be found. Please reinstall "
! 		@"the Radmind Assistant.", @"OK", @"", @"" );
! 	exit( 2 );
      }
      
--- 2091,2111 ----
  - ( IBAction )openServerManager: ( id )sender
  {
!     NSString		*smpath;
!     NSString		*bundleID = @"edu.umich.radmindservermanager";
!     
!     smpath = [[ NSWorkspace sharedWorkspace ]
! 		absolutePathForAppBundleWithIdentifier: bundleID ];
!     if ( smpath == nil ) {
! 	/* check in resource dir */
! 	smpath = [[ NSBundle mainBundle ] pathForResource:
  					@"Radmind Server Manager"
  					ofType: @"app" ];
! 	if ( smpath == nil ) {
! 	    NSRunAlertPanel( @"Couldn't locate Radmind Server Manager!",
! 		    @"The Radmind Assistant couldn't open the Radmind Server Manager "
! 		    @"because the Server Manager could not be found. Please reinstall "
! 		    @"the Radmind Assistant.", @"OK", @"", @"" );
! 	    exit( 2 );
! 	}
      }