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 /qt-models | |
| 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 'qt-models')
| -rw-r--r-- | qt-models/divelocationmodel.cpp | 4 | ||||
| -rw-r--r-- | qt-models/divetripmodel.cpp | 2 | ||||
| -rw-r--r-- | qt-models/models.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/qt-models/divelocationmodel.cpp b/qt-models/divelocationmodel.cpp index 794302fe2..d6fb09573 100644 --- a/qt-models/divelocationmodel.cpp +++ b/qt-models/divelocationmodel.cpp @@ -80,7 +80,7 @@ QVariant LocationInformationModel::data(const QModelIndex &index, int role) cons } return textField->text(); } - case Qt::DecorationRole : return QIcon(":plus"); + case Qt::DecorationRole : return QIcon(":list-add-icon"); } } @@ -108,7 +108,7 @@ QVariant LocationInformationModel::data(const QModelIndex &index, int role) cons break; case Qt::DecorationRole : { if (dive_site_has_gps_location(ds)) - return QIcon(":geocode"); + return QIcon(":geotag-icon"); else return QVariant(); } diff --git a/qt-models/divetripmodel.cpp b/qt-models/divetripmodel.cpp index 2a0b29449..b9693fcd2 100644 --- a/qt-models/divetripmodel.cpp +++ b/qt-models/divetripmodel.cpp @@ -85,7 +85,7 @@ QVariant TripItem::data(int column, int role) const QVariant DiveItem::data(int column, int role) const { QVariant retVal; - QString icon_names[4] = {":zero",":duringPhoto", ":outsidePhoto", ":inAndOutPhoto" }; + QString icon_names[4] = {":zero",":photo-in-icon", ":photo-out-icon", ":photo-in-out-icon" }; struct dive *dive = get_dive_by_uniq_id(diveId); if (!dive) return QVariant(); diff --git a/qt-models/models.cpp b/qt-models/models.cpp index c5bfda745..fa9519600 100644 --- a/qt-models/models.cpp +++ b/qt-models/models.cpp @@ -14,13 +14,13 @@ const QPixmap &trashIcon() { - static QPixmap trash = QPixmap(":trash").scaledToHeight(defaultIconMetrics().sz_small); + static QPixmap trash = QPixmap(":list-remove-icon").scaledToHeight(defaultIconMetrics().sz_small); return trash; } const QPixmap &trashForbiddenIcon() { - static QPixmap trash = QPixmap(":trashForbidden").scaledToHeight(defaultIconMetrics().sz_small); + static QPixmap trash = QPixmap(":list-remove-disabled-icon").scaledToHeight(defaultIconMetrics().sz_small); return trash; } |