mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Use consistent aliases for all icons."

Browse source 
This reverts commit 92e9c6606f.
This commit is contained in:
Dirk Hohndel 2017-11-29 14:04:52 -08:00
parent 13c6a55a96
commit 2747056889
26 changed files with 122 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

8
desktop-widgets/configuredivecomputerdialog.ui
View file

@ -215,7 +215,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:dc-ostc-3-icon</normaloff>:dc-ostc-3-icon</iconset>
<normaloff>:icons/ostc3.png</normaloff>:icons/ostc3.png</iconset>
</property>
</item>
<item>
@ -224,7 +224,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:dc-suunto-vyper-icon</normaloff>:dc-suunto-vyper-icon</iconset>
<normaloff>:icons/suunto_vyper.png</normaloff>:icons/suunto_vyper.png</iconset>
</property>
</item>
<item>
@ -233,7 +233,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:dc-ostc-2n-icon</normaloff>:dc-ostc-2n-icon</iconset>
<normaloff>:icons/ostc2n.png</normaloff>:icons/ostc2n.png</iconset>
</property>
</item>
<item>
@ -242,7 +242,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:dc-ostc-4-icon</normaloff>:dc-ostc-4-icon</iconset>
<normaloff>:icons/ostc4.png</normaloff>:icons/ostc4.png</iconset>
</property>
</item>
</widget>

4
desktop-widgets/filterwidget.ui
View file

@ -74,7 +74,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:edit-clear-icon</normaloff>:edit-clear-icon</iconset>
<normaloff>:filter-reset</normaloff>:filter-reset</iconset>
</property>
<property name="autoRaise">
<bool>true</bool>
@ -88,7 +88,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:show-icon</normaloff>:show-icon</iconset>
<normaloff>:filter-hide</normaloff>:filter-hide</iconset>
</property>
<property name="autoRaise">
<bool>true</bool>

2
desktop-widgets/locationInformation.ui
View file

@ -166,7 +166,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:dive-spot-selected-icon</normaloff>:dive-spot-selected-icon</iconset>
<normaloff>:mapwidget-marker-selected</normaloff>:mapwidget-marker-selected</iconset>
</property>
</widget>
</item>

4
desktop-widgets/locationinformation.cpp
View file

