summaryrefslogtreecommitdiffstats
path: root/qt-ui
diff options
context:
space:
mode:
authorGravatar roberto forini <forini.r@gmail.com>2014-07-10 10:54:05 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-07-10 12:37:54 -0700
commit9262d8a5187475b157dde399f84b58ee0ff8e4b5 (patch)
treea29c6bcff9a62c835816a6ed1fd019a30cf8b303 /qt-ui
parent29b35ad6d8e7701eb9e2b89e9b6f3b8ff987a6ca (diff)
downloadsubsurface-9262d8a5187475b157dde399f84b58ee0ff8e4b5.tar.gz
Use different gas change icons
[Dirk Hohndel: scaled PNG files and added the code to show them and to make them somewhat bigger] Signed-off-by: roberto forini <forini.r@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui')
-rw-r--r--qt-ui/profile/diveeventitem.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/qt-ui/profile/diveeventitem.cpp b/qt-ui/profile/diveeventitem.cpp
index aacb0af73..55408dfdc 100644
--- a/qt-ui/profile/diveeventitem.cpp
+++ b/qt-ui/profile/diveeventitem.cpp
@@ -59,7 +59,7 @@ void DiveEventItem::setEvent(struct event *ev)
void DiveEventItem::setupPixmap()
{
#define EVENT_PIXMAP(PIX) QPixmap(QString(PIX)).scaled(20, 20, Qt::KeepAspectRatio, Qt::SmoothTransformation)
-#define EVENT_PIXMAP_BIGGER(PIX) QPixmap(QString(PIX)).scaled(30, 28, Qt::KeepAspectRatio, Qt::SmoothTransformation)
+#define EVENT_PIXMAP_BIGGER(PIX) QPixmap(QString(PIX)).scaled(40, 38, Qt::KeepAspectRatio, Qt::SmoothTransformation)
if (!internalEvent->name) {
setPixmap(EVENT_PIXMAP(":warning"));
} else if (internalEvent->type == SAMPLE_EVENT_BOOKMARK) {
@@ -67,7 +67,12 @@ void DiveEventItem::setupPixmap()
} else if (strcmp(internalEvent->name, "heading") == 0) {
setPixmap(EVENT_PIXMAP(":flag"));
} else if (internalEvent->type == SAMPLE_EVENT_GASCHANGE || internalEvent->type == SAMPLE_EVENT_GASCHANGE2) {
- setPixmap(EVENT_PIXMAP_BIGGER(":gaschange"));
+ if (internalEvent->value >> 16)
+ setPixmap(EVENT_PIXMAP_BIGGER(":gaschangeTrimix"));
+ else if (internalEvent->value == 0)
+ setPixmap(EVENT_PIXMAP_BIGGER(":gaschangeAir"));
+ else
+ setPixmap(EVENT_PIXMAP_BIGGER(":gaschangeNitrox"));
} else {
setPixmap(EVENT_PIXMAP(":warning"));
}