From ce089fed71877e52167fe6ef0d1c06a75cb14daa Mon Sep 17 00:00:00 2001 From: Vishal Date: Sat, 2 Mar 2024 14:14:58 +0530 Subject: [PATCH] Fixing up a few stuff --- src/assets/ba_data/python/babase/modutils.py | 17 +++++++++++++---- .../python/bauiv1lib/settings/advanced.py | 9 +++++++-- .../python/bauiv1lib/settings/moddingtools.py | 17 ++++++++--------- 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/src/assets/ba_data/python/babase/modutils.py b/src/assets/ba_data/python/babase/modutils.py index 1608eb5c..3b1d14db 100644 --- a/src/assets/ba_data/python/babase/modutils.py +++ b/src/assets/ba_data/python/babase/modutils.py @@ -136,8 +136,16 @@ def create_user_system_scripts() -> None: path = f'{env.python_directory_user}/sys/{env.version}' pathtmp = path + '_tmp' if os.path.exists(path): - print('Delete Existing User Scripts and try again.') - _babase.screenmessage('Delete Existing User Scripts and try again.') + print('Delete Existing User Scripts,' + f'Restart {_babase.appname()} and try again.') + _babase.screenmessage( + 'Delete Existing User Scripts,', + color=(1, 0, 0) + ) + _babase.screenmessage( + f'Restart {_babase.appname()} and try again.', + color=(1, 0, 0) + ) return if os.path.exists(pathtmp): shutil.rmtree(pathtmp) @@ -161,7 +169,7 @@ def create_user_system_scripts() -> None: f"'\nRestart {_babase.appname()} to use them." f' (use babase.quit() to exit the game)' ) - _babase.screenmessage('Created User System Scripts') + _babase.screenmessage('Created User System Scripts', color=(0, 1, 0)) if app.classic is not None and app.classic.platform == 'android': print( 'Note: the new files may not be visible via ' @@ -186,9 +194,10 @@ def delete_user_system_scripts() -> None: f'Restart {_babase.appname()} to use internal' f' scripts. (use babase.quit() to exit the game)' ) - _babase.screenmessage('Deleted User System Scripts') + _babase.screenmessage('Deleted User System Scripts', color=(0, 1, 0)) else: print(f"User system scripts not found at '{path}'.") + _babase.screenmessage('User Scripts Not Found', color=(1, 0, 0)) # If the sys path is empty, kill it. dpath = env.python_directory_user + '/sys' diff --git a/src/assets/ba_data/python/bauiv1lib/settings/advanced.py b/src/assets/ba_data/python/bauiv1lib/settings/advanced.py index f9e2e8b1..677731de 100644 --- a/src/assets/ba_data/python/bauiv1lib/settings/advanced.py +++ b/src/assets/ba_data/python/bauiv1lib/settings/advanced.py @@ -1,6 +1,7 @@ # Released under the MIT License. See LICENSE for details. # """UI functionality for advanced settings.""" +# pylint: disable=too-many-lines from __future__ import annotations @@ -585,7 +586,7 @@ class AdvancedSettingsWindow(bui.Window): position=(self._sub_width / 2 - this_button_width / 2, v - 10), size=(this_button_width, 60), autoselect=True, - label=bui.Lstr(value='Modding Tools'), + label=bui.Lstr(resource=f'{self._r}.moddingToolsText'), text_scale=1.0, on_activate_call=self._on_modding_tools_button_press, ) @@ -779,6 +780,7 @@ class AdvancedSettingsWindow(bui.Window): ) def _on_modding_tools_button_press(self) -> None: + # pylint: disable=cyclic-import from bauiv1lib.settings.moddingtools import ModdingToolsWindow # no-op if our underlying widget is dead or on its way out. @@ -789,7 +791,9 @@ class AdvancedSettingsWindow(bui.Window): bui.containerwidget(edit=self._root_widget, transition='out_left') assert bui.app.classic is not None bui.app.ui_v1.set_main_menu_window( - ModdingToolsWindow(origin_widget=self._modding_tools_button).get_root_widget(), + ModdingToolsWindow( + origin_widget=self._modding_tools_button + ).get_root_widget(), from_window=self._root_widget, ) @@ -836,6 +840,7 @@ class AdvancedSettingsWindow(bui.Window): def _save_state(self) -> None: # pylint: disable=too-many-branches + # pylint: disable=too-many-statements try: sel = self._root_widget.get_selected_child() if sel == self._scrollwidget: diff --git a/src/assets/ba_data/python/bauiv1lib/settings/moddingtools.py b/src/assets/ba_data/python/bauiv1lib/settings/moddingtools.py index 163e3fa8..65222c85 100644 --- a/src/assets/ba_data/python/bauiv1lib/settings/moddingtools.py +++ b/src/assets/ba_data/python/bauiv1lib/settings/moddingtools.py @@ -95,8 +95,7 @@ class ModdingToolsWindow(bui.Window): parent=self._root_widget, position=(0, self._height - 52), size=(self._width, 25), - # text=bui.Lstr(resource=f'{self._r}.titleText'), - text=bui.Lstr(value='Modding Tools'), + text=bui.Lstr(resource='moddingToolsTitleText'), color=app.ui_v1.title_color, h_align='center', v_align='top', @@ -135,7 +134,7 @@ class ModdingToolsWindow(bui.Window): position=(self._sub_width / 2 - this_button_width / 2, v - 10), size=(this_button_width, 60), autoselect=True, - label=bui.Lstr(value='Create User System Scripts'), + label=bui.Lstr(resource='createUserSystemScriptsText'), text_scale=1.0, on_activate_call=babase.modutils.create_user_system_scripts, ) @@ -146,7 +145,7 @@ class ModdingToolsWindow(bui.Window): position=(self._sub_width / 2 - this_button_width / 2, v - 10), size=(this_button_width, 60), autoselect=True, - label=bui.Lstr(value='Delete User System Scripts'), + label=bui.Lstr(resource='deleteUserSystemScriptsText'), text_scale=1.0, on_activate_call=lambda: ConfirmWindow( action=babase.modutils.delete_user_system_scripts, @@ -170,10 +169,10 @@ class ModdingToolsWindow(bui.Window): button_size=(200.0, 60.0), choices=['auto','small', 'medium', 'large',], choices_display=[ - bui.Lstr(value='autoText'), - bui.Lstr(value='smallText'), - bui.Lstr(value='mediumText'), - bui.Lstr(value='largeText'), + bui.Lstr(resource='autoText'), + bui.Lstr(resource='smallText'), + bui.Lstr(resource='mediumText'), + bui.Lstr(resource='largeText'), ], current_choice=app.config.get('UI Scale', 'auto'), on_value_change_call=self._set_uiscale, @@ -205,4 +204,4 @@ class ModdingToolsWindow(bui.Window): bui.app.ui_v1.set_main_menu_window( AdvancedSettingsWindow(transition='in_left').get_root_widget(), from_window=self._root_widget, - ) \ No newline at end of file + )