diff options
26 files changed, 51 insertions, 51 deletions
diff --git a/desktop-widgets/about.ui b/desktop-widgets/about.ui index 98159253c..3062f5f62 100644 --- a/desktop-widgets/about.ui +++ b/desktop-widgets/about.ui @@ -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> diff --git a/desktop-widgets/configuredivecomputerdialog.ui b/desktop-widgets/configuredivecomputerdialog.ui index 2192be70d..d647d1134 100644 --- a/desktop-widgets/configuredivecomputerdialog.ui +++ b/desktop-widgets/configuredivecomputerdialog.ui @@ -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> diff --git a/desktop-widgets/divecomponentselection.ui b/desktop-widgets/divecomponentselection.ui index 8262a5c2a..ba58c546b 100644 --- a/desktop-widgets/divecomponentselection.ui +++ b/desktop-widgets/divecomponentselection.ui @@ -24,7 +24,7 @@ </property> <property name="windowIcon"> <iconset> - <normalon>:/subsurface-icon</normalon> + <normalon>:subsurface-icon</normalon> </iconset> </property> <layout class="QVBoxLayout" name="verticalLayout"> diff --git a/desktop-widgets/divecomputermanagementdialog.ui b/desktop-widgets/divecomputermanagementdialog.ui index 0e5db2c41..0533f681d 100644 --- a/desktop-widgets/divecomputermanagementdialog.ui +++ b/desktop-widgets/divecomputermanagementdialog.ui @@ -18,7 +18,7 @@ </property> <property name="windowIcon"> <iconset> - <normalon>:/subsurface-icon</normalon> + <normalon>:subsurface-icon</normalon> </iconset> </property> <layout class="QVBoxLayout" name="verticalLayout"> diff --git a/desktop-widgets/divelogexportdialog.ui b/desktop-widgets/divelogexportdialog.ui index d01f817c6..0d02d9fd8 100644 --- a/desktop-widgets/divelogexportdialog.ui +++ b/desktop-widgets/divelogexportdialog.ui @@ -15,7 +15,7 @@ </property> <property name="windowIcon"> <iconset> - <normalon>:/subsurface-icon</normalon> + <normalon>:subsurface-icon</normalon> </iconset> </property> <layout class="QGridLayout" name="gridLayout"> diff --git a/desktop-widgets/divelogimportdialog.ui b/desktop-widgets/divelogimportdialog.ui index 36746ffe9..515608c32 100644 --- a/desktop-widgets/divelogimportdialog.ui +++ b/desktop-widgets/divelogimportdialog.ui @@ -15,7 +15,7 @@ </property> <property name="windowIcon"> <iconset> - <normalon>:/subsurface-icon</normalon> + <normalon>:subsurface-icon</normalon> </iconset> </property> <layout class="QVBoxLayout" name="verticalLayout"> diff --git a/desktop-widgets/downloadfromdivecomputer.ui b/desktop-widgets/downloadfromdivecomputer.ui index 10d654b46..874da643b 100644 --- a/desktop-widgets/downloadfromdivecomputer.ui +++ b/desktop-widgets/downloadfromdivecomputer.ui @@ -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"> diff --git a/desktop-widgets/filterwidget.ui b/desktop-widgets/filterwidget.ui index 1450d81b2..8e42019ce 100644 --- a/desktop-widgets/filterwidget.ui +++ b/desktop-widgets/filterwidget.ui @@ -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> diff --git a/desktop-widgets/locationInformation.ui b/desktop-widgets/locationInformation.ui index 24b7977e4..9103bbc1f 100644 --- a/desktop-widgets/locationInformation.ui +++ b/desktop-widgets/locationInformation.ui @@ -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> diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index aaddb5174..6d4c36dc1 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -1108,7 +1108,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(); } diff --git a/desktop-widgets/mainwindow.ui b/desktop-widgets/mainwindow.ui index 8c8de5507..41cba8a5a 100644 --- a/desktop-widgets/mainwindow.ui +++ b/desktop-widgets/mainwindow.ui @@ -454,7 +454,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> @@ -466,7 +466,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> @@ -478,7 +478,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> @@ -490,7 +490,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> @@ -502,7 +502,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> @@ -514,7 +514,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> @@ -526,7 +526,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> @@ -538,7 +538,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> @@ -550,7 +550,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> @@ -562,7 +562,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> @@ -574,7 +574,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> @@ -586,7 +586,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> @@ -598,7 +598,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> @@ -610,7 +610,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> @@ -622,7 +622,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> @@ -634,7 +634,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> @@ -657,7 +657,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> diff --git a/desktop-widgets/plugins/facebook/facebookconnectwidget.ui b/desktop-widgets/plugins/facebook/facebookconnectwidget.ui index a13891fbc..b5caa5ab1 100644 --- a/desktop-widgets/plugins/facebook/facebookconnectwidget.ui +++ b/desktop-widgets/plugins/facebook/facebookconnectwidget.ui @@ -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"> diff --git a/desktop-widgets/preferences/preferences_georeference.cpp b/desktop-widgets/preferences/preferences_georeference.cpp index d839f9e29..1d960d4b5 100644 --- a/desktop-widgets/preferences/preferences_georeference.cpp +++ b/desktop-widgets/preferences/preferences_georeference.cpp @@ -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); diff --git a/desktop-widgets/preferences/preferences_language.cpp b/desktop-widgets/preferences/preferences_language.cpp index 5f7b5f488..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(":/language"), 4) +PreferencesLanguage::PreferencesLanguage() : AbstractPreferencesWidget(tr("Language"), QIcon(":language"), 4) { ui = new Ui::PreferencesLanguage(); ui->setupUi(this); diff --git a/desktop-widgets/renumber.ui b/desktop-widgets/renumber.ui index 5580f5cce..f7cb2ff2f 100644 --- a/desktop-widgets/renumber.ui +++ b/desktop-widgets/renumber.ui @@ -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"> diff --git a/desktop-widgets/setpoint.ui b/desktop-widgets/setpoint.ui index 707df250f..7f490218c 100644 --- a/desktop-widgets/setpoint.ui +++ b/desktop-widgets/setpoint.ui @@ -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"> diff --git a/desktop-widgets/shiftimagetimes.ui b/desktop-widgets/shiftimagetimes.ui index be09c23c1..a2ba0b8b1 100644 --- a/desktop-widgets/shiftimagetimes.ui +++ b/desktop-widgets/shiftimagetimes.ui @@ -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"> diff --git a/desktop-widgets/shifttimes.ui b/desktop-widgets/shifttimes.ui index 486b1f43b..3c03b7d57 100644 --- a/desktop-widgets/shifttimes.ui +++ b/desktop-widgets/shifttimes.ui @@ -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"> diff --git a/desktop-widgets/simplewidgets.cpp b/desktop-widgets/simplewidgets.cpp index 44ab49797..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").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); diff --git a/desktop-widgets/tab-widgets/maintab.ui b/desktop-widgets/tab-widgets/maintab.ui index 6f02c775d..6fa611153 100644 --- a/desktop-widgets/tab-widgets/maintab.ui +++ b/desktop-widgets/tab-widgets/maintab.ui @@ -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> diff --git a/desktop-widgets/updatemanager.cpp b/desktop-widgets/updatemanager.cpp index f73ea0bce..f742fbcaf 100644 --- a/desktop-widgets/updatemanager.cpp +++ b/desktop-widgets/updatemanager.cpp @@ -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(); diff --git a/desktop-widgets/usermanual.cpp b/desktop-widgets/usermanual.cpp index 41cb09570..580dadcfd 100644 --- a/desktop-widgets/usermanual.cpp +++ b/desktop-widgets/usermanual.cpp @@ -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); diff --git a/desktop-widgets/usersurvey.cpp b/desktop-widgets/usersurvey.cpp index fe55b9279..dd6d62231 100644 --- a/desktop-widgets/usersurvey.cpp +++ b/desktop-widgets/usersurvey.cpp @@ -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(); diff --git a/desktop-widgets/webservices.ui b/desktop-widgets/webservices.ui index bcca35f1e..2c8f8fe1d 100644 --- a/desktop-widgets/webservices.ui +++ b/desktop-widgets/webservices.ui @@ -15,7 +15,7 @@ </property> <property name="windowIcon"> <iconset> - <normalon>:/subsurface-icon</normalon> + <normalon>:subsurface-icon</normalon> </iconset> </property> <layout class="QGridLayout" name="gridLayout"> diff --git a/smtk-import/smrtk2ssrfc_window.ui b/smtk-import/smrtk2ssrfc_window.ui index 5809fc874..f85df88cc 100644 --- a/smtk-import/smrtk2ssrfc_window.ui +++ b/smtk-import/smrtk2ssrfc_window.ui @@ -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> diff --git a/subsurface-mobile-helper.cpp b/subsurface-mobile-helper.cpp index 31e582020..98d412aca 100644 --- a/subsurface-mobile-helper.cpp +++ b/subsurface-mobile-helper.cpp @@ -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(); |