Merge branch 'newqt' of https://github.com/Cacodemon345/86Box into qt

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

src/qt/qt_filefield.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <width>354</width>
+    <height>43</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -27,11 +27,7 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
+    <widget class="QLineEdit" name="label"/>
    </item>
    <item>
     <widget class="QPushButton" name="pushButton">

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() {

src/qt/qt_settings_bus_tracking.cpp

@@ -203,7 +203,6 @@ SettingsBusTracking::device_track(int set, uint8_t dev_type, int bus, int channe
     int i, element;
     uint64_t mask;
     uint8_t count = 0;
-    fprintf(stderr, "set: %d, dev_type: %hd, bus: %d, channel: %d\n", set, dev_type, bus, channel);
 
     switch (bus) {
         case HDD_BUS_MFM: