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

employename 

Signed-off-by: Henk Westhuis <henk_westhuis@hotmail.com>
pull/198/head
Henk Westhuis 17 years ago
committed by Henk Westhuis
parent
77aa51fa41
commit
a4dffa837e
5 changed files with 95 additions and 52 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. 69
      GitUI/ApplyPatch.Designer.cs
  2. 8
      GitUI/ApplyPatch.cs
  3. 55
      GitUI/ApplyPatch.resx
  4. 8
      GitUI/MergePatch.Designer.cs
  5. 7
      GitUI/MergePatch.cs

69
GitUI/ApplyPatch.Designer.cs
View File

@ -34,11 +34,8 @@
this.splitContainer5 = new System.Windows.Forms.SplitContainer();
this.GridChangedFiles = new System.Windows.Forms.DataGridView();
this.FileNameA = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.typeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Rate = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.File = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Apply = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.patchBindingSource = new System.Windows.Forms.BindingSource(this.components);
this.ChangesList = new System.Windows.Forms.RichTextBox();
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
this.FileToPatchEdit = new ICSharpCode.TextEditor.TextEditorControl();
@ -55,6 +52,10 @@
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.File = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.typeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.patchBindingSource = new System.Windows.Forms.BindingSource(this.components);
this.ApplyPatch = new System.Windows.Forms.Button();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
@ -62,7 +63,6 @@
this.splitContainer5.Panel2.SuspendLayout();
this.splitContainer5.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.GridChangedFiles)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.patchBindingSource)).BeginInit();
this.splitContainer2.Panel1.SuspendLayout();
this.splitContainer2.Panel2.SuspendLayout();
this.splitContainer2.SuspendLayout();
@ -71,6 +71,7 @@
this.splitContainer4.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.changedFileBindingSource)).BeginInit();
this.toolStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.patchBindingSource)).BeginInit();
this.SuspendLayout();
//
// splitContainer1
@ -140,14 +141,6 @@
this.FileNameA.Name = "FileNameA";
this.FileNameA.ReadOnly = true;
//
// typeDataGridViewTextBoxColumn
//
this.typeDataGridViewTextBoxColumn.DataPropertyName = "Type";
this.typeDataGridViewTextBoxColumn.HeaderText = "Change";
this.typeDataGridViewTextBoxColumn.Name = "typeDataGridViewTextBoxColumn";
this.typeDataGridViewTextBoxColumn.ReadOnly = true;
this.typeDataGridViewTextBoxColumn.Width = 70;
//
// Rate
//
this.Rate.DataPropertyName = "Rate";
@ -156,14 +149,6 @@
this.Rate.ReadOnly = true;
this.Rate.Width = 50;
//
// File
//
this.File.DataPropertyName = "File";
this.File.HeaderText = "Type";
this.File.Name = "File";
this.File.ReadOnly = true;
this.File.Width = 50;
//
// Apply
//
this.Apply.DataPropertyName = "Apply";
@ -171,10 +156,6 @@
this.Apply.Name = "Apply";
this.Apply.Width = 50;
//
// patchBindingSource
//
this.patchBindingSource.DataSource = typeof(PatchApply.Patch);
//
// ChangesList
//
this.ChangesList.Dock = System.Windows.Forms.DockStyle.Fill;
@ -235,6 +216,7 @@
//
// splitContainer4.Panel1
//
this.splitContainer4.Panel1.Controls.Add(this.ApplyPatch);
this.splitContainer4.Panel1.Controls.Add(this.ApplyToDir);
this.splitContainer4.Panel1.Controls.Add(this.LoadButton);
this.splitContainer4.Panel1.Controls.Add(this.BrowsePatch);
@ -262,11 +244,11 @@
//
// LoadButton
//
this.LoadButton.Location = new System.Drawing.Point(418, 55);
this.LoadButton.Location = new System.Drawing.Point(418, 56);
this.LoadButton.Name = "LoadButton";
this.LoadButton.Size = new System.Drawing.Size(68, 23);
this.LoadButton.Size = new System.Drawing.Size(76, 23);
this.LoadButton.TabIndex = 6;
this.LoadButton.Text = "Load";
this.LoadButton.Text = "Load patch";
this.LoadButton.UseVisualStyleBackColor = true;
this.LoadButton.Click += new System.EventHandler(this.LoadButton_Click);
//
@ -344,6 +326,36 @@
this.toolStripButton2.Text = "toolStripButton2";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
//
// File
//
this.File.DataPropertyName = "File";
this.File.HeaderText = "Type";
this.File.Name = "File";
this.File.ReadOnly = true;
this.File.Width = 50;
//
// typeDataGridViewTextBoxColumn
//
this.typeDataGridViewTextBoxColumn.DataPropertyName = "Type";
this.typeDataGridViewTextBoxColumn.HeaderText = "Change";
this.typeDataGridViewTextBoxColumn.Name = "typeDataGridViewTextBoxColumn";
this.typeDataGridViewTextBoxColumn.ReadOnly = true;
this.typeDataGridViewTextBoxColumn.Width = 70;
//
// patchBindingSource
//
this.patchBindingSource.DataSource = typeof(PatchApply.Patch);
//
// ApplyPatch
//
this.ApplyPatch.Location = new System.Drawing.Point(500, 56);
this.ApplyPatch.Name = "ApplyPatch";
this.ApplyPatch.Size = new System.Drawing.Size(75, 23);
this.ApplyPatch.TabIndex = 9;
this.ApplyPatch.Text = "Apply patch";
this.ApplyPatch.UseVisualStyleBackColor = true;
this.ApplyPatch.Click += new System.EventHandler(this.ApplyPatch_Click);
//
// ViewPatch
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -363,7 +375,6 @@
this.splitContainer5.Panel2.ResumeLayout(false);
this.splitContainer5.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.GridChangedFiles)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.patchBindingSource)).EndInit();
this.splitContainer2.Panel1.ResumeLayout(false);
this.splitContainer2.Panel2.ResumeLayout(false);
this.splitContainer2.ResumeLayout(false);
@ -374,6 +385,7 @@
((System.ComponentModel.ISupportInitialize)(this.changedFileBindingSource)).EndInit();
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.patchBindingSource)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@ -407,6 +419,7 @@
private System.Windows.Forms.DataGridViewTextBoxColumn Rate;
private System.Windows.Forms.DataGridViewTextBoxColumn File;
private System.Windows.Forms.DataGridViewCheckBoxColumn Apply;
private System.Windows.Forms.Button ApplyPatch;
}
}

