diff --git a/desktop-widgets/configuredivecomputerdialog.ui b/desktop-widgets/configuredivecomputerdialog.ui index d647d1134..1657aaf3a 100644 --- a/desktop-widgets/configuredivecomputerdialog.ui +++ b/desktop-widgets/configuredivecomputerdialog.ui @@ -215,7 +215,7 @@ - :icons/ostc3.png:icons/ostc3.png + :dc-ostc-3-icon:dc-ostc-3-icon @@ -224,7 +224,7 @@ - :icons/suunto_vyper.png:icons/suunto_vyper.png + :dc-suunto-vyper-icon:dc-suunto-vyper-icon @@ -233,7 +233,7 @@ - :icons/ostc2n.png:icons/ostc2n.png + :dc-ostc-2n-icon:dc-ostc-2n-icon @@ -242,7 +242,7 @@ - :icons/ostc4.png:icons/ostc4.png + :dc-ostc-4-icon:dc-ostc-4-icon diff --git a/desktop-widgets/filterwidget.ui b/desktop-widgets/filterwidget.ui index 8e42019ce..7f548a931 100644 --- a/desktop-widgets/filterwidget.ui +++ b/desktop-widgets/filterwidget.ui @@ -74,7 +74,7 @@ - :filter-reset:filter-reset + :edit-clear-icon:edit-clear-icon true @@ -88,7 +88,7 @@ - :filter-hide:filter-hide + :hide-icon:hide-icon true diff --git a/desktop-widgets/locationInformation.ui b/desktop-widgets/locationInformation.ui index 9103bbc1f..fdd191d4f 100644 --- a/desktop-widgets/locationInformation.ui +++ b/desktop-widgets/locationInformation.ui @@ -166,7 +166,7 @@ - :mapwidget-marker-selected:mapwidget-marker-selected + :dive-location-marker-selected-icon:dive-location-marker-selected-icon diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp index 454c4c68f..5212b0bf9 100644 --- a/desktop-widgets/locationinformation.cpp +++ b/desktop-widgets/locationinformation.cpp @@ -376,8 +376,8 @@ void DiveLocationModel::resetModel() QVariant DiveLocationModel::data(const QModelIndex &index, int role) const { - static const QIcon plusIcon(":plus"); - static const QIcon geoCode(":geocode"); + static const QIcon plusIcon(":list-add-icon"); + static const QIcon geoCode(":geotag-icon"); if (index.row() <= 1) { // two special cases. if (index.column() == UUID) { diff --git a/desktop-widgets/mainwindow.ui b/desktop-widgets/mainwindow.ui index 41cba8a5a..93f19e84e 100644 --- a/desktop-widgets/mainwindow.ui +++ b/desktop-widgets/mainwindow.ui @@ -454,7 +454,7 @@ - :icon_o2:icon_o2 + :pp-o2-icon:pp-o2-icon Toggle pO₂ graph @@ -466,7 +466,7 @@ - :icon_n2:icon_n2 + :pp-n2-icon:pp-n2-icon Toggle pN₂ graph @@ -478,7 +478,7 @@ - :icon_he:icon_he + :pp-he-icon:pp-he-icon Toggle pHe graph @@ -490,7 +490,7 @@ - :icon_ceiling_dc:icon_ceiling_dc + :ceiling-dc-icon:ceiling-dc-icon Toggle DC reported ceiling @@ -502,7 +502,7 @@ - :icon_ceiling_calculated:icon_ceiling_calculated + :ceiling-calculated-icon:ceiling-calculated-icon Toggle calculated ceiling @@ -514,7 +514,7 @@ - :icon_ceiling_alltissues:icon_ceiling_alltissues + :ceiling-tissues-icon:ceiling-tissues-icon Toggle calculating all tissues @@ -526,7 +526,7 @@ - :icon_ceiling_3m:icon_ceiling_3m + :ceiling-increments-icon:ceiling-increments-icon Toggle calculated ceiling with 3m increments @@ -538,7 +538,7 @@ - :icon_HR:icon_HR + :rate-heart-icon:rate-heart-icon Toggle heart rate @@ -550,7 +550,7 @@ - :icon_mod:icon_mod + :depth-mod-icon:depth-mod-icon Toggle MOD @@ -562,7 +562,7 @@ - :icon_ead:icon_ead + :depth-ead-icon:depth-ead-icon Toggle EAD, END, EADD @@ -574,7 +574,7 @@ - :icon_NDLTTS:icon_NDLTTS + :depth-ndl-icon:depth-ndl-icon Toggle NDL, TTS @@ -586,7 +586,7 @@ - :icon_lung:icon_lung + :rate-sac-icon:rate-sac-icon Toggle SAC rate @@ -598,7 +598,7 @@ - :ruler:ruler + :ruler-icon:ruler-icon Toggle ruler @@ -610,7 +610,7 @@ - :scale:scale + :scale-graph-icon:scale-graph-icon Scale graph @@ -622,7 +622,7 @@ - :pictures:pictures + :photo-icon:photo-icon Toggle pictures @@ -634,7 +634,7 @@ - :gaschange:gaschange + :gaschange-icon:gaschange-icon Toggle gas bar @@ -657,7 +657,7 @@ - :icon_tissue:icon_tissue + :heatmap-icon:heatmap-icon Toggle tissue heat-map diff --git a/desktop-widgets/preferences/preferences_defaults.cpp b/desktop-widgets/preferences/preferences_defaults.cpp index 0d4e83cc2..42dcae13d 100644 --- a/desktop-widgets/preferences/preferences_defaults.cpp +++ b/desktop-widgets/preferences/preferences_defaults.cpp @@ -7,7 +7,7 @@ #include -PreferencesDefaults::PreferencesDefaults(): AbstractPreferencesWidget(tr("General"), QIcon(":defaults"), 0 ), ui(new Ui::PreferencesDefaults()) +PreferencesDefaults::PreferencesDefaults(): AbstractPreferencesWidget(tr("General"), QIcon(":preferences-other-icon"), 0 ), ui(new Ui::PreferencesDefaults()) { ui->setupUi(this); } diff --git a/desktop-widgets/preferences/preferences_georeference.cpp b/desktop-widgets/preferences/preferences_georeference.cpp index 1d960d4b5..314a37c94 100644 --- a/desktop-widgets/preferences/preferences_georeference.cpp +++ b/desktop-widgets/preferences/preferences_georeference.cpp @@ -8,7 +8,7 @@ #include -PreferencesGeoreference::PreferencesGeoreference() : AbstractPreferencesWidget(tr("Georeference"), QIcon(":georeference"), 9) +PreferencesGeoreference::PreferencesGeoreference() : AbstractPreferencesWidget(tr("Georeference"), QIcon(":geotag-icon"), 9) { ui = new Ui::PreferencesGeoreference(); ui->setupUi(this); diff --git a/desktop-widgets/preferences/preferences_graph.cpp b/desktop-widgets/preferences/preferences_graph.cpp index 9f45c7db6..20e0918ab 100644 --- a/desktop-widgets/preferences/preferences_graph.cpp +++ b/desktop-widgets/preferences/preferences_graph.cpp @@ -7,7 +7,7 @@ #include "qt-models/models.h" -PreferencesGraph::PreferencesGraph() : AbstractPreferencesWidget(tr("Profile"), QIcon(":graph"), 5) +PreferencesGraph::PreferencesGraph() : AbstractPreferencesWidget(tr("Profile"), QIcon(":graph-icon"), 5) { ui = new Ui::PreferencesGraph(); ui->setupUi(this); diff --git a/desktop-widgets/preferences/preferences_language.cpp b/desktop-widgets/preferences/preferences_language.cpp index def46a0e2..687be1399 100644 --- a/desktop-widgets/preferences/preferences_language.cpp +++ b/desktop-widgets/preferences/preferences_language.cpp @@ -10,7 +10,7 @@ #include "qt-models/models.h" -PreferencesLanguage::PreferencesLanguage() : AbstractPreferencesWidget(tr("Language"), QIcon(":language"), 4) +PreferencesLanguage::PreferencesLanguage() : AbstractPreferencesWidget(tr("Language"), QIcon(":preferences-desktop-locale-icon"), 4) { ui = new Ui::PreferencesLanguage(); ui->setupUi(this); diff --git a/desktop-widgets/preferences/preferences_network.cpp b/desktop-widgets/preferences/preferences_network.cpp index 6ccf97384..9ea78f50b 100644 --- a/desktop-widgets/preferences/preferences_network.cpp +++ b/desktop-widgets/preferences/preferences_network.cpp @@ -8,7 +8,7 @@ #include "core/subsurface-qt/SettingsObjectWrapper.h" #include -PreferencesNetwork::PreferencesNetwork() : AbstractPreferencesWidget(tr("Network"),QIcon(":network"), 9), ui(new Ui::PreferencesNetwork()) +PreferencesNetwork::PreferencesNetwork() : AbstractPreferencesWidget(tr("Network"),QIcon(":preferences-system-network-icon"), 9), ui(new Ui::PreferencesNetwork()) { ui->setupUi(this); diff --git a/desktop-widgets/preferences/preferences_units.cpp b/desktop-widgets/preferences/preferences_units.cpp index 2ff09f192..5ae03fba2 100644 --- a/desktop-widgets/preferences/preferences_units.cpp +++ b/desktop-widgets/preferences/preferences_units.cpp @@ -5,7 +5,7 @@ #include "core/qthelper.h" #include "core/subsurface-qt/SettingsObjectWrapper.h" -PreferencesUnits::PreferencesUnits(): AbstractPreferencesWidget(tr("Units"),QIcon(":units"),1), ui(new Ui::PreferencesUnits()) +PreferencesUnits::PreferencesUnits(): AbstractPreferencesWidget(tr("Units"),QIcon(":units-icon"),1), ui(new Ui::PreferencesUnits()) { ui->setupUi(this); } diff --git a/desktop-widgets/searchbar.ui b/desktop-widgets/searchbar.ui index 22bce39c6..3acd0aab3 100644 --- a/desktop-widgets/searchbar.ui +++ b/desktop-widgets/searchbar.ui @@ -73,7 +73,7 @@ - + @@ -97,7 +97,7 @@ - + diff --git a/desktop-widgets/simplewidgets.cpp b/desktop-widgets/simplewidgets.cpp index 457589dde..fbc0a941d 100644 --- a/desktop-widgets/simplewidgets.cpp +++ b/desktop-widgets/simplewidgets.cpp @@ -30,13 +30,13 @@ public: MinMaxAvgWidgetPrivate(MinMaxAvgWidget *owner) { avgIco = new QLabel(owner); - avgIco->setPixmap(QIcon(":average").pixmap(16, 16)); + avgIco->setPixmap(QIcon(":value-average-icon").pixmap(16, 16)); avgIco->setToolTip(QObject::tr("Average")); minIco = new QLabel(owner); - minIco->setPixmap(QIcon(":minimum").pixmap(16, 16)); + minIco->setPixmap(QIcon(":value-minimum-icon").pixmap(16, 16)); minIco->setToolTip(QObject::tr("Minimum")); maxIco = new QLabel(owner); - maxIco->setPixmap(QIcon(":maximum").pixmap(16, 16)); + maxIco->setPixmap(QIcon(":value-maximum-icon").pixmap(16, 16)); maxIco->setToolTip(QObject::tr("Maximum")); avgValue = new QLabel(owner); minValue = new QLabel(owner); diff --git a/desktop-widgets/starwidget.cpp b/desktop-widgets/starwidget.cpp index 503b094ad..6f65a33a3 100644 --- a/desktop-widgets/starwidget.cpp +++ b/desktop-widgets/starwidget.cpp @@ -99,7 +99,7 @@ StarWidget::StarWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f), int dim = defaultIconMetrics().sz_small; if (activeStar.isNull()) { - QSvgRenderer render(QString(":star")); + QSvgRenderer render(QString(":star-icon")); QPixmap renderedStar(dim, dim); renderedStar.fill(Qt::transparent); diff --git a/desktop-widgets/tab-widgets/maintab.ui b/desktop-widgets/tab-widgets/maintab.ui index 6fa611153..7a1be9aed 100644 --- a/desktop-widgets/tab-widgets/maintab.ui +++ b/desktop-widgets/tab-widgets/maintab.ui @@ -226,7 +226,7 @@ - :geocode:geocode + :geotag-icon:geotag-icon diff --git a/desktop-widgets/tableview.cpp b/desktop-widgets/tableview.cpp index 29ccbdbd3..560f98a43 100644 --- a/desktop-widgets/tableview.cpp +++ b/desktop-widgets/tableview.cpp @@ -43,7 +43,7 @@ TableView::TableView(QWidget *parent) : QGroupBox(parent) } layout()->setContentsMargins(margins); - QIcon plusIcon(":plus"); + QIcon plusIcon(":list-add-icon"); plusBtn = new QPushButton(plusIcon, QString(), this); plusBtn->setFlat(true); diff --git a/desktop-widgets/usermanual.cpp b/desktop-widgets/usermanual.cpp index 580dadcfd..69000dd54 100644 --- a/desktop-widgets/usermanual.cpp +++ b/desktop-widgets/usermanual.cpp @@ -11,9 +11,9 @@ SearchBar::SearchBar(QWidget *parent): QWidget(parent) { ui.setupUi(this); #if defined(Q_OS_MAC) || defined(Q_OS_WIN) - ui.findNext->setIcon(QIcon(":icons/subsurface/32x32/actions/go-down.png")); - ui.findPrev->setIcon(QIcon(":icons/subsurface/32x32/actions/go-up.png")); - ui.findClose->setIcon(QIcon(":icons/subsurface/32x32/actions/window-close.png")); + ui.findNext->setIcon(QIcon(":go-down-icon")); + ui.findPrev->setIcon(QIcon(":go-up-icon")); + ui.findClose->setIcon(QIcon(":window-close-icon")); #endif connect(ui.findNext, SIGNAL(pressed()), this, SIGNAL(searchNext())); diff --git a/map-widget/qml/MapWidget.qml b/map-widget/qml/MapWidget.qml index af9b47135..ee6b49231 100644 --- a/map-widget/qml/MapWidget.qml +++ b/map-widget/qml/MapWidget.qml @@ -56,7 +56,7 @@ Item { z: mapHelper.model.selectedUuid === model.uuid ? mapHelper.model.count - 1 : 0 sourceItem: Image { id: mapItemImage - source: "qrc:///mapwidget-marker" + (mapHelper.model.selectedUuid === model.uuid ? "-selected" : (mapHelper.editMode ? "-gray" : "")) + source: "qrc:///dive-location-marker" + (mapHelper.model.selectedUuid === model.uuid ? "-selected" : (mapHelper.editMode ? "-inactive" : "")) + "-icon" SequentialAnimation { id: mapItemImageAnimation PropertyAnimation { target: mapItemImage; property: "scale"; from: 1.0; to: 0.7; duration: 120 } @@ -258,7 +258,7 @@ Item { x: 10; y: x width: 40 height: 40 - source: "qrc:///mapwidget-toggle-" + (map.activeMapType === map.mapType.SATELLITE ? "street" : "satellite") + source: "qrc:///map-style-" + (map.activeMapType === map.mapType.SATELLITE ? "map" : "photo") + "-icon" SequentialAnimation { id: toggleImageAnimation PropertyAnimation { target: toggleImage; property: "scale"; from: 1.0; to: 0.8; duration: 120 } @@ -278,7 +278,7 @@ Item { x: 10 + (toggleImage.width - imageZoomIn.width) * 0.5; y: toggleImage.y + toggleImage.height + 10 width: 20 height: 20 - source: "qrc:///mapwidget-zoom-in" + source: "qrc:///zoom-in-icon" SequentialAnimation { id: imageZoomInAnimation PropertyAnimation { target: imageZoomIn; property: "scale"; from: 1.0; to: 0.8; duration: 120 } @@ -301,7 +301,7 @@ Item { Image { id: imageZoomOut x: imageZoomIn.x; y: imageZoomIn.y + imageZoomIn.height + 10 - source: "qrc:///mapwidget-zoom-out" + source: "qrc:///zoom-out-icon" width: 20 height: 20 SequentialAnimation { diff --git a/map-widget/qml/MapWidgetContextMenu.qml b/map-widget/qml/MapWidgetContextMenu.qml index a7cb568b3..cf96cd975 100644 --- a/map-widget/qml/MapWidgetContextMenu.qml +++ b/map-widget/qml/MapWidgetContextMenu.qml @@ -31,7 +31,7 @@ Item { Image { id: contextMenuImage x: -width - source: "qrc:///mapwidget-context-menu" + source: "qrc:///open-menu-icon" SequentialAnimation { id:contextMenuImageAnimation diff --git a/profile-widget/diveeventitem.cpp b/profile-widget/diveeventitem.cpp index bb9350a2f..949c31c8c 100644 --- a/profile-widget/diveeventitem.cpp +++ b/profile-widget/diveeventitem.cpp @@ -81,19 +81,19 @@ void DiveEventItem::setupPixmap() #define EVENT_PIXMAP(PIX) QPixmap(QString(PIX)).scaled(sz_pix, sz_pix, Qt::KeepAspectRatio, Qt::SmoothTransformation) #define EVENT_PIXMAP_BIGGER(PIX) QPixmap(QString(PIX)).scaled(sz_bigger, sz_bigger, Qt::KeepAspectRatio, Qt::SmoothTransformation) if (same_string(internalEvent->name, "")) { - setPixmap(EVENT_PIXMAP(":warning-icon")); + setPixmap(EVENT_PIXMAP(":status-warning-icon")); } else if (internalEvent->type == SAMPLE_EVENT_BOOKMARK) { - setPixmap(EVENT_PIXMAP(":flag")); + setPixmap(EVENT_PIXMAP(":dive-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-trimix-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-oxygen-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 @@ -114,11 +114,11 @@ void DiveEventItem::setupPixmap() setPixmap(transparentPixmap); #ifdef SAMPLE_FLAGS_SEVERITY_SHIFT } else if (((internalEvent->flags & SAMPLE_FLAGS_SEVERITY_MASK) >> SAMPLE_FLAGS_SEVERITY_SHIFT) == 2) { - setPixmap(EVENT_PIXMAP(":info-icon")); + setPixmap(EVENT_PIXMAP(":status-info-icon")); } else if (((internalEvent->flags & SAMPLE_FLAGS_SEVERITY_MASK) >> SAMPLE_FLAGS_SEVERITY_SHIFT) == 3) { - setPixmap(EVENT_PIXMAP(":warning-icon")); + setPixmap(EVENT_PIXMAP(":status-warning-icon")); } else if (((internalEvent->flags & SAMPLE_FLAGS_SEVERITY_MASK) >> SAMPLE_FLAGS_SEVERITY_SHIFT) == 4) { - setPixmap(EVENT_PIXMAP(":violation-icon")); + setPixmap(EVENT_PIXMAP(":status-violation-icon")); #endif } else if (same_string_caseinsensitive(internalEvent->name, "violation") || // generic libdivecomputer same_string_caseinsensitive(internalEvent->name, "Safety stop violation") || // the rest are from the Uemis downloader @@ -127,17 +127,17 @@ void DiveEventItem::setupPixmap() same_string_caseinsensitive(internalEvent->name, "Dive time alert") || same_string_caseinsensitive(internalEvent->name, "Low battery alert") || same_string_caseinsensitive(internalEvent->name, "Speed alarm")) { - setPixmap(EVENT_PIXMAP(":violation-icon")); + setPixmap(EVENT_PIXMAP(":status-violation-icon")); } else if (same_string_caseinsensitive(internalEvent->name, "non stop time") || // generic libdivecomputer same_string_caseinsensitive(internalEvent->name, "safety stop") || same_string_caseinsensitive(internalEvent->name, "safety stop (voluntary)") || same_string_caseinsensitive(internalEvent->name, "Tank change suggested") || // Uemis downloader same_string_caseinsensitive(internalEvent->name, "Marker")) { - setPixmap(EVENT_PIXMAP(":info-icon")); + setPixmap(EVENT_PIXMAP(":status-info-icon")); } else { // we should do some guessing based on the type / name of the event; // for now they all get the warning icon - setPixmap(EVENT_PIXMAP(":warning-icon")); + setPixmap(EVENT_PIXMAP(":status-warning-icon")); } #undef EVENT_PIXMAP #undef EVENT_PIXMAP_BIGGER 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 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; } diff --git a/subsurface.qrc b/subsurface.qrc index 83b93cc29..d771282a6 100644 --- a/subsurface.qrc +++ b/subsurface.qrc @@ -3,41 +3,44 @@ map-widget/qml/MapWidget.qml map-widget/qml/MapWidgetError.qml map-widget/qml/MapWidgetContextMenu.qml - map-widget/qml/icons/mapwidget-marker.png - map-widget/qml/icons/mapwidget-marker-gray.png - map-widget/qml/icons/mapwidget-marker-selected.png - map-widget/qml/icons/mapwidget-toggle-satellite.png - map-widget/qml/icons/mapwidget-toggle-street.png - map-widget/qml/icons/mapwidget-context-menu.png - map-widget/qml/icons/mapwidget-zoom-in.png - map-widget/qml/icons/mapwidget-zoom-out.png - icons/satellite.svg - icons/star.svg + map-widget/qml/icons/mapwidget-marker.png + map-widget/qml/icons/mapwidget-marker-gray.png + map-widget/qml/icons/mapwidget-marker-selected.png + map-widget/qml/icons/mapwidget-toggle-satellite.png + map-widget/qml/icons/mapwidget-toggle-street.png + map-widget/qml/icons/mapwidget-context-menu.png + map-widget/qml/icons/mapwidget-zoom-in.png + map-widget/qml/icons/mapwidget-zoom-out.png + icons/satellite.svg + icons/graph.png + icons/scale.png + icons/go-top.svg + icons/star.svg icons/subsurface-icon.png icons/subsurface-mobile-icon.png - icons/plus.png - icons/trash.png - icons/trash-forbidden.png - icons/units.png - icons/advanced.png - icons/network.png - icons/graph.png - icons/minimum.png - icons/maximum.png - icons/average.png - icons/warning.png - icons/warning-icon.png - icons/violation-icon.png - icons/info-icon.png - icons/gaschange.png - icons/Air_change.png - icons/Nx_change.png - icons/Tmx_change.png - icons/Oxy_change.png - icons/flag.png - icons/scale.png - icons/ruler.png - icons/poster.png + icons/plus.png + icons/trash.png + icons/trash-forbidden.png + icons/units.png + icons/advanced.png + icons/network.png + icons/graph.png + icons/minimum.png + icons/maximum.png + icons/average.png + icons/warning.png + icons/warning-icon.png + icons/violation-icon.png + icons/info-icon.png + icons/gaschange.png + icons/Air_change.png + icons/Nx_change.png + icons/Tmx_change.png + icons/Oxy_change.png + icons/flag.png + icons/scale.png + icons/ruler.png + icons/poster.png xslt/commonTemplates.xsl xslt/csv2xml.xslt xslt/divelogs-export.xslt @@ -58,40 +61,40 @@ xslt/shearwater.xslt xslt/DiveLog.xslt xslt/av1.xslt - icons/gas.png - icons/mod.png - icons/he.png - icons/n2.png - icons/o2.png - icons/ss.png - icons/icon-ceiling-alltissues.png - icons/limit.png - icons/3x3.png - icons/pc.png - icons/ead.png - icons/icon-HR.png - icons/heatmap.png - icons/pictures.png + icons/gas.png + icons/mod.png + icons/he.png + icons/n2.png + icons/o2.png + icons/ss.png + icons/icon-ceiling-alltissues.png + icons/limit.png + icons/3x3.png + icons/pc.png + icons/ead.png + icons/icon-HR.png + icons/heatmap.png + icons/pictures.png icons/subsurface/index.theme - icons/subsurface/32x32/actions/go-down.png - icons/subsurface/32x32/actions/go-up.png - icons/subsurface/32x32/actions/window-close.png - icons/ostc2n.png - icons/ostc3.png - icons/ostc4.png - icons/suunto_vyper.png - icons/facebook.png - icons/georeference.png - icons/edit-undo.svg - icons/go-top.svg + icons/subsurface/32x32/actions/go-down.png + icons/subsurface/32x32/actions/go-up.png + icons/subsurface/32x32/actions/window-close.png + icons/ostc2n.png + icons/ostc3.png + icons/ostc4.png + icons/suunto_vyper.png + icons/facebook.png + icons/georeference.png + icons/edit-undo.svg + icons/go-top.svg icons/process-stop.svg - icons/edit-circled.svg + icons/edit-circled.svg icons/Emblem-earth.svg - icons/geocode.svg - icons/duringPhoto.png - icons/outsidePhoto.png - icons/inAndOutPhoto.png - icons/language.png - icons/defaults.png + icons/geocode.svg + icons/duringPhoto.png + icons/outsidePhoto.png + icons/inAndOutPhoto.png + icons/language.png + icons/defaults.png