@ -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) {

34
desktop-widgets/mainwindow.ui
View file

@ -479,7 +479,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:ppo2-icon</normaloff>:ppo2-icon</iconset>
<normaloff>:icon_o2</normaloff>:icon_o2</iconset>
</property>
<property name="text">
<string>Toggle pO₂ graph</string>
@ -491,7 +491,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:ppn2-icon</normaloff>:ppn2-icon</iconset>
<normaloff>:icon_n2</normaloff>:icon_n2</iconset>
</property>
<property name="text">
<string>Toggle pN₂ graph</string>
@ -503,7 +503,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:pphe-icon</normaloff>:pphe-icon</iconset>
<normaloff>:icon_he</normaloff>:icon_he</iconset>
</property>
<property name="text">
<string>Toggle pHe graph</string>
@ -515,7 +515,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:ceiling-dc-icon</normaloff>:ceiling-dc-icon</iconset>
<normaloff>:icon_ceiling_dc</normaloff>:icon_ceiling_dc</iconset>
</property>
<property name="text">
<string>Toggle DC reported ceiling</string>
@ -527,7 +527,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:ceiling-calculated-icon</normaloff>:ceiling-calculated-icon</iconset>
<normaloff>:icon_ceiling_calculated</normaloff>:icon_ceiling_calculated</iconset>
</property>
<property name="text">
<string>Toggle calculated ceiling</string>
@ -539,7 +539,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:ceiling-tissues-icon</normaloff>:ceiling-tissues-icon</iconset>
<normaloff>:icon_ceiling_alltissues</normaloff>:icon_ceiling_alltissues</iconset>
</property>
<property name="text">
<string>Toggle calculating all tissues</string>
@ -551,7 +551,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:ceiling-increments-icon</normaloff>:ceiling-increments-icon</iconset>
<normaloff>:icon_ceiling_3m</normaloff>:icon_ceiling_3m</iconset>
</property>
<property name="text">
<string>Toggle calculated ceiling with 3m increments</string>
@ -563,7 +563,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:heart-rate-icon</normaloff>:heart-rate-icon</iconset>
<normaloff>:icon_HR</normaloff>:icon_HR</iconset>
</property>
<property name="text">
<string>Toggle heart rate</string>
@ -575,7 +575,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:depth-mod-icon</normaloff>:depth-mod-icon</iconset>
<normaloff>:icon_mod</normaloff>:icon_mod</iconset>
</property>
<property name="text">
<string>Toggle MOD</string>
@ -587,7 +587,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:depth-ead-icon</normaloff>:depth-ead-icon</iconset>
<normaloff>:icon_ead</normaloff>:icon_ead</iconset>
</property>
<property name="text">
<string>Toggle EAD, END, EADD</string>
@ -599,7 +599,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:depth-ndl-icon</normaloff>:depth-ndl-icon</iconset>
<normaloff>:icon_NDLTTS</normaloff>:icon_NDLTTS</iconset>
</property>
<property name="text">
<string>Toggle NDL, TTS</string>
@ -611,7 +611,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:sac-rate-icon</normaloff>:sac-rate-icon</iconset>
<normaloff>:icon_lung</normaloff>:icon_lung</iconset>
</property>
<property name="text">
<string>Toggle SAC rate</string>
@ -623,7 +623,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:ruler-icon</normaloff>:ruler-icon</iconset>
<normaloff>:ruler</normaloff>:ruler</iconset>
</property>
<property name="text">
<string>Toggle ruler</string>
@ -635,7 +635,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:scale-icon</normaloff>:scale-icon</iconset>
<normaloff>:scale</normaloff>:scale</iconset>
</property>
<property name="text">
<string>Scale graph</string>
@ -647,7 +647,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:photo-icon</normaloff>:photo-icon</iconset>
<normaloff>:pictures</normaloff>:pictures</iconset>
</property>
<property name="text">
<string>Toggle pictures</string>
@ -659,7 +659,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:tanks-icon</normaloff>:tanks-icon</iconset>
<normaloff>:gaschange</normaloff>:gaschange</iconset>
</property>
<property name="text">
<string>Toggle gas bar</string>
@ -682,7 +682,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:tissue-icon</normaloff>:tissue-icon</iconset>
<normaloff>:icon_tissue</normaloff>:icon_tissue</iconset>
</property>
<property name="text">
<string>Toggle tissue heat-map</string>

2
desktop-widgets/preferences/preferences_defaults.cpp
View file

@ -7,7 +7,7 @@
#include <QFileDialog>
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);
}

2
desktop-widgets/preferences/preferences_georeference.cpp
View file

@ -8,7 +8,7 @@
#include <ctime>
PreferencesGeoreference::PreferencesGeoreference() : AbstractPreferencesWidget(tr("Georeference"), QIcon(":geotag-icon"), 9)
PreferencesGeoreference::PreferencesGeoreference() : AbstractPreferencesWidget(tr("Georeference"), QIcon(":georeference"), 9)
{
ui = new Ui::PreferencesGeoreference();
ui->setupUi(this);

2
desktop-widgets/preferences/preferences_graph.cpp
View file

@ -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);

2
desktop-widgets/preferences/preferences_language.cpp
View file

@ -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);

2
desktop-widgets/preferences/preferences_network.cpp
View file

@ -8,7 +8,7 @@
#include "core/subsurface-qt/SettingsObjectWrapper.h"
#include <QNetworkProxy>
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);

2
desktop-widgets/preferences/preferences_units.cpp
View file

@ -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);
}

4
desktop-widgets/searchbar.ui
View file

@ -73,7 +73,7 @@
<string/>
</property>
<property name="icon">
<iconset theme="go-up-icon">
<iconset theme="go-up">
<normaloff/>
</iconset>
</property>
@ -97,7 +97,7 @@
<string/>
</property>
<property name="icon">
<iconset theme="go-down-icon">
<iconset theme="go-down">
<normaloff/>
</iconset>
</property>

6
desktop-widgets/simplewidgets.cpp
View file

@ -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);

2
desktop-widgets/starwidget.cpp
View file

@ -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);

2
desktop-widgets/tab-widgets/maintab.ui
View file

@ -226,7 +226,7 @@
</property>
<property name="icon">
<iconset resource="../../subsurface.qrc">
<normaloff>:geotag-icon</normaloff>:geotag-icon</iconset>
<normaloff>:geocode</normaloff>:geocode</iconset>
</property>
</widget>
</item>

2
desktop-widgets/tableview.cpp
View file

@ -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);

6
desktop-widgets/usermanual.cpp
View file

@ -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()));