diff options
| author |  Martin Měřinský <mermar@centrum.cz> | 2017-11-29 10:57:08 +0100 |
|---|---|---|
| committer |  Tomaz Canabrava <tcanabrava@kde.org> | 2017-11-29 11:46:35 +0100 |
| commit | 92e9c6606f6ef3ad16d2e31f9f9a8f5fa14f2c1a (patch) | |
| tree | ca35a73e433d3c667c7ae805d1776ccdbc5e165a /profile-widget | |
| parent | b0d98f6e269be9560de1b9c140855c85fecf1dd1 (diff) | |
| download | subsurface-92e9c6606f6ef3ad16d2e31f9f9a8f5fa14f2c1a.tar.gz | |
Use consistent aliases for all icons.
Icon aliases were inconsistent mess. Underscores vs. hyphens vs. camelCase.
With vs. without filename suffix. Lower vs. upper case. "icon" suffix vs.
prefix vs. nothing. Some were duplicated, eg warning vs. warning-icon. Some
icons didn't have alias at all.
This changes all icon aliases to one, easy grep-able style which complies
to Freedesktop Icon Naming Specification (Guidelines).
Signed-off-by: Martin Měřinský <mermar@centrum.cz>
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 bb9350a2f..425e4310f 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(":flag")); + setPixmap(EVENT_PIXMAP(":bookmark-icon")); } else if (event_is_gaschange(internalEvent)) { struct gasmix *mix = get_gasmix_from_event(&displayed_dive, internalEvent); if (mix->he.permille) - setPixmap(EVENT_PIXMAP_BIGGER(":gaschangeTrimix")); + setPixmap(EVENT_PIXMAP_BIGGER(":gaschange-tmx-icon")); else if (gasmix_is_air(mix)) - setPixmap(EVENT_PIXMAP_BIGGER(":gaschangeAir")); + setPixmap(EVENT_PIXMAP_BIGGER(":gaschange-air-icon")); else if (mix->o2.permille == 1000) - setPixmap(EVENT_PIXMAP_BIGGER(":gaschangeOxy")); + setPixmap(EVENT_PIXMAP_BIGGER(":gaschange-oxy-icon")); else - setPixmap(EVENT_PIXMAP_BIGGER(":gaschangeNitrox")); + setPixmap(EVENT_PIXMAP_BIGGER(":gaschange-ean-icon")); #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 5caec0689..1c2f18b29 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(":trash"); + static QPixmap p = QPixmap(":list-remove-icon"); setPixmap(p); setFlag(ItemIgnoresTransformations); } diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index 80276c7d1..d7b159cd0 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"), + backgroundFile(":poster-icon"), #ifndef SUBSURFACE_MOBILE toolTipItem(new ToolTipItem()), #endif |