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

QDS NewProject dialog: use friendly error message when regex does not match

Browse Source 
Instead of telling the user that the project name does not match a
complex regular expression, we can tell him in English words what the
rules are.

Also, updates the icon of the status message so that, when the status is
multiline, the icon appears at the top, rather than vertical center, on
the left side of the text.

Change-Id: I848b3858f5f92a09588b9646c56cbf743b06ea09
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Samuel Ghinet
2021-11-15 16:56:52 +02:00
parent 06a6549075
commit 00d186ce10
5 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
share/qtcreator/qmldesigner/newprojectdialog/imports/NewProjectDialog/Details.qml
View File

@@ -127,6 +127,7 @@ Item {
Image {
id: statusIcon
Layout.alignment: Qt.AlignTop
asynchronous: false
}

10
src/libs/utils/projectintropage.cpp
View File

@@ -61,6 +61,7 @@ public:
Ui::ProjectIntroPage m_ui;
bool m_complete = false;
QRegularExpressionValidator m_projectNameValidator;
QString m_projectNameValidatorUserMessage;
bool m_forceSubProject = false;
FilePaths m_projectDirectories;
};
@@ -124,10 +125,11 @@ void ProjectIntroPage::setFilePath(const FilePath &path)
d->m_ui.pathChooser->setFilePath(path);
}
void ProjectIntroPage::setProjectNameRegularExpression(const QRegularExpression &regEx)
void ProjectIntroPage::setProjectNameRegularExpression(const QRegularExpression &regEx, const QString &userErrorMessage)
{
Q_ASSERT_X(regEx.isValid(), Q_FUNC_INFO, qPrintable(regEx.errorString()));
d->m_projectNameValidator.setRegularExpression(regEx);
d->m_projectNameValidatorUserMessage = userErrorMessage;
}
void ProjectIntroPage::setProjectName(const QString &name)
@@ -263,8 +265,10 @@ bool ProjectIntroPage::validateProjectName(const QString &name, QString *errorMe
// a more detailed error message
if (validatorState != QValidator::Acceptable && (pos == -1 || pos >= name.count())) {
if (errorMessage) {
*errorMessage = tr("Name does not match \"%1\".").arg(
d->m_projectNameValidator.regularExpression().pattern());
if (d->m_projectNameValidatorUserMessage.isEmpty())
*errorMessage = tr("Project name is invalid.");
else
*errorMessage = d->m_projectNameValidatorUserMessage;
}
return false;
}

2
src/libs/utils/projectintropage.h
View File

@@ -80,7 +80,7 @@ public slots:
void setProjectName(const QString &name);
void setDescription(const QString &description);
void setUseAsDefaultPath(bool u);
void setProjectNameRegularExpression(const QRegularExpression &regEx);
void setProjectNameRegularExpression(const QRegularExpression &regEx, const QString &userErrorMessage);
private:
void slotChanged();

6
src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp
View File

@@ -195,6 +195,7 @@ bool KitsPageFactory::validateData(Utils::Id typeId, const QVariant &data, QStri
// --------------------------------------------------------------------
static const char KEY_PROJECT_NAME_VALIDATOR[] = "projectNameValidator";
static const char KEY_PROJECT_NAME_VALIDATOR_USER_MESSAGE[] = "trProjectNameValidatorUserMessage";
ProjectPageFactory::ProjectPageFactory()
{
@@ -215,10 +216,13 @@ Utils::WizardPage *ProjectPageFactory::create(JsonWizard *wizard, Utils::Id type
page->setDescription(wizard->expander()->expand(description));
QString projectNameValidator
= tmp.value(QLatin1String(KEY_PROJECT_NAME_VALIDATOR)).toString();
QString projectNameValidatorUserMessage
= JsonWizardFactory::localizedString(tmp.value(QLatin1String(KEY_PROJECT_NAME_VALIDATOR_USER_MESSAGE)));
if (!projectNameValidator.isEmpty()) {
QRegularExpression regularExpression(projectNameValidator);
if (regularExpression.isValid())
page->setProjectNameRegularExpression(regularExpression);
page->setProjectNameRegularExpression(regularExpression, projectNameValidatorUserMessage);
}
return page;

2
src/plugins/studiowelcome/qdsnewdialog.cpp
View File

@@ -101,7 +101,7 @@ QdsNewDialog::QdsNewDialog(QWidget *parent)
QObject::connect(&m_wizard, &WizardHandler::projectCanBeCreated, this, &QdsNewDialog::onProjectCanBeCreatedChanged);
QObject::connect(&m_wizard, &WizardHandler::wizardCreationFailed, this, [this]() {
QMessageBox::critical(m_dialog, "New project", "Failed to initialize data");
QMessageBox::critical(m_dialog, tr("New project"), tr("Failed to initialize data"));
reject();
delete this;
});