Index: leahi.qrc =================================================================== diff -u -r00a8e3ead69ac7cbf292d4ee2d76b867769909c4 -r5fe5e34b1ba719f2eca6a00f89f3f5e138b9380e --- leahi.qrc (.../leahi.qrc) (revision 00a8e3ead69ac7cbf292d4ee2d76b867769909c4) +++ leahi.qrc (.../leahi.qrc) (revision 5fe5e34b1ba719f2eca6a00f89f3f5e138b9380e) @@ -112,7 +112,7 @@ sources/gui/qml/components/UltrafiltrationButton.qml sources/gui/qml/components/ImageWave.qml sources/gui/qml/components/ImageClock.qml - sources/gui/qml/components/ImageLogoDDarkTransparent.qml + sources/gui/qml/components/ImageLogoDDarkTransparent.qml sources/gui/qml/components/ConfirmTreatmentTableEntry.qml sources/gui/qml/components/DebugDataColumn.qml sources/gui/qml/components/RangeSlider.qml Index: main.cpp =================================================================== diff -u -r291cadb8a1441e856eda05bb347849ae45a2d7d5 -r5fe5e34b1ba719f2eca6a00f89f3f5e138b9380e --- main.cpp (.../main.cpp) (revision 291cadb8a1441e856eda05bb347849ae45a2d7d5) +++ main.cpp (.../main.cpp) (revision 5fe5e34b1ba719f2eca6a00f89f3f5e138b9380e) @@ -99,7 +99,6 @@ bool gConsoleoutFrameInterface = false ; bool gConsoleoutCanInterface = false ; -bool gReloadQML = false ; bool gEnableDryDemo = false ; QString gActiveCANBus = "can0"; @@ -128,7 +127,6 @@ * --help-all Displays help including Qt specific * options. * -v, --version Displays version information. - * -r, --reload-qml Enable QML reload/refresh with F5 key * -c, --canOut Show the Can Frame Output * -m, --msgOut Show the Message Output * -l, --logOut Show the Logs Output @@ -183,12 +181,6 @@ parser.addHelpOption(); parser.addVersionOption(); - // --- -r : reload - QCommandLineOption optionReloadQML( - QStringList() << "r" << "reload-qml", - QCoreApplication::translate("main", "Enable QML reload/refresh with F5 key")); - parser.addOption(optionReloadQML); - // --- -c : canOut QCommandLineOption optionConsoleoutCanInterface( QStringList() << "c" << "canOut", @@ -363,7 +355,6 @@ gDisableCheckInLog = parser.isSet(optionDisableCheckInLog ); gDisableAcknowLog = parser.isSet(optionDisableAcknowLog ); - gReloadQML = parser.isSet(optionReloadQML ); gEnableDryDemo = parser.isSet(optionEnableDryDemo ); gEnableManufacturing = parser.isSet(optionEnableManufacturing ); Index: sources/gui/qml/components/MainMenu.qml =================================================================== diff -u -r00a8e3ead69ac7cbf292d4ee2d76b867769909c4 -r5fe5e34b1ba719f2eca6a00f89f3f5e138b9380e --- sources/gui/qml/components/MainMenu.qml (.../MainMenu.qml) (revision 00a8e3ead69ac7cbf292d4ee2d76b867769909c4) +++ sources/gui/qml/components/MainMenu.qml (.../MainMenu.qml) (revision 5fe5e34b1ba719f2eca6a00f89f3f5e138b9380e) @@ -106,7 +106,7 @@ anchors.fill: parent } - ImageLogoDDarkTransparent { id: _image + ImageLogoDDT { id: _image visible: hasLogo anchors.centerIn: parent } Index: sources/gui/qml/components/NotificationBar.qml =================================================================== diff -u -r00a8e3ead69ac7cbf292d4ee2d76b867769909c4 -r5fe5e34b1ba719f2eca6a00f89f3f5e138b9380e --- sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision 00a8e3ead69ac7cbf292d4ee2d76b867769909c4) +++ sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision 5fe5e34b1ba719f2eca6a00f89f3f5e138b9380e) @@ -19,8 +19,7 @@ // Project import Gui.Actions 0.1 // Qml imports -import "../globals" -import "../compounds" +import "qrc:/globals" Rectangle { id: _root objectName: "NotificationBar" // SquishQt Index: sources/gui/qml/main.qml =================================================================== diff -u -r291cadb8a1441e856eda05bb347849ae45a2d7d5 -r5fe5e34b1ba719f2eca6a00f89f3f5e138b9380e --- sources/gui/qml/main.qml (.../main.qml) (revision 291cadb8a1441e856eda05bb347849ae45a2d7d5) +++ sources/gui/qml/main.qml (.../main.qml) (revision 5fe5e34b1ba719f2eca6a00f89f3f5e138b9380e) @@ -124,12 +124,12 @@ import VConfirm 0.1 // Qml imports -import "globals" -import "pages" -import "pages/treatment" -import "pages/settings" -import "components" -import "dialogs" +import "qrc:/globals" +import "qrc:/pages" +import "qrc:/pages/treatment" +import "qrc:/pages/settings" +import "qrc:/components" +import "qrc:/dialogs" /*! * \brief Initialization and start point of the QML Index: sources/main.h =================================================================== diff -u -rf20fa155dca799c332189f8d3932e35b5c4ef84a -r5fe5e34b1ba719f2eca6a00f89f3f5e138b9380e --- sources/main.h (.../main.h) (revision f20fa155dca799c332189f8d3932e35b5c4ef84a) +++ sources/main.h (.../main.h) (revision 5fe5e34b1ba719f2eca6a00f89f3f5e138b9380e) @@ -98,7 +98,6 @@ extern bool gConsoleoutFrameInterface ; extern bool gConsoleoutCanInterface ; -extern bool gReloadQML ; extern bool gEnableDryDemo ; extern QString gActiveCANBus ; extern bool gEnableManufacturing ;