diff --git a/plugin_manager.py b/plugin_manager.py index 8b28676..2b5f3be 100644 --- a/plugin_manager.py +++ b/plugin_manager.py @@ -29,7 +29,7 @@ from datetime import datetime # Modules used for overriding AllSettingsWindow import logging -PLUGIN_MANAGER_VERSION = "1.2.1" +PLUGIN_MANAGER_VERSION = "1.2.0" 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. @@ -48,17 +48,14 @@ loop = babase._asyncio._asyncio_event_loop open_popups = [] - def _add_popup(popup): open_popups.append(popup) - def _remove_popup(popup): try: open_popups.remove(popup) except ValueError: pass - def _uiscale(): return bui.app.ui_v1.uiscale def _regexp_friendly_class_name_shortcut(string): return string.replace(".", "\\.") @@ -1043,8 +1040,7 @@ class ChangelogWindow(popup.PopupWindow): size=(width, height), on_outside_click_call=self._back, transition=transition, - scale=(1.5 if _uiscale() is babase.UIScale.SMALL else 1.5 if _uiscale() - is babase.UIScale.MEDIUM else 1.0), + scale=(1.5 if _uiscale() is babase.UIScale.SMALL else 1.5 if _uiscale() is babase.UIScale.MEDIUM else 1.0), scale_origin_stack_offset=self.scale_origin ) @@ -1181,7 +1177,7 @@ class AuthorsWindow(popup.PopupWindow): parent=self._root_widget, size=(width * 0.8, height * 0.75), position=(width * 0.1, height * 0.1) - ) + ) self._columnwidget = bui.columnwidget( parent=self._scrollwidget, border=1, @@ -1199,9 +1195,9 @@ class AuthorsWindow(popup.PopupWindow): size=(width * 0.8, 35 if key == 'name' else 30), color=color if key == 'name' else (0.75, 0.7, 0.8), scale=( - (1.1 if key == 'name' else 0.9) if _uiscale() is babase.UIScale.SMALL else - (1.2 if key == 'name' else 1.0) - ), + (1.1 if key == 'name' else 0.9) if _uiscale() is babase.UIScale.SMALL else + (1.2 if key == 'name' else 1.0) + ), text=text, h_align='center', v_align='center', @@ -1227,7 +1223,7 @@ class PluginWindow(popup.PopupWindow): plugin: Plugin, origin_widget, plugins_list, - transition='in_scale', + transition = 'in_scale', button_callback=lambda: None, ): self.plugin: Plugin = plugin @@ -1291,8 +1287,7 @@ class PluginWindow(popup.PopupWindow): if self.p_n_plugins[0] is not None: previous_plugin_button = bui.buttonwidget( parent=self._root_widget, - position=(-12.5*s + (4 if _uiscale() is babase.UIScale.SMALL else -5), - height/2 - 20*s), + position=(-12.5*s + (4 if _uiscale() is babase.UIScale.SMALL else -5), height/2 - 20*s), label='<', size=(25, 40), color=(1, 0.5, 0.5), @@ -1303,8 +1298,7 @@ class PluginWindow(popup.PopupWindow): if self.p_n_plugins[1] is not None: next_plugin_button = bui.buttonwidget( parent=self._root_widget, - position=(width - 12.5*s - (8 if _uiscale() - is babase.UIScale.SMALL else 0), height/2 - 20*s), + position=(width - 12.5*s - (8 if _uiscale() is babase.UIScale.SMALL else 0), height/2 - 20*s), label='>', size=(25, 40), color=(1, 0.5, 0.5), @@ -1399,7 +1393,7 @@ class PluginWindow(popup.PopupWindow): 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 + 0.25 if self.plugin.is_installed else 0.4), pos ), size=button_size, on_activate_call=button1_action, @@ -1823,6 +1817,8 @@ class PluginCategoryWindow(popup.PopupMenuWindow): current_choice=current_choice, delegate=self ) + self._root_widget = self.root_widget + _add_popup(self) self._update_custom_sources_widget() def _update_custom_sources_widget(self): @@ -1958,8 +1954,7 @@ class PluginManagerWindow(bui.MainWindow): for popup in open_popups: try: bui.containerwidget(edit=popup._root_widget, transition='out_scale') - except: - pass + except: pass cls = type(self) return bui.BasicMainWindowState( create_call=lambda transition, origin_widget: cls( @@ -2072,10 +2067,7 @@ class PluginManagerWindow(bui.MainWindow): textcolor=b_textcolor, text_scale=0.6 ) - bui.buttonwidget( - edit=b, - on_activate_call=lambda: self.show_categories_window(source=b) - ) + bui.buttonwidget(edit=b, on_activate_call=lambda: self.show_categories_window(source=b)), else: b = self.category_selection_button bui.buttonwidget( @@ -2282,10 +2274,8 @@ class PluginManagerWindow(bui.MainWindow): plugin_names_ready_to_draw = [] for plugin in plugin_names_to_draw: - try: - lcv = plugin.latest_compatible_version - except NoCompatibleVersion: - continue + try: lcv = plugin.latest_compatible_version + except NoCompatibleVersion: continue plugin_names_ready_to_draw += [plugin] for i, plugin in enumerate(plugin_names_ready_to_draw): @@ -2559,8 +2549,7 @@ class PluginManagerSettingsWindow(popup.PopupWindow): parent=self._root_widget, position=((width * 0.77) - button_size[0] / 2, pos), size=button_size, - on_activate_call=lambda: loop.create_task( - self.update(*plugin_manager_update_available)), + on_activate_call=lambda: loop.create_task(self.update(*plugin_manager_update_available)), textcolor=b_text_color, button_type='square', text_scale=1,