diff --git a/src/libcalamaresui/libcalamaresui.qrc b/src/libcalamaresui/libcalamaresui.qrc index c109fa5d7..9514fd78f 100644 --- a/src/libcalamaresui/libcalamaresui.qrc +++ b/src/libcalamaresui/libcalamaresui.qrc @@ -13,5 +13,6 @@ ../../data/images/partition-erase-auto.svg ../../data/images/partition-manual.svg ../../data/images/partition-replace-os.svg + ../../data/images/squid.svg diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp b/src/libcalamaresui/utils/CalamaresUtilsGui.cpp index 2d837dd4e..cc7681c89 100644 --- a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp +++ b/src/libcalamaresui/utils/CalamaresUtilsGui.cpp @@ -94,6 +94,10 @@ defaultPixmap( ImageType type, ImageMode mode, const QSize& size ) pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/partition-replace-os.svg", size ); break; + case Squid: + pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/squid.svg", size ); + break; + default: break; } diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.h b/src/libcalamaresui/utils/CalamaresUtilsGui.h index af31320b2..2626fee64 100644 --- a/src/libcalamaresui/utils/CalamaresUtilsGui.h +++ b/src/libcalamaresui/utils/CalamaresUtilsGui.h @@ -43,7 +43,8 @@ enum ImageType : int PartitionAlongside, PartitionEraseAuto, PartitionManual, - PartitionReplaceOs + PartitionReplaceOs, + Squid }; enum ImageMode diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp index ecf974ada..87bc54dc0 100644 --- a/src/modules/welcome/WelcomePage.cpp +++ b/src/modules/welcome/WelcomePage.cpp @@ -66,25 +66,32 @@ WelcomePage::WelcomePage( RequirementsChecker* requirementsChecker, QWidget* par connect( ui->aboutButton, &QPushButton::clicked, this, [ this ] { - QMessageBox::about( this, - tr( "About %1 installer" ) - .arg( CALAMARES_APPLICATION_NAME ), - tr( - "

%1


" - "%2
" - "for %3


" - "Copyright 2014-2015 Teo Mrnjavac <teo@kde.org>
" - "Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Philip Müller, " - "Pier Luigi Fiorini and Rohan Garg.

" - "Calamares " - "development is sponsored by
" - "Blue Systems - " - "Liberating Software." - ) - .arg( CALAMARES_APPLICATION_NAME ) - .arg( CALAMARES_VERSION ) - .arg( Calamares::Branding::instance()->string( - Calamares::Branding::VersionedName ) ) ); + QMessageBox mb( QMessageBox::Information, + tr( "About %1 installer" ) + .arg( CALAMARES_APPLICATION_NAME ), + tr( + "

%1


" + "%2
" + "for %3


" + "Copyright 2014-2015 Teo Mrnjavac <teo@kde.org>
" + "Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Philip Müller, " + "Pier Luigi Fiorini and Rohan Garg.

" + "Calamares " + "development is sponsored by
" + "Blue Systems - " + "Liberating Software." + ) + .arg( CALAMARES_APPLICATION_NAME ) + .arg( CALAMARES_VERSION ) + .arg( Calamares::Branding::instance()->string( + Calamares::Branding::VersionedName ) ), + QMessageBox::Ok, + this ); + mb.setIconPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::Squid, + CalamaresUtils::Original, + QSize( CalamaresUtils::defaultFontHeight() * 6, + CalamaresUtils::defaultFontHeight() * 6 ) ) ); + mb.exec(); } ); ui->verticalLayout->insertStretch( 3 );