private void EnableButtons()
{
if (Module.InTheMiddleOfRebase())
{
if (Height < 200)
{
Height = 500;
}
Branches.Enabled = false;
Ok.Enabled = false;
chkStash.Enabled = false;
AddFiles.Enabled = true;
Commit.Enabled = true;
Resolved.Enabled = !Module.InTheMiddleOfConflictedMerge();
Mergetool.Enabled = Module.InTheMiddleOfConflictedMerge();
Skip.Enabled = true;
Abort.Enabled = true;
}
else
{
Branches.Enabled = true;
Ok.Enabled = true;
AddFiles.Enabled = false;
Commit.Enabled = false;
Resolved.Enabled = false;
Mergetool.Enabled = false;
Skip.Enabled = false;
Abort.Enabled = false;
chkStash.Enabled = Module.IsDirtyDir();
}
SolveMergeconflicts.Visible = Module.InTheMiddleOfConflictedMerge();
Resolved.Text = _continueRebaseText.Text;
Mergetool.Text = _solveConflictsText.Text;
Resolved.ForeColor = SystemColors.ControlText;
Mergetool.ForeColor = SystemColors.ControlText;
ContinuePanel.BackColor = Color.Transparent;
MergeToolPanel.BackColor = Color.Transparent;
var highlightColor = Color.Yellow.AdaptBackColor();
if (Module.InTheMiddleOfConflictedMerge())
{
AcceptButton = Mergetool;
Mergetool.Focus();
Mergetool.Text = _solveConflictsText2.Text;
MergeToolPanel.BackColor = highlightColor;
}
else if (Module.InTheMiddleOfRebase())
{
AcceptButton = Resolved;
Resolved.Focus();
Resolved.Text = _continueRebaseText2.Text;
ContinuePanel.BackColor = highlightColor;
}
}
private void EnableButtons()
{
if (Settings.Module.InTheMiddleOfRebase())
{
if (Height < 200)
{
Height = 500;
}
Branches.Enabled = false;
Ok.Enabled = false;
AddFiles.Enabled = true;
Resolved.Enabled = !Settings.Module.InTheMiddleOfConflictedMerge();
Mergetool.Enabled = Settings.Module.InTheMiddleOfConflictedMerge();
Skip.Enabled = true;
Abort.Enabled = true;
}
else
{
Branches.Enabled = true;
Ok.Enabled = true;
AddFiles.Enabled = false;
Resolved.Enabled = false;
Mergetool.Enabled = false;
Skip.Enabled = false;
Abort.Enabled = false;
}
SolveMergeconflicts.Visible = Settings.Module.InTheMiddleOfConflictedMerge();
Resolved.Text = _continueRebaseText.Text;
Mergetool.Text = _solveConflictsText.Text;
ContinuePanel.BackColor = Color.Transparent;
MergeToolPanel.BackColor = Color.Transparent;
if (Settings.Module.InTheMiddleOfConflictedMerge())
{
AcceptButton = Mergetool;
Mergetool.Focus();
Mergetool.Text = _solveConflictsText2.Text;
MergeToolPanel.BackColor = Color.Black;
}
else if (Settings.Module.InTheMiddleOfRebase())
{
AcceptButton = Resolved;
Resolved.Focus();
Resolved.Text = _continueRebaseText2.Text;
ContinuePanel.BackColor = Color.Black;
}
}
private void EnableButtons()
{
if (GitCommandHelpers.InTheMiddleOfRebase())
{
if (Height < 200)
{
Height = 500;
}
Branches.Enabled = false;
Ok.Enabled = false;
AddFiles.Enabled = true;
Resolved.Enabled = !GitCommandHelpers.InTheMiddleOfConflictedMerge();
Mergetool.Enabled = GitCommandHelpers.InTheMiddleOfConflictedMerge();
Skip.Enabled = true;
Abort.Enabled = true;
}
else
{
Branches.Enabled = true;
Ok.Enabled = true;
AddFiles.Enabled = false;
Resolved.Enabled = false;
Mergetool.Enabled = false;
Skip.Enabled = false;
Abort.Enabled = false;
}
SolveMergeconflicts.Visible = GitCommandHelpers.InTheMiddleOfConflictedMerge();
Resolved.Text = "Continue rebase";
Mergetool.Text = "Solve conflicts";
ContinuePanel.BackColor = Color.Transparent;
MergeToolPanel.BackColor = Color.Transparent;
if (GitCommandHelpers.InTheMiddleOfConflictedMerge())
{
AcceptButton = Mergetool;
Mergetool.Focus();
Mergetool.Text = ">Solve conflicts<";
MergeToolPanel.BackColor = Color.Black;
}
else if (GitCommandHelpers.InTheMiddleOfRebase())
{
AcceptButton = Resolved;
Resolved.Focus();
Resolved.Text = ">Continue rebase<";
ContinuePanel.BackColor = Color.Black;
}
}
private void EnableButtons()
{
if (Module.InTheMiddleOfPatch())
{
Apply.Enabled = false;
IgnoreWhitespace.Enabled = false;
PatchFileMode.Enabled = false;
PatchDirMode.Enabled = false;
AddFiles.Enabled = true;
Resolved.Enabled = !Module.InTheMiddleOfConflictedMerge();
Mergetool.Enabled = Module.InTheMiddleOfConflictedMerge();
Skip.Enabled = true;
Abort.Enabled = true;
PatchFile.Enabled = false;
PatchFile.ReadOnly = false;
BrowsePatch.Enabled = false;
PatchDir.Enabled = false;
PatchDir.ReadOnly = false;
BrowseDir.Enabled = false;
}
else
{
PatchFile.Enabled = PatchFileMode.Checked;
PatchFile.ReadOnly = !PatchFileMode.Checked;
BrowsePatch.Enabled = PatchFileMode.Checked;
PatchDir.Enabled = PatchDirMode.Checked;
PatchDir.ReadOnly = !PatchDirMode.Checked;
BrowseDir.Enabled = PatchDirMode.Checked;
Apply.Enabled = true;
IgnoreWhitespace.Enabled = true;
PatchFileMode.Enabled = true;
PatchDirMode.Enabled = true;
AddFiles.Enabled = false;
Resolved.Enabled = false;
Mergetool.Enabled = false;
Skip.Enabled = false;
Abort.Enabled = false;
}
patchGrid1.Initialize();
SolveMergeConflicts.Visible = Module.InTheMiddleOfConflictedMerge();
Resolved.Text = _conflictResolvedText.Text;
Mergetool.Text = _conflictMergetoolText.Text;
ContinuePanel.BackColor = Color.Transparent;
MergeToolPanel.BackColor = Color.Transparent;
if (Module.InTheMiddleOfConflictedMerge())
{
Mergetool.Text = ">" + _conflictMergetoolText.Text + "<";
Mergetool.Focus();
AcceptButton = Mergetool;
MergeToolPanel.BackColor = Color.Black;
}
else if (Module.InTheMiddleOfPatch())
{
Resolved.Text = ">" + _conflictResolvedText.Text + "<";
Resolved.Focus();
AcceptButton = Resolved;
ContinuePanel.BackColor = Color.Black;
}
}
