[Radmind-commit] radmind-assistant/rte RXTranscript.h, 1.42, 1.43 RXTranscript.m, 1.108, 1.109

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

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

Modified Files:
	RXTranscript.h RXTranscript.m 
Log Message:
[Bug #1377420]: Show Info Bug fixed with splitview delegate methods.
Ditch the Save button in the toolbar.
Set row height of tableview when font size is changed.


Index: RXTranscript.m
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/rte/RXTranscript.m,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** RXTranscript.m	5 Jun 2006 22:50:40 -0000	1.108
--- RXTranscript.m	10 Jul 2006 20:01:51 -0000	1.109
***************
*** 166,173 ****
  {
      fontsize = [[ NSUserDefaults standardUserDefaults ] floatForKey: @"RTETextFontSize" ];
!     if ( fontsize > 18.0 || fontsize < 8.0 ) {
          fontsize = 12.0;
      }
      
      [ tContentsTableView reloadData ];
  }
--- 166,174 ----
  {
      fontsize = [[ NSUserDefaults standardUserDefaults ] floatForKey: @"RTETextFontSize" ];
!     if ( fontsize > 72.0 || fontsize < 8.0 ) {
          fontsize = 12.0;
      }
      
+     [ tContentsTableView setRowHeight: ( fontsize + 5.0 ) ];
      [ tContentsTableView reloadData ];
  }
***************
*** 737,747 ****
          [ rxtbarItem setAction: @selector( convertTranscriptBasePath: ) ];
          [ rxtbarItem setTarget: self ];
-     } else if ( [ itemIdent isEqualToString: RTEToolbarSaveIdentifier ] ) {
-         [ rxtbarItem setLabel: @"Save" ];
-         [ rxtbarItem setPaletteLabel: @"Save" ];
-         [ rxtbarItem setToolTip: @"Save Transcript" ];
-         [ rxtbarItem setImage: [ NSImage imageNamed: @"save.png" ]];
-         [ rxtbarItem setAction: @selector( saveDocument: ) ];
-         [ rxtbarItem setTarget: self ];
      } else if ( [ itemIdent isEqualToString: RTEToolbarDeleteIdentifier ] ) {
          [ rxtbarItem setLabel: @"Delete" ];
--- 738,741 ----
***************
*** 785,789 ****
  		@"Show transcripts containing the selected path",
  		@"Show transcripts containing the selected path" ) ];
!         [ rxtbarItem setImage: [ NSImage imageNamed: @"comment.png" ]];
          [ rxtbarItem setAction: @selector( showSourceTranscripts: ) ];
          [ rxtbarItem setTarget: self ];
--- 779,783 ----
  		@"Show transcripts containing the selected path",
  		@"Show transcripts containing the selected path" ) ];
!         [ rxtbarItem setImage: [ NSImage imageNamed: @"twhich.png" ]];
          [ rxtbarItem setAction: @selector( showSourceTranscripts: ) ];
          [ rxtbarItem setTarget: self ];
