[Radmind-commit] radmind-assistant RCMPreferences.h,1.22,1.23 RCMPreferences.m,1.38,1.39

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

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

Modified Files:
	RCMPreferences.h RCMPreferences.m 
Log Message:
Compression settings support.
RadmindUpdateMonitor toggle.
Modified server addition inteface.


Index: RCMPreferences.m
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/RCMPreferences.m,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** RCMPreferences.m	18 Nov 2005 15:21:40 -0000	1.38
--- RCMPreferences.m	24 Feb 2006 22:19:35 -0000	1.39
***************
*** 28,37 ****
  
  - ( void )awakeFromNib
! {
!     [[ NSNotificationCenter defaultCenter ] addObserver: self
!                 selector: @selector( enableAddServerButton: )
!                 name: NSControlTextDidChangeNotification
!                 object: nil ];
! 		
      radmindServerList = nil;
      certificateManager = nil;
--- 28,32 ----
  
  - ( void )awakeFromNib
! {		
      radmindServerList = nil;
      certificateManager = nil;
***************
*** 200,203 ****
--- 195,232 ----
  /* end required toolbar delegate methods */
  
+ /* update preferences from array of strings to array of dictionaries */
+ - ( void )updateServerListPreferences: ( NSArray * )serverList
+ {
+     NSMutableArray	*newServerArray = nil;
+     NSDictionary	*serverInfo = nil;
+     int			i;
+     
+     if ( [ serverList count ] &&
+ 	    [[ serverList objectAtIndex: 0 ] isKindOfClass: [ NSString class ]] ) {
+ 	newServerArray = [ NSMutableArray array ];
+ 	
+ 	for ( i = 0; i < [ serverList count ]; i++ ) {
+ 	    serverInfo = [ NSDictionary dictionaryWithObjectsAndKeys:
+ 			    [ serverList objectAtIndex: i ],
+ 				@"RadmindServerName",
+ 			    @"",
+ 				@"RadmindServerPort",
+ 			    [ NSNumber numberWithBool: NO ],
+ 				@"RadmindServerEnableCompression",
+ 			    [ NSNumber numberWithInt: 0 ],
+ 				@"RadmindServerCompressionLevel",
+ 			    nil ];
+ 	    [ newServerArray addObject: serverInfo ];
+ 	}
+ 	
+ 	[[ NSUserDefaults standardUserDefaults ]
+ 		setObject: newServerArray forKey: @"RadmindServers" ];
+     }
+     
+     [[ NSUserDefaults standardUserDefaults ]
+ 	    removeObjectForKey: @"radmindhosts" ];
+     [[ NSUserDefaults standardUserDefaults ] synchronize ];
+ }
+ 
  - ( void )prefsReload
  {
***************
*** 218,221 ****
--- 247,251 ----
      BOOL		postapply = [ defaults boolForKey: @"RAAlwaysPostProcess" ];
      BOOL		caseInsensitive = [ defaults boolForKey: @"RACaseInsensitive" ];
+     BOOL		rum = [ defaults boolForKey: @"RadmindUpdateMonitorEnabled" ];
      NSString		*username = [ defaults stringForKey:
                                          @"username" ];
***************
*** 223,227 ****
      NSNumber		*tlsLevel = [ defaults objectForKey:
                                      @"tlslevel" ];
!     int			port = [ defaults integerForKey: @"RadmindServerPort" ];
      int			i = 0;
      
--- 253,257 ----
      NSNumber		*tlsLevel = [ defaults objectForKey:
                                      @"tlslevel" ];
!     NSDictionary	*serverInfo = nil;
      int			i = 0;
      
***************
*** 233,236 ****
--- 263,272 ----
      [ prefRadmindHost setEnabled: NO ];
      
+     if ( defaultHosts != nil ) {
+ 	[ self updateServerListPreferences: defaultHosts ];
+     }
+     defaultHosts = [[ NSUserDefaults standardUserDefaults ]
+ 			objectForKey: @"RadmindServers" ];
+     
      if ( radmindServerList == nil ) {
          radmindServerList = [[ NSMutableArray alloc ] init ];
***************
*** 238,246 ****
      [ radmindServerList removeAllObjects ];
      [ radmindServerList addObjectsFromArray: defaultHosts ];
      for ( i = 0; i < [ radmindServerList count ]; i++ ) {
          [ prefRadmindHost insertItemWithTitle:
!                         [ radmindServerList objectAtIndex: i ]
                          atIndex: 0 ];
  	[ prefRadmindHost setEnabled: YES ];
      }
      
--- 274,316 ----
      [ radmindServerList removeAllObjects ];
      [ radmindServerList addObjectsFromArray: defaultHosts ];
+     
      for ( i = 0; i < [ radmindServerList count ]; i++ ) {
          [ prefRadmindHost insertItemWithTitle:
!                         [[ radmindServerList objectAtIndex: i ]
! 				objectForKey: @"RadmindServerName" ]
                          atIndex: 0 ];
  	[ prefRadmindHost setEnabled: YES ];
+ 	if ( serverInfo == nil ) {
+ 	    if ( [[[ radmindServerList objectAtIndex: i ]
+ 			objectForKey: @"RadmindServerName" ]
+ 			isEqualToString: radmind ] ) {
+ 		serverInfo = [ radmindServerList objectAtIndex: i ];
+ 	    }
+ 	}
+     }
+     
+     [ prefServerPortSummary setStringValue: @"" ];
+     [ prefServerCompressionSummary setStringValue: @"" ];
+     
+     if ( serverInfo != nil ) {
+ 	NSString	*portString = @"";
+ 	NSString	*compressionString = @"";
+ 	int		port, zlevel;
+ 	
+ 	if ( [ serverInfo objectForKey: @"RadmindServerPort" ] != nil ) {
+ 	    port = [[ serverInfo objectForKey: @"RadmindServerPort" ] intValue ];
+ 	    if ( port > 0 ) {
+ 		portString = [ NSString stringWithFormat: @"Port %d", port ];
+ 		[ prefServerPortSummary setStringValue: portString ];
+ 	    }
+ 	}
+ 	if ( [[ serverInfo objectForKey:
+ 		@"RadmindServerEnableCompression" ] intValue ] == (int)YES ) {
+ 	    zlevel = [[ serverInfo objectForKey:
+ 			@"RadmindServerCompressionLevel" ] intValue ];
+ 	    compressionString = [ NSString stringWithFormat:
+ 				    @"Compression level %d", zlevel ];
+ 	    [ prefServerCompressionSummary setStringValue: compressionString ];
+ 	}
      }
      
***************
*** 252,258 ****
      }
      
!     if ( port != 0 ) {
! 	[ prefRadmindServerPort setStringValue:
! 		[ NSString stringWithFormat: @"%d", port ]];
      }
      
--- 322,329 ----
      }
      
!     if ( rum ) {
! 	[ prefEnableRadmindUpdateMonitor setState: NSOnState ];
!     } else {
! 	[ prefEnableRadmindUpdateMonitor setState: NSOffState ];
      }
      
***************
*** 661,664 ****
--- 732,738 ----
      [ prefDeleteRadmindServerButton setEnabled: NO ];
      [ prefPanel makeKeyAndOrderFront: nil ];
+     [ prefRadmindServerSettingCompress setEnabled: NO ];
+     [ prefRadmindServerSettingCompressionLevel setEnabled: NO ];
+     [ prefRadmindServerSettingPort setStringValue: @"" ];
      [ NSApp beginSheet: prefEditRadmindListSheet
  	    modalForWindow: prefPanel
***************
*** 670,695 ****
  - ( IBAction )setDefaultServer: ( id )sender
  {
      [[ NSUserDefaults standardUserDefaults ] setObject: [ sender title ]
  						forKey: @"radmindhost" ];
  }
  
  - ( IBAction )setPort: ( id )sender
  {
      NSString			*portString = [ sender stringValue ];
!     int				port;
      
!     if ( portString == nil || [ portString length ] == 0 ) {
! 	[[ NSUserDefaults standardUserDefaults ]
! 	    removeObjectForKey: @"RadmindServerPort" ];
  	return;
      }
      
!     if (( port = [ portString intValue ] ) < 1 || port > 65535 ) {
  	NSLog( @"%@: invalid port number", portString );
  	return;
      }
      
      [[ NSUserDefaults standardUserDefaults ]
! 	    setInteger: port forKey: @"RadmindServerPort" ];
  }
  
--- 744,824 ----
  - ( IBAction )setDefaultServer: ( id )sender
  {
+     NSDictionary		*serverInfo = nil;
+     NSNumber			*port, *zlevel;
+     int				i, compress;
+     
      [[ NSUserDefaults standardUserDefaults ] setObject: [ sender title ]
  						forKey: @"radmindhost" ];
+ 	
+     /* remove old settings */
+     [[ NSUserDefaults standardUserDefaults ]
+ 	    removeObjectForKey: @"RadmindServerPort" ];
+     [[ NSUserDefaults standardUserDefaults ]
+ 	    removeObjectForKey: @"RadmindServerEnableCompression" ];
+     [[ NSUserDefaults standardUserDefaults ]
+ 	    removeObjectForKey: @"RadmindServerCompressionLevel" ];
+ 	    
+     for ( i = 0; i < [ radmindServerList count ]; i++ ) {
+ 	if ( [[[ radmindServerList objectAtIndex: i ]
+ 		    objectForKey: @"RadmindServerName" ]
+ 		    isEqualToString: [ sender title ]] ) {
+ 	    serverInfo = [ radmindServerList objectAtIndex: i ];
+ 	    break;
+ 	}
+     }
+     if ( serverInfo != nil ) {
+ 	port = [ serverInfo objectForKey: @"RadmindServerPort" ];
+ 	if ( port != nil ) {
+ 	    [[ NSUserDefaults standardUserDefaults ]
+ 		    setInteger: [ port intValue ] forKey: @"RadmindServerPort" ];
+ 	}
+ 	
+ 	compress = [[ serverInfo objectForKey:
+ 			@"RadmindServerEnableCompression" ] intValue ];
+ 	if ( compress ) {
+ 	    zlevel = [ serverInfo objectForKey: @"RadmindServerCompressionLevel" ];
+ 	    if ( zlevel == nil ) {
+ 		zlevel = [ NSNumber numberWithInt: 0 ];
+ 	    }
+ 	    [[ NSUserDefaults standardUserDefaults ]
+ 		    setInteger: [ zlevel intValue ]
+ 		    forKey: @"RadmindServerCompressionLevel" ];
+ 	    [[ NSUserDefaults standardUserDefaults ]
+ 		    setBool: YES
+ 		    forKey: @"RadmindServerEnableCompression" ];
+ 	}
+     }
+     
+     [ self prefsReload ];
  }
  
  - ( IBAction )setPort: ( id )sender
  {
+     NSMutableDictionary		*serverInfo = nil;
      NSString			*portString = [ sender stringValue ];
!     int				port, row;
      
!     row = [ prefRadmindServerTable selectedRow ];
!     if ( row < 0 || row > [ radmindServerList count ] ) {
  	return;
      }
      
!     serverInfo = [ NSMutableDictionary dictionaryWithDictionary:
! 		    [ radmindServerList objectAtIndex: row ]];
!     
!     if ( portString == nil || [ portString length ] == 0 ) {
! 	[ serverInfo removeObjectForKey: @"RadmindServerPort" ];
!     } else if (( port = [ portString intValue ] ) < 1 || port > 65535 ) {
  	NSLog( @"%@: invalid port number", portString );
  	return;
+     } else {
+ 	[ serverInfo setObject: [ NSNumber numberWithInt: port ]
+ 		forKey: @"RadmindServerPort" ];
      }
      
+     [ radmindServerList replaceObjectAtIndex: row
+ 	    withObject: serverInfo ];
      [[ NSUserDefaults standardUserDefaults ]
! 	    setObject: radmindServerList forKey: @"RadmindServers" ];
  }
  
***************
*** 744,749 ****
      rae = [[ RAAuthExec alloc ] init ];
      rc = [ rae executeTool: -1
! 		withArgs: [ NSArray arrayWithObjects: @"-A", @"EnableRUM", @"--",
! 			    ctl, [[ NSBundle mainBundle ] resourcePath ], nil ]
  		controller: nil ];
      [ rae release ];
--- 873,879 ----
      rae = [[ RAAuthExec alloc ] init ];
      rc = [ rae executeTool: -1
! 		withArgs: [ NSArray arrayWithObjects: @"-A",
! 			    @"EnableRUM", @"--", ctl,
! 			    [[ NSBundle mainBundle ] resourcePath ], nil ]
  		controller: nil ];
      [ rae release ];
***************
*** 757,760 ****
--- 887,893 ----
  	NSLog( @"Failed to launch RadmindUpdateMonitor" );
      }
+     
+     [[ NSUserDefaults standardUserDefaults ]
+ 	    setBool: YES forKey: @"RadmindUpdateMonitorEnabled" ];
  }
  
***************
*** 815,818 ****
--- 948,954 ----
  		[ asErrorDictionary objectForKey: NSAppleScriptErrorMessage ] );
      }
