From da621fbfbe6d8dfd1308201dea5615edf86bd031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Tue, 5 Sep 2017 12:52:47 +0100 Subject: [PATCH] Use QValidator to validate label input. --- src/gui/newdialog.cpp | 5 ++--- src/gui/partpropsdialog.cpp | 11 ++++------- src/gui/partpropsdialog.h | 2 -- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/gui/newdialog.cpp b/src/gui/newdialog.cpp index f2d0d5b..d7b67c7 100644 --- a/src/gui/newdialog.cpp +++ b/src/gui/newdialog.cpp @@ -228,9 +228,8 @@ void NewDialog::onFilesystemChanged(int idx) updateOkButtonStatus(); const FileSystem* fs = FileSystemFactory::create(FileSystem::typeForName(dialogWidget().comboFileSystem().currentText()), -1, -1, -1, -1, QString()); - connect(dialogWidget().m_EditLabel, &QLineEdit::textChanged, [=] (const QString& text) { - dialogWidget().m_EditLabel->setText(fs->validateLabel(text)); - }); + dialogWidget().m_EditLabel->setMaxLength(fs->maxLabelLength()); + dialogWidget().m_EditLabel->setValidator(fs->labelValidator(dialogWidget().m_EditLabel)); updateSpinCapacity(partition().length()); dialogWidget().partResizerWidget().update(); diff --git a/src/gui/partpropsdialog.cpp b/src/gui/partpropsdialog.cpp index 9d4a226..e266adb 100644 --- a/src/gui/partpropsdialog.cpp +++ b/src/gui/partpropsdialog.cpp @@ -318,9 +318,8 @@ void PartPropsDialog::setupFileSystemComboBox() dialogWidget().fileSystem().setCurrentIndex(dialogWidget().fileSystem().findText(selected)); const FileSystem* fs = FileSystemFactory::create(FileSystem::typeForName(dialogWidget().fileSystem().currentText()), -1, -1, -1, -1, QString()); - m_EditLabelConnection = connect(dialogWidget().m_EditLabel, &QLineEdit::textChanged, [=] (const QString& text) { - dialogWidget().m_EditLabel->setText(fs->validateLabel(text)); - }); + dialogWidget().m_EditLabel->setMaxLength(fs->maxLabelLength()); + dialogWidget().m_EditLabel->setValidator(fs->labelValidator(dialogWidget().m_EditLabel)); } void PartPropsDialog::updatePartitionFileSystem() @@ -345,10 +344,8 @@ void PartPropsDialog::onFilesystemChanged(int) updatePartitionFileSystem(); const FileSystem* fs = FileSystemFactory::create(FileSystem::typeForName(dialogWidget().fileSystem().currentText()), -1, -1, -1, -1, QString()); - disconnect( m_EditLabelConnection ); - m_EditLabelConnection = connect(dialogWidget().m_EditLabel, &QLineEdit::textChanged, [=] (const QString& text) { - dialogWidget().m_EditLabel->setText(fs->validateLabel(text)); - }); + dialogWidget().m_EditLabel->setMaxLength(fs->maxLabelLength()); + dialogWidget().m_EditLabel->setValidator(fs->labelValidator(dialogWidget().m_EditLabel)); } else { dialogWidget().fileSystem().disconnect(this); setupFileSystemComboBox(); diff --git a/src/gui/partpropsdialog.h b/src/gui/partpropsdialog.h index a65875b..862264f 100644 --- a/src/gui/partpropsdialog.h +++ b/src/gui/partpropsdialog.h @@ -128,8 +128,6 @@ private: QPushButton* okButton; QPushButton* cancelButton; QVBoxLayout *mainLayout; - - QMetaObject::Connection m_EditLabelConnection; }; #endif