diff --git a/Vss2Git/MainForm.Designer.cs b/Vss2Git/MainForm.Designer.cs index 803aa7f..780c261 100755 --- a/Vss2Git/MainForm.Designer.cs +++ b/Vss2Git/MainForm.Designer.cs @@ -48,6 +48,7 @@ private void InitializeComponent() this.changeLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.timeLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.outputGroupBox = new System.Windows.Forms.GroupBox(); + this.ignoreErrorsCheckBox = new System.Windows.Forms.CheckBox(); this.commentTextBox = new System.Windows.Forms.TextBox(); this.commentLabel = new System.Windows.Forms.Label(); this.forceAnnotatedCheckBox = new System.Windows.Forms.CheckBox(); @@ -66,7 +67,6 @@ private void InitializeComponent() this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.anyCommentUpDown = new System.Windows.Forms.NumericUpDown(); - this.ignoreErrorsCheckBox = new System.Windows.Forms.CheckBox(); this.vssGroupBox.SuspendLayout(); this.statusStrip.SuspendLayout(); this.outputGroupBox.SuspendLayout(); @@ -77,8 +77,8 @@ private void InitializeComponent() // // vssGroupBox // - this.vssGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.vssGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.vssGroupBox.Controls.Add(this.encodingLabel); this.vssGroupBox.Controls.Add(this.encodingComboBox); this.vssGroupBox.Controls.Add(this.excludeTextBox); @@ -105,8 +105,8 @@ private void InitializeComponent() // // encodingComboBox // - this.encodingComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.encodingComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.encodingComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.encodingComboBox.FormattingEnabled = true; this.encodingComboBox.Location = new System.Drawing.Point(94, 97); @@ -116,8 +116,8 @@ private void InitializeComponent() // // excludeTextBox // - this.excludeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.excludeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.excludeTextBox.Location = new System.Drawing.Point(94, 71); this.excludeTextBox.Name = "excludeTextBox"; this.excludeTextBox.Size = new System.Drawing.Size(460, 20); @@ -134,8 +134,8 @@ private void InitializeComponent() // // vssProjectTextBox // - this.vssProjectTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.vssProjectTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.vssProjectTextBox.Location = new System.Drawing.Point(94, 45); this.vssProjectTextBox.Name = "vssProjectTextBox"; this.vssProjectTextBox.Size = new System.Drawing.Size(460, 20); @@ -143,8 +143,8 @@ private void InitializeComponent() // // vssDirTextBox // - this.vssDirTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.vssDirTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.vssDirTextBox.Location = new System.Drawing.Point(94, 19); this.vssDirTextBox.Name = "vssDirTextBox"; this.vssDirTextBox.Size = new System.Drawing.Size(460, 20); @@ -231,8 +231,8 @@ private void InitializeComponent() // // outputGroupBox // - this.outputGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.outputGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.outputGroupBox.Controls.Add(this.ignoreErrorsCheckBox); this.outputGroupBox.Controls.Add(this.commentTextBox); this.outputGroupBox.Controls.Add(this.commentLabel); @@ -251,6 +251,17 @@ private void InitializeComponent() this.outputGroupBox.TabStop = false; this.outputGroupBox.Text = "Output Settings"; // + // ignoreErrorsCheckBox + // + this.ignoreErrorsCheckBox.AutoSize = true; + this.ignoreErrorsCheckBox.Location = new System.Drawing.Point(421, 123); + this.ignoreErrorsCheckBox.Name = "ignoreErrorsCheckBox"; + this.ignoreErrorsCheckBox.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.ignoreErrorsCheckBox.Size = new System.Drawing.Size(101, 17); + this.ignoreErrorsCheckBox.TabIndex = 8; + this.ignoreErrorsCheckBox.Text = "Ignore Git errors"; + this.ignoreErrorsCheckBox.UseVisualStyleBackColor = true; + // // commentTextBox // this.commentTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -265,7 +276,7 @@ private void InitializeComponent() this.commentLabel.AutoSize = true; this.commentLabel.Location = new System.Drawing.Point(6, 100); this.commentLabel.Name = "commentLabel"; - this.commentLabel.Size = new System.Drawing.Size(88, 13); + this.commentLabel.Size = new System.Drawing.Size(87, 13); this.commentLabel.TabIndex = 8; this.commentLabel.Text = "Default comment"; // @@ -295,8 +306,8 @@ private void InitializeComponent() // // domainTextBox // - this.domainTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.domainTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.domainTextBox.Location = new System.Drawing.Point(94, 45); this.domainTextBox.Name = "domainTextBox"; this.domainTextBox.Size = new System.Drawing.Size(460, 20); @@ -313,8 +324,8 @@ private void InitializeComponent() // // outDirTextBox // - this.outDirTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.outDirTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.outDirTextBox.Location = new System.Drawing.Point(94, 19); this.outDirTextBox.Name = "outDirTextBox"; this.outDirTextBox.Size = new System.Drawing.Size(460, 20); @@ -331,8 +342,8 @@ private void InitializeComponent() // // logTextBox // - this.logTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.logTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.logTextBox.Location = new System.Drawing.Point(94, 71); this.logTextBox.Name = "logTextBox"; this.logTextBox.Size = new System.Drawing.Size(460, 20); @@ -433,17 +444,6 @@ private void InitializeComponent() this.anyCommentUpDown.Name = "anyCommentUpDown"; this.anyCommentUpDown.Size = new System.Drawing.Size(54, 20); this.anyCommentUpDown.TabIndex = 1; - // - // ignoreErrorsCheckBox - // - this.ignoreErrorsCheckBox.AutoSize = true; - this.ignoreErrorsCheckBox.Location = new System.Drawing.Point(422, 97); - this.ignoreErrorsCheckBox.Name = "ignoreErrorsCheckBox"; - this.ignoreErrorsCheckBox.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.ignoreErrorsCheckBox.Size = new System.Drawing.Size(101, 17); - this.ignoreErrorsCheckBox.TabIndex = 8; - this.ignoreErrorsCheckBox.Text = "Ignore Git errors"; - this.ignoreErrorsCheckBox.UseVisualStyleBackColor = true; // // MainForm // @@ -463,8 +463,8 @@ private void InitializeComponent() this.Name = "MainForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "VSS2Git"; - this.Load += new System.EventHandler(this.MainForm_Load); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing); + this.Load += new System.EventHandler(this.MainForm_Load); this.vssGroupBox.ResumeLayout(false); this.vssGroupBox.PerformLayout(); this.statusStrip.ResumeLayout(false);