Relax GetProfileNameForm validator to only check individual characters

QRegExpValidator can be somewhat user-unfriendly, as it will prevent
characters from being input, or even deleted, while leaving the user in
the dark as to what is going on.

Retricting the set of characters allowed shouldn't pose a problem if we
make a mention of this on the form.  Checking for a leading "." or "@",
however, is better left at submission time, with an explicit error
message in that case.

1 files changed, 22 insertions, 4 deletions

diff --git a/src/gui/getprofilenameform.cpp b/src/gui/getprofilenameform.cpp
index 19e3a62..f2042c5 100644
--- a/src/gui/getprofilenameform.cpp
+++ b/src/gui/getprofilenameform.cpp
@@ -29,8 +29,8 @@ GetProfileNameForm::~GetProfileNameForm()
 
 void GetProfileNameForm::init()
 {
-	// Letters, digits, underscore, minus
-	QRegExp rxFilenameChars("[\\w\\-][\\w\\-@\\.]*");
+	// Letters, digits, underscore, minus, "@" and period
+	QRegExp rxFilenameChars("[\\w\\-@\\.]*");
 
 	// Set validators
 	// USER
@@ -39,7 +39,25 @@ void GetProfileNameForm::init()
 
 void GetProfileNameForm::validate()
 {
-	if (profileLineEdit->text().isEmpty()) return;
+	QString profileName = profileLineEdit->text();
+
+	if (profileName.isEmpty()) return;
+
+	// Check for anything that was let through by the validator
+	QRegExp rxFilename("^[\\w\\-][\\w\\-@\\.]*$");
+	if (!rxFilename.exactMatch(profileName)) {
+		QMessageBox::critical(this, PRODUCT_NAME,
+			tr("Invalid profile name: %1").arg(profileName)
+			// While this would be better suited as informativeText,
+			// Qt wouldn't take it into account when sizing the box
+			// (see http://apocalyptech.com/linux/qt/qmessagebox/)
+			+ QString("\n\n") + tr(
+				"Allowed characters are: letters, digits, '-', '_', '.' and '@'.\n"
+				"Furthermore, the initial character cannot be '.' or '@'."
+			));
+
+		return;
+	}
 
 	// Find the .twinkle directory in HOME
 	QDir d = QDir::home();
@@ -49,7 +67,7 @@ void GetProfileNameForm::validate()
 		reject();
 	}
 
-	QString filename = profileLineEdit->text();
+	QString filename = profileName;
 	filename.append(USER_FILE_EXT);
 	QString fullname = d.filePath(filename);
 	if (QFile::exists(fullname)) {