[Scopeapp-cvs]scopeapp/src ScopeController.m,1.8,1.8.2.1 ScopeView.m,1.11,1.11.2.1 SpectrumView.h,1.1,1.1.2.1 SpectrumView.m,1.1,1.1.2.1

[<sco...@li...>]

Update of /cvsroot/scopeapp/scopeapp/src
In directory usw-pr-cvs1:/tmp/cvs-serv16742

Modified Files:
      Tag: scopeapp-gnustep
	ScopeController.m ScopeView.m SpectrumView.h SpectrumView.m 
Log Message:
Update implementation of control creation functions (still incomplete!)


Index: ScopeController.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeController.m,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** ScopeController.m	19 Oct 2002 06:39:31 -0000	1.8
--- ScopeController.m	29 Oct 2002 05:15:13 -0000	1.8.2.1
***************
*** 66,70 ****
  		[nCenter addObserver: self selector: @selector(windowResignedMain:)
  				name: @"NSWindowDidResignMain" object: [self window]];
- 		
  	}
  	
--- 66,69 ----

Index: ScopeView.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeView.m,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** ScopeView.m	19 Oct 2002 06:39:31 -0000	1.11
--- ScopeView.m	29 Oct 2002 05:15:13 -0000	1.11.2.1
***************
*** 26,29 ****
--- 26,35 ----
  
  #import "ScopeView.h"
+ #import "ScopeAppGlobals.h"
+ 
+ #ifdef __APPLE__
+ #import "GSVbox.h"
+ #import "GSHbox.h"
+ #endif
  
  static double gTimeScales[10] = {0.001,0.002,0.005,0.01,0.02,0.05,0.1};
***************
*** 353,357 ****
  -(id) createControls: (NSView*) parentView
  {
! #warning
  }
  
--- 359,452 ----
  -(id) createControls: (NSView*) parentView
  {
! 	/* Magic numbers in this function are mostly
! 	 * taken from the Aqua Human Interface Guidelines */
! 	/* Hold on to your hats, this one's going to be nasty */
! 	NSSlider* slider;
! 	NSTextField* text;
! 	NSTextField* genericText;
! 	NSTextField* genericSmallText;
! 	NSTextFieldCell* genericTextCell;
! 	NSMatrix* matrix;
! 	NSButtonCell* genericRadio;
! 	NSButton* genericCheckbox;
! 	NSControl* previousControl;
! 	GSVbox* bigVbox;
! 	GSVbox* smallVbox;
! 	GSHbox* bigHbox;
! 	GSHbox* smallHbox;
! 	
! 	/* first create our "generic" controls; these are
! 	 * duplicated with -[NSObject copy] to create
! 	 * real ones */
! 	genericText = [[NSTextField alloc] init];
! 	[genericText setSelectable: NO];
! 	[genericText setEditable: NO];
! 	
! 	genericSmallText = [genericText copy];
! 	[genericSmallText setControlSize: NSSmallControlSize];
! 	[genericSmallText setFont:
! 		[NSFont systemFontOfSize: [NSFont smallSystemFontSize]]];
! 	
! 	genericTextCell = [[NSTextFieldCell alloc] init];
! 	[genericTextCell setSelectable: NO];
! 	[genericTextCell setEditable: NO];
! 	[genericSmallText setControlSize: NSSmallControlSize];
! 	[genericTextCell setFont:
! 		[NSFont systemFontOfSize: [NSFont smallSystemFontSize]]];
! 	
! 	genericRadio = [[NSButtonCell alloc] init];
! 	[genericRadio setButtonType: NSRadioButton];
! 	[genericRadio setControlSize: NSSmallControlSize];
! 	[genericRadio setFont:
! 		[NSFont systemFontOfSize: [NSFont smallSystemFontSize]]];
! 	
! 	genericCheckbox = [[NSButton alloc] init];
! 	[genericCheckbox setButtonType: NSSwitchButton];
! 	[genericCheckbox setControlSize: NSSmallControlSize];
! 	[genericCheckbox setFont:
! 		[NSFont systemFontOfSize: [NSFont smallSystemFontSize]]];
! 	
! 	/* the "big" boxes are the top-level ones */
! 	/* bigVbox is the highest-level box */
! 	bigVbox = [GSVbox new];
! 	[bigVbox setYBorder: 12];
! 	
! 	/* bigHbox is the current row in bigVbox */
! 	bigHbox = [GSHbox new];
! 	[bigHbox setHBorder: 20];
! 	
! 	/* smallVbox is the current column in bigHbox */
! 	smallVbox = [GSVbox new];
! 	
! 	/* Offset controls */
! 	text = [genericText copy];
! 	[text setTitle: _(@"Offsets")];
! 	[smallVbox addView: text withMinYMargin: 12];
! 	
! 	smallHbox = [GSHbox new];
! 	
! 	text = [genericSmallText copy];
! 	[text setTitle: _(@"A")];
! 	[smallHbox addView: text];
! 
! 	text = [genericSmallText copy];
! 	[text setTitle: _(@"B")];
! 	[smallHbox addView: text];
! 	
! 	[smallVbox addView: smallHbox];
! 	
! 	[bigHbox addView: smallVbox];
! 	
! 	[bigVbox addView: bigHbox];
! 	
! 	[parentView addSubview: bigVbox];
! 	
! 	[genericCheckbox release];
! 	[genericRadio release];
! 	[genericText release];
! 	[genericTextCell release];
! 	[genericSmallText release];
! 	
! 	return self;
  }
  

Index: SpectrumView.h
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/SpectrumView.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** SpectrumView.h	29 Oct 2002 04:24:46 -0000	1.1
--- SpectrumView.h	29 Oct 2002 05:15:13 -0000	1.1.2.1
***************
*** 68,70 ****
--- 68,72 ----
  -(id) updateControls;
  
+ -(id) createControls: (NSView*) parentView;
+ 
  @end

Index: SpectrumView.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/SpectrumView.m,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** SpectrumView.m	29 Oct 2002 04:24:46 -0000	1.1
--- SpectrumView.m	29 Oct 2002 05:15:13 -0000	1.1.2.1
***************
*** 85,88 ****
--- 85,93 ----
  -(id) updateControls { return self; } 
  
+ -(id) createControls: (NSView*) parentView
+ {
+ #warning
+ }
+ 
  - (id)updateDisplay: (int) inTrace
  {