From fd9c905ba357a37fe13338600bbc2b669c867f6f Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 29 Nov 2017 14:04:52 -0800 Subject: [PATCH] Revert "Use icons relative path." This reverts commit b0d98f6e269be9560de1b9c140855c85fecf1dd1. --- desktop-widgets/about.ui | 4 +-- .../configuredivecomputerdialog.ui | 8 ++--- desktop-widgets/divecomponentselection.ui | 2 +- .../divecomputermanagementdialog.ui | 2 +- desktop-widgets/divelogexportdialog.ui | 2 +- desktop-widgets/divelogimportdialog.ui | 2 +- desktop-widgets/downloadfromdivecomputer.ui | 2 +- desktop-widgets/filterwidget.ui | 6 ++-- desktop-widgets/locationInformation.ui | 4 +-- desktop-widgets/mainwindow.cpp | 2 +- desktop-widgets/mainwindow.ui | 34 +++++++++---------- .../plugins/facebook/facebookconnectwidget.ui | 2 +- .../preferences/preferences_georeference.cpp | 2 +- .../preferences/preferences_language.cpp | 2 +- desktop-widgets/renumber.ui | 2 +- desktop-widgets/setpoint.ui | 2 +- desktop-widgets/shiftimagetimes.ui | 2 +- desktop-widgets/shifttimes.ui | 2 +- desktop-widgets/simplewidgets.cpp | 6 ++-- desktop-widgets/tab-widgets/maintab.ui | 2 +- desktop-widgets/updatemanager.cpp | 2 +- desktop-widgets/usermanual.cpp | 2 +- desktop-widgets/usersurvey.cpp | 2 +- desktop-widgets/webservices.ui | 2 +- smtk-import/smrtk2ssrfc_window.ui | 2 +- subsurface-mobile-helper.cpp | 2 +- 26 files changed, 51 insertions(+), 51 deletions(-) diff --git a/desktop-widgets/about.ui b/desktop-widgets/about.ui index 3062f5f62..98159253c 100644 --- a/desktop-widgets/about.ui +++ b/desktop-widgets/about.ui @@ -24,7 +24,7 @@ - :subsurface-icon:subsurface-icon + :/subsurface-icon:/subsurface-icon true @@ -39,7 +39,7 @@ - :subsurface-icon + :/subsurface-icon Qt::AlignCenter diff --git a/desktop-widgets/configuredivecomputerdialog.ui b/desktop-widgets/configuredivecomputerdialog.ui index d647d1134..2192be70d 100644 --- a/desktop-widgets/configuredivecomputerdialog.ui +++ b/desktop-widgets/configuredivecomputerdialog.ui @@ -215,7 +215,7 @@ - :icons/ostc3.png:icons/ostc3.png + :/icons/ostc3.png:/icons/ostc3.png @@ -224,7 +224,7 @@ - :icons/suunto_vyper.png:icons/suunto_vyper.png + :/icons/suunto_vyper.png:/icons/suunto_vyper.png @@ -233,7 +233,7 @@ - :icons/ostc2n.png:icons/ostc2n.png + :/icons/ostc2n.png:/icons/ostc2n.png @@ -242,7 +242,7 @@ - :icons/ostc4.png:icons/ostc4.png + :/icons/ostc4.png:/icons/ostc4.png diff --git a/desktop-widgets/divecomponentselection.ui b/desktop-widgets/divecomponentselection.ui index ba58c546b..8262a5c2a 100644 --- a/desktop-widgets/divecomponentselection.ui +++ b/desktop-widgets/divecomponentselection.ui @@ -24,7 +24,7 @@ - :subsurface-icon + :/subsurface-icon diff --git a/desktop-widgets/divecomputermanagementdialog.ui b/desktop-widgets/divecomputermanagementdialog.ui index 0533f681d..0e5db2c41 100644 --- a/desktop-widgets/divecomputermanagementdialog.ui +++ b/desktop-widgets/divecomputermanagementdialog.ui @@ -18,7 +18,7 @@ - :subsurface-icon + :/subsurface-icon diff --git a/desktop-widgets/divelogexportdialog.ui b/desktop-widgets/divelogexportdialog.ui index 0d02d9fd8..d01f817c6 100644 --- a/desktop-widgets/divelogexportdialog.ui +++ b/desktop-widgets/divelogexportdialog.ui @@ -15,7 +15,7 @@ - :subsurface-icon + :/subsurface-icon diff --git a/desktop-widgets/divelogimportdialog.ui b/desktop-widgets/divelogimportdialog.ui index 515608c32..36746ffe9 100644 --- a/desktop-widgets/divelogimportdialog.ui +++ b/desktop-widgets/divelogimportdialog.ui @@ -15,7 +15,7 @@ - :subsurface-icon + :/subsurface-icon diff --git a/desktop-widgets/downloadfromdivecomputer.ui b/desktop-widgets/downloadfromdivecomputer.ui index 874da643b..10d654b46 100644 --- a/desktop-widgets/downloadfromdivecomputer.ui +++ b/desktop-widgets/downloadfromdivecomputer.ui @@ -15,7 +15,7 @@ - :subsurface-icon + :/subsurface-icon diff --git a/desktop-widgets/filterwidget.ui b/desktop-widgets/filterwidget.ui index 8e42019ce..1450d81b2 100644 --- a/desktop-widgets/filterwidget.ui +++ b/desktop-widgets/filterwidget.ui @@ -74,7 +74,7 @@ - :filter-reset:filter-reset + :/filter-reset:/filter-reset true @@ -88,7 +88,7 @@ - :filter-hide:filter-hide + :/filter-hide:/filter-hide true @@ -102,7 +102,7 @@ - :filter-close:filter-close + :/filter-close:/filter-close true diff --git a/desktop-widgets/locationInformation.ui b/desktop-widgets/locationInformation.ui index 9103bbc1f..24b7977e4 100644 --- a/desktop-widgets/locationInformation.ui +++ b/desktop-widgets/locationInformation.ui @@ -77,7 +77,7 @@ - :satellite:satellite + :/satellite:/satellite @@ -166,7 +166,7 @@ - :mapwidget-marker-selected:mapwidget-marker-selected + :/mapwidget-marker-selected:/mapwidget-marker-selected diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 550372ec6..71babd03a 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -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(); } diff --git a/desktop-widgets/mainwindow.ui b/desktop-widgets/mainwindow.ui index 75b4f7f5c..67adccb23 100644 --- a/desktop-widgets/mainwindow.ui +++ b/desktop-widgets/mainwindow.ui @@ -479,7 +479,7 @@ - :icon_o2:icon_o2 + :/icon_o2:/icon_o2 Toggle pO₂ graph @@ -491,7 +491,7 @@ - :icon_n2:icon_n2 + :/icon_n2:/icon_n2 Toggle pN₂ graph @@ -503,7 +503,7 @@ - :icon_he:icon_he + :/icon_he:/icon_he Toggle pHe graph @@ -515,7 +515,7 @@ - :icon_ceiling_dc:icon_ceiling_dc + :/icon_ceiling_dc:/icon_ceiling_dc Toggle DC reported ceiling @@ -527,7 +527,7 @@ - :icon_ceiling_calculated:icon_ceiling_calculated + :/icon_ceiling_calculated:/icon_ceiling_calculated Toggle calculated ceiling @@ -539,7 +539,7 @@ - :icon_ceiling_alltissues:icon_ceiling_alltissues + :/icon_ceiling_alltissues:/icon_ceiling_alltissues Toggle calculating all tissues @@ -551,7 +551,7 @@ - :icon_ceiling_3m:icon_ceiling_3m + :/icon_ceiling_3m:/icon_ceiling_3m Toggle calculated ceiling with 3m increments @@ -563,7 +563,7 @@ - :icon_HR:icon_HR + :/icon_HR:/icon_HR Toggle heart rate @@ -575,7 +575,7 @@ - :icon_mod:icon_mod + :/icon_mod:/icon_mod Toggle MOD @@ -587,7 +587,7 @@ - :icon_ead:icon_ead + :/icon_ead:/icon_ead Toggle EAD, END, EADD @@ -599,7 +599,7 @@ - :icon_NDLTTS:icon_NDLTTS + :/icon_NDLTTS:/icon_NDLTTS Toggle NDL, TTS @@ -611,7 +611,7 @@ - :icon_lung:icon_lung + :/icon_lung:/icon_lung Toggle SAC rate @@ -623,7 +623,7 @@ - :ruler:ruler + :/ruler:/ruler Toggle ruler @@ -635,7 +635,7 @@ - :scale:scale + :/scale:/scale Scale graph @@ -647,7 +647,7 @@ - :pictures:pictures + :/pictures:/pictures Toggle pictures @@ -659,7 +659,7 @@ - :gaschange:gaschange + :/gaschange:/gaschange Toggle gas bar @@ -682,7 +682,7 @@ - :icon_tissue:icon_tissue + :/icon_tissue:/icon_tissue Toggle tissue heat-map diff --git a/desktop-widgets/plugins/facebook/facebookconnectwidget.ui b/desktop-widgets/plugins/facebook/facebookconnectwidget.ui index b5caa5ab1..a13891fbc 100644 --- a/desktop-widgets/plugins/facebook/facebookconnectwidget.ui +++ b/desktop-widgets/plugins/facebook/facebookconnectwidget.ui @@ -15,7 +15,7 @@ - :subsurface-icon + :/subsurface-icon diff --git a/desktop-widgets/preferences/preferences_georeference.cpp b/desktop-widgets/preferences/preferences_georeference.cpp index 1d960d4b5..d839f9e29 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(":/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 def46a0e2..5f7b5f488 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 f7cb2ff2f..5580f5cce 100644 --- a/desktop-widgets/renumber.ui +++ b/desktop-widgets/renumber.ui @@ -18,7 +18,7 @@ - :subsurface-icon + :/subsurface-icon diff --git a/desktop-widgets/setpoint.ui b/desktop-widgets/setpoint.ui index 7f490218c..707df250f 100644 --- a/desktop-widgets/setpoint.ui +++ b/desktop-widgets/setpoint.ui @@ -18,7 +18,7 @@ - :subsurface-icon + :/subsurface-icon diff --git a/desktop-widgets/shiftimagetimes.ui b/desktop-widgets/shiftimagetimes.ui index a2ba0b8b1..be09c23c1 100644 --- a/desktop-widgets/shiftimagetimes.ui +++ b/desktop-widgets/shiftimagetimes.ui @@ -24,7 +24,7 @@ - :subsurface-icon + :/subsurface-icon diff --git a/desktop-widgets/shifttimes.ui b/desktop-widgets/shifttimes.ui index 3c03b7d57..486b1f43b 100644 --- a/desktop-widgets/shifttimes.ui +++ b/desktop-widgets/shifttimes.ui @@ -24,7 +24,7 @@ - :subsurface-icon + :/subsurface-icon diff --git a/desktop-widgets/simplewidgets.cpp b/desktop-widgets/simplewidgets.cpp index 457589dde..44ab49797 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 6fa611153..6f02c775d 100644 --- a/desktop-widgets/tab-widgets/maintab.ui +++ b/desktop-widgets/tab-widgets/maintab.ui @@ -226,7 +226,7 @@ - :geocode:geocode + :/geocode:/geocode diff --git a/desktop-widgets/updatemanager.cpp b/desktop-widgets/updatemanager.cpp index f742fbcaf..f73ea0bce 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 580dadcfd..41cb09570 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 dd6d62231..fe55b9279 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 2c8f8fe1d..bcca35f1e 100644 --- a/desktop-widgets/webservices.ui +++ b/desktop-widgets/webservices.ui @@ -15,7 +15,7 @@ - :subsurface-icon + :/subsurface-icon diff --git a/smtk-import/smrtk2ssrfc_window.ui b/smtk-import/smrtk2ssrfc_window.ui index f85df88cc..5809fc874 100644 --- a/smtk-import/smrtk2ssrfc_window.ui +++ b/smtk-import/smrtk2ssrfc_window.ui @@ -329,7 +329,7 @@ - :subsurface-icon + :/subsurface-icon true diff --git a/subsurface-mobile-helper.cpp b/subsurface-mobile-helper.cpp index 98d412aca..31e582020 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(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();