From 506b79ef2cfbb62cf0e0ccf6d5fa360258491ec5 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Thu, 2 Apr 2015 12:49:40 +0200 Subject: [PATCH] Add new icons to CalamaresUtils::defaultPixmap. --- .../utils/CalamaresUtilsGui.cpp | 60 +++++++++++-------- src/libcalamaresui/utils/CalamaresUtilsGui.h | 7 ++- 2 files changed, 41 insertions(+), 26 deletions(-) diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp b/src/libcalamaresui/utils/CalamaresUtilsGui.cpp index a5b585fcc..97f6ed05d 100644 --- a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp +++ b/src/libcalamaresui/utils/CalamaresUtilsGui.cpp @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === * - * Copyright 2014, Teo Mrnjavac + * Copyright 2014-2015, Teo Mrnjavac * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -42,36 +42,48 @@ defaultPixmap( ImageType type, ImageMode mode, const QSize& size ) switch ( type ) { - case Yes: - pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/yes.svgz", size ); - break; + case Yes: + pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/yes.svgz", size ); + break; - case No: - pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/no.svgz", size ); - break; + case No: + pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/no.svgz", size ); + break; - case Information: - pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/information.svgz", size ); - break; + case Information: + pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/information.svgz", size ); + break; - case Fail: - pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/fail.svgz", size ); - break; + case Fail: + pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/fail.svgz", size ); + break; - case Partitions: - pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/partitions.svgz", size ); - break; + case Partitions: + pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/partitions.svgz", size ); + break; - case Magic: - pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/magic.svgz", size ); - break; + case Magic: + pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/magic.svgz", size ); + break; - case Replace: - pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/replace.svgz", size ); - break; + case Replace: + pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/replace.svgz", size ); + break; - default: - break; + case Bugs: + pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/bugs.svg", size ); + break; + + case Help: + pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/help.svg", size ); + break; + + case Release: + pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/release.svg", size ); + break; + + default: + break; } if ( pixmap.isNull() ) diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.h b/src/libcalamaresui/utils/CalamaresUtilsGui.h index 047e35e12..f5ac59777 100644 --- a/src/libcalamaresui/utils/CalamaresUtilsGui.h +++ b/src/libcalamaresui/utils/CalamaresUtilsGui.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === * - * Copyright 2014, Teo Mrnjavac + * Copyright 2014-2015, Teo Mrnjavac * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -37,7 +37,10 @@ enum ImageType : int Fail, Partitions, Magic, - Replace + Replace, + Bugs, + Help, + Release }; enum ImageMode