Skip to content
Browse files

Finishing changes

  • Loading branch information...
1 parent 33f0bc7 commit 943d230ba465d86c3ad2cd00f7e8c508d144d9a5 Henk Westhuis committed Dec 15, 2008
View
BIN GitPlugin/Connect.cs
Binary file not shown.
View
214 GitUI/Browse.Designer.cs
@@ -31,6 +31,16 @@ private void InitializeComponent()
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormBrowse));
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
+ this.ToolStrip = new System.Windows.Forms.ToolStrip();
+ this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
+ this.Workingdir = new System.Windows.Forms.ToolStripButton();
+ this.CurrentBranch = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
+ this.AddFiles = new System.Windows.Forms.ToolStripButton();
+ this.CreateBranch = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+ this.GitBash = new System.Windows.Forms.ToolStripButton();
this.splitContainer3 = new System.Windows.Forms.SplitContainer();
this.tabControl2 = new System.Windows.Forms.TabControl();
this.Commits = new System.Windows.Forms.TabPage();
@@ -75,20 +85,11 @@ private void InitializeComponent()
this.gitcommandLogToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.gitRevisionBindingSource = new System.Windows.Forms.BindingSource(this.components);
- this.ToolStrip = new System.Windows.Forms.ToolStrip();
- this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
- this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
- this.Workingdir = new System.Windows.Forms.ToolStripButton();
- this.CurrentBranch = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.RevisionGrid = new GitUI.RevisionGrid();
- this.AddFiles = new System.Windows.Forms.ToolStripButton();
- this.GitBash = new System.Windows.Forms.ToolStripButton();
- this.CreateBranch = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.splitContainer2.Panel1.SuspendLayout();
this.splitContainer2.Panel2.SuspendLayout();
this.splitContainer2.SuspendLayout();
+ this.ToolStrip.SuspendLayout();
this.splitContainer3.Panel1.SuspendLayout();
this.splitContainer3.Panel2.SuspendLayout();
this.splitContainer3.SuspendLayout();
@@ -104,7 +105,6 @@ private void InitializeComponent()
this.tabPage1.SuspendLayout();
this.menuStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gitRevisionBindingSource)).BeginInit();
- this.ToolStrip.SuspendLayout();
this.SuspendLayout();
//
// splitContainer2
@@ -128,6 +128,96 @@ private void InitializeComponent()
this.splitContainer2.TabIndex = 2;
this.splitContainer2.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.splitContainer2_SplitterMoved);
//
+ // ToolStrip
+ //
+ this.ToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.toolStripLabel1,
+ this.Workingdir,
+ this.CurrentBranch,
+ this.toolStripSeparator1,
+ this.toolStripButton1,
+ this.AddFiles,
+ this.CreateBranch,
+ this.toolStripSeparator2,
+ this.GitBash});
+ this.ToolStrip.Location = new System.Drawing.Point(0, 0);
+ this.ToolStrip.Name = "ToolStrip";
+ this.ToolStrip.Size = new System.Drawing.Size(750, 25);
+ this.ToolStrip.TabIndex = 4;
+ this.ToolStrip.Text = "toolStrip1";
+ //
+ // toolStripLabel1
+ //
+ this.toolStripLabel1.Name = "toolStripLabel1";
+ this.toolStripLabel1.Size = new System.Drawing.Size(0, 22);
+ //
+ // Workingdir
+ //
+ this.Workingdir.Image = ((System.Drawing.Image)(resources.GetObject("Workingdir.Image")));
+ this.Workingdir.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.Workingdir.Name = "Workingdir";
+ this.Workingdir.Size = new System.Drawing.Size(87, 22);
+ this.Workingdir.Text = "WorkingDir";
+ this.Workingdir.Click += new System.EventHandler(this.Workingdir_Click_1);
+ //
+ // CurrentBranch
+ //
+ this.CurrentBranch.Image = ((System.Drawing.Image)(resources.GetObject("CurrentBranch.Image")));
+ this.CurrentBranch.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.CurrentBranch.Name = "CurrentBranch";
+ this.CurrentBranch.Size = new System.Drawing.Size(64, 22);
+ this.CurrentBranch.Text = "Branch";
+ this.CurrentBranch.ToolTipText = "Current branch";
+ this.CurrentBranch.Click += new System.EventHandler(this.CurrentBranch_Click_1);
+ //
+ // toolStripSeparator1
+ //
+ this.toolStripSeparator1.Name = "toolStripSeparator1";
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25);
+ //
+ // toolStripButton1
+ //
+ this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
+ this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButton1.Name = "toolStripButton1";
+ this.toolStripButton1.Size = new System.Drawing.Size(71, 22);
+ this.toolStripButton1.Text = "Commit";
+ this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
+ //
+ // AddFiles
+ //
+ this.AddFiles.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.AddFiles.Image = ((System.Drawing.Image)(resources.GetObject("AddFiles.Image")));
+ this.AddFiles.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.AddFiles.Name = "AddFiles";
+ this.AddFiles.Size = new System.Drawing.Size(23, 22);
+ this.AddFiles.Text = "Add files";
+ this.AddFiles.Click += new System.EventHandler(this.AddFiles_Click);
+ //
+ // CreateBranch
+ //
+ this.CreateBranch.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.CreateBranch.Image = ((System.Drawing.Image)(resources.GetObject("CreateBranch.Image")));
+ this.CreateBranch.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.CreateBranch.Name = "CreateBranch";
+ this.CreateBranch.Size = new System.Drawing.Size(23, 22);
+ this.CreateBranch.Text = "Create branch";
+ this.CreateBranch.Click += new System.EventHandler(this.CreateBranch_Click);
+ //
+ // toolStripSeparator2
+ //
+ this.toolStripSeparator2.Name = "toolStripSeparator2";
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25);
+ //
+ // GitBash
+ //
+ this.GitBash.Image = ((System.Drawing.Image)(resources.GetObject("GitBash.Image")));
+ this.GitBash.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.GitBash.Name = "GitBash";
+ this.GitBash.Size = new System.Drawing.Size(70, 22);
+ this.GitBash.Text = "Git bash";
+ this.GitBash.Click += new System.EventHandler(this.GitBash_Click);
+ //
// splitContainer3
//
this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -174,7 +264,7 @@ private void InitializeComponent()
this.tabPage4.Location = new System.Drawing.Point(4, 22);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage4.Size = new System.Drawing.Size(742, 180);
+ this.tabPage4.Size = new System.Drawing.Size(742, 191);
this.tabPage4.TabIndex = 1;
this.tabPage4.Text = "File changes";
this.tabPage4.UseVisualStyleBackColor = true;
@@ -195,7 +285,7 @@ private void InitializeComponent()
this.FileChanges.ReadOnly = true;
this.FileChanges.RowHeadersVisible = false;
this.FileChanges.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
- this.FileChanges.Size = new System.Drawing.Size(736, 174);
+ this.FileChanges.Size = new System.Drawing.Size(736, 185);
this.FileChanges.TabIndex = 0;
this.FileChanges.SelectionChanged += new System.EventHandler(this.FileChanges_SelectionChanged);
this.FileChanges.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.FileChanges_CellContentClick);
@@ -484,14 +574,14 @@ private void InitializeComponent()
// gitBashToolStripMenuItem
//
this.gitBashToolStripMenuItem.Name = "gitBashToolStripMenuItem";
- this.gitBashToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.gitBashToolStripMenuItem.Size = new System.Drawing.Size(117, 22);
this.gitBashToolStripMenuItem.Text = "Git bash";
this.gitBashToolStripMenuItem.Click += new System.EventHandler(this.gitBashToolStripMenuItem_Click_1);
//
// gitGUIToolStripMenuItem
//
this.gitGUIToolStripMenuItem.Name = "gitGUIToolStripMenuItem";
- this.gitGUIToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.gitGUIToolStripMenuItem.Size = new System.Drawing.Size(117, 22);
this.gitGUIToolStripMenuItem.Text = "Git GUI";
this.gitGUIToolStripMenuItem.Click += new System.EventHandler(this.gitGUIToolStripMenuItem_Click);
//
@@ -522,62 +612,6 @@ private void InitializeComponent()
//
this.gitRevisionBindingSource.DataSource = typeof(GitCommands.GitRevision);
//
- // ToolStrip
- //
- this.ToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.toolStripLabel1,
- this.Workingdir,
- this.CurrentBranch,
- this.toolStripSeparator1,
- this.toolStripButton1,
- this.AddFiles,
- this.CreateBranch,
- this.toolStripSeparator2,
- this.GitBash});
- this.ToolStrip.Location = new System.Drawing.Point(0, 0);
- this.ToolStrip.Name = "ToolStrip";
- this.ToolStrip.Size = new System.Drawing.Size(750, 25);
- this.ToolStrip.TabIndex = 4;
- this.ToolStrip.Text = "toolStrip1";
- //
- // toolStripLabel1
- //
- this.toolStripLabel1.Name = "toolStripLabel1";
- this.toolStripLabel1.Size = new System.Drawing.Size(0, 22);
- //
- // toolStripButton1
- //
- this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
- this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButton1.Name = "toolStripButton1";
- this.toolStripButton1.Size = new System.Drawing.Size(71, 22);
- this.toolStripButton1.Text = "Commit";
- this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
- //
- // Workingdir
- //
- this.Workingdir.Image = ((System.Drawing.Image)(resources.GetObject("Workingdir.Image")));
- this.Workingdir.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.Workingdir.Name = "Workingdir";
- this.Workingdir.Size = new System.Drawing.Size(87, 22);
- this.Workingdir.Text = "WorkingDir";
- this.Workingdir.Click += new System.EventHandler(this.Workingdir_Click_1);
- //
- // CurrentBranch
- //
- this.CurrentBranch.Image = ((System.Drawing.Image)(resources.GetObject("CurrentBranch.Image")));
- this.CurrentBranch.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.CurrentBranch.Name = "CurrentBranch";
- this.CurrentBranch.Size = new System.Drawing.Size(64, 22);
- this.CurrentBranch.Text = "Branch";
- this.CurrentBranch.ToolTipText = "Current branch";
- this.CurrentBranch.Click += new System.EventHandler(this.CurrentBranch_Click_1);
- //
- // toolStripSeparator1
- //
- this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25);
- //
// RevisionGrid
//
this.RevisionGrid.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -590,40 +624,6 @@ private void InitializeComponent()
this.RevisionGrid.DoubleClick += new System.EventHandler(this.RevisionGrid_DoubleClick);
this.RevisionGrid.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.RevisionGrid_MouseDoubleClick);
//
- // AddFiles
- //
- this.AddFiles.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.AddFiles.Image = ((System.Drawing.Image)(resources.GetObject("AddFiles.Image")));
- this.AddFiles.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.AddFiles.Name = "AddFiles";
- this.AddFiles.Size = new System.Drawing.Size(23, 22);
- this.AddFiles.Text = "Add files";
- this.AddFiles.Click += new System.EventHandler(this.AddFiles_Click);
- //
- // GitBash
- //
- this.GitBash.Image = ((System.Drawing.Image)(resources.GetObject("GitBash.Image")));
- this.GitBash.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.GitBash.Name = "GitBash";
- this.GitBash.Size = new System.Drawing.Size(70, 22);
- this.GitBash.Text = "Git bash";
- this.GitBash.Click += new System.EventHandler(this.GitBash_Click);
- //
- // CreateBranch
- //
- this.CreateBranch.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.CreateBranch.Image = ((System.Drawing.Image)(resources.GetObject("CreateBranch.Image")));
- this.CreateBranch.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.CreateBranch.Name = "CreateBranch";
- this.CreateBranch.Size = new System.Drawing.Size(23, 22);
- this.CreateBranch.Text = "Create branch";
- this.CreateBranch.Click += new System.EventHandler(this.CreateBranch_Click);
- //
- // toolStripSeparator2
- //
- this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25);
- //
// FormBrowse
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -640,6 +640,8 @@ private void InitializeComponent()
this.splitContainer2.Panel1.PerformLayout();
this.splitContainer2.Panel2.ResumeLayout(false);
this.splitContainer2.ResumeLayout(false);
+ this.ToolStrip.ResumeLayout(false);
+ this.ToolStrip.PerformLayout();
this.splitContainer3.Panel1.ResumeLayout(false);
this.splitContainer3.Panel2.ResumeLayout(false);
this.splitContainer3.ResumeLayout(false);
@@ -656,8 +658,6 @@ private void InitializeComponent()
this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.gitRevisionBindingSource)).EndInit();
- this.ToolStrip.ResumeLayout(false);
- this.ToolStrip.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
View
55 GitUI/Browse.resx
@@ -146,43 +146,43 @@
<data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAfpJREFUOE+NkktI
- G1EYhSdZuNFVqQsFEaFYMBjElbYuKoi6UbD4GF2IEo2JaAVf4IOQGBNEAj5AfAU0C8EXKNLqonQdWsVi
- QqUlBBcGFxIEBQVFcpwzJKOTaPHCIff+5ztnhsnVCHGrZj0nSZusNQrQVAtaoVC2I4JX0GAzch1Z2Kg9
- vovPKOe63Vxjw14enP42rITH8Q2LsrjnjB6ZZwtqv+raDT8+Yu1yAmtwYRlWuDEgi3vO6JEhqyrha7N9
- 9WICS/dWzN32YDZOnNEjQ5YZpeTztq5r9KgFnpsRTF91YuqqI0GGn0WgyJBlRimo3tJ53ac2TF10YTzc
- miAGY4sMWWaUgoqdd3eecwccoWb5KTHZQ43y/uki4wk7wYyqwH1mgyUoquD48FCwBpYTEYshq/Qhs6+V
- gqrN97+nA/0YDojo+VupKokdOKfIkGVGKSidyRyx/GqE/Z8BX3zl6PSVqkp4puiRIcvM41/5VkgT9/SY
- PO5Fr68KpoNiGA8+ySX8pTijR4asIGWe3oWkYleGrel7AVx/ujFwJMK8X6J8TO45o0eGrBR+vAfRppQP
- 9vQxtg966+E4NMHhN2PUb4Lz0CzP6JGR+JTnrrMmaujz+1Ld5XOZAene8+6jbD4ryJnk66MM2RcXX+2N
- pCxJOVFxz1nCa/+v6FXeAwslwLNsAKojAAAAAElFTkSuQmCC
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAftJREFUOE+NkktI
+ G1EYhSdZuNFVqQsFEbuwYDCIK21dVBB1IYLFx+hClGhMRCv4Ah+ExJggEvAB4iugWQi+QJFWF6Xr0CoW
+ EyotIbgwuJAgKCgokuOcIRmdRIsXDrn3P985M0yuRohbNes5SdpkrVGAplrQCoWyHRG8ggabkevIwkbt
+ 8V18RjnX7eYaG/by4PS3YSU8jm9YlMU9Z/TIPFtQ+1XXbvjxEWuXE1iDC8uwwo0BWdxzRo8MWVUJX5vt
+ qxcTWLq3Yu62B7Nx4oweGbLMKCWft3Vdo0ct8NyMYPqqE1NXHQky/CwCRYYsM0pB9ZbO6z61YeqiC+Ph
+ 1gQxGFtkyDKjFFTsvLvznDvgCDXLT4nJHmqU908XGU/YCWZUBe4zGyxBUQXHh4eCNbCciFgMWaUPmX2t
+ FFRtvv89HejHcEBEz99KVUnswDlFhiwzSkHpTOaI5Vcj7P8M+OIrR6evVFXCM0WPDFlmHv/Kt0KauKfH
+ 5HEven1VMB0Uw3jwSS7hL8UZPTJkBSnz9C4kFbsybE3fC+D6042BIxHm/RLlY3LPGT0yZKXw4z2INqV8
+ sKePsX3QWw/HoQkOvxmjfhOch2Z5Ro+MxKc8d501UUOf35fqLp/LDEj3nncfZfNZQc4kXx9lyL64+Gpv
+ JGVJyomKe84SXvt/Ra/yHgD11MCqUT7z4wAAAABJRU5ErkJggg==
</value>
</data>
<data name="AddFiles.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAfxJREFUOE+Nkj9I
- W1EYxV8cXHQSHRSK6KaxoXRqawcFkUyCkujTQVrSxkS0gv/AP4TEmCAS8A9IxQQ0Q6G2Dg62DtI5tIpi
- QqUSgoOhQwlCBQsV8XjPI+9qYhQvnMd3v/P7zru8dw1K1rJ+qs7PK8izK4rBohiU55oNJSIea5dnl0uf
- Ww/Os2fkvu3rY3vH5hP4Y134kJrGFwQ1sWaPHpmcAa0bxm7bt1qs/p3BKgJYgRshjGhizR49MmQzQnhs
- pn88mcHyhRuL/wfwXsj2/aUm1uzRI0OWMzKkZd3YN7n/BuF/E5g/7cXcaY8mfel7emTIckYGWNaNkdCx
- B3MnfZhOvZVv1gP0k9AjQ5YzMsC6UXMe/uODL/ka3mSnfHN2QY9MOOUHZzICQr89cCVUjCWsdwbQcx2p
- CCbd/JBnMqB5rWpvPj6M8biKgV9NUnrSzR4ZspyRAY0L5ROuH53wHtrwLmpGb7RRk770PT0yZDlz/SuL
- lVJ104TZg0EMRpvh2KmHfacuQ+zRI0NWETM370J+feCR59XWMwR+9mNkX4Vzu0H+Ddbs0SNDVgxf34N0
- UuELb9kU00cj7fDtOuCLOTEZc8C/69R69MgIvjDXdTakDdPToZKQeakyLu497z7MwcoEe8I3pRmydy4e
- rUioQqg6Ldbs3Tr2fUEP8q4A99G+zKyZqQ4AAAAASUVORK5CYII=
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgBJREFUOE+Nkk9I
+ k2Ecx9/tsEueRA8FUp7CDUd0sj+HBmKeBHXqa4dhrNYWmZAazGJszg2RgX8gNB3oDkKmUITlQTyPSgw3
+ GsUYHRodYggKBkns2/N92fvo5hY98IXf8/t+ft/n4X0fg1Kyul6aTcYzRpcCg10xKlc0O6/EFQPW8of5
+ +dXu1FHpjNz3vGt03dq4hHDyHpZzE3iLBU2s2aNHpmxA97rlvnPrGlb2J7GCCJbgRxReTazZo0eGbFEI
+ r830F3uTWPzjx9zvQcwKOd9f18SaPXpkyHJGhnS8tgyM7d5B7NcoZg76MX3wQJO+9D09MmQ5IwPsryzx
+ 6PcApvcGMJG7K0/WA/Sb0CNDljMyoPON+Sj2M4RQ9jaCWYc8ubSgRyaWC4MzRQHRHwH4MiqeZLoqBtDz
+ fVOxkPWLD9lwKAPa1y5+mkk/xtO0isEvbVJ60skeGbKckQEtz86P+j44EPzqxMNEK/oTLZr0pe/pkSHL
+ meNfWaOcVTesmEoNYSjRDve2Da7tG0Vijx4ZsoqYOfkWTLZIXaBvswmRz4/g3VXh+dgs/wZr9uiRISuG
+ j99BIanqavDcONNH4r0I7bgRSnowlnQjvOPRevTICL6q3HM2FAzr5eHaaOvchbR493z7uPm8PsOe8K0F
+ hmzFxatVC9ULmQtizd6pa/8r6L+8v61Xv6rIyUQtAAAAAElFTkSuQmCC
</value>
</data>
<data name="CreateBranch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAUJJREFUOE+dkrFK
- A0EQhjf1vYW9vc8RMcJFMBEuriZBkIQggkZEUOwVKy0sFGJlYWFlo/cCggghBnJTiEVECw3o786RXc7L
- sRedY7i9Xf7v/tmZjFCx6dcPMkIs8ToaEOJwa2p/Ob4/8t3060gK3mf42AAWRJOhY0G0A36rv01yRl2l
- QmKA0LHe+8R7WJ0VEgXES9ilGl4R2CGyVTiNX+QXBtijBnaoim2q4Bn3VohTOJ4915AXPKJJZWyQxDot
- Yo1KKj084NYOyR9lLzSkDR81KmJV5QrNo6qyTHnc4MpAktrraAiXcIdryMCF7LkodXPwnnKoBHP4Vs+w
- Y4kjYiAf6ONy0MJCZxrFdhay6+INFIr53mwDZiAsOOufwOvMqG70QjG7VGInbUJ/OWE3fxFruIH8R2wg
- ajExzFTbaWWNnP8AjSR8MjY97JoAAAAASUVORK5CYII=
+ A0EQhjf1vYW9vc8RMcJFMBEuriZBkIQggkZEUOwVG7GwUIiVhYWVjd4LCCKEGMhNIRYRLTSgvztHdjkv
+ x150juH2dvm/+2dnMkLFpl8/yAixxOtoQIjDran95fj+yHfTryMpeJ/hYwNYEE2GjgXRDvit/jbJGXWV
+ CokBQsd67xPvYXVWSBQQL2GXanhFYIfIVuE0fpFfGGCPGtihKrapgmfcWyFO4Xj2XENe8IgmlbFBEuu0
+ iDUqqfTwgFs7JH+UvdCQNnzUqIhVlSs0j6rKMuVxgysDSWqvoyFcwh2uIQMXsuei1M3Be8qhEszhWz3D
+ jiWOiIF8oI/LQQsLnWkU21nIros3UCjme7MNmIGw4Kx/Aq8zo7rRC8XsUomdtAn95YTd/EWs4QbyH7GB
+ qMXEMFNtp5U1cv4DiuV8Mf39RXQAAAAASUVORK5CYII=
</value>
</data>
<data name="GitBash.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -198,9 +198,6 @@
<metadata name="gitItemBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>322, 17</value>
</metadata>
- <metadata name="gitItemBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>322, 17</value>
- </metadata>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>207, 17</value>
</metadata>
View
46 GitUI/FormDiff.Designer.cs
@@ -30,18 +30,13 @@ private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDiff));
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
- this.splitContainer2 = new System.Windows.Forms.SplitContainer();
- this.button1 = new System.Windows.Forms.Button();
this.splitContainer3 = new System.Windows.Forms.SplitContainer();
this.DiffFiles = new System.Windows.Forms.ListBox();
this.DiffText = new ICSharpCode.TextEditor.TextEditorControl();
this.RevisionGrid = new GitUI.RevisionGrid();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
- this.splitContainer2.Panel1.SuspendLayout();
- this.splitContainer2.Panel2.SuspendLayout();
- this.splitContainer2.SuspendLayout();
this.splitContainer3.Panel1.SuspendLayout();
this.splitContainer3.Panel2.SuspendLayout();
this.splitContainer3.SuspendLayout();
@@ -56,7 +51,7 @@ private void InitializeComponent()
//
// splitContainer1.Panel1
//
- this.splitContainer1.Panel1.Controls.Add(this.splitContainer2);
+ this.splitContainer1.Panel1.Controls.Add(this.RevisionGrid);
//
// splitContainer1.Panel2
//
@@ -65,34 +60,6 @@ private void InitializeComponent()
this.splitContainer1.SplitterDistance = 205;
this.splitContainer1.TabIndex = 0;
//
- // splitContainer2
- //
- this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
- this.splitContainer2.Location = new System.Drawing.Point(0, 0);
- this.splitContainer2.Name = "splitContainer2";
- //
- // splitContainer2.Panel1
- //
- this.splitContainer2.Panel1.Controls.Add(this.RevisionGrid);
- //
- // splitContainer2.Panel2
- //
- this.splitContainer2.Panel2.Controls.Add(this.button1);
- this.splitContainer2.Size = new System.Drawing.Size(750, 205);
- this.splitContainer2.SplitterDistance = 664;
- this.splitContainer2.TabIndex = 2;
- //
- // button1
- //
- this.button1.Location = new System.Drawing.Point(3, 3);
- this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(75, 28);
- this.button1.TabIndex = 0;
- this.button1.Text = "Show";
- this.button1.UseVisualStyleBackColor = true;
- this.button1.Click += new System.EventHandler(this.button1_Click);
- //
// splitContainer3
//
this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -134,9 +101,11 @@ private void InitializeComponent()
// RevisionGrid
//
this.RevisionGrid.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.RevisionGrid.HeadFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold);
this.RevisionGrid.Location = new System.Drawing.Point(0, 0);
this.RevisionGrid.Name = "RevisionGrid";
- this.RevisionGrid.Size = new System.Drawing.Size(664, 205);
+ this.RevisionGrid.NormalFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.RevisionGrid.Size = new System.Drawing.Size(750, 205);
this.RevisionGrid.TabIndex = 1;
this.RevisionGrid.SelectionChanged += new System.EventHandler(this.RevisionGrid_SelectionChanged);
//
@@ -153,9 +122,6 @@ private void InitializeComponent()
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.splitContainer3.Panel1.ResumeLayout(false);
this.splitContainer3.Panel2.ResumeLayout(false);
this.splitContainer3.ResumeLayout(false);
@@ -166,11 +132,9 @@ private void InitializeComponent()
#endregion
private System.Windows.Forms.SplitContainer splitContainer1;
- private System.Windows.Forms.Button button1;
private ICSharpCode.TextEditor.TextEditorControl DiffText;
- private RevisionGrid RevisionGrid;
- private System.Windows.Forms.SplitContainer splitContainer2;
private System.Windows.Forms.SplitContainer splitContainer3;
private System.Windows.Forms.ListBox DiffFiles;
+ private RevisionGrid RevisionGrid;
}
}
View
8 GitUI/FormDiff.cs
@@ -20,6 +20,14 @@ public FormDiff()
EditorOptions.SetSyntax(DiffText, "output.cs");
}
+ public FormDiff(GitRevision revision)
+ {
+ InitializeComponent();
+ EditorOptions.SetSyntax(DiffText, "output.cs");
+
+ RevisionGrid.SetSelectedRevision( revision);
+ }
+
private void label1_Click(object sender, EventArgs e)
{
View
2 GitUI/MergePatch.cs
@@ -136,7 +136,7 @@ private void MergePatch_FormClosing(object sender, FormClosingEventArgs e)
{
if (Directory.Exists(GitCommands.Settings.WorkingDir + ".git\\rebase-apply\\"))
{
- if (MessageBox.Show("You are in the middle of a patch apply. You need to resolve, skip or abort this patch.\nAre you sure to exit now?", "Exit", MessageBoxButtons.YesNo) == DialogResult.Yes)
+ if (MessageBox.Show("You are in the middle of a patch apply. You need to resolve, skip or abort this patch.\nAre you sure to exit now?", "Exit", MessageBoxButtons.YesNo) == DialogResult.No)
{
e.Cancel = true;
}
View
2 GitUI/RevisionGrid.Designer.cs
@@ -71,6 +71,8 @@ private void InitializeComponent()
this.Revisions.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.Revisions.Size = new System.Drawing.Size(585, 204);
this.Revisions.TabIndex = 0;
+ this.Revisions.DoubleClick += new System.EventHandler(this.Revisions_DoubleClick);
+ this.Revisions.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.Revisions_CellContentClick);
//
// Graph
//
View
34 GitUI/RevisionGrid.cs
@@ -16,20 +16,33 @@ public partial class RevisionGrid : UserControl
public RevisionGrid()
{
InitializeComponent();
- RefreshRevisions();
Revisions.SelectionChanged += new EventHandler(Revisions_SelectionChanged);
NormalFont = Revisions.Font;
HeadFont = new Font(NormalFont, FontStyle.Bold);
-
-
+ RefreshRevisions();
}
public Font NormalFont { get; set; }
public Font HeadFont { get; set; }
public event EventHandler SelectionChanged;
+ public void SetSelectedRevision(GitRevision revision)
+ {
+ Revisions.ClearSelection();
+
+ if (revision != null)
+ {
+ foreach (DataGridViewRow row in Revisions.Rows)
+ {
+ if (((GitRevision)row.DataBoundItem).Guid == revision.Guid)
+ row.Selected = true;
+ }
+ }
+ Revisions.Select();
+ }
+
void Revisions_SelectionChanged(object sender, EventArgs e)
{
if (SelectionChanged != null)
@@ -64,6 +77,7 @@ public void RefreshRevisions()
Revisions.DataSource = revisions;
Revisions.CellPainting += new DataGridViewCellPaintingEventHandler(Revisions_CellPainting);
+
int height = Revisions.RowTemplate.Height;
int width = 8;
int y = -height;
@@ -295,5 +309,19 @@ void Revisions_CellPainting(object sender, DataGridViewCellPaintingEventArgs e)
}
}
+
+ private void Revisions_DoubleClick(object sender, EventArgs e)
+ {
+ List<GitRevision> r = GetRevisions();
+ if (r.Count > 0)
+ new FormDiff(r[0]).ShowDialog();
+ else
+ new FormDiff().ShowDialog();
+ }
+
+ private void Revisions_CellContentClick(object sender, DataGridViewCellEventArgs e)
+ {
+
+ }
}
}

0 comments on commit 943d230

Please sign in to comment.
Something went wrong with that request. Please try again.