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 fd0d9a2..0000000 Binary files a/UVOSicon.bmp and /dev/null differ diff --git a/resources.qrc b/resources.qrc index 877c740..ebbb814 100644 --- a/resources.qrc +++ b/resources.qrc @@ -1,5 +1,5 @@ - 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 0000000..846c190 Binary files /dev/null and b/xyz.uvos.icon.bmp differ diff --git a/xyz.uvos.icon.png b/xyz.uvos.icon.png new file mode 100644 index 0000000..d4d9368 Binary files /dev/null and b/xyz.uvos.icon.png differ 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