From 256de794a37174512d085561392f965a139c360b Mon Sep 17 00:00:00 2001 From: Juraj Oravec Date: Wed, 15 May 2019 20:56:10 +0200 Subject: [PATCH] Remove buttons from all windows on unload - Remove not yet present import of i18n --- autoZoomer/__init__.py | 10 +++++++--- autoZoomer/settingsDialog.py | 1 - 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/autoZoomer/__init__.py b/autoZoomer/__init__.py index bea6199..e1aa061 100644 --- a/autoZoomer/__init__.py +++ b/autoZoomer/__init__.py @@ -22,7 +22,7 @@ from autoZoomer.autoZoomer import AutoZoomer from autoZoomer.button import AutoZoomerButton -class Zoomer_Plugin(Falkon.PluginInterface, QtCore.QObject): +class AutoZoomer_Plugin(Falkon.PluginInterface, QtCore.QObject): manager = None buttons = {} @@ -42,7 +42,11 @@ class Zoomer_Plugin(Falkon.PluginInterface, QtCore.QObject): def unload(self): self.manager.saveSettings() - self.mainWindowDeleted(self.window) + for window in Falkon.MainApplication.instance().windows(): + self.mainWindowDeleted(window) + + del self.manager + self.manager = None def testPlugin(self): return True @@ -72,4 +76,4 @@ class Zoomer_Plugin(Falkon.PluginInterface, QtCore.QObject): page.loadFinished.connect(onLoadFinished) -Falkon.registerPlugin(Zoomer_Plugin()) +Falkon.registerPlugin(AutoZoomer_Plugin()) diff --git a/autoZoomer/settingsDialog.py b/autoZoomer/settingsDialog.py index 0459bef..6832516 100644 --- a/autoZoomer/settingsDialog.py +++ b/autoZoomer/settingsDialog.py @@ -19,7 +19,6 @@ import os from PySide2 import QtCore, QtWidgets, QtUiTools from autoZoomer.listItem import ListItem -from autoZoomer.i18n import i18n class SettingsDialog(QtWidgets.QDialog):