Mirror
/
GitExtensions
mirror of https://github.com/gitextensions/gitextensions.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fixed FileStatusListBox for large DPI and fixed background texts for Vista.

LibGit2Sharp
Henk Westhuis 16 years ago
parent
fb13f8e770
commit
2870759632
6 changed files with 796 additions and 793 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      GitCommands/GitExtensions/Program.cs
  2. 117
      GitUI/Commit.Designer.cs
  3. 2
      GitUI/EditNetSpell.Designer.cs
  4. 4
      GitUI/FileStatusList.Designer.cs
  5. 12
      GitUI/FileStatusList.cs
  6. 2
      GitUI/FormMailMap.cs

2
GitCommands/GitExtensions/Program.cs
View File

@ -45,7 +45,7 @@ namespace GitExtensions
{
}
if (args.Length == 3)
if (args.Length >= 3)
{
if (Directory.Exists(args[2]))
GitCommands.Settings.WorkingDir = args[2];

117
GitUI/Commit.Designer.cs
View File

@ -48,7 +48,7 @@
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.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();
@ -59,7 +59,6 @@
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();
@ -70,7 +69,7 @@
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.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();
@ -90,6 +89,7 @@
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();
@ -102,15 +102,12 @@
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();
@ -119,6 +116,7 @@
this.tableLayoutPanel7.SuspendLayout();
this.tableLayoutPanel3.SuspendLayout();
this.menuStrip3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gitItemStatusBindingSource)).BeginInit();
this.SuspendLayout();
//
// splitContainer1
@ -137,7 +135,7 @@
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.splitContainer3);
this.splitContainer1.Size = new System.Drawing.Size(895, 648);
this.splitContainer1.Size = new System.Drawing.Size(891, 644);
this.splitContainer1.SplitterDistance = 397;
this.splitContainer1.TabIndex = 0;
//
@ -155,8 +153,8 @@
// splitContainer2.Panel2
//
this.splitContainer2.Panel2.Controls.Add(this.splitContainer5);
this.splitContainer2.Size = new System.Drawing.Size(397, 648);
this.splitContainer2.SplitterDistance = 286;
this.splitContainer2.Size = new System.Drawing.Size(397, 644);
this.splitContainer2.SplitterDistance = 284;
this.splitContainer2.TabIndex = 3;
//
// splitContainer4
@ -176,7 +174,7 @@
//
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.Size = new System.Drawing.Size(397, 284);
this.splitContainer4.SplitterDistance = 25;
this.splitContainer4.SplitterWidth = 1;
this.splitContainer4.TabIndex = 1;
@ -233,13 +231,13 @@
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.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(255, 24);
this.showIgnoredFilesToolStripMenuItem.Size = new System.Drawing.Size(216, 22);
this.showIgnoredFilesToolStripMenuItem.Text = "Show ignored files";
this.showIgnoredFilesToolStripMenuItem.Click += new System.EventHandler(this.showIgnoredFilesToolStripMenuItem_Click);
//
@ -248,52 +246,52 @@
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.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(252, 6);
this.toolStripSeparator3.Size = new System.Drawing.Size(213, 6);
//
// deleteSelectedFilesToolStripMenuItem
//
this.deleteSelectedFilesToolStripMenuItem.Name = "deleteSelectedFilesToolStripMenuItem";
this.deleteSelectedFilesToolStripMenuItem.Size = new System.Drawing.Size(255, 24);
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(255, 24);
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(255, 24);
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(252, 6);
this.toolStripSeparator1.Size = new System.Drawing.Size(213, 6);
//
// eToolStripMenuItem
//
this.eToolStripMenuItem.Name = "eToolStripMenuItem";
this.eToolStripMenuItem.Size = new System.Drawing.Size(255, 24);
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(255, 24);
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);
//
@ -302,7 +300,7 @@
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.Size = new System.Drawing.Size(216, 22);
this.rescanChangesToolStripMenuItem.Text = "Rescan changes";
this.rescanChangesToolStripMenuItem.Click += new System.EventHandler(this.rescanChangesToolStripMenuItem_Click);
//
@ -314,7 +312,7 @@
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.Size = new System.Drawing.Size(397, 258);
this.Loading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
this.Loading.TabIndex = 2;
this.Loading.TabStop = false;
@ -323,9 +321,11 @@
//
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.Size = new System.Drawing.Size(397, 260);
this.Unstaged.SelectedItem = null;
this.Unstaged.Size = new System.Drawing.Size(397, 258);
this.Unstaged.TabIndex = 0;
//
// UnstagedFileContext
@ -341,71 +341,67 @@
this.toolStripSeparator5,
this.filenameToClipboardToolStripMenuItem});
this.UnstagedFileContext.Name = "UnstagedFileContext";
this.UnstagedFileContext.Size = new System.Drawing.Size(225, 184);
this.UnstagedFileContext.Size = new System.Drawing.Size(247, 184);
//
// ResetChanges
//
this.ResetChanges.Name = "ResetChanges";
this.ResetChanges.Size = new System.Drawing.Size(224, 24);
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(224, 24);
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(224, 24);
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(221, 6);
this.toolStripSeparator4.Size = new System.Drawing.Size(243, 6);
//
// openToolStripMenuItem
//
this.openToolStripMenuItem.Name = "openToolStripMenuItem";
this.openToolStripMenuItem.Size = new System.Drawing.Size(224, 24);
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(224, 24);
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(224, 24);
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(221, 6);
this.toolStripSeparator5.Size = new System.Drawing.Size(243, 6);
//
// filenameToClipboardToolStripMenuItem
//
this.filenameToClipboardToolStripMenuItem.Name = "filenameToClipboardToolStripMenuItem";
this.filenameToClipboardToolStripMenuItem.Size = new System.Drawing.Size(224, 24);
this.filenameToClipboardToolStripMenuItem.Size = new System.Drawing.Size(246, 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;
@ -423,7 +419,7 @@
//
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.Size = new System.Drawing.Size(397, 356);
this.splitContainer5.SplitterDistance = 30;
this.splitContainer5.SplitterWidth = 1;
this.splitContainer5.TabIndex = 1;
@ -483,32 +479,32 @@
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.Size = new System.Drawing.Size(91, 20);
this.filesListedToCommitToolStripMenuItem.Text = "Staged files";
//
// stageAllToolStripMenuItem
//
this.stageAllToolStripMenuItem.Name = "stageAllToolStripMenuItem";
this.stageAllToolStripMenuItem.Size = new System.Drawing.Size(201, 24);
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(201, 24);
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(198, 6);
this.toolStripSeparator2.Size = new System.Drawing.Size(171, 6);
//
// stageChunkOfFileToolStripMenuItem
//
this.stageChunkOfFileToolStripMenuItem.Name = "stageChunkOfFileToolStripMenuItem";
this.stageChunkOfFileToolStripMenuItem.Size = new System.Drawing.Size(201, 24);
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);
//
@ -528,11 +524,12 @@
// 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.Size = new System.Drawing.Size(397, 327);
this.Staged.SelectedItem = null;
this.Staged.Size = new System.Drawing.Size(397, 325);
this.Staged.TabIndex = 0;
//
// Cancel
//
@ -571,8 +568,8 @@
//
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.Size = new System.Drawing.Size(490, 644);
this.splitContainer3.SplitterDistance = 506;
this.splitContainer3.TabIndex = 0;
//
// SolveMergeconflicts
@ -596,12 +593,12 @@
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.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(494, 510);
this.SelectedDiff.Size = new System.Drawing.Size(490, 506);
this.SelectedDiff.TabIndex = 0;
this.SelectedDiff.TreatAllFilesAsText = false;
//
@ -618,7 +615,7 @@
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.Size = new System.Drawing.Size(490, 134);
this.tableLayoutPanel6.TabIndex = 2;
//
// tableLayoutPanel2
@ -716,8 +713,8 @@
//
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.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;
@ -755,7 +752,7 @@
//
this.commitMessageToolStripMenuItem.Image = global::GitUI.Properties.Resources._89;
this.commitMessageToolStripMenuItem.Name = "commitMessageToolStripMenuItem";
this.commitMessageToolStripMenuItem.Size = new System.Drawing.Size(152, 26);
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);
@ -766,7 +763,7 @@
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.Size = new System.Drawing.Size(143, 17);
this.CloseDialogAfterCommit.TabIndex = 0;
this.CloseDialogAfterCommit.Text = "Close dialog after commit";
this.CloseDialogAfterCommit.UseVisualStyleBackColor = true;
@ -787,13 +784,17 @@
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(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);
this.ClientSize = new System.Drawing.Size(891, 644);
this.Controls.Add(this.splitContainer1);
this.MainMenuStrip = this.menuStrip1;
this.Name = "FormCommit";
@ -816,9 +817,7 @@
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);
@ -826,7 +825,6 @@
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);
@ -837,6 +835,7 @@
this.tableLayoutPanel3.PerformLayout();
this.menuStrip3.ResumeLayout(false);
this.menuStrip3.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.gitItemStatusBindingSource)).EndInit();
this.ResumeLayout(false);
}

2
GitUI/EditNetSpell.Designer.cs
View File

@ -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);

4
GitUI/FileStatusList.Designer.cs
View File

@ -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";
//

12
GitUI/FileStatusList.cs
View File

@ -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);
}

2
GitUI/FormMailMap.cs
View File

@ -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();
}

Write Preview
Loading…
Cancel
Save