mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Use consistent aliases for all icons."

Browse source 
This reverts commit 92e9c6606f.
This commit is contained in:
Dirk Hohndel 2017-11-29 14:04:52 -08:00
parent 13c6a55a96
commit 2747056889
26 changed files with 122 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

10
profile-widget/diveeventitem.cpp
View file

@ -83,17 +83,17 @@ void DiveEventItem::setupPixmap()
if (same_string(internalEvent->name, "")) {
setPixmap(EVENT_PIXMAP(":warning-icon"));
} else if (internalEvent->type == SAMPLE_EVENT_BOOKMARK) {
setPixmap(EVENT_PIXMAP(":bookmark-icon"));
setPixmap(EVENT_PIXMAP(":flag"));
} else if (event_is_gaschange(internalEvent)) {
struct gasmix *mix = get_gasmix_from_event(&displayed_dive, internalEvent);
if (mix->he.permille)
setPixmap(EVENT_PIXMAP_BIGGER(":gaschange-tmx-icon"));
setPixmap(EVENT_PIXMAP_BIGGER(":gaschangeTrimix"));
else if (gasmix_is_air(mix))
setPixmap(EVENT_PIXMAP_BIGGER(":gaschange-air-icon"));
setPixmap(EVENT_PIXMAP_BIGGER(":gaschangeAir"));
else if (mix->o2.permille == 1000)
setPixmap(EVENT_PIXMAP_BIGGER(":gaschange-oxy-icon"));
setPixmap(EVENT_PIXMAP_BIGGER(":gaschangeOxy"));
else
setPixmap(EVENT_PIXMAP_BIGGER(":gaschange-ean-icon"));
setPixmap(EVENT_PIXMAP_BIGGER(":gaschangeNitrox"));
#ifdef SAMPLE_FLAGS_SEVERITY_SHIFT
} else if ((((internalEvent->flags & SAMPLE_FLAGS_SEVERITY_MASK) >> SAMPLE_FLAGS_SEVERITY_SHIFT) == 1) ||
// those are useless internals of the dive computer