From 4c099ed11af44f4631671951291b41f4d77ba36b Mon Sep 17 00:00:00 2001
From: Flavio Tarsetti <Flavio.Tarsetti@idiap.ch>
Date: Wed, 20 Feb 2019 14:04:40 +0100
Subject: [PATCH] [widgets] set app/name/organization with QApplication and set
QSettings as local variable
---
beat/editor/scripts/editor_cli.py | 7 +++++++
beat/editor/widgets/mainwindow.py | 15 ++++++++-------
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/beat/editor/scripts/editor_cli.py b/beat/editor/scripts/editor_cli.py
index 94980f23..84969423 100644
--- a/beat/editor/scripts/editor_cli.py
+++ b/beat/editor/scripts/editor_cli.py
@@ -36,6 +36,7 @@ import pkg_resources
from click_plugins import with_plugins
from PyQt5.QtWidgets import QApplication
+from PyQt5.QtCore import QCoreApplication
from beat.cmdline.click_helper import AliasedGroup
from beat.cmdline.config import Configuration
@@ -98,6 +99,12 @@ def start(ctx, prefix, cache):
logger.info("BEAT cache set to `%s'", config.cache)
app = QApplication(sys.argv)
+
+ # MainWindow settings
+ QCoreApplication.setApplicationName("beat.editor")
+ QCoreApplication.setOrganizationName("Idiap")
+ QCoreApplication.setOrganizationDomain("ch.idiap")
+
mainwindow = MainWindow()
mainwindow.set_prefix_root(config.path)
mainwindow.show()
diff --git a/beat/editor/widgets/mainwindow.py b/beat/editor/widgets/mainwindow.py
index dfd009de..cca818eb 100644
--- a/beat/editor/widgets/mainwindow.py
+++ b/beat/editor/widgets/mainwindow.py
@@ -44,11 +44,11 @@ class MainWindow(QMainWindow):
super(MainWindow, self).__init__(parent)
# MainWindow settings
- self.settings = QSettings("beat", "editor")
- if not self.settings.value("geometry") is None:
- self.restoreGeometry(self.settings.value("geometry"))
- if not self.settings.value("windowState") is None:
- self.restoreState(self.settings.value("windowState"))
+ settings = QSettings()
+ if not settings.value("geometry") is None:
+ self.restoreGeometry(settings.value("geometry"))
+ if not settings.value("windowState") is None:
+ self.restoreState(settings.value("windowState"))
menubar = self.menuBar()
fileMenu = menubar.addMenu(self.tr("File"))
@@ -81,6 +81,7 @@ class MainWindow(QMainWindow):
pass
def closeEvent(self, event):
- self.settings.setValue("geometry", self.saveGeometry())
- self.settings.setValue("windowState", self.saveState())
+ settings = QSettings()
+ settings.setValue("geometry", self.saveGeometry())
+ settings.setValue("windowState", self.saveState())
QMainWindow.closeEvent(self, event)
--
GitLab