sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-08 00:05:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

[gui/hidpi] scale splash screen on startup not on release

Browse Source
This commit is contained in:
Juergen E. Fischer 2016-07-02 12:54:37 +02:00
parent 87d0168ff8
commit 9446b20fe1
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/release.pl
View File

@ -131,8 +131,6 @@ if( $domajor ) {
my $splashwidth; my $splashwidth;
unless( $dopoint ) { unless( $dopoint ) {
pod2usage("Splash images/splash/splash-$newmajor.$newminor.png not found") unless -r "images/splash/splash-$newmajor.$newminor.png"; pod2usage("Splash images/splash/splash-$newmajor.$newminor.png not found") unless -r "images/splash/splash-$newmajor.$newminor.png";
$splashwidth = `identify -format '%w' images/splash/splash-$newmajor.$newminor.png`;
print "WARNING: Splash images/splash/splash-$newmajor.$newminor.png is $splashwidth pixels wide - will be rescaled\n" if $splashwidth != 600;
pod2usage("NSIS image ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.bmp not found") unless -r "ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.bmp"; pod2usage("NSIS image ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.bmp not found") unless -r "ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.bmp";
my $welcomeformat = `identify -format '%wx%h %m' ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.bmp`; my $welcomeformat = `identify -format '%wx%h %m' ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.bmp`;
pod2usage("NSIS Image ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.bmp mis-sized [$welcomeformat vs. 164x314 BMP3]") unless $welcomeformat =~ /^164x314 /; pod2usage("NSIS Image ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.bmp mis-sized [$welcomeformat vs. 164x314 BMP3]") unless $welcomeformat =~ /^164x314 /;
@ -174,11 +172,7 @@ run( "dch --newversion $version 'Release of $version'", "dch failed" );
run( "cp debian/changelog /tmp", "backup changelog failed" ); run( "cp debian/changelog /tmp", "backup changelog failed" );
unless( $dopoint ) { unless( $dopoint ) {
if( $splashwidth != 600 ) {
run( "convert -resize 600x300 images/splash/splash-$newmajor.$newminor.png images/splash/splash.png", "rescale of splash png failed" );
} else {
run( "cp -v images/splash/splash-$newmajor.$newminor.png images/splash/splash.png", "splash png switch failed" ); run( "cp -v images/splash/splash-$newmajor.$newminor.png images/splash/splash.png", "splash png switch failed" );
}
run( "convert -resize 164x314 ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.bmp BMP3:ms-windows/Installer-Files/WelcomeFinishPage.bmp", "installer bitmap switch failed" ); run( "convert -resize 164x314 ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.bmp BMP3:ms-windows/Installer-Files/WelcomeFinishPage.bmp", "installer bitmap switch failed" );
if( -f "images/splash/splash-release.xcf.bz2" ) { if( -f "images/splash/splash-release.xcf.bz2" ) {

13
src/app/main.cpp
View File

@ -37,6 +37,7 @@
#if QT_VERSION < 0x050000 #if QT_VERSION < 0x050000
#include <QPlastiqueStyle> #include <QPlastiqueStyle>
#endif #endif
#include <QDesktopWidget>
#include <QTranslator> #include <QTranslator>
#include <QImageReader> #include <QImageReader>
#include <QMessageBox> #include <QMessageBox>
@ -1032,12 +1033,12 @@ int main( int argc, char *argv[] )
//set up splash screen //set up splash screen
QString mySplashPath( QgsCustomization::instance()->splashPath() ); QString mySplashPath( QgsCustomization::instance()->splashPath() );
QPixmap myPixmap( mySplashPath + QLatin1String( "splash.png" ) ); QPixmap myPixmap( mySplashPath + QLatin1String( "splash.png" ) );
QSplashScreen *mypSplash = new QSplashScreen( myPixmap );
if ( mySettings.value( "/qgis/hideSplash" ).toBool() || myHideSplash ) double w = 600 * qApp->desktop()->logicalDpiX() / 96;
{ double h = 300 * qApp->desktop()->logicalDpiY() / 96;
//splash screen hidden
} QSplashScreen *mypSplash = new QSplashScreen( myPixmap.scaled( w, h, Qt::KeepAspectRatio ) );
else if ( !myHideSplash && !mySettings.value( "/qgis/hideSplash" ).toBool() )
{ {
//for win and linux we can just automask and png transparency areas will be used //for win and linux we can just automask and png transparency areas will be used
mypSplash->setMask( myPixmap.mask() ); mypSplash->setMask( myPixmap.mask() );