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

Fixes: Add way to create a new local branch in the git plugin

Browse Source 
Task: 205821
Details: Split up the branch model into remote branch base class and extended local branch class with <New Branch> row.
This commit is contained in:
Friedemann Kleint
2009-01-07 12:58:31 +01:00
parent 800baec88b
commit 352cf14353
4 changed files with 256 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,8 +58,9 @@ bool BranchDialog::init(GitClient *client, const QString &workingDirectory, QStr
}
m_ui->repositoryFieldLabel->setText(m_repoDirectory);
m_localModel = new BranchModel(client, BranchModel::LocalBranches, this);
m_remoteModel = new BranchModel(client, BranchModel::RemoteBranches, this);
m_localModel = new LocalBranchModel(client, this);
connect(m_localModel, SIGNAL(newBranchCreated(QString)), this, SLOT(slotNewLocalBranchCreated(QString)));
m_remoteModel = new RemoteBranchModel(client, this);
if (!m_localModel->refresh(workingDirectory, errorMessage)
|| !m_remoteModel->refresh(workingDirectory, errorMessage))
return false;
@@ -93,13 +94,23 @@ void BranchDialog::slotEnableButtons()
const int selectedLocalRow = selectedLocalBranchIndex();
const int currentLocalBranch = m_localModel->currentBranch();
const bool hasSelection = selectedLocalRow != -1;
const bool hasSelection = selectedLocalRow != -1 && !m_localModel->isNewBranchRow(selectedLocalRow);
const bool currentIsNotSelected = hasSelection && selectedLocalRow != currentLocalBranch;
m_checkoutButton->setEnabled(currentIsNotSelected);
m_deleteButton->setEnabled(currentIsNotSelected);
}
void BranchDialog::slotNewLocalBranchCreated(const QString &b)
{
// Select the newly created branch
const int row = m_localModel->findBranchByName(b);
if (row != -1) {
const QModelIndex index = m_localModel->index(row);
m_ui->localBranchListView->selectionModel()->select(index, QItemSelectionModel::Select);
}
}
bool BranchDialog::ask(const QString &title, const QString &what, bool defaultButton)
{
return QMessageBox::question(this, title, what, QMessageBox::Yes|QMessageBox::No,