Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 17:55:19 +03:00
Code Issues Wiki Activity

Warning removed

Browse source
This commit is contained in:
Bertrand Songis 2014-02-13 18:11:40 +01:00
parent a918f293cf
commit aa19969759
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
companion/src/burndialog.cpp
View file

@ -212,8 +212,8 @@ void burnDialog::checkFw(QString fileName)
ui->SplashFrame->show(); ui->SplashFrame->show();
ui->ImageLoadButton->setEnabled(true); ui->ImageLoadButton->setEnabled(true);
ui->libraryButton->setEnabled(true); ui->libraryButton->setEnabled(true);
ui->FwImage->setFixedSize(flash.getSplashWidth(),flash.getSplashHeight()); ui->FwImage->setFixedSize(flash.getSplashWidth(), flash.getSplashHeight());
ui->imageLabel->setFixedSize(flash.getSplashWidth(),flash.getSplashHeight()); ui->imageLabel->setFixedSize(flash.getSplashWidth(), flash.getSplashHeight());
ui->FwImage->show(); ui->FwImage->show();
ui->FwImage->setPixmap(QPixmap::fromImage(flash.getSplash())); ui->FwImage->setPixmap(QPixmap::fromImage(flash.getSplash()));
QString ImageStr = settings.value("SplashImage", "").toString(); QString ImageStr = settings.value("SplashImage", "").toString();

2
companion/src/customizesplashdialog.cpp
View file

@ -37,7 +37,7 @@ bool Side::displayImage( QString fileName, Source pictSource )
return false; return false;
else else
image = flash.getSplash(); image = flash.getSplash();
*format = flash.getSplashWidth()==WIDTH_TARANIS ? LCDTARANIS : LCD9X; *format = (flash.getSplashWidth()==WIDTH_TARANIS ? LCDTARANIS : LCD9X);
} }
else { else {
image.load(fileName); image.load(fileName);

2
companion/src/flashinterface.cpp
View file

@ -413,7 +413,7 @@ bool FlashInterface::setSplash(const QImage & newsplash)
} }
} }
uint FlashInterface::getSplashWidth() int FlashInterface::getSplashWidth()
{ {
return splash_width; return splash_width;
} }

2
companion/src/flashinterface.h
View file

@ -59,7 +59,7 @@ public:
QImage getSplash(); QImage getSplash();
bool setSplash(const QImage & newsplash); bool setSplash(const QImage & newsplash);
bool hasSplash(); bool hasSplash();
uint getSplashWidth(); int getSplashWidth();
uint getSplashHeight(); uint getSplashHeight();
uint getSplashColors(); uint getSplashColors();
QImage::Format getSplashFormat(); QImage::Format getSplashFormat();