Menu
▾
▴
radmind-commit — CVS commit messages.
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
(52) |
Mar
(83) |
Apr
(37) |
May
(23) |
Jun
(9) |
Jul
(10) |
Aug
(30) |
Sep
(4) |
Oct
(9) |
Nov
(10) |
Dec
(7) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(3) |
Feb
(20) |
Mar
(3) |
Apr
|
May
(10) |
Jun
(17) |
Jul
(11) |
Aug
(6) |
Sep
(6) |
Oct
|
Nov
(15) |
Dec
(15) |
| 2008 |
Jan
(12) |
Feb
(1) |
Mar
(13) |
Apr
(7) |
May
(4) |
Jun
(37) |
Jul
(9) |
Aug
(7) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2009 |
Jan
(1) |
Feb
(11) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2010 |
Jan
(3) |
Feb
(1) |
Mar
|
Apr
|
May
(2) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
|
Oct
(4) |
Nov
(6) |
Dec
(2) |
| 2011 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
|
Aug
|
Sep
(3) |
Oct
(3) |
Nov
(6) |
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
(3) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Andrew M. <fit...@us...> - 2006-10-28 02:54:01
|
Update of /cvsroot/radmind/radmind-assistant In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8270 Modified Files: RCMPreferences.h Log Message: Added missing variables to fix compiling. Index: RCMPreferences.h =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/RCMPreferences.h,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** RCMPreferences.h 14 Jul 2006 14:30:44 -0000 1.26 --- RCMPreferences.h 28 Oct 2006 02:53:55 -0000 1.27 *************** *** 54,57 **** --- 54,58 ---- /* user management view */ IBOutlet NSView *userManagementView; + IBOutlet NSTextField *prefMaxHomeLifeField; /* advanced prefs view */ *************** *** 110,113 **** --- 111,116 ---- - ( IBAction )deleteRadmindServerFromTable: ( id )sender; - ( IBAction )okEditServerTable: ( id )sender; + - ( IBAction )setPort: ( id )sender; + - ( IBAction )setCompressionLevel: ( id )sender; @end |
|
From: Andrew M. <fit...@us...> - 2006-10-27 02:44:34
|
Update of /cvsroot/radmind/radmind-assistant In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14310 Modified Files: RCMPreferences.m RCMStepController.m Log Message: Fix: Bug 1584644: Cannot generate case-insensitive transcripts Index: RCMStepController.m =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/RCMStepController.m,v retrieving revision 1.107 retrieving revision 1.108 diff -C2 -d -r1.107 -r1.108 *** RCMStepController.m 17 Apr 2006 15:44:43 -0000 1.107 --- RCMStepController.m 27 Oct 2006 02:44:31 -0000 1.108 *************** *** 45,48 **** --- 45,58 ---- "/usr/local/sbin/radmind", NULL }; + + ( void )initialize + { + /* register defaults */ + [[ NSUserDefaults standardUserDefaults ] registerDefaults: + [ NSDictionary dictionaryWithObject: + [ NSNumber numberWithBool: YES ] forKey:@"RACaseInsensitive" ]]; + + [ super initialize ]; + } + - ( id )init { Index: RCMPreferences.m =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/RCMPreferences.m,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** RCMPreferences.m 14 Jul 2006 14:30:45 -0000 1.45 --- RCMPreferences.m 27 Oct 2006 02:44:31 -0000 1.46 *************** *** 37,46 **** certificateManager = nil; scriptManager = nil; ! ! [ prefRadmindHost removeAllItems ]; ! #ifdef notdef [ prefRadmindServerTable setDataSource: self ]; [ prefRadmindServerTable setDelegate: self ]; - #endif notdef [ self toolbarSetup ]; [ self showGeneralPreferences: nil ]; --- 37,43 ---- certificateManager = nil; scriptManager = nil; ! [ prefRadmindServerTable setDataSource: self ]; [ prefRadmindServerTable setDelegate: self ]; [ self toolbarSetup ]; [ self showGeneralPreferences: nil ]; *************** *** 247,252 **** int i = 0; ! [ prefRadmindHost removeAllItems ]; ! [ prefRadmindHost setEnabled: NO ]; if ( defaultHosts != nil ) { --- 244,248 ---- int i = 0; ! [ prefRadmindHost setEnabled: YES ]; if ( defaultHosts != nil ) { *************** *** 261,265 **** [ radmindServerList removeAllObjects ]; [ radmindServerList addObjectsFromArray: defaultHosts ]; ! for ( i = 0; i < [ radmindServerList count ]; i++ ) { [ prefRadmindHost insertItemWithTitle: --- 257,261 ---- [ radmindServerList removeAllObjects ]; [ radmindServerList addObjectsFromArray: defaultHosts ]; ! #ifdef notdef for ( i = 0; i < [ radmindServerList count ]; i++ ) { [ prefRadmindHost insertItemWithTitle: *************** *** 276,280 **** } } ! [ prefServerPortSummary setStringValue: @"" ]; [ prefServerCompressionSummary setStringValue: @"" ]; --- 272,276 ---- } } ! #endif notdef [ prefServerPortSummary setStringValue: @"" ]; [ prefServerCompressionSummary setStringValue: @"" ]; *************** *** 303,314 **** } } ! ! if ( radmind != nil ) { ! if ( ! [[ prefRadmindHost itemTitles ] containsObject: radmind ] ) { ! [ prefRadmindHost insertItemWithTitle: radmind atIndex: 0 ]; ! } ! [ prefRadmindHost selectItemWithTitle: radmind ]; ! } ! if ( rum ) { [ prefEnableRadmindUpdateMonitor setState: NSOnState ]; --- 299,303 ---- } } ! if ( rum ) { [ prefEnableRadmindUpdateMonitor setState: NSOnState ]; *************** *** 403,409 **** --- 392,410 ---- - ( void )showUserManagementSettings: ( id )sender { + int maxlife; + if ( [[ prefPanel contentView ] isEqualTo: userManagementView ] ) { return; } + + if (( maxlife = [[[[[ NSUserDefaults standardUserDefaults ] + objectForKey: @"UMMaxHomeLife" ] + componentsSeparatedByString: @" " ] + objectAtIndex: 0 ] intValue ] ) == 0 ) { + maxlife = 24; + } + [ prefMaxHomeLifeField setStringValue: + [ NSString stringWithFormat: @"%d", maxlife ]]; + [ contentBox setContentView: nil ]; [ prefPanel resizeForContentView: userManagementView ]; |
|
From: Andrew M. <fit...@us...> - 2006-10-20 14:32:11
|
Update of /cvsroot/radmind/radmind-assistant/rsm In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21589 Modified Files: RAServerController.m Log Message: Fix: 1554962 Server Manager can't run over the weekend. Mitigate problems when the session tmpdir goes missing by testing for its presence and creating it as needed. Index: RAServerController.m =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rsm/RAServerController.m,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** RAServerController.m 12 Dec 2005 16:26:02 -0000 1.17 --- RAServerController.m 20 Oct 2006 14:32:06 -0000 1.18 *************** *** 150,153 **** --- 150,174 ---- - ( NSString * )sessionTmpDirectory { + NSString *tmpdir; + BOOL tmpDirExists = NO, isDir = YES; + + /* + * make sure the tmpdir exists. If it's not there, create a new one. + */ + if ( _rsmTmpDirectory != nil ) { + tmpDirExists = [[ NSFileManager defaultManager ] + fileExistsAtPath: _rsmTmpDirectory + isDirectory: &isDir ]; + } + + if ( _rsmTmpDirectory == nil || !tmpDirExists ) { + tmpdir = [[ NSFileManager defaultManager ] + makeTemporaryDirectory: @"/tmp/.rsm.XXXXXX" + withMode: (mode_t)0700 ]; + if ( tmpdir == nil ) { + exit( 2 ); + } + [ self setSessionTmpDirectory: tmpdir ]; + } return( _rsmTmpDirectory ); } *************** *** 530,535 **** - ( IBAction )reloadServerInformation: ( id )sender { - NSString *tmpdir = nil; - if ( [ self isConfigFileEdited ] ) { int rc; --- 551,554 ---- *************** *** 562,576 **** [ hostsTable setDrawsStripes: YES ]; - /* create tmpdir for session */ - if ( [ self sessionTmpDirectory ] == nil ) { - tmpdir = [[ NSFileManager defaultManager ] - makeTemporaryDirectory: @"/tmp/.rsm.XXXXXX" - withMode: (mode_t)0700 ]; - if ( tmpdir == nil ) { - exit( 2 ); - } - [ self setSessionTmpDirectory: tmpdir ]; - } - [ self loadServerInfoWithCommand: RSM_REFRESHALL arguments: [ NSArray arrayWithObjects: --- 581,584 ---- |
|
From: Andrew M. <fit...@us...> - 2006-10-20 14:11:11
|
Update of /cvsroot/radmind/radmind-assistant/rsm In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12751 Modified Files: RAServerAuth.m Log Message: Fix: 1570432 Server Manager fails if Password not Provided. Set AuthorizationRef to NULL following a failure so subsequent AuthorizationCopyRights calls work. Index: RAServerAuth.m =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rsm/RAServerAuth.m,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** RAServerAuth.m 14 Dec 2005 03:41:11 -0000 1.14 --- RAServerAuth.m 20 Oct 2006 14:11:07 -0000 1.15 *************** *** 370,373 **** --- 370,374 ---- NSLog( @"AuthorizationCopyRights failed: error %d", (int)status ); AuthorizationFree( rsmAuthRef, kAuthorizationFlagDefaults ); + rsmAuthRef = NULL; return( -2 ); } |
|
From: Andrew M. <fit...@us...> - 2006-10-16 19:33:34
|
Update of /cvsroot/radmind/radmind-assistant/rsm/rsm.xcodeproj In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5023 Modified Files: project.pbxproj Log Message: Updated build settings for rsmauthtool. Index: project.pbxproj =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rsm/rsm.xcodeproj/project.pbxproj,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** project.pbxproj 10 Mar 2006 14:03:41 -0000 1.9 --- project.pbxproj 16 Oct 2006 19:33:22 -0000 1.10 *************** *** 129,163 **** /* End PBXBuildRule section */ - /* Begin PBXBuildStyle section */ - 4A9504CCFFE6A4B311CA0CBA /* Development */ = { - isa = PBXBuildStyle; - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - OPTIMIZATION_CFLAGS = "-O0"; - ZERO_LINK = YES; - }; - name = Development; - }; - 4A9504CDFFE6A4B311CA0CBA /* Deployment */ = { - isa = PBXBuildStyle; - buildSettings = { - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - ZERO_LINK = NO; - }; - name = Deployment; - }; - /* End PBXBuildStyle section */ - /* Begin PBXContainerItemProxy section */ ! 09EFC1BE099CE3C000A7D599 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; proxyType = 1; ! remoteGlobalIDString = 09EFC1B9099CE3A900A7D599; remoteInfo = rsmauthtool; }; --- 129,138 ---- /* End PBXBuildRule section */ /* Begin PBXContainerItemProxy section */ ! 0964CE450AE4154E0061FCC8 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; proxyType = 1; ! remoteGlobalIDString = 09EFC1B9099CE3A900A7D599 /* rsmauthtool */; remoteInfo = rsmauthtool; }; *************** *** 231,235 **** 09B119EF046CD15F00439ED6 /* RSMTranscriptTitleCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = RSMTranscriptTitleCell.m; sourceTree = "<group>"; }; 09C83D7A0469673C00A8002B /* rsmauthtool.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = rsmauthtool.c; sourceTree = "<group>"; }; - 09C83D7C04696A8500A8002B /* rsmauthtool */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = rsmauthtool; sourceTree = "<group>"; }; 09C83D7E0469880100A8002B /* RSMLoadsetEditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RSMLoadsetEditor.h; sourceTree = "<group>"; }; 09C83D7F0469880100A8002B /* RSMLoadsetEditor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RSMLoadsetEditor.m; sourceTree = "<group>"; }; --- 206,209 ---- *************** *** 479,483 **** 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */, 0966F55209490F6C0061D4EC /* Info.plist */, - 09C83D7C04696A8500A8002B /* rsmauthtool */, 097A47C5059754CC0099CC32 /* RSMLogger.nib */, 09FBACCB06485BEE0089C37B /* Preferences.nib */, --- 453,456 ---- *************** *** 545,568 **** 0966F55509490F6C0061D4EC /* PBXBuildRule */, ); - buildSettings = { - CC = "/usr/bin/gcc-3.3"; - CPLUSPLUS = "/usr/bin/g++-3.3"; - FRAMEWORK_SEARCH_PATHS = ""; - GCC_VERSION = 3.3; - HEADER_SEARCH_PATHS = ""; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ""; - OTHER_LDFLAGS = ""; - PRODUCT_NAME = "Radmind Server Manager"; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - WRAPPER_EXTENSION = app; - }; dependencies = ( ! 09EFC1BF099CE3C000A7D599 /* PBXTargetDependency */, ); name = "Radmind Server Manager"; --- 518,523 ---- 0966F55509490F6C0061D4EC /* PBXBuildRule */, ); dependencies = ( ! 0964CE460AE4154E0061FCC8 /* PBXTargetDependency */, ); name = "Radmind Server Manager"; *************** *** 581,592 **** buildRules = ( ); - buildSettings = { - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = "$(HOME)/bin"; - PREBINDING = NO; - PRODUCT_NAME = rsmauthtool; - ZERO_LINK = YES; - }; dependencies = ( ); --- 536,539 ---- *************** *** 602,611 **** isa = PBXProject; buildConfigurationList = 09943E7708980F78001810A0 /* Build configuration list for PBXProject "rsm" */; - buildSettings = { - }; - buildStyles = ( - 4A9504CCFFE6A4B311CA0CBA /* Development */, - 4A9504CDFFE6A4B311CA0CBA /* Deployment */, - ); hasScannedForEncodings = 1; mainGroup = 29B97314FDCFA39411CA2CEA /* rsm */; --- 549,552 ---- *************** *** 723,730 **** /* Begin PBXTargetDependency section */ ! 09EFC1BF099CE3C000A7D599 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 09EFC1B9099CE3A900A7D599 /* rsmauthtool */; ! targetProxy = 09EFC1BE099CE3C000A7D599 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ --- 664,671 ---- /* Begin PBXTargetDependency section */ ! 0964CE460AE4154E0061FCC8 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 09EFC1B9099CE3A900A7D599 /* rsmauthtool */; ! targetProxy = 0964CE450AE4154E0061FCC8 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ |
|
From: Patrick M. <ume...@us...> - 2006-10-13 20:22:33
|
Update of /cvsroot/radmind/radmind In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4207 Modified Files: ktcheck.c lapply.c Log Message: Fixed formatting and type-o Index: lapply.c =================================================================== RCS file: /cvsroot/radmind/radmind/lapply.c,v retrieving revision 1.133 retrieving revision 1.134 diff -C2 -d -r1.133 -r1.134 *** lapply.c 13 Oct 2006 20:20:20 -0000 1.133 --- lapply.c 13 Oct 2006 20:22:26 -0000 1.134 *************** *** 717,721 **** if ( network ) { if (( closesn( sn )) != 0 ) { ! fprintf( stderr, "can not close sn\n" ); exit( 2 ); } --- 717,721 ---- if ( network ) { if (( closesn( sn )) != 0 ) { ! fprintf( stderr, "cannot close sn\n" ); exit( 2 ); } Index: ktcheck.c =================================================================== RCS file: /cvsroot/radmind/radmind/ktcheck.c,v retrieving revision 1.113 retrieving revision 1.114 diff -C2 -d -r1.113 -r1.114 *** ktcheck.c 13 Oct 2006 20:20:20 -0000 1.113 --- ktcheck.c 13 Oct 2006 20:22:25 -0000 1.114 *************** *** 703,707 **** } if (( capa = get_capabilities( sn )) == NULL ) { ! exit( 2 ); } --- 703,707 ---- } if (( capa = get_capabilities( sn )) == NULL ) { ! exit( 2 ); } |
|
From: Patrick M. <ume...@us...> - 2006-10-13 20:20:24
|
Update of /cvsroot/radmind/radmind In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3311 Modified Files: connect.c connect.h ktcheck.c lapply.c lcreate.c lfdiff.c Log Message: Centralize v_logger code Index: connect.c =================================================================== RCS file: /cvsroot/radmind/radmind/connect.c,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** connect.c 24 Jan 2006 20:47:01 -0000 1.27 --- connect.c 13 Oct 2006 20:20:20 -0000 1.28 *************** *** 44,47 **** --- 44,54 ---- #endif + void + v_logger( char *line ) + { + printf( "<<< %s\n", line ); + return; + } + static SNET * connectsn2( struct sockaddr_in *sin ) Index: connect.h =================================================================== RCS file: /cvsroot/radmind/radmind/connect.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** connect.h 20 Mar 2006 18:16:45 -0000 1.12 --- connect.h 13 Oct 2006 20:20:20 -0000 1.13 *************** *** 25,26 **** --- 25,27 ---- char *trancksum, struct applefileinfo *afinfo ); int stor_response( SNET *sn, int *respcount, struct timeval * ); + void v_logger( char *string); Index: lcreate.c =================================================================== RCS file: /cvsroot/radmind/radmind/lcreate.c,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** lcreate.c 20 Mar 2006 17:57:51 -0000 1.86 --- lcreate.c 13 Oct 2006 20:20:20 -0000 1.87 *************** *** 69,79 **** extern char *ca, *cert, *privatekey; - static void - v_logger( char *line ) - { - printf( "<<< %s\n", line ); - return; - } - int main( int argc, char **argv ) --- 69,72 ---- Index: ktcheck.c =================================================================== RCS file: /cvsroot/radmind/radmind/ktcheck.c,v retrieving revision 1.112 retrieving revision 1.113 diff -C2 -d -r1.112 -r1.113 *** ktcheck.c 13 Oct 2006 18:49:59 -0000 1.112 --- ktcheck.c 13 Oct 2006 20:20:20 -0000 1.113 *************** *** 49,53 **** int cleandirs( char *path, struct llist *khead ); int clean_client_dir( void ); - void output( char* string); int check( SNET *sn, char *type, char *path); int createspecial( SNET *sn, struct list *special_list ); --- 49,52 ---- *************** *** 277,287 **** } - void - output( char *string ) - { - printf( "<<< %s\n", string ); - return; - } - int createspecial( SNET *sn, struct list *special_list ) --- 276,279 ---- *************** *** 610,614 **** case 'v': verbose = 1; ! logger = output; if ( isatty( fileno( stdout ))) { dodots = 1; --- 602,606 ---- case 'v': verbose = 1; ! logger = v_logger; if ( isatty( fileno( stdout ))) { dodots = 1; Index: lapply.c =================================================================== RCS file: /cvsroot/radmind/radmind/lapply.c,v retrieving revision 1.132 retrieving revision 1.133 diff -C2 -d -r1.132 -r1.133 *** lapply.c 6 May 2006 21:55:52 -0000 1.132 --- lapply.c 13 Oct 2006 20:20:20 -0000 1.133 *************** *** 72,76 **** void free_node( struct node *node ); int do_line( char *tline, int present, struct stat *st, SNET *sn ); - void output( char *string); struct node * --- 72,75 ---- *************** *** 99,109 **** } - void - output( char *string ) - { - printf( "<<< %s\n", string ); - return; - } - int do_line( char *tline, int present, struct stat *st, SNET *sn ) --- 98,101 ---- *************** *** 321,325 **** case 'v': verbose = 1; ! logger = output; if ( isatty( fileno( stdout ))) { dodots = 1; --- 313,317 ---- case 'v': verbose = 1; ! logger = v_logger; if ( isatty( fileno( stdout ))) { dodots = 1; Index: lfdiff.c =================================================================== RCS file: /cvsroot/radmind/radmind/lfdiff.c,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** lfdiff.c 20 Mar 2006 18:16:46 -0000 1.57 --- lfdiff.c 13 Oct 2006 20:20:20 -0000 1.58 *************** *** 38,43 **** #include "code.h" - void output( char* string); - void (*logger)( char * ) = NULL; extern struct timeval timeout; --- 38,41 ---- *************** *** 52,62 **** extern char *ca, *cert, *privatekey; - void - output( char *string ) - { - printf( "<<< %s\n", string ); - return; - } - static struct transcript * precedent_transcript( char *kfile, char *file, int where ) --- 50,53 ---- *************** *** 205,209 **** case 'v': verbose = 1; ! logger = output; if ( isatty( fileno( stdout ))) { dodots = 1; --- 196,200 ---- case 'v': verbose = 1; ! logger = v_logger; if ( isatty( fileno( stdout ))) { dodots = 1; |
|
From: Patrick M. <ume...@us...> - 2006-10-13 19:39:49
|
Update of /cvsroot/radmind/radmind In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20202 Modified Files: command.c Log Message: Formatting. Index: command.c =================================================================== RCS file: /cvsroot/radmind/radmind/command.c,v retrieving revision 1.129 retrieving revision 1.130 diff -C2 -d -r1.129 -r1.130 *** command.c 20 Mar 2006 17:57:51 -0000 1.129 --- command.c 13 Oct 2006 19:39:45 -0000 1.130 *************** *** 236,240 **** if ( strlen( av[ 1 ] ) + strlen( av[ 2 ] ) + ! strlen( remote_host) + 5 > MAXPATHLEN ) { syslog( LOG_WARNING, "Overflow attempt: %s/%s-%s longer than MAXPATHLEN", --- 236,240 ---- if ( strlen( av[ 1 ] ) + strlen( av[ 2 ] ) + ! strlen( remote_host ) + 5 > MAXPATHLEN ) { syslog( LOG_WARNING, "Overflow attempt: %s/%s-%s longer than MAXPATHLEN", |
|
From: Patrick M. <ume...@us...> - 2006-10-13 18:50:06
|
Update of /cvsroot/radmind/radmind In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv686 Modified Files: ktcheck.c Log Message: Corrected type-o Index: ktcheck.c =================================================================== RCS file: /cvsroot/radmind/radmind/ktcheck.c,v retrieving revision 1.111 retrieving revision 1.112 diff -C2 -d -r1.111 -r1.112 *** ktcheck.c 20 Mar 2006 18:16:46 -0000 1.111 --- ktcheck.c 13 Oct 2006 18:49:59 -0000 1.112 *************** *** 735,739 **** #endif /* HAVE_ZLIB */ ! /* Chack/get correct base command file */ switch( check( sn, "COMMAND", NULL )) { case 0: --- 735,739 ---- #endif /* HAVE_ZLIB */ ! /* Check/get correct base command file */ switch( check( sn, "COMMAND", NULL )) { case 0: |
|
From: Patrick M. <ume...@us...> - 2006-09-28 18:55:55
|
Update of /cvsroot/radmind/radmind In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12588 Modified Files: transcript.c Log Message: Do not checksum files that are going to be removed Index: transcript.c =================================================================== RCS file: /cvsroot/radmind/radmind/transcript.c,v retrieving revision 1.114 retrieving revision 1.115 diff -C2 -d -r1.114 -r1.115 *** transcript.c 17 Feb 2006 20:30:01 -0000 1.114 --- transcript.c 28 Sep 2006 18:55:52 -0000 1.115 *************** *** 218,221 **** --- 218,222 ---- char *epath; dev_t dev; + int print_minus = 0; #ifdef __APPLE__ *************** *** 248,252 **** if ( edit_path == APPLICABLE ) { if ( flag == PR_FS_ONLY ) { ! fprintf( outtran, "- " ); cur = fs; } else if ( flag == PR_STATUS_MINUS ) { --- 249,253 ---- if ( edit_path == APPLICABLE ) { if ( flag == PR_FS_ONLY ) { ! print_minus = 1; cur = fs; } else if ( flag == PR_STATUS_MINUS ) { *************** *** 255,262 **** } else if (( edit_path == CREATABLE ) && (( flag == PR_TRAN_ONLY ) || ( fs->pi_type == 'X' ))) { ! fprintf( outtran, "- " ); cur = &tran->t_pinfo; } if (( epath = encode( cur->pi_name )) == NULL ) { fprintf( stderr, "Filename too long: %s\n", cur->pi_name ); --- 256,267 ---- } else if (( edit_path == CREATABLE ) && (( flag == PR_TRAN_ONLY ) || ( fs->pi_type == 'X' ))) { ! print_minus = 1; cur = &tran->t_pinfo; } + if ( print_minus ) { + fprintf( outtran, "- " ); + } + if (( epath = encode( cur->pi_name )) == NULL ) { fprintf( stderr, "Filename too long: %s\n", cur->pi_name ); *************** *** 315,321 **** * it now. Note that this can only be the case if "cur" is the * filesystem, because transcript_parse() won't read lines without ! * checksums if they are enabled. */ ! if (( *cur->pi_cksum_b64 == '-' ) && cksum ) { if ( cur->pi_type == 'f' ) { if ( do_cksum( cur->pi_name, cur->pi_cksum_b64 ) < 0 ) { --- 320,327 ---- * it now. Note that this can only be the case if "cur" is the * filesystem, because transcript_parse() won't read lines without ! * checksums if they are enabled. But, don't get the checksum ! * if we are just going to remove the file. */ ! if (( *cur->pi_cksum_b64 == '-' ) && cksum && !print_minus ) { if ( cur->pi_type == 'f' ) { if ( do_cksum( cur->pi_name, cur->pi_cksum_b64 ) < 0 ) { |
|
From: Andrew M. <fit...@us...> - 2006-09-27 15:39:57
|
Update of /cvsroot/radmind/radmind/man In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25744/man Modified Files: radmind.8 Log Message: Restored -R option with note of deprecation. Index: radmind.8 =================================================================== RCS file: /cvsroot/radmind/radmind/man/radmind.8,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** radmind.8 22 Sep 2006 20:44:41 -0000 1.34 --- radmind.8 27 Sep 2006 15:39:53 -0000 1.35 *************** *** 6,10 **** .B radmind [ ! .B \-dBrUV ] [ .BI \-a\ bind-address --- 6,10 ---- .B radmind [ ! .B \-dBRrUV ] [ .BI \-a\ bind-address *************** *** 221,224 **** --- 221,228 ---- .BR 6662 . .TP 19 + .B \-R + register daemon as a Bonjour service. Deprecated in favor of + .BR \-B . + .TP 19 .B \-r use random seed file $RANDFILE if that environment variable is set, |
|
From: Andrew M. <fit...@us...> - 2006-09-22 20:44:45
|
Update of /cvsroot/radmind/radmind In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23312 Modified Files: config.h.in configure.ac configure daemon.c Log Message: Accepted patch 1562455: Use Updated DNSServiceDiscovery APIs. Use dns_sd.h instead of older DNSServiceDiscovery.h. Index: configure.ac =================================================================== RCS file: /cvsroot/radmind/radmind/configure.ac,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** configure.ac 23 May 2006 16:18:03 -0000 1.38 --- configure.ac 22 Sep 2006 20:44:41 -0000 1.39 *************** *** 66,73 **** ] ) CHECK_ZLIB - CHECK_ZEROCONF - # Miscellaneous: --- 66,72 ---- ] ) + AC_CHECK_HEADER([dns_sd.h], [AC_DEFINE(HAVE_DNSSD)], [], []) CHECK_ZLIB # Miscellaneous: Index: config.h.in =================================================================== RCS file: /cvsroot/radmind/radmind/config.h.in,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** config.h.in 22 Feb 2006 14:30:40 -0000 1.8 --- config.h.in 22 Sep 2006 20:44:41 -0000 1.9 *************** *** 26,29 **** --- 26,30 ---- #undef HAVE_SECURITY_PAM_APPL_H + #undef HAVE_DNSSD #undef HAVE_ZLIB Index: daemon.c =================================================================== RCS file: /cvsroot/radmind/radmind/daemon.c,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** daemon.c 12 Apr 2006 19:17:11 -0000 1.76 --- daemon.c 22 Sep 2006 20:44:41 -0000 1.77 *************** *** 32,38 **** * for zeroconf, currently only available on Mac OS X */ ! #ifdef HAVE_ZEROCONF ! #include <DNSServiceDiscovery/DNSServiceDiscovery.h> ! #endif /* HAVE_ZEROCONF */ #ifdef HAVE_ZLIB --- 32,38 ---- * for zeroconf, currently only available on Mac OS X */ ! #ifdef HAVE_DNSSD ! #include <dns_sd.h> ! #endif /* HAVE_DNSSD */ #ifdef HAVE_ZLIB *************** *** 87,124 **** } ! /* ! * Callback with return value of zeroconf name registration attempt ! */ ! #ifdef HAVE_ZEROCONF static void ! dnsreg_reply( DNSServiceRegistrationReplyErrorType rc, void *context ) { ! switch ( rc ) { ! case kDNSServiceDiscoveryNoError: ! syslog( LOG_INFO, "Rendezvous name now registered and active.\n" ); ! break; ! case kDNSServiceDiscoveryNameConflict: ! syslog( LOG_ERR, "Rendezvous name in use, please choose another.\n" ); ! break; ! default: ! syslog( LOG_ERR, "An error occurred registering the name.\n" ); ! break; } } ! /* ! * Register as a zeroconf service ! */ ! static dns_service_discovery_ref ! register_service( unsigned int port, DNSServiceRegistrationReply callback ) { ! dns_service_discovery_ref dsdref = NULL; ! dsdref = DNSServiceRegistrationCreate( "", "_radmind._tcp", "", ! port, "", callback, NULL ); ! return( dsdref ); } ! #endif /* HAVE_ZEROCONF */ int --- 87,127 ---- } ! #ifdef HAVE_DNSSD static void ! dnsreg_callback( DNSServiceRef dnssrv, DNSServiceFlags flags, ! DNSServiceErrorType error, const char *name, const char *regtype, ! const char *domain, void *context ) { ! if ( error == kDNSServiceErr_NoError ) { ! syslog( LOG_NOTICE, "DNSServiceRegister successful. Name: %s " ! "Type: %s Domain: %s", name, regtype, domain ); ! } else { ! syslog( LOG_ERR, "DNSServiceRegister error: %d", ( int )error ); } } ! static DNSServiceErrorType ! register_service( DNSServiceRef *dnssrv, unsigned int port, ! DNSServiceRegisterReply callback ) { ! DNSServiceErrorType err; ! /* see dns_sd.h for API details */ ! err = DNSServiceRegister( dnssrv, /* registered service */ ! 0, /* service flags */ ! 0, /* interface index */ ! NULL, /* service name */ ! "_radmind._tcp", /* service type */ ! NULL, /* domain */ ! NULL, /* SRV target host */ ! port, /* port */ ! 0, /* TXT len */ ! NULL, /* TXT record */ ! callback, /* callback */ ! NULL ); /* context pointer */ ! return( err ); } ! #endif /* HAVE_DNSSD */ int *************** *** 145,152 **** int status; struct rusage usage; ! #ifdef HAVE_ZEROCONF int regservice = 0; ! dns_service_discovery_ref mdnsref = NULL; ! #endif /* HAVE_ZEROCONF */ --- 148,156 ---- int status; struct rusage usage; ! #ifdef HAVE_DNSSD int regservice = 0; ! DNSServiceRef dnssrv; ! DNSServiceErrorType dnsreg_err; ! #endif /* HAVE_DNSSD */ *************** *** 159,163 **** b_addr.s_addr = htonl( INADDR_ANY ); ! while (( c = getopt( ac, av, "a:b:dD:F:fL:m:p:Ru:UVw:x:y:z:Z:" )) != EOF ) { switch ( c ) { case 'a' : /* bind address */ --- 163,168 ---- b_addr.s_addr = htonl( INADDR_ANY ); ! while (( c = getopt( ac, av, "a:Bb:dD:F:fL:m:p:Ru:UVw:x:y:z:Z:" )) ! != EOF ) { switch ( c ) { case 'a' : /* bind address */ *************** *** 168,171 **** --- 173,186 ---- break; + case 'B': /* register as a Bonjour service */ + case 'R': /* -R: deprecated in favor of -B */ + #ifdef HAVE_DNSSD + regservice = 1; + break; + #else /* HAVE_DNSSD */ + fprintf( stderr, "Bonjour not supported.\n" ); + exit( 1 ); + #endif /* HAVE_DNSSD */ + case 'b' : /* listen backlog */ backlog = atoi( optarg ); *************** *** 212,224 **** break; - case 'R' : /* register as Rendezvous service */ - #ifdef HAVE_ZEROCONF - regservice = 1; - break; - #else - fprintf( stderr, "Rendezvous not supported.\n" ); - exit( 1 ); - #endif /* HAVE_ZEROCONF */ - case 'u' : /* umask */ umask( (mode_t)strtol( optarg, (char **)NULL, 0 )); --- 227,230 ---- *************** *** 450,465 **** /* ! * Register as rendezvous service, if requested. * We have to wait till we've started * listening for this registration to work. */ ! #ifdef HAVE_ZEROCONF if ( regservice ) { ! mdnsref = register_service( sin.sin_port, dnsreg_reply ); ! if ( ! mdnsref ) { ! syslog( LOG_ERR, "Failed to register as rendezvous service." ); } } ! #endif /* HAVE_ZEROCONF */ /* --- 456,471 ---- /* ! * Register as Bonjour service, if requested. * We have to wait till we've started * listening for this registration to work. */ ! #ifdef HAVE_DNSSD if ( regservice ) { ! dnsreg_err = register_service( &dnssrv, sin.sin_port, dnsreg_callback ); ! if ( dnsreg_err != kDNSServiceErr_NoError ) { ! syslog( LOG_ERR, "Failed to register as a Bonjour service." ); } } ! #endif /* HAVE_DNSSD */ /* *************** *** 556,562 **** } ! #ifdef HAVE_ZEROCONF if ( regservice ) ! DNSServiceDiscoveryDeallocate( mdnsref ); ! #endif /* HAVE_ZEROCONF */ } --- 562,568 ---- } ! #ifdef HAVE_DNSSD if ( regservice ) ! DNSServiceRefDeallocate( dnssrv ); ! #endif /* HAVE_DNSSD */ } Index: configure =================================================================== RCS file: /cvsroot/radmind/radmind/configure,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** configure 1 Aug 2006 16:48:05 -0000 1.48 --- configure 22 Sep 2006 20:44:41 -0000 1.49 *************** *** 874,878 **** --with-ssl=DIR path to ssl --with-zlib=DIR path to zlib - --with-zeroconf=DIR path to zeroconf Some influential environment variables: --- 874,877 ---- *************** *** 5130,5133 **** --- 5129,5277 ---- fi + if test "${ac_cv_header_dns_sd_h+set}" = set; then + echo "$as_me:$LINENO: checking for dns_sd.h" >&5 + echo $ECHO_N "checking for dns_sd.h... $ECHO_C" >&6 + if test "${ac_cv_header_dns_sd_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi + echo "$as_me:$LINENO: result: $ac_cv_header_dns_sd_h" >&5 + echo "${ECHO_T}$ac_cv_header_dns_sd_h" >&6 + else + # Is the header compilable? + echo "$as_me:$LINENO: checking dns_sd.h usability" >&5 + echo $ECHO_N "checking dns_sd.h usability... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default + #include <dns_sd.h> + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 + echo "${ECHO_T}$ac_header_compiler" >&6 + + # Is the header present? + echo "$as_me:$LINENO: checking dns_sd.h presence" >&5 + echo $ECHO_N "checking dns_sd.h presence... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include <dns_sd.h> + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi + else + ac_cpp_err=yes + fi + if test -z "$ac_cpp_err"; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + rm -f conftest.err conftest.$ac_ext + echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: dns_sd.h: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: dns_sd.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: dns_sd.h: proceeding with the compiler's result" >&5 + echo "$as_me: WARNING: dns_sd.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: dns_sd.h: present but cannot be compiled" >&5 + echo "$as_me: WARNING: dns_sd.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: dns_sd.h: check for missing prerequisite headers?" >&5 + echo "$as_me: WARNING: dns_sd.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: dns_sd.h: see the Autoconf documentation" >&5 + echo "$as_me: WARNING: dns_sd.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: dns_sd.h: section \"Present But Cannot Be Compiled\"" >&5 + echo "$as_me: WARNING: dns_sd.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: dns_sd.h: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: dns_sd.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: dns_sd.h: in the future, the compiler will take precedence" >&5 + echo "$as_me: WARNING: dns_sd.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX + ## -------------------------------- ## + ## Report this to ra...@um... ## + ## -------------------------------- ## + _ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac + echo "$as_me:$LINENO: checking for dns_sd.h" >&5 + echo $ECHO_N "checking for dns_sd.h... $ECHO_C" >&6 + if test "${ac_cv_header_dns_sd_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_dns_sd_h=$ac_header_preproc + fi + echo "$as_me:$LINENO: result: $ac_cv_header_dns_sd_h" >&5 + echo "${ECHO_T}$ac_cv_header_dns_sd_h" >&6 + + fi + if test $ac_cv_header_dns_sd_h = yes; then + cat >>confdefs.h <<\_ACEOF + #define HAVE_DNSSD 1 + _ACEOF + + fi + + *************** *** 5177,5211 **** - echo "$as_me:$LINENO: checking for zeroconf" >&5 - echo $ECHO_N "checking for zeroconf... $ECHO_C" >&6 - zeroconfdirs="/usr /usr/local" - - # Check whether --with-zeroconf or --without-zeroconf was given. - if test "${with_zeroconf+set}" = set; then - withval="$with_zeroconf" - zeroconfdirs="$withval" - fi; - for dir in $zeroconfdirs; do - zcdir="$dir" - if test -f "$dir/include/DNSServiceDiscovery/DNSServiceDiscovery.h"; then - found_zeroconf="yes"; - CPPFLAGS="$CPPFLAGS -I$zcdir/include"; - break; - fi - done - if test x_$found_zeroconf != x_yes; then - echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6 - else - cat >>confdefs.h <<\_ACEOF - #define HAVE_ZEROCONF 1 - _ACEOF - - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - fi - - - # Miscellaneous: if test x_$GCC = x_yes; then --- 5321,5324 ---- |
|
From: Andrew M. <fit...@us...> - 2006-09-22 20:44:45
|
Update of /cvsroot/radmind/radmind/man In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23312/man Modified Files: radmind.8 Log Message: Accepted patch 1562455: Use Updated DNSServiceDiscovery APIs. Use dns_sd.h instead of older DNSServiceDiscovery.h. Index: radmind.8 =================================================================== RCS file: /cvsroot/radmind/radmind/man/radmind.8,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** radmind.8 4 Aug 2006 15:58:03 -0000 1.33 --- radmind.8 22 Sep 2006 20:44:41 -0000 1.34 *************** *** 6,10 **** .B radmind [ ! .B \-dRrUV ] [ .BI \-a\ bind-address --- 6,10 ---- .B radmind [ ! .B \-dBrUV ] [ .BI \-a\ bind-address *************** *** 189,192 **** --- 189,195 ---- (wildcard address). .TP 19 + .B \-B + register daemon as a Bonjour service + .TP 19 .BI \-b\ backlog Defines the maximum queue of pending connections to *************** *** 203,206 **** --- 206,212 ---- specifies to which syslog facility to log messages. .TP 19 + .B \-f + run in foreground + .TP 19 .BI \-L\ syslog-level specifies at which syslog level to log messages. *************** *** 215,221 **** .BR 6662 . .TP 19 - .BI \-R - registers daemon as a Rendezvous service (Mac OS X only). - .TP 19 .B \-r use random seed file $RANDFILE if that environment variable is set, --- 221,224 ---- |
|
From: Andrew M. <fit...@us...> - 2006-08-31 04:28:56
|
Update of /cvsroot/radmind/radmind-assistant/rte/RTE.xcodeproj In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8559/RTE.xcodeproj Modified Files: project.pbxproj Log Message: Added RTEEditableTableView class. Index: project.pbxproj =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rte/RTE.xcodeproj/project.pbxproj,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** project.pbxproj 29 Aug 2006 01:38:57 -0000 1.7 --- project.pbxproj 31 Aug 2006 04:28:53 -0000 1.8 *************** *** 90,93 **** --- 90,95 ---- 09D37D10054DC855009341C4 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5178166030AD6B001A8002B /* Security.framework */; }; 09D37D11054DC855009341C4 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 091C6DEC0545CA2A008EE6BD /* CoreFoundation.framework */; }; + 09D609320AA5E27200F83AA1 /* RTEEditableTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 09D609300AA5E27200F83AA1 /* RTEEditableTableView.h */; }; + 09D609330AA5E27300F83AA1 /* RTEEditableTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 09D609310AA5E27200F83AA1 /* RTEEditableTableView.m */; }; 09DD166B09AE7925007EA0B4 /* RTETwhichDisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = 09DD166909AE7925007EA0B4 /* RTETwhichDisplay.h */; }; 09DD166C09AE7925007EA0B4 /* RTETwhichDisplay.m in Sources */ = {isa = PBXBuildFile; fileRef = 09DD166A09AE7925007EA0B4 /* RTETwhichDisplay.m */; }; *************** *** 162,165 **** --- 164,169 ---- 09D37D13054DC855009341C4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; 09D37D14054DC855009341C4 /* Radmind Transcript Editor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Radmind Transcript Editor.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 09D609300AA5E27200F83AA1 /* RTEEditableTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTEEditableTableView.h; sourceTree = "<group>"; }; + 09D609310AA5E27200F83AA1 /* RTEEditableTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RTEEditableTableView.m; sourceTree = "<group>"; }; 09DD166909AE7925007EA0B4 /* RTETwhichDisplay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTETwhichDisplay.h; sourceTree = "<group>"; }; 09DD166A09AE7925007EA0B4 /* RTETwhichDisplay.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RTETwhichDisplay.m; sourceTree = "<group>"; }; *************** *** 269,272 **** --- 273,278 ---- F57FF63E0369B2C501D5EA79 /* RXTableView.h */, F57FF63F0369B2C501D5EA79 /* RXTableView.m */, + 09D609300AA5E27200F83AA1 /* RTEEditableTableView.h */, + 09D609310AA5E27200F83AA1 /* RTEEditableTableView.m */, 09E600F205501DBD00B7BA4B /* RTESearchField.h */, 09E600F305501DBD00B7BA4B /* RTESearchField.m */, *************** *** 487,490 **** --- 493,497 ---- 09C1BB2909FE6F250092498C /* NSPanel(Resizing).h in Headers */, 09AA3ABC0A7F063E0022721C /* UMArrayController.h in Headers */, + 09D609320AA5E27200F83AA1 /* RTEEditableTableView.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; *************** *** 638,641 **** --- 645,649 ---- 09C1BB2A09FE6F250092498C /* NSPanel(Resizing).m in Sources */, 09AA3ABD0A7F063E0022721C /* UMArrayController.m in Sources */, + 09D609330AA5E27300F83AA1 /* RTEEditableTableView.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; |
|
From: Andrew M. <fit...@us...> - 2006-08-31 04:27:39
|
Update of /cvsroot/radmind/radmind-assistant/rte/English.lproj/RXPrefs.nib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8170/English.lproj/RXPrefs.nib Modified Files: classes.nib keyedobjects.nib Log Message: Added switch for negateBoolean. Index: classes.nib =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rte/English.lproj/RXPrefs.nib/classes.nib,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** classes.nib 29 Aug 2006 01:33:29 -0000 1.8 --- classes.nib 31 Aug 2006 04:27:36 -0000 1.9 *************** *** 2,7 **** IBClasses = ( {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, { ! ACTIONS = {setAuthorizationTimeout = id; toggleSessionRights = id; }; CLASS = RXPrefs; LANGUAGE = ObjC; --- 2,9 ---- IBClasses = ( {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, + {CLASS = NSObject; LANGUAGE = ObjC; }, + {CLASS = RTEEditableTableView; LANGUAGE = ObjC; SUPERCLASS = NSTableView; }, { ! ACTIONS = {saveSelection = id; setAuthorizationTimeout = id; toggleSessionRights = id; }; CLASS = RXPrefs; LANGUAGE = ObjC; Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rte/English.lproj/RXPrefs.nib/keyedobjects.nib,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 Binary files /tmp/cvs1lr3mM and /tmp/cvsm0Lvk1 differ |
|
From: Andrew M. <fit...@us...> - 2006-08-31 04:26:46
|
Update of /cvsroot/radmind/radmind-assistant/rte In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7762 Modified Files: UMArrayController.m Log Message: Override super's remove: to delete filter from disk as well as array. Index: UMArrayController.m =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rte/UMArrayController.m,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** UMArrayController.m 29 Aug 2006 01:25:23 -0000 1.1 --- UMArrayController.m 31 Aug 2006 04:26:43 -0000 1.2 *************** *** 1,4 **** --- 1,6 ---- #import "UMArrayController.h" + #include <unistd.h> + @implementation UMArrayController *************** *** 99,101 **** --- 101,138 ---- } + - ( void )remove: ( id )sender + { + NSString *filterName; + NSString *filterPath; + id tmp, object; + + tmp = [ self selectedObjects ]; + object = [ tmp objectAtIndex: 0 ]; + + filterName = [ object objectForKey: @"filterName" ]; + + if ( floor( NSAppKitVersionNumber ) <= NSAppKitVersionNumber10_3 ) { + /* 10.3 doesn't have NSApplicationSupportDirectory defined */ + tmp = [ NSArray arrayWithObject: + [ @"~/Library/Application Support" stringByExpandingTildeInPath ]]; + } else { + tmp = NSSearchPathForDirectoriesInDomains( + NSApplicationSupportDirectory, NSUserDomainMask, YES ); + } + + filterPath = [ NSString stringWithFormat: + @"%@/Radmind Transcript Editor/Filters/" + @"%@.transcriptFilter", + [ tmp objectAtIndex: 0 ], filterName ]; + + if ( unlink( [ filterPath UTF8String ] ) != 0 ) { + if ( errno != ENOENT ) { + /* XXX NSError subclass here */ + NSLog( @"Couldn't remove %@", filterPath ); + } + } + + [ super remove: sender ]; + } + @end |
|
From: Andrew M. <fit...@us...> - 2006-08-31 04:26:00
|
Update of /cvsroot/radmind/radmind-assistant/rte In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7382 Modified Files: RXPrefs.h RXPrefs.m Log Message: Filter saving methods. Index: RXPrefs.m =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rte/RXPrefs.m,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** RXPrefs.m 29 Aug 2006 01:28:54 -0000 1.10 --- RXPrefs.m 31 Aug 2006 04:25:57 -0000 1.11 *************** *** 31,34 **** --- 31,37 ---- #include <Security/AuthorizationDB.h> + #include <sys/types.h> + #include <sys/stat.h> + #include "sessionrights.h" *************** *** 60,72 **** } - - ( void )observeValueForKeyPath: ( NSString * )keyPath - ofObject: ( id )object change: ( NSDictionary * )change - context: ( void * )context - { - NSLog( @"keyPath: %@", keyPath ); - NSLog( @"object: %@", object ); - NSLog( @"%@", [ object valueForKeyPath: keyPath ] ); - } - - ( void )toolbarSetup { --- 63,66 ---- *************** *** 83,87 **** - ( void )awakeFromNib ! { [ self toolbarSetup ]; [ self showGeneralPreferences: nil ]; --- 77,81 ---- - ( void )awakeFromNib ! { [ self toolbarSetup ]; [ self showGeneralPreferences: nil ]; *************** *** 95,103 **** } - [ filterController addObserver: self - forKeyPath: @"arrangedObjects.filterName" - options: 0 - context: NULL ]; - [ prefPanel center ]; } --- 89,92 ---- *************** *** 217,220 **** --- 206,217 ---- } + - ( IBAction )saveSelection: ( id )sender + { + NSArray *objects = [ filterController selectedObjects ]; + id object = [ objects objectAtIndex: 0 ]; + + [ self saveFilter: object overwrite: YES ]; + } + - ( void )showAdvancedPreferences: ( id )sender { *************** *** 261,264 **** --- 258,266 ---- } + - ( id )transcriptFilterController + { + return( filterController ); + } + /* advanced preferences */ - ( IBAction )toggleSessionRights: ( id )sender *************** *** 309,311 **** --- 311,425 ---- } + #pragma mark RTEEditableTableView delegate methods + + - ( BOOL )handleChangedText: ( NSString * )text + forTable: ( NSTableView * )table + column: ( int )column + { + id editedObject; + int row = [ table editedRow ]; + + if ( text == nil || [ text length ] == 0 ) { + return( NO ); + } + + if ( row < 0 && row >= [[ filterController arrangedObjects ] count ] ) { + return( NO ); + } + + editedObject = [[ filterController arrangedObjects ] objectAtIndex: row ]; + if ( [ editedObject objectForKey: @"filterName" ] == nil ) { + return( NO ); + } + + [ self saveFilter: editedObject overwrite: NO ]; + + return( YES ); + } + + - ( void )tableView: ( NSTableView * )tableview willDisplayCell: ( id )cell + forTableColumn: ( NSTableColumn * )column row: ( int )row + { + id object, tmp; + + if ( row < 0 || row >= [[ filterController arrangedObjects ] count ] ) { + return; + } + + object = [[ filterController arrangedObjects ] objectAtIndex: row ]; + tmp = [ object objectForKey: @"immutable" ]; + + if ( tmp && [ tmp isKindOfClass: [ NSNumber class ]] && + [ tmp boolValue ] == YES ) { + [ cell setEditable: NO ]; + } + } + + #pragma mark Filter methods + + - ( BOOL )saveFilter: ( id )filter overwrite: ( BOOL )overwrite + { + NSString *savedPath; + id tmp; + BOOL exists = NO; + unsigned int i = 1; + + if ( floor( NSAppKitVersionNumber ) <= NSAppKitVersionNumber10_3 ) { + /* 10.3 doesn't have NSApplicationSupportDirectory defined */ + tmp = [ NSArray arrayWithObject: + [ @"~/Library/Application Support" stringByExpandingTildeInPath ]]; + } else { + tmp = NSSearchPathForDirectoriesInDomains( + NSApplicationSupportDirectory, NSUserDomainMask, YES ); + } + + savedPath = [[ tmp objectAtIndex: 0 ] stringByAppendingPathComponent: + @"Radmind Transcript Editor" ]; + if ( mkdir( [ savedPath UTF8String ], 0777 ) != 0 ) { + if ( errno != EEXIST ) { + /* XXX NSError subclass here */ + NSLog( @"mkdir %@: %s", savedPath, strerror( errno )); + return( NO ); + } + } + savedPath = [ savedPath stringByAppendingPathComponent: @"Filters" ]; + if ( mkdir( [ savedPath UTF8String ], 0777 ) != 0 ) { + if ( errno != EEXIST ) { + /* XXX NSError subclass here */ + NSLog( @"mkdir %@: %s", savedPath, strerror( errno )); + return( NO ); + } + } + + do { + savedPath = [[ tmp objectAtIndex: 0 ] stringByAppendingPathComponent: + @"Radmind Transcript Editor" ]; + savedPath = [ savedPath stringByAppendingPathComponent: @"Filters" ]; + savedPath = [ savedPath stringByAppendingPathComponent: + [ filter objectForKey: @"filterName" ]]; + if ( exists ) { + savedPath = [ savedPath stringByAppendingString: + [ NSString stringWithFormat: @" %u", i++ ]]; + } + exists = [[ NSFileManager defaultManager ] fileExistsAtPath: + [ savedPath stringByAppendingPathExtension: + @"transcriptFilter" ]]; + } while ( !overwrite && exists ); + + savedPath = [ savedPath stringByAppendingPathExtension: + @"transcriptFilter" ]; + + tmp = [[ savedPath lastPathComponent ] stringByDeletingPathExtension ]; + [ filter setObject: tmp forKey: @"filterName" ]; + if ( ![ filter writeToFile: savedPath atomically: YES ] ) { + /* XXX improved error handling, import NSError subclass */ + NSLog( @"Couldn't save %@", savedPath ); + return( NO ); + } + + [ filterController rearrangeObjects ]; + + return( YES ); + } + @end Index: RXPrefs.h =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rte/RXPrefs.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** RXPrefs.h 29 Aug 2006 01:28:54 -0000 1.10 --- RXPrefs.h 31 Aug 2006 04:25:57 -0000 1.11 *************** *** 50,59 **** --- 50,64 ---- - ( void )displayPreferencesPane; + - ( id )transcriptFilterController; - ( void )showGeneralPreferences: ( id )sender; - ( void )showAdvancedPreferences: ( id )sender; + - ( IBAction )saveSelection: ( id )sender; + /* advanced preferences actions */ - ( IBAction )toggleSessionRights: ( id )sender; - ( IBAction )setAuthorizationTimeout: ( id )sender; + - ( BOOL )saveFilter: ( id )filter overwrite: ( BOOL )overwrite; + @end |
|
From: Andrew M. <fit...@us...> - 2006-08-31 04:25:22
|
Update of /cvsroot/radmind/radmind-assistant/rte In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6978 Modified Files: RXAppController.m Log Message: KVO for creating and re-creating filter menu. Improved menu item tagging. Index: RXAppController.m =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rte/RXAppController.m,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** RXAppController.m 29 Aug 2006 01:26:52 -0000 1.7 --- RXAppController.m 31 Aug 2006 04:25:18 -0000 1.8 *************** *** 101,104 **** --- 101,112 ---- #endif notdef + - ( void )observeValueForKeyPath: ( NSString * )keyPath + ofObject: ( id )object + change: ( NSDictionary * )change + context: ( void * )context + { + [ self createFilterMenu ]; + } + - ( IBAction )getPrefPanel: ( id )sender { *************** *** 106,109 **** --- 114,122 ---- prefController = [[ RXPrefs alloc ] init ]; [ NSBundle loadNibNamed: @"RXPrefs" owner: prefController ]; + [[ prefController transcriptFilterController ] + addObserver: self + forKeyPath: @"arrangedObjects" + options: 0 + context: NULL ]; } *************** *** 163,170 **** continue; } - - /* set tag for menu item */ - [ filter setObject: [ NSNumber numberWithInt: tag ] - forKey: @"menuTag" ]; /* user cannot modify these */ --- 176,179 ---- *************** *** 229,233 **** for ( i = 0; i < [ tmp count ]; i++ ) { if (( filter = [ NSMutableDictionary dictionaryWithContentsOfFile: ! [ tmp objectAtIndex: i ]] ) == nil ) { NSLog( @"Couldn't read %@, skipping", [ tmp objectAtIndex: i ] ); --- 238,243 ---- for ( i = 0; i < [ tmp count ]; i++ ) { if (( filter = [ NSMutableDictionary dictionaryWithContentsOfFile: ! [ path stringByAppendingPathComponent: ! [ tmp objectAtIndex: i ]]] ) == nil ) { NSLog( @"Couldn't read %@, skipping", [ tmp objectAtIndex: i ] ); *************** *** 260,264 **** return( nil ); } ! return( [[ self transcriptFilters ] objectAtIndex: i ] ); } --- 270,274 ---- return( nil ); } ! return( [[ self transcriptFilters ] objectAtIndex: i ] ); } *************** *** 278,281 **** --- 288,292 ---- newFilterMenu = [[ NSMenu alloc ] initWithTitle: NSLocalizedString( @"Filters", @"Filters" ) ]; + for ( i = 0; i < [ filters count ]; i++ ) { title = [[ filters objectAtIndex: i ] objectForKey: @"filterName" ]; *************** *** 291,297 **** continue; } ! [ item setTag: [[[ filters objectAtIndex: i ] ! objectForKey: @"menuTag" ] intValue ]]; ! [ newFilterMenu insertItem: item atIndex: i ]; } --- 302,310 ---- continue; } ! ! [ item setTag: i ]; ! [[ filters objectAtIndex: i ] setObject: [ NSNumber numberWithInt: i ] ! forKey: @"menuTag" ]; ! [ newFilterMenu insertItem: item atIndex: i ]; } |
|
From: Andrew M. <fit...@us...> - 2006-08-31 04:22:04
|
Update of /cvsroot/radmind/radmind-assistant/rte In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5788 Added Files: RTEEditableTableView.h RTEEditableTableView.m Log Message: Basic editable tableview with delegated editing. --- NEW FILE: RTEEditableTableView.h --- /* * Copyright (c) 2006 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. */ #import <Cocoa/Cocoa.h> @interface RTEEditableTableView : NSTableView { } @end /* additional delegate methods */ @interface NSObject(RTEEditableTableViewEventDelegate) - ( BOOL )handleChangedText: ( NSString * )newstring forTable: ( RTEEditableTableView * )table column: ( int )column; @end --- NEW FILE: RTEEditableTableView.m --- /* * Copyright (c) 2005 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. */ #import "RTEEditableTableView.h" @implementation RTEEditableTableView - ( BOOL )needsPanelToBecomeKey { return( YES ); } - ( void )textDidEndEditing: ( NSNotification * )aNotification { int textMovement; textMovement = [[[ aNotification userInfo ] objectForKey: @"NSTextMovement" ] intValue ]; if ( textMovement == NSReturnTextMovement || textMovement == NSTabTextMovement || textMovement == NSBacktabTextMovement ) { int column = [ self editedColumn ]; if ( ! [[ self delegate ] respondsToSelector: @selector( handleChangedText:forTable:column: ) ] ) { NSBeep(); [ super textDidEndEditing: aNotification ]; return; } [[ self delegate ] handleChangedText: [[ aNotification object ] string ] forTable: self column: column ]; [[ self window ] endEditingFor: self ]; [[ self window ] makeFirstResponder: self ]; [ self reloadData ]; } [ super textDidEndEditing: aNotification ]; } @end |
|
From: Andrew M. <fit...@us...> - 2006-08-29 01:39:01
|
Update of /cvsroot/radmind/radmind-assistant/rte/RTE.xcodeproj In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31111/RTE.xcodeproj Modified Files: project.pbxproj Log Message: Updated references. Index: project.pbxproj =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rte/RTE.xcodeproj/project.pbxproj,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** project.pbxproj 10 Jul 2006 20:03:31 -0000 1.6 --- project.pbxproj 29 Aug 2006 01:38:57 -0000 1.7 *************** *** 11,16 **** 090F958407CE653500E8E8B5 /* RTEAuditorDisplay.m in Sources */ = {isa = PBXBuildFile; fileRef = 090F958207CE653500E8E8B5 /* RTEAuditorDisplay.m */; }; 090F95B107CE71DD00E8E8B5 /* AuditResults.nib in Resources */ = {isa = PBXBuildFile; fileRef = 090F95AF07CE71DD00E8E8B5 /* AuditResults.nib */; }; ! 09176A4907CC308B0087F7EB /* RTEAuditor.h in Headers */ = {isa = PBXBuildFile; fileRef = 09176A4707CC308B0087F7EB /* RTEAuditor.h */; }; ! 09176A4A07CC308B0087F7EB /* RTEAuditor.m in Sources */ = {isa = PBXBuildFile; fileRef = 09176A4807CC308B0087F7EB /* RTEAuditor.m */; }; 091EDEF605582A140036F26A /* RXPrefs.nib in Resources */ = {isa = PBXBuildFile; fileRef = 091EDEF405582A140036F26A /* RXPrefs.nib */; }; 091EDF2E05583F160036F26A /* NSArray(CreateArgv).h in Headers */ = {isa = PBXBuildFile; fileRef = 091EDF2C05583F160036F26A /* NSArray(CreateArgv).h */; }; --- 11,16 ---- 090F958407CE653500E8E8B5 /* RTEAuditorDisplay.m in Sources */ = {isa = PBXBuildFile; fileRef = 090F958207CE653500E8E8B5 /* RTEAuditorDisplay.m */; }; 090F95B107CE71DD00E8E8B5 /* AuditResults.nib in Resources */ = {isa = PBXBuildFile; fileRef = 090F95AF07CE71DD00E8E8B5 /* AuditResults.nib */; }; ! 09176A4907CC308B0087F7EB /* RTEFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 09176A4707CC308B0087F7EB /* RTEFilter.h */; }; ! 09176A4A07CC308B0087F7EB /* RTEFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = 09176A4807CC308B0087F7EB /* RTEFilter.m */; }; 091EDEF605582A140036F26A /* RXPrefs.nib in Resources */ = {isa = PBXBuildFile; fileRef = 091EDEF405582A140036F26A /* RXPrefs.nib */; }; 091EDF2E05583F160036F26A /* NSArray(CreateArgv).h in Headers */ = {isa = PBXBuildFile; fileRef = 091EDF2C05583F160036F26A /* NSArray(CreateArgv).h */; }; *************** *** 32,35 **** --- 32,37 ---- 09A6A939057BD335009E45A5 /* RTESearchField.h in Headers */ = {isa = PBXBuildFile; fileRef = 09E600F205501DBD00B7BA4B /* RTESearchField.h */; }; 09A6A93A057BD336009E45A5 /* RTESearchField.m in Sources */ = {isa = PBXBuildFile; fileRef = 09E600F305501DBD00B7BA4B /* RTESearchField.m */; }; + 09AA3ABC0A7F063E0022721C /* UMArrayController.h in Headers */ = {isa = PBXBuildFile; fileRef = 09AA3ABA0A7F063E0022721C /* UMArrayController.h */; }; + 09AA3ABD0A7F063E0022721C /* UMArrayController.m in Sources */ = {isa = PBXBuildFile; fileRef = 09AA3ABB0A7F063E0022721C /* UMArrayController.m */; }; 09C1BB0A09FE6C7A0092498C /* sessionrights.c in Sources */ = {isa = PBXBuildFile; fileRef = 09C1BB0809FE6C7A0092498C /* sessionrights.c */; }; 09C1BB0B09FE6C7A0092498C /* sessionrights.h in Headers */ = {isa = PBXBuildFile; fileRef = 09C1BB0909FE6C7A0092498C /* sessionrights.h */; }; *************** *** 120,125 **** 090F958207CE653500E8E8B5 /* RTEAuditorDisplay.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RTEAuditorDisplay.m; sourceTree = "<group>"; }; 090F95B007CE71DD00E8E8B5 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/AuditResults.nib; sourceTree = "<group>"; }; ! 09176A4707CC308B0087F7EB /* RTEAuditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTEAuditor.h; sourceTree = "<group>"; }; ! 09176A4807CC308B0087F7EB /* RTEAuditor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RTEAuditor.m; sourceTree = "<group>"; }; 091C6DEC0545CA2A008EE6BD /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; }; 091C6DF70545D4E2008EE6BD /* trash.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = trash.png; sourceTree = "<group>"; }; --- 122,127 ---- 090F958207CE653500E8E8B5 /* RTEAuditorDisplay.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RTEAuditorDisplay.m; sourceTree = "<group>"; }; 090F95B007CE71DD00E8E8B5 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/AuditResults.nib; sourceTree = "<group>"; }; ! 09176A4707CC308B0087F7EB /* RTEFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTEFilter.h; sourceTree = "<group>"; }; ! 09176A4807CC308B0087F7EB /* RTEFilter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RTEFilter.m; sourceTree = "<group>"; }; 091C6DEC0545CA2A008EE6BD /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; }; 091C6DF70545D4E2008EE6BD /* trash.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = trash.png; sourceTree = "<group>"; }; *************** *** 146,149 **** --- 148,153 ---- 09A3B7A90A3F3E05006F3297 /* comment.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = comment.png; sourceTree = "<group>"; }; 09A6A853057B8B8F009E45A5 /* newcomment.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = newcomment.png; sourceTree = "<group>"; }; + 09AA3ABA0A7F063E0022721C /* UMArrayController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UMArrayController.h; sourceTree = "<group>"; }; + 09AA3ABB0A7F063E0022721C /* UMArrayController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UMArrayController.m; sourceTree = "<group>"; }; 09C1BB0809FE6C7A0092498C /* sessionrights.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sessionrights.c; sourceTree = "<group>"; }; 09C1BB0909FE6C7A0092498C /* sessionrights.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sessionrights.h; sourceTree = "<group>"; }; *************** *** 259,262 **** --- 263,268 ---- isa = PBXGroup; children = ( + 09AA3ABA0A7F063E0022721C /* UMArrayController.h */, + 09AA3ABB0A7F063E0022721C /* UMArrayController.m */, 096AE99A07722BC800FFFBE8 /* RMSplitView.h */, 096AE99B07722BC800FFFBE8 /* RMSplitView.m */, *************** *** 332,337 **** 090F958107CE653500E8E8B5 /* RTEAuditorDisplay.h */, 090F958207CE653500E8E8B5 /* RTEAuditorDisplay.m */, ! 09176A4707CC308B0087F7EB /* RTEAuditor.h */, ! 09176A4807CC308B0087F7EB /* RTEAuditor.m */, 2A37F4AEFDCFA73011CA2CEA /* RXTranscript.h */, 2A37F4ACFDCFA73011CA2CEA /* RXTranscript.m */, --- 338,343 ---- 090F958107CE653500E8E8B5 /* RTEAuditorDisplay.h */, 090F958207CE653500E8E8B5 /* RTEAuditorDisplay.m */, ! 09176A4707CC308B0087F7EB /* RTEFilter.h */, ! 09176A4807CC308B0087F7EB /* RTEFilter.m */, 2A37F4AEFDCFA73011CA2CEA /* RXTranscript.h */, 2A37F4ACFDCFA73011CA2CEA /* RXTranscript.m */, *************** *** 473,477 **** 095BE12E06000E2E0065403C /* selfrepair.h in Headers */, 096AE99C07722BC800FFFBE8 /* RMSplitView.h in Headers */, ! 09176A4907CC308B0087F7EB /* RTEAuditor.h in Headers */, 090F958307CE653500E8E8B5 /* RTEAuditorDisplay.h in Headers */, 097ACC900975B90C0031FEFF /* UMWildcard.h in Headers */, --- 479,483 ---- 095BE12E06000E2E0065403C /* selfrepair.h in Headers */, 096AE99C07722BC800FFFBE8 /* RMSplitView.h in Headers */, ! 09176A4907CC308B0087F7EB /* RTEFilter.h in Headers */, 090F958307CE653500E8E8B5 /* RTEAuditorDisplay.h in Headers */, 097ACC900975B90C0031FEFF /* UMWildcard.h in Headers */, *************** *** 480,483 **** --- 486,490 ---- 09C1BB0B09FE6C7A0092498C /* sessionrights.h in Headers */, 09C1BB2909FE6F250092498C /* NSPanel(Resizing).h in Headers */, + 09AA3ABC0A7F063E0022721C /* UMArrayController.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; *************** *** 623,627 **** 095BE01205FEC2D40065403C /* NSAttributedString-Ellipsis.m in Sources */, 096AE99D07722BC800FFFBE8 /* RMSplitView.m in Sources */, ! 09176A4A07CC308B0087F7EB /* RTEAuditor.m in Sources */, 090F958407CE653500E8E8B5 /* RTEAuditorDisplay.m in Sources */, 097ACC910975B90C0031FEFF /* UMWildcard.m in Sources */, --- 630,634 ---- 095BE01205FEC2D40065403C /* NSAttributedString-Ellipsis.m in Sources */, 096AE99D07722BC800FFFBE8 /* RMSplitView.m in Sources */, ! 09176A4A07CC308B0087F7EB /* RTEFilter.m in Sources */, 090F958407CE653500E8E8B5 /* RTEAuditorDisplay.m in Sources */, 097ACC910975B90C0031FEFF /* UMWildcard.m in Sources */, *************** *** 630,633 **** --- 637,641 ---- 09C1BB0A09FE6C7A0092498C /* sessionrights.c in Sources */, 09C1BB2A09FE6F250092498C /* NSPanel(Resizing).m in Sources */, + 09AA3ABD0A7F063E0022721C /* UMArrayController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; |
|
From: Andrew M. <fit...@us...> - 2006-08-29 01:38:38
|
Update of /cvsroot/radmind/radmind-assistant/rte/English.lproj/RXTranscript.nib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30700/English.lproj/RXTranscript.nib Modified Files: classes.nib info.nib keyedobjects.nib Log Message: Added array controller for path display. Index: info.nib =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rte/English.lproj/RXTranscript.nib/info.nib,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** info.nib 6 Jun 2006 20:01:34 -0000 1.42 --- info.nib 29 Aug 2006 01:38:34 -0000 1.43 *************** *** 18,32 **** <string>348 627 181 87 0 0 1440 878 </string> <key>97</key> ! <string>451 462 538 285 0 0 1440 878 </string> </dict> <key>IBFramework Version</key> ! <string>443.0</string> <key>IBOpenObjects</key> <array> ! <integer>5</integer> <integer>821</integer> </array> <key>IBSystem Version</key> ! <string>8I1119</string> </dict> </plist> --- 18,33 ---- <string>348 627 181 87 0 0 1440 878 </string> <key>97</key> ! <string>451 444 538 285 0 0 1440 878 </string> </dict> <key>IBFramework Version</key> ! <string>446.1</string> <key>IBOpenObjects</key> <array> ! <integer>97</integer> <integer>821</integer> + <integer>5</integer> </array> <key>IBSystem Version</key> ! <string>8J2135a</string> </dict> </plist> Index: classes.nib =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rte/English.lproj/RXTranscript.nib/classes.nib,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** classes.nib 27 Mar 2006 16:22:04 -0000 1.24 --- classes.nib 29 Aug 2006 01:38:34 -0000 1.25 *************** *** 107,110 **** --- 107,116 ---- }; SUPERCLASS = NSDocument; + }, + { + ACTIONS = {search = id; }; + CLASS = UMArrayController; + LANGUAGE = ObjC; + SUPERCLASS = NSArrayController; } ); Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rte/English.lproj/RXTranscript.nib/keyedobjects.nib,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 Binary files /tmp/cvsyqhLXl and /tmp/cvsDFaBqj differ |
|
From: Andrew M. <fit...@us...> - 2006-08-29 01:33:32
|
Update of /cvsroot/radmind/radmind-assistant/rte/English.lproj/RXPrefs.nib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29092/English.lproj/RXPrefs.nib Modified Files: classes.nib info.nib keyedobjects.nib Log Message: Filter display support and outlets added. Index: info.nib =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rte/English.lproj/RXPrefs.nib/info.nib,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** info.nib 14 Jul 2006 14:26:48 -0000 1.7 --- info.nib 29 Aug 2006 01:33:29 -0000 1.8 *************** *** 7,10 **** --- 7,14 ---- <key>IBFramework Version</key> <string>446.1</string> + <key>IBLockedTabItems</key> + <array> + <integer>46</integer> + </array> <key>IBOpenObjects</key> <array> Index: classes.nib =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rte/English.lproj/RXPrefs.nib/classes.nib,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** classes.nib 14 Jul 2006 14:26:48 -0000 1.7 --- classes.nib 29 Aug 2006 01:33:29 -0000 1.8 *************** *** 7,13 **** --- 7,15 ---- LANGUAGE = ObjC; OUTLETS = { + filterController = UMArrayController; prefAdvancedPreferencesBox = NSBox; prefBasePathPopUp = NSPopUpButton; prefDefineRightsSwitch = NSButton; + prefFilterPreferencesBox = NSBox; prefGeneralPreferencesBox = NSBox; prefPanel = NSPanel; *************** *** 21,24 **** --- 23,33 ---- }; SUPERCLASS = NSObject; + }, + { + ACTIONS = {search = id; }; + CLASS = UMArrayController; + LANGUAGE = ObjC; + OUTLETS = {tableView = NSTableView; }; + SUPERCLASS = NSArrayController; } ); Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rte/English.lproj/RXPrefs.nib/keyedobjects.nib,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 Binary files /tmp/cvs5dF7v9 and /tmp/cvsicnbbp differ |
|
From: Andrew M. <fit...@us...> - 2006-08-29 01:32:57
|
Update of /cvsroot/radmind/radmind-assistant/rte/English.lproj/MainMenu.nib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28702/English.lproj/MainMenu.nib Modified Files: classes.nib info.nib objects.nib Log Message: Added filtersMenuItem outlet Index: info.nib =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rte/English.lproj/MainMenu.nib/info.nib,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** info.nib 12 Apr 2006 20:37:26 -0000 1.15 --- info.nib 29 Aug 2006 01:32:53 -0000 1.16 *************** *** 11,15 **** </dict> <key>IBFramework Version</key> ! <string>443.0</string> <key>IBOpenObjects</key> <array> --- 11,15 ---- </dict> <key>IBFramework Version</key> ! <string>446.1</string> <key>IBOpenObjects</key> <array> *************** *** 17,21 **** </array> <key>IBSystem Version</key> ! <string>8I1119</string> </dict> </plist> --- 17,21 ---- </array> <key>IBSystem Version</key> ! <string>8J2135a</string> </dict> </plist> Index: objects.nib =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rte/English.lproj/MainMenu.nib/objects.nib,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 Binary files /tmp/cvsVKoK26 and /tmp/cvsuZWuYd differ Index: classes.nib =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rte/English.lproj/MainMenu.nib/classes.nib,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** classes.nib 12 Apr 2006 20:37:26 -0000 1.15 --- classes.nib 29 Aug 2006 01:32:53 -0000 1.16 *************** *** 26,29 **** --- 26,30 ---- CLASS = RXAppController; LANGUAGE = ObjC; + OUTLETS = {filtersMenuItem = NSMenuItem; }; SUPERCLASS = NSObject; }, |
|
From: Andrew M. <fit...@us...> - 2006-08-29 01:32:26
|
Update of /cvsroot/radmind/radmind-assistant/rte In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28664 Modified Files: SharedActions.h Log Message: Added -applyFilterToTranscript: Index: SharedActions.h =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rte/SharedActions.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** SharedActions.h 12 Apr 2006 20:37:26 -0000 1.11 --- SharedActions.h 29 Aug 2006 01:32:22 -0000 1.12 *************** *** 56,57 **** --- 56,60 ---- - ( IBAction )sortTranscriptCaseSensitively: ( id )sender; - ( IBAction )sortTranscriptCaseInsensitively: ( id )sender; + + /* filter transcript */ + - ( void )applyFilterToTranscript: ( id )sender; |
|
From: Andrew M. <fit...@us...> - 2006-08-29 01:32:05
|
Update of /cvsroot/radmind/radmind-assistant/rte In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27854 Modified Files: RXTranscript.h RXTranscript.m Log Message: Some additional binding usage. Basic filter support. Audit uses RTEFilter class. Moving from enumerators to index sets where possible. Removed unused drawer code. Index: RXTranscript.m =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rte/RXTranscript.m,v retrieving revision 1.110 retrieving revision 1.111 diff -C2 -d -r1.110 -r1.111 *** RXTranscript.m 14 Jul 2006 14:28:24 -0000 1.110 --- RXTranscript.m 29 Aug 2006 01:32:00 -0000 1.111 *************** *** 24,30 **** #import "RXTranscript.h" ! #import "RTEAuditor.h" #import "RXPrefs.h" #import "RTEInfoPanelController.h" #import "NSString(RXAdditions).h" --- 24,31 ---- #import "RXTranscript.h" ! #import "RTEFilter.h" #import "RXPrefs.h" #import "RTEInfoPanelController.h" + #import "RXAppController.h" #import "NSString(RXAdditions).h" *************** *** 513,529 **** if ( [[ tWindow firstResponder ] isEqual: tContentsTableView ] ) { NSPasteboard *pb; ! NSMutableArray *copiedlines = [[ NSMutableArray alloc ] init ]; ! NSEnumerator *en = [ tContentsTableView selectedRowEnumerator ]; ! id linenum = nil; ! while (( linenum = [ en nextObject ] ) != nil ) { ! [ copiedlines addObject: ! [[ self displayedTranscriptContents ] ! objectAtIndex: [ linenum intValue ]]]; ! } pb = [ NSPasteboard generalPasteboard ]; ! [ pb declareTypes: [ NSArray arrayWithObject: RTETranscriptContentsPboardType ] owner: self ]; [ pb setPropertyList: copiedlines forType: RTETranscriptContentsPboardType ]; - [ copiedlines release ]; } else { if ( [[ tWindow firstResponder ] respondsToSelector: @selector( copy: ) ] ) { --- 514,530 ---- if ( [[ tWindow firstResponder ] isEqual: tContentsTableView ] ) { NSPasteboard *pb; ! NSMutableArray *copiedlines; ! NSIndexSet *indexes = [ tContentsTableView selectedRowIndexes ]; ! copiedlines = [ NSMutableArray arrayWithCapacity: [ indexes count ]]; ! [ copiedlines addObjectsFromArray: ! [[ self displayedTranscriptContents ] ! objectsAtIndexes: indexes ]]; ! pb = [ NSPasteboard generalPasteboard ]; ! [ pb declareTypes: ! [ NSArray arrayWithObject: RTETranscriptContentsPboardType ] ! owner: self ]; [ pb setPropertyList: copiedlines forType: RTETranscriptContentsPboardType ]; } else { if ( [[ tWindow firstResponder ] respondsToSelector: @selector( copy: ) ] ) { *************** *** 556,578 **** { NSPasteboard *pb = [ NSPasteboard generalPasteboard ]; ! NSArray *types = [ pb types ]; ! ! if ( [ types containsObject: RTETranscriptContentsPboardType ] ) { if ( [[ tWindow firstResponder ] isEqual: tContentsTableView ] ) { - NSArray *pastedlines = nil; - NSMutableArray *lines = [[ self transcriptContents ] mutableCopy ]; - if ( mode == SEARCH ) { NSBeep(); return; } ! pastedlines = [ pb propertyListForType: RTETranscriptContentsPboardType ]; ! ! if ( lines == nil ) { lines = [[ NSMutableArray alloc ] init ]; ! } ! [ lines addObjectsFromArray: pastedlines ]; [ lines sortUsingFunction: &pathcompare context: nil ]; [ self setTranscriptContents: lines ]; --- 557,582 ---- { NSPasteboard *pb = [ NSPasteboard generalPasteboard ]; ! NSString *type = [ pb availableTypeFromArray: ! [ NSArray arrayWithObject: ! RTETranscriptContentsPboardType ]]; ! id pasteContents = nil; ! NSMutableArray *lines; ! ! if ( [ type isEqualToString: RTETranscriptContentsPboardType ] ) { if ( [[ tWindow firstResponder ] isEqual: tContentsTableView ] ) { if ( mode == SEARCH ) { NSBeep(); return; } + + pasteContents = [ pb propertyListForType: RTETranscriptContentsPboardType ]; ! if ( [ self transcriptContents ] == nil ) { lines = [[ NSMutableArray alloc ] init ]; ! } else { ! lines = [[ self transcriptContents ] mutableCopy ]; ! } ! [ lines addObjectsFromArray: pasteContents ]; [ lines sortUsingFunction: &pathcompare context: nil ]; [ self setTranscriptContents: lines ]; *************** *** 595,599 **** } ! [ tContentsTableView reloadData ]; [ tWindow setDocumentEdited: YES ]; } --- 599,603 ---- } ! //[ tContentsTableView reloadData ]; [ tWindow setDocumentEdited: YES ]; } *************** *** 728,734 **** if ( [ itemIdent isEqualToString: RTEToolbarInfoIdentifier ] ) { ! [ rxtbarItem setLabel: @"Info" ]; ! [ rxtbarItem setPaletteLabel: @"Info" ]; ! [ rxtbarItem setToolTip: @"Show item information" ]; [ rxtbarItem setImage: [ NSImage imageNamed: @"info.png" ]]; [ rxtbarItem setAction: @selector( showInfo: ) ]; --- 732,740 ---- if ( [ itemIdent isEqualToString: RTEToolbarInfoIdentifier ] ) { ! [ rxtbarItem setLabel: NSLocalizedString( ! @"Inspector", @"Inspector" ) ]; ! [ rxtbarItem setPaletteLabel: NSLocalizedString( ! @"Inspector", @"Inspector" ) ]; ! [ rxtbarItem setToolTip: @"Inspect selected item" ]; [ rxtbarItem setImage: [ NSImage imageNamed: @"info.png" ]]; [ rxtbarItem setAction: @selector( showInfo: ) ]; *************** *** 837,844 **** } else if ( [ transcriptSplitView isSubviewCollapsed: infoTabView ] ) { [ item setAction: @selector( showInfo: ) ]; - [ item setLabel: NSLocalizedString( @"Show Info", @"Show Info" ) ]; } else { [ item setAction: @selector( hideInfo: ) ]; - [ item setLabel: NSLocalizedString( @"Hide Info", @"Hide Info" ) ]; } } else if ( [[ item itemIdentifier ] isEqualToString: RTEToolbarConvertIdentifier ] ) { --- 843,848 ---- *************** *** 923,927 **** - ( void )auditTranscript: ( id )sender { ! RTEAuditor *auditor = [[ RTEAuditor alloc ] init ]; NSMutableArray *auditResults = nil; --- 927,931 ---- - ( void )auditTranscript: ( id )sender { ! RTEFilter *auditor = [[ RTEFilter alloc ] init ]; NSMutableArray *auditResults = nil; *************** *** 934,938 **** NSLocalizedString( @"Auditing...", @"Auditing..." ) ]; [ lineCountField displayIfNeeded ]; ! auditResults = [[ auditor auditTranscriptContents: [ self transcriptContents ]] retain ]; --- 938,942 ---- NSLocalizedString( @"Auditing...", @"Auditing..." ) ]; [ lineCountField displayIfNeeded ]; ! auditResults = [[ auditor auditTranscriptContents: [ self transcriptContents ]] retain ]; *************** *** 969,972 **** --- 973,1004 ---- } + - ( void )applyFilterToTranscript: ( id )sender + { + NSDictionary *filterDictionary = nil; + NSMutableArray *filteredTranscript; + RTEFilter *filter; + + if ( [[ NSApp delegate ] respondsToSelector: + @selector( filterWithTag: ) ] ) { + filterDictionary = [[ NSApp delegate ] filterWithTag: [ sender tag ]]; + } + if ( filterDictionary == nil ) { + return; + } + + filter = [[[ RTEFilter alloc ] init ] autorelease ]; + filteredTranscript = [ filter filterTranscript: [ self transcriptContents ] + withFilterPatterns: [ NSArray arrayWithObject: filterDictionary ]]; + + /* XXX add undo invocation */ + [ self setTranscriptContents: filteredTranscript ]; + [ self setDisplayedTranscriptContents: [ self transcriptContents ]]; + [ tContentsTableView reloadData ]; + + if ( filteredTranscript ) { + [ filteredTranscript autorelease ]; + } + } + - ( void )showSourceTranscripts: ( id )sender { *************** *** 988,993 **** [ NSString stringWithFormat: @"-U%@", [[ self delegate ] sessionUserName ]], ! @"--", @"/usr/local/bin/twhich", ! @"-a", path, nil ]; [ self executeAuthorizedAction: TWHICH arguments: args ]; --- 1020,1030 ---- [ NSString stringWithFormat: @"-U%@", [[ self delegate ] sessionUserName ]], ! @"--", @"/usr/local/bin/twhich", nil ]; ! if ( [[ NSUserDefaults standardUserDefaults ] integerForKey: ! @"RTECaseSensitive" ] == 0 ) { ! args = [ args arrayByAddingObject: @"-I" ]; ! } ! args = [ args arrayByAddingObjectsFromArray: ! [ NSArray arrayWithObjects: @"-a", path, nil ]]; [ self executeAuthorizedAction: TWHICH arguments: args ]; *************** *** 1395,1400 **** menu = [[ menu itemWithTitle: NSLocalizedString( @"File", @"File" ) ] submenu ]; if (( menuItem = [ menu itemWithTitle: ! NSLocalizedString( @"Show Info", @"Show Info" ) ] ) != nil ) { ! [ menuItem setTitle: NSLocalizedString( @"Hide Info", @"Hide Info" ) ]; [ menuItem setAction: @selector( hideInfo: ) ]; } --- 1432,1436 ---- menu = [[ menu itemWithTitle: NSLocalizedString( @"File", @"File" ) ] submenu ]; if (( menuItem = [ menu itemWithTitle: ! NSLocalizedString( @"Inspector", @"Inspector" ) ] ) != nil ) { [ menuItem setAction: @selector( hideInfo: ) ]; } *************** *** 1443,1447 **** /* set its fields with the right information */ ! [ typeImage setImage: [ NSImage imageForType: type ]]; [ nameField setStringValue: [[ dict objectForKey: @"path" ] lastPathComponent ]]; --- 1479,1483 ---- /* set its fields with the right information */ ! [ typeImage setImage: [ NSImage imageForType: type ]]; [ nameField setStringValue: [[ dict objectForKey: @"path" ] lastPathComponent ]]; *************** *** 1473,1479 **** [ modified setStringValue: [ NSString formattedDateFromTimeInterval: [ dict objectForKey: @"mtime" ]]]; - [ chksum setStringValue: [ dict objectForKey: @"cksum" ]]; - [ owner setStringValue: [ dict objectForKey: @"owner" ]]; - [ group setStringValue: [ dict objectForKey: @"group" ]]; break; case 'D': --- 1509,1512 ---- *************** *** 1496,1502 **** break; } ! ! [ owner setStringValue: [ dict objectForKey: @"owner" ]]; ! [ group setStringValue: [ dict objectForKey: @"group" ]]; [ permissionsField setStringValue: [ NSString stringWithFormat: @"%@ (%@)", [[ dict objectForKey: @"perm" ] stringFromOctal ], --- 1529,1533 ---- break; } ! [ permissionsField setStringValue: [ NSString stringWithFormat: @"%@ (%@)", [[ dict objectForKey: @"perm" ] stringFromOctal ], *************** *** 1504,1508 **** [ size setStringValue: @"-" ]; [ modified setStringValue: @"-" ]; - [ chksum setStringValue: @"-" ]; break; case 'l': --- 1535,1538 ---- *************** *** 1516,1528 **** [ size setStringValue: @"-" ]; [ modified setStringValue: @"-" ]; - [ chksum setStringValue: @"-" ]; - [ owner setStringValue: @"-" ]; - [ group setStringValue: @"-" ]; break; case 'b': case 'c': - /* etc */ - [ owner setStringValue: [ dict objectForKey: @"owner" ]]; - [ group setStringValue: [ dict objectForKey: @"group" ]]; [ permissionsField setStringValue: [ NSString stringWithFormat: @"%@ (%@)", --- 1546,1552 ---- *************** *** 1547,1552 **** menu = [[ menu itemWithTitle: NSLocalizedString( @"File", @"File" ) ] submenu ]; if (( menuItem = [ menu itemWithTitle: ! NSLocalizedString( @"Hide Info", @"Hide Info" ) ] ) != nil ) { ! [ menuItem setTitle: NSLocalizedString( @"Show Info", @"Show Info" ) ]; [ menuItem setAction: @selector( showInfo: ) ]; } --- 1571,1575 ---- menu = [[ menu itemWithTitle: NSLocalizedString( @"File", @"File" ) ] submenu ]; if (( menuItem = [ menu itemWithTitle: ! NSLocalizedString( @"Inspector", @"Inspector" ) ] ) != nil ) { [ menuItem setAction: @selector( showInfo: ) ]; } *************** *** 2030,2045 **** - ( oneway void )addLines: ( NSArray * )lines fromThreadWithID: ( int )ID { if ( ID != [ self helperThreadID ] || [ lines count ] == 0 ) { return; } if ( [ self transcriptContents ] == nil ) { ! parsedLines = [[ NSMutableArray alloc ] initWithArray: lines ]; } else { ! [[ self transcriptContents ] addObjectsFromArray: lines ]; } /* XXXX sort should occur only after all lines have been added */ ! [[ self transcriptContents ] sortUsingFunction: &pathcompare context: NULL ]; [ self setDisplayedTranscriptContents: [ self transcriptContents ]]; [ tContentsTableView reloadData ]; [ loadProgressIndicator setIndeterminate: YES ]; --- 2053,2084 ---- - ( oneway void )addLines: ( NSArray * )lines fromThreadWithID: ( int )ID { + NSMutableArray *newLines; + int i; + if ( ID != [ self helperThreadID ] || [ lines count ] == 0 ) { return; } + + [ lines retain ]; + newLines = [ NSMutableArray arrayWithCapacity: [ lines count ]]; + for ( i = 0; i < [ lines count ]; i++ ) { + NSDictionary *dict; + + dict = [ NSMutableDictionary dictionaryForLine: + [ lines objectAtIndex: i ]]; + [ newLines addObject: dict ]; + } + [ lines release ]; if ( [ self transcriptContents ] == nil ) { ! parsedLines = [[ NSMutableArray alloc ] initWithArray: newLines ]; } else { ! [[ self transcriptContents ] addObjectsFromArray: newLines ]; } + /* XXXX sort should occur only after all lines have been added */ ! //[[ self transcriptContents ] sortUsingFunction: &pathcompare context: NULL ]; [ self setDisplayedTranscriptContents: [ self transcriptContents ]]; + [ tContentsTableView reloadData ]; [ loadProgressIndicator setIndeterminate: YES ]; *************** *** 2192,2196 **** [ parsedLines count ], ( [ parsedLines count ] == 1 ? @"" : @"s" ) ]]; ! //[ tContentsTableView reloadData ]; [[ tContentsTableView window ] makeFirstResponder: tContentsTableView ]; --- 2231,2235 ---- [ parsedLines count ], ( [ parsedLines count ] == 1 ? @"" : @"s" ) ]]; ! [ tContentsTableView reloadData ]; [[ tContentsTableView window ] makeFirstResponder: tContentsTableView ]; *************** *** 2406,2416 **** /* tableview data source methods */ - - ( int )numberOfRowsInTableView: ( NSTableView * )aTableView - { - int count = [[ self displayedTranscriptContents ] count ]; - - return( count ); - } - - ( void )tableView: ( NSTableView * )tableView willDisplayCell: ( id )aCell forTableColumn: ( NSTableColumn * )aTableColumn row: ( int )rowIndex --- 2445,2448 ---- *************** *** 2418,2423 **** NSMutableArray *lines = [ self displayedTranscriptContents ]; ! if ( rowIndex < 0 ) { ! NSLog( @"%d: invalid row.", rowIndex ); return; } --- 2450,2454 ---- NSMutableArray *lines = [ self displayedTranscriptContents ]; ! if ( rowIndex < 0 || rowIndex >= [ lines count] ) { return; } *************** *** 2557,2580 **** } - - ( id )tableView: ( NSTableView * )aTableView - objectValueForTableColumn: ( NSTableColumn * )aTableColumn - row: ( int )rowIndex - { - NSMutableArray *lines = [ self displayedTranscriptContents ]; - - if ( [[ aTableColumn identifier ] isEqualToString: @"Path" ] ) { - NSString *path = [[ lines objectAtIndex: rowIndex ] objectForKey: @"path" ]; - NSAttributedString *attrString = [[[ NSAttributedString alloc ] initWithString: path ] autorelease ]; - double width = [ aTableColumn width ]; - - attrString = [ attrString ellipsisAbbreviatedStringForWidth: width ]; - - return( attrString ); - } - - /* rest handled by willDisplayCell: */ - return( @"" ); - } - - ( void )tableViewSelectionDidChange: ( NSNotification * )notification { --- 2588,2591 ---- *************** *** 2582,2597 **** [ self showInfo: nil ]; } - - if ( [ transcriptLineDrawer state ] == NSDrawerOpenState ) { - int row = [ tContentsTableView selectedRow ]; - - if ( row >= 0 ) { - [ transcriptLineView setEditable: YES ]; - [ transcriptLineView setString: - [ NSString transcriptLineFromDictionary: - [[ self displayedTranscriptContents ] objectAtIndex: row ]]]; - [ transcriptLineView setEditable: NO ]; - } - } } --- 2593,2596 ---- Index: RXTranscript.h =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rte/RXTranscript.h,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** RXTranscript.h 10 Jul 2006 20:01:51 -0000 1.43 --- RXTranscript.h 29 Aug 2006 01:32:00 -0000 1.44 *************** *** 68,75 **** @interface RXTranscript : NSDocument { - /* drawer outlets */ - IBOutlet NSDrawer *transcriptLineDrawer; - IBOutlet NSTextView *transcriptLineView; - /* list view outlets */ IBOutlet NSView *tableView; --- 68,71 ---- *************** *** 153,156 **** --- 149,155 ---- RTETwhichDisplay *twhichDisplay; + NSMutableArray *columnContents, *parsedLines; + NSMutableArray *_rteDisplayedTranscriptLines; + @private int viewtype, mode; *************** *** 162,167 **** id _rteTranscriptDelegate; - NSMutableArray *columnContents, *parsedLines; - NSMutableArray *_rteDisplayedTranscriptLines; //NSMutableArray *curColumnItems; //NSView *origSuperView; --- 161,164 ---- |
