From 4465276e10b9feafb20375aed6d7f5b7060398b8 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 27 Feb 2014 09:23:44 +0200 Subject: [PATCH] Git: Conditionally enable Reset button in branches dialog Conditions: * There is an active local branch * The selected node is a leaf * The selected node is not the active branch Change-Id: I539dd13750737934378e503484646634e50a1aa7 Reviewed-by: Tobias Hunger --- src/plugins/git/branchdialog.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/git/branchdialog.cpp b/src/plugins/git/branchdialog.cpp index 7d922a5cd75..8798f4657d5 100644 --- a/src/plugins/git/branchdialog.cpp +++ b/src/plugins/git/branchdialog.cpp @@ -128,6 +128,7 @@ void BranchDialog::enableButtons() m_ui->diffButton->setEnabled(hasActions); m_ui->checkoutButton->setEnabled(hasActions && !currentSelected); m_ui->rebaseButton->setEnabled(hasActions && !currentSelected); + m_ui->resetButton->setEnabled(hasActions && currentLocal && !currentSelected); m_ui->mergeButton->setEnabled(hasActions && !currentSelected); m_ui->cherryPickButton->setEnabled(hasActions && !currentSelected); m_ui->trackButton->setEnabled(hasActions && currentLocal && !currentSelected && !isTag);