diff --git a/public/source_icon/timer.png b/public/source_icon/timer.png index 492562c..07a58b1 100644 Binary files a/public/source_icon/timer.png and b/public/source_icon/timer.png differ 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坐标", };