Merge branch 'refs/heads/schnacke' into linuxero
This commit is contained in:
@@ -80,7 +80,7 @@ class ConfigLoader(QObject):
|
||||
|
||||
dbConnectionError = Signal(str, bool)
|
||||
adminUserError = Signal(str, bool)
|
||||
adminNotAvailable = Signal()
|
||||
adminNotAsvailable = Signal()
|
||||
configurationReady = Signal()
|
||||
backupEncryptionKey = Signal()
|
||||
invalidEncryptionKey = Signal()
|
||||
@@ -258,7 +258,6 @@ class ConfigLoader(QObject):
|
||||
else:
|
||||
return None
|
||||
|
||||
|
||||
def __invalidateEncryptionKey(self):
|
||||
"""! Flag the encryption key as invalid.
|
||||
"""
|
||||
@@ -310,11 +309,6 @@ class ConfigLoader(QObject):
|
||||
except Exception as e:
|
||||
print(str(e))
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
def __configLoad(self):
|
||||
"""! Loads the program configuration.
|
||||
This function emits a configurationReady signal.
|
||||
|
||||
Reference in New Issue
Block a user