From 198a782660dd447ff6398f466b0adff7aac2b438 Mon Sep 17 00:00:00 2001 From: Vishal Date: Sat, 5 Nov 2022 12:50:33 +0530 Subject: [PATCH 1/7] Plugin Settings --- assets/src/ba_data/python/ba/_plugin.py | 15 +- .../python/bastd/ui/settings/advanced.py | 4 +- .../python/bastd/ui/settings/plugins.py | 30 +++- .../bastd/ui/settings/pluginsettings.py | 151 ++++++++++++++++++ 4 files changed, 189 insertions(+), 11 deletions(-) create mode 100644 assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py diff --git a/assets/src/ba_data/python/ba/_plugin.py b/assets/src/ba_data/python/ba/_plugin.py index 3e896887..a9a50172 100644 --- a/assets/src/ba_data/python/ba/_plugin.py +++ b/assets/src/ba_data/python/ba/_plugin.py @@ -48,13 +48,14 @@ class PluginSubsystem: available=True, ) ) - if class_path not in plugstates: - # Go ahead and enable new plugins by default, but we'll - # inform the user that they need to restart to pick them up. - # they can also disable them in settings so they never load. - plugstates[class_path] = {'enabled': True} - config_changed = True - found_new = True + if _ba.app.config['Auto Enable New Plugins'] is True: + if class_path not in plugstates: + # Go ahead and enable new plugins by default, but we'll + # inform the user that they need to restart to pick them up. + # they can also disable them in settings so they never load. + plugstates[class_path] = {'enabled': True} + config_changed = True + found_new = True plugs.potential_plugins.sort(key=lambda p: p.class_path) diff --git a/assets/src/ba_data/python/bastd/ui/settings/advanced.py b/assets/src/ba_data/python/bastd/ui/settings/advanced.py index 940cd161..cde5d7b8 100644 --- a/assets/src/ba_data/python/bastd/ui/settings/advanced.py +++ b/assets/src/ba_data/python/bastd/ui/settings/advanced.py @@ -667,12 +667,12 @@ class AdvancedSettingsWindow(ba.Window): appinvite.handle_app_invites_press() def _on_plugins_button_press(self) -> None: - from bastd.ui.settings.plugins import PluginSettingsWindow + from bastd.ui.settings.plugins import PluginWindow self._save_state() ba.containerwidget(edit=self._root_widget, transition='out_left') ba.app.ui.set_main_menu_window( - PluginSettingsWindow( + PluginWindow( origin_widget=self._plugins_button ).get_root_widget() ) diff --git a/assets/src/ba_data/python/bastd/ui/settings/plugins.py b/assets/src/ba_data/python/bastd/ui/settings/plugins.py index a8197551..598c7444 100644 --- a/assets/src/ba_data/python/bastd/ui/settings/plugins.py +++ b/assets/src/ba_data/python/bastd/ui/settings/plugins.py @@ -1,6 +1,6 @@ # Released under the MIT License. See LICENSE for details. # -"""Plugin settings UI.""" +"""Plugin Window UI.""" from __future__ import annotations @@ -12,7 +12,7 @@ if TYPE_CHECKING: pass -class PluginSettingsWindow(ba.Window): +class PluginWindow(ba.Window): """Window for configuring plugins.""" def __init__( @@ -106,6 +106,21 @@ class PluginSettingsWindow(ba.Window): size=(60, 60), label=ba.charstr(ba.SpecialChar.BACK), ) + settings_button_x = 670 if uiscale is ba.UIScale.SMALL else 570 + self._settings_button = ba.buttonwidget( + parent=self._root_widget, + position=(settings_button_x, self._height - 60), + size=(40, 40), + label='', + on_activate_call=self._open_settings, + ) + + ba.imagewidget( + parent=self._root_widget, + position=(settings_button_x + 5, self._height - 60), + size=(35, 35), + texture=ba.gettexture('settingsIcon'), + ) self._scrollwidget = ba.scrollwidget( parent=self._root_widget, @@ -212,6 +227,17 @@ class PluginSettingsWindow(ba.Window): plugstate['enabled'] = value ba.app.config.commit() + def _open_settings(self) -> None: + from bastd.ui.settings.pluginsettings import PluginSettingsWindow + ba.playsound(ba.getsound('swish')) + + ba.containerwidget( + edit=self._root_widget,transition='out_left' + ) + ba.app.ui.set_main_menu_window( + PluginSettingsWindow(transition='in_right').get_root_widget() + ) + def _save_state(self) -> None: pass diff --git a/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py b/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py new file mode 100644 index 00000000..7ea1d4b1 --- /dev/null +++ b/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py @@ -0,0 +1,151 @@ +# Released under the MIT License. See LICENSE for details. +# +"""Plugin Settings UI.""" + +from __future__ import annotations + +from typing import TYPE_CHECKING + +import ba + +if TYPE_CHECKING: + pass + +class PluginSettingsWindow(ba.Window): + """Plugin Settings Window""" + + def __init__( + self, + transition: str = 'in_right' + ): + + scale_origin: tuple[float, float] | None + self._transition_out = 'out_right' + scale_origin = None + + uiscale = ba.app.ui.uiscale + width = 470.0 if uiscale is ba.UIScale.SMALL else 470.0 + height = ( + 365.0 + if uiscale is ba.UIScale.SMALL + else 300.0 + if uiscale is ba.UIScale.MEDIUM + else 370.0 + ) + top_extra = 10 if uiscale is ba.UIScale.SMALL else 0 + + super().__init__( + root_widget=ba.containerwidget( + size=(width, height + top_extra), + transition=transition, + toolbar_visibility='menu_minimal', + scale_origin_stack_offset=scale_origin, + scale=( + 2.06 + if uiscale is ba.UIScale.SMALL + else 1.4 + if uiscale is ba.UIScale.MEDIUM + else 1.0 + ), + stack_offset=(0, -25) + if uiscale is ba.UIScale.SMALL + else (0, 0), + ) + ) + + self._back_button = ba.buttonwidget( + parent=self._root_widget, + position=(53, height - 60), + size=(60, 60), + scale=0.8, + autoselect=True, + label=ba.charstr(ba.SpecialChar.BACK), + button_type='backSmall', + on_activate_call=self._do_back + ) + ba.containerwidget( + edit=self._root_widget, cancel_button=self._back_button + ) + + self._title_text = ba.textwidget( + parent=self._root_widget, + position=(0, height - 52), + size=(width, 25), + text='Plugin Settings', + color=ba.app.ui.title_color, + h_align='center', + v_align='top' + ) + + self._y_position = 170 if uiscale is ba.UIScale.MEDIUM else 205 + self._plugins_button = ba.buttonwidget( + parent=self._root_widget, + position=(65,self._y_position), + size=(350, 60), + autoselect=True, + label='Enable All Plugins', + text_scale=1.0, + on_activate_call=self._enable_all_plugins, + ) + + self._y_position -= 70 + self._plugins_button = ba.buttonwidget( + parent=self._root_widget, + position=(65,self._y_position), + size=(350, 60), + autoselect=True, + label='Disable All Plugins', + text_scale=1.0, + on_activate_call=self._disable_all_plugins, + ) + + self._y_position -= 70 + self._enable_new_plugins_check_box = ba.checkboxwidget( + parent=self._root_widget, + position=(65, self._y_position), + size=(350, 60), + value=ba.app.config['Auto Enable New Plugins'], + text='Auto Enable New Plugins', + scale=1.0, + maxwidth=430, + on_value_change_call=self._update_value + ) + + def _enable_all_plugins(self) -> None: + cfg = ba.app.config + plugs = cfg['Plugins'] + for plug in plugs: + plugs[plug]['enabled'] = True + cfg.apply_and_commit() + + ba.screenmessage( + ba.Lstr(resource='settingsWindowAdvanced.mustRestartText'), + color=(1.0, 0.5, 0.0), + ) + + def _disable_all_plugins(self) -> None: + cfg = ba.app.config + plugs = cfg['Plugins'] + for plug in plugs: + plugs[plug]['enabled'] = False + cfg.apply_and_commit() + + ba.screenmessage( + ba.Lstr(resource='settingsWindowAdvanced.mustRestartText'), + color=(1.0, 0.5, 0.0), + ) + + def _update_value(self, val: bool) -> None: + cfg = ba.app.config + cfg['Auto Enable New Plugins'] = val + cfg.apply_and_commit() + + def _do_back(self) -> None: + from bastd.ui.settings.plugins import PluginWindow + + ba.containerwidget( + edit=self._root_widget, transition=self._transition_out + ) + ba.app.ui.set_main_menu_window( + PluginWindow(transition='in_left').get_root_widget() + ) From f9925aba0ab274fa414791415865254ac2e0ba8b Mon Sep 17 00:00:00 2001 From: Vishal Date: Sat, 5 Nov 2022 12:57:08 +0530 Subject: [PATCH 2/7] Fixing an Error --- assets/src/ba_data/python/bastd/ui/settings/plugins.py | 1 + assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py | 1 + 2 files changed, 2 insertions(+) diff --git a/assets/src/ba_data/python/bastd/ui/settings/plugins.py b/assets/src/ba_data/python/bastd/ui/settings/plugins.py index 598c7444..16fd5836 100644 --- a/assets/src/ba_data/python/bastd/ui/settings/plugins.py +++ b/assets/src/ba_data/python/bastd/ui/settings/plugins.py @@ -228,6 +228,7 @@ class PluginWindow(ba.Window): ba.app.config.commit() def _open_settings(self) -> None: + # pylint: disable=cyclic-import from bastd.ui.settings.pluginsettings import PluginSettingsWindow ba.playsound(ba.getsound('swish')) diff --git a/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py b/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py index 7ea1d4b1..5d378f52 100644 --- a/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py +++ b/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py @@ -141,6 +141,7 @@ class PluginSettingsWindow(ba.Window): cfg.apply_and_commit() def _do_back(self) -> None: + # pylint: disable=cyclic-import from bastd.ui.settings.plugins import PluginWindow ba.containerwidget( From 713540cbb843700d8759d87e7c719d4bd8f6196c Mon Sep 17 00:00:00 2001 From: Vishal Date: Sat, 5 Nov 2022 13:41:45 +0530 Subject: [PATCH 3/7] Adding Language Compatibility --- .../ba_data/python/bastd/ui/settings/pluginsettings.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py b/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py index 5d378f52..24a60e1b 100644 --- a/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py +++ b/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py @@ -71,7 +71,7 @@ class PluginSettingsWindow(ba.Window): parent=self._root_widget, position=(0, height - 52), size=(width, 25), - text='Plugin Settings', + text=ba.Lstr(resource='pluginSettingsText'), color=ba.app.ui.title_color, h_align='center', v_align='top' @@ -83,7 +83,7 @@ class PluginSettingsWindow(ba.Window): position=(65,self._y_position), size=(350, 60), autoselect=True, - label='Enable All Plugins', + label=ba.Lstr(resource='pluginsEnableAllText'), text_scale=1.0, on_activate_call=self._enable_all_plugins, ) @@ -94,7 +94,7 @@ class PluginSettingsWindow(ba.Window): position=(65,self._y_position), size=(350, 60), autoselect=True, - label='Disable All Plugins', + label=ba.Lstr(resource='pluginsDisableAllText'), text_scale=1.0, on_activate_call=self._disable_all_plugins, ) @@ -105,7 +105,7 @@ class PluginSettingsWindow(ba.Window): position=(65, self._y_position), size=(350, 60), value=ba.app.config['Auto Enable New Plugins'], - text='Auto Enable New Plugins', + text=ba.Lstr(resource='AutoEnableNewPluginsText'), scale=1.0, maxwidth=430, on_value_change_call=self._update_value From de086a8a3f0ff72d7892ed88ab9243657152b2d9 Mon Sep 17 00:00:00 2001 From: Vishal Date: Sat, 5 Nov 2022 23:47:16 +0530 Subject: [PATCH 4/7] Updating to ConfigCheckBox --- .../ba_data/python/bastd/ui/settings/plugins.py | 2 +- .../python/bastd/ui/settings/pluginsettings.py | 15 +++++---------- src/ballistica/app/app_config.cc | 2 ++ src/ballistica/app/app_config.h | 1 + 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/assets/src/ba_data/python/bastd/ui/settings/plugins.py b/assets/src/ba_data/python/bastd/ui/settings/plugins.py index 16fd5836..0f09b1c5 100644 --- a/assets/src/ba_data/python/bastd/ui/settings/plugins.py +++ b/assets/src/ba_data/python/bastd/ui/settings/plugins.py @@ -117,7 +117,7 @@ class PluginWindow(ba.Window): ba.imagewidget( parent=self._root_widget, - position=(settings_button_x + 5, self._height - 60), + position=(settings_button_x + 3, self._height - 60), size=(35, 35), texture=ba.gettexture('settingsIcon'), ) diff --git a/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py b/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py index 24a60e1b..3cce1311 100644 --- a/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py +++ b/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py @@ -7,6 +7,7 @@ from __future__ import annotations from typing import TYPE_CHECKING import ba +from bastd.ui.config import ConfigCheckBox if TYPE_CHECKING: pass @@ -100,15 +101,14 @@ class PluginSettingsWindow(ba.Window): ) self._y_position -= 70 - self._enable_new_plugins_check_box = ba.checkboxwidget( + self._enable_new_plugins_check_box = ConfigCheckBox( parent=self._root_widget, position=(65, self._y_position), size=(350, 60), - value=ba.app.config['Auto Enable New Plugins'], - text=ba.Lstr(resource='AutoEnableNewPluginsText'), + configkey='Auto Enable New Plugins', + displayname=ba.Lstr(resource='AutoEnableNewPluginsText'), scale=1.0, - maxwidth=430, - on_value_change_call=self._update_value + maxwidth=430 ) def _enable_all_plugins(self) -> None: @@ -135,11 +135,6 @@ class PluginSettingsWindow(ba.Window): color=(1.0, 0.5, 0.0), ) - def _update_value(self, val: bool) -> None: - cfg = ba.app.config - cfg['Auto Enable New Plugins'] = val - cfg.apply_and_commit() - def _do_back(self) -> None: # pylint: disable=cyclic-import from bastd.ui.settings.plugins import PluginWindow diff --git a/src/ballistica/app/app_config.cc b/src/ballistica/app/app_config.cc index cf6f0b23..7ad55fd9 100644 --- a/src/ballistica/app/app_config.cc +++ b/src/ballistica/app/app_config.cc @@ -221,6 +221,8 @@ void AppConfig::SetupEntries() { // (default to internal keyboard on iircade; not elsewhere) bool_entries_[BoolID::kAlwaysUseInternalKeyboard] = BoolEntry("Always Use Internal Keyboard", g_buildconfig.iircade_build()); + bool_entries_[BoolID::kAutoEnableNewPlugins] = + BoolEntry("Auto Enable New Plugins", true); bool_entries_[BoolID::kShowFPS] = BoolEntry("Show FPS", false); bool_entries_[BoolID::kTVBorder] = BoolEntry("TV Border", g_platform->IsRunningOnTV()); diff --git a/src/ballistica/app/app_config.h b/src/ballistica/app/app_config.h index 9a970b4a..f40a2cb3 100644 --- a/src/ballistica/app/app_config.h +++ b/src/ballistica/app/app_config.h @@ -60,6 +60,7 @@ class AppConfig { kFullscreen, kKickIdlePlayers, kAlwaysUseInternalKeyboard, + kAutoEnableNewPlugins, kShowFPS, kTVBorder, kKeyboardP2Enabled, From 967bebf80b2a839895c71167fcfc453c53e86fce Mon Sep 17 00:00:00 2001 From: Vishal Date: Sun, 6 Nov 2022 00:49:21 +0530 Subject: [PATCH 5/7] Removing ConfigCheckBox (will add it back after a few fixes) --- .../python/bastd/ui/settings/pluginsettings.py | 15 ++++++++++----- src/ballistica/app/app_config.cc | 2 -- src/ballistica/app/app_config.h | 1 - 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py b/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py index 3cce1311..24a60e1b 100644 --- a/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py +++ b/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py @@ -7,7 +7,6 @@ from __future__ import annotations from typing import TYPE_CHECKING import ba -from bastd.ui.config import ConfigCheckBox if TYPE_CHECKING: pass @@ -101,14 +100,15 @@ class PluginSettingsWindow(ba.Window): ) self._y_position -= 70 - self._enable_new_plugins_check_box = ConfigCheckBox( + self._enable_new_plugins_check_box = ba.checkboxwidget( parent=self._root_widget, position=(65, self._y_position), size=(350, 60), - configkey='Auto Enable New Plugins', - displayname=ba.Lstr(resource='AutoEnableNewPluginsText'), + value=ba.app.config['Auto Enable New Plugins'], + text=ba.Lstr(resource='AutoEnableNewPluginsText'), scale=1.0, - maxwidth=430 + maxwidth=430, + on_value_change_call=self._update_value ) def _enable_all_plugins(self) -> None: @@ -135,6 +135,11 @@ class PluginSettingsWindow(ba.Window): color=(1.0, 0.5, 0.0), ) + def _update_value(self, val: bool) -> None: + cfg = ba.app.config + cfg['Auto Enable New Plugins'] = val + cfg.apply_and_commit() + def _do_back(self) -> None: # pylint: disable=cyclic-import from bastd.ui.settings.plugins import PluginWindow diff --git a/src/ballistica/app/app_config.cc b/src/ballistica/app/app_config.cc index 7ad55fd9..cf6f0b23 100644 --- a/src/ballistica/app/app_config.cc +++ b/src/ballistica/app/app_config.cc @@ -221,8 +221,6 @@ void AppConfig::SetupEntries() { // (default to internal keyboard on iircade; not elsewhere) bool_entries_[BoolID::kAlwaysUseInternalKeyboard] = BoolEntry("Always Use Internal Keyboard", g_buildconfig.iircade_build()); - bool_entries_[BoolID::kAutoEnableNewPlugins] = - BoolEntry("Auto Enable New Plugins", true); bool_entries_[BoolID::kShowFPS] = BoolEntry("Show FPS", false); bool_entries_[BoolID::kTVBorder] = BoolEntry("TV Border", g_platform->IsRunningOnTV()); diff --git a/src/ballistica/app/app_config.h b/src/ballistica/app/app_config.h index f40a2cb3..9a970b4a 100644 --- a/src/ballistica/app/app_config.h +++ b/src/ballistica/app/app_config.h @@ -60,7 +60,6 @@ class AppConfig { kFullscreen, kKickIdlePlayers, kAlwaysUseInternalKeyboard, - kAutoEnableNewPlugins, kShowFPS, kTVBorder, kKeyboardP2Enabled, From 147038b724c98f3af2ed7826ce7e49aa3399c762 Mon Sep 17 00:00:00 2001 From: Vishal Date: Sun, 6 Nov 2022 11:36:42 +0530 Subject: [PATCH 6/7] Fixed Arrow Navigation --- .../python/bastd/ui/settings/plugins.py | 7 +++++++ .../bastd/ui/settings/pluginsettings.py | 21 +++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/assets/src/ba_data/python/bastd/ui/settings/plugins.py b/assets/src/ba_data/python/bastd/ui/settings/plugins.py index 0f09b1c5..2a5e4ffe 100644 --- a/assets/src/ba_data/python/bastd/ui/settings/plugins.py +++ b/assets/src/ba_data/python/bastd/ui/settings/plugins.py @@ -122,6 +122,12 @@ class PluginWindow(ba.Window): texture=ba.gettexture('settingsIcon'), ) + ba.widget( + edit=self._settings_button, + up_widget=self._settings_button, + right_widget=self._settings_button + ) + self._scrollwidget = ba.scrollwidget( parent=self._root_widget, position=(50 + x_inset, 50), @@ -200,6 +206,7 @@ class PluginWindow(ba.Window): edit=check, up_widget=self._back_button, left_widget=self._back_button, + right_widget=self._settings_button ) if button is not None: ba.widget(edit=button, up_widget=self._back_button) diff --git a/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py b/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py index 24a60e1b..a16b9377 100644 --- a/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py +++ b/assets/src/ba_data/python/bastd/ui/settings/pluginsettings.py @@ -78,7 +78,7 @@ class PluginSettingsWindow(ba.Window): ) self._y_position = 170 if uiscale is ba.UIScale.MEDIUM else 205 - self._plugins_button = ba.buttonwidget( + self._enable_plugins_button = ba.buttonwidget( parent=self._root_widget, position=(65,self._y_position), size=(350, 60), @@ -89,7 +89,7 @@ class PluginSettingsWindow(ba.Window): ) self._y_position -= 70 - self._plugins_button = ba.buttonwidget( + self._disable_plugins_button = ba.buttonwidget( parent=self._root_widget, position=(65,self._y_position), size=(350, 60), @@ -111,6 +111,23 @@ class PluginSettingsWindow(ba.Window): on_value_change_call=self._update_value ) + ba.widget( + edit=self._back_button, + down_widget=self._enable_plugins_button + ) + + ba.widget( + edit=self._disable_plugins_button, + left_widget=self._disable_plugins_button + ) + + ba.widget( + edit=self._enable_new_plugins_check_box, + left_widget=self._enable_new_plugins_check_box, + right_widget=self._enable_new_plugins_check_box, + down_widget=self._enable_new_plugins_check_box + ) + def _enable_all_plugins(self) -> None: cfg = ba.app.config plugs = cfg['Plugins'] From 128ec50adc0aad3c4cdc0445aeaa9963136a8501 Mon Sep 17 00:00:00 2001 From: Vishal Date: Sun, 6 Nov 2022 20:51:06 +0530 Subject: [PATCH 7/7] A Small Fix in Gather Tab --- assets/src/ba_data/python/bastd/ui/gather/manualtab.py | 1 + assets/src/ba_data/python/bastd/ui/gather/publictab.py | 1 + 2 files changed, 2 insertions(+) diff --git a/assets/src/ba_data/python/bastd/ui/gather/manualtab.py b/assets/src/ba_data/python/bastd/ui/gather/manualtab.py index 960e6eef..ee371ba0 100644 --- a/assets/src/ba_data/python/bastd/ui/gather/manualtab.py +++ b/assets/src/ba_data/python/bastd/ui/gather/manualtab.py @@ -256,6 +256,7 @@ class ManualGatherTab(GatherTab): autoselect=True, v_align='center', scale=1.0, + maxwidth=380, size=(420, 60), ) ba.widget(edit=self._join_by_address_text, down_widget=txt) diff --git a/assets/src/ba_data/python/bastd/ui/gather/publictab.py b/assets/src/ba_data/python/bastd/ui/gather/publictab.py index fafd19b4..93772ca5 100644 --- a/assets/src/ba_data/python/bastd/ui/gather/publictab.py +++ b/assets/src/ba_data/python/bastd/ui/gather/publictab.py @@ -571,6 +571,7 @@ class PublicGatherTab(GatherTab): h_align='left', v_align='center', editable=True, + maxwidth=310, description=filter_txt, ) ba.widget(edit=self._filter_text, up_widget=self._join_text)