Merge branch 'overlay' into develop

# Conflicts:
#	requirements.txt
This commit is contained in:
misyaguziya
2024-04-16 10:24:05 +09:00
15 changed files with 551 additions and 3 deletions

View File

@@ -247,6 +247,15 @@ class Config:
if isinstance(value, bool):
self._IS_RESET_BUTTON_DISPLAYED_FOR_WHISPER = value
@property
def IS_EASTER_EGG_ENABLED(self):
return self._IS_EASTER_EGG_ENABLED
@IS_EASTER_EGG_ENABLED.setter
def IS_EASTER_EGG_ENABLED(self, value):
if isinstance(value, bool):
self._IS_EASTER_EGG_ENABLED = value
# Save Json Data
## Main Window
@property
@@ -727,6 +736,28 @@ class Config:
self._ENABLE_NOTICE_XSOVERLAY = value
saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value)
@property
@json_serializable('ENABLE_NOTICE_OVERLAY')
def ENABLE_NOTICE_OVERLAY(self):
return self._ENABLE_NOTICE_OVERLAY
@ENABLE_NOTICE_OVERLAY.setter
def ENABLE_NOTICE_OVERLAY(self, value):
if isinstance(value, bool):
self._ENABLE_NOTICE_OVERLAY = value
saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value)
@property
@json_serializable('OVERLAY_UI_TYPE')
def OVERLAY_UI_TYPE(self):
return self._OVERLAY_UI_TYPE
@OVERLAY_UI_TYPE.setter
def OVERLAY_UI_TYPE(self, value):
if isinstance(value, str):
self._OVERLAY_UI_TYPE = value
# saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, value)
@property
@json_serializable('ENABLE_SEND_MESSAGE_TO_VRC')
def ENABLE_SEND_MESSAGE_TO_VRC(self):
@@ -900,6 +931,7 @@ class Config:
self._CURRENT_SENT_MESSAGES_LOG_INDEX = 0
self._IS_RESET_BUTTON_DISPLAYED_FOR_TRANSLATION = False
self._IS_RESET_BUTTON_DISPLAYED_FOR_WHISPER = False
self._IS_EASTER_EGG_ENABLED = False
# Save Json Data
## Main Window
@@ -991,6 +1023,8 @@ class Config:
self._ENABLE_SEND_ONLY_TRANSLATED_MESSAGES = False
self._SEND_MESSAGE_BUTTON_TYPE = "show"
self._ENABLE_NOTICE_XSOVERLAY = False
self._ENABLE_NOTICE_OVERLAY = False
self._OVERLAY_UI_TYPE = "default"
self._ENABLE_SEND_MESSAGE_TO_VRC = True
self._ENABLE_SEND_RECEIVED_MESSAGE_TO_VRC = False # Speaker2Chatbox
self._ENABLE_SPEAKER2CHATBOX_PASS = "000000000"