[Squirrel-sql-commits] sql12/plugins/sqlscript/src/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script I18NStrings.properties,1.2,1.3 TableScriptConfigCtrl.java,1.3,1.4 TableScriptConfigFrame.java,1.3,1.4

[Gerd W. <ger...@us...>]

Update of /cvsroot/squirrel-sql/sql12/plugins/sqlscript/src/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29688/plugins/sqlscript/src/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script

Modified Files:
	I18NStrings.properties TableScriptConfigCtrl.java 
	TableScriptConfigFrame.java 
Log Message:
Nicer table script config dialog

Index: TableScriptConfigCtrl.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/sqlscript/src/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/TableScriptConfigCtrl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TableScriptConfigCtrl.java	29 Oct 2005 20:22:02 -0000	1.3
--- TableScriptConfigCtrl.java	31 Jan 2006 21:34:17 -0000	1.4
***************
*** 19,23 ****
     private boolean _constAndIndAtEnd = true;
     private boolean _constToTablesNotInScript = true;
! 	private boolean _isOk = false;
  
  
--- 19,23 ----
     private boolean _constAndIndAtEnd = true;
     private boolean _constToTablesNotInScript = true;
!    private boolean _isOk = false;
  
  
***************
*** 47,50 ****
--- 47,60 ----
        });
  
+       _dlg.btnCancel.addActionListener(new ActionListener()
+       {
+          public void actionPerformed(ActionEvent e)
+          {
+      		_dlg.setVisible(false);
+             _dlg.dispose();
+          }
+       });
+       
+       
        GUIUtils.centerWithinParent(_dlg);
  

Index: TableScriptConfigFrame.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/sqlscript/src/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/TableScriptConfigFrame.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TableScriptConfigFrame.java	29 Oct 2005 20:22:02 -0000	1.3
--- TableScriptConfigFrame.java	31 Jan 2006 21:34:17 -0000	1.4
***************
*** 20,23 ****
--- 20,24 ----
  	JCheckBox constToTablesNotInScript;
  	JButton btnOk;
+ 	JButton btnCancel;
  
  	public TableScriptConfigFrame(JFrame mainFrame)
***************
*** 26,52 ****
  		super(mainFrame, s_stringMgr.getString("sqlscript.configMultiTableScript"), true);
  
! 		JPanel pnl = new JPanel(new GridLayout(5,1,5,0));
  
  		// i18n[sqlscript.configYourMultiTableScript=Configure your multi table script:]
  		Label lbl = new Label(s_stringMgr.getString("sqlscript.configYourMultiTableScript"));
! 		pnl.add(lbl);
  
  		// i18n[sqlscript.configYourMultiTableScriptIxAtEnd=Constraints and indexes at end of script]
  		optConstAndIndAtEnd = new JRadioButton(s_stringMgr.getString("sqlscript.configYourMultiTableScriptIxAtEnd"));
! 		pnl.add(optConstAndIndAtEnd);
  
  		// i18n[sqlscript.configYourMultiTableScriptIxAfterEach=Constraints and indexes after each table]
  		optConstAndIndAfterTable = new JRadioButton(s_stringMgr.getString("sqlscript.configYourMultiTableScriptIxAfterEach"));
! 		pnl.add(optConstAndIndAfterTable);
  
  		// i18n[sqlscript.configYourMultiTableScriptConstr=Include constraints to tables not in selection]
  		constToTablesNotInScript = new JCheckBox(s_stringMgr.getString("sqlscript.configYourMultiTableScriptConstr"));
! 		pnl.add(constToTablesNotInScript);
  
  
! 		// i18n[sqlscript.configYourMultiTableScriptOk=OK]
! 		btnOk = new JButton(s_stringMgr.getString("sqlscript.configYourMultiTableScriptOk"));
! 		pnl.add(btnOk);
  
  
  		ButtonGroup buttonGroup = new ButtonGroup();
--- 27,70 ----
  		super(mainFrame, s_stringMgr.getString("sqlscript.configMultiTableScript"), true);
  
! 		JPanel pnl = new JPanel(new GridBagLayout());
! 		
! 		GridBagConstraints gbc;
  
+ 		
  		// i18n[sqlscript.configYourMultiTableScript=Configure your multi table script:]
  		Label lbl = new Label(s_stringMgr.getString("sqlscript.configYourMultiTableScript"));
! 		gbc = new GridBagConstraints(0,0,1,1,0,0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5,5,5,5),0,0);
! 		pnl.add(lbl, gbc);
  
  		// i18n[sqlscript.configYourMultiTableScriptIxAtEnd=Constraints and indexes at end of script]
  		optConstAndIndAtEnd = new JRadioButton(s_stringMgr.getString("sqlscript.configYourMultiTableScriptIxAtEnd"));
! 		gbc = new GridBagConstraints(0,1,1,1,0,0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0,5,5,5),0,0);
! 		pnl.add(optConstAndIndAtEnd,gbc);
  
  		// i18n[sqlscript.configYourMultiTableScriptIxAfterEach=Constraints and indexes after each table]
  		optConstAndIndAfterTable = new JRadioButton(s_stringMgr.getString("sqlscript.configYourMultiTableScriptIxAfterEach"));
! 		gbc = new GridBagConstraints(0,2,1,1,0,0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0,5,5,5),0,0);
! 		pnl.add(optConstAndIndAfterTable,gbc);
  
  		// i18n[sqlscript.configYourMultiTableScriptConstr=Include constraints to tables not in selection]
  		constToTablesNotInScript = new JCheckBox(s_stringMgr.getString("sqlscript.configYourMultiTableScriptConstr"));
! 		gbc = new GridBagConstraints(0,3,1,1,0,0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0,5,5,5),0,0);
! 		pnl.add(constToTablesNotInScript,gbc);
  
  
! 		JPanel pnlButtons = new JPanel(new GridLayout(1,2,5,0));
  
+       // i18n[sqlscript.configYourMultiTableScriptOk=OK]
+       btnOk = new JButton(s_stringMgr.getString("sqlscript.configYourMultiTableScriptOk"));
+       pnlButtons.add(btnOk);
+       
+ 		// i18n[sqlscript.configYourMultiTableScriptCancel=Cancel]
+ 		btnCancel = new JButton(s_stringMgr.getString("sqlscript.configYourMultiTableScriptCancel"));
+ 		pnlButtons.add(btnCancel);
+ 
+ 		
+ 		gbc = new GridBagConstraints(0,4,1,1,0,0, GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,5,5,5),0,0);
+ 		pnl.add(pnlButtons, gbc);
+ 		
  
  		ButtonGroup buttonGroup = new ButtonGroup();

Index: I18NStrings.properties
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/sqlscript/src/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/I18NStrings.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** I18NStrings.properties	11 Dec 2005 20:47:16 -0000	1.2
--- I18NStrings.properties	31 Jan 2006 21:34:17 -0000	1.3
***************
*** 20,23 ****
--- 20,24 ----
  sqlscript.abort=Abort?
  sqlscript.creatingDataScript=Creating data script
+ sqlscript.configYourMultiTableScriptCancel=Cancel