8
GitUI/ApplyPatch.cs
View File

@ -8,6 +8,7 @@ using System.Text;
using System.Windows.Forms;
using System.IO;
using GitCommands;
using GitUI;
namespace PatchApply
{
@ -261,5 +262,12 @@ namespace PatchApply
{
}
private void ApplyPatch_Click(object sender, EventArgs e)
{
MergePatch form = new MergePatch();
form.SetPatchFile(PatchFileNameEdit.Text);
form.Show();
}
}
}

55
GitUI/ApplyPatch.resx
View File

@ -132,6 +132,15 @@
<metadata name="patchBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>328, 17</value>
</metadata>
<metadata name="FileNameA.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Rate.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Apply.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="changedFileBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>132, 17</value>
</metadata>
@ -142,33 +151,39 @@
<data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAfZJREFUOE+NkkFI
k3EYxr8lCspA0C7RITw0cYigJeWxQx2kQ6IIXkI8fIEMlBJTSMgpNciTi9QRiUM8yA41GOrF2UCmotvA
zYGjiKyoyVjlXOLYHv/Ptu+bWyb94eF7/+/zex/eb/s0UsHRz/tLSiMJ+YIktUnJX01pu6jcnZIk25/K
YstOe+1x4Yx6vz7plW9afHjsiuDNR8AezYg1e/TInBnQMLHZfdsaxOweMPMdGBfPF58yYs0ePTJk80K4
NtNnCQuNhoCRXeDO3F5arNmjR4YsZ9SQBrO755EzjFfCHAoCTwIZKUe50yNDljNqwDXzhvtlIIGn20Cf
Jycl4HSPDFnOqAGNJs/xlFixdy0Jgzuprq4EKK9Cj4xFsJzJCzAHU5BX4uhyxnO7F1T0ZNcRxgNJ6Ma2
DtWA+rH3XtNWDPJyDB2Lv9MqPEqfDFnOqAHVQzajYekLHroO0GrfR8u7jJSj3OmRIcuZ3F9ZdvHSjSkf
nq3/xH3HPu7avqF5Pl/s0SNDVhIzp7+Fkqv91uFb034YV6OQF8K4Z/uq/pis2aNHhqwYzn0H2STtFcOE
iekPHJ8x4PyBwZWIeEYwKGr26JERvPasz1mTNeoudz5/rRu2hxonvaBqjG8/sCf8uixD9p+Hq1UIVQnp
s2LN3l9rnxf0X94JnWH0Mu1exMoAAAAASUVORK5CYII=
YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAfdJREFUOE+Nkk9I
k3Ecxt8pCsUOYl6ig3RIccQgS6qjBz1EB0MJvIh4eAMZFBmWoKAzVHCnTdwcYiSjw9jBBqJe2hzEKnIb
6BokhahJOYbD1MSxPf2ebe+7P1r4g4f3+/s+n+/D991ejVR0dM618guxhFwiSW1SMn43bZdW+FOS5Ppz
qcz+5eH1k+IZ9X7LFpTv2EN47oth5jvg3suINXv0yJwZUG/93N00G4FjC3j9EzCL5/hGRqzZo0eGbEEI
12a6g7DQy3Vg+CvQ/GYrLdbs0SNDljNqSL3F/7jHs4tJYQ5EgP5wRspR7vTIkOWMGnDT8sk/EU5gcBV4
FshJCcjvkSHLGTWgwRg4mRIrPvmQhMGfVFdXApRXoUfGLljOFARYIinI3iN0eY5yuxdV9GTfMczhJGpM
K4dqwA3TcnBs5QDyuwO0L+6nVXyUPhmynFEDagdcRsPSNp76fqPVHcWDtxkpR7nTI0OWM7m/8mLV5dtT
IYx8jKNjPor7rh3ccxaKPXpkyEpiJv9bKL/WOzvU+GoNxvd7kBd20eL6of6YrNmjR4asGM59B9kkbbXB
Osb0R/ObeOH5hT5vTDxj6BM1e/TICF571uesyRr6K52j0zVD7vUGWxBUnXHuG3vC12cZsv88XK1S6KqQ
LivW7J1a+39B5/L+AnLP9CCWOSlKAAAAAElFTkSuQmCC
</value>
</data>
<data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAfRJREFUOE+Nkl1I
U2Ecxo9Kg2QgVDfhhXTRIhGhpaiXXthFdFEUQjcRXhwhBkVFJjhoM3KgV1u0D6RIxAvZhQ1EvXE6iFW0
D8g1SIpwKqkMKz9Rtsf3cTvvPprhCw/nf57n9392YG+ZUnRqR+d0J5P7armi3FJSf1oO44qqYFpRvDun
T3i+ttftFe/I9wZXRG32RNEVSOL1D8C3nhFneszIlCwwOj/faxuKYzgBvP0F2MWz/2dGnOkxI0O2oISf
zfZhwkLP54Heb8CVkcShONNjRoYsd2SJ0RG8/8i/ilciNMeBnlhmWTuc6TEjQ5Y7suCy41PwZWwfz74A
j8OFy/klzMiQ5Y4saLSF99ziEx98SMEUTMlfLh6YkfEIljsFBY54GurMNjr8OWkF+Z4a2IU9loJhILQl
Cy4NzEZsoU2o05u4PflXSivI98iQ5Y4suGD2Wk1Ti3gY2MBN3xpuvMtIO9o7MzJkuZP7KyvPnG1yR/Hi
42/cGV/DNe8yro4Wih4zMmQVsZN/F3TnnwxZWt/Mwfp+HerEKq57l+Q94EyPGRmyYjl3D7JN+hqT08b2
zvEFPPWvoHsmKZ5JdIuZHjMygteXus5l2aC++m7foMHim290RUBdtI59pyfy+ixD9sjDTzsldE6oNivO
9P757P8VHSs7AB2+8vDWBe6MAAAAAElFTkSuQmCC
YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAfRJREFUOE+Nkk9I
k3Ecxt8VCoqH0C7SQTxkNGSQJdXRgx7EQ2EEXUI8vEIMkopSUNAVKejJiZsjkmR0GDvUQKyLW4NYSjqh
rUFDETXxD2MjV8pke/w9bu9vf1rSDx7e7/s8n++zF/bTKQVH7wiUlkWO1DOKckdJxm6exGfP+VKK4jyo
KrF9v1ufKNyR79esfvWGbRnPvBG8XgVc0bQ402NGpmhBg+Xrg+bpEOwbwJttYEw8R9bS4kyPGRmyeSX8
bLbbCQu9CAPPfwAtbzdOxJkeMzJkuSNLGsy+h4/du5gQYX8I6Auml7XDmR4zMmS5Iwuumhd848EjDHwD
nizlL+eWMCNDljuyoNG0lJgUn9j9JQmjLyl/uXBgRsYmWO7kFZhDKaieP+h0Z6UV5Hqq9xBjwSTqRhd/
y4Iro5/8w4txqHNx3PvwS0oryPXIkOWOLLjU7zQZP27ikXcf7a493H6flna0d2ZkyHIn+1eWn6++PrmM
l/Mx3J/ZQ5tzC62OfNFjRoasInZy70LpxafTg01TAZg+R6HO7uKW86e8B5zpMSNDVixn70GmqaLGaBlm
e9fMOnrcO+j1RMQzgl4x02NGRvAVxa6zLhMYLnQMvaobdIUbrX5Ql03vVuiJ3JBhyP7z8NMqhWqF9Blx
pvfXZ59W9F/ZMfMd8t4gZ+7CAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="File.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="patchBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>328, 17</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAgAAAAAAAEACADoPwAAhgAAADAwAAABAAgAqA4AAG5AAAAgIAAAAQAIAKgIAAAWTwAAEBAAAAEA

