fix(uiform): Added format constraints

qTox · Oct 7, 2016 · 13baf93 · 13baf93
1 parent d909d99
commit 13baf93
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/widget/form/settings/userinterfaceform.cpp b/src/widget/form/settings/userinterfaceform.cpp
@@ -25,6 +25,7 @@
 #include <QFileDialog>
 #include <QFont>
 #include <QMessageBox>
+#include <QRegularExpressionValidator>
 #include <QStandardPaths>
 #include <QStyleFactory>
 #include <QTime>
@@ -124,8 +125,15 @@ UserInterfaceForm::UserInterfaceForm(SettingsWidget* myParent) :
     timeFormats.removeDuplicates();
     bodyUI->timestamp->addItems(timeFormats);
 
+    QRegularExpression re(QString("^[^\\n]{0,%0}$").arg(MAX_FORMAT_LENGTH));
+    QRegularExpressionValidator* validator = new QRegularExpressionValidator(re, this);
     QString timeFormat = s.getTimestampFormat();
+
+    if (!re.match(timeFormat).hasMatch())
+        timeFormat = timeFormats[0];
+
     bodyUI->timestamp->setCurrentText(timeFormat);
+    bodyUI->timestamp->setValidator(validator);
     on_timestamp_editTextChanged(timeFormat);
 
     QStringList dateFormats;
@@ -140,7 +148,11 @@ UserInterfaceForm::UserInterfaceForm(SettingsWidget* myParent) :
     bodyUI->dateFormats->addItems(dateFormats);
 
     QString dateFormat = s.getDateFormat();
+    if (!re.match(dateFormat).hasMatch())
+        dateFormat = dateFormats[0];
+
     bodyUI->dateFormats->setCurrentText(dateFormat);
+    bodyUI->dateFormats->setValidator(validator);
     on_dateFormats_editTextChanged(dateFormat);
 
     eventsInit();

diff --git a/src/widget/form/settings/userinterfaceform.h b/src/widget/form/settings/userinterfaceform.h
@@ -63,7 +63,8 @@ private slots:
 private:
     QList<QLabel*> smileLabels;
     SettingsWidget* parent;
-    Ui::UserInterfaceSettings *bodyUI;
+    Ui::UserInterfaceSettings* bodyUI;
+    const int MAX_FORMAT_LENGTH = 128;
 };
 
 #endif