Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added two additional context menu items

Browse Source 
* Compare source safe
* Compare mailbox
This commit is contained in:
Rich
2012-09-13 22:03:04 +00:00
parent 04fac124c1
commit ffcffcc5ba
2 changed files with 85 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
PROMS/Sync/Sync/frmSync.cs
View File

@@ -291,22 +291,22 @@ namespace Sync
List<FileCompare> fcList = SelectedList;
foreach (FileCompare fc in fcList)
{
Console.WriteLine("Compare {0} and {1}", fc.FileName, fc.SSFileName);
string progname = string.Empty;
if (System.IO.File.Exists(@"C:\Program Files\IDM Computer Solutions\UltraCompare\UC.exe"))
{
progname = @"C:\Program Files\IDM Computer Solutions\UltraCompare\UC.exe";
}
if (System.IO.File.Exists(@"C:\Program Files (x86)\IDM Computer Solutions\UltraCompare\UC.exe"))
{
progname = @"C:\Program Files (x86)\IDM Computer Solutions\UltraCompare\UC.exe";
}
// string cmd = string.Format("\"{0}\" -t \"{1}\" \"{2}\"", progname, fc.FileName, fc.SSFileName);
System.Diagnostics.ProcessStartInfo psi = new System.Diagnostics.ProcessStartInfo(progname,
string.Format(@" -t ""{0}"" ""{1}""", fc.FileName, fc.SSFileName));
System.Diagnostics.Process prc = System.Diagnostics.Process.Start(psi);
CompareOneFile(fc.FileName, fc.SSFileName);
}
}
private static void CompareOneFile(string fileDev, string fileSS)
{
Console.WriteLine("Compare {0} and {1}", fileDev, fileSS);
string progname = string.Empty;
if (System.IO.File.Exists(@"C:\Program Files\IDM Computer Solutions\UltraCompare\UC.exe"))
progname = @"C:\Program Files\IDM Computer Solutions\UltraCompare\UC.exe";
if (System.IO.File.Exists(@"C:\Program Files (x86)\IDM Computer Solutions\UltraCompare\UC.exe"))
progname = @"C:\Program Files (x86)\IDM Computer Solutions\UltraCompare\UC.exe";
// string cmd = string.Format("\"{0}\" -t \"{1}\" \"{2}\"", progname, fc.FileName, fc.SSFileName);
System.Diagnostics.ProcessStartInfo psi =
new System.Diagnostics.ProcessStartInfo(progname, string.Format(@" -t ""{0}"" ""{1}""", fileDev, fileSS));
System.Diagnostics.Process prc = System.Diagnostics.Process.Start(psi);
}
private void restoreToolStripMenuItem_Click(object sender, EventArgs e)
{
dgv.EndEdit();
@@ -505,5 +505,31 @@ namespace Sync
foreach (FileCompare fc in _CheckedOut) fc.ToProcess = false;
dgv.Refresh();
}
private void compareSourceSafeToolStripMenuItem_Click(object sender, EventArgs e)
{
// Compare SS version with SS version from Mailbox
dgv.EndEdit();
// This should launch UltraCompare with the two files
// Which Item am I on
List<FileCompare> fcList = SelectedList;
foreach (FileCompare fc in fcList)
{
CompareOneFile(fc.SSFileName, fc.SSFileName.Replace(tbSourceSafe.Text, tbSSMailBox.Text));
}
}
private void compareMailboxToolStripMenuItem_Click(object sender, EventArgs e)
{
// Compare MailBox version with Mailbox Source Safe version
dgv.EndEdit();
// This should launch UltraCompare with the two files
// Which Item am I on
List<FileCompare> fcList = SelectedList;
foreach (FileCompare fc in fcList)
{
CompareOneFile(fc.FileName, fc.FileName.Replace(tbDevelopment.Text, tbSSMailBox.Text));
}
}
}
}