+     
+     [[ NSUserDefaults standardUserDefaults ]
+ 	    setBool: YES forKey: @"RadmindUpdateMonitorEnabled" ];
  }
  
***************
*** 821,825 ****
      NSString			*path = [ sender title ];
      
!     [[ NSUserDefaults standardUserDefaults ] setObject: path forKey: @"runfrompath" ];
  }
  
--- 957,962 ----
      NSString			*path = [ sender title ];
      
!     [[ NSUserDefaults standardUserDefaults ] setObject: path
! 	    forKey: @"runfrompath" ];
  }
  
***************
*** 834,838 ****
      
      editor = [ sender title ];
!     [[ NSUserDefaults standardUserDefaults ] setObject: editor forKey: @"transeditor" ];
  }
  
--- 971,976 ----
      
      editor = [ sender title ];
!     [[ NSUserDefaults standardUserDefaults ] setObject: editor
! 	    forKey: @"transeditor" ];
  }
  
***************
*** 1224,1228 ****
  - ( IBAction )addRadmindServerToTable: ( id )sender
  {
!     [ radmindServerList addObject: @"radmindserver.local" ];
      [ prefRadmindServerTable reloadData ];
      [ prefRadmindServerTable selectRow: ( [ radmindServerList count ] - 1 )
--- 1362,1371 ----
  - ( IBAction )addRadmindServerToTable: ( id )sender
  {
!     [ radmindServerList addObject:
! 	    [ NSDictionary dictionaryWithObjectsAndKeys:
! 		@"newserver.radmind.edu", @"RadmindServerName",
! 		[ NSNumber numberWithBool: NO ], @"RadmindServerEnableCompression",
! 		[ NSNumber numberWithInt: 0 ], @"RadmindServerCompressionLevel",
! 		nil ]];
      [ prefRadmindServerTable reloadData ];
      [ prefRadmindServerTable selectRow: ( [ radmindServerList count ] - 1 )
***************
*** 1246,1250 ****
      [[ NSUserDefaults standardUserDefaults ]
  	    setObject: radmindServerList
! 	    forKey: @"radmindhosts" ];
      [[ NSUserDefaults standardUserDefaults ] synchronize ];
  	
--- 1389,1393 ----
      [[ NSUserDefaults standardUserDefaults ]
  	    setObject: radmindServerList
! 	    forKey: @"RadmindServers" ];
      [[ NSUserDefaults standardUserDefaults ] synchronize ];
  	
***************
*** 1253,1314 ****
  }
  
! - ( IBAction )okEditServerTable: ( id )sender
  {
!     if ( radmindServerList != nil ) {
!         [[ NSUserDefaults standardUserDefaults ] setObject: radmindServerList
!                                                 forKey: @"radmindhosts" ];
! 	if ( [ radmindServerList count ] == 1 ) {
! 	    [[ NSUserDefaults standardUserDefaults ]
! 		    setObject: [ radmindServerList objectAtIndex: 0 ]
! 		    forKey: @"radmindhost" ];
! 	}
      }
!     [ prefEditRadmindListSheet orderOut: nil ];
!     [ NSApp endSheet: prefEditRadmindListSheet ];
!     [ prefPanel makeKeyAndOrderFront: nil ];
!     [ self prefsReload ];
  }
  
! - ( IBAction )addRadmindServer: ( id )sender
  {
!     NSUserDefaults		*defaults = nil;
!     NSMutableArray		*defaultServers = nil;
!     NSString			*newServer = nil;
      
!     defaults = [ NSUserDefaults standardUserDefaults ];
!     newServer = [ prefNewServerField stringValue ];
!     if (( defaultServers = [ defaults objectForKey: @"radmindhosts" ] ) == nil ) {
!         defaultServers = [ NSMutableArray array ];
      }
!     [ defaultServers addObject: newServer ];
!     [ defaults setObject: defaultServers forKey: @"radmindhosts" ];
      
!     [ prefRadmindHost insertItemWithTitle: newServer atIndex: 0 ];
!     [ prefRadmindHost selectItemWithTitle: newServer ];
      
!     [ prefNewServerSheet orderOut: nil ];
!     [ NSApp endSheet: prefNewServerSheet ];
!     [ prefPanel makeKeyAndOrderFront: nil ];
!     [ self prefsReload ];
  }
  
! - ( IBAction )cancelAddRadmindServer: ( id )sender
  {
!     [ prefNewServerSheet orderOut: nil ];
!     [ NSApp endSheet: prefNewServerSheet ];
      [ prefPanel makeKeyAndOrderFront: nil ];
      [ self prefsReload ];
  }
  
- - ( void )enableAddServerButton: ( NSNotification * )aNotification
- {
-     if ( [ aNotification object ] != prefNewServerField ) return;
-     
-     if ( [[ prefNewServerField stringValue ] length ] == 0 ) {
-             [ prefNewServerAddButton setEnabled: NO ];
-     } else {
-         [ prefNewServerAddButton setEnabled: YES ];
-     }
- }
  
  - ( IBAction )chooseAlternateEditor: ( id )sender
--- 1396,1493 ----
  }
  
! - ( IBAction )setCompressionLevel: ( id )sender
  {
!     NSMutableDictionary	*serverInfo = nil;
!     int			zlevel = [ sender indexOfSelectedItem ];
!     int			row = [ prefRadmindServerTable selectedRow ];
!     
!     if ( row < 0 || row >= [ radmindServerList count ] ) {
! 	return;
      }
!     
!     serverInfo = [ NSMutableDictionary dictionaryWithDictionary:
! 		    [ radmindServerList objectAtIndex: row ]];
!     
!     if ( zlevel < 0 || zlevel > 9 ) {
! 	zlevel = 0;
!     }
!     
!     [ serverInfo setObject: [ NSNumber numberWithInt: zlevel ]
! 	    forKey: @"RadmindServerCompressionLevel" ];
!     [ radmindServerList replaceObjectAtIndex: row
! 	    withObject: serverInfo ];
! 	    
!     [[ NSUserDefaults standardUserDefaults ]
! 	    setObject: radmindServerList
! 	    forKey: @"RadmindServers" ];
  }
  
! - ( IBAction )toggleCompressionSwitch: ( id )sender
  {
!     NSMutableDictionary	*serverInfo = nil;
!     BOOL		enableCompression = NO;
!     int			row = [ prefRadmindServerTable selectedRow ];
      
!     if ( [ sender state ] == NSOnState ) {
! 	enableCompression = YES;
      }
!     [ prefRadmindServerSettingCompressionLevel
! 	    setEnabled: enableCompression ];
      
!     if ( row < 0 || row >= [ radmindServerList count ] ) {
! 	return;
!     }
      
!     serverInfo = [ NSMutableDictionary dictionaryWithDictionary:
! 		    [ radmindServerList objectAtIndex: row ]];
!     
!     [ serverInfo setObject: [ NSNumber numberWithBool: enableCompression ]
! 	    forKey: @"RadmindServerEnableCompression" ];
!     [ radmindServerList replaceObjectAtIndex: row
! 	    withObject: serverInfo ];
! 	    
!     [[ NSUserDefaults standardUserDefaults ]
! 	    setObject: radmindServerList
! 	    forKey: @"RadmindServers" ];
  }
  
! - ( IBAction )okEditServerTable: ( id )sender
  {
!     if ( radmindServerList != nil ) {
!         [[ NSUserDefaults standardUserDefaults ] setObject: radmindServerList
!                                                 forKey: @"RadmindServers" ];
! 	if ( [ radmindServerList count ] == 1 ) {
! 	    NSDictionary	*serverInfo = nil;
! 	    BOOL		compress = NO;
! 	    
! 	    serverInfo = [ radmindServerList objectAtIndex: 0 ];
! 	    
! 	    if ( [[ serverInfo objectForKey:
! 		    @"RadmindServerEnableCompression" ] intValue ] ) {
! 		compress = YES;
! 	    }
! 	    
! 	    [[ NSUserDefaults standardUserDefaults ]
! 		    setObject: [ serverInfo objectForKey: @"RadmindServerName" ]
! 		    forKey: @"radmindhost" ];
! 	    [[ NSUserDefaults standardUserDefaults ]
! 		    setObject: [ serverInfo objectForKey: @"RadmindServerPort" ]
! 		    forKey: @"RadmindServerPort" ];
! 	    [[ NSUserDefaults standardUserDefaults ]
! 		    setBool: compress
! 		    forKey: @"RadmindServerEnableCompression" ];
! 	    [[ NSUserDefaults standardUserDefaults ]
! 		    setInteger: [[ serverInfo objectForKey:
! 				    @"RadmindServerCompressionLevel" ]
! 				    intValue ]
! 		    forKey: @"RadmindServerCompressionLevel" ];
! 	}
!     }
!     [ prefEditRadmindListSheet orderOut: nil ];
!     [ NSApp endSheet: prefEditRadmindListSheet ];
      [ prefPanel makeKeyAndOrderFront: nil ];
      [ self prefsReload ];
  }
  
  
  - ( IBAction )chooseAlternateEditor: ( id )sender
***************
*** 1379,1383 ****
          row: ( int )row
  {
!     return( [ radmindServerList objectAtIndex: row ] );
  }
  
--- 1558,1563 ----
          row: ( int )row
  {
!     return( [[ radmindServerList objectAtIndex: row ]
! 		objectForKey: @"RadmindServerName" ] );
  }
  
***************
*** 1386,1394 ****
          row: ( int )row
  {
!     if ( ! [ obj isKindOfClass: [ NSString class ]] ) return;
!     if ( ! [ ( NSString * )obj length ] ) return;
!     if ( row < 0 || row > [ radmindServerList count ] ) return;
      
!     [ radmindServerList replaceObjectAtIndex: row withObject: obj ];
      [ prefRadmindServerTable reloadData ];
  }
--- 1566,1587 ----
          row: ( int )row
  {
!     NSMutableDictionary    *serverInfo = nil;
      
!     if ( ! [ obj isKindOfClass: [ NSString class ]] ) {
! 	return;
!     }
!     if ( ! [ ( NSString * )obj length ] ) {
! 	return;
!     }
!     if ( row < 0 || row > [ radmindServerList count ] ) {
! 	return;
!     }
!     
!     serverInfo = [ NSMutableDictionary dictionaryWithDictionary:
! 		    [ radmindServerList objectAtIndex: row ]];
!     [ serverInfo setObject: obj forKey: @"RadmindServerName" ];
!     
!     [ radmindServerList replaceObjectAtIndex: row
! 	    withObject: serverInfo ];
      [ prefRadmindServerTable reloadData ];
  }
***************
*** 1396,1406 ****
  - ( void )tableViewSelectionDidChange: ( NSNotification * )notification
  {
      BOOL	    enabled = NO;
      
!     if ( [ prefRadmindServerTable selectedRow ] >= 0 ) {
  	enabled = YES;
      }
      
      [ prefDeleteRadmindServerButton setEnabled: enabled ];
  }
  
--- 1589,1641 ----
  - ( void )tableViewSelectionDidChange: ( NSNotification * )notification
  {
+     NSArray	    *servers = nil;
+     NSDictionary    *serverInfo = nil;
+     NSNumber	    *port;
+     NSString	    *serverName;
      BOOL	    enabled = NO;
+     int		    row, compress = 0, zlevel = 0;
      
!     if (( row = [ prefRadmindServerTable selectedRow ] ) >= 0 ) {
  	enabled = YES;
      }
      
      [ prefDeleteRadmindServerButton setEnabled: enabled ];
+     
+     servers = [[ NSUserDefaults standardUserDefaults ]
+ 		    objectForKey: @"RadmindServers" ];
+     
+     [ prefRadmindServerSettingBox setTitle:
+ 	    NSLocalizedString( @"Server Settings", @"Server Settings" ) ];
+     [ prefRadmindServerSettingCompress setState: NSOffState ];
+     [ prefRadmindServerSettingCompress setEnabled: NO ];
+     [ prefRadmindServerSettingCompressionLevel setEnabled: NO ];
+     [ prefRadmindServerSettingCompressionLevel selectItemAtIndex: 0 ];
+     [ prefRadmindServerSettingPort setStringValue: @"" ];
+     [ prefRadmindServerSettingPort setEnabled: NO ];
+ 		    
+     if ( row < 0 || row >= [ servers count ] ) {
+ 	return;
+     }
+     
+     [ prefRadmindServerSettingCompress setEnabled: YES ];
+     [ prefRadmindServerSettingPort setEnabled: YES ];
+     
+     serverInfo = [ servers objectAtIndex: row ];
+     serverName = [ serverInfo objectForKey: @"RadmindServerName" ];
+     port = [ serverInfo objectForKey: @"RadmindServerPort" ];
+     compress = [[ serverInfo objectForKey:
+ 		@"RadmindServerEnableCompression" ] intValue ];
+     zlevel = [[ serverInfo objectForKey:
+ 		@"RadmindServerCompressionLevel" ] intValue ];
+ 		
+     [ prefRadmindServerSettingBox setTitle: serverName ];
+     if ( port != nil ) {
+ 	[ prefRadmindServerSettingPort setObjectValue: port ];
+     }
+     if ( compress ) {
+ 	[ prefRadmindServerSettingCompress setState: NSOnState ];
+ 	[ prefRadmindServerSettingCompressionLevel selectItemAtIndex: zlevel ];
+ 	[ prefRadmindServerSettingCompressionLevel setEnabled: YES ];
+     }
  }
  

Index: RCMPreferences.h
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/RCMPreferences.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** RCMPreferences.h	18 Nov 2005 15:21:40 -0000	1.22
--- RCMPreferences.h	24 Feb 2006 22:19:35 -0000	1.23
***************
*** 30,33 ****
--- 30,37 ----
      IBOutlet NSButton		*prefDeleteRadmindServerButton;
      IBOutlet NSTableView	*prefRadmindServerTable;
+     IBOutlet NSBox		*prefRadmindServerSettingBox; 
+     IBOutlet NSTextField	*prefRadmindServerSettingPort;
+     IBOutlet NSButton		*prefRadmindServerSettingCompress;
+     IBOutlet NSPopUpButton	*prefRadmindServerSettingCompressionLevel;
      
      /* general prefs view */
***************
*** 35,39 ****
      IBOutlet NSMatrix 		*prefGlobalCksum;
      IBOutlet NSPopUpButton 	*prefRadmindHost;
!     IBOutlet NSTextField	*prefRadmindServerPort;
      IBOutlet NSButton		*prefLapplyForce;
      IBOutlet NSButton		*prefIgnoreLcreateErrors;
--- 39,45 ----
      IBOutlet NSMatrix 		*prefGlobalCksum;
      IBOutlet NSPopUpButton 	*prefRadmindHost;
!     IBOutlet NSTextField	*prefServerCompressionSummary;
!     IBOutlet NSTextField	*prefServerPortSummary;
!     IBOutlet NSButton		*prefEnableRadmindUpdateMonitor;
      IBOutlet NSButton		*prefLapplyForce;
      IBOutlet NSButton		*prefIgnoreLcreateErrors;
***************
*** 125,131 ****
  
  - ( IBAction )editRadmindServerList: ( id )sender;
! - ( IBAction )addRadmindServer: ( id )sender;
! - ( IBAction )cancelAddRadmindServer: ( id )sender;
! 
  - ( IBAction )deleteRadmindServerFromTable: ( id )sender;
  - ( IBAction )okEditServerTable: ( id )sender;
--- 131,137 ----
  
  - ( IBAction )editRadmindServerList: ( id )sender;
! - ( IBAction )setCompressionLevel: ( id )sender;
! - ( IBAction )toggleCompressionSwitch: ( id )sender;
! - ( IBAction )addRadmindServerToTable: ( id )sender;
  - ( IBAction )deleteRadmindServerFromTable: ( id )sender;
  - ( IBAction )okEditServerTable: ( id )sender;