From dd643daa78850209b05ae9829a9b78342a6d1e7b Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Wed, 15 May 2024 13:26:05 +0900 Subject: [PATCH] =?UTF-8?q?[Update]=20Quick=20Settings=20Window(Overlay):?= =?UTF-8?q?=20=E3=83=BBrotation=E5=91=A8=E3=82=8A=E3=80=81=E6=96=87?= =?UTF-8?q?=E8=A8=80=E4=BF=AE=E6=AD=A3=E3=80=81=E6=97=A5=E6=9C=AC=E8=AA=9E?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C=E3=80=82=20=E3=83=BB=E5=88=9D=E6=9C=9F?= =?UTF-8?q?=E5=80=A4=E3=81=AB=E6=88=BB=E3=81=99=E3=83=9C=E3=82=BF=E3=83=B3?= =?UTF-8?q?=E3=81=B8=E3=81=AE=E5=AF=BE=E5=BF=9C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/en.yml | 3 +++ locales/ja.yml | 3 +++ view.py | 24 +++++++++++++++++++++--- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/locales/en.yml b/locales/en.yml index 34c63e00..673f5535 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -75,6 +75,9 @@ overlay_settings: x_position: X-axis (left-right) y_position: Y-axis (up-down) depth: Z-axis (front-back) + x_rotation: X-axis rotation + y_rotation: Y-axis rotation + z_rotation: Z-axis rotation display_duration: Display duration fadeout_duration: Fadeout duration diff --git a/locales/ja.yml b/locales/ja.yml index 8376fce0..6adaf169 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -74,6 +74,9 @@ overlay_settings: x_position: X軸（左右） y_position: Y軸（上下） depth: Z軸（前後） + x_rotation: X軸の回転 + y_rotation: Y軸の回転 + z_rotation: Z軸の回転 display_duration: 表示時間 fadeout_duration: フェードアウト時間 diff --git a/view.py b/view.py index 11c250f8..ec842c90 100644 --- a/view.py +++ b/view.py @@ -186,19 +186,19 @@ class View(): 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_X_ROTATION=StringVar(value="x_rotation"), + VAR_LABEL_OVERLAY_SMALL_LOG_X_ROTATION=StringVar(value=i18n.t("overlay_settings.x_rotation")), SLIDER_RANGE_OVERLAY_SMALL_LOG_X_ROTATION=(-180, 180), NUMBER_OF_STEPS_OVERLAY_SMALL_LOG_X_ROTATION=360, VAR_OVERLAY_SMALL_LOG_X_ROTATION=DoubleVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["x_rotation"]), VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_X_ROTATION=StringVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["x_rotation"]), - VAR_LABEL_OVERLAY_SMALL_LOG_Y_ROTATION=StringVar(value="y_rotation"), + VAR_LABEL_OVERLAY_SMALL_LOG_Y_ROTATION=StringVar(value=i18n.t("overlay_settings.y_rotation")), SLIDER_RANGE_OVERLAY_SMALL_LOG_Y_ROTATION=(-180, 180), NUMBER_OF_STEPS_OVERLAY_SMALL_LOG_Y_ROTATION=360, VAR_OVERLAY_SMALL_LOG_Y_ROTATION=DoubleVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["y_rotation"]), VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_Y_ROTATION=StringVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["y_rotation"]), - VAR_LABEL_OVERLAY_SMALL_LOG_Z_ROTATION=StringVar(value="z_rotation"), + VAR_LABEL_OVERLAY_SMALL_LOG_Z_ROTATION=StringVar(value=i18n.t("overlay_settings.z_rotation")), SLIDER_RANGE_OVERLAY_SMALL_LOG_Z_ROTATION=(-180, 180), NUMBER_OF_STEPS_OVERLAY_SMALL_LOG_Z_ROTATION=360, VAR_OVERLAY_SMALL_LOG_Z_ROTATION=DoubleVar(value=config.OVERLAY_SMALL_LOG_SETTINGS["z_rotation"]), @@ -1167,6 +1167,9 @@ class View(): "x_pos": 0.0, "y_pos": 0.0, "depth": 0.0, + "x_rotation": 0.0, + "y_rotation": 0.0, + "z_rotation": 0.0, "display_duration": 5, "fadeout_duration": 2, } @@ -1182,6 +1185,9 @@ class View(): self.setLatestConfigVariable("OverlaySmallLogXPos") self.setLatestConfigVariable("OverlaySmallLogYPos") self.setLatestConfigVariable("OverlaySmallLogDepth") + self.setLatestConfigVariable("OverlaySmallLogXRotation") + self.setLatestConfigVariable("OverlaySmallLogYRotation") + self.setLatestConfigVariable("OverlaySmallLogZRotation") self.setLatestConfigVariable("OverlaySmallLogDisplayDuration") self.setLatestConfigVariable("OverlaySmallLogFadeoutDuration") @@ -1948,6 +1954,18 @@ class View(): self.view_variable.VAR_OVERLAY_SMALL_LOG_DEPTH.set(config.OVERLAY_SMALL_LOG_SETTINGS["depth"]) self.view_variable.VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_DEPTH.set(config.OVERLAY_SMALL_LOG_SETTINGS["depth"]) + case "OverlaySmallLogXRotation": + self.view_variable.VAR_OVERLAY_SMALL_LOG_X_ROTATION.set(config.OVERLAY_SMALL_LOG_SETTINGS["x_rotation"]) + self.view_variable.VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_X_ROTATION.set(config.OVERLAY_SMALL_LOG_SETTINGS["x_rotation"]) + + case "OverlaySmallLogYRotation": + self.view_variable.VAR_OVERLAY_SMALL_LOG_Y_ROTATION.set(config.OVERLAY_SMALL_LOG_SETTINGS["y_rotation"]) + self.view_variable.VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_Y_ROTATION.set(config.OVERLAY_SMALL_LOG_SETTINGS["y_rotation"]) + + case "OverlaySmallLogZRotation": + self.view_variable.VAR_OVERLAY_SMALL_LOG_Z_ROTATION.set(config.OVERLAY_SMALL_LOG_SETTINGS["z_rotation"]) + self.view_variable.VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_Z_ROTATION.set(config.OVERLAY_SMALL_LOG_SETTINGS["z_rotation"]) + case "OverlaySmallLogDisplayDuration": self.view_variable.VAR_OVERLAY_SMALL_LOG_DISPLAY_DURATION.set(config.OVERLAY_SMALL_LOG_SETTINGS["display_duration"]) self.view_variable.VAR_CURRENT_VALUE_OVERLAY_SMALL_LOG_DISPLAY_DURATION.set(f"{config.OVERLAY_SMALL_LOG_SETTINGS['display_duration']} second(s)")