Revize f727f55f

Feature/8996 config file location

aswi2021vochomurka/app.py

@@ -1 +1 @@
 import logging
 
+from PyQt5.QtCore import QSettings, QCoreApplication
 from PyQt5.QtWidgets import QApplication
 
 from aswi2021vochomurka.view.main_view import MainView
@@ -31 +32 @@
 
     logging.getLogger('apscheduler').setLevel(logging.WARNING)
     logging.getLogger('matplotlib').setLevel(logging.WARNING)
+
+
+def init_settings():
+    QCoreApplication.setOrganizationName('Vochomurka')
+    QCoreApplication.setOrganizationDomain('vochomurka.org')
+    QCoreApplication.setApplicationName('MQTTClient')
+
+    QSettings.setDefaultFormat(QSettings.IniFormat)
+    QSettings.setPath(QSettings.IniFormat, QSettings.SystemScope, '.')
+    settings = QSettings()

aswi2021vochomurka/settings.ini

@@ +1 @@
+[General]
+topics_items=/home/1, /home/2
+topics_timeout=60
+connection_host=localhost
+connection_port=1883
+connection_keepalive=60
+connection_anonymous=true
+connection_username=
+connection_password=

aswi2021vochomurka/view/main_view.py

@@ -15 +15 @@
 from aswi2021vochomurka.service.subscriber_params import SubscriberParams, ConnectionParams
 from aswi2021vochomurka.view.logger_view import LoggerView
 from aswi2021vochomurka.view.settings import SettingsDialog, DEFAULT_HOST, DEFAULT_PORT, DEFAULT_KEEPALIVE, \
-    DEFAULT_ANONYMOUS, DEFAULT_USERNAME, DEFAULT_TIMEOUT, DEFAULT_TOPICS
+    DEFAULT_ANONYMOUS, DEFAULT_USERNAME, DEFAULT_TIMEOUT, DEFAULT_TOPICS, get_settings
 
 
 class Worker(QObject, SubscriberCallback):
@@ -176 +176 @@
         self.workerThread.start()
 
     def getConfigParams(self) -> SubscriberParams:
-        settings = QSettings("Vochomurka", "MQTTClient")
+        settings = get_settings()
 
         connection = ConnectionParams(
             settings.value("connection_host", DEFAULT_HOST, str),

aswi2021vochomurka/view/settings.py

@@ -13 +13 @@
 DEFAULT_TIMEOUT = 60
 
 
+def get_settings():
+    settings = QSettings('settings.ini', QSettings.IniFormat)
+    return settings
+
+
 class SettingsDialog(QDialog):
     topics = DEFAULT_TOPICS
 
     def __init__(self):
         super(SettingsDialog, self).__init__(None,
                                              QtCore.Qt.WindowCloseButtonHint | QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowTitleHint)
-        self.settings = QSettings("Vochomurka", "MQTTClient")
+        self.settings = get_settings()
         self.setWindowTitle("Settings")
         self.setMinimumSize(QSize(600, 500))