Merge branch 'remove_xsoverlay_ui' into develop

controller.py

@@ -912,9 +912,6 @@ def callbackSetSendMessageButtonType(value):
     config.SEND_MESSAGE_BUTTON_TYPE = value
     view.changeMainWindowSendMessageButton(config.SEND_MESSAGE_BUTTON_TYPE)
 
-def callbackSetEnableNoticeXsoverlay(value):
-    pass
-
 def callbackSetEnableAutoExportMessageLogs(value):
     print("callbackSetEnableAutoExportMessageLogs", value)
     config.ENABLE_LOGGER = value
@@ -1162,7 +1159,6 @@ def createMainWindow(splash):
             "callback_set_enable_auto_clear_chatbox": callbackSetEnableAutoClearMessageBox,
             "callback_set_send_only_translated_messages": callbackSetEnableSendOnlyTranslatedMessages,
             "callback_set_send_message_button_type": callbackSetSendMessageButtonType,
-            "callback_set_enable_notice_xsoverlay": callbackSetEnableNoticeXsoverlay,
             "callback_set_enable_auto_export_message_logs": callbackSetEnableAutoExportMessageLogs,
             "callback_set_enable_vrc_mic_mute_sync": callbackSetEnableVrcMicMuteSync,
             "callback_set_enable_send_message_to_vrc": callbackSetEnableSendMessageToVrc,

view.py

@@ -539,11 +539,6 @@ class View():
                 "show_and_disable_enter_key": StringVar(value=i18n.t("config_window.send_message_button_type.show_and_disable_enter_key")),
             },
 
-            VAR_LABEL_ENABLE_NOTICE_XSOVERLAY=StringVar(value=i18n.t("config_window.notice_xsoverlay.label")),
-            VAR_DESC_ENABLE_NOTICE_XSOVERLAY=StringVar(value=i18n.t("config_window.notice_xsoverlay.desc")),
-            CALLBACK_SET_ENABLE_NOTICE_XSOVERLAY=None,
-            VAR_ENABLE_NOTICE_XSOVERLAY=BooleanVar(value=config.ENABLE_NOTICE_XSOVERLAY),
-
             VAR_LABEL_ENABLE_AUTO_EXPORT_MESSAGE_LOGS=StringVar(value=i18n.t("config_window.auto_export_message_logs.label")),
             VAR_DESC_ENABLE_AUTO_EXPORT_MESSAGE_LOGS=StringVar(value=i18n.t("config_window.auto_export_message_logs.desc")),
             CALLBACK_SET_ENABLE_AUTO_EXPORT_MESSAGE_LOGS=None,
@@ -804,7 +799,6 @@ class View():
             self.view_variable.CALLBACK_SET_ENABLE_AUTO_CLEAR_MESSAGE_BOX=config_window_registers.get("callback_set_enable_auto_clear_chatbox", None)
             self.view_variable.CALLBACK_SET_ENABLE_SEND_ONLY_TRANSLATED_MESSAGES=config_window_registers.get("callback_set_send_only_translated_messages", None)
             self.view_variable.CALLBACK_SET_SEND_MESSAGE_BUTTON_TYPE=config_window_registers.get("callback_set_send_message_button_type", None)
-            self.view_variable.CALLBACK_SET_ENABLE_NOTICE_XSOVERLAY=config_window_registers.get("callback_set_enable_notice_xsoverlay", None)
             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_ENABLE_VRC_MIC_MUTE_SYNC=config_window_registers.get("callback_set_enable_vrc_mic_mute_sync", None)

vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_vr/createSettingBox_Vr.py

@@ -5,7 +5,6 @@ from .._SettingBoxGenerator import _SettingBoxGenerator
 def createSettingBox_Vr(setting_box_wrapper, config_window, settings, view_variable):
     sbg = _SettingBoxGenerator(setting_box_wrapper, config_window, settings, view_variable)
     createSettingBox_Overlay = sbg.createSettingBox_Overlay
-    createSettingBoxCheckbox = sbg.createSettingBoxCheckbox
 
     def switchEnableOverlayUiCallback(switch_widget):
         callFunctionIfCallable(view_variable.CALLBACK_SET_ENABLE_OVERLAY_SMALL_LOG, switch_widget.get())
@@ -14,10 +13,6 @@ def createSettingBox_Vr(setting_box_wrapper, config_window, settings, view_varia
         callFunctionIfCallable(view_variable.CALLBACK_SET_OPEN_OVERLAY_SETTINGS_WINDOW)
 
 
-    def checkboxNoticeXsoverlayCallback(checkbox_box_widget):
-        callFunctionIfCallable(view_variable.CALLBACK_SET_ENABLE_NOTICE_XSOVERLAY, checkbox_box_widget.get())
-
-
     row=0
     config_window.sb__enable_overlay_small_log = createSettingBox_Overlay(
         for_var_label_text=view_variable.VAR_LABEL_ENABLE_OVERLAY_SMALL_LOG,
@@ -28,16 +23,4 @@ def createSettingBox_Vr(setting_box_wrapper, config_window, settings, view_varia
         for_var_button_label=view_variable.VAR_OPEN_OVERLAY_SETTINGS_BUTTON,
         label_button_clicked_command=buttonOpenOverlaySettingsWindow,
     )
-    config_window.sb__enable_overlay_small_log.grid(row=row)
+    config_window.sb__enable_overlay_small_log.grid(row=row, pady=0)
-    row+=1
-
-
-    config_window.sb__notice_xsoverlay = createSettingBoxCheckbox(
-        for_var_label_text=view_variable.VAR_LABEL_ENABLE_NOTICE_XSOVERLAY,
-        for_var_desc_text=view_variable.VAR_DESC_ENABLE_NOTICE_XSOVERLAY,
-        checkbox_attr_name="sb__checkbox_notice_xsoverlay",
-        command=lambda: checkboxNoticeXsoverlayCallback(config_window.sb__checkbox_notice_xsoverlay),
-        variable=view_variable.VAR_ENABLE_NOTICE_XSOVERLAY,
-    )
-    config_window.sb__notice_xsoverlay.grid(row=row, pady=0)
-    row+=1