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

Git: Prevent checking unmerged files in submit editor

Browse Source 
Change-Id: Ic226638a522ca92f61b8b6736a325c1cc747ff62
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2012-12-25 19:38:07 +02:00
parent 30d548ea3a
commit 65b7874341
8 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/vcsbase/submitfilemodel.cpp
View File

@@ -43,11 +43,12 @@ namespace VcsBase {
// --------------------------------------------------------------------------
static QList<QStandardItem *> createFileRow(const QString &fileName, const QString &status,
bool checked, const QVariant &v)
CheckMode checked, const QVariant &v)
{
QStandardItem *statusItem = new QStandardItem(status);
statusItem->setCheckable(true);
statusItem->setCheckState(checked ? Qt::Checked : Qt::Unchecked);
statusItem->setCheckable(checked != Uncheckable);
if (checked != Uncheckable)
statusItem->setCheckState(checked == Checked ? Qt::Checked : Qt::Unchecked);
statusItem->setFlags(Qt::ItemIsSelectable|Qt::ItemIsUserCheckable|Qt::ItemIsEnabled);
statusItem->setData(v);
QStandardItem *fileItem = new QStandardItem(fileName);
@@ -78,10 +79,10 @@ SubmitFileModel::SubmitFileModel(QObject *parent) :
setHorizontalHeaderLabels(headerLabels);
}
QList<QStandardItem *> SubmitFileModel::addFile(const QString &fileName, const QString &status, bool checked,
QList<QStandardItem *> SubmitFileModel::addFile(const QString &fileName, const QString &status, CheckMode checkMode,
const QVariant &v)
{
const QList<QStandardItem *> row = createFileRow(fileName, status, checked, v);
const QList<QStandardItem *> row = createFileRow(fileName, status, checkMode, v);
appendRow(row);
return row;
}