From 0855f6f31577789888aa6d9b955c1bc46ed34d40 Mon Sep 17 00:00:00 2001 From: Martin Měřinský Date: Tue, 28 Nov 2017 08:37:01 +0100 Subject: Use icons relative path. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Icon paths are defined in one place only - application's embedded resources. Signed-off-by: Martin Měřinský --- desktop-widgets/about.ui | 4 +-- desktop-widgets/configuredivecomputerdialog.ui | 8 ++--- desktop-widgets/divecomponentselection.ui | 2 +- desktop-widgets/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 +- 24 files changed, 49 insertions(+), 49 deletions(-) (limited to 'desktop-widgets') 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 @@ - :/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 2192be70d..d647d1134 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 8262a5c2a..ba58c546b 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 0e5db2c41..0533f681d 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 d01f817c6..0d02d9fd8 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 36746ffe9..515608c32 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 10d654b46..874da643b 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 1450d81b2..8e42019ce 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 24b7977e4..9103bbc1f 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 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 @@ - :/icon_o2:/icon_o2 + :icon_o2:icon_o2 Toggle pO₂ graph @@ -466,7 +466,7 @@ - :/icon_n2:/icon_n2 + :icon_n2:icon_n2 Toggle pN₂ graph @@ -478,7 +478,7 @@ - :/icon_he:/icon_he + :icon_he:icon_he Toggle pHe graph @@ -490,7 +490,7 @@ - :/icon_ceiling_dc:/icon_ceiling_dc + :icon_ceiling_dc:icon_ceiling_dc Toggle DC reported ceiling @@ -502,7 +502,7 @@ - :/icon_ceiling_calculated:/icon_ceiling_calculated + :icon_ceiling_calculated:icon_ceiling_calculated Toggle calculated ceiling @@ -514,7 +514,7 @@ - :/icon_ceiling_alltissues:/icon_ceiling_alltissues + :icon_ceiling_alltissues:icon_ceiling_alltissues Toggle calculating all tissues @@ -526,7 +526,7 @@ - :/icon_ceiling_3m:/icon_ceiling_3m + :icon_ceiling_3m:icon_ceiling_3m Toggle calculated ceiling with 3m increments @@ -538,7 +538,7 @@ - :/icon_HR:/icon_HR + :icon_HR:icon_HR Toggle heart rate @@ -550,7 +550,7 @@ - :/icon_mod:/icon_mod + :icon_mod:icon_mod Toggle MOD @@ -562,7 +562,7 @@ - :/icon_ead:/icon_ead + :icon_ead:icon_ead Toggle EAD, END, EADD @@ -574,7 +574,7 @@ - :/icon_NDLTTS:/icon_NDLTTS + :icon_NDLTTS:icon_NDLTTS Toggle NDL, TTS @@ -586,7 +586,7 @@ - :/icon_lung:/icon_lung + :icon_lung:icon_lung Toggle SAC rate @@ -598,7 +598,7 @@ - :/ruler:/ruler + :ruler:ruler Toggle ruler @@ -610,7 +610,7 @@ - :/scale:/scale + :scale:scale Scale graph @@ -622,7 +622,7 @@ - :/pictures:/pictures + :pictures:pictures Toggle pictures @@ -634,7 +634,7 @@ - :/gaschange:/gaschange + :gaschange:gaschange Toggle gas bar @@ -657,7 +657,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 a13891fbc..b5caa5ab1 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 d839f9e29..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(":/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 @@ - :/subsurface-icon + :subsurface-icon 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 @@ - :/subsurface-icon + :subsurface-icon 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 @@ - :/subsurface-icon + :subsurface-icon 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 @@ - :/subsurface-icon + :subsurface-icon 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 @@ - :/geocode:/geocode + :geocode:geocode 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 @@ - :/subsurface-icon + :subsurface-icon -- cgit v1.2.3-70-g09d2