***************
*** 796,804 ****
  {
      NSArray	*tmp = [ NSArray arrayWithObjects:
!                             RTEToolbarSaveIdentifier,
                              RTEToolbarConvertIdentifier,
                              NSToolbarSeparatorItemIdentifier,
-                             RTEToolbarInfoIdentifier,
- 			    RTEToolbarAuditIdentifier,
                              RTEToolbarToggleCommentIdentifier,
                              NSToolbarFlexibleSpaceItemIdentifier,
--- 790,798 ----
  {
      NSArray	*tmp = [ NSArray arrayWithObjects:
! 			    RTEToolbarInfoIdentifier,
! 			    RTEToolbarAuditIdentifier,
! 			    RTEToolbarTwhichIdentifier,
                              RTEToolbarConvertIdentifier,
                              NSToolbarSeparatorItemIdentifier,
                              RTEToolbarToggleCommentIdentifier,
                              NSToolbarFlexibleSpaceItemIdentifier,
***************
*** 813,817 ****
  {
      NSArray	*tmp = [ NSArray arrayWithObjects:
-                             RTEToolbarSaveIdentifier,
                              RTEToolbarInfoIdentifier,
                              RTEToolbarToggleCommentIdentifier,
--- 807,810 ----
***************
*** 821,825 ****
                              RTEToolbarSearchIdentifier,
                              RTEToolbarConvertIdentifier, 
! 			    RTEToolbarAuditIdentifier, nil ];
                              
      return( tmp );
--- 814,819 ----
                              RTEToolbarSearchIdentifier,
                              RTEToolbarConvertIdentifier, 
! 			    RTEToolbarAuditIdentifier,
! 			    RTEToolbarTwhichIdentifier, nil ];
                              
      return( tmp );
***************
*** 830,836 ****
      BOOL        validate = YES;
      
!     if ( [[ item itemIdentifier ] isEqualToString: RTEToolbarSaveIdentifier ] ) {
!         validate = [ self isDocumentEdited ];
!     } else if ( [[ item itemIdentifier ] isEqualToString: RTEToolbarDeleteIdentifier ] ) {
          if ( [[ self transcriptContents ] count ] == 0 ) {
              validate = NO;
--- 824,828 ----
      BOOL        validate = YES;
      
!     if ( [[ item itemIdentifier ] isEqualToString: RTEToolbarDeleteIdentifier ] ) {
          if ( [[ self transcriptContents ] count ] == 0 ) {
              validate = NO;
***************
*** 2635,2656 ****
  
  /* splitview delegate methods */
- - ( BOOL )splitView: ( NSSplitView * )splitview
-             canCollapseSubview: ( NSView * )subview
- {
-     return(( subview == infoTabView ));
- }
  
! - ( float )splitView: ( NSSplitView * )splitview
!             constrainMaxCoordinate: ( float )proposedMax
!             ofSubviewAt: ( int )offset
  {
!     return(( proposedMax - 316.0 ));
  }
  
! - ( float )splitView: ( NSSplitView * )splitview
!             constrainMinCoordinate: ( float )proposedMin
!             ofSubviewAt: ( int )offset
  {
!     return(( proposedMin + 316.0 ));
  }
  
--- 2627,2664 ----
  
  /* splitview delegate methods */
  
! /* restrict when and how the info pane appears */
! - ( void )splitView: ( NSSplitView * )splitview
! 	    resizeSubviewsWithOldSize: ( NSSize )oldSize
  {
!     NSArray	    *subviews = [ splitview subviews ];
!     NSRect	    newFrame = [ splitview frame ];
!     NSRect	    topFrame, bottomFrame;
! 
!     if ( NSHeight( newFrame ) == oldSize.height ) {
! 	[ splitview adjustSubviews ];
! 	return;
!     }
!     
!     topFrame = [[ subviews objectAtIndex: 0 ] frame ];
!     bottomFrame = [[ subviews objectAtIndex: 1 ] frame ];
!     
!     if ( [ splitview isSubviewCollapsed: [ subviews objectAtIndex: 1 ]] ) {
! 	bottomFrame.size.height = 0;
! 	topFrame = newFrame;
!     } else {
! 	bottomFrame.size.height = 210;
! 	topFrame.size.height = ( newFrame.size.height - bottomFrame.size.height );
! 	topFrame.origin.y = ( bottomFrame.origin.y + 210 );
!     }
!     
!     [[ subviews objectAtIndex: 1 ] setFrame: bottomFrame ];
!     [[ subviews objectAtIndex: 0 ] setFrame: topFrame ];
  }
  
! - ( BOOL )splitView: ( NSSplitView * )splitview
!             canCollapseSubview: ( NSView * )subview
  {
!     return(( subview == infoTabView ));
  }
  

Index: RXTranscript.h
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/rte/RXTranscript.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** RXTranscript.h	5 Jun 2006 22:50:40 -0000	1.42
--- RXTranscript.h	10 Jul 2006 20:01:51 -0000	1.43
***************
*** 37,41 ****
  /* toolbar identifiers */
  #define RTEToolbarInfoIdentifier		@"RTEToolbarInfo"
- #define RTEToolbarSaveIdentifier		@"RTEToolbarSave"
  #define RTEToolbarViewTypeIdentifier            @"RTEToolbarViewType"
  #define RTEToolbarDeleteIdentifier              @"RTEToolbarDelete"
--- 37,40 ----