summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTeo Mrnjavac <teo@kde.org>2014-08-26 18:21:16 +0200
committerTeo Mrnjavac <teo@kde.org>2014-08-26 18:24:51 +0200
commit2182fd2f0cb44f152e6e2ef1cb783cb6020bb3bd (patch)
treec4db009c2adce9fdd6fe282cdeb65bd8f80b0425
parent5434a04ebca8c5accc52ae3f471c8c027b7b4f32 (diff)
Add info and fail icons to libcalamaresui.
-rw-r--r--data/images/fail.svgzbin0 -> 1279 bytes
-rw-r--r--data/images/information.svgzbin0 -> 1122 bytes
-rw-r--r--src/libcalamaresui/libcalamaresui.qrc2
-rw-r--r--src/libcalamaresui/utils/CalamaresUtilsGui.cpp8
-rw-r--r--src/libcalamaresui/utils/CalamaresUtilsGui.h4
5 files changed, 13 insertions, 1 deletions
diff --git a/data/images/fail.svgz b/data/images/fail.svgz
new file mode 100644
index 000000000..feca389f5
--- /dev/null
+++ b/data/images/fail.svgz
Binary files differ
diff --git a/data/images/information.svgz b/data/images/information.svgz
new file mode 100644
index 000000000..2d84c1cb0
--- /dev/null
+++ b/data/images/information.svgz
Binary files differ
diff --git a/src/libcalamaresui/libcalamaresui.qrc b/src/libcalamaresui/libcalamaresui.qrc
index 4bea23aeb..5bf10bda1 100644
--- a/src/libcalamaresui/libcalamaresui.qrc
+++ b/src/libcalamaresui/libcalamaresui.qrc
@@ -2,5 +2,7 @@
<qresource prefix="/data">
<file alias="images/yes.svgz">../../data/images/yes.svgz</file>
<file alias="images/no.svgz">../../data/images/no.svgz</file>
+ <file alias="images/information.svgz">../../data/images/information.svgz</file>
+ <file alias="images/fail.svgz">../../data/images/fail.svgz</file>
</qresource>
</RCC>
diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp b/src/libcalamaresui/utils/CalamaresUtilsGui.cpp
index 747460261..48d8055d8 100644
--- a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp
+++ b/src/libcalamaresui/utils/CalamaresUtilsGui.cpp
@@ -50,6 +50,14 @@ defaultPixmap( ImageType type, ImageMode mode, const QSize& size )
pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/no.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;
+
default:
break;
}
diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.h b/src/libcalamaresui/utils/CalamaresUtilsGui.h
index 1a52bf305..20d6bc8b4 100644
--- a/src/libcalamaresui/utils/CalamaresUtilsGui.h
+++ b/src/libcalamaresui/utils/CalamaresUtilsGui.h
@@ -32,7 +32,9 @@ namespace CalamaresUtils
enum ImageType
{
Yes,
- No
+ No,
+ Information,
+ Fail
};
enum ImageMode