From 65aee3edffc446a566bff30482b335069e7350f7 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Wed, 10 Jul 2024 21:33:33 -0500 Subject: [PATCH] Addon Manager: Eliminate use of Qt::WindowStaysOnTopHint Fixes #14860 --- src/Mod/AddonManager/NetworkManager.py | 1 - src/Mod/AddonManager/addonmanager_firstrun.py | 1 - src/Mod/AddonManager/addonmanager_installer_gui.py | 3 --- src/Mod/AddonManager/addonmanager_update_all_gui.py | 1 - src/Mod/AddonManager/change_branch.py | 1 - src/Mod/AddonManager/install_to_toolbar.py | 2 -- src/Mod/AddonManager/manage_python_dependencies.py | 1 - 7 files changed, 10 deletions(-) diff --git a/src/Mod/AddonManager/NetworkManager.py b/src/Mod/AddonManager/NetworkManager.py index fcf558c274..3d391e670b 100644 --- a/src/Mod/AddonManager/NetworkManager.py +++ b/src/Mod/AddonManager/NetworkManager.py @@ -478,7 +478,6 @@ if HAVE_QTNETWORK: proxy_authentication = FreeCADGui.PySideUic.loadUi( os.path.join(os.path.dirname(__file__), "proxy_authentication.ui") ) - proxy_authentication.setWindowFlag(QtCore.Qt.WindowStaysOnTopHint, True) # Show the right labels, etc. proxy_authentication.labelProxyAddress.setText(f"{reply.hostName()}:{reply.port()}") if authenticator.realm(): diff --git a/src/Mod/AddonManager/addonmanager_firstrun.py b/src/Mod/AddonManager/addonmanager_firstrun.py index eeaa4bc6c6..bee2052509 100644 --- a/src/Mod/AddonManager/addonmanager_firstrun.py +++ b/src/Mod/AddonManager/addonmanager_firstrun.py @@ -51,7 +51,6 @@ class FirstRunDialog: warning_dialog = FreeCADGui.PySideUic.loadUi( os.path.join(os.path.dirname(__file__), "first_run.ui") ) - warning_dialog.setWindowFlag(QtCore.Qt.WindowStaysOnTopHint, True) autocheck = self.pref.GetBool("AutoCheck", False) download_macros = self.pref.GetBool("DownloadMacros", False) proxy_string = self.pref.GetString("ProxyUrl", "") diff --git a/src/Mod/AddonManager/addonmanager_installer_gui.py b/src/Mod/AddonManager/addonmanager_installer_gui.py index 265525e749..7eec964e52 100644 --- a/src/Mod/AddonManager/addonmanager_installer_gui.py +++ b/src/Mod/AddonManager/addonmanager_installer_gui.py @@ -209,7 +209,6 @@ class AddonInstallerGUI(QtCore.QObject): self.dependency_dialog = FreeCADGui.PySideUic.loadUi( os.path.join(os.path.dirname(__file__), "dependency_resolution_dialog.ui") ) - self.dependency_dialog.setWindowFlag(QtCore.Qt.WindowStaysOnTopHint, True) for addon in missing.external_addons: self.dependency_dialog.listWidgetAddons.addItem(addon) @@ -555,7 +554,6 @@ class MacroInstallerGUI(QtCore.QObject): add_toolbar_button_dialog = FreeCADGui.PySideUic.loadUi( os.path.join(os.path.dirname(__file__), "add_toolbar_button_dialog.ui") ) - add_toolbar_button_dialog.setWindowFlag(QtCore.Qt.WindowStaysOnTopHint, True) add_toolbar_button_dialog.buttonYes.clicked.connect(self._install_toolbar_button) add_toolbar_button_dialog.buttonNever.clicked.connect( lambda: self.addon_params.SetBool("dontShowAddMacroButtonDialog", True) @@ -591,7 +589,6 @@ class MacroInstallerGUI(QtCore.QObject): select_toolbar_dialog = FreeCADGui.PySideUic.loadUi( os.path.join(os.path.dirname(__file__), "select_toolbar_dialog.ui") ) - select_toolbar_dialog.setWindowFlag(QtCore.Qt.WindowStaysOnTopHint, True) select_toolbar_dialog.comboBox.clear() diff --git a/src/Mod/AddonManager/addonmanager_update_all_gui.py b/src/Mod/AddonManager/addonmanager_update_all_gui.py index 49f06a7159..9cfafbd0bf 100644 --- a/src/Mod/AddonManager/addonmanager_update_all_gui.py +++ b/src/Mod/AddonManager/addonmanager_update_all_gui.py @@ -91,7 +91,6 @@ class UpdateAllGUI(QtCore.QObject): self.dialog = FreeCADGui.PySideUic.loadUi( os.path.join(os.path.dirname(__file__), "update_all.ui") ) - self.dialog.setWindowFlag(QtCore.Qt.WindowStaysOnTopHint, True) self.row_map = {} self.in_process_row = None self.active_installer = None diff --git a/src/Mod/AddonManager/change_branch.py b/src/Mod/AddonManager/change_branch.py index bb2f04fff9..5a92f29c1a 100644 --- a/src/Mod/AddonManager/change_branch.py +++ b/src/Mod/AddonManager/change_branch.py @@ -42,7 +42,6 @@ class ChangeBranchDialog(QtWidgets.QWidget): self.ui = FreeCADGui.PySideUic.loadUi( os.path.join(os.path.dirname(__file__), "change_branch.ui") ) - self.ui.setWindowFlag(QtCore.Qt.WindowStaysOnTopHint, True) self.item_filter = ChangeBranchDialogFilter() self.ui.tableView.setModel(self.item_filter) diff --git a/src/Mod/AddonManager/install_to_toolbar.py b/src/Mod/AddonManager/install_to_toolbar.py index 359fbd1183..c40af1bf39 100644 --- a/src/Mod/AddonManager/install_to_toolbar.py +++ b/src/Mod/AddonManager/install_to_toolbar.py @@ -43,7 +43,6 @@ def ask_to_install_toolbar_button(repo: Addon) -> None: add_toolbar_button_dialog = FreeCADGui.PySideUic.loadUi( os.path.join(os.path.dirname(__file__), "add_toolbar_button_dialog.ui") ) - add_toolbar_button_dialog.setWindowFlag(QtCore.Qt.WindowStaysOnTopHint, True) add_toolbar_button_dialog.buttonYes.clicked.connect(lambda: install_toolbar_button(repo)) add_toolbar_button_dialog.buttonNever.clicked.connect( lambda: pref.SetBool("dontShowAddMacroButtonDialog", True) @@ -79,7 +78,6 @@ def ask_for_toolbar(repo: Addon, custom_toolbars) -> object: select_toolbar_dialog = FreeCADGui.PySideUic.loadUi( os.path.join(os.path.dirname(__file__), "select_toolbar_dialog.ui") ) - select_toolbar_dialog.setWindowFlag(QtCore.Qt.WindowStaysOnTopHint, True) select_toolbar_dialog.comboBox.clear() diff --git a/src/Mod/AddonManager/manage_python_dependencies.py b/src/Mod/AddonManager/manage_python_dependencies.py index 98ade87fd7..cf4786a78b 100644 --- a/src/Mod/AddonManager/manage_python_dependencies.py +++ b/src/Mod/AddonManager/manage_python_dependencies.py @@ -174,7 +174,6 @@ class PythonPackageManager: self._add_current_python_version() self._create_list_from_pip() - self.dlg.setWindowFlag(QtCore.Qt.WindowStaysOnTopHint, True) self.dlg.tableWidget.setSortingEnabled(False) self.dlg.labelInstallationPath.setText(self.vendor_path) self.dlg.exec()