Merge pull request #266 from Loup-Garou911XD/main

Fix for error caused when disable button was missing
bombsquad-community · Apr 22, 2024 · 4100142 · 4100142
2 parents b907dc1 + 6e10e12
commit 4100142
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Plugin Manager (dd-mm-yyyy)
 
+### 1.0.16 (22-04-2024)
+
+- Fix for error caused when disable button was missing
+
 ### 1.0.15 (22-04-2024)
 
 - Plugins can now be viewed in A-Z and Z-A order.

diff --git a/index.json b/index.json
@@ -1,6 +1,12 @@
 {
   "plugin_manager_url": "https://github.com/bombsquad-community/plugin-manager/{content_type}/{tag}/plugin_manager.py",
   "versions": {
+    "1.0.16": {
+      "api_version": 8,
+      "commit_sha": "0839999",
+      "released_on": "22-04-2024",
+      "md5sum": "f9f3f7d3ff9fcbeee7ae01c8dc1a4ab8"
+    },
     "1.0.15": {
       "api_version": 8,
       "commit_sha": "fd170eb",

diff --git a/plugin_manager.py b/plugin_manager.py
@@ -31,7 +31,7 @@
 from threading import Thread
 import logging
 
-PLUGIN_MANAGER_VERSION = "1.0.15"
+PLUGIN_MANAGER_VERSION = "1.0.16"
 REPOSITORY_URL = "https://github.com/bombsquad-community/plugin-manager"
 # Current tag can be changed to "staging" or any other branch in
 # plugin manager repo for testing purpose.
@@ -1095,45 +1095,46 @@ async def draw_ui(self):
             button1_action = self.install
 
         if to_draw_button1:
-            button1 = bui.buttonwidget(parent=self._root_widget,
-                                       position=(
-                                           width * (
-                                               0.1 if self.plugin.is_installed and has_update else
-                                               0.25 if self.plugin.is_installed else
-                                               0.4), pos),
-                                       size=button_size,
-                                       on_activate_call=button1_action,
-                                       color=b1_color,
-                                       textcolor=b_text_color,
-                                       button_type='square',
-                                       text_scale=1,
-                                       label=button1_label)
+            selected_btn = bui.buttonwidget(parent=self._root_widget,
+                                            position=(
+                                                width * (
+                                                    0.1 if self.plugin.is_installed and has_update else
+                                                    0.25 if self.plugin.is_installed else
+                                                    0.4), pos),
+                                            size=button_size,
+                                            on_activate_call=button1_action,
+                                            color=b1_color,
+                                            textcolor=b_text_color,
+                                            button_type='square',
+                                            text_scale=1,
+                                            label=button1_label)
 
         if self.plugin.is_installed:
-            bui.buttonwidget(parent=self._root_widget,
-                             position=(width * (0.4 if has_update else 0.55), pos),
-                             size=button_size,
-                             on_activate_call=button2_action,
-                             color=b2_color,
-                             textcolor=b_text_color,
-                             button_type='square',
-                             text_scale=1,
-                             label=button2_label)
+            selected_btn = bui.buttonwidget(parent=self._root_widget,
+                                            position=(width * (0.4 if has_update else 0.55), pos),
+                                            size=button_size,
+                                            on_activate_call=button2_action,
+                                            color=b2_color,
+                                            textcolor=b_text_color,
+                                            button_type='square',
+                                            text_scale=1,
+                                            label=button2_label)
 
             if has_update:
-                button1 = bui.buttonwidget(parent=self._root_widget,
-                                           position=(width * 0.7, pos),
-                                           size=button_size,
-                                           on_activate_call=button3_action,
-                                           color=b3_color,
-                                           textcolor=b_text_color,
-                                           autoselect=True,
-                                           button_type='square',
-                                           text_scale=1,
-                                           label=button3_label)
+                selected_btn = bui.buttonwidget(parent=self._root_widget,
+                                                position=(width * 0.7, pos),
+                                                size=button_size,
+                                                on_activate_call=button3_action,
+                                                color=b3_color,
+                                                textcolor=b_text_color,
+                                                autoselect=True,
+                                                button_type='square',
+                                                text_scale=1,
+                                                label=button3_label)
+
         bui.containerwidget(edit=self._root_widget,
                             on_cancel_call=self._cancel,
-                            selected_child=button1)
+                            selected_child=selected_btn)
 
         open_pos_x = (390 if _uiscale is babase.UIScale.SMALL else
                       450 if _uiscale is babase.UIScale.MEDIUM else 440)