napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hardcode Calamares logo in About.

Browse Source 
CAL-241 #close
This commit is contained in:
Teo Mrnjavac 2015-06-16 02:38:07 +02:00
parent bc112889ea
commit bd7dd43c90
4 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libcalamaresui/libcalamaresui.qrc
View File

@ -13,5 +13,6 @@
<file alias="images/partition-erase-auto.svg">../../data/images/partition-erase-auto.svg</file>
<file alias="images/partition-manual.svg">../../data/images/partition-manual.svg</file>
<file alias="images/partition-replace-os.svg">../../data/images/partition-replace-os.svg</file>
<file alias="images/squid.svg">../../data/images/squid.svg</file>
</qresource>
</RCC>

4
src/libcalamaresui/utils/CalamaresUtilsGui.cpp
View File

@ -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;
}

3
src/libcalamaresui/utils/CalamaresUtilsGui.h
View File

@ -43,7 +43,8 @@ enum ImageType : int
PartitionAlongside,
PartitionEraseAuto,
PartitionManual,
PartitionReplaceOs
PartitionReplaceOs,
Squid
};
enum ImageMode

11
src/modules/welcome/WelcomePage.cpp
View File

@ -66,7 +66,7 @@ WelcomePage::WelcomePage( RequirementsChecker* requirementsChecker, QWidget* par
connect( ui->aboutButton, &QPushButton::clicked,
this, [ this ]
{
QMessageBox::about( this,
QMessageBox mb( QMessageBox::Information,
tr( "About %1 installer" )
.arg( CALAMARES_APPLICATION_NAME ),
tr(
@ -84,7 +84,14 @@ WelcomePage::WelcomePage( RequirementsChecker* requirementsChecker, QWidget* par
.arg( CALAMARES_APPLICATION_NAME )
.arg( CALAMARES_VERSION )
.arg( Calamares::Branding::instance()->string(
Calamares::Branding::VersionedName ) ) );
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 );