claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Final round of bugfixes

Browse Source
This commit is contained in:
Cacodemon345
2022-02-07 12:16:07 +06:00
parent fdb67ee872
commit 94ce0f9613
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/qt/qt_mainwindow.cpp
View File

@@ -88,7 +88,15 @@ MainWindow::MainWindow(QWidget *parent) :
auto toolbar_label = new QLabel(); auto toolbar_label = new QLabel();
ui->toolBar->addWidget(toolbar_label); ui->toolBar->addWidget(toolbar_label);
#ifdef RELEASE_BUILD
this->setWindowIcon(QIcon(":/settings/win/icons/86Box-green.ico"));
#elif defined ALPHA_BUILD
this->setWindowIcon(QIcon(":/settings/win/icons/86Box-read.ico"))
#elif defined BETA_BUILD
this->setWindowIcon(QIcon(":/settings/win/icons/86Box-yellow.ico")); this->setWindowIcon(QIcon(":/settings/win/icons/86Box-yellow.ico"));
#else
this->setWindowIcon(QIcon(":/settings/win/icons/86Box-gray.ico"));
#endif
this->setWindowFlag(Qt::MSWindowsFixedSizeDialogHint, vid_resize != 1); this->setWindowFlag(Qt::MSWindowsFixedSizeDialogHint, vid_resize != 1);
this->setWindowFlag(Qt::WindowMaximizeButtonHint, vid_resize == 1); this->setWindowFlag(Qt::WindowMaximizeButtonHint, vid_resize == 1);

4
src/qt/qt_settingsfloppycdrom.cpp
View File

@@ -173,8 +173,8 @@ void SettingsFloppyCDROM::onCDROMRowChanged(const QModelIndex &current) {
if (! match.isEmpty()) { if (! match.isEmpty()) {
ui->comboBoxChannel->setCurrentIndex(match.first().row()); ui->comboBoxChannel->setCurrentIndex(match.first().row());
} }
else ui->comboBoxChannel->setCurrentIndex(8);
ui->comboBoxSpeed->setCurrentIndex(speed - 1); ui->comboBoxSpeed->setCurrentIndex(speed == 0 ? 7 : speed - 1);
} }
void SettingsFloppyCDROM::on_checkBoxTurboTimings_stateChanged(int arg1) { void SettingsFloppyCDROM::on_checkBoxTurboTimings_stateChanged(int arg1) {