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

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

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

Modified Files:
	RCMStepController.m 
Log Message:
Modified retrieval of compression prefs.
Improved package installation.


Index: RCMStepController.m
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/RCMStepController.m,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** RCMStepController.m	24 Feb 2006 22:20:43 -0000	1.102
--- RCMStepController.m	8 Mar 2006 18:40:17 -0000	1.103
***************
*** 492,509 ****
  - ( IBAction )installTools: ( id )sender
  {
      if ( ! [[ NSWorkspace sharedWorkspace ] openFile:
!             [[ NSBundle mainBundle ] pathForResource: @"RadmindTools"
                                          ofType: @"pkg" ]] ) {
!         NSBeginAlertSheet( NSLocalizedString( @"Error", @"Error" ),
!                 NSLocalizedString( @"OK", @"OK" ), @"", @"", stepperWindow, self,
!                 NULL, NULL, NULL,
!                 NSLocalizedString( @"Couldn't open Radmind Tool Installer! You may need to "
!                                         @"reinstall the Radmind Assistant before continuing.",
!                                     @"Couldn't open Radmind Tool Installer! You may need to "
!                                         @"reinstall the Radmind Assistant before continuing." ));
!         return;
      }
      
      [ self setNeedsToolUpdate: NO ];
  }
  
--- 492,521 ----
  - ( IBAction )installTools: ( id )sender
  {
+     NSString		*pkgName;
+     
+     pkgName = [[ NSBundle mainBundle ]
+ 		objectForInfoDictionaryKey:
+ 		@"RABundledRadmindToolsPackageName" ];
+     if ( pkgName == nil ) {
+ 	goto INSTALL_FAILED;
+     }
+     
      if ( ! [[ NSWorkspace sharedWorkspace ] openFile:
!             [[ NSBundle mainBundle ] pathForResource: pkgName
                                          ofType: @"pkg" ]] ) {
!         goto INSTALL_FAILED;
      }
      
      [ self setNeedsToolUpdate: NO ];
+     
+ INSTALL_FAILED:
+     NSBeginAlertSheet( NSLocalizedString( @"Error", @"Error" ),
+ 	    NSLocalizedString( @"OK", @"OK" ), @"", @"", stepperWindow, self,
+ 	    NULL, NULL, NULL,
+ 	    NSLocalizedString(
+ 		@"Couldn't open Radmind Tool Installer. You may need to "
+ 		    @"reinstall the Radmind Assistant before continuing.",
+ 		@"Couldn't open Radmind Tool Installer. You may need to "
+ 		    @"reinstall the Radmind Assistant before continuing." ));
  }
  
***************
*** 1190,1197 ****
  			[ NSString stringWithFormat: @"%d", port ], nil ]];
  	}
! 	if ( [[ NSUserDefaults standardUserDefaults ]
! 		boolForKey: @"RadmindServerEnableCompression" ] == YES ) {
! 	    zlevel = [[ NSUserDefaults standardUserDefaults ]
  			integerForKey: @"RadmindServerCompressionLevel" ];
  	    argv = [ argv arrayByAddingObjectsFromArray:
  			[ NSArray arrayWithObjects: @"-Z",
--- 1202,1208 ----
  			[ NSString stringWithFormat: @"%d", port ], nil ]];
  	}
! 	zlevel = [[ NSUserDefaults standardUserDefaults ]
  			integerForKey: @"RadmindServerCompressionLevel" ];
+ 	if ( zlevel > 1 && zlevel < 10 ) {
  	    argv = [ argv arrayByAddingObjectsFromArray:
  			[ NSArray arrayWithObjects: @"-Z",
***************
*** 1337,1344 ****
  				[ NSString stringWithFormat: @"%d", port ], nil ]];
  		}
! 		if ( [[ NSUserDefaults standardUserDefaults ]
! 			boolForKey: @"RadmindServerEnableCompression" ] == YES ) {
! 		    zlevel = [[ NSUserDefaults standardUserDefaults ]
  				integerForKey: @"RadmindServerCompressionLevel" ];
  		    argv = [ argv arrayByAddingObjectsFromArray:
  				[ NSArray arrayWithObjects: @"-Z",
--- 1348,1355 ----
  				[ NSString stringWithFormat: @"%d", port ], nil ]];
  		}
! 		
! 		zlevel = [[ NSUserDefaults standardUserDefaults ]
  				integerForKey: @"RadmindServerCompressionLevel" ];
+ 		if ( zlevel > 1 && zlevel < 10 ) {
  		    argv = [ argv arrayByAddingObjectsFromArray:
  				[ NSArray arrayWithObjects: @"-Z",
***************
*** 1384,1391 ****
  			    [ NSString stringWithFormat: @"%d", port ], nil ]];
  	    }
! 	    if ( [[ NSUserDefaults standardUserDefaults ]
! 		    boolForKey: @"RadmindServerEnableCompression" ] == YES ) {
! 		zlevel = [[ NSUserDefaults standardUserDefaults ]
  			    integerForKey: @"RadmindServerCompressionLevel" ];
  		argv = [ argv arrayByAddingObjectsFromArray:
  			    [ NSArray arrayWithObjects: @"-Z",
--- 1395,1402 ----
  			    [ NSString stringWithFormat: @"%d", port ], nil ]];
  	    }
! 	    
! 	    zlevel = [[ NSUserDefaults standardUserDefaults ]
  			    integerForKey: @"RadmindServerCompressionLevel" ];
+ 	    if ( zlevel > 1 && zlevel < 10 ) {
  		argv = [ argv arrayByAddingObjectsFromArray:
  			    [ NSArray arrayWithObjects: @"-Z",