forked from qt-creator/qt-creator
VCS[git]: Cleaning a repositories: Uncheck pro.user files as well.
This commit is contained in:
@@ -166,18 +166,20 @@ void CleanDialog::setFileList(const QString &workingDirectory, const QStringList
|
|||||||
const QIcon fileIcon = style->standardIcon(QStyle::SP_FileIcon);
|
const QIcon fileIcon = style->standardIcon(QStyle::SP_FileIcon);
|
||||||
const QString diffSuffix = QLatin1String(".diff");
|
const QString diffSuffix = QLatin1String(".diff");
|
||||||
const QString patchSuffix = QLatin1String(".patch");
|
const QString patchSuffix = QLatin1String(".patch");
|
||||||
|
const QString proUserSuffix = QLatin1String(".pro.user");
|
||||||
const QChar slash = QLatin1Char('/');
|
const QChar slash = QLatin1Char('/');
|
||||||
// Do not initially check patches for deletion.
|
// Do not initially check patches or 'pro.user' files for deletion.
|
||||||
foreach(const QString &fileName, l) {
|
foreach(const QString &fileName, l) {
|
||||||
const QFileInfo fi(workingDirectory + slash + fileName);
|
const QFileInfo fi(workingDirectory + slash + fileName);
|
||||||
const bool isDir = fi.isDir();
|
const bool isDir = fi.isDir();
|
||||||
QStandardItem *nameItem = new QStandardItem(QDir::toNativeSeparators(fileName));
|
QStandardItem *nameItem = new QStandardItem(QDir::toNativeSeparators(fileName));
|
||||||
nameItem->setFlags(Qt::ItemIsUserCheckable|Qt::ItemIsEnabled);
|
nameItem->setFlags(Qt::ItemIsUserCheckable|Qt::ItemIsEnabled);
|
||||||
nameItem->setIcon(isDir ? folderIcon : fileIcon);
|
nameItem->setIcon(isDir ? folderIcon : fileIcon);
|
||||||
const bool isPatch = !isDir && (fileName.endsWith(diffSuffix)
|
const bool saveFile = !isDir && (fileName.endsWith(diffSuffix)
|
||||||
|| fileName.endsWith(patchSuffix));
|
|| fileName.endsWith(patchSuffix)
|
||||||
|
|| fileName.endsWith(proUserSuffix));
|
||||||
nameItem->setCheckable(true);
|
nameItem->setCheckable(true);
|
||||||
nameItem->setCheckState(isPatch ? Qt::Unchecked : Qt::Checked);
|
nameItem->setCheckState(saveFile ? Qt::Unchecked : Qt::Checked);
|
||||||
nameItem->setData(QVariant(fi.absoluteFilePath()), fileNameRole);
|
nameItem->setData(QVariant(fi.absoluteFilePath()), fileNameRole);
|
||||||
nameItem->setData(QVariant(isDir), isDirectoryRole);
|
nameItem->setData(QVariant(isDir), isDirectoryRole);
|
||||||
// Tooltip with size information
|
// Tooltip with size information
|
||||||
|
|||||||
Reference in New Issue
Block a user