From e88d2cd28d56ad82c0a9ba15296babc77df5e76f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Sep 2026 21:37:03 +0000 Subject: [PATCH] Remove SuperWoW Vanilla Tweaks coupling --- setup_tool.py | 45 ------------------------------------------- setup_tool_dynamic.py | 6 ------ tests/test_safety.py | 20 ------------------- 3 files changed, 71 deletions(-) diff --git a/setup_tool.py b/setup_tool.py index a6258be..2e47764 100644 --- a/setup_tool.py +++ b/setup_tool.py @@ -544,7 +544,6 @@ class WowSetupTool: self._load_legacy_install_state(target_dir) self._normalize_plugin_conflicts() self.toggle_safety_limits() - self.update_superwow_managed_controls() return False try: @@ -562,7 +561,6 @@ class WowSetupTool: self._normalize_plugin_conflicts() self.toggle_safety_limits() - self.update_superwow_managed_controls() if recovered_from_damage: messagebox.showwarning( @@ -719,48 +717,7 @@ class WowSetupTool: cb.pack(anchor='w', padx=10, pady=4) ToolTip(cb, self.descriptions.get(dll, "")) - def _superwow_enabled(self): - var = self.core_plugins.get("SuperWoWhook.dll") - return bool(var is not None and var.get()) - - def update_superwow_managed_controls(self): - """Keep Vanilla Tweaks controls independent from SuperWoW.""" - if hasattr(self, "superwow_notice"): - try: - self.superwow_notice.pack_forget() - except tk.TclError: - pass - - if hasattr(self, "fov_ratio_combo"): - self.fov_ratio_combo.configure(state="readonly") - if hasattr(self, "fov_entry"): - self.fov_entry.configure(state="normal") - if hasattr(self, "sound_scale"): - self.sound_scale.configure(state="normal") - if hasattr(self, "sound_entry"): - self.sound_entry.configure(state="normal") - if hasattr(self, "cb_loot"): - self.cb_loot.configure(state="normal") - if hasattr(self, "cb_bg"): - self.cb_bg.configure(state="normal") - def build_tweaks_tab(self, parent): - self.superwow_notice = tk.Label( - parent, - text="", - background="#EAF4FF", - foreground="#005A9E", - font=("Segoe UI", 9, "bold"), - relief="solid", - borderwidth=1, - padx=8, - pady=4, - anchor="w", - justify="left", - wraplength=620, - ) - self.superwow_notice.pack(fill="x", padx=10, pady=(5, 2)) - fov_frame = ttk.LabelFrame(parent, text="Field of View (FoV) Calculator") fov_frame.pack(fill='x', padx=10, pady=5) @@ -858,8 +815,6 @@ class WowSetupTool: cb_clear_wdb.grid(row=4, column=0, sticky='w', padx=10, pady=2) ToolTip(cb_clear_wdb, self.descriptions["clear_wdb"]) - self.update_superwow_managed_controls() - def build_visual_audio_tab(self, parent): ttk.Label( diff --git a/setup_tool_dynamic.py b/setup_tool_dynamic.py index 5f15afd..9b1ff29 100644 --- a/setup_tool_dynamic.py +++ b/setup_tool_dynamic.py @@ -641,18 +641,12 @@ class ModernWowSetupTool(WowSetupTool): dll, (os.path.splitext(dll)[0], "") ) - command = ( - self.update_superwow_managed_controls - if dll == "SuperWoWhook.dll" - else None - ) self._plugin_row( left_frame, display_name, var, attribution, self.descriptions.get(dll, ""), - command=command, ) self._plugin_row( diff --git a/tests/test_safety.py b/tests/test_safety.py index 5aedd85..a1a6990 100644 --- a/tests/test_safety.py +++ b/tests/test_safety.py @@ -839,26 +839,6 @@ class SmartUpdateTests(unittest.TestCase): self.assertTrue(signature_with_superwow["quickloot"]) self.assertTrue(signature_with_superwow["background_sound"]) - def test_superwow_keeps_vanilla_tweaks_controls_enabled(self): - tool = WowSetupTool.__new__(WowSetupTool) - tool.superwow_notice = mock.Mock() - tool.fov_ratio_combo = mock.Mock() - tool.fov_entry = mock.Mock() - tool.sound_scale = mock.Mock() - tool.sound_entry = mock.Mock() - tool.cb_loot = mock.Mock() - tool.cb_bg = mock.Mock() - - tool.update_superwow_managed_controls() - - tool.superwow_notice.pack_forget.assert_called_once() - tool.fov_ratio_combo.configure.assert_called_once_with(state="readonly") - tool.fov_entry.configure.assert_called_once_with(state="normal") - tool.sound_scale.configure.assert_called_once_with(state="normal") - tool.sound_entry.configure.assert_called_once_with(state="normal") - tool.cb_loot.configure.assert_called_once_with(state="normal") - tool.cb_bg.configure.assert_called_once_with(state="normal") - def test_superwow_modern_cli_keeps_selected_fov_sound_loot_and_background(self): tool = WowSetupTool.__new__(WowSetupTool) tool.core_plugins = {"SuperWoWhook.dll": FakeVar(True)}