mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 17:33:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Use icons relative path."

Browse source 
This reverts commit b0d98f6e26.
This commit is contained in:
Dirk Hohndel 2017-11-29 14:04:52 -08:00
parent 2747056889
commit fd9c905ba3
26 changed files with 51 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
desktop-widgets/about.ui
View file

@ -24,7 +24,7 @@
</property>
<property name="windowIcon">
<iconset resource="../subsurface.qrc">
<normaloff>:subsurface-icon</normaloff>:subsurface-icon</iconset>
<normaloff>:/subsurface-icon</normaloff>:/subsurface-icon</iconset>
</property>
<property name="modal">
<bool>true</bool>
@ -39,7 +39,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../subsurface.qrc">:subsurface-icon</pixmap>
<pixmap resource="../subsurface.qrc">:/subsurface-icon</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>

8
desktop-widgets/configuredivecomputerdialog.ui
View file

@ -215,7 +215,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:icons/ostc3.png</normaloff>:icons/ostc3.png</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>:icons/suunto_vyper.png</normaloff>:icons/suunto_vyper.png</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>:icons/ostc2n.png</normaloff>:icons/ostc2n.png</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>:icons/ostc4.png</normaloff>:icons/ostc4.png</iconset>
<normaloff>:/icons/ostc4.png</normaloff>:/icons/ostc4.png</iconset>
</property>
</item>
</widget>

2
desktop-widgets/divecomponentselection.ui
View file

@ -24,7 +24,7 @@
</property>
<property name="windowIcon">
<iconset>
<normalon>:subsurface-icon</normalon>
<normalon>:/subsurface-icon</normalon>
</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">

2
desktop-widgets/divecomputermanagementdialog.ui
View file

@ -18,7 +18,7 @@
</property>
<property name="windowIcon">
<iconset>
<normalon>:subsurface-icon</normalon>
<normalon>:/subsurface-icon</normalon>
</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">

2
desktop-widgets/divelogexportdialog.ui
View file

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset>
<normalon>:subsurface-icon</normalon>
<normalon>:/subsurface-icon</normalon>
</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">

2
desktop-widgets/divelogimportdialog.ui
View file

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset>
<normalon>:subsurface-icon</normalon>
<normalon>:/subsurface-icon</normalon>
</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">

2
desktop-widgets/downloadfromdivecomputer.ui
View file

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset>
<normalon>:subsurface-icon</normalon>
<normalon>:/subsurface-icon</normalon>
</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">

6
desktop-widgets/filterwidget.ui
View file

@ -74,7 +74,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:filter-reset</normaloff>:filter-reset</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>:filter-hide</normaloff>:filter-hide</iconset>
<normaloff>:/filter-hide</normaloff>:/filter-hide</iconset>
</property>
<property name="autoRaise">
<bool>true</bool>
@ -102,7 +102,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:filter-close</normaloff>:filter-close</iconset>
<normaloff>:/filter-close</normaloff>:/filter-close</iconset>
</property>
<property name="autoRaise">
<bool>true</bool>

4
desktop-widgets/locationInformation.ui
View file

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

2
desktop-widgets/mainwindow.cpp
View file

@ -1105,7 +1105,7 @@ void MainWindow::on_actionYearlyStatistics_triggered()
d.setWindowFlags(Qt::Window | Qt::CustomizeWindowHint
| Qt::WindowCloseButtonHint | Qt::WindowTitleHint);
d.setWindowTitle(tr("Yearly statistics"));
d.setWindowIcon(QIcon(":subsurface-icon"));
d.setWindowIcon(QIcon(":/subsurface-icon"));
d.exec();
}

34
desktop-widgets/mainwindow.ui
View file

@ -479,7 +479,7 @@
</property>
<property name="icon">
<iconset resource="../subsurface.qrc">
<normaloff>:icon_o2</normaloff>:icon_o2</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>:icon_n2</normaloff>:icon_n2</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>:icon_he</normaloff>:icon_he</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>:icon_ceiling_dc</normaloff>:icon_ceiling_dc</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>:icon_ceiling_calculated</normaloff>:icon_ceiling_calculated</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>:icon_ceiling_alltissues</normaloff>:icon_ceiling_alltissues</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>:icon_ceiling_3m</normaloff>:icon_ceiling_3m</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>:icon_HR</normaloff>:icon_HR</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>:icon_mod</normaloff>:icon_mod</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>:icon_ead</normaloff>:icon_ead</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>:icon_NDLTTS</normaloff>:icon_NDLTTS</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>:icon_lung</normaloff>:icon_lung</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</normaloff>:ruler</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</normaloff>:scale</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>:pictures</normaloff>:pictures</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>:gaschange</normaloff>:gaschange</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>:icon_tissue</normaloff>:icon_tissue</iconset>
<normaloff>:/icon_tissue</normaloff>:/icon_tissue</iconset>
</property>
<property name="text">
<string>Toggle tissue heat-map</string>

2
desktop-widgets/plugins/facebook/facebookconnectwidget.ui
View file

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset>
<normalon>:subsurface-icon</normalon>
<normalon>:/subsurface-icon</normalon>
</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">

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

