[Adapdev-commits] Adapdev/src/Adapdev.Windows.Forms DatabaseWizard.cs,1.3,1.4 DatabaseWizard.resx,1.
Status: Beta
Brought to you by:
intesar66
Menu
▾
▴
[Adapdev-commits] Adapdev/src/Adapdev.Windows.Forms DatabaseWizard.cs,1.3,1.4 DatabaseWizard.resx,1.3,1.4 SmoothProgressBar.cs,1.1.1.1,1.2
|
From: Trevor L. <tre...@us...> - 2005-04-14 03:43:55
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Windows.Forms In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3367/src/Adapdev.Windows.Forms Modified Files: DatabaseWizard.cs DatabaseWizard.resx SmoothProgressBar.cs Log Message: Changes to support filtering of Schemas for Oracle Index: DatabaseWizard.resx =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Windows.Forms/DatabaseWizard.resx,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DatabaseWizard.resx 13 Apr 2005 04:23:42 -0000 1.3 --- DatabaseWizard.resx 14 Apr 2005 03:43:43 -0000 1.4 *************** *** 125,131 **** <value>Private</value> </data> - <data name="btnNewDatabase.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>Private</value> - </data> <data name="btnNewDatabase.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> --- 125,128 ---- *************** *** 134,137 **** --- 131,137 ---- <value>Private</value> </data> + <data name="btnNewDatabase.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> <data name="btnTestConnection.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> *************** *** 242,254 **** <value>Private</value> </data> ! <data name="tbLocation.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="tbLocation.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> <data name="tbLocation.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> <data name="btnOpenFile.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> --- 242,272 ---- <value>Private</value> </data> ! <data name="tbFilter.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="tbFilter.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>Private</value> ! </data> ! <data name="tbFilter.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>False</value> ! </data> ! <data name="lblFilter.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> + <data name="lblFilter.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="lblFilter.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> <data name="tbLocation.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> + <data name="tbLocation.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="tbLocation.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> <data name="btnOpenFile.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> Index: SmoothProgressBar.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Windows.Forms/SmoothProgressBar.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** SmoothProgressBar.cs 28 Feb 2005 01:32:46 -0000 1.1.1.1 --- SmoothProgressBar.cs 14 Apr 2005 03:43:43 -0000 1.2 *************** *** 239,242 **** --- 239,246 ---- } + public void Increment( int value ) { + this.val = this.val + value; + } + public Color ProgressBarColor { Index: DatabaseWizard.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Windows.Forms/DatabaseWizard.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DatabaseWizard.cs 13 Apr 2005 04:23:42 -0000 1.3 --- DatabaseWizard.cs 14 Apr 2005 03:43:43 -0000 1.4 *************** *** 42,45 **** --- 42,47 ---- private DbConnectionProvider _connectionProvider = null; + private System.Windows.Forms.Label lblFilter; + private System.Windows.Forms.TextBox tbFilter; private ProviderConfig _providersConfig = new ProviderConfig(); *************** *** 48,52 **** InitializeComponent(); this.BuildConnectionsTree(this.tvConnectionTypes); ! this.SetGUIProperties(DbConnectionTypes.UnknownConnectionType()); // TODO: Add any initialization after the InitializeComponent call --- 50,54 ---- InitializeComponent(); this.BuildConnectionsTree(this.tvConnectionTypes); ! this.SetGUIProperties(null); // TODO: Add any initialization after the InitializeComponent call *************** *** 80,83 **** --- 82,87 ---- this.imageList1 = new System.Windows.Forms.ImageList(this.components); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.tbFilter = new System.Windows.Forms.TextBox(); + this.lblFilter = new System.Windows.Forms.Label(); this.tbLocation = new System.Windows.Forms.TextBox(); this.btnOpenFile = new System.Windows.Forms.Button(); *************** *** 107,114 **** this.tbConnectionString.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); ! this.tbConnectionString.Location = new System.Drawing.Point(112, 224); this.tbConnectionString.Name = "tbConnectionString"; this.tbConnectionString.ReadOnly = true; ! this.tbConnectionString.Size = new System.Drawing.Size(416, 20); this.tbConnectionString.TabIndex = 5; this.tbConnectionString.Text = ""; --- 111,118 ---- this.tbConnectionString.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); ! this.tbConnectionString.Location = new System.Drawing.Point(112, 256); this.tbConnectionString.Name = "tbConnectionString"; this.tbConnectionString.ReadOnly = true; ! this.tbConnectionString.Size = new System.Drawing.Size(424, 20); this.tbConnectionString.TabIndex = 5; this.tbConnectionString.Text = ""; *************** *** 117,121 **** // this.lblConnection.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); ! this.lblConnection.Location = new System.Drawing.Point(8, 224); this.lblConnection.Name = "lblConnection"; this.lblConnection.Size = new System.Drawing.Size(104, 23); --- 121,125 ---- // this.lblConnection.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); ! this.lblConnection.Location = new System.Drawing.Point(8, 256); this.lblConnection.Name = "lblConnection"; this.lblConnection.Size = new System.Drawing.Size(104, 23); *************** *** 127,131 **** // this.btnNewDatabase.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); ! this.btnNewDatabase.Location = new System.Drawing.Point(112, 248); this.btnNewDatabase.Name = "btnNewDatabase"; this.btnNewDatabase.Size = new System.Drawing.Size(56, 23); --- 131,135 ---- // this.btnNewDatabase.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); ! this.btnNewDatabase.Location = new System.Drawing.Point(112, 280); this.btnNewDatabase.Name = "btnNewDatabase"; this.btnNewDatabase.Size = new System.Drawing.Size(56, 23); *************** *** 137,141 **** // this.btnTestConnection.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); ! this.btnTestConnection.Location = new System.Drawing.Point(176, 248); this.btnTestConnection.Name = "btnTestConnection"; this.btnTestConnection.Size = new System.Drawing.Size(96, 23); --- 141,145 ---- // this.btnTestConnection.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); ! this.btnTestConnection.Location = new System.Drawing.Point(176, 280); this.btnTestConnection.Name = "btnTestConnection"; this.btnTestConnection.Size = new System.Drawing.Size(96, 23); *************** *** 155,158 **** --- 159,164 ---- this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); + this.groupBox1.Controls.Add(this.tbFilter); + this.groupBox1.Controls.Add(this.lblFilter); this.groupBox1.Controls.Add(this.tbLocation); this.groupBox1.Controls.Add(this.btnOpenFile); *************** *** 167,175 **** this.groupBox1.Location = new System.Drawing.Point(248, 64); this.groupBox1.Name = "groupBox1"; ! this.groupBox1.Size = new System.Drawing.Size(280, 152); this.groupBox1.TabIndex = 3; this.groupBox1.TabStop = false; this.groupBox1.Text = "Enter the Database Properties"; // // tbLocation // --- 173,200 ---- this.groupBox1.Location = new System.Drawing.Point(248, 64); this.groupBox1.Name = "groupBox1"; ! this.groupBox1.Size = new System.Drawing.Size(288, 184); this.groupBox1.TabIndex = 3; this.groupBox1.TabStop = false; this.groupBox1.Text = "Enter the Database Properties"; // + // tbFilter + // + this.tbFilter.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.tbFilter.Location = new System.Drawing.Point(112, 152); + this.tbFilter.Name = "tbFilter"; + this.tbFilter.Size = new System.Drawing.Size(136, 20); + this.tbFilter.TabIndex = 12; + this.tbFilter.Text = ""; + this.tbFilter.TextChanged += new System.EventHandler(this.tbFilter_TextChanged); + // + // lblFilter + // + this.lblFilter.Location = new System.Drawing.Point(8, 152); + this.lblFilter.Name = "lblFilter"; + this.lblFilter.TabIndex = 11; + this.lblFilter.Text = "Schema Filter:"; + this.lblFilter.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // tbLocation // *************** *** 178,184 **** this.tbLocation.Location = new System.Drawing.Point(112, 24); this.tbLocation.Name = "tbLocation"; ! this.tbLocation.Size = new System.Drawing.Size(128, 20); this.tbLocation.TabIndex = 3; this.tbLocation.Text = ""; // // btnOpenFile --- 203,210 ---- this.tbLocation.Location = new System.Drawing.Point(112, 24); this.tbLocation.Name = "tbLocation"; ! this.tbLocation.Size = new System.Drawing.Size(136, 20); this.tbLocation.TabIndex = 3; this.tbLocation.Text = ""; + this.tbLocation.TextChanged += new System.EventHandler(this.tbLocation_TextChanged); // // btnOpenFile *************** *** 205,211 **** this.tbName.Location = new System.Drawing.Point(112, 56); this.tbName.Name = "tbName"; ! this.tbName.Size = new System.Drawing.Size(128, 20); this.tbName.TabIndex = 6; this.tbName.Text = ""; // // lblPassword --- 231,238 ---- this.tbName.Location = new System.Drawing.Point(112, 56); this.tbName.Name = "tbName"; ! this.tbName.Size = new System.Drawing.Size(136, 20); this.tbName.TabIndex = 6; this.tbName.Text = ""; + this.tbName.TextChanged += new System.EventHandler(this.tbName_TextChanged); // // lblPassword *************** *** 239,245 **** this.tbPassword.Location = new System.Drawing.Point(112, 120); this.tbPassword.Name = "tbPassword"; ! this.tbPassword.Size = new System.Drawing.Size(128, 20); this.tbPassword.TabIndex = 10; this.tbPassword.Text = ""; // // tbUsername --- 266,273 ---- this.tbPassword.Location = new System.Drawing.Point(112, 120); this.tbPassword.Name = "tbPassword"; ! this.tbPassword.Size = new System.Drawing.Size(136, 20); this.tbPassword.TabIndex = 10; this.tbPassword.Text = ""; + this.tbPassword.TextChanged += new System.EventHandler(this.tbPassword_TextChanged); // // tbUsername *************** *** 249,255 **** this.tbUsername.Location = new System.Drawing.Point(112, 88); this.tbUsername.Name = "tbUsername"; ! this.tbUsername.Size = new System.Drawing.Size(128, 20); this.tbUsername.TabIndex = 8; this.tbUsername.Text = ""; // // groupBox2 --- 277,284 ---- this.tbUsername.Location = new System.Drawing.Point(112, 88); this.tbUsername.Name = "tbUsername"; ! this.tbUsername.Size = new System.Drawing.Size(136, 20); this.tbUsername.TabIndex = 8; this.tbUsername.Text = ""; + this.tbUsername.TextChanged += new System.EventHandler(this.tbUsername_TextChanged); // // groupBox2 *************** *** 261,265 **** this.groupBox2.Location = new System.Drawing.Point(248, 8); this.groupBox2.Name = "groupBox2"; ! this.groupBox2.Size = new System.Drawing.Size(280, 48); this.groupBox2.TabIndex = 44; this.groupBox2.TabStop = false; --- 290,294 ---- this.groupBox2.Location = new System.Drawing.Point(248, 8); this.groupBox2.Name = "groupBox2"; ! this.groupBox2.Size = new System.Drawing.Size(288, 48); this.groupBox2.TabIndex = 44; this.groupBox2.TabStop = false; *************** *** 272,276 **** this.tbConnectionName.Location = new System.Drawing.Point(112, 16); this.tbConnectionName.Name = "tbConnectionName"; ! this.tbConnectionName.Size = new System.Drawing.Size(160, 20); this.tbConnectionName.TabIndex = 1; this.tbConnectionName.Text = ""; --- 301,305 ---- this.tbConnectionName.Location = new System.Drawing.Point(112, 16); this.tbConnectionName.Name = "tbConnectionName"; ! this.tbConnectionName.Size = new System.Drawing.Size(168, 20); this.tbConnectionName.TabIndex = 1; this.tbConnectionName.Text = ""; *************** *** 291,297 **** | System.Windows.Forms.AnchorStyles.Right))); this.groupBox3.Controls.Add(this.tvConnectionTypes); ! this.groupBox3.Location = new System.Drawing.Point(8, 8); this.groupBox3.Name = "groupBox3"; ! this.groupBox3.Size = new System.Drawing.Size(232, 208); this.groupBox3.TabIndex = 45; this.groupBox3.TabStop = false; --- 320,326 ---- | System.Windows.Forms.AnchorStyles.Right))); this.groupBox3.Controls.Add(this.tvConnectionTypes); ! this.groupBox3.Location = new System.Drawing.Point(0, 8); this.groupBox3.Name = "groupBox3"; ! this.groupBox3.Size = new System.Drawing.Size(240, 240); this.groupBox3.TabIndex = 45; this.groupBox3.TabStop = false; *************** *** 309,313 **** this.tvConnectionTypes.Name = "tvConnectionTypes"; this.tvConnectionTypes.SelectedImageIndex = 1; ! this.tvConnectionTypes.Size = new System.Drawing.Size(216, 176); this.tvConnectionTypes.TabIndex = 1; this.tvConnectionTypes.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvConnectionTypes_AfterSelect); --- 338,342 ---- this.tvConnectionTypes.Name = "tvConnectionTypes"; this.tvConnectionTypes.SelectedImageIndex = 1; ! this.tvConnectionTypes.Size = new System.Drawing.Size(224, 208); this.tvConnectionTypes.TabIndex = 1; this.tvConnectionTypes.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvConnectionTypes_AfterSelect); *************** *** 323,327 **** this.Controls.Add(this.groupBox2); this.Name = "DatabaseWizard"; ! this.Size = new System.Drawing.Size(536, 272); this.groupBox1.ResumeLayout(false); this.groupBox2.ResumeLayout(false); --- 352,356 ---- this.Controls.Add(this.groupBox2); this.Name = "DatabaseWizard"; ! this.Size = new System.Drawing.Size(536, 304); this.groupBox1.ResumeLayout(false); this.groupBox2.ResumeLayout(false); *************** *** 353,356 **** --- 382,390 ---- } + public string Filter { + get { return this.tbFilter.Text; } + set { this.tbFilter.Text = value; } + } + public string ConnectionName { get { return this.tbConnectionName.Text; } *************** *** 358,361 **** --- 392,399 ---- } + public TextBox ConnectionControl { + get { return this.tbConnectionName; } + } + public TreeView TypesTreeView { get { return this.tvConnectionTypes; } *************** *** 379,387 **** private void btnTestConnection_Click(object sender, System.EventArgs e) { ! this.btnTestConnection.Enabled = false; ! if (this.TestConnection()) { ! MessageBox.Show(this, "Successfully connected!", "Success!", MessageBoxButtons.OK, MessageBoxIcon.Information); ! } ! this.btnTestConnection.Enabled = true; } --- 417,421 ---- private void btnTestConnection_Click(object sender, System.EventArgs e) { ! TestConnection(); } *************** *** 392,437 **** this.tbPassword.Text = ""; this.tbUsername.Text = ""; } #endregion #region Form KeyPress Handlers ! private void tbLocation_KeyPress(object sender, KeyPressEventArgs e) { ! this.DatabasePropertiesUC_KeyPress(sender, e); ! this.OnKeyPress(e); ! } ! private void DatabasePropertiesUC_KeyPress(object sender, KeyPressEventArgs e) { ! } ! ! private void tbUsername_KeyPress(object sender, KeyPressEventArgs e) { ! this.DatabasePropertiesUC_KeyPress(sender, e); ! this.OnKeyPress(e); ! } ! ! private void tbPassword_KeyPress(object sender, KeyPressEventArgs e) { ! this.DatabasePropertiesUC_KeyPress(sender, e); ! this.OnKeyPress(e); } ! private void tbName_KeyPress(object sender, KeyPressEventArgs e) { ! this.DatabasePropertiesUC_KeyPress(sender, e); ! this.OnKeyPress(e); } ! private void tbLocation_KeyUp(object sender, KeyEventArgs e) { ! this.OnKeyUp(e); } ! private void tbName_KeyUp(object sender, KeyEventArgs e) { ! this.OnKeyUp(e); } ! private void tbUsername_KeyUp(object sender, KeyEventArgs e) { ! this.OnKeyUp(e); } ! private void tbPassword_KeyUp(object sender, KeyEventArgs e) { ! this.OnKeyUp(e); ! } ! private void tbConnectionName_KeyUp(object sender, System.Windows.Forms.KeyEventArgs e) { } #endregion --- 426,456 ---- this.tbPassword.Text = ""; this.tbUsername.Text = ""; + this.tbFilter.Text = ""; } #endregion #region Form KeyPress Handlers ! private void DatabasePropertiesUC_TextChanged(object sender, System.EventArgs e) { ! this.tbConnectionString.Text = GetConnectionString(); } ! private void tbLocation_TextChanged(object sender, System.EventArgs e) { ! this.DatabasePropertiesUC_TextChanged(sender, e); } ! private void tbUsername_TextChanged(object sender, System.EventArgs e) { ! this.DatabasePropertiesUC_TextChanged(sender, e); } ! private void tbPassword_TextChanged(object sender, System.EventArgs e) { ! this.DatabasePropertiesUC_TextChanged(sender, e); } ! private void tbFilter_TextChanged(object sender, System.EventArgs e) { ! this.DatabasePropertiesUC_TextChanged(sender, e); } ! private void tbName_TextChanged(object sender, System.EventArgs e) { ! this.DatabasePropertiesUC_TextChanged(sender, e); } #endregion *************** *** 443,447 **** /// </summary> /// <returns>true if we can connect</returns> ! public bool TestConnection() { bool validSelected = false; bool validInternal = false; --- 462,480 ---- /// </summary> /// <returns>true if we can connect</returns> ! /// ! ! public void TestConnection() { ! this.btnTestConnection.Enabled = false; ! if (this.TestConnections()) { ! MessageBox.Show(this, "Successfully connected!", "Success!", MessageBoxButtons.OK, MessageBoxIcon.Information); ! } ! this.btnTestConnection.Enabled = true; ! } ! ! /// <summary> ! /// This routine actually does the work of testing the Main and INternal connection methods. ! /// </summary> ! /// <returns>true if both connections were sucessfull</returns> ! public bool TestConnections() { bool validSelected = false; bool validInternal = false; *************** *** 483,490 **** public void SetDatabaseSetting(DatabaseSetting settings) { this.ConnectionName = settings.ConnectionName; ! this.DbLocation = settings.DatabaseLocation; ! this.DbName = settings.DatabaseName; ! this.Password = settings.Password; ! this.Username = settings.UserName; try { --- 516,524 ---- public void SetDatabaseSetting(DatabaseSetting settings) { this.ConnectionName = settings.ConnectionName; ! this.DbLocation = settings.DatabaseLocation; ! this.DbName = settings.DatabaseName; ! this.Password = settings.Password; ! this.Username = settings.UserName; ! this.Filter = settings.Filter; try { *************** *** 498,513 **** public DatabaseSetting GetDatabaseSetting() { ! DatabaseSetting ds = new DatabaseSetting(); ! ds.ConnectionName = this.ConnectionName; ds.DatabaseLocation = this.DbLocation; ! ds.DatabaseName = this.DbName; ! ds.Password = this.Password; ! ds.UserName = this.Username; ds.ConnectionString = this.GetConnectionString(); ds.OleDbConnectionString = this.GetInternalProviderConnectionString(); ! ds.DbProviderType = _connectionProvider.ProviderType; ! ds.DbType = _connectionProvider.DbType; ! ds.ConnectionRef = _connectionProvider.Parent.Name; ! ds.ProviderRef = _connectionProvider.Name; return ds; } --- 532,548 ---- public DatabaseSetting GetDatabaseSetting() { ! DatabaseSetting ds = new DatabaseSetting(); ! ds.ConnectionName = this.ConnectionName; ds.DatabaseLocation = this.DbLocation; ! ds.DatabaseName = this.DbName; ! ds.Password = this.Password; ! ds.UserName = this.Username; ! ds.Filter = this.Filter; ds.ConnectionString = this.GetConnectionString(); ds.OleDbConnectionString = this.GetInternalProviderConnectionString(); ! ds.DbProviderType = _connectionProvider.ProviderType; ! ds.DbType = _connectionProvider.DbType; ! ds.ConnectionRef = _connectionProvider.Parent.Name; ! ds.ProviderRef = _connectionProvider.Name; return ds; } *************** *** 576,579 **** --- 611,615 ---- if (obj == null) { _connectionProvider = null; + SetGUIProperties (null); } else { _connectionProvider = obj as DbConnectionProvider; *************** *** 595,598 **** --- 631,635 ---- SetPromptState(connectionType.SupportsUserID, this.lblUsername, this.tbUsername); SetPromptState(connectionType.SupportsPassword, this.lblPassword, this.tbPassword); + SetPromptState(connectionType.SupportsFilter, this.lblFilter, this.tbFilter); this.tbConnectionString.Text = GetConnectionString(); *************** *** 609,612 **** --- 646,650 ---- SetPromptState (state, this.lblUsername, this.tbUsername); SetPromptState (state, this.lblPassword, this.tbPassword); + SetPromptState (state, this.lblFilter, this.tbFilter); this.btnTestConnection.Enabled = state; *************** *** 633,641 **** text.Enabled = state; label.Enabled = state; - if (!state) text.Text = ""; } #endregion - } } --- 671,677 ---- |
