feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Conditionally enable Reset button in branches dialog

Browse Source 
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 <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2014-02-27 09:23:44 +02:00
committed by Orgad Shaneh
parent cb7f9fe496
commit 4465276e10
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/git/branchdialog.cpp
View File

@@ -128,6 +128,7 @@ void BranchDialog::enableButtons()
m_ui->diffButton->setEnabled(hasActions); m_ui->diffButton->setEnabled(hasActions);
m_ui->checkoutButton->setEnabled(hasActions && !currentSelected); m_ui->checkoutButton->setEnabled(hasActions && !currentSelected);
m_ui->rebaseButton->setEnabled(hasActions && !currentSelected); m_ui->rebaseButton->setEnabled(hasActions && !currentSelected);
m_ui->resetButton->setEnabled(hasActions && currentLocal && !currentSelected);
m_ui->mergeButton->setEnabled(hasActions && !currentSelected); m_ui->mergeButton->setEnabled(hasActions && !currentSelected);
m_ui->cherryPickButton->setEnabled(hasActions && !currentSelected); m_ui->cherryPickButton->setEnabled(hasActions && !currentSelected);
m_ui->trackButton->setEnabled(hasActions && currentLocal && !currentSelected && !isTag); m_ui->trackButton->setEnabled(hasActions && currentLocal && !currentSelected && !isTag);