[Jake2-commits] jake2/src/jake2/qcommon Q2DataDialog.java,1.9,1.10

[Holger Z. <hz...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/qcommon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28690/src/jake2/qcommon

Modified Files:
	Q2DataDialog.java 
Log Message:
reorganized install dialog

Index: Q2DataDialog.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Q2DataDialog.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Q2DataDialog.java	26 Sep 2004 12:07:32 -0000	1.9
--- Q2DataDialog.java	26 Sep 2004 18:31:14 -0000	1.10
***************
*** 65,74 ****
          choosePanel.setPreferredSize(new java.awt.Dimension(400, 100));
  
          gridBagConstraints = new java.awt.GridBagConstraints();
!         gridBagConstraints.gridx = 0;
          gridBagConstraints.gridy = 0;
!         gridBagConstraints.gridwidth = 3;
          gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
!         gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 2);
          gridBagConstraints.weightx = 1;
          choosePanel.add(jTextField1, gridBagConstraints);
--- 65,84 ----
          choosePanel.setPreferredSize(new java.awt.Dimension(400, 100));
  
+ 
+ 		
          gridBagConstraints = new java.awt.GridBagConstraints();
! 		gridBagConstraints.gridx = 0;
! 		gridBagConstraints.gridy = 0;
! 		gridBagConstraints.gridwidth = 1;
! 		gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
! 		gridBagConstraints.weightx = 0;
! 		gridBagConstraints.anchor = GridBagConstraints.SOUTHWEST;
! 		choosePanel.add(new JLabel("baseq2 directory"),gridBagConstraints);
!         
!         gridBagConstraints.gridx = 1;
          gridBagConstraints.gridy = 0;
!         gridBagConstraints.gridwidth = 2;
          gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
!         gridBagConstraints.insets = new java.awt.Insets(5, 2, 5, 2);
          gridBagConstraints.weightx = 1;
          choosePanel.add(jTextField1, gridBagConstraints);
***************
*** 89,92 ****
--- 99,110 ----
          choosePanel.add(changeButton, gridBagConstraints);
  
+ 		gridBagConstraints.gridx = 0;
+ 		gridBagConstraints.gridy = 1;
+ 		gridBagConstraints.gridwidth = 4;
+ 		gridBagConstraints.weightx = 0;
+ 		gridBagConstraints.weighty = 1;
+ 		gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL;
+ 		choosePanel.add(new JPanel(), gridBagConstraints);
+ 
          cancelButton.setText("Cancel");
          cancelButton.addActionListener(new java.awt.event.ActionListener() {
***************
*** 96,100 ****
          });
          gridBagConstraints.gridx = 0;
!         gridBagConstraints.gridy = 1;
  		gridBagConstraints.gridwidth = 4;
  		gridBagConstraints.weighty = 0;
--- 114,118 ----
          });
          gridBagConstraints.gridx = 0;
!         gridBagConstraints.gridy = 2;
  		gridBagConstraints.gridwidth = 4;
  		gridBagConstraints.weighty = 0;
***************
*** 110,114 ****
          });
          gridBagConstraints.gridx = 0;
!         gridBagConstraints.gridy = 1;
  		gridBagConstraints.gridwidth = 1;
  		gridBagConstraints.anchor = java.awt.GridBagConstraints.SOUTHWEST;
--- 128,132 ----
          });
          gridBagConstraints.gridx = 0;
!         gridBagConstraints.gridy = 2;
  		gridBagConstraints.gridwidth = 1;
  		gridBagConstraints.anchor = java.awt.GridBagConstraints.SOUTHWEST;
***************
*** 122,126 ****
          });
          gridBagConstraints.gridx = 2;
!         gridBagConstraints.gridy = 1;
  		gridBagConstraints.gridwidth = 2;
  		gridBagConstraints.anchor = java.awt.GridBagConstraints.SOUTHEAST;
--- 140,144 ----
          });
          gridBagConstraints.gridx = 2;
!         gridBagConstraints.gridy = 2;
  		gridBagConstraints.gridwidth = 2;
  		gridBagConstraints.anchor = java.awt.GridBagConstraints.SOUTHEAST;
***************
*** 249,252 ****
--- 267,271 ----
  	void showNotFoundPanel() {
  		getContentPane().remove(choosePanel);
+ 		getContentPane().remove(installPanel);
  		getContentPane().remove(statusPanel);
  		getContentPane().add(notFoundPanel, BorderLayout.SOUTH);
***************
*** 321,325 ****
  			constraints.gridy = 0;
  			constraints.gridwidth = 2;
! 			constraints.insets = new Insets(5, 5, 5, 5);
  			constraints.anchor = GridBagConstraints.CENTER;
  			add(message, constraints);
--- 340,344 ----
  			constraints.gridy = 0;
  			constraints.gridwidth = 2;
! 			constraints.insets = new Insets(5, 5, 2, 5);
  			constraints.anchor = GridBagConstraints.CENTER;
  			add(message, constraints);
***************
*** 468,477 ****
  			constraints.weighty = 1;
  			constraints.fill = GridBagConstraints.NONE;
! 			cancel = new JButton("Cancel");
! 			cancel.addActionListener(new ActionListener() {
  			public void actionPerformed(ActionEvent e) {
! 				cancel();
  			}});
! 			add(cancel, constraints);
  			
  			constraints.gridx = 0;
--- 487,496 ----
  			constraints.weighty = 1;
  			constraints.fill = GridBagConstraints.NONE;
! 			exit = new JButton("Exit");
! 			exit.addActionListener(new ActionListener() {
  			public void actionPerformed(ActionEvent e) {
! 				exit();
  			}});
! 			add(exit, constraints);
  			
  			constraints.gridx = 0;
***************
*** 479,488 ****
  			constraints.gridwidth = 4;
  			constraints.anchor = GridBagConstraints.SOUTH;
! 			exit = new JButton("Exit");
! 			exit.addActionListener(new ActionListener() {
  			public void actionPerformed(ActionEvent e) {
! 				exit();
  			}});
! 			add(exit, constraints);						
  
  			constraints.gridx = 2;
--- 498,507 ----
  			constraints.gridwidth = 4;
  			constraints.anchor = GridBagConstraints.SOUTH;
! 			cancel = new JButton("Cancel");
! 			cancel.addActionListener(new ActionListener() {
  			public void actionPerformed(ActionEvent e) {
! 				cancel();
  			}});
! 			add(cancel, constraints);						
  
  			constraints.gridx = 2;
***************
*** 509,513 ****
  		
  		private void cancel() {
! 			parent.showChooseDialog();
  		}
  		
--- 528,532 ----
  		
  		private void cancel() {
! 			parent.showNotFoundPanel();
  		}