andrius
/
partitionmanager
1
0
Fork 0
Code Pull Requests Releases Activity

Use QValidator to validate label input.

This commit is contained in:
Andrius Štikonas 2017-09-05 12:52:47 +01:00
parent 0f64ac2dc3
commit da621fbfbe
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/newdialog.cpp
View File

@ -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();

11
src/gui/partpropsdialog.cpp
View File

@ -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();

2
src/gui/partpropsdialog.h
View File

@ -128,8 +128,6 @@ private:
QPushButton* okButton;
QPushButton* cancelButton;
QVBoxLayout *mainLayout;
QMetaObject::Connection m_EditLabelConnection;
};
#endif