public CompareSolutionsForm(NodeDifference difference)
{
InitializeComponent();
FormPosition.LoadFromRegistry(this);
m_differences.Data = difference;
}
public MergeSolutionsForm(
NodeDifference differenceInSourceBranch,
NodeDifference differenceInDestinationBranch,
Conflict conflict,
OperationTypeConflictResolver operationTypeConflictResolver,
ValueConflictResolver valueConflictResolver)
{
InitializeComponent();
FormPosition.LoadFromRegistry(this);
m_differencesInSourceBranchControl.Data = differenceInSourceBranch;
m_differencesInDestinationBranchControl.Data = differenceInDestinationBranch;
m_conflict = conflict as NodeConflict;
m_operationTypeConflictResolver = operationTypeConflictResolver;
m_valueConflictResolver = valueConflictResolver;
if (m_conflict.Subconflicts.Count == 0)
{
m_result = (NodeDifference)m_conflict.Resolve(m_operationTypeConflictResolver, m_valueConflictResolver);
}
else
{
m_result = null;
}
UpdateUI();
}
public ValueConflictResolverForm(
ConflictContext context,
string valueInSourceBranch,
string valueInDestinationBranch)
{
InitializeComponent();
FormPosition.LoadFromRegistry(this);
m_result = null;
m_conflictcontextcontrol.Data = context;
m_textboxValueFromSourceBranch.Text = valueInSourceBranch;
m_textboxValueFromDestinationBranch.Text = valueInDestinationBranch;
m_buttonAccept.Enabled = false;
}
public OperationTypeConflictResolverForm(
ConflictContext context,
Difference differenceTypeInSourceBranch,
Difference differenceTypeInDestinationBranch)
{
InitializeComponent();
FormPosition.LoadFromRegistry(this);
m_result = null;
m_conflictcontextcontrol.Data = context;
m_radioKeepSource.Tag = differenceTypeInSourceBranch;
m_textboxChangeDescriptionFromSourceBranch.Text = differenceTypeInSourceBranch.ToString();
m_radioKeepDestination.Tag = differenceTypeInDestinationBranch;
m_textboxChangeDescriptionFromDestinationBranch.Text = differenceTypeInDestinationBranch.ToString();
m_buttonAccept.Enabled = false;
}
public UpdateOriginalSolutionForm(NodeDifference difference, string originalSolutionFullPath)
{
InitializeComponent();
FormPosition.LoadFromRegistry(this);
m_differencesInFilteredSolution.Data = difference;
m_originalSolutionFullPath = originalSolutionFullPath;
UpdateState();
m_watcher = new FileSystemWatcher();
m_watcher.NotifyFilter = NotifyFilters.Attributes;
m_watcher.Path = Path.GetDirectoryName(originalSolutionFullPath);
m_watcher.Filter = Path.GetFileName(originalSolutionFullPath);
m_watcher.Changed += delegate(object source, FileSystemEventArgs e)
{
UpdateState();
};
m_watcher.EnableRaisingEvents = true;
}
protected override void OnClosing(CancelEventArgs e)
{
FormPosition.SaveInRegistry(this);
base.OnClosing(e);
}
public CreateFilterForm(string filename)
{
InitializeComponent();
Init(filename);
FormPosition.LoadFromRegistry(this);
}