From fcb66fa0c8d38390c33ab735419d57a8eaede801 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Tue, 29 Aug 2023 19:53:09 +0900 Subject: [PATCH] Setting box: add Advanced Settings tab (formerly Parameters). add items OSC IP Address and OSC Port. --- .../createSideMenuAndSettingsBoxContainers.py | 26 +++++----- .../setting_box_containers/__init__.py | 3 +- .../setting_box_advanced_settings/__init__.py | 1 + .../createSettingBox_AdvancedSettings.py | 48 +++++++++++++++++++ 4 files changed, 64 insertions(+), 14 deletions(-) create mode 100644 vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_advanced_settings/__init__.py create mode 100644 vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_advanced_settings/createSettingBox_AdvancedSettings.py diff --git a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/createSideMenuAndSettingsBoxContainers.py b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/createSideMenuAndSettingsBoxContainers.py index fe965a39..dec611be 100644 --- a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/createSideMenuAndSettingsBoxContainers.py +++ b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/createSideMenuAndSettingsBoxContainers.py @@ -6,7 +6,7 @@ from .addConfigSideMenuItem import addConfigSideMenuItem from .createSettingBoxContainer import createSettingBoxContainer -from .setting_box_containers import createSettingBox_Appearance, createSettingBox_Mic, createSettingBox_Speaker, createSettingBox_Others +from .setting_box_containers import createSettingBox_Appearance, createSettingBox_Mic, createSettingBox_Speaker, createSettingBox_Others, createSettingBox_AdvancedSettings def createSideMenuAndSettingsBoxContainers(config_window, settings): @@ -81,18 +81,6 @@ def createSideMenuAndSettingsBoxContainers(config_window, settings): ] }, }, - { - "side_menu_tab_attr_name": "side_menu_tab_parameters", - "label_attr_name": "label_parameters", - "selected_mark_attr_name": "selected_mark_foreground", - "text": "Parameters", - "setting_box_container_settings": { - "setting_box_container_attr_name": "setting_box_container_parameters", - "setting_boxes": [ - { "section_title": None, "setting_box": None }, - ] - }, - }, { "side_menu_tab_attr_name": "side_menu_tab_others", "label_attr_name": "label_others", @@ -104,6 +92,18 @@ def createSideMenuAndSettingsBoxContainers(config_window, settings): { "section_title": None, "setting_box": createSettingBox_Others }, ] }, + }, + { + "side_menu_tab_attr_name": "side_menu_tab_advanced", + "label_attr_name": "label_advanced", + "selected_mark_attr_name": "selected_mark_advanced", + "text": "Advanced Settings", + "setting_box_container_settings": { + "setting_box_container_attr_name": "setting_box_container_advanced", + "setting_boxes": [ + { "section_title": None, "setting_box": createSettingBox_AdvancedSettings }, + ] + }, "activate_by_default": True, }, ] diff --git a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/__init__.py b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/__init__.py index ba34d66c..9f316e34 100644 --- a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/__init__.py +++ b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/__init__.py @@ -1,3 +1,4 @@ from .setting_box_appearance import createSettingBox_Appearance from .setting_box_transcription import createSettingBox_Mic, createSettingBox_Speaker -from .setting_box_others import createSettingBox_Others \ No newline at end of file +from .setting_box_others import createSettingBox_Others +from .setting_box_advanced_settings import createSettingBox_AdvancedSettings \ No newline at end of file diff --git a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_advanced_settings/__init__.py b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_advanced_settings/__init__.py new file mode 100644 index 00000000..0ceb6231 --- /dev/null +++ b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_advanced_settings/__init__.py @@ -0,0 +1 @@ +from .createSettingBox_AdvancedSettings import createSettingBox_AdvancedSettings \ No newline at end of file diff --git a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_advanced_settings/createSettingBox_AdvancedSettings.py b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_advanced_settings/createSettingBox_AdvancedSettings.py new file mode 100644 index 00000000..e82087a6 --- /dev/null +++ b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_advanced_settings/createSettingBox_AdvancedSettings.py @@ -0,0 +1,48 @@ +from time import sleep + +from customtkinter import StringVar, IntVar + + +from ..SettingBoxGenerator import SettingBoxGenerator + +from config import config + +def createSettingBox_AdvancedSettings(setting_box_wrapper, config_window, settings): + + + sbg = SettingBoxGenerator(config_window, settings) + + createSettingBoxEntry = sbg.createSettingBoxEntry + + + def entry_ip_address_callback(value): + config.OSC_IP_ADDRESS = str(value) + + def entry_port_callback(value): + config.OSC_PORT = int(value) + + row=0 + config_window.sb__ip_address = createSettingBoxEntry( + parent_widget=setting_box_wrapper, + label_text="OSC IP Address", + desc_text="(Default: 127.0.0.1)", + entry_attr_name="sb__entry_ip_address", + entry_width=settings.uism.SB__ENTRY_WIDTH_150, + entry_bind__Any_KeyRelease=lambda value: entry_ip_address_callback(value), + entry_textvariable=StringVar(value=config.OSC_IP_ADDRESS), + ) + config_window.sb__ip_address.grid(row=row) + row+=1 + + + config_window.sb__port = createSettingBoxEntry( + parent_widget=setting_box_wrapper, + label_text="OSC Port", + desc_text="(Default: 9000)", + entry_attr_name="sb__entry_port", + entry_width=settings.uism.SB__ENTRY_WIDTH_150, + entry_bind__Any_KeyRelease=lambda value: entry_port_callback(value), + entry_textvariable=IntVar(value=config.OSC_PORT), + ) + config_window.sb__port.grid(row=row) + row+=1 \ No newline at end of file