From 294cd4dfd8e5893a25fef37e7c237e7f53fb2001 Mon Sep 17 00:00:00 2001 From: Artem30801 Date: Wed, 12 Feb 2020 18:44:35 +0300 Subject: [PATCH] Fixes for standalone and server config dialog --- Server/config_editor_models.py | 9 +++++++-- Server/server_qt.py | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Server/config_editor_models.py b/Server/config_editor_models.py index 137fd4b..146126c 100644 --- a/Server/config_editor_models.py +++ b/Server/config_editor_models.py @@ -229,10 +229,10 @@ def ensure_unique_names(item, include_self=True): class ConfigModel(QtCore.QAbstractItemModel): def __init__(self, parent=None, widget=None, headers=("Option", "Value", 'Comment', 'Inline Comment')): + self.rootItem = ConfigModelItem(headers) super(ConfigModel, self).__init__(parent) self.widget = widget - self.rootItem = ConfigModelItem(headers) self.do_color = True self.initial_comment = '' @@ -883,7 +883,12 @@ class ConfigDialog(QtWidgets.QDialog): on_restart() return True - def call_standalone_dialog(self): + @classmethod + def call_standalone_dialog(cls): + dialog = cls() + dialog._call_standalone_dialog() + + def _call_standalone_dialog(self): path = QFileDialog.getOpenFileName(self, "Select configuration or specification file", filter="Config and spec files (*.ini)")[0] if not path: diff --git a/Server/server_qt.py b/Server/server_qt.py index 0b980f0..ae94d15 100644 --- a/Server/server_qt.py +++ b/Server/server_qt.py @@ -139,7 +139,6 @@ class MainWindow(QtWidgets.QMainWindow): self.ui.action_edit_any_config.triggered.connect(ConfigDialog.call_standalone_dialog) self.ui.action_edit_server_config.triggered.connect(self.edit_server_config) - self.ui.action_restart_server.triggered.connect(restart) self.ui.action_update_server_git.triggered.connect(update_server)