[Adapdev-commits] Adapdev/src/Adapdev.Windows.Forms/Progress ProgressWindow.cs,1.1,1.2 ProgressWindo
Status: Beta
Brought to you by:
intesar66
Menu
▾
▴
[Adapdev-commits] Adapdev/src/Adapdev.Windows.Forms/Progress ProgressWindow.cs,1.1,1.2 ProgressWindow.resx,1.1,1.2
|
From: Trevor L. <tre...@us...> - 2005-04-14 03:43:53
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Windows.Forms/Progress In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3367/src/Adapdev.Windows.Forms/Progress Modified Files: ProgressWindow.cs ProgressWindow.resx Log Message: Changes to support filtering of Schemas for Oracle Index: ProgressWindow.resx =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Windows.Forms/Progress/ProgressWindow.resx,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ProgressWindow.resx 12 Apr 2005 10:23:01 -0000 1.1 --- ProgressWindow.resx 14 Apr 2005 03:43:44 -0000 1.2 *************** *** 98,110 **** <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> - <data name="progressBar.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>False</value> - </data> - <data name="progressBar.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>Private</value> - </data> - <data name="progressBar.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>Private</value> - </data> <data name="txtMessage1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> --- 98,101 ---- *************** *** 234,237 **** --- 225,237 ---- <value>Private</value> </data> + <data name="progressBar.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> + <data name="progressBar.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> + <data name="progressBar.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>Private</value> + </data> <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> *************** *** 249,252 **** --- 249,255 ---- <value>8, 8</value> </data> + <data name="$this.Name"> + <value>ProgressWindow</value> + </data> <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> *************** *** 258,264 **** <value>True</value> </data> - <data name="$this.Name"> - <value>ProgressWindow</value> - </data> <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> --- 261,264 ---- Index: ProgressWindow.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Windows.Forms/Progress/ProgressWindow.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ProgressWindow.cs 12 Apr 2005 10:23:01 -0000 1.1 --- ProgressWindow.cs 14 Apr 2005 03:43:44 -0000 1.2 *************** *** 5,8 **** --- 5,9 ---- using System; + using System.Drawing; using System.Windows.Forms; *************** *** 14,18 **** public class ProgressWindow : System.Windows.Forms.Form, IProgressCallback { - private System.Windows.Forms.ProgressBar progressBar; private System.ComponentModel.IContainer components; --- 15,18 ---- *************** *** 41,47 **** --- 41,50 ---- private int totalErrors = 0; + private bool firstMsg = true; + private System.Windows.Forms.Label txtMessage1; private System.Windows.Forms.ListView listView; private System.Windows.Forms.ColumnHeader ColumnHeader1; + private Adapdev.Windows.Forms.SmoothProgressBar progressBar; private System.Windows.Forms.Label txtMessage2; *************** *** 256,260 **** } listView.Items.Add(li); ! this.morelessButton.Enabled = !(this.listView.Items.Count == 0); } --- 259,267 ---- } listView.Items.Add(li); ! if (firstMsg = true) { ! firstMsg = false; ! this.morelessButton.Enabled = !(this.listView.Items.Count == 0); ! this.morelessButton.ForeColor = (this.listView.Items.Count == 0) ? Color.Black : Color.Red; ! } } *************** *** 298,306 **** Close(); } else { - Invoke( new MoreLessInvoker(DoSetMoreLess), new object[] { true } ); Invoke( new MethodInvoker( DoSetCompleted ) ); } break; } } else { Close(); --- 305,316 ---- Close(); } else { Invoke( new MethodInvoker( DoSetCompleted ) ); } break; } + if (totalErrors > 0) { + Invoke( new MoreLessInvoker(DoSetMoreLess), new object[] { true } ); + } + } else { Close(); *************** *** 376,380 **** this.components = new System.ComponentModel.Container(); System.Resources.ResourceManager resources = new System.Resources.ResourceManager(typeof(ProgressWindow)); - this.progressBar = new System.Windows.Forms.ProgressBar(); this.txtMessage1 = new System.Windows.Forms.Label(); this.cancelButton = new System.Windows.Forms.Button(); --- 386,389 ---- *************** *** 384,403 **** this.listView = new System.Windows.Forms.ListView(); this.ColumnHeader1 = new System.Windows.Forms.ColumnHeader(); this.SuspendLayout(); // - // progressBar - // - this.progressBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.progressBar.Location = new System.Drawing.Point(8, 48); - this.progressBar.Name = "progressBar"; - this.progressBar.Size = new System.Drawing.Size(326, 16); - this.progressBar.TabIndex = 1; - // // txtMessage1 // this.txtMessage1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); ! this.txtMessage1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0))); this.txtMessage1.Location = new System.Drawing.Point(8, 8); this.txtMessage1.Name = "txtMessage1"; --- 393,404 ---- this.listView = new System.Windows.Forms.ListView(); this.ColumnHeader1 = new System.Windows.Forms.ColumnHeader(); + this.progressBar = new Adapdev.Windows.Forms.SmoothProgressBar(); this.SuspendLayout(); // // txtMessage1 // this.txtMessage1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); ! this.txtMessage1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0))); this.txtMessage1.Location = new System.Drawing.Point(8, 8); this.txtMessage1.Name = "txtMessage1"; *************** *** 411,415 **** this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.cancelButton.Enabled = false; ! this.cancelButton.Location = new System.Drawing.Point(262, 72); this.cancelButton.Name = "cancelButton"; this.cancelButton.TabIndex = 2; --- 412,416 ---- this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.cancelButton.Enabled = false; ! this.cancelButton.Location = new System.Drawing.Point(264, 64); this.cancelButton.Name = "cancelButton"; this.cancelButton.TabIndex = 2; *************** *** 420,424 **** // this.morelessButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); ! this.morelessButton.Location = new System.Drawing.Point(182, 72); this.morelessButton.Name = "morelessButton"; this.morelessButton.TabIndex = 4; --- 421,425 ---- // this.morelessButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); ! this.morelessButton.Location = new System.Drawing.Point(182, 64); this.morelessButton.Name = "morelessButton"; this.morelessButton.TabIndex = 4; *************** *** 453,463 **** this.listView.FullRowSelect = true; this.listView.GridLines = true; - this.listView.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; - this.listView.LabelWrap = false; this.listView.LargeImageList = this.imageList; ! this.listView.Location = new System.Drawing.Point(8, 104); this.listView.MultiSelect = false; this.listView.Name = "listView"; ! this.listView.Size = new System.Drawing.Size(328, 160); this.listView.SmallImageList = this.imageList; this.listView.StateImageList = this.imageList; --- 454,462 ---- this.listView.FullRowSelect = true; this.listView.GridLines = true; this.listView.LargeImageList = this.imageList; ! this.listView.Location = new System.Drawing.Point(8, 96); this.listView.MultiSelect = false; this.listView.Name = "listView"; ! this.listView.Size = new System.Drawing.Size(328, 168); this.listView.SmallImageList = this.imageList; this.listView.StateImageList = this.imageList; *************** *** 470,473 **** --- 469,483 ---- this.ColumnHeader1.Width = 500; // + // progressBar + // + this.progressBar.Location = new System.Drawing.Point(8, 40); + this.progressBar.Maximum = 100; + this.progressBar.Minimum = 0; + this.progressBar.Name = "progressBar"; + this.progressBar.ProgressBarColor = System.Drawing.Color.Blue; + this.progressBar.Size = new System.Drawing.Size(328, 16); + this.progressBar.TabIndex = 7; + this.progressBar.Value = 0; + // // ProgressWindow // *************** *** 475,483 **** this.ClientSize = new System.Drawing.Size(344, 278); this.ControlBox = false; this.Controls.Add(this.listView); this.Controls.Add(this.txtMessage2); this.Controls.Add(this.morelessButton); this.Controls.Add(this.cancelButton); - this.Controls.Add(this.progressBar); this.Controls.Add(this.txtMessage1); this.MaximizeBox = false; --- 485,493 ---- this.ClientSize = new System.Drawing.Size(344, 278); this.ControlBox = false; + this.Controls.Add(this.progressBar); this.Controls.Add(this.listView); this.Controls.Add(this.txtMessage2); this.Controls.Add(this.morelessButton); this.Controls.Add(this.cancelButton); this.Controls.Add(this.txtMessage1); this.MaximizeBox = false; |
