@@ -160,7 +160,7 @@ // AboutBox // this.AcceptButton = this.okButton; - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(435, 283); this.Controls.Add(this.tableLayoutPanel); GitUI/AboutBox.Designer.cs @@ -68,7 +68,7 @@ this.RevisionGrid.HeadFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold); this.RevisionGrid.LastRow = 0; this.RevisionGrid.Location = new System.Drawing.Point(0, 0); - this.RevisionGrid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.RevisionGrid.Margin = new System.Windows.Forms.Padding(4); this.RevisionGrid.Name = "RevisionGrid"; this.RevisionGrid.NormalFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.RevisionGrid.Size = new System.Drawing.Size(750, 205); @@ -97,10 +97,9 @@ // this.DiffFiles.Dock = System.Windows.Forms.DockStyle.Fill; this.DiffFiles.FormattingEnabled = true; - this.DiffFiles.ItemHeight = 16; this.DiffFiles.Location = new System.Drawing.Point(0, 0); this.DiffFiles.Name = "DiffFiles"; - this.DiffFiles.Size = new System.Drawing.Size(136, 308); + this.DiffFiles.Size = new System.Drawing.Size(136, 316); this.DiffFiles.Sorted = true; this.DiffFiles.TabIndex = 0; this.DiffFiles.SelectedIndexChanged += new System.EventHandler(this.DiffFiles_SelectedIndexChanged); @@ -110,7 +109,7 @@ // this.DiffText.Dock = System.Windows.Forms.DockStyle.Fill; this.DiffText.Location = new System.Drawing.Point(0, 0); - this.DiffText.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.DiffText.Margin = new System.Windows.Forms.Padding(4); this.DiffText.Name = "DiffText"; this.DiffText.ScrollPos = 0; this.DiffText.Size = new System.Drawing.Size(610, 320); @@ -118,7 +117,7 @@ // // FormDiff // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(750, 529); this.Controls.Add(this.splitContainer1); GitUI/FormDiff.Designer.cs @@ -64,10 +64,9 @@ // this.DiffFiles.Dock = System.Windows.Forms.DockStyle.Fill; this.DiffFiles.FormattingEnabled = true; - this.DiffFiles.ItemHeight = 16; this.DiffFiles.Location = new System.Drawing.Point(0, 0); this.DiffFiles.Name = "DiffFiles"; - this.DiffFiles.Size = new System.Drawing.Size(239, 404); + this.DiffFiles.Size = new System.Drawing.Size(239, 407); this.DiffFiles.Sorted = true; this.DiffFiles.TabIndex = 0; this.DiffFiles.SelectedIndexChanged += new System.EventHandler(this.DiffFiles_SelectedIndexChanged); @@ -77,7 +76,7 @@ // this.DiffText.Dock = System.Windows.Forms.DockStyle.Fill; this.DiffText.Location = new System.Drawing.Point(0, 0); - this.DiffText.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.DiffText.Margin = new System.Windows.Forms.Padding(4); this.DiffText.Name = "DiffText"; this.DiffText.ScrollPos = 0; this.DiffText.Size = new System.Drawing.Size(474, 410); @@ -115,7 +114,7 @@ // // FormDiffSmall // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(717, 529); this.Controls.Add(this.splitContainer2); GitUI/FormDiffSmall.Designer.cs @@ -111,7 +111,7 @@ // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.groupBox1); - this.splitContainer1.Size = new System.Drawing.Size(642, 186); + this.splitContainer1.Size = new System.Drawing.Size(642, 189); this.splitContainer1.SplitterDistance = 177; this.splitContainer1.TabIndex = 0; // @@ -119,10 +119,9 @@ // this.Remotes.Dock = System.Windows.Forms.DockStyle.Fill; this.Remotes.FormattingEnabled = true; - this.Remotes.ItemHeight = 16; this.Remotes.Location = new System.Drawing.Point(0, 0); this.Remotes.Name = "Remotes"; - this.Remotes.Size = new System.Drawing.Size(177, 180); + this.Remotes.Size = new System.Drawing.Size(177, 186); this.Remotes.TabIndex = 0; this.Remotes.SelectedIndexChanged += new System.EventHandler(this.Remotes_SelectedIndexChanged); // @@ -174,7 +173,7 @@ // this.PuttySshKey.Location = new System.Drawing.Point(107, 13); this.PuttySshKey.Name = "PuttySshKey"; - this.PuttySshKey.Size = new System.Drawing.Size(246, 22); + this.PuttySshKey.Size = new System.Drawing.Size(246, 20); this.PuttySshKey.TabIndex = 7; this.PuttySshKey.TextChanged += new System.EventHandler(this.PuttySshKey_TextChanged); // @@ -195,7 +194,7 @@ this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(6, 16); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(100, 17); + this.label3.Size = new System.Drawing.Size(76, 13); this.label3.TabIndex = 5; this.label3.Text = "Private key file"; // @@ -243,7 +242,7 @@ // this.RemoteName.Location = new System.Drawing.Point(113, 19); this.RemoteName.Name = "RemoteName"; - this.RemoteName.Size = new System.Drawing.Size(246, 22); + this.RemoteName.Size = new System.Drawing.Size(246, 20); this.RemoteName.TabIndex = 1; this.RemoteName.TextChanged += new System.EventHandler(this.RemoteName_TextChanged); // @@ -252,7 +251,7 @@ this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(13, 22); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(45, 17); + this.label1.Size = new System.Drawing.Size(35, 13); this.label1.TabIndex = 0; this.label1.Text = "Name"; // @@ -261,7 +260,7 @@ this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(13, 51); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(26, 17); + this.label2.Size = new System.Drawing.Size(20, 13); this.label2.TabIndex = 2; this.label2.Text = "Url"; // @@ -270,7 +269,7 @@ this.Url.FormattingEnabled = true; this.Url.Location = new System.Drawing.Point(113, 48); this.Url.Name = "Url"; - this.Url.Size = new System.Drawing.Size(246, 24); + this.Url.Size = new System.Drawing.Size(246, 21); this.Url.TabIndex = 3; this.Url.SelectedIndexChanged += new System.EventHandler(this.Url_SelectedIndexChanged); this.Url.DropDown += new System.EventHandler(this.Url_DropDown); @@ -299,10 +298,10 @@ // tabPage1 // this.tabPage1.Controls.Add(this.splitContainer1); - this.tabPage1.Location = new System.Drawing.Point(4, 25); + this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(648, 192); + this.tabPage1.Size = new System.Drawing.Size(648, 195); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "Remote repositories"; this.tabPage1.UseVisualStyleBackColor = true; @@ -310,10 +309,10 @@ // tabPage2 // this.tabPage2.Controls.Add(this.splitContainer2); - this.tabPage2.Location = new System.Drawing.Point(4, 25); + this.tabPage2.Location = new System.Drawing.Point(4, 22); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(648, 192); + this.tabPage2.Size = new System.Drawing.Size(648, 195); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "Default pull behaviour (fetch & merge)"; this.tabPage2.UseVisualStyleBackColor = true; @@ -334,8 +333,8 @@ // this.splitContainer2.Panel2.Controls.Add(this.Prune); this.splitContainer2.Panel2.Controls.Add(this.UpdateBranch); - this.splitContainer2.Size = new System.Drawing.Size(642, 186); - this.splitContainer2.SplitterDistance = 152; + this.splitContainer2.Size = new System.Drawing.Size(642, 189); + this.splitContainer2.SplitterDistance = 155; this.splitContainer2.TabIndex = 11; // // splitContainer3 @@ -357,7 +356,7 @@ this.splitContainer3.Panel2.Controls.Add(this.label6); this.splitContainer3.Panel2.Controls.Add(this.label5); this.splitContainer3.Panel2.Controls.Add(this.label4); - this.splitContainer3.Size = new System.Drawing.Size(642, 152); + this.splitContainer3.Size = new System.Drawing.Size(642, 155); this.splitContainer3.SplitterDistance = 376; this.splitContainer3.TabIndex = 1; // @@ -390,7 +389,7 @@ this.RemoteBranches.ReadOnly = true; this.RemoteBranches.RowHeadersVisible = false; this.RemoteBranches.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.RemoteBranches.Size = new System.Drawing.Size(376, 152); + this.RemoteBranches.Size = new System.Drawing.Size(376, 155); this.RemoteBranches.TabIndex = 0; this.RemoteBranches.RowValidated += new System.Windows.Forms.DataGridViewCellEventHandler(this.RemoteBranches_RowValidated); this.RemoteBranches.SelectionChanged += new System.EventHandler(this.RemoteBranches_SelectionChanged); @@ -514,7 +513,7 @@ // this.LocalBranchNameEdit.Location = new System.Drawing.Point(124, 6); this.LocalBranchNameEdit.Name = "LocalBranchNameEdit"; - this.LocalBranchNameEdit.Size = new System.Drawing.Size(133, 22); + this.LocalBranchNameEdit.Size = new System.Drawing.Size(133, 20); this.LocalBranchNameEdit.TabIndex = 5; this.LocalBranchNameEdit.TextChanged += new System.EventHandler(this.LocalBranchNameEdit_TextChanged); // @@ -523,7 +522,7 @@ this.RemoteRepositoryCombo.FormattingEnabled = true; this.RemoteRepositoryCombo.Location = new System.Drawing.Point(124, 32); this.RemoteRepositoryCombo.Name = "RemoteRepositoryCombo"; - this.RemoteRepositoryCombo.Size = new System.Drawing.Size(133, 24); + this.RemoteRepositoryCombo.Size = new System.Drawing.Size(133, 21); this.RemoteRepositoryCombo.TabIndex = 4; this.RemoteRepositoryCombo.SelectedIndexChanged += new System.EventHandler(this.RemoteRepositoryCombo_SelectedIndexChanged); this.RemoteRepositoryCombo.Validated += new System.EventHandler(this.RemoteRepositoryCombo_Validated); @@ -533,7 +532,7 @@ this.DefaultMergeWithCombo.FormattingEnabled = true; this.DefaultMergeWithCombo.Location = new System.Drawing.Point(124, 59); this.DefaultMergeWithCombo.Name = "DefaultMergeWithCombo"; - this.DefaultMergeWithCombo.Size = new System.Drawing.Size(133, 24); + this.DefaultMergeWithCombo.Size = new System.Drawing.Size(133, 21); this.DefaultMergeWithCombo.TabIndex = 3; this.DefaultMergeWithCombo.SelectedIndexChanged += new System.EventHandler(this.DefaultMergeWithCombo_SelectedIndexChanged); this.DefaultMergeWithCombo.Validated += new System.EventHandler(this.DefaultMergeWithCombo_Validated); @@ -544,7 +543,7 @@ this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(7, 62); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(125, 17); + this.label6.Size = new System.Drawing.Size(95, 13); this.label6.TabIndex = 2; this.label6.Text = "Default merge with"; // @@ -553,7 +552,7 @@ this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(7, 35); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(124, 17); + this.label5.Size = new System.Drawing.Size(92, 13); this.label5.TabIndex = 1; this.label5.Text = "Remote repository"; // @@ -562,7 +561,7 @@ this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(7, 9); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(129, 17); + this.label4.Size = new System.Drawing.Size(98, 13); this.label4.TabIndex = 0; this.label4.Text = "Local branch name"; // @@ -608,7 +607,7 @@ // // FormRemotes // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(656, 221); this.Controls.Add(this.tabControl1); GitUI/FormRemotes.Designer.cs @@ -145,6 +145,13 @@ this.directorySearcher2 = new System.DirectoryServices.DirectorySearcher(); this.label10 = new System.Windows.Forms.Label(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.label28 = new System.Windows.Forms.Label(); + this.label30 = new System.Windows.Forms.Label(); + this.label34 = new System.Windows.Forms.Label(); + this.label35 = new System.Windows.Forms.Label(); + this.label37 = new System.Windows.Forms.Label(); + this.label38 = new System.Windows.Forms.Label(); + this.label39 = new System.Windows.Forms.Label(); this.LocalSettings.SuspendLayout(); this.InvalidGitPathLocal.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); @@ -169,6 +176,7 @@ // // LocalSettings // + this.LocalSettings.Controls.Add(this.label30); this.LocalSettings.Controls.Add(this.lblLocalAutoCRLF); this.LocalSettings.Controls.Add(this.LocalAutoCRLF); this.LocalSettings.Controls.Add(this.InvalidGitPathLocal); @@ -183,10 +191,10 @@ this.LocalSettings.Controls.Add(this.UserName); this.LocalSettings.Controls.Add(this.label2); this.LocalSettings.Controls.Add(this.label1); - this.LocalSettings.Location = new System.Drawing.Point(4, 25); + this.LocalSettings.Location = new System.Drawing.Point(4, 22); this.LocalSettings.Name = "LocalSettings"; this.LocalSettings.Padding = new System.Windows.Forms.Padding(3); - this.LocalSettings.Size = new System.Drawing.Size(710, 319); + this.LocalSettings.Size = new System.Drawing.Size(710, 322); this.LocalSettings.TabIndex = 0; this.LocalSettings.Text = "Local settings"; this.LocalSettings.UseVisualStyleBackColor = true; @@ -196,7 +204,7 @@ this.lblLocalAutoCRLF.AutoSize = true; this.lblLocalAutoCRLF.Location = new System.Drawing.Point(8, 156); this.lblLocalAutoCRLF.Name = "lblLocalAutoCRLF"; - this.lblLocalAutoCRLF.Size = new System.Drawing.Size(391, 17); + this.lblLocalAutoCRLF.Size = new System.Drawing.Size(295, 13); this.lblLocalAutoCRLF.TabIndex = 22; this.lblLocalAutoCRLF.Text = "Convert CRLF at the end of lines in text files to LF, AutoCRLF"; // @@ -209,7 +217,7 @@ "input"}); this.LocalAutoCRLF.Location = new System.Drawing.Point(405, 149); this.LocalAutoCRLF.Name = "LocalAutoCRLF"; - this.LocalAutoCRLF.Size = new System.Drawing.Size(121, 24); + this.LocalAutoCRLF.Size = new System.Drawing.Size(121, 21); this.LocalAutoCRLF.TabIndex = 21; // // InvalidGitPathLocal @@ -229,7 +237,7 @@ this.label21.AutoSize = true; this.label21.Location = new System.Drawing.Point(63, 9); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(232, 51); + this.label21.Size = new System.Drawing.Size(175, 39); this.label21.TabIndex = 19; this.label21.Text = "You need to set the correct path to \r\ngit.cmd before you can change\r\nlocal settin" + "gs.\r\n"; @@ -250,7 +258,7 @@ this.NoGitRepo.ForeColor = System.Drawing.Color.Red; this.NoGitRepo.Location = new System.Drawing.Point(460, 76); this.NoGitRepo.Name = "NoGitRepo"; - this.NoGitRepo.Size = new System.Drawing.Size(143, 17); + this.NoGitRepo.Size = new System.Drawing.Size(106, 13); this.NoGitRepo.TabIndex = 12; this.NoGitRepo.Text = "Not in a git repository"; // @@ -261,7 +269,7 @@ this.label20.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label20.Location = new System.Drawing.Point(440, 6); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(195, 70); + this.label20.Size = new System.Drawing.Size(145, 54); this.label20.TabIndex = 11; this.label20.Text = "You only need local settings\r\nif you want to override the \r\nglobal settings for t" + "he current\r\nrepository."; @@ -274,7 +282,7 @@ "p4merge"}); this.MergeTool.Location = new System.Drawing.Point(118, 94); this.MergeTool.Name = "MergeTool"; - this.MergeTool.Size = new System.Drawing.Size(159, 24); + this.MergeTool.Size = new System.Drawing.Size(159, 21); this.MergeTool.TabIndex = 10; // // KeepMergeBackup @@ -282,12 +290,11 @@ this.KeepMergeBackup.AutoSize = true; this.KeepMergeBackup.Checked = true; this.KeepMergeBackup.CheckState = System.Windows.Forms.CheckState.Indeterminate; - this.KeepMergeBackup.Location = new System.Drawing.Point(189, 124); + this.KeepMergeBackup.Location = new System.Drawing.Point(405, 127); this.KeepMergeBackup.Name = "KeepMergeBackup"; this.KeepMergeBackup.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - this.KeepMergeBackup.Size = new System.Drawing.Size(232, 21); + this.KeepMergeBackup.Size = new System.Drawing.Size(15, 14); this.KeepMergeBackup.TabIndex = 9; - this.KeepMergeBackup.Text = "Keep backup (.orig) after merge"; this.KeepMergeBackup.UseVisualStyleBackColor = true; // // label8 @@ -295,7 +302,7 @@ this.label8.AutoSize = true; this.label8.Location = new System.Drawing.Point(8, 97); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(71, 17); + this.label8.Size = new System.Drawing.Size(54, 13); this.label8.TabIndex = 6; this.label8.Text = "Mergetool"; // @@ -303,7 +310,7 @@ // this.Editor.Location = new System.Drawing.Point(118, 67); this.Editor.Name = "Editor"; - this.Editor.Size = new System.Drawing.Size(159, 22); + this.Editor.Size = new System.Drawing.Size(159, 20); this.Editor.TabIndex = 5; // // label5 @@ -311,7 +318,7 @@ this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(8, 70); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(45, 17); + this.label5.Size = new System.Drawing.Size(34, 13); this.label5.TabIndex = 4; this.label5.Text = "Editor"; // @@ -319,7 +326,7 @@ // this.UserEmail.Location = new System.Drawing.Point(118, 40); this.UserEmail.Name = "UserEmail"; - this.UserEmail.Size = new System.Drawing.Size(159, 22); + this.UserEmail.Size = new System.Drawing.Size(159, 20); this.UserEmail.TabIndex = 3; this.UserEmail.TextChanged += new System.EventHandler(this.UserEmail_TextChanged); // @@ -327,7 +334,7 @@ // this.UserName.Location = new System.Drawing.Point(118, 12); this.UserName.Name = "UserName"; - this.UserName.Size = new System.Drawing.Size(159, 22); + this.UserName.Size = new System.Drawing.Size(159, 20); this.UserName.TabIndex = 1; this.UserName.TextChanged += new System.EventHandler(this.UserName_TextChanged); // @@ -336,7 +343,7 @@ this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(8, 40); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(75, 17); + this.label2.Size = new System.Drawing.Size(56, 13); this.label2.TabIndex = 2; this.label2.Text = "User email"; // @@ -345,23 +352,23 @@ this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(8, 12); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(77, 17); + this.label1.Size = new System.Drawing.Size(58, 13); this.label1.TabIndex = 0; this.label1.Text = "User name"; // // SmtpServer // - this.SmtpServer.Location = new System.Drawing.Point(382, 141); + this.SmtpServer.Location = new System.Drawing.Point(382, 140); this.SmtpServer.Name = "SmtpServer"; - this.SmtpServer.Size = new System.Drawing.Size(242, 22); + this.SmtpServer.Size = new System.Drawing.Size(242, 20); this.SmtpServer.TabIndex = 17; // // label23 // this.label23.AutoSize = true; - this.label23.Location = new System.Drawing.Point(8, 145); + this.label23.Location = new System.Drawing.Point(8, 144); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(213, 17); + this.label23.Size = new System.Drawing.Size(159, 13); this.label23.TabIndex = 18; this.label23.Text = "Smtp server for sending patches"; // @@ -392,9 +399,9 @@ this.tabPage3.Controls.Add(this.UserNameSet); this.tabPage3.Controls.Add(this.ShellExtensionsRegistered); this.tabPage3.Controls.Add(this.GitExtensionsInstall); - this.tabPage3.Location = new System.Drawing.Point(4, 25); + this.tabPage3.Location = new System.Drawing.Point(4, 22); this.tabPage3.Name = "tabPage3"; - this.tabPage3.Size = new System.Drawing.Size(710, 319); + this.tabPage3.Size = new System.Drawing.Size(710, 322); this.tabPage3.TabIndex = 2; this.tabPage3.Text = "Checklist"; this.tabPage3.UseVisualStyleBackColor = true; @@ -444,7 +451,7 @@ this.CheckAtStartup.AutoSize = true; this.CheckAtStartup.Location = new System.Drawing.Point(12, 286); this.CheckAtStartup.Name = "CheckAtStartup"; - this.CheckAtStartup.Size = new System.Drawing.Size(493, 21); + this.CheckAtStartup.Size = new System.Drawing.Size(368, 17); this.CheckAtStartup.TabIndex = 7; this.CheckAtStartup.Text = "Check settings at startup (disables automatically if all settings are correct)"; this.CheckAtStartup.UseVisualStyleBackColor = true; @@ -455,7 +462,7 @@ this.label11.AutoSize = true; this.label11.Location = new System.Drawing.Point(9, 4); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(577, 17); + this.label11.Size = new System.Drawing.Size(434, 13); this.label11.TabIndex = 6; this.label11.Text = "The checklist below validates the basic settings needed for GitExtensions to work" + " properly."; @@ -537,6 +544,11 @@ // // TabPageGitExtensions // + this.TabPageGitExtensions.Controls.Add(this.label39); + this.TabPageGitExtensions.Controls.Add(this.label38); + this.TabPageGitExtensions.Controls.Add(this.label37); + this.TabPageGitExtensions.Controls.Add(this.label35); + this.TabPageGitExtensions.Controls.Add(this.label34); this.TabPageGitExtensions.Controls.Add(this.EncodingLabel); this.TabPageGitExtensions.Controls.Add(this.Encoding); this.TabPageGitExtensions.Controls.Add(this.label23); @@ -556,9 +568,9 @@ this.TabPageGitExtensions.Controls.Add(this.label13); this.TabPageGitExtensions.Controls.Add(this.MaxCommits); this.TabPageGitExtensions.Controls.Add(this.label12); - this.TabPageGitExtensions.Location = new System.Drawing.Point(4, 25); + this.TabPageGitExtensions.Location = new System.Drawing.Point(4, 22); this.TabPageGitExtensions.Name = "TabPageGitExtensions"; - this.TabPageGitExtensions.Size = new System.Drawing.Size(710, 319); + this.TabPageGitExtensions.Size = new System.Drawing.Size(710, 322); this.TabPageGitExtensions.TabIndex = 3; this.TabPageGitExtensions.Text = "Git extensions"; this.TabPageGitExtensions.UseVisualStyleBackColor = true; @@ -567,9 +579,9 @@ // EncodingLabel // this.EncodingLabel.AutoSize = true; - this.EncodingLabel.Location = new System.Drawing.Point(332, 291); + this.EncodingLabel.Location = new System.Drawing.Point(324, 291); this.EncodingLabel.Name = "EncodingLabel"; - this.EncodingLabel.Size = new System.Drawing.Size(67, 17); + this.EncodingLabel.Size = new System.Drawing.Size(52, 13); this.EncodingLabel.TabIndex = 20; this.EncodingLabel.Text = "Encoding"; // @@ -582,17 +594,17 @@ "UTF7", "UTF8", "UTF32"}); - this.Encoding.Location = new System.Drawing.Point(404, 289); + this.Encoding.Location = new System.Drawing.Point(382, 288); this.Encoding.Name = "Encoding"; - this.Encoding.Size = new System.Drawing.Size(242, 24); + this.Encoding.Size = new System.Drawing.Size(242, 21); this.Encoding.TabIndex = 19; // // Dictionary // this.Dictionary.FormattingEnabled = true; - this.Dictionary.Location = new System.Drawing.Point(382, 110); + this.Dictionary.Location = new System.Drawing.Point(382, 109); this.Dictionary.Name = "Dictionary"; - this.Dictionary.Size = new System.Drawing.Size(242, 24); + this.Dictionary.Size = new System.Drawing.Size(242, 21); this.Dictionary.TabIndex = 15; this.Dictionary.SelectedIndexChanged += new System.EventHandler(this.Dictionary_SelectedIndexChanged); this.Dictionary.DropDown += new System.EventHandler(this.Dictionary_DropDown); @@ -600,66 +612,61 @@ // label22 // this.label22.AutoSize = true; - this.label22.Location = new System.Drawing.Point(8, 119); + this.label22.Location = new System.Drawing.Point(8, 118); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(202, 17); + this.label22.Size = new System.Drawing.Size(152, 13); this.label22.TabIndex = 14; this.label22.Text = "Dictionary for spelling checker."; // // ShowRelativeDate // this.ShowRelativeDate.AutoSize = true; - this.ShowRelativeDate.Location = new System.Drawing.Point(156, 265); + this.ShowRelativeDate.Location = new System.Drawing.Point(382, 262); this.ShowRelativeDate.Name = "ShowRelativeDate"; this.ShowRelativeDate.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - this.ShowRelativeDate.Size = new System.Drawing.Size(266, 21); + this.ShowRelativeDate.Size = new System.Drawing.Size(15, 14); this.ShowRelativeDate.TabIndex = 13; - this.ShowRelativeDate.Text = "Show relative date instead of full date"; this.ShowRelativeDate.UseVisualStyleBackColor = true; // // UseFastChecks // this.UseFastChecks.AutoSize = true; - this.UseFastChecks.Location = new System.Drawing.Point(64, 242); + this.UseFastChecks.Location = new System.Drawing.Point(382, 240); this.UseFastChecks.Name = "UseFastChecks"; this.UseFastChecks.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - this.UseFastChecks.Size = new System.Drawing.Size(358, 21); + this.UseFastChecks.Size = new System.Drawing.Size(15, 14); this.UseFastChecks.TabIndex = 12; - this.UseFastChecks.Text = "Use FileSystemWatcher to check if index is changed"; this.UseFastChecks.UseVisualStyleBackColor = true; // // ShowGitCommandLine // this.ShowGitCommandLine.AutoSize = true; - this.ShowGitCommandLine.Location = new System.Drawing.Point(52, 195); + this.ShowGitCommandLine.Location = new System.Drawing.Point(382, 196); this.ShowGitCommandLine.Name = "ShowGitCommandLine"; this.ShowGitCommandLine.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - this.ShowGitCommandLine.Size = new System.Drawing.Size(370, 21); + this.ShowGitCommandLine.Size = new System.Drawing.Size(15, 14); this.ShowGitCommandLine.TabIndex = 11; - this.ShowGitCommandLine.Text = "Show Git commandline dialog when executing process"; this.ShowGitCommandLine.UseVisualStyleBackColor = true; // // ShowRevisionGraph // this.ShowRevisionGraph.AutoSize = true; - this.ShowRevisionGraph.Location = new System.Drawing.Point(178, 219); + this.ShowRevisionGraph.Location = new System.Drawing.Point(382, 218); this.ShowRevisionGraph.Name = "ShowRevisionGraph"; this.ShowRevisionGraph.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - this.ShowRevisionGraph.Size = new System.Drawing.Size(244, 21); + this.ShowRevisionGraph.Size = new System.Drawing.Size(15, 14); this.ShowRevisionGraph.TabIndex = 10; - this.ShowRevisionGraph.Text = "Show revision graph in commit log"; this.ShowRevisionGraph.UseVisualStyleBackColor = true; this.ShowRevisionGraph.CheckedChanged += new System.EventHandler(this.ShowRevisionGraph_CheckedChanged); // // CloseProcessDialog // this.CloseProcessDialog.AutoSize = true; - this.CloseProcessDialog.Location = new System.Drawing.Point(8, 171); + this.CloseProcessDialog.Location = new System.Drawing.Point(382, 174); this.CloseProcessDialog.Name = "CloseProcessDialog"; this.CloseProcessDialog.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - this.CloseProcessDialog.Size = new System.Drawing.Size(414, 21); + this.CloseProcessDialog.Size = new System.Drawing.Size(15, 14); this.CloseProcessDialog.TabIndex = 9; - this.CloseProcessDialog.Text = "Close process dialog automaticly when process is succeeded"; this.CloseProcessDialog.UseVisualStyleBackColor = true; // // BrowseGitBinPath @@ -676,7 +683,7 @@ // this.GitBinPath.Location = new System.Drawing.Point(382, 35); this.GitBinPath.Name = "GitBinPath"; - this.GitBinPath.Size = new System.Drawing.Size(242, 22); + this.GitBinPath.Size = new System.Drawing.Size(242, 20); this.GitBinPath.TabIndex = 7; // // label14 @@ -684,7 +691,7 @@ this.label14.AutoSize = true; this.label14.Location = new System.Drawing.Point(8, 40); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(355, 17); + this.label14.Size = new System.Drawing.Size(267, 13); this.label14.TabIndex = 6; this.label14.Text = "Path to git.exe (leave empty when git.exe is in the path)"; // @@ -702,7 +709,7 @@ // this.GitPath.Location = new System.Drawing.Point(382, 9); this.GitPath.Name = "GitPath"; - this.GitPath.Size = new System.Drawing.Size(242, 22); + this.GitPath.Size = new System.Drawing.Size(242, 20); this.GitPath.TabIndex = 4; this.GitPath.TextChanged += new System.EventHandler(this.GitPath_TextChanged); // @@ -711,7 +718,7 @@ this.label13.AutoSize = true; this.label13.Location = new System.Drawing.Point(8, 14); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(363, 17); + this.label13.Size = new System.Drawing.Size(273, 13); this.label13.TabIndex = 3; this.label13.Text = "Path to git.cmd (leave empty when git.cmd is in the path)"; // @@ -729,7 +736,7 @@ 0, 0}); this.MaxCommits.Name = "MaxCommits"; - this.MaxCommits.Size = new System.Drawing.Size(123, 22); + this.MaxCommits.Size = new System.Drawing.Size(123, 20); this.MaxCommits.TabIndex = 2; this.MaxCommits.Value = new decimal(new int[] { 1000, @@ -742,7 +749,7 @@ this.label12.AutoSize = true; this.label12.Location = new System.Drawing.Point(8, 64); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(379, 51); + this.label12.Size = new System.Drawing.Size(285, 39); this.label12.TabIndex = 0; this.label12.Text = "Limit number of commits that will be loaded at startup.\r\nOther commits will be lo" + "aded when needed. Lower number \r\nresult is shorter startup time, but slower scro" + @@ -752,9 +759,9 @@ // this.AppearancePage.Controls.Add(this.groupBox4); this.AppearancePage.Controls.Add(this.groupBox3); - this.AppearancePage.Location = new System.Drawing.Point(4, 25); + this.AppearancePage.Location = new System.Drawing.Point(4, 22); this.AppearancePage.Name = "AppearancePage"; - this.AppearancePage.Size = new System.Drawing.Size(710, 319); + this.AppearancePage.Size = new System.Drawing.Size(710, 322); this.AppearancePage.TabIndex = 5; this.AppearancePage.Text = "Appearance"; this.AppearancePage.UseVisualStyleBackColor = true; @@ -785,7 +792,7 @@ this.label33.AutoSize = true; this.label33.Location = new System.Drawing.Point(6, 133); this.label33.Name = "label33"; - this.label33.Size = new System.Drawing.Size(137, 17); + this.label33.Size = new System.Drawing.Size(102, 13); this.label33.TabIndex = 8; this.label33.Text = "Color remote branch"; // @@ -797,7 +804,7 @@ this.ColorRemoteBranchLabel.Cursor = System.Windows.Forms.Cursors.Hand; this.ColorRemoteBranchLabel.Location = new System.Drawing.Point(211, 133); this.ColorRemoteBranchLabel.Name = "ColorRemoteBranchLabel"; - this.ColorRemoteBranchLabel.Size = new System.Drawing.Size(36, 19); + this.ColorRemoteBranchLabel.Size = new System.Drawing.Size(29, 15); this.ColorRemoteBranchLabel.TabIndex = 9; this.ColorRemoteBranchLabel.Text = "Red"; this.ColorRemoteBranchLabel.Click += new System.EventHandler(this.ColorRemoteBranchLabel_Click); @@ -810,7 +817,7 @@ this.ColorOtherLabel.Cursor = System.Windows.Forms.Cursors.Hand; this.ColorOtherLabel.Location = new System.Drawing.Point(211, 161); this.ColorOtherLabel.Name = "ColorOtherLabel"; - this.ColorOtherLabel.Size = new System.Drawing.Size(36, 19); + this.ColorOtherLabel.Size = new System.Drawing.Size(29, 15); this.ColorOtherLabel.TabIndex = 11; this.ColorOtherLabel.Text = "Red"; this.ColorOtherLabel.Click += new System.EventHandler(this.ColorOtherLabel_Click); @@ -820,7 +827,7 @@ this.label36.AutoSize = true; this.label36.Location = new System.Drawing.Point(6, 161); this.label36.Name = "label36"; - this.label36.Size = new System.Drawing.Size(112, 17); + this.label36.Size = new System.Drawing.Size(83, 13); this.label36.TabIndex = 10; this.label36.Text = "Color other label"; // @@ -829,7 +836,7 @@ this.label25.AutoSize = true; this.label25.Location = new System.Drawing.Point(6, 76); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(65, 17); + this.label25.Size = new System.Drawing.Size(49, 13); this.label25.TabIndex = 4; this.label25.Text = "Color tag"; // @@ -841,7 +848,7 @@ this.ColorTagLabel.Cursor = System.Windows.Forms.Cursors.Hand; this.ColorTagLabel.Location = new System.Drawing.Point(211, 76); this.ColorTagLabel.Name = "ColorTagLabel"; - this.ColorTagLabel.Size = new System.Drawing.Size(36, 19); + this.ColorTagLabel.Size = new System.Drawing.Size(29, 15); this.ColorTagLabel.TabIndex = 5; this.ColorTagLabel.Text = "Red"; this.ColorTagLabel.Click += new System.EventHandler(this.ColorTagLabel_Click); @@ -854,7 +861,7 @@ this.ColorBranchLabel.Cursor = System.Windows.Forms.Cursors.Hand; this.ColorBranchLabel.Location = new System.Drawing.Point(211, 104); this.ColorBranchLabel.Name = "ColorBranchLabel"; - this.ColorBranchLabel.Size = new System.Drawing.Size(36, 19); + this.ColorBranchLabel.Size = new System.Drawing.Size(29, 15); this.ColorBranchLabel.TabIndex = 7; this.ColorBranchLabel.Text = "Red"; this.ColorBranchLabel.Click += new System.EventHandler(this.ColorBranchLabel_Click); @@ -864,7 +871,7 @@ this.label32.AutoSize = true; this.label32.Location = new System.Drawing.Point(6, 104); this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(89, 17); + this.label32.Size = new System.Drawing.Size(67, 13); this.label32.TabIndex = 6; this.label32.Text = "Color branch"; // @@ -873,7 +880,7 @@ this.label24.AutoSize = true; this.label24.Location = new System.Drawing.Point(6, 19); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(135, 17); + this.label24.Size = new System.Drawing.Size(100, 13); this.label24.TabIndex = 0; this.label24.Text = "Color revision graph"; // @@ -885,7 +892,7 @@ this.RevisionGraphColorLabel.Cursor = System.Windows.Forms.Cursors.Hand; this.RevisionGraphColorLabel.Location = new System.Drawing.Point(211, 19); this.RevisionGraphColorLabel.Name = "RevisionGraphColorLabel"; - this.RevisionGraphColorLabel.Size = new System.Drawing.Size(36, 19); + this.RevisionGraphColorLabel.Size = new System.Drawing.Size(29, 15); this.RevisionGraphColorLabel.TabIndex = 1; this.RevisionGraphColorLabel.Text = "Red"; this.RevisionGraphColorLabel.Click += new System.EventHandler(this.label25_Click); @@ -898,7 +905,7 @@ this.RevisionGraphColorSelected.Cursor = System.Windows.Forms.Cursors.Hand; this.RevisionGraphColorSelected.Location = new System.Drawing.Point(211, 47); this.RevisionGraphColorSelected.Name = "RevisionGraphColorSelected"; - this.RevisionGraphColorSelected.Size = new System.Drawing.Size(36, 19); + this.RevisionGraphColorSelected.Size = new System.Drawing.Size(29, 15); this.RevisionGraphColorSelected.TabIndex = 3; this.RevisionGraphColorSelected.Text = "Red"; this.RevisionGraphColorSelected.Click += new System.EventHandler(this.label25_Click_1); @@ -908,7 +915,7 @@ this.label26.AutoSize = true; this.label26.Location = new System.Drawing.Point(6, 47); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(192, 17); + this.label26.Size = new System.Drawing.Size(143, 13); this.label26.TabIndex = 2; this.label26.Text = "Color revision graph selected"; // @@ -932,7 +939,7 @@ this.label27.AutoSize = true; this.label27.Location = new System.Drawing.Point(6, 19); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(126, 17); + this.label27.Size = new System.Drawing.Size(94, 13); this.label27.TabIndex = 4; this.label27.Text = "Color removed line"; // @@ -944,7 +951,7 @@ this.ColorSectionLabel.Cursor = System.Windows.Forms.Cursors.Hand; this.ColorSectionLabel.Location = new System.Drawing.Point(208, 78); this.ColorSectionLabel.Name = "ColorSectionLabel"; - this.ColorSectionLabel.Size = new System.Drawing.Size(36, 19); + this.ColorSectionLabel.Size = new System.Drawing.Size(29, 15); this.ColorSectionLabel.TabIndex = 9; this.ColorSectionLabel.Text = "Red"; this.ColorSectionLabel.Click += new System.EventHandler(this.ColorSectionLabel_Click); @@ -957,7 +964,7 @@ this.ColorRemovedLine.Cursor = System.Windows.Forms.Cursors.Hand; this.ColorRemovedLine.Location = new System.Drawing.Point(208, 19); this.ColorRemovedLine.Name = "ColorRemovedLine"; - this.ColorRemovedLine.Size = new System.Drawing.Size(36, 19); + this.ColorRemovedLine.Size = new System.Drawing.Size(29, 15); this.ColorRemovedLine.TabIndex = 5; this.ColorRemovedLine.Text = "Red"; this.ColorRemovedLine.Click += new System.EventHandler(this.ColorRemovedLine_Click); @@ -967,7 +974,7 @@ this.label31.AutoSize = true; this.label31.Location = new System.Drawing.Point(6, 78); this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(90, 17); + this.label31.Size = new System.Drawing.Size(68, 13); this.label31.TabIndex = 8; this.label31.Text = "Color section"; // @@ -976,7 +983,7 @@ this.label29.AutoSize = true; this.label29.Location = new System.Drawing.Point(6, 49); this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(111, 17); + this.label29.Size = new System.Drawing.Size(83, 13); this.label29.TabIndex = 6; this.label29.Text = "Color added line"; // @@ -988,13 +995,14 @@ this.ColorAddedLineLabel.Cursor = System.Windows.Forms.Cursors.Hand; this.ColorAddedLineLabel.Location = new System.Drawing.Point(208, 49); this.ColorAddedLineLabel.Name = "ColorAddedLineLabel"; - this.ColorAddedLineLabel.Size = new System.Drawing.Size(36, 19); + this.ColorAddedLineLabel.Size = new System.Drawing.Size(29, 15); this.ColorAddedLineLabel.TabIndex = 7; this.ColorAddedLineLabel.Text = "Red"; this.ColorAddedLineLabel.Click += new System.EventHandler(this.label28_Click); // // GlobalSettingsPage // + this.GlobalSettingsPage.Controls.Add(this.label28); this.GlobalSettingsPage.Controls.Add(this.lblGlobalAutoCRLF); this.GlobalSettingsPage.Controls.Add(this.GlobalAutoCRLF); this.GlobalSettingsPage.Controls.Add(this.InvalidGitPathGlobal); @@ -1013,10 +1021,10 @@ this.GlobalSettingsPage.Controls.Add(this.GlobalUserName); this.GlobalSettingsPage.Controls.Add(this.label4); this.GlobalSettingsPage.Controls.Add(this.label3); - this.GlobalSettingsPage.Location = new System.Drawing.Point(4, 25); + this.GlobalSettingsPage.Location = new System.Drawing.Point(4, 22); this.GlobalSettingsPage.Name = "GlobalSettingsPage"; this.GlobalSettingsPage.Padding = new System.Windows.Forms.Padding(3); - this.GlobalSettingsPage.Size = new System.Drawing.Size(710, 319); + this.GlobalSettingsPage.Size = new System.Drawing.Size(710, 322); this.GlobalSettingsPage.TabIndex = 1; this.GlobalSettingsPage.Text = "Global settings"; this.GlobalSettingsPage.UseVisualStyleBackColor = true; @@ -1026,7 +1034,7 @@ this.lblGlobalAutoCRLF.AutoSize = true; this.lblGlobalAutoCRLF.Location = new System.Drawing.Point(10, 206); this.lblGlobalAutoCRLF.Name = "lblGlobalAutoCRLF"; - this.lblGlobalAutoCRLF.Size = new System.Drawing.Size(391, 17); + this.lblGlobalAutoCRLF.Size = new System.Drawing.Size(295, 13); this.lblGlobalAutoCRLF.TabIndex = 21; this.lblGlobalAutoCRLF.Text = "Convert CRLF at the end of lines in text files to LF, AutoCRLF"; // @@ -1039,7 +1047,7 @@ "input"}); this.GlobalAutoCRLF.Location = new System.Drawing.Point(411, 201); this.GlobalAutoCRLF.Name = "GlobalAutoCRLF"; - this.GlobalAutoCRLF.Size = new System.Drawing.Size(121, 24); + this.GlobalAutoCRLF.Size = new System.Drawing.Size(121, 21); this.GlobalAutoCRLF.TabIndex = 20; // // InvalidGitPathGlobal @@ -1059,7 +1067,7 @@ this.label9.AutoSize = true; this.label9.Location = new System.Drawing.Point(63, 9); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(232, 51); + this.label9.Size = new System.Drawing.Size(175, 39); this.label9.TabIndex = 19; this.label9.Text = "You need to set the correct path to \r\ngit.cmd before you can change\r\nglobal setti" + "ngs.\r\n"; @@ -1096,7 +1104,7 @@ "BASE\" \"$REMOTE\""}); this.MergeToolCmd.Location = new System.Drawing.Point(153, 147); this.MergeToolCmd.Name = "MergeToolCmd"; - this.MergeToolCmd.Size = new System.Drawing.Size(347, 24); + this.MergeToolCmd.Size = new System.Drawing.Size(347, 21); this.MergeToolCmd.TabIndex = 15; // // label19 @@ -1104,7 +1112,7 @@ this.label19.AutoSize = true; this.label19.Location = new System.Drawing.Point(9, 151); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(136, 17); + this.label19.Size = new System.Drawing.Size(103, 13); this.label19.TabIndex = 14; this.label19.Text = "Mergetool command"; // @@ -1129,7 +1137,7 @@ "TortoiseMerge"}); this.GlobalMergeTool.Location = new System.Drawing.Point(153, 92); this.GlobalMergeTool.Name = "GlobalMergeTool"; - this.GlobalMergeTool.Size = new System.Drawing.Size(164, 24); + this.GlobalMergeTool.Size = new System.Drawing.Size(164, 21); this.GlobalMergeTool.TabIndex = 12; this.GlobalMergeTool.SelectedIndexChanged += new System.EventHandler(this.GlobalMergeTool_SelectedIndexChanged); this.GlobalMergeTool.TextChanged += new System.EventHandler(this.GlobalMergeTool_TextChanged); @@ -1139,7 +1147,7 @@ this.PathToKDiff3.AutoSize = true; this.PathToKDiff3.Location = new System.Drawing.Point(9, 124); this.PathToKDiff3.Name = "PathToKDiff3"; - this.PathToKDiff3.Size = new System.Drawing.Size(120, 17); + this.PathToKDiff3.Size = new System.Drawing.Size(90, 13); this.PathToKDiff3.TabIndex = 11; this.PathToKDiff3.Text = "Path to mergetool"; // @@ -1147,7 +1155,7 @@ // this.MergetoolPath.Location = new System.Drawing.Point(153, 120); this.MergetoolPath.Name = "MergetoolPath"; - this.MergetoolPath.Size = new System.Drawing.Size(347, 22); + this.MergetoolPath.Size = new System.Drawing.Size(347, 20); this.MergetoolPath.TabIndex = 10; // // GlobalKeepMergeBackup @@ -1155,12 +1163,11 @@ this.GlobalKeepMergeBackup.AutoSize = true; this.GlobalKeepMergeBackup.Checked = true; this.GlobalKeepMergeBackup.CheckState = System.Windows.Forms.CheckState.Indeterminate; - this.GlobalKeepMergeBackup.Location = new System.Drawing.Point(196, 177); + this.GlobalKeepMergeBackup.Location = new System.Drawing.Point(411, 179); this.GlobalKeepMergeBackup.Name = "GlobalKeepMergeBackup"; this.GlobalKeepMergeBackup.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - this.GlobalKeepMergeBackup.Size = new System.Drawing.Size(232, 21); + this.GlobalKeepMergeBackup.Size = new System.Drawing.Size(15, 14); this.GlobalKeepMergeBackup.TabIndex = 9; - this.GlobalKeepMergeBackup.Text = "Keep backup (.orig) after merge"; this.GlobalKeepMergeBackup.UseVisualStyleBackColor = true; // // label7 @@ -1168,7 +1175,7 @@ this.label7.AutoSize = true; this.label7.Location = new System.Drawing.Point(10, 95); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(71, 17); + this.label7.Size = new System.Drawing.Size(54, 13); this.label7.TabIndex = 7; this.label7.Text = "Mergetool"; // @@ -1176,7 +1183,7 @@ // this.GlobalEditor.Location = new System.Drawing.Point(153, 65); this.GlobalEditor.Name = "GlobalEditor"; - this.GlobalEditor.Size = new System.Drawing.Size(164, 22); + this.GlobalEditor.Size = new System.Drawing.Size(164, 20); this.GlobalEditor.TabIndex = 5; // // label6 @@ -1184,7 +1191,7 @@ this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(9, 68); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(45, 17); + this.label6.Size = new System.Drawing.Size(34, 13); this.label6.TabIndex = 4; this.label6.Text = "Editor"; // @@ -1192,14 +1199,14 @@ // this.GlobalUserEmail.Location = new System.Drawing.Point(153, 37); this.GlobalUserEmail.Name = "GlobalUserEmail"; - this.GlobalUserEmail.Size = new System.Drawing.Size(164, 22); + this.GlobalUserEmail.Size = new System.Drawing.Size(164, 20); this.GlobalUserEmail.TabIndex = 3; // // GlobalUserName // this.GlobalUserName.Location = new System.Drawing.Point(153, 8); this.GlobalUserName.Name = "GlobalUserName"; - this.GlobalUserName.Size = new System.Drawing.Size(164, 22); + this.GlobalUserName.Size = new System.Drawing.Size(164, 20); this.GlobalUserName.TabIndex = 2; this.GlobalUserName.TextChanged += new System.EventHandler(this.textBox1_TextChanged); // @@ -1208,7 +1215,7 @@ this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(8, 39); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(75, 17); + this.label4.Size = new System.Drawing.Size(56, 13); this.label4.TabIndex = 1; this.label4.Text = "User email"; // @@ -1217,7 +1224,7 @@ this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(8, 12); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(77, 17); + this.label3.Size = new System.Drawing.Size(58, 13); this.label3.TabIndex = 0; this.label3.Text = "User name"; this.label3.Click += new System.EventHandler(this.label3_Click); @@ -1226,10 +1233,10 @@ // this.Ssh.Controls.Add(this.groupBox2); this.Ssh.Controls.Add(this.groupBox1); - this.Ssh.Location = new System.Drawing.Point(4, 25); + this.Ssh.Location = new System.Drawing.Point(4, 22); this.Ssh.Name = "Ssh"; this.Ssh.Padding = new System.Windows.Forms.Padding(3); - this.Ssh.Size = new System.Drawing.Size(710, 319); + this.Ssh.Size = new System.Drawing.Size(710, 322); this.Ssh.TabIndex = 4; this.Ssh.Text = "Ssh"; this.Ssh.UseVisualStyleBackColor = true; @@ -1260,7 +1267,7 @@ this.AutostartPageant.CheckState = System.Windows.Forms.CheckState.Checked; this.AutostartPageant.Location = new System.Drawing.Point(118, 103); this.AutostartPageant.Name = "AutostartPageant"; - this.AutostartPageant.Size = new System.Drawing.Size(563, 21); + this.AutostartPageant.Size = new System.Drawing.Size(424, 17); this.AutostartPageant.TabIndex = 11; this.AutostartPageant.Text = "Automatically start authentication client when a private key is configured for a " + "remote"; @@ -1270,7 +1277,7 @@ // this.PageantPath.Location = new System.Drawing.Point(118, 76); this.PageantPath.Name = "PageantPath"; - this.PageantPath.Size = new System.Drawing.Size(323, 22); + this.PageantPath.Size = new System.Drawing.Size(323, 20); this.PageantPath.TabIndex = 9; // // PageantBrowse @@ -1288,7 +1295,7 @@ this.label17.AutoSize = true; this.label17.Location = new System.Drawing.Point(8, 79); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(109, 17); + this.label17.Size = new System.Drawing.Size(83, 13); this.label17.TabIndex = 8; this.label17.Text = "Path to pageant"; // @@ -1296,7 +1303,7 @@ // this.PuttygenPath.Location = new System.Drawing.Point(118, 46); this.PuttygenPath.Name = "PuttygenPath"; - this.PuttygenPath.Size = new System.Drawing.Size(323, 22); + this.PuttygenPath.Size = new System.Drawing.Size(323, 20); this.PuttygenPath.TabIndex = 6; // // PuttygenBrowse @@ -1314,7 +1321,7 @@ this.label16.AutoSize = true; this.label16.Location = new System.Drawing.Point(8, 49); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(112, 17); + this.label16.Size = new System.Drawing.Size(85, 13); this.label16.TabIndex = 5; this.label16.Text = "Path to puttygen"; // @@ -1323,7 +1330,7 @@ this.label15.AutoSize = true; this.label15.Location = new System.Drawing.Point(8, 20); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(112, 17); + this.label15.Size = new System.Drawing.Size(86, 13); this.label15.TabIndex = 4; this.label15.Text = "Path to plink.exe"; // @@ -1331,7 +1338,7 @@ // this.PlinkPath.Location = new System.Drawing.Point(118, 17); this.PlinkPath.Name = "PlinkPath"; - this.PlinkPath.Size = new System.Drawing.Size(323, 22); + this.PlinkPath.Size = new System.Drawing.Size(323, 20); this.PlinkPath.TabIndex = 2; // // PlinkBrowse @@ -1363,7 +1370,7 @@ // this.OtherSsh.Location = new System.Drawing.Point(143, 80); this.OtherSsh.Name = "OtherSsh"; - this.OtherSsh.Size = new System.Drawing.Size(323, 22); + this.OtherSsh.Size = new System.Drawing.Size(323, 20); this.OtherSsh.TabIndex = 4; // // OtherSshBrowse @@ -1381,7 +1388,7 @@ this.Other.AutoSize = true; this.Other.Location = new System.Drawing.Point(9, 81); this.Other.Name = "Other"; - this.Other.Size = new System.Drawing.Size(128, 21); + this.Other.Size = new System.Drawing.Size(98, 17); this.Other.TabIndex = 3; this.Other.Text = "Other ssh client"; this.Other.UseVisualStyleBackColor = true; @@ -1394,7 +1401,7 @@ this.label18.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.label18.Location = new System.Drawing.Point(121, 18); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(560, 53); + this.label18.Size = new System.Drawing.Size(418, 41); this.label18.TabIndex = 2; this.label18.Text = resources.GetString("label18.Text"); // @@ -1403,7 +1410,7 @@ this.OpenSSH.AutoSize = true; this.OpenSSH.Location = new System.Drawing.Point(9, 50); this.OpenSSH.Name = "OpenSSH"; - this.OpenSSH.Size = new System.Drawing.Size(92, 21); + this.OpenSSH.Size = new System.Drawing.Size(73, 17); this.OpenSSH.TabIndex = 1; this.OpenSSH.Text = "OpenSSH"; this.OpenSSH.UseVisualStyleBackColor = true; @@ -1415,7 +1422,7 @@ this.Putty.Checked = true; this.Putty.Location = new System.Drawing.Point(9, 20); this.Putty.Name = "Putty"; - this.Putty.Size = new System.Drawing.Size(73, 21); + this.Putty.Size = new System.Drawing.Size(59, 17); this.Putty.TabIndex = 0; this.Putty.TabStop = true; this.Putty.Text = "PuTTY"; @@ -1482,9 +1489,72 @@ this.pictureBox2.TabIndex = 18; this.pictureBox2.TabStop = false; // + // label28 + // + this.label28.AutoSize = true; + this.label28.Location = new System.Drawing.Point(10, 179); + this.label28.Name = "label28"; + this.label28.Size = new System.Drawing.Size(156, 13); + this.label28.TabIndex = 22; + this.label28.Text = "Keep backup (.orig) after merge"; + // + // label30 + // + this.label30.AutoSize = true; + this.label30.Location = new System.Drawing.Point(8, 127); + this.label30.Name = "label30"; + this.label30.Size = new System.Drawing.Size(156, 13); + this.label30.TabIndex = 23; + this.label30.Text = "Keep backup (.orig) after merge"; + // + // label34 + // + this.label34.AutoSize = true; + this.label34.Location = new System.Drawing.Point(8, 175); + this.label34.Name = "label34"; + this.label34.Size = new System.Drawing.Size(295, 13); + this.label34.TabIndex = 21; + this.label34.Text = "Close process dialog automaticly when process is succeeded"; + // + // label35 + // + this.label35.AutoSize = true; + this.label35.Location = new System.Drawing.Point(8, 197); + this.label35.Name = "label35"; + this.label35.Size = new System.Drawing.Size(264, 13); + this.label35.TabIndex = 22; + this.label35.Text = "Show Git commandline dialog when executing process"; + // + // label37 + // + this.label37.AutoSize = true; + this.label37.Location = new System.Drawing.Point(8, 218); + this.label37.Name = "label37"; + this.label37.Size = new System.Drawing.Size(167, 13); + this.label37.TabIndex = 23; + this.label37.Text = "Show revision graph in commit log"; + // + // label38 + // + this.label38.AutoSize = true; + this.label38.Location = new System.Drawing.Point(8, 240); + this.label38.Name = "label38"; + this.label38.Size = new System.Drawing.Size(256, 13); + this.label38.TabIndex = 24; + this.label38.Text = "Use FileSystemWatcher to check if index is changed"; + // + // label39 + // + this.label39.AutoSize = true; + this.label39.Location = new System.Drawing.Point(8, 263); + this.label39.Name = "label39"; + this.label39.Size = new System.Drawing.Size(184, 13); + this.label39.TabIndex = 25; + this.label39.Text = "Show relative date instead of full date"; + // // FormSettings // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(718, 381); this.Controls.Add(this.splitContainer1); @@ -1650,6 +1720,13 @@ private System.Windows.Forms.Label ColorTagLabel; private System.Windows.Forms.Label ColorBranchLabel; private System.Windows.Forms.Label label32; + private System.Windows.Forms.Label label30; + private System.Windows.Forms.Label label28; + private System.Windows.Forms.Label label37; + private System.Windows.Forms.Label label35; + private System.Windows.Forms.Label label34; + private System.Windows.Forms.Label label39; + private System.Windows.Forms.Label label38; } } \ No newline at end of file GitUI/FormSettings.Designer.cs @@ -158,7 +158,7 @@ this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(3, 5); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(205, 17); + this.label1.Size = new System.Drawing.Size(156, 13); this.label1.TabIndex = 0; this.label1.Text = "Tracked changes in working dir"; // @@ -166,10 +166,9 @@ // this.Changes.Dock = System.Windows.Forms.DockStyle.Fill; this.Changes.FormattingEnabled = true; - this.Changes.ItemHeight = 16; this.Changes.Location = new System.Drawing.Point(0, 0); this.Changes.Name = "Changes"; - this.Changes.Size = new System.Drawing.Size(251, 164); + this.Changes.Size = new System.Drawing.Size(251, 173); this.Changes.TabIndex = 0; this.Changes.SelectedIndexChanged += new System.EventHandler(this.Changes_SelectedIndexChanged); // @@ -210,7 +209,7 @@ this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(1, 29); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(69, 17); + this.label3.Size = new System.Drawing.Size(53, 13); this.label3.TabIndex = 2; this.label3.Text = "Message:"; // @@ -221,7 +220,7 @@ this.Stashes.FormattingEnabled = true; this.Stashes.Location = new System.Drawing.Point(52, 3); this.Stashes.Name = "Stashes"; - this.Stashes.Size = new System.Drawing.Size(196, 24); + this.Stashes.Size = new System.Drawing.Size(196, 21); this.Stashes.TabIndex = 1; this.Stashes.SelectedIndexChanged += new System.EventHandler(this.Stashes_SelectedIndexChanged); // @@ -234,7 +233,7 @@ this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(1, 7); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(48, 17); + this.label2.Size = new System.Drawing.Size(37, 13); this.label2.TabIndex = 0; this.label2.Text = "Stash:"; // @@ -242,10 +241,9 @@ // this.Stashed.Dock = System.Windows.Forms.DockStyle.Fill; this.Stashed.FormattingEnabled = true; - this.Stashed.ItemHeight = 16; this.Stashed.Location = new System.Drawing.Point(0, 0); this.Stashed.Name = "Stashed"; - this.Stashed.Size = new System.Drawing.Size(251, 180); + this.Stashed.Size = new System.Drawing.Size(251, 186); this.Stashed.TabIndex = 0; this.Stashed.SelectedIndexChanged += new System.EventHandler(this.Stashed_SelectedIndexChanged); // @@ -253,7 +251,7 @@ // this.View.Dock = System.Windows.Forms.DockStyle.Fill; this.View.Location = new System.Drawing.Point(0, 0); - this.View.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.View.Margin = new System.Windows.Forms.Padding(4); this.View.Name = "View"; this.View.ScrollPos = 0; this.View.Size = new System.Drawing.Size(453, 485); @@ -291,7 +289,7 @@ // // FormStash // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(708, 520); this.Controls.Add(this.splitContainer1); GitUI/FormStash.Designer.cs @@ -210,7 +210,7 @@ this.tableLayoutPanel1.Controls.Add(this.SubModuleCommit, 1, 3); this.tableLayoutPanel1.Controls.Add(this.SubModuleBranch, 1, 4); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 18); + this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 16); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 6; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); @@ -219,7 +219,7 @@ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(349, 207); + this.tableLayoutPanel1.Size = new System.Drawing.Size(349, 209); this.tableLayoutPanel1.TabIndex = 12; // // SubModuleStatus @@ -227,7 +227,7 @@ this.SubModuleStatus.Location = new System.Drawing.Point(104, 128); this.SubModuleStatus.Name = "SubModuleStatus"; this.SubModuleStatus.ReadOnly = true; - this.SubModuleStatus.Size = new System.Drawing.Size(172, 22); + this.SubModuleStatus.Size = new System.Drawing.Size(172, 20); this.SubModuleStatus.TabIndex = 13; this.SubModuleStatus.TextChanged += new System.EventHandler(this.textBox6_TextChanged); // @@ -236,7 +236,7 @@ this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(3, 125); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(48, 17); + this.label6.Size = new System.Drawing.Size(37, 13); this.label6.TabIndex = 11; this.label6.Text = "Status"; // @@ -245,7 +245,7 @@ this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(3, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(45, 17); + this.label1.Size = new System.Drawing.Size(35, 13); this.label1.TabIndex = 6; this.label1.Text = "Name"; // @@ -254,7 +254,7 @@ this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(3, 25); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(89, 17); + this.label2.Size = new System.Drawing.Size(68, 13); this.label2.TabIndex = 7; this.label2.Text = "Remote path"; // @@ -263,7 +263,7 @@ this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(3, 100); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(53, 17); + this.label5.Size = new System.Drawing.Size(41, 13); this.label5.TabIndex = 10; this.label5.Text = "Branch"; // @@ -272,7 +272,7 @@ this.SubModuleName.Location = new System.Drawing.Point(104, 3); this.SubModuleName.Name = "SubModuleName"; this.SubModuleName.ReadOnly = true; - this.SubModuleName.Size = new System.Drawing.Size(172, 22); + this.SubModuleName.Size = new System.Drawing.Size(172, 20); this.SubModuleName.TabIndex = 8; // // label4 @@ -280,7 +280,7 @@ this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(3, 75); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(54, 17); + this.label4.Size = new System.Drawing.Size(41, 13); this.label4.TabIndex = 9; this.label4.Text = "Commit"; // @@ -289,7 +289,7 @@ this.SubModuleRemotePath.Location = new System.Drawing.Point(104, 28); this.SubModuleRemotePath.Name = "SubModuleRemotePath"; this.SubModuleRemotePath.ReadOnly = true; - this.SubModuleRemotePath.Size = new System.Drawing.Size(238, 22); + this.SubModuleRemotePath.Size = new System.Drawing.Size(238, 20); this.SubModuleRemotePath.TabIndex = 9; // // label3 @@ -297,7 +297,7 @@ this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(3, 50); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(74, 17); + this.label3.Size = new System.Drawing.Size(57, 13); this.label3.TabIndex = 8; this.label3.Text = "Local path"; // @@ -306,7 +306,7 @@ this.SubModuleLocalPath.Location = new System.Drawing.Point(104, 53); this.SubModuleLocalPath.Name = "SubModuleLocalPath"; this.SubModuleLocalPath.ReadOnly = true; - this.SubModuleLocalPath.Size = new System.Drawing.Size(238, 22); + this.SubModuleLocalPath.Size = new System.Drawing.Size(238, 20); this.SubModuleLocalPath.TabIndex = 10; // // SubModuleCommit @@ -314,7 +314,7 @@ this.SubModuleCommit.Location = new System.Drawing.Point(104, 78); this.SubModuleCommit.Name = "SubModuleCommit"; this.SubModuleCommit.ReadOnly = true; - this.SubModuleCommit.Size = new System.Drawing.Size(238, 22); + this.SubModuleCommit.Size = new System.Drawing.Size(238, 20); this.SubModuleCommit.TabIndex = 11; // // SubModuleBranch @@ -322,7 +322,7 @@ this.SubModuleBranch.Location = new System.Drawing.Point(104, 103); this.SubModuleBranch.Name = "SubModuleBranch"; this.SubModuleBranch.ReadOnly = true; - this.SubModuleBranch.Size = new System.Drawing.Size(238, 22); + this.SubModuleBranch.Size = new System.Drawing.Size(238, 20); this.SubModuleBranch.TabIndex = 12; // // splitContainer4 @@ -373,7 +373,7 @@ // // FormSubmodules // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(581, 263); this.Controls.Add(this.splitContainer1); GitUI/FormSubmodules.Designer.cs @@ -10,6 +10,10 @@ Version 1.79 Removed Load button from view patch dialog. Patch is now loaded when file is selected. Added context menu to merge conflict dialog Added "Abort" button to merge conflict dialog + Most dialogs changed to support larger DPI settings. + Delete commit message after succesful commit. + Added waitcursor to FormResolveConflicts. + Set width to submodules submenu and recent repositories submenu. Version 1.78 Fixed bug causing the commitmessage to contain encoding marker bytes GitUI/Resources/ChangeLog.txt f459de07f7737d8e849ad201497dbe5bb0dca0d9 Henk Westhuis Henk_Westhuis@hotmail.com http://github.com/spdr870/gitextensions/commit/51758aaf33da1c3a7c3b3a16a32c3a50ea68f310 51758aaf33da1c3a7c3b3a16a32c3a50ea68f310 2009-11-03T10:11:24-08:00 2009-11-03T10:11:24-08:00 Minor layout changes a2360752d012bbc5c3bdf611f51b1f189b3abe39 Henk Westhuis Henk_Westhuis@hotmail.com