From 4851ee1504784160a77394000b9c960e069de06a Mon Sep 17 00:00:00 2001 From: fangxiang Date: Thu, 2 Jun 2022 11:01:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=B9=95=E6=B7=BB=E5=8A=A0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9x=E5=9D=90=E6=A0=87=E5=92=8C=E5=AE=BD=E5=BA=A6?= =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/source_icon/timer.png | Bin 4921 -> 2748 bytes src/components/SubtitleDialog.vue | 46 +++++++++++++++++++++++++++--- src/entities/SubtitleEntity.ts | 4 ++- src/i18n/zh-CN/index.ts | 4 ++- 4 files changed, 48 insertions(+), 6 deletions(-) diff --git a/public/source_icon/timer.png b/public/source_icon/timer.png index 492562c8c9ccc13a5f39d5ad6ce7df9488f66056..07a58b16326cc7ec25b7472d23a0cd2c632f3449 100644 GIT binary patch literal 2748 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 diff --git a/src/components/SubtitleDialog.vue b/src/components/SubtitleDialog.vue index eb52a24..d759aa3 100644 --- a/src/components/SubtitleDialog.vue +++ b/src/components/SubtitleDialog.vue @@ -44,7 +44,7 @@ @@ -63,14 +63,14 @@ @@ -86,6 +86,28 @@ /> + + + + + + + + temp)[item] != "undefined") { + (subtitle.value)[item] = (temp)[item]; + } + } + } catch { + subtitle.value = response.subtitle; + } } } catch (e) { console.log(e); @@ -261,6 +292,13 @@ export default defineComponent({ async onSubmit() { loading.value = true; try { + subtitle.value.y_offset = parseInt( + subtitle.value.y_offset.toString() + ); + subtitle.value.x_speed = parseInt(subtitle.value.x_speed.toString()); + subtitle.value.x = parseInt(subtitle.value.x.toString()); + subtitle.value.width = parseInt(subtitle.value.width.toString()); + GlobalData.getInstance() .getCurrentClient() ?.setSubtitle(subtitle.value); diff --git a/src/entities/SubtitleEntity.ts b/src/entities/SubtitleEntity.ts index 5bbbb08..1247c9f 100644 --- a/src/entities/SubtitleEntity.ts +++ b/src/entities/SubtitleEntity.ts @@ -2,7 +2,9 @@ export default class SubtitleEntity { show: boolean = false; x_speed: number = 0; y_offset: number = 0; + x: number = 0; + width: number = 3840; text: string = ""; background: string = ""; - bakcground_transparent: boolean = false; + background_transparent: boolean = false; } diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts index 11d3b0c..051dbde 100644 --- a/src/i18n/zh-CN/index.ts +++ b/src/i18n/zh-CN/index.ts @@ -165,7 +165,8 @@ export default { "background color": "背景颜色", "background transparent": "背景透明", "move forward": "正向移动", - speed: "移动速度", + speed: "速度", + "move speed": "移动速度", width: "宽度", height: "高度", "x pos": "X坐标", @@ -574,4 +575,5 @@ export default { hour_2_: "时", "the start time should not exceed the current time, and the target time should not be less than the current time": "正计时的时候起始时间不要超过当前时间,倒计时的时候目标时间不要小于当前时间", + "pos x": "X坐标", };