From c4256254095a7984d9a9791292748e8afe70e339 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Thu, 3 Feb 2022 23:00:39 +0600 Subject: [PATCH] qt: File field is now an actual text field --- src/qt/qt_filefield.cpp | 2 ++ src/qt/qt_filefield.ui | 10 +++------- src/qt/qt_harddiskdialog.cpp | 4 +++- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qt/qt_filefield.cpp b/src/qt/qt_filefield.cpp index c99fc4cff..fbeed6066 100644 --- a/src/qt/qt_filefield.cpp +++ b/src/qt/qt_filefield.cpp @@ -8,6 +8,8 @@ FileField::FileField(QWidget *parent) : ui(new Ui::FileField) { ui->setupUi(this); + + connect(ui->label, &QLineEdit::editingFinished, this, [this] () { emit fileSelected(ui->label->text()); }); } FileField::~FileField() diff --git a/src/qt/qt_filefield.ui b/src/qt/qt_filefield.ui index 462de5970..14c58349b 100644 --- a/src/qt/qt_filefield.ui +++ b/src/qt/qt_filefield.ui @@ -6,8 +6,8 @@ 0 0 - 400 - 300 + 354 + 43 @@ -27,11 +27,7 @@ 0 - - - - - + diff --git a/src/qt/qt_harddiskdialog.cpp b/src/qt/qt_harddiskdialog.cpp index 8c7e8ae27..6a3ba6207 100644 --- a/src/qt/qt_harddiskdialog.cpp +++ b/src/qt/qt_harddiskdialog.cpp @@ -83,7 +83,7 @@ HarddiskDialog::HarddiskDialog(bool existing, QWidget *parent) : ui->lineEditSize->setValidator(new QIntValidator()); ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); - connect(ui->fileField, &FileField::fileSelected, this, [this] { + if (!existing) connect(ui->fileField, &FileField::fileSelected, this, [this] { ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true); }); } @@ -459,6 +459,7 @@ void HarddiskDialog::onExistingFileSelected(const QString &fileName) { uint32_t cylinders = 0; int vhd_error = 0; + ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); QFile file(fileName); if (! file.open(QIODevice::ReadOnly)) { QMessageBox::critical(this, tr("Unable to read file"), tr("Make sure the file exists and is readable.")); @@ -553,6 +554,7 @@ void HarddiskDialog::onExistingFileSelected(const QString &fileName) { ui->lineEditSectors->setEnabled(true); ui->lineEditSize->setEnabled(true); ui->comboBoxType->setEnabled(true); + ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true); } void HarddiskDialog::recalcSize() {