diff --git a/src/assets/ba_data/python/bauiv1lib/settings/advanced.py b/src/assets/ba_data/python/bauiv1lib/settings/advanced.py index 2a6ccc4d..da7fbf6f 100644 --- a/src/assets/ba_data/python/bauiv1lib/settings/advanced.py +++ b/src/assets/ba_data/python/bauiv1lib/settings/advanced.py @@ -109,7 +109,7 @@ class AdvancedSettingsWindow(bui.Window): if self._do_net_test_button: self._sub_height += self._extra_button_spacing self._sub_height += self._spacing * 2.0 # plugins - self._sub_height += self._spacing * 2.0 # modding tools + self._sub_height += self._spacing * 2.0 # dev tools self._r = 'settingsWindowAdvanced' @@ -194,7 +194,7 @@ class AdvancedSettingsWindow(bui.Window): from bauiv1lib import sendinfo as _unused7 from bauiv1lib import debug as _unused8 from bauiv1lib.settings import plugins as _unused9 - from bauiv1lib.settings import moddingtools as _unused10 + from bauiv1lib.settings import devtools as _unused10 def _update_lang_status(self) -> None: if self._complete_langs_list is not None: @@ -581,14 +581,14 @@ class AdvancedSettingsWindow(bui.Window): v -= self._spacing * 2.0 - self._modding_tools_button = bui.buttonwidget( + self._dev_tools_button = bui.buttonwidget( parent=self._subcontainer, position=(self._sub_width / 2 - this_button_width / 2, v - 10), size=(this_button_width, 60), autoselect=True, - label=bui.Lstr(resource=f'{self._r}.moddingToolsText'), + label=bui.Lstr(resource=f'{self._r}.devToolsText'), text_scale=1.0, - on_activate_call=self._on_modding_tools_button_press, + on_activate_call=self._on_dev_tools_button_press, ) if self._show_always_use_internal_keyboard: @@ -782,9 +782,9 @@ class AdvancedSettingsWindow(bui.Window): from_window=self._root_widget, ) - def _on_modding_tools_button_press(self) -> None: + def _on_dev_tools_button_press(self) -> None: # pylint: disable=cyclic-import - from bauiv1lib.settings.moddingtools import ModdingToolsWindow + from bauiv1lib.settings.devtools import DevToolsWindow # no-op if our underlying widget is dead or on its way out. if not self._root_widget or self._root_widget.transitioning_out: @@ -794,8 +794,8 @@ 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 + DevToolsWindow( + origin_widget=self._dev_tools_button ).get_root_widget(), from_window=self._root_widget, ) @@ -882,8 +882,8 @@ class AdvancedSettingsWindow(bui.Window): sel_name = 'ShowUserMods' elif sel == self._plugins_button: sel_name = 'Plugins' - elif sel == self._modding_tools_button: - sel_name = 'ModdingTools' + elif sel == self._dev_tools_button: + sel_name = 'DevTools' elif sel == self._modding_guide_button: sel_name = 'ModdingGuide' elif sel == self._language_inform_checkbox: @@ -954,8 +954,8 @@ class AdvancedSettingsWindow(bui.Window): sel = self._show_user_mods_button elif sel_name == 'Plugins': sel = self._plugins_button - elif sel_name == 'ModdingTools': - sel = self._modding_tools_button + elif sel_name == 'DevTools': + sel = self._dev_tools_button elif sel_name == 'ModdingGuide': sel = self._modding_guide_button elif sel_name == 'LangInform': diff --git a/src/assets/ba_data/python/bauiv1lib/settings/moddingtools.py b/src/assets/ba_data/python/bauiv1lib/settings/devtools.py similarity index 91% rename from src/assets/ba_data/python/bauiv1lib/settings/moddingtools.py rename to src/assets/ba_data/python/bauiv1lib/settings/devtools.py index e2874a4a..5a3d96ab 100644 --- a/src/assets/ba_data/python/bauiv1lib/settings/moddingtools.py +++ b/src/assets/ba_data/python/bauiv1lib/settings/devtools.py @@ -8,9 +8,10 @@ import babase import bauiv1 as bui from bauiv1lib.popup import PopupMenu from bauiv1lib.confirm import ConfirmWindow +from bauiv1lib.config import ConfigCheckBox -class ModdingToolsWindow(bui.Window): +class DevToolsWindow(bui.Window): """Window for accessing modding tools.""" def __init__( @@ -47,7 +48,7 @@ class ModdingToolsWindow(bui.Window): self._scroll_width = self._width - (100 + 2 * x_inset) self._scroll_height = self._height - 115.0 self._sub_width = self._scroll_width * 0.95 - self._sub_height = 100.0 + self._sub_height = 350.0 super().__init__( root_widget=bui.containerwidget( @@ -66,7 +67,7 @@ class ModdingToolsWindow(bui.Window): ) ) - self._r = 'settingsModdingTools' + self._r = 'settingsDevTools' if app.ui_v1.use_toolbars and uiscale is bui.UIScale.SMALL: bui.containerwidget( @@ -92,7 +93,7 @@ class ModdingToolsWindow(bui.Window): parent=self._root_widget, position=(0, self._height - 52), size=(self._width, 25), - text=bui.Lstr(resource='settingsWindowAdvanced.moddingToolsText'), + text=bui.Lstr(resource='settingsWindowAdvanced.devToolsText'), color=app.ui_v1.title_color, h_align='center', v_align='top', @@ -184,6 +185,19 @@ class ModdingToolsWindow(bui.Window): on_value_change_call=self._set_uiscale, ) + v -= self._spacing * 2.5 + self._show_dev_console_button_check_box = ConfigCheckBox( + parent=self._subcontainer, + position=(50, v), + size=(self._sub_width - 100, 30), + configkey='Show Dev Console Button', + displayname=bui.Lstr( + resource='settingsWindowAdvanced.showDevConsoleButtonText' + ), + scale=1.0, + maxwidth=430, + ) + def _set_uiscale(self, val: str) -> None: cfg = bui.app.config cfg['UI Scale'] = val