diff --git a/GitCommands/GitExtensions/Program.cs b/GitCommands/GitExtensions/Program.cs index d9ca17309..e0c0221ef 100644 --- a/GitCommands/GitExtensions/Program.cs +++ b/GitCommands/GitExtensions/Program.cs @@ -45,7 +45,7 @@ namespace GitExtensions { } - if (args.Length == 3) + if (args.Length >= 3) { if (Directory.Exists(args[2])) GitCommands.Settings.WorkingDir = args[2]; diff --git a/GitUI/Commit.Designer.cs b/GitUI/Commit.Designer.cs index b91f242dc..77ae2e0e8 100644 --- a/GitUI/Commit.Designer.cs +++ b/GitUI/Commit.Designer.cs @@ -28,198 +28,196 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormCommit)); - this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.splitContainer4 = new System.Windows.Forms.SplitContainer(); - this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel(); - this.progressBar = new System.Windows.Forms.ProgressBar(); - this.menuStrip1 = new System.Windows.Forms.MenuStrip(); - this.workingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.showIgnoredFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.showUntrackedFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.deleteSelectedFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.resetSelectedFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.resetAlltrackedChangesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.eToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.deleteAllUntrackedFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.rescanChangesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.Loading = new System.Windows.Forms.PictureBox(); - this.Unstaged = new FileStatusList(); - this.UnstagedFileContext = new System.Windows.Forms.ContextMenuStrip(this.components); - this.ResetChanges = new System.Windows.Forms.ToolStripMenuItem(); - this.deleteFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.addFileTogitignoreToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); - this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.openWithToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.openWithDifftoolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); - this.filenameToClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.gitItemStatusBindingSource = new System.Windows.Forms.BindingSource(this.components); - this.splitContainer5 = new System.Windows.Forms.SplitContainer(); - this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); - this.AddFiles = new System.Windows.Forms.Button(); - this.menuStrip2 = new System.Windows.Forms.MenuStrip(); - this.filesListedToCommitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.stageAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.unstageAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.stageChunkOfFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.UnstageFiles = new System.Windows.Forms.Button(); - this.Staged = new FileStatusList(); - this.Cancel = new System.Windows.Forms.Button(); - this.Ok = new System.Windows.Forms.Button(); - this.splitContainer3 = new System.Windows.Forms.SplitContainer(); - this.SolveMergeconflicts = new System.Windows.Forms.Button(); - this.SelectedDiff = new GitUI.FileViewer(); - this.tableLayoutPanel6 = new System.Windows.Forms.TableLayoutPanel(); - this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); - this.Scan = new System.Windows.Forms.Button(); - this.Reset = new System.Windows.Forms.Button(); - this.Amend = new System.Windows.Forms.Button(); - this.Commit = new System.Windows.Forms.Button(); - this.tableLayoutPanel7 = new System.Windows.Forms.TableLayoutPanel(); - this.Message = new GitUI.EditNetSpell(); - this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); - this.menuStrip3 = new System.Windows.Forms.MenuStrip(); - this.commitMessageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.CloseDialogAfterCommit = new System.Windows.Forms.CheckBox(); - this.CloseCommitDialogTooltip = new System.Windows.Forms.ToolTip(this.components); - this.fileTooltip = new System.Windows.Forms.ToolTip(this.components); - this.splitContainer1.Panel1.SuspendLayout(); - this.splitContainer1.Panel2.SuspendLayout(); - this.splitContainer1.SuspendLayout(); - this.splitContainer2.Panel1.SuspendLayout(); - this.splitContainer2.Panel2.SuspendLayout(); - this.splitContainer2.SuspendLayout(); - this.splitContainer4.Panel1.SuspendLayout(); - this.splitContainer4.Panel2.SuspendLayout(); - this.splitContainer4.SuspendLayout(); - this.tableLayoutPanel5.SuspendLayout(); - this.menuStrip1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.Loading)).BeginInit(); - //((System.ComponentModel.ISupportInitialize)(this.Unstaged)).BeginInit(); - this.UnstagedFileContext.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.gitItemStatusBindingSource)).BeginInit(); - this.splitContainer5.Panel1.SuspendLayout(); - this.splitContainer5.Panel2.SuspendLayout(); - this.splitContainer5.SuspendLayout(); - this.tableLayoutPanel4.SuspendLayout(); - this.menuStrip2.SuspendLayout(); - //((System.ComponentModel.ISupportInitialize)(this.Staged)).BeginInit(); - this.splitContainer3.Panel1.SuspendLayout(); - this.splitContainer3.Panel2.SuspendLayout(); - this.splitContainer3.SuspendLayout(); - this.tableLayoutPanel6.SuspendLayout(); - this.tableLayoutPanel2.SuspendLayout(); - this.tableLayoutPanel7.SuspendLayout(); - this.tableLayoutPanel3.SuspendLayout(); - this.menuStrip3.SuspendLayout(); - this.SuspendLayout(); - // - // splitContainer1 - // - this.splitContainer1.BackColor = System.Drawing.SystemColors.Control; - this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; - this.splitContainer1.Location = new System.Drawing.Point(0, 0); - this.splitContainer1.Name = "splitContainer1"; - // - // splitContainer1.Panel1 - // - this.splitContainer1.Panel1.Controls.Add(this.splitContainer2); - this.splitContainer1.Panel1.Controls.Add(this.Ok); - // - // splitContainer1.Panel2 - // - this.splitContainer1.Panel2.Controls.Add(this.splitContainer3); - this.splitContainer1.Size = new System.Drawing.Size(895, 648); - this.splitContainer1.SplitterDistance = 397; - this.splitContainer1.TabIndex = 0; - // - // splitContainer2 - // - this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer2.Location = new System.Drawing.Point(0, 0); - this.splitContainer2.Name = "splitContainer2"; - this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal; - // - // splitContainer2.Panel1 - // - this.splitContainer2.Panel1.Controls.Add(this.splitContainer4); - // - // splitContainer2.Panel2 - // - this.splitContainer2.Panel2.Controls.Add(this.splitContainer5); - this.splitContainer2.Size = new System.Drawing.Size(397, 648); - this.splitContainer2.SplitterDistance = 286; - this.splitContainer2.TabIndex = 3; - // - // splitContainer4 - // - this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; - this.splitContainer4.Location = new System.Drawing.Point(0, 0); - this.splitContainer4.Margin = new System.Windows.Forms.Padding(0); - this.splitContainer4.Name = "splitContainer4"; - this.splitContainer4.Orientation = System.Windows.Forms.Orientation.Horizontal; - // - // splitContainer4.Panel1 - // - this.splitContainer4.Panel1.Controls.Add(this.tableLayoutPanel5); - // - // splitContainer4.Panel2 - // - this.splitContainer4.Panel2.Controls.Add(this.Loading); - this.splitContainer4.Panel2.Controls.Add(this.Unstaged); - this.splitContainer4.Size = new System.Drawing.Size(397, 286); - this.splitContainer4.SplitterDistance = 25; - this.splitContainer4.SplitterWidth = 1; - this.splitContainer4.TabIndex = 1; - // - // tableLayoutPanel5 - // - this.tableLayoutPanel5.ColumnCount = 2; - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel5.Controls.Add(this.progressBar, 1, 0); - this.tableLayoutPanel5.Controls.Add(this.menuStrip1, 0, 0); - this.tableLayoutPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel5.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel5.Name = "tableLayoutPanel5"; - this.tableLayoutPanel5.RowCount = 1; - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel5.Size = new System.Drawing.Size(397, 25); - this.tableLayoutPanel5.TabIndex = 0; - // - // progressBar - // - this.progressBar.Dock = System.Windows.Forms.DockStyle.Fill; - this.progressBar.Location = new System.Drawing.Point(201, 3); - this.progressBar.Name = "progressBar"; - this.progressBar.Size = new System.Drawing.Size(193, 19); - this.progressBar.TabIndex = 1; - this.progressBar.Visible = false; - // - // menuStrip1 - // - this.menuStrip1.BackColor = System.Drawing.SystemColors.Control; - this.menuStrip1.Dock = System.Windows.Forms.DockStyle.Fill; - this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormCommit)); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.splitContainer2 = new System.Windows.Forms.SplitContainer(); + this.splitContainer4 = new System.Windows.Forms.SplitContainer(); + this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel(); + this.progressBar = new System.Windows.Forms.ProgressBar(); + this.menuStrip1 = new System.Windows.Forms.MenuStrip(); + this.workingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.showIgnoredFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.showUntrackedFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.deleteSelectedFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.resetSelectedFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.resetAlltrackedChangesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.eToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.deleteAllUntrackedFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.rescanChangesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.Loading = new System.Windows.Forms.PictureBox(); + this.Unstaged = new GitUI.FileStatusList(); + this.UnstagedFileContext = new System.Windows.Forms.ContextMenuStrip(this.components); + this.ResetChanges = new System.Windows.Forms.ToolStripMenuItem(); + this.deleteFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.addFileTogitignoreToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.openWithToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.openWithDifftoolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); + this.filenameToClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.splitContainer5 = new System.Windows.Forms.SplitContainer(); + this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); + this.AddFiles = new System.Windows.Forms.Button(); + this.menuStrip2 = new System.Windows.Forms.MenuStrip(); + this.filesListedToCommitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.stageAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.unstageAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.stageChunkOfFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.UnstageFiles = new System.Windows.Forms.Button(); + this.Staged = new GitUI.FileStatusList(); + this.Cancel = new System.Windows.Forms.Button(); + this.Ok = new System.Windows.Forms.Button(); + this.splitContainer3 = new System.Windows.Forms.SplitContainer(); + this.SolveMergeconflicts = new System.Windows.Forms.Button(); + this.SelectedDiff = new GitUI.FileViewer(); + this.tableLayoutPanel6 = new System.Windows.Forms.TableLayoutPanel(); + this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); + this.Scan = new System.Windows.Forms.Button(); + this.Reset = new System.Windows.Forms.Button(); + this.Amend = new System.Windows.Forms.Button(); + this.Commit = new System.Windows.Forms.Button(); + this.tableLayoutPanel7 = new System.Windows.Forms.TableLayoutPanel(); + this.Message = new GitUI.EditNetSpell(); + this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); + this.menuStrip3 = new System.Windows.Forms.MenuStrip(); + this.commitMessageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.CloseDialogAfterCommit = new System.Windows.Forms.CheckBox(); + this.CloseCommitDialogTooltip = new System.Windows.Forms.ToolTip(this.components); + this.fileTooltip = new System.Windows.Forms.ToolTip(this.components); + this.gitItemStatusBindingSource = new System.Windows.Forms.BindingSource(this.components); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.splitContainer2.Panel1.SuspendLayout(); + this.splitContainer2.Panel2.SuspendLayout(); + this.splitContainer2.SuspendLayout(); + this.splitContainer4.Panel1.SuspendLayout(); + this.splitContainer4.Panel2.SuspendLayout(); + this.splitContainer4.SuspendLayout(); + this.tableLayoutPanel5.SuspendLayout(); + this.menuStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.Loading)).BeginInit(); + this.UnstagedFileContext.SuspendLayout(); + this.splitContainer5.Panel1.SuspendLayout(); + this.splitContainer5.Panel2.SuspendLayout(); + this.splitContainer5.SuspendLayout(); + this.tableLayoutPanel4.SuspendLayout(); + this.menuStrip2.SuspendLayout(); + this.splitContainer3.Panel1.SuspendLayout(); + this.splitContainer3.Panel2.SuspendLayout(); + this.splitContainer3.SuspendLayout(); + this.tableLayoutPanel6.SuspendLayout(); + this.tableLayoutPanel2.SuspendLayout(); + this.tableLayoutPanel7.SuspendLayout(); + this.tableLayoutPanel3.SuspendLayout(); + this.menuStrip3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gitItemStatusBindingSource)).BeginInit(); + this.SuspendLayout(); + // + // splitContainer1 + // + this.splitContainer1.BackColor = System.Drawing.SystemColors.Control; + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer1.Location = new System.Drawing.Point(0, 0); + this.splitContainer1.Name = "splitContainer1"; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.splitContainer2); + this.splitContainer1.Panel1.Controls.Add(this.Ok); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.splitContainer3); + this.splitContainer1.Size = new System.Drawing.Size(891, 644); + this.splitContainer1.SplitterDistance = 397; + this.splitContainer1.TabIndex = 0; + // + // splitContainer2 + // + this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer2.Location = new System.Drawing.Point(0, 0); + this.splitContainer2.Name = "splitContainer2"; + this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer2.Panel1 + // + this.splitContainer2.Panel1.Controls.Add(this.splitContainer4); + // + // splitContainer2.Panel2 + // + this.splitContainer2.Panel2.Controls.Add(this.splitContainer5); + this.splitContainer2.Size = new System.Drawing.Size(397, 644); + this.splitContainer2.SplitterDistance = 284; + this.splitContainer2.TabIndex = 3; + // + // splitContainer4 + // + this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer4.Location = new System.Drawing.Point(0, 0); + this.splitContainer4.Margin = new System.Windows.Forms.Padding(0); + this.splitContainer4.Name = "splitContainer4"; + this.splitContainer4.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer4.Panel1 + // + this.splitContainer4.Panel1.Controls.Add(this.tableLayoutPanel5); + // + // splitContainer4.Panel2 + // + this.splitContainer4.Panel2.Controls.Add(this.Loading); + this.splitContainer4.Panel2.Controls.Add(this.Unstaged); + this.splitContainer4.Size = new System.Drawing.Size(397, 284); + this.splitContainer4.SplitterDistance = 25; + this.splitContainer4.SplitterWidth = 1; + this.splitContainer4.TabIndex = 1; + // + // tableLayoutPanel5 + // + this.tableLayoutPanel5.ColumnCount = 2; + this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel5.Controls.Add(this.progressBar, 1, 0); + this.tableLayoutPanel5.Controls.Add(this.menuStrip1, 0, 0); + this.tableLayoutPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel5.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel5.Name = "tableLayoutPanel5"; + this.tableLayoutPanel5.RowCount = 1; + this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel5.Size = new System.Drawing.Size(397, 25); + this.tableLayoutPanel5.TabIndex = 0; + // + // progressBar + // + this.progressBar.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar.Location = new System.Drawing.Point(201, 3); + this.progressBar.Name = "progressBar"; + this.progressBar.Size = new System.Drawing.Size(193, 19); + this.progressBar.TabIndex = 1; + this.progressBar.Visible = false; + // + // menuStrip1 + // + this.menuStrip1.BackColor = System.Drawing.SystemColors.Control; + this.menuStrip1.Dock = System.Windows.Forms.DockStyle.Fill; + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.workingToolStripMenuItem}); - this.menuStrip1.Location = new System.Drawing.Point(0, 0); - this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(198, 25); - this.menuStrip1.TabIndex = 2; - this.menuStrip1.Text = "menuStrip1"; - // - // workingToolStripMenuItem - // - this.workingToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Size = new System.Drawing.Size(198, 25); + this.menuStrip1.TabIndex = 2; + this.menuStrip1.Text = "menuStrip1"; + // + // workingToolStripMenuItem + // + this.workingToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.showIgnoredFilesToolStripMenuItem, this.showUntrackedFilesToolStripMenuItem, this.toolStripSeparator3, @@ -230,107 +228,109 @@ this.eToolStripMenuItem, this.deleteAllUntrackedFilesToolStripMenuItem, this.rescanChangesToolStripMenuItem}); - this.workingToolStripMenuItem.Image = global::GitUI.Properties.Resources._89; - this.workingToolStripMenuItem.Name = "workingToolStripMenuItem"; - this.workingToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F5; - this.workingToolStripMenuItem.Size = new System.Drawing.Size(173, 21); - this.workingToolStripMenuItem.Text = "Working dir changes"; - // - // showIgnoredFilesToolStripMenuItem - // - this.showIgnoredFilesToolStripMenuItem.Name = "showIgnoredFilesToolStripMenuItem"; - this.showIgnoredFilesToolStripMenuItem.Size = new System.Drawing.Size(255, 24); - this.showIgnoredFilesToolStripMenuItem.Text = "Show ignored files"; - this.showIgnoredFilesToolStripMenuItem.Click += new System.EventHandler(this.showIgnoredFilesToolStripMenuItem_Click); - // - // showUntrackedFilesToolStripMenuItem - // - this.showUntrackedFilesToolStripMenuItem.Checked = true; - this.showUntrackedFilesToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; - this.showUntrackedFilesToolStripMenuItem.Name = "showUntrackedFilesToolStripMenuItem"; - this.showUntrackedFilesToolStripMenuItem.Size = new System.Drawing.Size(255, 24); - this.showUntrackedFilesToolStripMenuItem.Text = "Show untracked files"; - this.showUntrackedFilesToolStripMenuItem.Click += new System.EventHandler(this.showUntrackedFilesToolStripMenuItem_Click); - // - // toolStripSeparator3 - // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(252, 6); - // - // deleteSelectedFilesToolStripMenuItem - // - this.deleteSelectedFilesToolStripMenuItem.Name = "deleteSelectedFilesToolStripMenuItem"; - this.deleteSelectedFilesToolStripMenuItem.Size = new System.Drawing.Size(255, 24); - 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.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.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); - // - // eToolStripMenuItem - // - this.eToolStripMenuItem.Name = "eToolStripMenuItem"; - this.eToolStripMenuItem.Size = new System.Drawing.Size(255, 24); - 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.Text = "Delete all untracked files"; - this.deleteAllUntrackedFilesToolStripMenuItem.Click += new System.EventHandler(this.deleteAllUntrackedFilesToolStripMenuItem_Click); - // - // rescanChangesToolStripMenuItem - // - this.rescanChangesToolStripMenuItem.Image = global::GitUI.Properties.Resources.arrow_refresh; - this.rescanChangesToolStripMenuItem.Name = "rescanChangesToolStripMenuItem"; - this.rescanChangesToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F5; - this.rescanChangesToolStripMenuItem.Size = new System.Drawing.Size(255, 24); - this.rescanChangesToolStripMenuItem.Text = "Rescan changes"; - this.rescanChangesToolStripMenuItem.Click += new System.EventHandler(this.rescanChangesToolStripMenuItem_Click); - // - // Loading - // - this.Loading.BackColor = System.Drawing.SystemColors.AppWorkspace; - this.Loading.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.Loading.Dock = System.Windows.Forms.DockStyle.Fill; - this.Loading.Image = global::GitUI.Properties.Resources.loadingpanel; - this.Loading.Location = new System.Drawing.Point(0, 0); - this.Loading.Name = "Loading"; - this.Loading.Size = new System.Drawing.Size(397, 260); - this.Loading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.Loading.TabIndex = 2; - this.Loading.TabStop = false; - // - // Unstaged - // - this.Unstaged.ContextMenuStrip = this.UnstagedFileContext; - this.Unstaged.Dock = System.Windows.Forms.DockStyle.Fill; - this.Unstaged.Location = new System.Drawing.Point(0, 0); - this.Unstaged.Name = "Unstaged"; - this.Unstaged.Size = new System.Drawing.Size(397, 260); - this.Unstaged.TabIndex = 0; - // - // UnstagedFileContext - // - this.UnstagedFileContext.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.workingToolStripMenuItem.Image = global::GitUI.Properties.Resources._89; + this.workingToolStripMenuItem.Name = "workingToolStripMenuItem"; + this.workingToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F5; + this.workingToolStripMenuItem.Size = new System.Drawing.Size(132, 21); + this.workingToolStripMenuItem.Text = "Working dir changes"; + // + // showIgnoredFilesToolStripMenuItem + // + this.showIgnoredFilesToolStripMenuItem.Name = "showIgnoredFilesToolStripMenuItem"; + this.showIgnoredFilesToolStripMenuItem.Size = new System.Drawing.Size(216, 22); + this.showIgnoredFilesToolStripMenuItem.Text = "Show ignored files"; + this.showIgnoredFilesToolStripMenuItem.Click += new System.EventHandler(this.showIgnoredFilesToolStripMenuItem_Click); + // + // showUntrackedFilesToolStripMenuItem + // + this.showUntrackedFilesToolStripMenuItem.Checked = true; + this.showUntrackedFilesToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; + this.showUntrackedFilesToolStripMenuItem.Name = "showUntrackedFilesToolStripMenuItem"; + this.showUntrackedFilesToolStripMenuItem.Size = new System.Drawing.Size(216, 22); + this.showUntrackedFilesToolStripMenuItem.Text = "Show untracked files"; + this.showUntrackedFilesToolStripMenuItem.Click += new System.EventHandler(this.showUntrackedFilesToolStripMenuItem_Click); + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(213, 6); + // + // deleteSelectedFilesToolStripMenuItem + // + this.deleteSelectedFilesToolStripMenuItem.Name = "deleteSelectedFilesToolStripMenuItem"; + this.deleteSelectedFilesToolStripMenuItem.Size = new System.Drawing.Size(216, 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(216, 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(216, 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(213, 6); + // + // eToolStripMenuItem + // + this.eToolStripMenuItem.Name = "eToolStripMenuItem"; + this.eToolStripMenuItem.Size = new System.Drawing.Size(216, 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(216, 22); + this.deleteAllUntrackedFilesToolStripMenuItem.Text = "Delete all untracked files"; + this.deleteAllUntrackedFilesToolStripMenuItem.Click += new System.EventHandler(this.deleteAllUntrackedFilesToolStripMenuItem_Click); + // + // rescanChangesToolStripMenuItem + // + this.rescanChangesToolStripMenuItem.Image = global::GitUI.Properties.Resources.arrow_refresh; + this.rescanChangesToolStripMenuItem.Name = "rescanChangesToolStripMenuItem"; + this.rescanChangesToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F5; + this.rescanChangesToolStripMenuItem.Size = new System.Drawing.Size(216, 22); + this.rescanChangesToolStripMenuItem.Text = "Rescan changes"; + this.rescanChangesToolStripMenuItem.Click += new System.EventHandler(this.rescanChangesToolStripMenuItem_Click); + // + // Loading + // + this.Loading.BackColor = System.Drawing.SystemColors.AppWorkspace; + this.Loading.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.Loading.Dock = System.Windows.Forms.DockStyle.Fill; + this.Loading.Image = global::GitUI.Properties.Resources.loadingpanel; + this.Loading.Location = new System.Drawing.Point(0, 0); + this.Loading.Name = "Loading"; + this.Loading.Size = new System.Drawing.Size(397, 258); + this.Loading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.Loading.TabIndex = 2; + this.Loading.TabStop = false; + // + // Unstaged + // + this.Unstaged.ContextMenuStrip = this.UnstagedFileContext; + this.Unstaged.Dock = System.Windows.Forms.DockStyle.Fill; + this.Unstaged.GitItemStatusses = null; + this.Unstaged.Location = new System.Drawing.Point(0, 0); + this.Unstaged.Name = "Unstaged"; + this.Unstaged.SelectedItem = null; + this.Unstaged.Size = new System.Drawing.Size(397, 258); + this.Unstaged.TabIndex = 0; + // + // UnstagedFileContext + // + this.UnstagedFileContext.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ResetChanges, this.deleteFileToolStripMenuItem, this.addFileTogitignoreToolStripMenuItem, @@ -340,504 +340,503 @@ this.openWithDifftoolToolStripMenuItem, this.toolStripSeparator5, this.filenameToClipboardToolStripMenuItem}); - this.UnstagedFileContext.Name = "UnstagedFileContext"; - this.UnstagedFileContext.Size = new System.Drawing.Size(225, 184); - // - // ResetChanges - // - this.ResetChanges.Name = "ResetChanges"; - this.ResetChanges.Size = new System.Drawing.Size(224, 24); - 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(224, 24); - this.deleteFileToolStripMenuItem.Text = "Delete file"; - this.deleteFileToolStripMenuItem.Click += new System.EventHandler(this.deleteFileToolStripMenuItem_Click); - // - // addFileTogitignoreToolStripMenuItem - // - this.addFileTogitignoreToolStripMenuItem.Name = "addFileTogitignoreToolStripMenuItem"; - this.addFileTogitignoreToolStripMenuItem.Size = new System.Drawing.Size(224, 24); - this.addFileTogitignoreToolStripMenuItem.Text = "Add file to .gitignore"; - this.addFileTogitignoreToolStripMenuItem.Click += new System.EventHandler(this.addFileTogitignoreToolStripMenuItem_Click); - // - // toolStripSeparator4 - // - this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(221, 6); - // - // openToolStripMenuItem - // - this.openToolStripMenuItem.Name = "openToolStripMenuItem"; - this.openToolStripMenuItem.Size = new System.Drawing.Size(224, 24); - this.openToolStripMenuItem.Text = "Open"; - this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click); - // - // openWithToolStripMenuItem - // - this.openWithToolStripMenuItem.Name = "openWithToolStripMenuItem"; - this.openWithToolStripMenuItem.Size = new System.Drawing.Size(224, 24); - this.openWithToolStripMenuItem.Text = "Open With"; - this.openWithToolStripMenuItem.Click += new System.EventHandler(this.openWithToolStripMenuItem_Click); - // - // openWithDifftoolToolStripMenuItem - // - this.openWithDifftoolToolStripMenuItem.Name = "openWithDifftoolToolStripMenuItem"; - this.openWithDifftoolToolStripMenuItem.Size = new System.Drawing.Size(224, 24); - this.openWithDifftoolToolStripMenuItem.Text = "Open With Difftool"; - this.openWithDifftoolToolStripMenuItem.Click += new System.EventHandler(this.openWithDifftoolToolStripMenuItem_Click); - // - // toolStripSeparator5 - // - this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(221, 6); - // - // filenameToClipboardToolStripMenuItem - // - this.filenameToClipboardToolStripMenuItem.Name = "filenameToClipboardToolStripMenuItem"; - this.filenameToClipboardToolStripMenuItem.Size = new System.Drawing.Size(224, 24); - this.filenameToClipboardToolStripMenuItem.Text = "Filename to clipboard"; - this.filenameToClipboardToolStripMenuItem.Click += new System.EventHandler(this.filenameToClipboardToolStripMenuItem_Click); - // - // gitItemStatusBindingSource - // - this.gitItemStatusBindingSource.DataSource = typeof(GitCommands.GitItemStatus); - // - // splitContainer5 - // - this.splitContainer5.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer5.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; - this.splitContainer5.Location = new System.Drawing.Point(0, 0); - this.splitContainer5.Margin = new System.Windows.Forms.Padding(0); - this.splitContainer5.Name = "splitContainer5"; - this.splitContainer5.Orientation = System.Windows.Forms.Orientation.Horizontal; - // - // splitContainer5.Panel1 - // - this.splitContainer5.Panel1.Controls.Add(this.tableLayoutPanel4); - // - // splitContainer5.Panel2 - // - this.splitContainer5.Panel2.Controls.Add(this.Staged); - this.splitContainer5.Panel2.Controls.Add(this.Cancel); - this.splitContainer5.Size = new System.Drawing.Size(397, 358); - this.splitContainer5.SplitterDistance = 30; - this.splitContainer5.SplitterWidth = 1; - this.splitContainer5.TabIndex = 1; - // - // tableLayoutPanel4 - // - this.tableLayoutPanel4.ColumnCount = 3; - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 34F)); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33F)); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33F)); - this.tableLayoutPanel4.Controls.Add(this.AddFiles, 2, 0); - this.tableLayoutPanel4.Controls.Add(this.menuStrip2, 0, 0); - this.tableLayoutPanel4.Controls.Add(this.UnstageFiles, 1, 0); - this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel4.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel4.Name = "tableLayoutPanel4"; - this.tableLayoutPanel4.RowCount = 1; - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(397, 30); - this.tableLayoutPanel4.TabIndex = 0; - // - // AddFiles - // - this.AddFiles.Dock = System.Windows.Forms.DockStyle.Fill; - this.AddFiles.Image = global::GitUI.Properties.Resources._4; - this.AddFiles.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.AddFiles.Location = new System.Drawing.Point(268, 3); - this.AddFiles.Name = "AddFiles"; - this.AddFiles.Size = new System.Drawing.Size(126, 24); - this.AddFiles.TabIndex = 4; - this.AddFiles.Text = "Stage"; - this.AddFiles.UseVisualStyleBackColor = true; - this.AddFiles.Click += new System.EventHandler(this.Stage_Click); - // - // menuStrip2 - // - this.menuStrip2.BackColor = System.Drawing.SystemColors.Control; - this.menuStrip2.Dock = System.Windows.Forms.DockStyle.Fill; - this.menuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.UnstagedFileContext.Name = "UnstagedFileContext"; + this.UnstagedFileContext.Size = new System.Drawing.Size(247, 184); + // + // ResetChanges + // + this.ResetChanges.Name = "ResetChanges"; + this.ResetChanges.Size = new System.Drawing.Size(246, 24); + 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(246, 24); + this.deleteFileToolStripMenuItem.Text = "Delete file"; + this.deleteFileToolStripMenuItem.Click += new System.EventHandler(this.deleteFileToolStripMenuItem_Click); + // + // addFileTogitignoreToolStripMenuItem + // + this.addFileTogitignoreToolStripMenuItem.Name = "addFileTogitignoreToolStripMenuItem"; + this.addFileTogitignoreToolStripMenuItem.Size = new System.Drawing.Size(246, 24); + this.addFileTogitignoreToolStripMenuItem.Text = "Add file to .gitignore"; + this.addFileTogitignoreToolStripMenuItem.Click += new System.EventHandler(this.addFileTogitignoreToolStripMenuItem_Click); + // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(243, 6); + // + // openToolStripMenuItem + // + this.openToolStripMenuItem.Name = "openToolStripMenuItem"; + this.openToolStripMenuItem.Size = new System.Drawing.Size(246, 24); + this.openToolStripMenuItem.Text = "Open"; + this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click); + // + // openWithToolStripMenuItem + // + this.openWithToolStripMenuItem.Name = "openWithToolStripMenuItem"; + this.openWithToolStripMenuItem.Size = new System.Drawing.Size(246, 24); + this.openWithToolStripMenuItem.Text = "Open With"; + this.openWithToolStripMenuItem.Click += new System.EventHandler(this.openWithToolStripMenuItem_Click); + // + // openWithDifftoolToolStripMenuItem + // + this.openWithDifftoolToolStripMenuItem.Name = "openWithDifftoolToolStripMenuItem"; + this.openWithDifftoolToolStripMenuItem.Size = new System.Drawing.Size(246, 24); + this.openWithDifftoolToolStripMenuItem.Text = "Open With Difftool"; + this.openWithDifftoolToolStripMenuItem.Click += new System.EventHandler(this.openWithDifftoolToolStripMenuItem_Click); + // + // toolStripSeparator5 + // + this.toolStripSeparator5.Name = "toolStripSeparator5"; + this.toolStripSeparator5.Size = new System.Drawing.Size(243, 6); + // + // filenameToClipboardToolStripMenuItem + // + this.filenameToClipboardToolStripMenuItem.Name = "filenameToClipboardToolStripMenuItem"; + this.filenameToClipboardToolStripMenuItem.Size = new System.Drawing.Size(246, 24); + this.filenameToClipboardToolStripMenuItem.Text = "Filename to clipboard"; + this.filenameToClipboardToolStripMenuItem.Click += new System.EventHandler(this.filenameToClipboardToolStripMenuItem_Click); + // + // splitContainer5 + // + this.splitContainer5.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer5.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer5.Location = new System.Drawing.Point(0, 0); + this.splitContainer5.Margin = new System.Windows.Forms.Padding(0); + this.splitContainer5.Name = "splitContainer5"; + this.splitContainer5.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer5.Panel1 + // + this.splitContainer5.Panel1.Controls.Add(this.tableLayoutPanel4); + // + // splitContainer5.Panel2 + // + this.splitContainer5.Panel2.Controls.Add(this.Staged); + this.splitContainer5.Panel2.Controls.Add(this.Cancel); + this.splitContainer5.Size = new System.Drawing.Size(397, 356); + this.splitContainer5.SplitterDistance = 30; + this.splitContainer5.SplitterWidth = 1; + this.splitContainer5.TabIndex = 1; + // + // tableLayoutPanel4 + // + this.tableLayoutPanel4.ColumnCount = 3; + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 34F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33F)); + this.tableLayoutPanel4.Controls.Add(this.AddFiles, 2, 0); + this.tableLayoutPanel4.Controls.Add(this.menuStrip2, 0, 0); + this.tableLayoutPanel4.Controls.Add(this.UnstageFiles, 1, 0); + this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel4.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel4.Name = "tableLayoutPanel4"; + this.tableLayoutPanel4.RowCount = 1; + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); + this.tableLayoutPanel4.Size = new System.Drawing.Size(397, 30); + this.tableLayoutPanel4.TabIndex = 0; + // + // AddFiles + // + this.AddFiles.Dock = System.Windows.Forms.DockStyle.Fill; + this.AddFiles.Image = global::GitUI.Properties.Resources._4; + this.AddFiles.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.AddFiles.Location = new System.Drawing.Point(268, 3); + this.AddFiles.Name = "AddFiles"; + this.AddFiles.Size = new System.Drawing.Size(126, 24); + this.AddFiles.TabIndex = 4; + this.AddFiles.Text = "Stage"; + this.AddFiles.UseVisualStyleBackColor = true; + this.AddFiles.Click += new System.EventHandler(this.Stage_Click); + // + // menuStrip2 + // + this.menuStrip2.BackColor = System.Drawing.SystemColors.Control; + this.menuStrip2.Dock = System.Windows.Forms.DockStyle.Fill; + this.menuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.filesListedToCommitToolStripMenuItem}); - this.menuStrip2.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; - this.menuStrip2.Location = new System.Drawing.Point(0, 0); - this.menuStrip2.Name = "menuStrip2"; - this.menuStrip2.Size = new System.Drawing.Size(134, 30); - this.menuStrip2.TabIndex = 5; - this.menuStrip2.Text = "menuStrip2"; - // - // filesListedToCommitToolStripMenuItem - // - this.filesListedToCommitToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; - this.filesListedToCommitToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menuStrip2.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; + this.menuStrip2.Location = new System.Drawing.Point(0, 0); + this.menuStrip2.Name = "menuStrip2"; + this.menuStrip2.Size = new System.Drawing.Size(134, 30); + this.menuStrip2.TabIndex = 5; + this.menuStrip2.Text = "menuStrip2"; + // + // filesListedToCommitToolStripMenuItem + // + this.filesListedToCommitToolStripMenuItem.BackColor = System.Drawing.SystemColors.Control; + this.filesListedToCommitToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.stageAllToolStripMenuItem, this.unstageAllToolStripMenuItem, this.toolStripSeparator2, this.stageChunkOfFileToolStripMenuItem}); - this.filesListedToCommitToolStripMenuItem.Image = global::GitUI.Properties.Resources._89; - this.filesListedToCommitToolStripMenuItem.Name = "filesListedToCommitToolStripMenuItem"; - this.filesListedToCommitToolStripMenuItem.Size = new System.Drawing.Size(115, 24); - this.filesListedToCommitToolStripMenuItem.Text = "Staged files"; - // - // stageAllToolStripMenuItem - // - this.stageAllToolStripMenuItem.Name = "stageAllToolStripMenuItem"; - this.stageAllToolStripMenuItem.Size = new System.Drawing.Size(201, 24); - 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.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); - // - // stageChunkOfFileToolStripMenuItem - // - this.stageChunkOfFileToolStripMenuItem.Name = "stageChunkOfFileToolStripMenuItem"; - this.stageChunkOfFileToolStripMenuItem.Size = new System.Drawing.Size(201, 24); - this.stageChunkOfFileToolStripMenuItem.Text = "Stage chunk of file"; - this.stageChunkOfFileToolStripMenuItem.Click += new System.EventHandler(this.stageChunkOfFileToolStripMenuItem_Click); - // - // UnstageFiles - // - this.UnstageFiles.Dock = System.Windows.Forms.DockStyle.Fill; - this.UnstageFiles.Image = global::GitUI.Properties.Resources._3; - this.UnstageFiles.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.UnstageFiles.Location = new System.Drawing.Point(137, 3); - this.UnstageFiles.Name = "UnstageFiles"; - this.UnstageFiles.Size = new System.Drawing.Size(125, 24); - this.UnstageFiles.TabIndex = 1; - this.UnstageFiles.Text = "Unstage"; - this.UnstageFiles.UseVisualStyleBackColor = true; - this.UnstageFiles.Click += new System.EventHandler(this.UnstageFiles_Click); - // - // Staged - // - this.Staged.Dock = System.Windows.Forms.DockStyle.Fill; - this.Staged.Location = new System.Drawing.Point(0, 0); - this.Staged.Name = "Staged"; - this.Staged.Size = new System.Drawing.Size(397, 327); - this.Staged.TabIndex = 0; - - // - // Cancel - // - this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.Cancel.Location = new System.Drawing.Point(139, 143); - this.Cancel.Name = "Cancel"; - this.Cancel.Size = new System.Drawing.Size(129, 23); - this.Cancel.TabIndex = 9; - this.Cancel.Text = "Cancel"; - this.Cancel.UseVisualStyleBackColor = true; - this.Cancel.Click += new System.EventHandler(this.Cancel_Click); - // - // Ok - // - this.Ok.Location = new System.Drawing.Point(334, 10); - this.Ok.Name = "Ok"; - this.Ok.Size = new System.Drawing.Size(75, 23); - this.Ok.TabIndex = 2; - this.Ok.Text = "Commit"; - this.Ok.UseVisualStyleBackColor = true; - // - // splitContainer3 - // - this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer3.Location = new System.Drawing.Point(0, 0); - this.splitContainer3.Name = "splitContainer3"; - this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal; - // - // splitContainer3.Panel1 - // - this.splitContainer3.Panel1.Controls.Add(this.SolveMergeconflicts); - this.splitContainer3.Panel1.Controls.Add(this.SelectedDiff); - this.splitContainer3.Panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.splitContainer3_Panel1_Paint); - // - // splitContainer3.Panel2 - // - this.splitContainer3.Panel2.Controls.Add(this.tableLayoutPanel6); - this.splitContainer3.Panel2MinSize = 134; - this.splitContainer3.Size = new System.Drawing.Size(494, 648); - this.splitContainer3.SplitterDistance = 510; - this.splitContainer3.TabIndex = 0; - // - // SolveMergeconflicts - // - this.SolveMergeconflicts.BackColor = System.Drawing.Color.SeaShell; - this.SolveMergeconflicts.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.SolveMergeconflicts.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.SolveMergeconflicts.Image = ((System.Drawing.Image)(resources.GetObject("SolveMergeconflicts.Image"))); - this.SolveMergeconflicts.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.SolveMergeconflicts.Location = new System.Drawing.Point(14, 12); - this.SolveMergeconflicts.Name = "SolveMergeconflicts"; - this.SolveMergeconflicts.Size = new System.Drawing.Size(188, 42); - this.SolveMergeconflicts.TabIndex = 8; - this.SolveMergeconflicts.Text = "There are unresolved mergeconflicts\r\n"; - this.SolveMergeconflicts.UseVisualStyleBackColor = false; - this.SolveMergeconflicts.Visible = false; - this.SolveMergeconflicts.Click += new System.EventHandler(this.SolveMergeconflicts_Click); - // - // SelectedDiff - // - this.SelectedDiff.Dock = System.Windows.Forms.DockStyle.Fill; - this.SelectedDiff.IgnoreWhitespaceChanges = false; - this.SelectedDiff.Location = new System.Drawing.Point(0, 0); - this.SelectedDiff.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.SelectedDiff.Name = "SelectedDiff"; - this.SelectedDiff.NumberOfVisibleLines = 3; - this.SelectedDiff.ScrollPos = 0; - this.SelectedDiff.ShowEntireFile = false; - this.SelectedDiff.Size = new System.Drawing.Size(494, 510); - this.SelectedDiff.TabIndex = 0; - this.SelectedDiff.TreatAllFilesAsText = false; - // - // tableLayoutPanel6 - // - this.tableLayoutPanel6.ColumnCount = 2; - this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 130F)); - this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel6.Controls.Add(this.tableLayoutPanel2, 0, 0); - this.tableLayoutPanel6.Controls.Add(this.tableLayoutPanel7, 1, 0); - this.tableLayoutPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel6.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel6.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel6.Name = "tableLayoutPanel6"; - this.tableLayoutPanel6.RowCount = 1; - this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel6.Size = new System.Drawing.Size(494, 134); - this.tableLayoutPanel6.TabIndex = 2; - // - // tableLayoutPanel2 - // - this.tableLayoutPanel2.ColumnCount = 1; - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.Controls.Add(this.Scan, 0, 3); - this.tableLayoutPanel2.Controls.Add(this.Reset, 0, 2); - this.tableLayoutPanel2.Controls.Add(this.Amend, 0, 1); - this.tableLayoutPanel2.Controls.Add(this.Commit, 0, 0); - this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel2.Name = "tableLayoutPanel2"; - this.tableLayoutPanel2.RowCount = 5; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel2.Size = new System.Drawing.Size(130, 134); - this.tableLayoutPanel2.TabIndex = 0; - // - // Scan - // - this.Scan.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.Scan.Location = new System.Drawing.Point(3, 99); - this.Scan.Name = "Scan"; - this.Scan.Size = new System.Drawing.Size(124, 26); - this.Scan.TabIndex = 3; - this.Scan.Text = "&Rescan changes"; - this.Scan.UseVisualStyleBackColor = true; - this.Scan.Click += new System.EventHandler(this.Scan_Click); - // - // Reset - // - this.Reset.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.Reset.Location = new System.Drawing.Point(3, 67); - this.Reset.Name = "Reset"; - this.Reset.Size = new System.Drawing.Size(124, 26); - this.Reset.TabIndex = 5; - this.Reset.Text = "Reset changes"; - this.Reset.UseVisualStyleBackColor = true; - this.Reset.Click += new System.EventHandler(this.Reset_Click); - // - // Amend - // - this.Amend.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.Amend.Location = new System.Drawing.Point(3, 35); - this.Amend.Name = "Amend"; - this.Amend.Size = new System.Drawing.Size(124, 26); - this.Amend.TabIndex = 7; - this.Amend.Text = "&Amend last commit"; - this.Amend.UseVisualStyleBackColor = true; - this.Amend.Click += new System.EventHandler(this.Amend_Click); - // - // Commit - // - this.Commit.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.Commit.Image = global::GitUI.Properties.Resources._10; - this.Commit.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.Commit.Location = new System.Drawing.Point(3, 3); - this.Commit.Name = "Commit"; - this.Commit.Size = new System.Drawing.Size(124, 26); - this.Commit.TabIndex = 2; - this.Commit.Text = "&Commit"; - this.Commit.UseVisualStyleBackColor = true; - this.Commit.Click += new System.EventHandler(this.Commit_Click); - // - // tableLayoutPanel7 - // - this.tableLayoutPanel7.ColumnCount = 1; - this.tableLayoutPanel7.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel7.Controls.Add(this.Message, 0, 1); - this.tableLayoutPanel7.Controls.Add(this.tableLayoutPanel3, 0, 0); - this.tableLayoutPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel7.Location = new System.Drawing.Point(130, 0); - this.tableLayoutPanel7.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel7.Name = "tableLayoutPanel7"; - this.tableLayoutPanel7.RowCount = 2; - this.tableLayoutPanel7.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tableLayoutPanel7.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel7.Size = new System.Drawing.Size(364, 134); - this.tableLayoutPanel7.TabIndex = 1; - // - // Message - // - this.Message.Dock = System.Windows.Forms.DockStyle.Fill; - this.Message.Location = new System.Drawing.Point(4, 34); - 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.Name = "Message"; - this.Message.Size = new System.Drawing.Size(356, 96); - this.Message.TabIndex = 0; - this.Message.Load += new System.EventHandler(this.Message_Load); - // - // tableLayoutPanel3 - // - this.tableLayoutPanel3.ColumnCount = 2; - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel3.Controls.Add(this.menuStrip3, 0, 0); - this.tableLayoutPanel3.Controls.Add(this.CloseDialogAfterCommit, 1, 0); - this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel3.Name = "tableLayoutPanel3"; - this.tableLayoutPanel3.RowCount = 1; - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(364, 30); - this.tableLayoutPanel3.TabIndex = 1; - // - // menuStrip3 - // - this.menuStrip3.BackColor = System.Drawing.SystemColors.Control; - this.menuStrip3.Dock = System.Windows.Forms.DockStyle.Fill; - this.menuStrip3.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.filesListedToCommitToolStripMenuItem.Image = global::GitUI.Properties.Resources._89; + this.filesListedToCommitToolStripMenuItem.Name = "filesListedToCommitToolStripMenuItem"; + this.filesListedToCommitToolStripMenuItem.Size = new System.Drawing.Size(91, 20); + this.filesListedToCommitToolStripMenuItem.Text = "Staged files"; + // + // stageAllToolStripMenuItem + // + this.stageAllToolStripMenuItem.Name = "stageAllToolStripMenuItem"; + this.stageAllToolStripMenuItem.Size = new System.Drawing.Size(174, 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(174, 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(171, 6); + // + // stageChunkOfFileToolStripMenuItem + // + this.stageChunkOfFileToolStripMenuItem.Name = "stageChunkOfFileToolStripMenuItem"; + this.stageChunkOfFileToolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.stageChunkOfFileToolStripMenuItem.Text = "Stage chunk of file"; + this.stageChunkOfFileToolStripMenuItem.Click += new System.EventHandler(this.stageChunkOfFileToolStripMenuItem_Click); + // + // UnstageFiles + // + this.UnstageFiles.Dock = System.Windows.Forms.DockStyle.Fill; + this.UnstageFiles.Image = global::GitUI.Properties.Resources._3; + this.UnstageFiles.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.UnstageFiles.Location = new System.Drawing.Point(137, 3); + this.UnstageFiles.Name = "UnstageFiles"; + this.UnstageFiles.Size = new System.Drawing.Size(125, 24); + this.UnstageFiles.TabIndex = 1; + this.UnstageFiles.Text = "Unstage"; + this.UnstageFiles.UseVisualStyleBackColor = true; + this.UnstageFiles.Click += new System.EventHandler(this.UnstageFiles_Click); + // + // Staged + // + this.Staged.Dock = System.Windows.Forms.DockStyle.Fill; + this.Staged.GitItemStatusses = null; + this.Staged.Location = new System.Drawing.Point(0, 0); + this.Staged.Name = "Staged"; + this.Staged.SelectedItem = null; + this.Staged.Size = new System.Drawing.Size(397, 325); + this.Staged.TabIndex = 0; + // + // Cancel + // + this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.Cancel.Location = new System.Drawing.Point(139, 143); + this.Cancel.Name = "Cancel"; + this.Cancel.Size = new System.Drawing.Size(129, 23); + this.Cancel.TabIndex = 9; + this.Cancel.Text = "Cancel"; + this.Cancel.UseVisualStyleBackColor = true; + this.Cancel.Click += new System.EventHandler(this.Cancel_Click); + // + // Ok + // + this.Ok.Location = new System.Drawing.Point(334, 10); + this.Ok.Name = "Ok"; + this.Ok.Size = new System.Drawing.Size(75, 23); + this.Ok.TabIndex = 2; + this.Ok.Text = "Commit"; + this.Ok.UseVisualStyleBackColor = true; + // + // splitContainer3 + // + this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer3.Location = new System.Drawing.Point(0, 0); + this.splitContainer3.Name = "splitContainer3"; + this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer3.Panel1 + // + this.splitContainer3.Panel1.Controls.Add(this.SolveMergeconflicts); + this.splitContainer3.Panel1.Controls.Add(this.SelectedDiff); + this.splitContainer3.Panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.splitContainer3_Panel1_Paint); + // + // splitContainer3.Panel2 + // + this.splitContainer3.Panel2.Controls.Add(this.tableLayoutPanel6); + this.splitContainer3.Panel2MinSize = 134; + this.splitContainer3.Size = new System.Drawing.Size(490, 644); + this.splitContainer3.SplitterDistance = 506; + this.splitContainer3.TabIndex = 0; + // + // SolveMergeconflicts + // + this.SolveMergeconflicts.BackColor = System.Drawing.Color.SeaShell; + this.SolveMergeconflicts.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.SolveMergeconflicts.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.SolveMergeconflicts.Image = ((System.Drawing.Image)(resources.GetObject("SolveMergeconflicts.Image"))); + this.SolveMergeconflicts.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.SolveMergeconflicts.Location = new System.Drawing.Point(14, 12); + this.SolveMergeconflicts.Name = "SolveMergeconflicts"; + this.SolveMergeconflicts.Size = new System.Drawing.Size(188, 42); + this.SolveMergeconflicts.TabIndex = 8; + this.SolveMergeconflicts.Text = "There are unresolved mergeconflicts\r\n"; + this.SolveMergeconflicts.UseVisualStyleBackColor = false; + this.SolveMergeconflicts.Visible = false; + this.SolveMergeconflicts.Click += new System.EventHandler(this.SolveMergeconflicts_Click); + // + // SelectedDiff + // + this.SelectedDiff.Dock = System.Windows.Forms.DockStyle.Fill; + this.SelectedDiff.IgnoreWhitespaceChanges = false; + this.SelectedDiff.Location = new System.Drawing.Point(0, 0); + this.SelectedDiff.Margin = new System.Windows.Forms.Padding(4); + this.SelectedDiff.Name = "SelectedDiff"; + this.SelectedDiff.NumberOfVisibleLines = 3; + this.SelectedDiff.ScrollPos = 0; + this.SelectedDiff.ShowEntireFile = false; + this.SelectedDiff.Size = new System.Drawing.Size(490, 506); + this.SelectedDiff.TabIndex = 0; + this.SelectedDiff.TreatAllFilesAsText = false; + // + // tableLayoutPanel6 + // + this.tableLayoutPanel6.ColumnCount = 2; + this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 130F)); + this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel6.Controls.Add(this.tableLayoutPanel2, 0, 0); + this.tableLayoutPanel6.Controls.Add(this.tableLayoutPanel7, 1, 0); + this.tableLayoutPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel6.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel6.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel6.Name = "tableLayoutPanel6"; + this.tableLayoutPanel6.RowCount = 1; + this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel6.Size = new System.Drawing.Size(490, 134); + this.tableLayoutPanel6.TabIndex = 2; + // + // tableLayoutPanel2 + // + this.tableLayoutPanel2.ColumnCount = 1; + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel2.Controls.Add(this.Scan, 0, 3); + this.tableLayoutPanel2.Controls.Add(this.Reset, 0, 2); + this.tableLayoutPanel2.Controls.Add(this.Amend, 0, 1); + this.tableLayoutPanel2.Controls.Add(this.Commit, 0, 0); + this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel2.Name = "tableLayoutPanel2"; + this.tableLayoutPanel2.RowCount = 5; + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel2.Size = new System.Drawing.Size(130, 134); + this.tableLayoutPanel2.TabIndex = 0; + // + // Scan + // + this.Scan.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.Scan.Location = new System.Drawing.Point(3, 99); + this.Scan.Name = "Scan"; + this.Scan.Size = new System.Drawing.Size(124, 26); + this.Scan.TabIndex = 3; + this.Scan.Text = "&Rescan changes"; + this.Scan.UseVisualStyleBackColor = true; + this.Scan.Click += new System.EventHandler(this.Scan_Click); + // + // Reset + // + this.Reset.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.Reset.Location = new System.Drawing.Point(3, 67); + this.Reset.Name = "Reset"; + this.Reset.Size = new System.Drawing.Size(124, 26); + this.Reset.TabIndex = 5; + this.Reset.Text = "Reset changes"; + this.Reset.UseVisualStyleBackColor = true; + this.Reset.Click += new System.EventHandler(this.Reset_Click); + // + // Amend + // + this.Amend.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.Amend.Location = new System.Drawing.Point(3, 35); + this.Amend.Name = "Amend"; + this.Amend.Size = new System.Drawing.Size(124, 26); + this.Amend.TabIndex = 7; + this.Amend.Text = "&Amend last commit"; + this.Amend.UseVisualStyleBackColor = true; + this.Amend.Click += new System.EventHandler(this.Amend_Click); + // + // Commit + // + this.Commit.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.Commit.Image = global::GitUI.Properties.Resources._10; + this.Commit.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.Commit.Location = new System.Drawing.Point(3, 3); + this.Commit.Name = "Commit"; + this.Commit.Size = new System.Drawing.Size(124, 26); + this.Commit.TabIndex = 2; + this.Commit.Text = "&Commit"; + this.Commit.UseVisualStyleBackColor = true; + this.Commit.Click += new System.EventHandler(this.Commit_Click); + // + // tableLayoutPanel7 + // + this.tableLayoutPanel7.ColumnCount = 1; + this.tableLayoutPanel7.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel7.Controls.Add(this.Message, 0, 1); + this.tableLayoutPanel7.Controls.Add(this.tableLayoutPanel3, 0, 0); + this.tableLayoutPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel7.Location = new System.Drawing.Point(130, 0); + this.tableLayoutPanel7.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel7.Name = "tableLayoutPanel7"; + this.tableLayoutPanel7.RowCount = 2; + this.tableLayoutPanel7.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); + this.tableLayoutPanel7.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel7.Size = new System.Drawing.Size(364, 134); + this.tableLayoutPanel7.TabIndex = 1; + // + // Message + // + this.Message.Dock = System.Windows.Forms.DockStyle.Fill; + this.Message.Location = new System.Drawing.Point(4, 34); + 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(356, 96); + this.Message.TabIndex = 0; + this.Message.Load += new System.EventHandler(this.Message_Load); + // + // tableLayoutPanel3 + // + this.tableLayoutPanel3.ColumnCount = 2; + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel3.Controls.Add(this.menuStrip3, 0, 0); + this.tableLayoutPanel3.Controls.Add(this.CloseDialogAfterCommit, 1, 0); + this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel3.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel3.Name = "tableLayoutPanel3"; + this.tableLayoutPanel3.RowCount = 1; + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel3.Size = new System.Drawing.Size(364, 30); + this.tableLayoutPanel3.TabIndex = 1; + // + // menuStrip3 + // + this.menuStrip3.BackColor = System.Drawing.SystemColors.Control; + this.menuStrip3.Dock = System.Windows.Forms.DockStyle.Fill; + this.menuStrip3.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.commitMessageToolStripMenuItem}); - this.menuStrip3.Location = new System.Drawing.Point(0, 0); - this.menuStrip3.Name = "menuStrip3"; - this.menuStrip3.Size = new System.Drawing.Size(182, 30); - this.menuStrip3.TabIndex = 0; - this.menuStrip3.Text = "menuStrip3"; - // - // commitMessageToolStripMenuItem - // - this.commitMessageToolStripMenuItem.Image = global::GitUI.Properties.Resources._89; - this.commitMessageToolStripMenuItem.Name = "commitMessageToolStripMenuItem"; - this.commitMessageToolStripMenuItem.Size = new System.Drawing.Size(152, 26); - this.commitMessageToolStripMenuItem.Text = "Commit &message"; - this.commitMessageToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.commitMessageToolStripMenuItem_DropDownItemClicked); - this.commitMessageToolStripMenuItem.DropDownOpening += new System.EventHandler(this.commitMessageToolStripMenuItem_DropDownOpening); - this.commitMessageToolStripMenuItem.Click += new System.EventHandler(this.commitMessageToolStripMenuItem_Click); - // - // CloseDialogAfterCommit - // - this.CloseDialogAfterCommit.AutoSize = true; - this.CloseDialogAfterCommit.Location = new System.Drawing.Point(185, 3); - this.CloseDialogAfterCommit.Name = "CloseDialogAfterCommit"; - this.CloseDialogAfterCommit.Size = new System.Drawing.Size(176, 21); - this.CloseDialogAfterCommit.TabIndex = 0; - this.CloseDialogAfterCommit.Text = "Close dialog after commit"; - this.CloseDialogAfterCommit.UseVisualStyleBackColor = true; - this.CloseDialogAfterCommit.CheckedChanged += new System.EventHandler(this.CloseDialogAfterCommit_CheckedChanged); - // - // CloseCommitDialogTooltip - // - this.CloseCommitDialogTooltip.AutomaticDelay = 1; - this.CloseCommitDialogTooltip.AutoPopDelay = 5000; - this.CloseCommitDialogTooltip.InitialDelay = 1; - this.CloseCommitDialogTooltip.ReshowDelay = 1; - this.CloseCommitDialogTooltip.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info; - // - // fileTooltip - // - this.fileTooltip.AutomaticDelay = 0; - this.fileTooltip.AutoPopDelay = 500; - this.fileTooltip.InitialDelay = 0; - this.fileTooltip.ReshowDelay = 0; - // - // FormCommit - // - this.AcceptButton = this.Commit; - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.Cancel; - this.ClientSize = new System.Drawing.Size(895, 648); - this.Controls.Add(this.splitContainer1); - this.MainMenuStrip = this.menuStrip1; - this.Name = "FormCommit"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Commit"; - this.Load += new System.EventHandler(this.FormCommit_Load); - this.Shown += new System.EventHandler(this.FormCommit_Shown); - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormCommit_FormClosing); - this.splitContainer1.Panel1.ResumeLayout(false); - this.splitContainer1.Panel2.ResumeLayout(false); - this.splitContainer1.ResumeLayout(false); - this.splitContainer2.Panel1.ResumeLayout(false); - this.splitContainer2.Panel2.ResumeLayout(false); - this.splitContainer2.ResumeLayout(false); - this.splitContainer4.Panel1.ResumeLayout(false); - this.splitContainer4.Panel2.ResumeLayout(false); - this.splitContainer4.ResumeLayout(false); - this.tableLayoutPanel5.ResumeLayout(false); - this.tableLayoutPanel5.PerformLayout(); - this.menuStrip1.ResumeLayout(false); - this.menuStrip1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.Loading)).EndInit(); - //((System.ComponentModel.ISupportInitialize)(this.Unstaged)).EndInit(); - this.UnstagedFileContext.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.gitItemStatusBindingSource)).EndInit(); - this.splitContainer5.Panel1.ResumeLayout(false); - this.splitContainer5.Panel2.ResumeLayout(false); - this.splitContainer5.ResumeLayout(false); - this.tableLayoutPanel4.ResumeLayout(false); - this.tableLayoutPanel4.PerformLayout(); - this.menuStrip2.ResumeLayout(false); - this.menuStrip2.PerformLayout(); - //((System.ComponentModel.ISupportInitialize)(this.Staged)).EndInit(); - this.splitContainer3.Panel1.ResumeLayout(false); - this.splitContainer3.Panel2.ResumeLayout(false); - this.splitContainer3.ResumeLayout(false); - this.tableLayoutPanel6.ResumeLayout(false); - this.tableLayoutPanel2.ResumeLayout(false); - this.tableLayoutPanel7.ResumeLayout(false); - this.tableLayoutPanel3.ResumeLayout(false); - this.tableLayoutPanel3.PerformLayout(); - this.menuStrip3.ResumeLayout(false); - this.menuStrip3.PerformLayout(); - this.ResumeLayout(false); + this.menuStrip3.Location = new System.Drawing.Point(0, 0); + this.menuStrip3.Name = "menuStrip3"; + this.menuStrip3.Size = new System.Drawing.Size(182, 30); + this.menuStrip3.TabIndex = 0; + this.menuStrip3.Text = "menuStrip3"; + // + // commitMessageToolStripMenuItem + // + this.commitMessageToolStripMenuItem.Image = global::GitUI.Properties.Resources._89; + this.commitMessageToolStripMenuItem.Name = "commitMessageToolStripMenuItem"; + this.commitMessageToolStripMenuItem.Size = new System.Drawing.Size(115, 26); + this.commitMessageToolStripMenuItem.Text = "Commit &message"; + this.commitMessageToolStripMenuItem.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.commitMessageToolStripMenuItem_DropDownItemClicked); + this.commitMessageToolStripMenuItem.DropDownOpening += new System.EventHandler(this.commitMessageToolStripMenuItem_DropDownOpening); + this.commitMessageToolStripMenuItem.Click += new System.EventHandler(this.commitMessageToolStripMenuItem_Click); + // + // CloseDialogAfterCommit + // + this.CloseDialogAfterCommit.AutoSize = true; + this.CloseDialogAfterCommit.Location = new System.Drawing.Point(185, 3); + this.CloseDialogAfterCommit.Name = "CloseDialogAfterCommit"; + this.CloseDialogAfterCommit.Size = new System.Drawing.Size(143, 17); + this.CloseDialogAfterCommit.TabIndex = 0; + this.CloseDialogAfterCommit.Text = "Close dialog after commit"; + this.CloseDialogAfterCommit.UseVisualStyleBackColor = true; + this.CloseDialogAfterCommit.CheckedChanged += new System.EventHandler(this.CloseDialogAfterCommit_CheckedChanged); + // + // CloseCommitDialogTooltip + // + this.CloseCommitDialogTooltip.AutomaticDelay = 1; + this.CloseCommitDialogTooltip.AutoPopDelay = 5000; + this.CloseCommitDialogTooltip.InitialDelay = 1; + this.CloseCommitDialogTooltip.ReshowDelay = 1; + this.CloseCommitDialogTooltip.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info; + // + // fileTooltip + // + this.fileTooltip.AutomaticDelay = 0; + this.fileTooltip.AutoPopDelay = 500; + this.fileTooltip.InitialDelay = 0; + this.fileTooltip.ReshowDelay = 0; + // + // gitItemStatusBindingSource + // + this.gitItemStatusBindingSource.DataSource = typeof(GitCommands.GitItemStatus); + // + // FormCommit + // + this.AcceptButton = this.Commit; + 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(891, 644); + this.Controls.Add(this.splitContainer1); + this.MainMenuStrip = this.menuStrip1; + this.Name = "FormCommit"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "Commit"; + this.Load += new System.EventHandler(this.FormCommit_Load); + this.Shown += new System.EventHandler(this.FormCommit_Shown); + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormCommit_FormClosing); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + this.splitContainer1.ResumeLayout(false); + this.splitContainer2.Panel1.ResumeLayout(false); + this.splitContainer2.Panel2.ResumeLayout(false); + this.splitContainer2.ResumeLayout(false); + this.splitContainer4.Panel1.ResumeLayout(false); + this.splitContainer4.Panel2.ResumeLayout(false); + this.splitContainer4.ResumeLayout(false); + this.tableLayoutPanel5.ResumeLayout(false); + this.tableLayoutPanel5.PerformLayout(); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.Loading)).EndInit(); + this.UnstagedFileContext.ResumeLayout(false); + this.splitContainer5.Panel1.ResumeLayout(false); + this.splitContainer5.Panel2.ResumeLayout(false); + this.splitContainer5.ResumeLayout(false); + this.tableLayoutPanel4.ResumeLayout(false); + this.tableLayoutPanel4.PerformLayout(); + this.menuStrip2.ResumeLayout(false); + this.menuStrip2.PerformLayout(); + this.splitContainer3.Panel1.ResumeLayout(false); + this.splitContainer3.Panel2.ResumeLayout(false); + this.splitContainer3.ResumeLayout(false); + this.tableLayoutPanel6.ResumeLayout(false); + this.tableLayoutPanel2.ResumeLayout(false); + this.tableLayoutPanel7.ResumeLayout(false); + this.tableLayoutPanel3.ResumeLayout(false); + this.tableLayoutPanel3.PerformLayout(); + this.menuStrip3.ResumeLayout(false); + this.menuStrip3.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gitItemStatusBindingSource)).EndInit(); + this.ResumeLayout(false); } diff --git a/GitUI/EditNetSpell.Designer.cs b/GitUI/EditNetSpell.Designer.cs index 9dafbf98f..80160444c 100644 --- a/GitUI/EditNetSpell.Designer.cs +++ b/GitUI/EditNetSpell.Designer.cs @@ -74,7 +74,7 @@ // this.EmptyLabel.BackColor = System.Drawing.SystemColors.Window; this.EmptyLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.EmptyLabel.ForeColor = System.Drawing.SystemColors.GrayText; + this.EmptyLabel.ForeColor = System.Drawing.SystemColors.InactiveCaption; this.EmptyLabel.Location = new System.Drawing.Point(3, 3); this.EmptyLabel.Name = "EmptyLabel"; this.EmptyLabel.Size = new System.Drawing.Size(100, 23); diff --git a/GitUI/FileStatusList.Designer.cs b/GitUI/FileStatusList.Designer.cs index 41c564056..96dd94e7f 100644 --- a/GitUI/FileStatusList.Designer.cs +++ b/GitUI/FileStatusList.Designer.cs @@ -49,11 +49,11 @@ // this.NoFiles.BackColor = System.Drawing.SystemColors.Window; this.NoFiles.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.NoFiles.ForeColor = System.Drawing.SystemColors.GrayText; + this.NoFiles.ForeColor = System.Drawing.SystemColors.InactiveCaption; this.NoFiles.Location = new System.Drawing.Point(5, 5); this.NoFiles.Margin = new System.Windows.Forms.Padding(0); this.NoFiles.Name = "NoFiles"; - this.NoFiles.Size = new System.Drawing.Size(104, 41); + this.NoFiles.Size = new System.Drawing.Size(172, 49); this.NoFiles.TabIndex = 1; this.NoFiles.Text = "No changes"; // diff --git a/GitUI/FileStatusList.cs b/GitUI/FileStatusList.cs index 57e448034..040e9530b 100644 --- a/GitUI/FileStatusList.cs +++ b/GitUI/FileStatusList.cs @@ -17,7 +17,8 @@ namespace GitUI { InitializeComponent(); - FileStatusListBox.DrawMode = DrawMode.OwnerDrawFixed; + FileStatusListBox.DrawMode = DrawMode.OwnerDrawVariable; + FileStatusListBox.MeasureItem += new MeasureItemEventHandler(FileStatusListBox_MeasureItem); FileStatusListBox.DrawItem += new DrawItemEventHandler(FileStatusListBox_DrawItem); FileStatusListBox.SelectedIndexChanged += new EventHandler(FileStatusListBox_SelectedIndexChanged); FileStatusListBox.DoubleClick += new EventHandler(FileStatusListBox_DoubleClick); @@ -29,6 +30,11 @@ namespace GitUI NoFiles.Visible = false; } + void FileStatusListBox_MeasureItem(object sender, MeasureItemEventArgs e) + { + e.ItemHeight = (int)e.Graphics.MeasureString(FileStatusListBox.Items[e.Index].ToString(), FileStatusListBox.Font).Height; + } + public void SetNoFilesText(string text) { NoFiles.Text = text; @@ -243,8 +249,8 @@ namespace GitUI private void NoFiles_SizeChanged(object sender, EventArgs e) { - NoFiles.Location = new Point(3, 3); - NoFiles.Size = new Size(Size.Width - 6, Size.Height - 6); + NoFiles.Location = new Point(5, 5); + NoFiles.Size = new Size(Size.Width - 10, Size.Height - 10); } diff --git a/GitUI/FormMailMap.cs b/GitUI/FormMailMap.cs index dbce5b662..4e4407ad3 100644 --- a/GitUI/FormMailMap.cs +++ b/GitUI/FormMailMap.cs @@ -24,7 +24,6 @@ namespace GitUI using (StreamReader re = new StreamReader(Settings.WorkingDir + ".mailmap", Settings.Encoding)) { MailMapFile = re.ReadToEnd(); - re.Close(); } } MailMapText.Text = MailMapFile; @@ -43,7 +42,6 @@ namespace GitUI using (TextWriter tw = new StreamWriter(Settings.WorkingDir + ".mailmap", false, Settings.Encoding)) { tw.Write(MailMapFile); - tw.Close(); } Close(); }