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

PathChooser: Make error messages more informative

Browse Source
This commit is contained in:
Tobias Hunger
2011-04-01 11:46:10 +02:00
parent 0023ed78ba
commit f6ceffb0d9
1 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/libs/utils/pathchooser.cpp
View File

@@ -406,28 +406,67 @@ bool PathChooser::validatePath(const QString &path, QString *errorMessage)
{ {
QString expandedPath = m_d->expandedPath(path); QString expandedPath = m_d->expandedPath(path);
if (expandedPath.isEmpty()) { if (path.isEmpty()) {
if (errorMessage) if (errorMessage)
*errorMessage = tr("The path must not be empty."); *errorMessage = tr("The path must not be empty.");
return false; return false;
} }
if (expandedPath.isEmpty()) {
if (errorMessage)
*errorMessage = tr("The path '%1' expanded to an empty string.").arg(QDir::toNativeSeparators(path));
return false;
}
const QFileInfo fi(expandedPath); const QFileInfo fi(expandedPath);
// Check if existing // Check if existing
switch (m_d->m_acceptingKind) { switch (m_d->m_acceptingKind) {
case PathChooser::ExistingDirectory: // fall through case PathChooser::ExistingDirectory: // fall through
if (!fi.exists()) {
if (errorMessage)
*errorMessage = tr("The path '%1' does not exist.").arg(QDir::toNativeSeparators(expandedPath));
return false;
}
if (!fi.isDir()) {
if (errorMessage)
*errorMessage = tr("The path '%1' is not a directory.").arg(QDir::toNativeSeparators(expandedPath));
return false;
}
break;
case PathChooser::File: // fall through case PathChooser::File: // fall through
case PathChooser::ExistingCommand:
if (!fi.exists()) { if (!fi.exists()) {
if (errorMessage) if (errorMessage)
*errorMessage = tr("The path '%1' does not exist.").arg(QDir::toNativeSeparators(expandedPath)); *errorMessage = tr("The path '%1' does not exist.").arg(QDir::toNativeSeparators(expandedPath));
return false; return false;
} }
break; break;
case PathChooser::ExistingCommand:
if (!fi.exists()) {
if (errorMessage)
*errorMessage = tr("The path '%1' does not exist.").arg(QDir::toNativeSeparators(expandedPath));
return false;
}
if (!fi.isExecutable()) {
if (errorMessage)
*errorMessage = tr("Can not execute '%1'.").arg(QDir::toNativeSeparators(expandedPath));
return false;
}
break;
case PathChooser::Directory: case PathChooser::Directory:
if (fi.exists() && !fi.isDir()) {
if (errorMessage)
*errorMessage = tr("The path '%1' is not a directory.").arg(QDir::toNativeSeparators(expandedPath));
return false;
}
break;
case PathChooser::Command: // fall through case PathChooser::Command: // fall through
if (fi.exists() && !fi.isExecutable()) {
if (errorMessage)
*errorMessage = tr("Can not execute '%1'.").arg(QDir::toNativeSeparators(expandedPath));
return false;
}
break;
default: default:
; ;
} }