[Radmind-commit] radmind-assistant/rte RXTranscript.h,1.40,1.41 RXTranscript.m,1.104,1.105

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

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

Modified Files:
	RXTranscript.h RXTranscript.m 
Log Message:
Fixes for bug #1448059. Removed unused methods.


Index: RXTranscript.m
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/rte/RXTranscript.m,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** RXTranscript.m	13 Mar 2006 15:44:02 -0000	1.104
--- RXTranscript.m	27 Mar 2006 16:15:30 -0000	1.105
***************
*** 26,29 ****
--- 26,30 ----
  #import "RTEAuditor.h"
  #import "RXPrefs.h"
+ #import "RTEInfoPanelController.h"
  
  #import "NSString(RXAdditions).h"
***************
*** 292,301 ****
      int			rc;
      NSOpenPanel		*op = [ NSOpenPanel openPanel ];
-     NSString		*lastDir = [[ NSUserDefaults standardUserDefaults ]
- 					stringForKey: @"NSDefaultOpenDirectory" ];
-     
-     if ( lastDir == nil ) {
- 	lastDir = NSHomeDirectory();
-     }
      
      [ op setTitle: @"Choose item to add to transcript" ];
--- 293,296 ----
***************
*** 310,314 ****
      }
      
!     rc = [ op runModalForDirectory: lastDir file: nil types: nil ];
      
      switch ( rc ) {
--- 305,309 ----
      }
      
!     rc = [ op runModalForDirectory: nil file: nil types: nil ];
      
      switch ( rc ) {
***************
*** 1524,1528 ****
--- 1519,1525 ----
          [ editOwnerUIDField setStringValue: @"" ];
          [ editGroupGIDField setStringValue: @"" ];
+ 	[ editedTranscriptLineField setStringValue: @"" ];
  
+ 	[ transcriptSplitView expandSubView: infoTabView animate: NO ];
          return;
      }
***************
*** 1540,1546 ****
      [ dict retain ];
  
! #ifdef notdef
!     /* display info view here */
! #endif notdef
      
      /* set its fields with the right information */
--- 1537,1547 ----
      [ dict retain ];
  
! #ifdef rte_next_version
!     infoPanelController = [[ RTEInfoPanelController alloc ] init ];
!     [ infoPanelController setInfoDictionary: dict ];
!     [ NSBundle loadNibNamed: @"InfoPanel" owner: infoPanelController ];
!     [ infoPanelController showWindow: nil ];
!     [ self addWindowController: infoPanelController ];
! #endif /* rte_next_version */
      
      /* set its fields with the right information */
***************
*** 1715,1719 ****
      
      [ tWindow setDocumentEdited: YES ];
!     [ self showInfo: nil ];
  }
  
--- 1716,1722 ----
      
      [ tWindow setDocumentEdited: YES ];
!     if ( [ tContentsTableView numberOfSelectedRows ] == 1 ) {
! 	[ self showInfo: nil ];
!     }
  }
  
***************
*** 1780,1788 ****
      [ tWindow setDocumentEdited: YES ];
      [ self updateChangeCount: NSChangeDone ];
!     [ self showInfo: nil ];
  }
  
  - ( void )setupPermissionSwitchesForMode: ( NSString * )octalmode
  {
      int			own, ow, grp, g, oth, ot, adv, a;
      
--- 1783,1794 ----
      [ tWindow setDocumentEdited: YES ];
      [ self updateChangeCount: NSChangeDone ];
!     if ( [ tContentsTableView numberOfSelectedRows ] == 1 ) {
! 	[ self showInfo: nil ];
!     }
  }
  
  - ( void )setupPermissionSwitchesForMode: ( NSString * )octalmode
  {
+     NSString		*modeString = octalmode;
      int			own, ow, grp, g, oth, ot, adv, a;
      
***************
*** 1802,1806 ****
      
      [ octalModeField setStringValue: @"" ];
!     if ( octalmode == nil ) return;
      
      a = adv = ( [ octalmode characterAtIndex: 0 ] - '0' );
--- 1808,1814 ----
      
      [ octalModeField setStringValue: @"" ];
!     if ( modeString == nil || [ modeString isEqualToString: @"" ] ) {
! 	modeString = @"0000";
!     }
      
      a = adv = ( [ octalmode characterAtIndex: 0 ] - '0' );
***************
*** 1837,1841 ****
              || oth == -2 || oth == -4 || oth == -6 ) [ otExecSwitch setState: NSOnState ];
  
!     [ octalModeField setStringValue: octalmode ];
  }
  
--- 1845,1849 ----
              || oth == -2 || oth == -4 || oth == -6 ) [ otExecSwitch setState: NSOnState ];
  
!     [ octalModeField setStringValue: modeString ];
  }
  
***************
*** 1915,1924 ****
      
      [ tWindow setDocumentEdited: YES ];
!     [ self showInfo: nil ];
! }
! 
! - ( IBAction )resetTranscriptInfo: ( id )sender
! {
!     [[ self undoManager ] undo ];
  }
  
--- 1923,1929 ----
      
      [ tWindow setDocumentEdited: YES ];
!     if ( [ tContentsTableView numberOfSelectedRows ] == 1 ) {
! 	[ self showInfo: nil ];
!     }
  }
  

Index: RXTranscript.h
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/rte/RXTranscript.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** RXTranscript.h	24 Feb 2006 22:00:02 -0000	1.40
--- RXTranscript.h	27 Mar 2006 16:15:30 -0000	1.41
***************
*** 189,193 ****
  - ( IBAction )setPermissions: ( id )sender;
  - ( IBAction )saveManuallyEditedTranscriptLine: ( id )sender;
- - ( IBAction )resetTranscriptInfo: ( id )sender;
  
  - ( void )updateIndices;
--- 189,192 ----