Hardcode Calamares logo in About.

CAL-241 #close

src/libcalamaresui/libcalamaresui.qrc

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

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

src/libcalamaresui/utils/CalamaresUtilsGui.h

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

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(
-                                "<h1>%1</h1><br/>"
-                                "<strong>%2<br/>"
-                                "for %3</strong><br/><br/>"
-                                "Copyright 2014-2015 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>"
-                                "Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Philip Müller, "
-                                "Pier Luigi Fiorini and Rohan Garg.<br/><br/>"
-                                "<a href=\"http://calamares.io/\">Calamares</a> "
-                                "development is sponsored by <br/>"
-                                "<a href=\"http://www.blue-systems.com/\">Blue Systems</a> - "
-                                "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(
+                            "<h1>%1</h1><br/>"
+                            "<strong>%2<br/>"
+                            "for %3</strong><br/><br/>"
+                            "Copyright 2014-2015 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>"
+                            "Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Philip Müller, "
+                            "Pier Luigi Fiorini and Rohan Garg.<br/><br/>"
+                            "<a href=\"http://calamares.io/\">Calamares</a> "
+                            "development is sponsored by <br/>"
+                            "<a href=\"http://www.blue-systems.com/\">Blue Systems</a> - "
+                            "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 );