every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'osc_check_variable_and_callbacks' into UI_2.0

Browse Source
This commit is contained in:
Sakamoto Shiina
2023-09-17 12:05:07 +09:00
parent 43133ac7ad 6f5b7983a9
commit 5e97741812
4 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
config.py
View File

@@ -388,6 +388,16 @@ class Config:
if type(value) is bool:
self._ENABLE_OSC = value
@property
def ENABLE_SEND_MESSAGE_TO_VRC(self):
return self._ENABLE_SEND_MESSAGE_TO_VRC
@ENABLE_SEND_MESSAGE_TO_VRC.setter
def ENABLE_SEND_MESSAGE_TO_VRC(self, value):
if type(value) is bool:
self._ENABLE_SEND_MESSAGE_TO_VRC = value
saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value)
@property
def STARTUP_OSC_ENABLED_CHECK(self):
return self._STARTUP_OSC_ENABLED_CHECK
@@ -517,6 +527,7 @@ class Config:
self._ENABLE_AUTO_CLEAR_MESSAGE_BOX = True
self._ENABLE_NOTICE_XSOVERLAY = False
self._ENABLE_OSC = False
self._ENABLE_SEND_MESSAGE_TO_VRC = True
self._STARTUP_OSC_ENABLED_CHECK = True
self._UPDATE_FLAG = False
self._GITHUB_URL = "https://api.github.com/repos/misyaguziya/VRCT/releases/latest"

6
main.py
View File

@@ -518,6 +518,10 @@ def callbackSetMessageFormat(value):
if len(value) > 0:
config.MESSAGE_FORMAT = value
def callbackSetEnableSendMessageToVrc(value):
print("callbackSetEnableSendMessageToVrc", value)
config.ENABLE_SEND_MESSAGE_TO_VRC = value
def callbackSetStartupOscEnabledCheck(value):
print("callbackSetStartupOscEnabledCheck", value)
config.STARTUP_OSC_ENABLED_CHECK = value
@@ -626,7 +630,7 @@ view.register(
"callback_set_enable_notice_xsoverlay": callbackSetEnableNoticeXsoverlay,
"callback_set_enable_auto_export_message_logs": callbackSetEnableAutoExportMessageLogs,
"callback_set_message_format": callbackSetMessageFormat,
"callback_set_enable_send_message_to_vrc": callbackSetEnableSendMessageToVrc,
"callback_set_startup_osc_enabled_check": callbackSetStartupOscEnabledCheck,
# Advanced Settings Tab

9
view.py
View File

@@ -246,10 +246,10 @@ class View():
VAR_MESSAGE_FORMAT=StringVar(value=config.MESSAGE_FORMAT),
VAR_LABEL_ENABLE_OSC=StringVar(value="Send Message To VRChat"),
VAR_DESC_ENABLE_OSC=StringVar(value="There is a way to use it without sending messages to VRChat."),
CALLBACK_SET_ENABLE_OSC=None,
VAR_ENABLE_OSC=BooleanVar(value=config.ENABLE_OSC),
VAR_LABEL_ENABLE_SEND_MESSAGE_TO_VRC=StringVar(value="Send Message To VRChat"),
VAR_DESC_ENABLE_SEND_MESSAGE_TO_VRC=StringVar(value="There is a way to use it without sending messages to VRChat.\nThat is not covered by support, though."),
CALLBACK_SET_ENABLE_SEND_MESSAGE_TO_VRC=None,
VAR_ENABLE_SEND_MESSAGE_TO_VRC=BooleanVar(value=config.ENABLE_SEND_MESSAGE_TO_VRC),
VAR_LABEL_STARTUP_OSC_ENABLED_CHECK=StringVar(value="Check If OSC Is Enabled At Startup"),
VAR_DESC_STARTUP_OSC_ENABLED_CHECK=StringVar(value="Every time VRCT is started up, your character in VRChat moves forward ever so slightly. If your character is seated, they might even stand up. Unfortunately, this is the only method we've found to check if OSC is enabled at startup... Sorry about that. (Remember to turn on OSC yourself when you want to send messages to VRChat.)"),
@@ -377,6 +377,7 @@ class View():
self.view_variable.CALLBACK_SET_ENABLE_AUTO_EXPORT_MESSAGE_LOGS = config_window_registers.get("callback_set_enable_auto_export_message_logs", None)
self.view_variable.CALLBACK_SET_MESSAGE_FORMAT = config_window_registers.get("callback_set_message_format", None)
self.view_variable.CALLBACK_SET_ENABLE_SEND_MESSAGE_TO_VRC = config_window_registers.get("callback_set_enable_send_message_to_vrc", None)
self.view_variable.CALLBACK_SET_STARTUP_OSC_ENABLED_CHECK = config_window_registers.get("callback_set_startup_osc_enabled_check", None)
# Advanced Settings Tab

18
vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_others/createSettingBox_Others.py
View File

@@ -18,8 +18,8 @@ def createSettingBox_Others(setting_box_wrapper, config_window, settings, view_v
def checkbox_auto_export_message_logs_callback(checkbox_box_widget):
callFunctionIfCallable(view_variable.CALLBACK_SET_ENABLE_AUTO_EXPORT_MESSAGE_LOGS, checkbox_box_widget.get())
def checkbox_enable_osc_callback(checkbox_box_widget):
callFunctionIfCallable(view_variable.CALLBACK_SET_ENABLE_OSC, checkbox_box_widget.get())
def checkbox_enable_send_message_to_vrc_callback(checkbox_box_widget):
callFunctionIfCallable(view_variable.CALLBACK_SET_ENABLE_SEND_MESSAGE_TO_VRC, checkbox_box_widget.get())
def checkbox_startup_osc_enabled_check_callback(checkbox_box_widget):
callFunctionIfCallable(view_variable.CALLBACK_SET_STARTUP_OSC_ENABLED_CHECK, checkbox_box_widget.get())
@@ -78,15 +78,15 @@ def createSettingBox_Others(setting_box_wrapper, config_window, settings, view_v
row+=1
config_window.sb__enable_osc = createSettingBoxCheckbox(
config_window.sb__enable_send_message_to_vrc = createSettingBoxCheckbox(
parent_widget=setting_box_wrapper,
for_var_label_text=view_variable.VAR_LABEL_ENABLE_OSC,
for_var_desc_text=view_variable.VAR_DESC_ENABLE_OSC,
checkbox_attr_name="sb__checkbox_enable_osc",
command=lambda: checkbox_enable_osc_callback(config_window.sb__checkbox_enable_osc),
variable=view_variable.VAR_ENABLE_OSC,
for_var_label_text=view_variable.VAR_LABEL_ENABLE_SEND_MESSAGE_TO_VRC,
for_var_desc_text=view_variable.VAR_DESC_ENABLE_SEND_MESSAGE_TO_VRC,
checkbox_attr_name="sb__checkbox_enable_send_message_to_vrc",
command=lambda: checkbox_enable_send_message_to_vrc_callback(config_window.sb__checkbox_enable_send_message_to_vrc),
variable=view_variable.VAR_ENABLE_SEND_MESSAGE_TO_VRC,
)
config_window.sb__enable_osc.grid(row=row)
config_window.sb__enable_send_message_to_vrc.grid(row=row)
row+=1
config_window.sb__startup_osc_enabled_check = createSettingBoxCheckbox(