From 9a0bda9884216d7ca13765333a1ed3ad6b163da7 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Tue, 11 Oct 2022 23:27:45 +0200 Subject: [PATCH] Fix tab parents on settings dialogs --- novelwriter/dialogs/preferences.py | 56 ++++++++++++++--------------- novelwriter/dialogs/projsettings.py | 34 +++++++++--------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/novelwriter/dialogs/preferences.py b/novelwriter/dialogs/preferences.py index 964f92b0..00c1fe6a 100644 --- a/novelwriter/dialogs/preferences.py +++ b/novelwriter/dialogs/preferences.py @@ -55,13 +55,13 @@ class GuiPreferences(PagedDialog): self.setWindowTitle(self.tr("Preferences")) - self.tabGeneral = GuiPreferencesGeneral(self, self.mainGui) - self.tabProjects = GuiPreferencesProjects(self, self.mainGui) - self.tabDocs = GuiPreferencesDocuments(self, self.mainGui) - self.tabEditor = GuiPreferencesEditor(self, self.mainGui) - self.tabSyntax = GuiPreferencesSyntax(self, self.mainGui) - self.tabAuto = GuiPreferencesAutomation(self, self.mainGui) - self.tabQuote = GuiPreferencesQuotes(self, self.mainGui) + self.tabGeneral = GuiPreferencesGeneral(self) + self.tabProjects = GuiPreferencesProjects(self) + self.tabDocs = GuiPreferencesDocuments(self) + self.tabEditor = GuiPreferencesEditor(self) + self.tabSyntax = GuiPreferencesSyntax(self) + self.tabAuto = GuiPreferencesAutomation(self) + self.tabQuote = GuiPreferencesQuotes(self) self.addTab(self.tabGeneral, self.tr("General")) self.addTab(self.tabProjects, self.tr("Projects")) @@ -138,12 +138,12 @@ class GuiPreferences(PagedDialog): class GuiPreferencesGeneral(QWidget): - def __init__(self, prefsGui, mainGui): + def __init__(self, prefsGui): super().__init__(parent=prefsGui) self.mainConf = novelwriter.CONFIG - self.mainGui = mainGui - self.mainTheme = mainGui.mainTheme + self.mainGui = prefsGui.mainGui + self.mainTheme = prefsGui.mainGui.mainTheme # The Form self.mainForm = QConfigLayout() @@ -344,12 +344,12 @@ class GuiPreferencesGeneral(QWidget): class GuiPreferencesProjects(QWidget): - def __init__(self, prefsGui, mainGui): + def __init__(self, prefsGui): super().__init__(parent=prefsGui) self.mainConf = novelwriter.CONFIG - self.mainGui = mainGui - self.mainTheme = mainGui.mainTheme + self.mainGui = prefsGui.mainGui + self.mainTheme = prefsGui.mainGui.mainTheme # The Form self.mainForm = QConfigLayout() @@ -505,12 +505,12 @@ class GuiPreferencesProjects(QWidget): class GuiPreferencesDocuments(QWidget): - def __init__(self, prefsGui, mainGui): + def __init__(self, prefsGui): super().__init__(parent=prefsGui) self.mainConf = novelwriter.CONFIG - self.mainGui = mainGui - self.mainTheme = mainGui.mainTheme + self.mainGui = prefsGui.mainGui + self.mainTheme = prefsGui.mainGui.mainTheme # The Form self.mainForm = QConfigLayout() @@ -666,12 +666,12 @@ class GuiPreferencesDocuments(QWidget): class GuiPreferencesEditor(QWidget): - def __init__(self, prefsGui, mainGui): + def __init__(self, prefsGui): super().__init__(parent=prefsGui) self.mainConf = novelwriter.CONFIG - self.mainGui = mainGui - self.mainTheme = mainGui.mainTheme + self.mainGui = prefsGui.mainGui + self.mainTheme = prefsGui.mainGui.mainTheme # The Form self.mainForm = QConfigLayout() @@ -840,12 +840,12 @@ class GuiPreferencesEditor(QWidget): class GuiPreferencesSyntax(QWidget): - def __init__(self, prefsGui, mainGui): + def __init__(self, prefsGui): super().__init__(parent=prefsGui) self.mainConf = novelwriter.CONFIG - self.mainGui = mainGui - self.mainTheme = mainGui.mainTheme + self.mainGui = prefsGui.mainGui + self.mainTheme = prefsGui.mainGui.mainTheme # The Form self.mainForm = QConfigLayout() @@ -943,12 +943,12 @@ class GuiPreferencesSyntax(QWidget): class GuiPreferencesAutomation(QWidget): - def __init__(self, prefsGui, mainGui): + def __init__(self, prefsGui): super().__init__(parent=prefsGui) self.mainConf = novelwriter.CONFIG - self.mainGui = mainGui - self.mainTheme = mainGui.mainTheme + self.mainGui = prefsGui.mainGui + self.mainTheme = prefsGui.mainGui.mainTheme # The Form self.mainForm = QConfigLayout() @@ -1100,12 +1100,12 @@ class GuiPreferencesAutomation(QWidget): class GuiPreferencesQuotes(QWidget): - def __init__(self, prefsGui, mainGui): + def __init__(self, prefsGui): super().__init__(parent=prefsGui) self.mainConf = novelwriter.CONFIG - self.mainGui = mainGui - self.mainTheme = mainGui.mainTheme + self.mainGui = prefsGui.mainGui + self.mainTheme = prefsGui.mainGui.mainTheme # The Form self.mainForm = QConfigLayout() diff --git a/novelwriter/dialogs/projsettings.py b/novelwriter/dialogs/projsettings.py index d2484a20..87954392 100644 --- a/novelwriter/dialogs/projsettings.py +++ b/novelwriter/dialogs/projsettings.py @@ -67,10 +67,10 @@ class GuiProjectSettings(PagedDialog): self.mainConf.pxInt(pOptions.getInt("GuiProjectSettings", "winHeight", wH)) ) - self.tabMain = GuiProjectEditMain(self, self.mainGui, self.theProject) - self.tabStatus = GuiProjectEditStatus(self, self.mainGui, self.theProject, True) - self.tabImport = GuiProjectEditStatus(self, self.mainGui, self.theProject, False) - self.tabReplace = GuiProjectEditReplace(self, self.mainGui, self.theProject) + self.tabMain = GuiProjectEditMain(self) + self.tabStatus = GuiProjectEditStatus(self, True) + self.tabImport = GuiProjectEditStatus(self, False) + self.tabReplace = GuiProjectEditReplace(self) self.addTab(self.tabMain, self.tr("Settings")) self.addTab(self.tabStatus, self.tr("Status")) @@ -166,12 +166,12 @@ class GuiProjectSettings(PagedDialog): class GuiProjectEditMain(QWidget): - def __init__(self, projGui, mainGui, theProject): + def __init__(self, projGui): super().__init__(parent=projGui) self.mainConf = novelwriter.CONFIG - self.mainGui = mainGui - self.theProject = theProject + self.mainGui = projGui.mainGui + self.theProject = projGui.theProject # The Form self.mainForm = QConfigLayout() @@ -256,13 +256,13 @@ class GuiProjectEditStatus(QWidget): COL_ROLE = Qt.UserRole + 1 NUM_ROLE = Qt.UserRole + 2 - def __init__(self, prefsGui, mainGui, theProject, isStatus): - super().__init__(parent=prefsGui) + def __init__(self, projGui, isStatus): + super().__init__(parent=projGui) self.mainConf = novelwriter.CONFIG - self.mainGui = mainGui - self.theProject = theProject - self.mainTheme = mainGui.mainTheme + self.mainGui = projGui.mainGui + self.theProject = projGui.theProject + self.mainTheme = projGui.mainGui.mainTheme if isStatus: self.theStatus = self.theProject.statusItems @@ -527,13 +527,13 @@ class GuiProjectEditReplace(QWidget): COL_KEY = 0 COL_REPL = 1 - def __init__(self, prefsGui, mainGui, theProject): - super().__init__(parent=prefsGui) + def __init__(self, projGui): + super().__init__(parent=projGui) self.mainConf = novelwriter.CONFIG - self.mainGui = mainGui - self.mainTheme = mainGui.mainTheme - self.theProject = theProject + self.mainGui = projGui.mainGui + self.mainTheme = projGui.mainGui.mainTheme + self.theProject = projGui.theProject self.arChanged = False wCol0 = self.mainConf.pxInt(