@ -8,7 +8,7 @@
#include <ctime>
PreferencesGeoreference::PreferencesGeoreference() : AbstractPreferencesWidget(tr("Georeference"), QIcon(":georeference"), 9)
PreferencesGeoreference::PreferencesGeoreference() : AbstractPreferencesWidget(tr("Georeference"), QIcon(":/georeference"), 9)
{
ui = new Ui::PreferencesGeoreference();
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(":language"), 4)
PreferencesLanguage::PreferencesLanguage() : AbstractPreferencesWidget(tr("Language"), QIcon(":/language"), 4)
{
ui = new Ui::PreferencesLanguage();
ui->setupUi(this);

2
desktop-widgets/renumber.ui
View file

@ -18,7 +18,7 @@
</property>
<property name="windowIcon">
<iconset>
<normalon>:subsurface-icon</normalon>
<normalon>:/subsurface-icon</normalon>
</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">

2
desktop-widgets/setpoint.ui
View file

@ -18,7 +18,7 @@
</property>
<property name="windowIcon">
<iconset>
<normalon>:subsurface-icon</normalon>
<normalon>:/subsurface-icon</normalon>
</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">

2
desktop-widgets/shiftimagetimes.ui
View file

@ -24,7 +24,7 @@
</property>
<property name="windowIcon">
<iconset>
<normalon>:subsurface-icon</normalon>
<normalon>:/subsurface-icon</normalon>
</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">

2
desktop-widgets/shifttimes.ui
View file

@ -24,7 +24,7 @@
</property>
<property name="windowIcon">
<iconset>
<normalon>:subsurface-icon</normalon>
<normalon>:/subsurface-icon</normalon>
</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">

6
desktop-widgets/simplewidgets.cpp
View file

@ -30,13 +30,13 @@ public:
MinMaxAvgWidgetPrivate(MinMaxAvgWidget *owner)
{
avgIco = new QLabel(owner);
avgIco->setPixmap(QIcon(":average").pixmap(16, 16));
avgIco->setPixmap(QIcon(":/average").pixmap(16, 16));
avgIco->setToolTip(QObject::tr("Average"));
minIco = new QLabel(owner);
minIco->setPixmap(QIcon(":minimum").pixmap(16, 16));
minIco->setPixmap(QIcon(":/minimum").pixmap(16, 16));
minIco->setToolTip(QObject::tr("Minimum"));
maxIco = new QLabel(owner);
maxIco->setPixmap(QIcon(":maximum").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/tab-widgets/maintab.ui
View file

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

2
desktop-widgets/updatemanager.cpp
View file

@ -104,7 +104,7 @@ void UpdateManager::requestReceived()
#ifndef SUBSURFACE_MOBILE
if (haveNewVersion || !isAutomaticCheck) {
msgbox.setWindowTitle(msgTitle);
msgbox.setWindowIcon(QIcon(":subsurface-icon"));
msgbox.setWindowIcon(QIcon(":/subsurface-icon"));
msgbox.setText(msgText);
msgbox.setTextFormat(Qt::RichText);
msgbox.exec();

2
desktop-widgets/usermanual.cpp
View file

@ -74,7 +74,7 @@ UserManual::UserManual(QWidget *parent) : QWidget(parent)
addAction(actionHideSearch);
setWindowTitle(tr("User manual"));
setWindowIcon(QIcon(":subsurface-icon"));
setWindowIcon(QIcon(":/subsurface-icon"));
#ifdef USE_WEBENGINE
userManual = new MyQWebEngineView(this);

2
desktop-widgets/usersurvey.cpp
View file

@ -126,7 +126,7 @@ void UserSurvey::requestReceived()
}
msgbox.setWindowTitle(msgTitle);
msgbox.setWindowIcon(QIcon(":subsurface-icon"));
msgbox.setWindowIcon(QIcon(":/subsurface-icon"));
msgbox.setText(msgText);
msgbox.setTextFormat(Qt::RichText);
msgbox.exec();

2
desktop-widgets/webservices.ui
View file

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset>
<normalon>:subsurface-icon</normalon>
<normalon>:/subsurface-icon</normalon>
</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">

2
smtk-import/smrtk2ssrfc_window.ui
View file

@ -329,7 +329,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../subsurface.qrc">:subsurface-icon</pixmap>
<pixmap resource="../subsurface.qrc">:/subsurface-icon</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>

2
subsurface-mobile-helper.cpp
View file

@ -101,7 +101,7 @@ void run_ui()
exit(1);
}
QQuickWindow *qml_window = qobject_cast<QQuickWindow *>(qqWindowObject);
qml_window->setIcon(QIcon(":subsurface-mobile-icon"));
qml_window->setIcon(QIcon(":/subsurface-mobile-icon"));
qqWindowObject->setProperty("messageText", QVariant("Subsurface-mobile startup"));
qDebug() << "qqwindow devicePixelRatio" << qml_window->devicePixelRatio() << qml_window->screen()->devicePixelRatio();
QScreen *screen = qml_window->screen();