diff --git a/view.py b/view.py index 2bf98c8c..c76a90ae 100644 --- a/view.py +++ b/view.py @@ -140,57 +140,57 @@ class View(): # Overlay Settings - VAR_OVERLAY_SETTINGS=StringVar(value="Overlay Settings"), - CALLBACK_SET_OPEN_OVERLAY_SETTINGS_WINDOW=self._openVrSettingsWindow, - VAR_TO_DEFAULT_OVERLAY_SETTINGS=StringVar(value=i18n.t("overlay_settings.restore_default_settings")), - CALLBACK_SET_TO_DEFAULT_OVERLAY_SETTINGS=self._toDefaultOverlaySettings, + # VAR_OVERLAY_SETTINGS=StringVar(value="Overlay Settings"), + # CALLBACK_SET_OPEN_OVERLAY_SETTINGS_WINDOW=self._openVrSettingsWindow, + # VAR_TO_DEFAULT_OVERLAY_SETTINGS=StringVar(value=i18n.t("overlay_settings.restore_default_settings")), + # CALLBACK_SET_TO_DEFAULT_OVERLAY_SETTINGS=self._toDefaultOverlaySettings, - VAR_LABEL_OVERLAY_OPACITY=StringVar(value=i18n.t("overlay_settings.opacity")), - SLIDER_RANGE_OVERLAY_OPACITY=(0.1, 1.0), - NUMBER_OF_STEPS_OVERLAY_OPACITY=18, - VAR_OVERLAY_OPACITY=DoubleVar(value=config.OVERLAY_SETTINGS["opacity"]), - VAR_CURRENT_VALUE_OVERLAY_OPACITY=StringVar(value=floatToPctStr(config.OVERLAY_SETTINGS["opacity"])), + # VAR_LABEL_OVERLAY_OPACITY=StringVar(value=i18n.t("overlay_settings.opacity")), + # SLIDER_RANGE_OVERLAY_OPACITY=(0.1, 1.0), + # NUMBER_OF_STEPS_OVERLAY_OPACITY=18, + # VAR_OVERLAY_OPACITY=DoubleVar(value=config.OVERLAY_SETTINGS["opacity"]), + # VAR_CURRENT_VALUE_OVERLAY_OPACITY=StringVar(value=floatToPctStr(config.OVERLAY_SETTINGS["opacity"])), - VAR_LABEL_OVERLAY_UI_SCALING=StringVar(value=i18n.t("overlay_settings.ui_scaling")), - SLIDER_RANGE_OVERLAY_UI_SCALING=(0.4, 2.0), - NUMBER_OF_STEPS_OVERLAY_UI_SCALING=16, - VAR_OVERLAY_UI_SCALING=DoubleVar(value=config.OVERLAY_SETTINGS["ui_scaling"]), - VAR_CURRENT_VALUE_OVERLAY_UI_SCALING=StringVar(value=floatToPctStr(config.OVERLAY_SETTINGS["ui_scaling"])), + # VAR_LABEL_OVERLAY_UI_SCALING=StringVar(value=i18n.t("overlay_settings.ui_scaling")), + # SLIDER_RANGE_OVERLAY_UI_SCALING=(0.4, 2.0), + # NUMBER_OF_STEPS_OVERLAY_UI_SCALING=16, + # VAR_OVERLAY_UI_SCALING=DoubleVar(value=config.OVERLAY_SETTINGS["ui_scaling"]), + # VAR_CURRENT_VALUE_OVERLAY_UI_SCALING=StringVar(value=floatToPctStr(config.OVERLAY_SETTINGS["ui_scaling"])), - # CALLBACK_SET_OVERLAY_SMALL_LOG_SETTINGS=None, + # # CALLBACK_SET_OVERLAY_SMALL_LOG_SETTINGS=None, - VAR_LABEL_OVERLAY_SMALL_LOG_X_POS=StringVar(value=i18n.t("overlay_settings.x_position")), - SLIDER_RANGE_OVERLAY_SMALL_LOG_X_POS=(-0.5, 0.5), - NUMBER_OF_STEPS_OVERLAY_SMALL_LOG_X_POS=100, - VAR_OVERLAY_SMALL_LOG_X_POS=DoubleVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["x_pos"]), - VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_X_POS=StringVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["x_pos"]), + # VAR_LABEL_OVERLAY_SMALL_LOG_X_POS=StringVar(value=i18n.t("overlay_settings.x_position")), + # SLIDER_RANGE_OVERLAY_SMALL_LOG_X_POS=(-0.5, 0.5), + # NUMBER_OF_STEPS_OVERLAY_SMALL_LOG_X_POS=100, + # VAR_OVERLAY_SMALL_LOG_X_POS=DoubleVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["x_pos"]), + # VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_X_POS=StringVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["x_pos"]), - VAR_LABEL_OVERLAY_SMALL_LOG_Y_POS=StringVar(value=i18n.t("overlay_settings.y_position")), - SLIDER_RANGE_OVERLAY_SMALL_LOG_Y_POS=(-0.8, 0.8), - NUMBER_OF_STEPS_OVERLAY_SMALL_LOG_Y_POS=160, - VAR_OVERLAY_SMALL_LOG_Y_POS=DoubleVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["y_pos"]), - VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_Y_POS=StringVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["y_pos"]), + # VAR_LABEL_OVERLAY_SMALL_LOG_Y_POS=StringVar(value=i18n.t("overlay_settings.y_position")), + # SLIDER_RANGE_OVERLAY_SMALL_LOG_Y_POS=(-0.8, 0.8), + # NUMBER_OF_STEPS_OVERLAY_SMALL_LOG_Y_POS=160, + # VAR_OVERLAY_SMALL_LOG_Y_POS=DoubleVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["y_pos"]), + # VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_Y_POS=StringVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["y_pos"]), - VAR_LABEL_OVERLAY_SMALL_LOG_DEPTH=StringVar(value=i18n.t("overlay_settings.depth")), - SLIDER_RANGE_OVERLAY_SMALL_LOG_DEPTH=(0.5, 1.5), - NUMBER_OF_STEPS_OVERLAY_SMALL_LOG_DEPTH=100, - VAR_OVERLAY_SMALL_LOG_DEPTH=DoubleVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["depth"]), - VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_DEPTH=StringVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["depth"]), + # VAR_LABEL_OVERLAY_SMALL_LOG_DEPTH=StringVar(value=i18n.t("overlay_settings.depth")), + # SLIDER_RANGE_OVERLAY_SMALL_LOG_DEPTH=(0.5, 1.5), + # NUMBER_OF_STEPS_OVERLAY_SMALL_LOG_DEPTH=100, + # VAR_OVERLAY_SMALL_LOG_DEPTH=DoubleVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["depth"]), + # VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_DEPTH=StringVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["depth"]), - VAR_LABEL_OVERLAY_SMALL_LOG_DISPLAY_DURATION=StringVar(value=i18n.t("overlay_settings.display_duration")), - SLIDER_RANGE_OVERLAY_SMALL_LOG_DISPLAY_DURATION=(1, 60), - NUMBER_OF_STEPS_OVERLAY_SMALL_LOG_DISPLAY_DURATION=59, - VAR_OVERLAY_SMALL_LOG_DISPLAY_DURATION=IntVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["display_duration"]), - VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_DISPLAY_DURATION=StringVar(value=f"{config.OVERLAY_SMALL_LOG_SETTINGS['display_duration']} second(s)"), + # VAR_LABEL_OVERLAY_SMALL_LOG_DISPLAY_DURATION=StringVar(value=i18n.t("overlay_settings.display_duration")), + # SLIDER_RANGE_OVERLAY_SMALL_LOG_DISPLAY_DURATION=(1, 60), + # NUMBER_OF_STEPS_OVERLAY_SMALL_LOG_DISPLAY_DURATION=59, + # VAR_OVERLAY_SMALL_LOG_DISPLAY_DURATION=IntVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["display_duration"]), + # VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_DISPLAY_DURATION=StringVar(value=f"{config.OVERLAY_SMALL_LOG_SETTINGS['display_duration']} second(s)"), - VAR_LABEL_OVERLAY_SMALL_LOG_FADEOUT_DURATION=StringVar(value=i18n.t("overlay_settings.fadeout_duration")), - SLIDER_RANGE_OVERLAY_SMALL_LOG_FADEOUT_DURATION=(0, 5), - NUMBER_OF_STEPS_OVERLAY_SMALL_LOG_FADEOUT_DURATION=5, - VAR_OVERLAY_SMALL_LOG_FADEOUT_DURATION=IntVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["fadeout_duration"]), - VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_FADEOUT_DURATION=StringVar(value=f"{config.OVERLAY_SMALL_LOG_SETTINGS['fadeout_duration']} second(s)"), + # VAR_LABEL_OVERLAY_SMALL_LOG_FADEOUT_DURATION=StringVar(value=i18n.t("overlay_settings.fadeout_duration")), + # SLIDER_RANGE_OVERLAY_SMALL_LOG_FADEOUT_DURATION=(0, 5), + # NUMBER_OF_STEPS_OVERLAY_SMALL_LOG_FADEOUT_DURATION=5, + # VAR_OVERLAY_SMALL_LOG_FADEOUT_DURATION=IntVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["fadeout_duration"]), + # VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_FADEOUT_DURATION=StringVar(value=f"{config.OVERLAY_SMALL_LOG_SETTINGS['fadeout_duration']} second(s)"), @@ -478,13 +478,13 @@ class View(): VAR_WHISPER_WEIGHT_TYPE=StringVar(value=self.getSelectableWhisperWeightTypeDict()[config.WHISPER_WEIGHT_TYPE]), - # VR Tab - VAR_LABEL_ENABLE_OVERLAY_SMALL_LOG=StringVar(value=i18n.t("config_window.enable_overlay_small_log.label")), - VAR_DESC_ENABLE_OVERLAY_SMALL_LOG=None, - # VAR_DESC_ENABLE_OVERLAY_SMALL_LOG=StringVar(value=i18n.t("config_window.enable_overlay_small_log.desc")), - CALLBACK_SET_ENABLE_OVERLAY_SMALL_LOG=None, - VAR_ENABLE_OVERLAY_SMALL_LOG=BooleanVar(value=config.ENABLE_OVERLAY_SMALL_LOG), - VAR_OPEN_OVERLAY_SETTINGS_BUTTON=StringVar(value=i18n.t("config_window.enable_overlay_small_log.open_overlay_settings")), + # # VR Tab + # VAR_LABEL_ENABLE_OVERLAY_SMALL_LOG=StringVar(value=i18n.t("config_window.enable_overlay_small_log.label")), + # VAR_DESC_ENABLE_OVERLAY_SMALL_LOG=None, + # # VAR_DESC_ENABLE_OVERLAY_SMALL_LOG=StringVar(value=i18n.t("config_window.enable_overlay_small_log.desc")), + # CALLBACK_SET_ENABLE_OVERLAY_SMALL_LOG=None, + # VAR_ENABLE_OVERLAY_SMALL_LOG=BooleanVar(value=config.ENABLE_OVERLAY_SMALL_LOG), + # VAR_OPEN_OVERLAY_SETTINGS_BUTTON=StringVar(value=i18n.t("config_window.enable_overlay_small_log.open_overlay_settings")), # Others Tab @@ -1114,32 +1114,32 @@ class View(): } - def _toDefaultOverlaySettings(self): - INIT_OVERLAY_SETTINGS = { - "opacity": 1.0, - "ui_scaling": 1.0, - } - INIT_OVERLAY_SMALL_LOG_SETTINGS = { - "x_pos": 0.0, - "y_pos": -0.41, - "depth": 1.0, - "display_duration": 5, - "fadeout_duration": 2, - } - for key in INIT_OVERLAY_SETTINGS.keys(): - callFunctionIfCallable(self.view_variable.CALLBACK_SET_OVERLAY_SETTINGS, INIT_OVERLAY_SETTINGS[key], key) + # def _toDefaultOverlaySettings(self): + # INIT_OVERLAY_SETTINGS = { + # "opacity": 1.0, + # "ui_scaling": 1.0, + # } + # INIT_OVERLAY_SMALL_LOG_SETTINGS = { + # "x_pos": 0.0, + # "y_pos": -0.41, + # "depth": 1.0, + # "display_duration": 5, + # "fadeout_duration": 2, + # } + # for key in INIT_OVERLAY_SETTINGS.keys(): + # callFunctionIfCallable(self.view_variable.CALLBACK_SET_OVERLAY_SETTINGS, INIT_OVERLAY_SETTINGS[key], key) - for key in INIT_OVERLAY_SMALL_LOG_SETTINGS.keys(): - callFunctionIfCallable(self.view_variable.CALLBACK_SET_OVERLAY_SMALL_LOG_SETTINGS, INIT_OVERLAY_SMALL_LOG_SETTINGS[key], key) + # for key in INIT_OVERLAY_SMALL_LOG_SETTINGS.keys(): + # callFunctionIfCallable(self.view_variable.CALLBACK_SET_OVERLAY_SMALL_LOG_SETTINGS, INIT_OVERLAY_SMALL_LOG_SETTINGS[key], key) - self.setLatestConfigVariable("OverlayOpacity") - self.setLatestConfigVariable("OverlayUiScaling") + # self.setLatestConfigVariable("OverlayOpacity") + # self.setLatestConfigVariable("OverlayUiScaling") - self.setLatestConfigVariable("OverlaySmallLogXPos") - self.setLatestConfigVariable("OverlaySmallLogYPos") - self.setLatestConfigVariable("OverlaySmallLogDepth") - self.setLatestConfigVariable("OverlaySmallLogDisplayDuration") - self.setLatestConfigVariable("OverlaySmallLogFadeoutDuration") + # self.setLatestConfigVariable("OverlaySmallLogXPos") + # self.setLatestConfigVariable("OverlaySmallLogYPos") + # self.setLatestConfigVariable("OverlaySmallLogDepth") + # self.setLatestConfigVariable("OverlaySmallLogDisplayDuration") + # self.setLatestConfigVariable("OverlaySmallLogFadeoutDuration") # Open Webpage Functions def openWebPage_Booth(self):