diff --git a/companion/src/apppreferencesdialog.cpp b/companion/src/apppreferencesdialog.cpp index 97cd25fdd..8b46cd41e 100644 --- a/companion/src/apppreferencesdialog.cpp +++ b/companion/src/apppreferencesdialog.cpp @@ -215,8 +215,6 @@ void AppPreferencesDialog::initSettings() ui->profileNameLE->setText(g.profile[g.id()].name()); ui->SplashFileName->setText(g.profile[g.id()].splashFile()); - displayImage( g.profile[g.id()].splashFile() ); - QString hwSettings; if (g.profile[g.id()].stickPotCalib() == "" ) { hwSettings = tr("EMPTY: No radio settings stored in profile"); @@ -231,6 +229,22 @@ void AppPreferencesDialog::initSettings() ui->lblGeneralSettings->setText(hwSettings); Firmware * current_firmware = getCurrentFirmware(); + + if (!IS_HORUS(current_firmware->getBoard())) { + displayImage(g.profile[g.id()].splashFile()); + } + // TODO: Remove once splash replacement supported on Horus + // NOTE: 480x272 image causes issues on screens <800px high, needs a solution like scrolling once reinstated + else { + ui->imageLabel->hide(); + ui->splashLabel->hide(); + ui->SplashFileName->hide(); + ui->SplashSelect->hide(); + ui->SplashSelect->setEnabled(false); + ui->clearImageButton->hide(); + ui->clearImageButton->setEnabled(false); + ui->splashSeparator->hide(); + } foreach(Firmware * firmware, firmwares) { ui->downloadVerCB->addItem(firmware->getName(), firmware->getId()); diff --git a/companion/src/apppreferencesdialog.ui b/companion/src/apppreferencesdialog.ui index 7975a3253..3c668b2c3 100644 --- a/companion/src/apppreferencesdialog.ui +++ b/companion/src/apppreferencesdialog.ui @@ -177,14 +177,14 @@ May be different from firmware language - + Qt::Horizontal - + 0