8
GitUI/MergePatch.Designer.cs
View File

@ -97,7 +97,7 @@
//
// Skip
//
this.Skip.Location = new System.Drawing.Point(465, 172);
this.Skip.Location = new System.Drawing.Point(463, 172);
this.Skip.Name = "Skip";
this.Skip.Size = new System.Drawing.Size(103, 23);
this.Skip.TabIndex = 6;
@ -107,7 +107,7 @@
//
// Abort
//
this.Abort.Location = new System.Drawing.Point(465, 201);
this.Abort.Location = new System.Drawing.Point(463, 201);
this.Abort.Name = "Abort";
this.Abort.Size = new System.Drawing.Size(104, 23);
this.Abort.TabIndex = 7;
@ -117,7 +117,7 @@
//
// Resolved
//
this.Resolved.Location = new System.Drawing.Point(466, 143);
this.Resolved.Location = new System.Drawing.Point(464, 143);
this.Resolved.Name = "Resolved";
this.Resolved.Size = new System.Drawing.Size(103, 23);
this.Resolved.TabIndex = 8;
@ -127,7 +127,7 @@
//
// AddFiles
//
this.AddFiles.Location = new System.Drawing.Point(466, 114);
this.AddFiles.Location = new System.Drawing.Point(464, 94);
this.AddFiles.Name = "AddFiles";
this.AddFiles.Size = new System.Drawing.Size(102, 23);
this.AddFiles.TabIndex = 9;

7
GitUI/MergePatch.cs
View File

@ -18,6 +18,11 @@ namespace GitUI
EnableButtons();
}
public void SetPatchFile(string name)
{
PatchFile.Text = name;
}
private void EnableButtons()
{
if (Directory.Exists(GitCommands.Settings.WorkingDir + ".git\\rebase-apply\\"))
@ -25,6 +30,7 @@ namespace GitUI
BrowsePatch.Enabled = false;
Apply.Enabled = false;
PatchFile.ReadOnly = true;
AddFiles.Enabled = true;
Resolved.Enabled = true;
Mergetool.Enabled = true;
Skip.Enabled = true;
@ -35,6 +41,7 @@ namespace GitUI
BrowsePatch.Enabled = true;
Apply.Enabled = true;
PatchFile.ReadOnly = false;
AddFiles.Enabled = false;
Resolved.Enabled = false;
Mergetool.Enabled = false;
Skip.Enabled = false;

Write Preview
Loading…
Cancel
Save