diff --git a/CHANGELOG.md b/CHANGELOG.md index d9192817c..3d13de15d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ - profile: include profile editing in undo system - core: avoid crash with corrupted cloud storage - mobile: fix profile scaling issue on high DPR devices +- mobile: bring back profile icons - mobile/Android: add logfiles as attachment to support emails - planner: make ESC (cancel plan) work when moving handles - dive list: make dive guide visible in dive list [#3382] diff --git a/CMakeLists.txt b/CMakeLists.txt index 1514294dc..9e3c83241 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -335,9 +335,9 @@ endif() set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} ${LIBDIVECOMPUTER_LIBRARIES} ${LIBGIT2_LIBRARIES} ${LIBUSB_LIBRARIES} ${LIBMTP_LIBRARIES}) if (NOT SUBSURFACE_TARGET_EXECUTABLE MATCHES "DownloaderExecutable") if(USINGQT6) - qt_add_resources(SUBSURFACE_RESOURCES subsurface.qrc stats/statsicons.qrc desktop-widgets/qml/statsview2.qrc) + qt_add_resources(SUBSURFACE_RESOURCES subsurface.qrc profile.qrc stats/statsicons.qrc desktop-widgets/qml/statsview2.qrc) else() - qt5_add_resources(SUBSURFACE_RESOURCES subsurface.qrc stats/statsicons.qrc map-widget/qml/map-widget.qrc desktop-widgets/qml/statsview2.qrc) + qt5_add_resources(SUBSURFACE_RESOURCES subsurface.qrc profile.qrc stats/statsicons.qrc map-widget/qml/map-widget.qrc desktop-widgets/qml/statsview2.qrc) set(SUBSURFACE_MAPWIDGET subsurface_mapwidget) endif() endif() @@ -388,10 +388,12 @@ if (SUBSURFACE_TARGET_EXECUTABLE MATCHES "MobileExecutable") ) if(USINGQT6) qt_add_resources(MOBILE_RESOURCES mobile-widgets/qml/mobile-resources.qrc) + qt_add_resources(MOBILE_RESOURCES profile.qrc) qt_add_resources(MOBILE_RESOURCES mobile-widgets/3rdparty/icons.qrc) qt_add_resources(MOBILE_RESOURCES mobile-widgets/3rdparty/kirigami/src/scenegraph/shaders/shaders.qrc) else() qt5_add_resources(MOBILE_RESOURCES mobile-widgets/qml/mobile-resources.qrc) + qt5_add_resources(MOBILE_RESOURCES profile.qrc) qt5_add_resources(MOBILE_RESOURCES mobile-widgets/3rdparty/icons.qrc) qt5_add_resources(MOBILE_RESOURCES mobile-widgets/3rdparty/kirigami/src/scenegraph/shaders/shaders.qrc) endif() diff --git a/Subsurface-mobile.pro b/Subsurface-mobile.pro index 920f0df7c..512047884 100644 --- a/Subsurface-mobile.pro +++ b/Subsurface-mobile.pro @@ -338,7 +338,8 @@ HEADERS += \ RESOURCES += mobile-widgets/qml/mobile-resources.qrc \ mobile-widgets/3rdparty/icons.qrc \ map-widget/qml/map-widget.qrc \ - stats/statsicons.qrc + stats/statsicons.qrc \ + profile.qrc android { SOURCES += core/android.cpp \ diff --git a/profile.qrc b/profile.qrc new file mode 100644 index 000000000..29c7161c8 --- /dev/null +++ b/profile.qrc @@ -0,0 +1,23 @@ + + + + icons/warning-icon.png + icons/violation-icon.png + icons/info-icon.png + icons/OC.png + icons/CCR.png + icons/flag.svg + icons/gaschange.png + icons/Air_change.png + icons/Nx_change.png + icons/Tmx_change.png + icons/Oxy_change.png + icons/Air_changeICD.png + icons/Nx_changeICD.png + icons/Tmx_changeICD.png + icons/Oxy_changeICD.png + icons/plus.png + icons/trash.png + icons/trash-forbidden.png + + diff --git a/subsurface.qrc b/subsurface.qrc index 2203a5011..8d0e1dc0c 100644 --- a/subsurface.qrc +++ b/subsurface.qrc @@ -22,22 +22,7 @@ icons/minimum.png icons/maximum.png icons/average.png - icons/warning-icon.png - icons/violation-icon.png - icons/info-icon.png - icons/gaschange.png - icons/Air_change.png - icons/Nx_change.png - icons/Tmx_change.png - icons/Oxy_change.png - icons/Air_changeICD.png - icons/Nx_changeICD.png - icons/Tmx_changeICD.png - icons/Oxy_changeICD.png - icons/CCR.png - icons/OC.png icons/bluewarning.png - icons/flag.svg icons/ruler.png icons/poster.png xslt/commonTemplates.xsl