From abe5380aa9a2c6c4f4c8b709fe52f98c542a7e15 Mon Sep 17 00:00:00 2001 From: Vishal Date: Wed, 21 Jun 2023 17:21:13 +0530 Subject: [PATCH 1/2] Small fix --- .../python/bauiv1lib/settings/plugins.py | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/assets/ba_data/python/bauiv1lib/settings/plugins.py b/src/assets/ba_data/python/bauiv1lib/settings/plugins.py index cccb2f2e..dc93d644 100644 --- a/src/assets/ba_data/python/bauiv1lib/settings/plugins.py +++ b/src/assets/ba_data/python/bauiv1lib/settings/plugins.py @@ -272,16 +272,16 @@ class PluginWindow(bui.Window): plug_line_height = 50 sub_width = self._scroll_width - num_active = 0 + num_enabled = 0 num_disabled = 0 for i, availplug in enumerate(pluglist): # counting number of enabled and disabled plugins - plugin = bui.app.plugins.active_plugins.get(availplug.class_path) - active = plugin is not None - if active: - num_active += 1 - elif availplug.available and not active: + plugstate = plugstates.setdefault(availplug.class_path, {}) + enabled = plugstate.get('enabled', False) + if enabled: + num_enabled += 1 + elif availplug.available and not enabled: num_disabled += 1 if self._category is Category.ALL: @@ -290,7 +290,7 @@ class PluginWindow(bui.Window): edit=self._subcontainer, size=(self._scroll_width, sub_height) ) elif self._category is Category.ENABLED: - sub_height = num_active * plug_line_height + sub_height = num_enabled * plug_line_height bui.containerwidget( edit=self._subcontainer, size=(self._scroll_width, sub_height) ) @@ -316,9 +316,9 @@ class PluginWindow(bui.Window): if self._category is Category.ALL: show = True elif self._category is Category.ENABLED: - show = active + show = checked elif self._category is Category.DISABLED: - show = availplug.available and not active + show = availplug.available and not checked else: assert_never(self._category) show = False @@ -342,7 +342,9 @@ class PluginWindow(bui.Window): (0.8, 0.3, 0.3) if not availplug.available else (0, 1, 0) - if active + if active and checked + else (0.8, 0.3, 0.3) + if checked else (0.6, 0.6, 0.6) ), ) @@ -424,4 +426,4 @@ class PluginWindow(bui.Window): assert bui.app.classic is not None bui.app.ui_v1.set_main_menu_window( AdvancedSettingsWindow(transition='in_left').get_root_widget() - ) + ) \ No newline at end of file From 9f9e3e9c0edcd54dba36c245b285c4895f873fba Mon Sep 17 00:00:00 2001 From: Vishal Date: Wed, 21 Jun 2023 17:28:16 +0530 Subject: [PATCH 2/2] Update plugins.py --- src/assets/ba_data/python/bauiv1lib/settings/plugins.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/ba_data/python/bauiv1lib/settings/plugins.py b/src/assets/ba_data/python/bauiv1lib/settings/plugins.py index dc93d644..635f80b0 100644 --- a/src/assets/ba_data/python/bauiv1lib/settings/plugins.py +++ b/src/assets/ba_data/python/bauiv1lib/settings/plugins.py @@ -426,4 +426,4 @@ class PluginWindow(bui.Window): assert bui.app.classic is not None bui.app.ui_v1.set_main_menu_window( AdvancedSettingsWindow(transition='in_left').get_root_widget() - ) \ No newline at end of file + )