From b09598283047a4da33511ee2c39dc847261f4bf7 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Thu, 2 Apr 2015 14:03:12 +0200 Subject: [PATCH] Expose new partitioning icons in CalamaresUtils::defaultPixmap. --- .../utils/CalamaresUtilsGui.cpp | 28 +++++++++++-------- src/libcalamaresui/utils/CalamaresUtilsGui.h | 9 +++--- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp b/src/libcalamaresui/utils/CalamaresUtilsGui.cpp index 97f6ed05d..797b880ba 100644 --- a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp +++ b/src/libcalamaresui/utils/CalamaresUtilsGui.cpp @@ -58,18 +58,6 @@ defaultPixmap( ImageType type, ImageMode mode, const QSize& size ) pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/fail.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 Replace: - pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/replace.svgz", size ); - break; - case Bugs: pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/bugs.svg", size ); break; @@ -82,6 +70,22 @@ defaultPixmap( ImageType type, ImageMode mode, const QSize& size ) pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/release.svg", size ); break; + case PartitionAlongside: + pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/partition-alongside.svg", size ); + break; + + case PartitionEraseAuto: + pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/partition-erase-auto.svg", size ); + break; + + case PartitionManual: + pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/partition-manual.svg", size ); + break; + + case PartitionReplaceOs: + pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/partition-replace-os.svg", size ); + break; + default: break; } diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.h b/src/libcalamaresui/utils/CalamaresUtilsGui.h index f5ac59777..7e9e4e205 100644 --- a/src/libcalamaresui/utils/CalamaresUtilsGui.h +++ b/src/libcalamaresui/utils/CalamaresUtilsGui.h @@ -35,12 +35,13 @@ enum ImageType : int No, Information, Fail, - Partitions, - Magic, - Replace, Bugs, Help, - Release + Release, + PartitionAlongside, + PartitionEraseAuto, + PartitionManual, + PartitionReplaceOs }; enum ImageMode