diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-11-29 14:04:52 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-11-29 14:05:07 -0800 |
| commit | 2747056889c6e003880201998353e28591faab62 (patch) | |
| tree | ec0362db822a9a5b008ec28f3e3336e3a5505348 /profile-widget | |
| parent | 13c6a55a96434609dd053664d3a9093f41bf9ae1 (diff) | |
| download | subsurface-2747056889c6e003880201998353e28591faab62.tar.gz | |
Revert "Use consistent aliases for all icons."
This reverts commit 92e9c6606f6ef3ad16d2e31f9f9a8f5fa14f2c1a.
Diffstat (limited to 'profile-widget')
| -rw-r--r-- | profile-widget/diveeventitem.cpp | 10 | ||||
| -rw-r--r-- | profile-widget/divepixmapitem.cpp | 2 | ||||
| -rw-r--r-- | profile-widget/profilewidget2.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/profile-widget/diveeventitem.cpp b/profile-widget/diveeventitem.cpp index 425e4310f..bb9350a2f 100644 --- a/profile-widget/diveeventitem.cpp +++ b/profile-widget/diveeventitem.cpp @@ -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 diff --git a/profile-widget/divepixmapitem.cpp b/profile-widget/divepixmapitem.cpp index 1c2f18b29..5caec0689 100644 --- a/profile-widget/divepixmapitem.cpp +++ b/profile-widget/divepixmapitem.cpp @@ -29,7 +29,7 @@ void DiveButtonItem::mousePressEvent(QGraphicsSceneMouseEvent *event) // paint on screen, but for now, this. CloseButtonItem::CloseButtonItem(QObject *parent): DiveButtonItem(parent) { - static QPixmap p = QPixmap(":list-remove-icon"); + static QPixmap p = QPixmap(":trash"); setPixmap(p); setFlag(ItemIgnoresTransformations); } diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index d7b159cd0..80276c7d1 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -86,7 +86,7 @@ ProfileWidget2::ProfileWidget2(QWidget *parent) : QGraphicsView(parent), zoomLevel(0), zoomFactor(1.15), background(new DivePixmapItem()), - backgroundFile(":poster-icon"), + backgroundFile(":poster"), #ifndef SUBSURFACE_MOBILE toolTipItem(new ToolTipItem()), #endif |