From 2747056889c6e003880201998353e28591faab62 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 29 Nov 2017 14:04:52 -0800 Subject: Revert "Use consistent aliases for all icons." This reverts commit 92e9c6606f6ef3ad16d2e31f9f9a8f5fa14f2c1a. --- desktop-widgets/configuredivecomputerdialog.ui | 8 ++--- desktop-widgets/filterwidget.ui | 4 +-- desktop-widgets/locationInformation.ui | 2 +- desktop-widgets/locationinformation.cpp | 4 +-- desktop-widgets/mainwindow.ui | 34 +++++++++++----------- .../preferences/preferences_defaults.cpp | 2 +- .../preferences/preferences_georeference.cpp | 2 +- desktop-widgets/preferences/preferences_graph.cpp | 2 +- .../preferences/preferences_language.cpp | 2 +- .../preferences/preferences_network.cpp | 2 +- desktop-widgets/preferences/preferences_units.cpp | 2 +- desktop-widgets/searchbar.ui | 4 +-- desktop-widgets/simplewidgets.cpp | 6 ++-- desktop-widgets/starwidget.cpp | 2 +- desktop-widgets/tab-widgets/maintab.ui | 2 +- desktop-widgets/tableview.cpp | 2 +- desktop-widgets/usermanual.cpp | 6 ++-- 17 files changed, 43 insertions(+), 43 deletions(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/configuredivecomputerdialog.ui b/desktop-widgets/configuredivecomputerdialog.ui index 1657aaf3a..d647d1134 100644 --- a/desktop-widgets/configuredivecomputerdialog.ui +++ b/desktop-widgets/configuredivecomputerdialog.ui @@ -215,7 +215,7 @@ - :dc-ostc-3-icon:dc-ostc-3-icon + :icons/ostc3.png:icons/ostc3.png @@ -224,7 +224,7 @@ - :dc-suunto-vyper-icon:dc-suunto-vyper-icon + :icons/suunto_vyper.png:icons/suunto_vyper.png @@ -233,7 +233,7 @@ - :dc-ostc-2n-icon:dc-ostc-2n-icon + :icons/ostc2n.png:icons/ostc2n.png @@ -242,7 +242,7 @@ - :dc-ostc-4-icon:dc-ostc-4-icon + :icons/ostc4.png:icons/ostc4.png diff --git a/desktop-widgets/filterwidget.ui b/desktop-widgets/filterwidget.ui index 99117f031..8e42019ce 100644 --- a/desktop-widgets/filterwidget.ui +++ b/desktop-widgets/filterwidget.ui @@ -74,7 +74,7 @@ - :edit-clear-icon:edit-clear-icon + :filter-reset:filter-reset true @@ -88,7 +88,7 @@ - :show-icon:show-icon + :filter-hide:filter-hide true diff --git a/desktop-widgets/locationInformation.ui b/desktop-widgets/locationInformation.ui index b86bdcc92..9103bbc1f 100644 --- a/desktop-widgets/locationInformation.ui +++ b/desktop-widgets/locationInformation.ui @@ -166,7 +166,7 @@ - :dive-spot-selected-icon:dive-spot-selected-icon + :mapwidget-marker-selected:mapwidget-marker-selected diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp index 5212b0bf9..454c4c68f 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(":list-add-icon"); - static const QIcon geoCode(":geotag-icon"); + static const QIcon plusIcon(":plus"); + static const QIcon geoCode(":geocode"); if (index.row() <= 1) { // two special cases. if (index.column() == UUID) { diff --git a/desktop-widgets/mainwindow.ui b/desktop-widgets/mainwindow.ui index 7c967eba4..75b4f7f5c 100644 --- a/desktop-widgets/mainwindow.ui +++ b/desktop-widgets/mainwindow.ui @@ -479,7 +479,7 @@ - :ppo2-icon:ppo2-icon + :icon_o2:icon_o2 Toggle pO₂ graph @@ -491,7 +491,7 @@ - :ppn2-icon:ppn2-icon + :icon_n2:icon_n2 Toggle pN₂ graph @@ -503,7 +503,7 @@ - :pphe-icon:pphe-icon + :icon_he:icon_he Toggle pHe graph @@ -515,7 +515,7 @@ - :ceiling-dc-icon:ceiling-dc-icon + :icon_ceiling_dc:icon_ceiling_dc Toggle DC reported ceiling @@ -527,7 +527,7 @@ - :ceiling-calculated-icon:ceiling-calculated-icon + :icon_ceiling_calculated:icon_ceiling_calculated Toggle calculated ceiling @@ -539,7 +539,7 @@ - :ceiling-tissues-icon:ceiling-tissues-icon + :icon_ceiling_alltissues:icon_ceiling_alltissues Toggle calculating all tissues @@ -551,7 +551,7 @@ - :ceiling-increments-icon:ceiling-increments-icon + :icon_ceiling_3m:icon_ceiling_3m Toggle calculated ceiling with 3m increments @@ -563,7 +563,7 @@ - :heart-rate-icon:heart-rate-icon + :icon_HR:icon_HR Toggle heart rate @@ -575,7 +575,7 @@ - :depth-mod-icon:depth-mod-icon + :icon_mod:icon_mod Toggle MOD @@ -587,7 +587,7 @@ - :depth-ead-icon:depth-ead-icon + :icon_ead:icon_ead Toggle EAD, END, EADD @@ -599,7 +599,7 @@ - :depth-ndl-icon:depth-ndl-icon + :icon_NDLTTS:icon_NDLTTS Toggle NDL, TTS @@ -611,7 +611,7 @@ - :sac-rate-icon:sac-rate-icon + :icon_lung:icon_lung Toggle SAC rate @@ -623,7 +623,7 @@ - :ruler-icon:ruler-icon + :ruler:ruler Toggle ruler @@ -635,7 +635,7 @@ - :scale-icon:scale-icon + :scale:scale Scale graph @@ -647,7 +647,7 @@ - :photo-icon:photo-icon + :pictures:pictures Toggle pictures @@ -659,7 +659,7 @@ - :tanks-icon:tanks-icon + :gaschange:gaschange Toggle gas bar @@ -682,7 +682,7 @@ - :tissue-icon:tissue-icon + :icon_tissue:icon_tissue Toggle tissue heat-map diff --git a/desktop-widgets/preferences/preferences_defaults.cpp b/desktop-widgets/preferences/preferences_defaults.cpp index 42dcae13d..0d4e83cc2 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(":preferences-other-icon"), 0 ), ui(new Ui::PreferencesDefaults()) +PreferencesDefaults::PreferencesDefaults(): AbstractPreferencesWidget(tr("General"), QIcon(":defaults"), 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 314a37c94..1d960d4b5 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(":geotag-icon"), 9) +PreferencesGeoreference::PreferencesGeoreference() : AbstractPreferencesWidget(tr("Georeference"), QIcon(":georeference"), 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 20e0918ab..9f45c7db6 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-icon"), 5) +PreferencesGraph::PreferencesGraph() : AbstractPreferencesWidget(tr("Profile"), QIcon(":graph"), 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 687be1399..def46a0e2 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(":preferences-desktop-locale-icon"), 4) +PreferencesLanguage::PreferencesLanguage() : AbstractPreferencesWidget(tr("Language"), QIcon(":language"), 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 c7ce57f2e..6ccf97384 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-icon"), 9), ui(new Ui::PreferencesNetwork()) +PreferencesNetwork::PreferencesNetwork() : AbstractPreferencesWidget(tr("Network"),QIcon(":network"), 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 5ae03fba2..2ff09f192 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-icon"),1), ui(new Ui::PreferencesUnits()) +PreferencesUnits::PreferencesUnits(): AbstractPreferencesWidget(tr("Units"),QIcon(":units"),1), ui(new Ui::PreferencesUnits()) { ui->setupUi(this); } diff --git a/desktop-widgets/searchbar.ui b/desktop-widgets/searchbar.ui index 3acd0aab3..22bce39c6 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 f142e6155..457589dde 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-icon").pixmap(16, 16)); + avgIco->setPixmap(QIcon(":average").pixmap(16, 16)); avgIco->setToolTip(QObject::tr("Average")); minIco = new QLabel(owner); - minIco->setPixmap(QIcon(":minimum-icon").pixmap(16, 16)); + minIco->setPixmap(QIcon(":minimum").pixmap(16, 16)); minIco->setToolTip(QObject::tr("Minimum")); maxIco = new QLabel(owner); - maxIco->setPixmap(QIcon(":maximum-icon").pixmap(16, 16)); + maxIco->setPixmap(QIcon(":maximum").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 6f65a33a3..503b094ad 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-icon")); + QSvgRenderer render(QString(":star")); 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 7a1be9aed..6fa611153 100644 --- a/desktop-widgets/tab-widgets/maintab.ui +++ b/desktop-widgets/tab-widgets/maintab.ui @@ -226,7 +226,7 @@ - :geotag-icon:geotag-icon + :geocode:geocode diff --git a/desktop-widgets/tableview.cpp b/desktop-widgets/tableview.cpp index 560f98a43..29ccbdbd3 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(":list-add-icon"); + QIcon plusIcon(":plus"); plusBtn = new QPushButton(plusIcon, QString(), this); plusBtn->setFlat(true); diff --git a/desktop-widgets/usermanual.cpp b/desktop-widgets/usermanual.cpp index 69000dd54..580dadcfd 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(":go-down-icon")); - ui.findPrev->setIcon(QIcon(":go-up-icon")); - ui.findClose->setIcon(QIcon(":window-close-icon")); + 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")); #endif connect(ui.findNext, SIGNAL(pressed()), this, SIGNAL(searchNext())); -- cgit v1.2.3-70-g09d2