From 7c96b87a11193b7737f8e2ebb7acba8da5d326be Mon Sep 17 00:00:00 2001 From: Carl Philipp Klemm Date: Sun, 19 Apr 2026 19:22:49 +0200 Subject: [PATCH] Rename icons and .desktop files --- CMakeLists.txt | 4 ++-- UVOSicon.bmp | Bin 114798 -> 0 bytes resources.qrc | 2 +- src/sensors/mqttsensorsource.cpp | 2 +- src/ui/mainwindow.ui | 2 +- xyz.uvos.icon.bmp | Bin 0 -> 3210 bytes xyz.uvos.icon.png | Bin 0 -> 2949 bytes smartvos.desktop => xyz.uvos.smartvos.desktop | 6 +++--- 8 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 UVOSicon.bmp create mode 100644 xyz.uvos.icon.bmp create mode 100644 xyz.uvos.icon.png rename smartvos.desktop => xyz.uvos.smartvos.desktop (71%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6508688..fdf32b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -222,10 +222,10 @@ install(TARGETS smartvos DESTINATION bin) install(TARGETS smartvos_core DESTINATION lib) # Install icon -install(FILES UVOSicon.bmp DESTINATION share/icons/hicolor/48x48/apps RENAME smartvos.png) +install(FILES xyz.uvos.icon.png DESTINATION share/icons/hicolor/128x128/apps) # Install .desktop file -install(FILES smartvos.desktop DESTINATION share/applications) +install(FILES xyz.uvos.smartvos.desktop DESTINATION share/applications) # Update icon cache (optional, for icon themes) install(CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})") diff --git a/UVOSicon.bmp b/UVOSicon.bmp deleted file mode 100644 index fd0d9a26a67d4f67f2fcec39e6e641809f3b4d85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 114798 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 - UVOSicon.bmp + xyz.uvos.icon.bmp diff --git a/src/sensors/mqttsensorsource.cpp b/src/sensors/mqttsensorsource.cpp index be4ec20..eaa23e1 100644 --- a/src/sensors/mqttsensorsource.cpp +++ b/src/sensors/mqttsensorsource.cpp @@ -152,7 +152,7 @@ void MqttSensorSource::onMessageReceived(const QMqttMessage& message) { sensor.name = baseName + " Power"; sensor.type = Sensor::TYPE_POWER; - sensor.field = obj["Power"].toDouble(0); + sensor.field = obj["power"].toDouble(0); stateChanged(sensor); } diff --git a/src/ui/mainwindow.ui b/src/ui/mainwindow.ui index 422862d..693bb9f 100644 --- a/src/ui/mainwindow.ui +++ b/src/ui/mainwindow.ui @@ -27,7 +27,7 @@ - :/images/UVOSicon.bmp:/images/UVOSicon.bmp + :/images/xyz.uvos.icon.bmp:/images/xyz.uvos.icon.bmp diff --git a/xyz.uvos.icon.bmp b/xyz.uvos.icon.bmp new file mode 100644 index 0000000000000000000000000000000000000000..846c190c8b1f60183cd48acf38898f4fdb8ad3d5 GIT binary patch literal 3210 zcmeH|*=kx*6owN;qEtjJLUFjq!u=<{}Tgzw&r~KDRd?_(C{;|4uwY@#FpN*WX3e=q|qeIlJyla~^wULRu~LKLKMc z6bcoKMcnChI=F*(xm?cU@jOAQ`2#7N5;ULBNdXs7Z6Xi|2!5~E`&rh$>5M)t827}>6Ja+K{6WruQ zfU;7r*AoX!`2BtvvQQ|%KO7D<8a30B@WP+Z=Vkn6vzc7e2sEM$qo607qS35Ys|;4D zRB(YdlmV3W6hAI77GyBD+bw#T4;e;5Pk+HrTj_K<8H^gng=)1b11RXBWhh~S$tQ!+ z9k@U(nM@`bMnTWyguhfO$uL^2meGd`>UzOqv4}!dh%n5!fE7lT>>3Js3Y9`qxE^<4 zZexPQp}-?Ma=BdaBk;&D6e|48SQ$WBPZF7IcDr2$V;<6p$nQ!Mu~OICGApX}3}>43 z@uC!qKn!X|#CpBnY&P5NcDLK@_xr=)aDRV)JRVP{)A@WRwy&CI+tSVyYPnn{+BDST feNE(PG_kK))(kz$i93jWtvWBS-s%nTk3`@*&}^1| literal 0 HcmV?d00001 diff --git a/xyz.uvos.icon.png b/xyz.uvos.icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d4d9368ac06c60e5b0d2c03313b610a81eb0b84a GIT binary patch literal 2949 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 Yd>Wrlb~j4B4M7!{n^+o?j9e1`4J}|_%m4rY literal 0 HcmV?d00001 diff --git a/smartvos.desktop b/xyz.uvos.smartvos.desktop similarity index 71% rename from smartvos.desktop rename to xyz.uvos.smartvos.desktop index adc785e..49dc5df 100644 --- a/smartvos.desktop +++ b/xyz.uvos.smartvos.desktop @@ -1,10 +1,10 @@ [Desktop Entry] Name=SmartVOS Comment=Smart Home Interface -Exec=smartvos -Icon=smartvos +Exec=smartvos -H 10.0.0.1 +Icon=xyz.uvos.icon Terminal=false Type=Application Categories=Utility;HomeAutomation; Keywords=smart;home;automation;iot; -StartupNotify=true \ No newline at end of file +StartupNotify=true