80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #3086 from cold-brewed/existing-hdd-selection-fix

Browse Source 
qt: Fixes to the process for selecting an existing hdd image
This commit is contained in:
Miran Grča
2023-02-05 21:06:30 +01:00
committed by GitHub
parent c206288ef6 c809f482d5
commit c36b68bb77
4 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/qt_filefield.cpp
View File

@@ -29,7 +29,7 @@ FileField::FileField(QWidget *parent)
connect(ui->label, &QLineEdit::editingFinished, this, [this]() {
fileName_ = ui->label->text();
emit fileSelected(ui->label->text());
emit fileSelected(ui->label->text(), true);
});
this->setFixedWidth(this->sizeHint().width() + ui->pushButton->sizeHint().width());
}

2
src/qt/qt_filefield.hpp
View File

@@ -24,7 +24,7 @@ public:
bool createFile() { return createFile_; }
signals:
void fileSelected(const QString &fileName);
void fileSelected(const QString &fileName, bool precheck = false);
private slots:
void on_pushButton_clicked();

76
src/qt/qt_harddiskdialog.cpp
View File

@@ -51,6 +51,40 @@ HarddiskDialog::HarddiskDialog(bool existing, QWidget *parent)
{
ui->setupUi(this);
auto *model = ui->comboBoxFormat->model();
model->insertRows(0, 6);
model->setData(model->index(0, 0), tr("Raw image (.img)"));
model->setData(model->index(1, 0), tr("HDI image (.hdi)"));
model->setData(model->index(2, 0), tr("HDX image (.hdx)"));
model->setData(model->index(3, 0), tr("Fixed-size VHD (.vhd)"));
model->setData(model->index(4, 0), tr("Dynamic-size VHD (.vhd)"));
model->setData(model->index(5, 0), tr("Differencing VHD (.vhd)"));
model = ui->comboBoxBlockSize->model();
model->insertRows(0, 2);
model->setData(model->index(0, 0), tr("Large blocks (2 MB)"));
model->setData(model->index(1, 0), tr("Small blocks (512 KB)"));
ui->comboBoxBlockSize->hide();
ui->labelBlockSize->hide();
Harddrives::populateBuses(ui->comboBoxBus->model());
ui->comboBoxBus->setCurrentIndex(3);
model = ui->comboBoxType->model();
for (int i = 0; i < 127; i++) {
uint64_t size = ((uint64_t) hdd_table[i][0]) * hdd_table[i][1] * hdd_table[i][2];
uint32_t size_mb = size >> 11LL;
// QString text = QString("%1 MiB (CHS: %2, %3, %4)").arg(size_mb).arg(hdd_table[i][0]).arg(hdd_table[i][1]).arg(hdd_table[i][2]);
QString text = QString::asprintf(tr("%u MB (CHS: %i, %i, %i)").toUtf8().constData(), (size_mb), (hdd_table[i][0]), (hdd_table[i][1]), (hdd_table[i][2]));
Models::AddEntry(model, text, i);
}
Models::AddEntry(model, tr("Custom..."), 127);
Models::AddEntry(model, tr("Custom (large)..."), 128);
ui->lineEditSize->setValidator(new QIntValidator());
ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
if (existing) {
ui->fileField->setFilter(tr("Hard disk images") % util::DlgFilter({ "hd?", "im?", "vhd" }) % tr("All files") % util::DlgFilter({ "*" }, true));
@@ -85,40 +119,6 @@ HarddiskDialog::HarddiskDialog(bool existing, QWidget *parent)
ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
});
}
auto *model = ui->comboBoxFormat->model();
model->insertRows(0, 6);
model->setData(model->index(0, 0), tr("Raw image (.img)"));
model->setData(model->index(1, 0), tr("HDI image (.hdi)"));
model->setData(model->index(2, 0), tr("HDX image (.hdx)"));
model->setData(model->index(3, 0), tr("Fixed-size VHD (.vhd)"));
model->setData(model->index(4, 0), tr("Dynamic-size VHD (.vhd)"));
model->setData(model->index(5, 0), tr("Differencing VHD (.vhd)"));
model = ui->comboBoxBlockSize->model();
model->insertRows(0, 2);
model->setData(model->index(0, 0), tr("Large blocks (2 MB)"));
model->setData(model->index(1, 0), tr("Small blocks (512 KB)"));
ui->comboBoxBlockSize->hide();
ui->labelBlockSize->hide();
Harddrives::populateBuses(ui->comboBoxBus->model());
ui->comboBoxBus->setCurrentIndex(3);
model = ui->comboBoxType->model();
for (int i = 0; i < 127; i++) {
uint64_t size = ((uint64_t) hdd_table[i][0]) * hdd_table[i][1] * hdd_table[i][2];
uint32_t size_mb = size >> 11LL;
// QString text = QString("%1 MiB (CHS: %2, %3, %4)").arg(size_mb).arg(hdd_table[i][0]).arg(hdd_table[i][1]).arg(hdd_table[i][2]);
QString text = QString::asprintf(tr("%u MB (CHS: %i, %i, %i)").toUtf8().constData(), (size_mb), (hdd_table[i][0]), (hdd_table[i][1]), (hdd_table[i][2]));
Models::AddEntry(model, text, i);
}
Models::AddEntry(model, tr("Custom..."), 127);
Models::AddEntry(model, tr("Custom (large)..."), 128);
ui->lineEditSize->setValidator(new QIntValidator());
ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
}
HarddiskDialog::~HarddiskDialog()
@@ -499,7 +499,7 @@ HarddiskDialog::recalcSelection()
}
void
HarddiskDialog::onExistingFileSelected(const QString &fileName)
HarddiskDialog::onExistingFileSelected(const QString &fileName, bool precheck)
{
// TODO : Over to non-existing file selected
/*
@@ -531,7 +531,11 @@ HarddiskDialog::onExistingFileSelected(const QString &fileName)
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."));
// No message box during precheck (performed when the file input loses focus and this function is called)
// If precheck is false, the file has been chosen from a file dialog and the alert should display.
if(!precheck) {
QMessageBox::critical(this, tr("Unable to read file"), tr("Make sure the file exists and is readable."));
}
return;
}
QByteArray fileNameUtf8 = fileName.toUtf8();

2
src/qt/qt_harddiskdialog.hpp
View File

@@ -37,7 +37,7 @@ private slots:
void on_comboBoxBus_currentIndexChanged(int index);
void on_comboBoxFormat_currentIndexChanged(int index);
void onCreateNewFile();
void onExistingFileSelected(const QString &fileName);
void onExistingFileSelected(const QString &fileName, bool precheck);
private:
Ui::HarddiskDialog *ui;