diff --git a/src-capacitor/package.json b/src-capacitor/package.json index c24bd0d..4334cfe 100644 --- a/src-capacitor/package.json +++ b/src-capacitor/package.json @@ -1,6 +1,6 @@ { "name": "media_player_client", - "version": "1.4.1", + "version": "1.4.2", "description": "A Quasar Framework app", "author": "fangxiang ", "private": true, @@ -9,4 +9,4 @@ "@capacitor/cli": "^2.0.0", "@capacitor/core": "^2.0.0" } -} \ No newline at end of file +} diff --git a/src/components/AdvancedDebugDialog.vue b/src/components/AdvancedDebugDialog.vue index 19c3fb7..044fafa 100644 --- a/src/components/AdvancedDebugDialog.vue +++ b/src/components/AdvancedDebugDialog.vue @@ -12,7 +12,7 @@ " > - +
AdvancedDebug
@@ -56,14 +56,6 @@ color="primary" v-close-popup /> - diff --git a/src/components/SubtitleDialog.vue b/src/components/SubtitleDialog.vue index b5c6b85..dd2e3e1 100644 --- a/src/components/SubtitleDialog.vue +++ b/src/components/SubtitleDialog.vue @@ -56,9 +56,9 @@ - + - + {{ $t("replace window") }} + + {{ $t("edit window rect") }} + + + + + +
+
+ {{ $t("window rect") }} +
+ +
+ + + {{ $t("close") }} + + +
+
+
+ + + + + + + + + {{ $t("desktop width") }}: + + {{ $store.state.device_screen_width }} + + {{ $t("px") }} + + + + + {{ $t("desktop height") }}: + + {{ $store.state.device_screen_height }} + + {{ $t("px") }} + + + + + + + + + {{ $t("X") }}: + + + + + + + + + + + + + {{ $t("Y") }}: + + + + + + + + + + + + + + {{ $t("width") }}: + + + + + + + + + + + + + {{ $t("height") }}: + + + + + + + + + + + + + + + + + + +
+
+
+ + + + + diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts index a4c39f1..bb08dc9 100644 --- a/src/i18n/zh-CN/index.ts +++ b/src/i18n/zh-CN/index.ts @@ -480,4 +480,16 @@ export default { "plan running! can't open window!": "预案正在运行!不能开窗!", "full screen window": "全屏", "restore window size": "恢复", + "window rect": "窗口矩形", + "the number must be greater than 0": "数字必须大于0", + "the number must be greater than 1": "数字必须大于1", + X: "X坐标", + Y: "Y坐标", + "edit window rect": "修改窗口矩形", + "set the window rectangle beyond the desktop rectangle, the window rectangle will be clipped, are you sure to use this window rectangle": + "设置的窗口矩形超出桌面矩形,窗口矩形将会被裁剪,确定使用这个窗口矩形吗", + "desktop width": "桌面宽度", + "desktop height": "桌面高度", + px: "像素", + Warning: "警告", }; diff --git a/src/pad/ContentWall.vue b/src/pad/ContentWall.vue index f762d4d..7c403ca 100644 --- a/src/pad/ContentWall.vue +++ b/src/pad/ContentWall.vue @@ -52,6 +52,7 @@ @mute_unmute="mute_unmute" @start_polling="start_polling" @stop_polling="stop_polling" + @edit_rect="editRect" :ref="'window_' + item.window_id" :id="'window_' + item.window_id" :uuid="item.uuid" @@ -74,7 +75,7 @@ :key="row" class="row" :style="{ - height: cell_height + 'px', + height: wall_height.value / $store.state.wall_row + 'px', }" >
@@ -121,6 +124,7 @@
+