@@ -1295,7 +1295,7 @@ namespace GitCommands public void SetGlobalSetting(string setting, string value) { - if (!string.IsNullOrEmpty(value) && !value.Contains("git.exe' is not")) + if (!string.IsNullOrEmpty(value) && !value.Contains("git.exe' is not") && !value.Contains("git.cmd' is not")) { value = value.Replace("\"", "$QUOTE$"); @@ -1331,7 +1331,7 @@ namespace GitCommands if (!File.Exists(configFileName)) return; - if (!string.IsNullOrEmpty(value) && !value.Contains("git.exe' is not")) + if (!string.IsNullOrEmpty(value) && !value.Contains("git.exe' is not") && !value.Contains("git.cmd' is not")) { value = value.Replace("\"", "$QUOTE$"); value = FixPath(value); GitCommands/GitCommands/Git/GitCommands.cs @@ -148,13 +148,13 @@ this.commitcountPerUserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.gitcommandLogToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); + this.userManualToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.changelogToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.donateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.gitItemBindingSource = new System.Windows.Forms.BindingSource(this.components); this.gitRevisionBindingSource = new System.Windows.Forms.BindingSource(this.components); - this.userManualToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.splitContainer2.Panel1.SuspendLayout(); this.splitContainer2.Panel2.SuspendLayout(); this.splitContainer2.SuspendLayout(); @@ -391,6 +391,7 @@ // toolStripTextBoxFilter // this.toolStripTextBoxFilter.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.toolStripTextBoxFilter.ForeColor = System.Drawing.Color.Black; this.toolStripTextBoxFilter.Name = "toolStripTextBoxFilter"; this.toolStripTextBoxFilter.Size = new System.Drawing.Size(120, 25); this.toolStripTextBoxFilter.Leave += new System.EventHandler(this.toolStripTextBoxFilter_Leave); @@ -1311,6 +1312,13 @@ this.toolStripSeparator7.Name = "toolStripSeparator7"; this.toolStripSeparator7.Size = new System.Drawing.Size(165, 6); // + // userManualToolStripMenuItem + // + this.userManualToolStripMenuItem.Name = "userManualToolStripMenuItem"; + this.userManualToolStripMenuItem.Size = new System.Drawing.Size(168, 22); + this.userManualToolStripMenuItem.Text = "User Manual"; + this.userManualToolStripMenuItem.Click += new System.EventHandler(this.userManualToolStripMenuItem_Click); + // // changelogToolStripMenuItem // this.changelogToolStripMenuItem.Name = "changelogToolStripMenuItem"; @@ -1346,13 +1354,6 @@ // this.gitRevisionBindingSource.DataSource = typeof(GitCommands.GitRevision); // - // userManualToolStripMenuItem - // - this.userManualToolStripMenuItem.Name = "userManualToolStripMenuItem"; - this.userManualToolStripMenuItem.Size = new System.Drawing.Size(168, 22); - this.userManualToolStripMenuItem.Text = "User Manual"; - this.userManualToolStripMenuItem.Click += new System.EventHandler(this.userManualToolStripMenuItem_Click); - // // FormBrowse // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); GitUI/Browse.Designer.cs @@ -182,7 +182,7 @@ this.workingToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(389, 28); + this.menuStrip1.Size = new System.Drawing.Size(389, 24); this.menuStrip1.TabIndex = 2; this.menuStrip1.Text = "menuStrip1"; // @@ -196,46 +196,46 @@ this.eToolStripMenuItem, this.deleteAllUntrackedFilesToolStripMenuItem}); this.workingToolStripMenuItem.Name = "workingToolStripMenuItem"; - this.workingToolStripMenuItem.Size = new System.Drawing.Size(157, 24); + this.workingToolStripMenuItem.Size = new System.Drawing.Size(128, 20); this.workingToolStripMenuItem.Text = "Working dir changes"; // // deleteSelectedFilesToolStripMenuItem // this.deleteSelectedFilesToolStripMenuItem.Name = "deleteSelectedFilesToolStripMenuItem"; - this.deleteSelectedFilesToolStripMenuItem.Size = new System.Drawing.Size(255, 24); + this.deleteSelectedFilesToolStripMenuItem.Size = new System.Drawing.Size(214, 22); this.deleteSelectedFilesToolStripMenuItem.Text = "Delete selected files"; this.deleteSelectedFilesToolStripMenuItem.Click += new System.EventHandler(this.deleteSelectedFilesToolStripMenuItem_Click); // // resetSelectedFilesToolStripMenuItem // this.resetSelectedFilesToolStripMenuItem.Name = "resetSelectedFilesToolStripMenuItem"; - this.resetSelectedFilesToolStripMenuItem.Size = new System.Drawing.Size(255, 24); + this.resetSelectedFilesToolStripMenuItem.Size = new System.Drawing.Size(214, 22); this.resetSelectedFilesToolStripMenuItem.Text = "Reset selected files"; this.resetSelectedFilesToolStripMenuItem.Click += new System.EventHandler(this.resetSelectedFilesToolStripMenuItem_Click); // // resetAlltrackedChangesToolStripMenuItem // this.resetAlltrackedChangesToolStripMenuItem.Name = "resetAlltrackedChangesToolStripMenuItem"; - this.resetAlltrackedChangesToolStripMenuItem.Size = new System.Drawing.Size(255, 24); + this.resetAlltrackedChangesToolStripMenuItem.Size = new System.Drawing.Size(214, 22); this.resetAlltrackedChangesToolStripMenuItem.Text = "Reset all (tracked) changes"; this.resetAlltrackedChangesToolStripMenuItem.Click += new System.EventHandler(this.resetAlltrackedChangesToolStripMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(252, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(211, 6); // // eToolStripMenuItem // this.eToolStripMenuItem.Name = "eToolStripMenuItem"; - this.eToolStripMenuItem.Size = new System.Drawing.Size(255, 24); + this.eToolStripMenuItem.Size = new System.Drawing.Size(214, 22); this.eToolStripMenuItem.Text = "Edit ignored files"; this.eToolStripMenuItem.Click += new System.EventHandler(this.eToolStripMenuItem_Click); // // deleteAllUntrackedFilesToolStripMenuItem // this.deleteAllUntrackedFilesToolStripMenuItem.Name = "deleteAllUntrackedFilesToolStripMenuItem"; - this.deleteAllUntrackedFilesToolStripMenuItem.Size = new System.Drawing.Size(255, 24); + this.deleteAllUntrackedFilesToolStripMenuItem.Size = new System.Drawing.Size(214, 22); this.deleteAllUntrackedFilesToolStripMenuItem.Text = "Delete all untracked files"; this.deleteAllUntrackedFilesToolStripMenuItem.Click += new System.EventHandler(this.deleteAllUntrackedFilesToolStripMenuItem_Click); // @@ -297,19 +297,19 @@ this.ResetChanges, this.deleteFileToolStripMenuItem}); this.UnstagedFileContext.Name = "UnstagedFileContext"; - this.UnstagedFileContext.Size = new System.Drawing.Size(198, 52); + this.UnstagedFileContext.Size = new System.Drawing.Size(169, 48); // // ResetChanges // this.ResetChanges.Name = "ResetChanges"; - this.ResetChanges.Size = new System.Drawing.Size(197, 24); + this.ResetChanges.Size = new System.Drawing.Size(168, 22); this.ResetChanges.Text = "Reset file changes"; this.ResetChanges.Click += new System.EventHandler(this.ResetSoft_Click); // // deleteFileToolStripMenuItem // this.deleteFileToolStripMenuItem.Name = "deleteFileToolStripMenuItem"; - this.deleteFileToolStripMenuItem.Size = new System.Drawing.Size(197, 24); + this.deleteFileToolStripMenuItem.Size = new System.Drawing.Size(168, 22); this.deleteFileToolStripMenuItem.Text = "Delete file"; this.deleteFileToolStripMenuItem.Click += new System.EventHandler(this.deleteFileToolStripMenuItem_Click); // @@ -379,7 +379,7 @@ this.filesListedToCommitToolStripMenuItem}); this.menuStrip2.Location = new System.Drawing.Point(0, 0); this.menuStrip2.Name = "menuStrip2"; - this.menuStrip2.Size = new System.Drawing.Size(389, 28); + this.menuStrip2.Size = new System.Drawing.Size(389, 24); this.menuStrip2.TabIndex = 5; this.menuStrip2.Text = "menuStrip2"; // @@ -391,32 +391,32 @@ this.toolStripSeparator2, this.stageChunkOfFileToolStripMenuItem}); this.filesListedToCommitToolStripMenuItem.Name = "filesListedToCommitToolStripMenuItem"; - this.filesListedToCommitToolStripMenuItem.Size = new System.Drawing.Size(123, 24); + this.filesListedToCommitToolStripMenuItem.Size = new System.Drawing.Size(101, 20); this.filesListedToCommitToolStripMenuItem.Text = "Files to commit"; // // stageAllToolStripMenuItem // this.stageAllToolStripMenuItem.Name = "stageAllToolStripMenuItem"; - this.stageAllToolStripMenuItem.Size = new System.Drawing.Size(201, 24); + this.stageAllToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.stageAllToolStripMenuItem.Text = "Stage all"; this.stageAllToolStripMenuItem.Click += new System.EventHandler(this.stageAllToolStripMenuItem_Click); // // unstageAllToolStripMenuItem // this.unstageAllToolStripMenuItem.Name = "unstageAllToolStripMenuItem"; - this.unstageAllToolStripMenuItem.Size = new System.Drawing.Size(201, 24); + this.unstageAllToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.unstageAllToolStripMenuItem.Text = "Unstage all"; this.unstageAllToolStripMenuItem.Click += new System.EventHandler(this.unstageAllToolStripMenuItem_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(198, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(169, 6); // // stageChunkOfFileToolStripMenuItem // this.stageChunkOfFileToolStripMenuItem.Name = "stageChunkOfFileToolStripMenuItem"; - this.stageChunkOfFileToolStripMenuItem.Size = new System.Drawing.Size(201, 24); + this.stageChunkOfFileToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.stageChunkOfFileToolStripMenuItem.Text = "Stage chunk of file"; this.stageChunkOfFileToolStripMenuItem.Click += new System.EventHandler(this.stageChunkOfFileToolStripMenuItem_Click); // @@ -489,7 +489,7 @@ // this.SelectedDiff.Dock = System.Windows.Forms.DockStyle.Fill; this.SelectedDiff.Location = new System.Drawing.Point(0, 0); - this.SelectedDiff.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.SelectedDiff.Margin = new System.Windows.Forms.Padding(4); this.SelectedDiff.Name = "SelectedDiff"; this.SelectedDiff.ScrollPos = 0; this.SelectedDiff.Size = new System.Drawing.Size(502, 316); @@ -625,7 +625,7 @@ this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(3, 3); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(115, 17); + this.label1.Size = new System.Drawing.Size(86, 13); this.label1.TabIndex = 1; this.label1.Text = "Commit message"; // @@ -652,8 +652,8 @@ // this.Message.Dock = System.Windows.Forms.DockStyle.Fill; this.Message.Location = new System.Drawing.Point(0, 0); - this.Message.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.Message.MistakeFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Underline); + this.Message.Margin = new System.Windows.Forms.Padding(4); + this.Message.MistakeFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline); this.Message.Name = "Message"; this.Message.Size = new System.Drawing.Size(364, 198); this.Message.TabIndex = 0; @@ -701,7 +701,7 @@ this.CloseDialogAfterCommit.CheckState = System.Windows.Forms.CheckState.Checked; this.CloseDialogAfterCommit.Location = new System.Drawing.Point(3, 5); this.CloseDialogAfterCommit.Name = "CloseDialogAfterCommit"; - this.CloseDialogAfterCommit.Size = new System.Drawing.Size(188, 21); + this.CloseDialogAfterCommit.Size = new System.Drawing.Size(143, 17); this.CloseDialogAfterCommit.TabIndex = 0; this.CloseDialogAfterCommit.Text = "Close dialog after commit"; this.CloseDialogAfterCommit.UseVisualStyleBackColor = true; @@ -709,7 +709,7 @@ // FormCommit // this.AcceptButton = this.Commit; - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.Cancel; this.ClientSize = new System.Drawing.Size(895, 648); GitUI/Commit.Designer.cs 85ffe9b6d50318be17bb8f1715105973cc41be03 Henk Westhuis Henk_Westhuis@hotmail.com http://github.com/spdr870/gitextensions/commit/cfcd415a531e4c327c4e9a2f1f840dc1b029958d cfcd415a531e4c327c4e9a2f1f840dc1b029958d 2009-11-04T09:36:20-08:00 2009-11-04T09:29:59-08:00 Minor fix 4a0c10a43e7c1e1e2080f5a8e2fa6751416eb9f1 Henk Westhuis Henk_Westhuis@hotmail.com