[Btrwiz-commits] CVS: btrwiz/src BtrWiz.java,1.8,1.9 FolderSelect.java,1.6,1.7 ProgressPage.java,1.4,1.5 WelcomePage.java,1.5,1.6

[Mark H. <ho...@us...>]

Update of /cvsroot/btrwiz/btrwiz/src
In directory usw-pr-cvs1:/tmp/cvs-serv24701/btrwiz/src

Modified Files:
	BtrWiz.java FolderSelect.java ProgressPage.java 
	WelcomePage.java 
Log Message:
more work.


Index: BtrWiz.java
===================================================================
RCS file: /cvsroot/btrwiz/btrwiz/src/BtrWiz.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** BtrWiz.java	3 Sep 2002 07:41:53 -0000	1.8
--- BtrWiz.java	3 Sep 2002 15:28:41 -0000	1.9
***************
*** 43,47 ****
  	 */
  	public BtrWiz(){
! 		super( "BTRWiz "+VERSION );
  	}
  
--- 43,47 ----
  	 */
  	public BtrWiz(){
! 		super( "BTRz "+VERSION );
  	}
  
***************
*** 56,86 ****
  		WizardPage welcomePage = new WelcomePage(messages, this, null, messages.getString("WelcomeTitle") );
  		WizardPage selFolders = new FolderSelect(btr, messages, this,  welcomePage, messages.getString("SelFoldersTitle") );
! 		WizardPage incFilters = new IncludeFilters(btr, messages, this, selFolders, messages.getString("IncFiltersTitle") );
! 		WizardPage excFilters = new ExcludeFilters(btr, messages, this, selFolders, messages.getString("ExcFiltersTitle") );
! 		WizardPage findReplace = new FindReplace(btr, messages, this, welcomePage, messages.getString("FindReplaceTitle") );
! 		ProgressPage progress = new ProgressPage(btr, messages, this, findReplace, messages.getString("ProgressTitle") );
! 		WizardPage finished = new SummaryPage(btr, messages, this, welcomePage, messages.getString("SummaryTitle") );
  		
! 		btr.setProgressPage(progress);
  		
  		setFirstPage(welcomePage);	
  		welcomePage.setFirstChild(selFolders);	
- 		welcomePage.setNextScreen(welcomePage);
- 		selFolders.setParentScreen(welcomePage);
  		
! 		selFolders.setFirstChild(incFilters);
! 		incFilters.setParentScreen(selFolders);
  		
! 		incFilters.setNextScreen(excFilters);
! 		excFilters.setPreviousScreen(incFilters);
! 		excFilters.setNextScreen(null);
! 
! 		selFolders.setNextScreen(findReplace);
! 		findReplace.setPreviousScreen(selFolders);
  
! 		findReplace.setFirstChild(progress);
! 		progress.setNextScreen(finished);
! 		
  
  	}	
  
--- 56,79 ----
  		WizardPage welcomePage = new WelcomePage(messages, this, null, messages.getString("WelcomeTitle") );
  		WizardPage selFolders = new FolderSelect(btr, messages, this,  welcomePage, messages.getString("SelFoldersTitle") );
! //		WizardPage incFilters = new IncludeFilters(btr, messages, this, selFolders, messages.getString("IncFiltersTitle") );
! //		WizardPage excFilters = new ExcludeFilters(btr, messages, this, selFolders, messages.getString("ExcFiltersTitle") );
! //		WizardPage findReplace = new FindReplace(btr, messages, this, welcomePage, messages.getString("FindReplaceTitle") );
! //		ProgressPage progress = new ProgressPage(btr, messages, this, findReplace, messages.getString("ProgressTitle") );
! //		WizardPage finished = new SummaryPage(btr, messages, this, welcomePage, messages.getString("SummaryTitle") );
  		
! //		btr.setProgressPage(progress);
  		
  		setFirstPage(welcomePage);	
  		welcomePage.setFirstChild(selFolders);	
  		
! //		selFolders.setFirstChild(incFilters);
! //		incFilters.setParentScreen(selFolders);
  		
! //		incFilters.joinNextScreen(excFilters);
  
! //		selFolders.joinNextScreen(findReplace);
  
+ //		findReplace.setFirstChild(progress);
+ //		progress.setNextScreen(finished);
  	}	
  

Index: FolderSelect.java
===================================================================
RCS file: /cvsroot/btrwiz/btrwiz/src/FolderSelect.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FolderSelect.java	3 Sep 2002 07:41:53 -0000	1.6
--- FolderSelect.java	3 Sep 2002 15:28:41 -0000	1.7
***************
*** 7,11 ****
  
  /**
!  * The second page of the wizard, responsible for delecting the folders to be
   * scanned.
   */
--- 7,11 ----
  
  /**
!  * The second page of the wizard, responsible for detecting the folders to be
   * scanned.
   */
***************
*** 16,20 ****
  	/** The content container to be shown on the screen */
  	private VBox content;
! 	Entry dirEntry;
  	
  	/**
--- 16,20 ----
  	/** The content container to be shown on the screen */
  	private VBox content;
! 	private	Entry dirEntry;
  	
  	/**

Index: ProgressPage.java
===================================================================
RCS file: /cvsroot/btrwiz/btrwiz/src/ProgressPage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ProgressPage.java	3 Sep 2002 07:41:53 -0000	1.4
--- ProgressPage.java	3 Sep 2002 15:28:41 -0000	1.5
***************
*** 37,41 ****
  		content = new VBox(false, 0);
  
! 		stageOneFrame = new Frame(null);
  		VBox stageOneBox = new VBox(false, 3);
  		stageOneFrame.add(stageOneBox);
--- 37,41 ----
  		content = new VBox(false, 0);
  
! 		stageOneFrame = new Frame("Stage One");
  		VBox stageOneBox = new VBox(false, 3);
  		stageOneFrame.add(stageOneBox);
***************
*** 52,56 ****
  		 * Stage Two
  		 */
! 		stageTwoFrame = new Frame(null);
  		VBox stageTwoBox = new VBox(false, 3);
  		Label scanning = new Label( messages.getString("StageTwoHead") );
--- 52,56 ----
  		 * Stage Two
  		 */
! 		stageTwoFrame = new Frame("Stage two");
  		VBox stageTwoBox = new VBox(false, 3);
  		Label scanning = new Label( messages.getString("StageTwoHead") );

Index: WelcomePage.java
===================================================================
RCS file: /cvsroot/btrwiz/btrwiz/src/WelcomePage.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** WelcomePage.java	3 Sep 2002 07:41:53 -0000	1.5
--- WelcomePage.java	3 Sep 2002 15:28:41 -0000	1.6
***************
*** 39,42 ****
--- 39,43 ----
  		Label wsLbl = new Label("http://www.tildemh.com/sw/btrwiz");
  		wsLbl.setJustification(Justification.CENTER);
+ 		wsLbl.setSelectable(true);
  		content.add(wsLbl);
  
***************
*** 45,51 ****
  		gmsgLbl.setJustification(Justification.FILL);
  		content.add(gmsgLbl);
- 
  		
! //		setButtons(false, null, true, messages.getString("Start") );	
  		setContent(content);
  	}
--- 46,52 ----
  		gmsgLbl.setJustification(Justification.FILL);
  		content.add(gmsgLbl);
  		
! 		setButtonVisibility(true, true);		
! 		setButtonCaptions("", messages.getString("Start"));
  		setContent(content);
  	}