switched from qsettings to json added editng of actors

SHinterface.pro

@@ -4,7 +4,9 @@
 #
 #-------------------------------------------------
 
-QT       += core gui widgets network  serialport multimedia
+QT       += core gui widgets network
+
+ QT += serialport
 
 TARGET = SHinterface
 TEMPLATE = app
@@ -15,34 +17,104 @@ TEMPLATE = app
 # deprecated API in order to know how to port your code away from it.
 DEFINES += QT_DEPRECATED_WARNINGS
 
+QMAKE_CXXFLAGS += -flto -std=c++17 -O2
+
+SOURCES += \
+    src/broadcast.cpp \
+    src/ui/actorwidgets/sensoractorwidget.cpp \
+    src/ui/actorwidgets/alarmwidget.cpp \
+    src/ui/actorwidgets/timeractorwidget.cpp \
+    src/ui/itemwidget.cpp \
+    src/ui/itemsettingsdialog.cpp \
+    src/ui/itemscrollbox.cpp \
+    src/items/poweritem.cpp \
+    src/ui/actorwidgets/regulatorwdiget.cpp
+
+SOURCES += \
+    src/ui/actorsettingsdialog.cpp \
+    src/ui/mainwindow.cpp \
+    src/ui/sensorlistwidget.cpp
+
+SOURCES += \
+    src/actors/actor.cpp \
+    src/actors/sensoractor.cpp \
+    src/actors/alarmtime.cpp \
+    src/actors/regulator.cpp \
+    src/actors/timeractor.cpp
+
+SOURCES += \
+    src/sensors/sensor.cpp \
+    src/sensors/speakersensor.cpp \
+    src/sensors/sunsensor.cpp \
+    src/sensors/ocupancysensor.cpp
+
+SOURCES += \
+    src/items/relay.cpp \
+    src/items/item.cpp \
+    src/items/itemstore.cpp \
+    src/items/auxitem.cpp \
+    src/items/rgbitem.cpp
+
+SOURCES += \
+    src/alarmactions.cpp \
+    src/main.cpp \
+    src/microcontroller.cpp \
+    src/sun.cpp
 
 
-SOURCES += main.cpp mainwindow.cpp ampmanager.cpp alarmtime.cpp \
-    microcontroller.cpp \
-    relaydialog.cpp \
-    alarmsettingsdialog.cpp \
-    alarmactions.cpp \
-    relaywidget.cpp \
-    actor.cpp \
-    relay.cpp \
-    relaymanager.cpp
+HEADERS  += \
+    src/broadcast.h \
+    src/ui/actorwidgets/alarmwidget.h \
+    src/ui/actorwidgets/sensoractorwidget.h \
+    src/ui/actorwidgets/timeractorwidget.h \
+    src/ui/itemwidget.h \
+    src/ui/itemsettingsdialog.h \
+    src/ui/itemscrollbox.h \
+    src/items/poweritem.h \
+    src/ui/actorwidgets/regulatorwdiget.h
 
-HEADERS  += mainwindow.h \
-    ampmanager.h \
-    alarmtime.h \
-    microcontroller.h \
-    relaydialog.h \
-    alarmsettingsdialog.h \
-    alarmactions.h \
-    relaywidget.h \
-    actor.h \
-    relay.h \
-    relaymanager.h
+HEADERS  += \
+    src/ui/actorsettingsdialog.h \
+    src/ui/mainwindow.h \
+    src/ui/sensorlistwidget.h
 
-FORMS    += mainwindow.ui \
-    relaydialog.ui \
-    alarmsettingsdialog.ui \
-    relaywidget.ui
+HEADERS  += \
+    src/actors/actor.h \
+    src/actors/alarmtime.h \
+    src/actors/sensoractor.h \
+    src/actors/regulator.h \
+    src/actors/timeractor.h
+
+HEADERS  += \
+    src/sensors/sensor.h \
+    src/sensors/speakersensor.h \
+    src/sensors/sunsensor.h \
+    src/sensors/ocupancysensor.h
+
+HEADERS += \
+    src/items/relay.h \
+    src/items/item.h \
+    src/items/itemstore.h \
+    src/items/auxitem.h \
+    src/items/rgbitem.h
+
+HEADERS += \
+    src/alarmactions.h \
+    src/microcontroller.h \
+    src/sun.h
+
+FORMS    += \
+    src/ui/actorsettingsdialog.ui \
+    src/ui/mainwindow.ui \
+    src/ui/relayscrollbox.ui \
+    src/ui/actorwidgets/sensoractorwidget.ui \
+    src/ui/actorwidgets/alarmwidget.ui \
+    src/ui/actorwidgets/timeractorwidget.ui \
+    src/ui/itemsettingsdialog.ui \
+    src/ui/itemwidget.ui \
+    src/ui/actorwidgets/regulatorwdiget.ui
+
+android:FORMS += src/ui/mainwindow-android.ui
 
 RESOURCES += \
     resources.qrc