diff --git a/package.json b/package.json index 9eb12cc..beb8072 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "media_player_client", - "version": "1.4.19", + "version": "1.4.20", "description": "A Quasar Framework app", "productName": "MediaPlayerClient", "author": "fangxiang ", diff --git a/src/components/BackgroundImageDialog.vue b/src/components/BackgroundImageDialog.vue index 31c82a3..6a36857 100644 --- a/src/components/BackgroundImageDialog.vue +++ b/src/components/BackgroundImageDialog.vue @@ -208,7 +208,16 @@ export default defineComponent({ $q.dialog({ title: $t.t("Confirm"), message: $t.t("use this image to background image") + "?", - cancel: true, + ok: { + label: $t.t("ok"), + noCaps: true, + flat: true, + }, + cancel: { + label: $t.t("cancel"), + noCaps: true, + flat: true, + }, persistent: true, }) .onOk(() => { diff --git a/src/components/EdgeBlendingDialog.vue b/src/components/EdgeBlendingDialog.vue index b5fe895..1b483ca 100644 --- a/src/components/EdgeBlendingDialog.vue +++ b/src/components/EdgeBlendingDialog.vue @@ -299,7 +299,16 @@ export default defineComponent({ $q.dialog({ title: $t.t("Error"), message: $t.t("get edge blending data failed") + "!", - cancel: true, + ok: { + label: $t.t("ok"), + noCaps: true, + flat: true, + }, + cancel: { + label: $t.t("cancel"), + noCaps: true, + flat: true, + }, }).onDismiss(() => { show_dialog.value = false; }); diff --git a/src/components/FileManageDialog.vue b/src/components/FileManageDialog.vue index 9165548..bbb81f7 100644 --- a/src/components/FileManageDialog.vue +++ b/src/components/FileManageDialog.vue @@ -908,7 +908,16 @@ export default defineComponent({ isValid: (val: string) => !!val && val.trim().length > 0, type: "text", }, - cancel: true, + ok: { + label: $t.t("ok"), + noCaps: true, + flat: true, + }, + cancel: { + label: $t.t("cancel"), + noCaps: true, + flat: true, + }, persistent: true, }).onOk(async (data: string) => { if (url) { @@ -994,7 +1003,16 @@ export default defineComponent({ isValid: (val: string) => !!val && val.trim().length > 0, type: "text", }, - cancel: true, + ok: { + label: $t.t("ok"), + noCaps: true, + flat: true, + }, + cancel: { + label: $t.t("cancel"), + noCaps: true, + flat: true, + }, persistent: true, }).onOk(async (data: string) => { if (data == file.name) { @@ -1252,7 +1270,16 @@ export default defineComponent({ ) + "!" + "", - cancel: true, + ok: { + label: $t.t("ok"), + noCaps: true, + flat: true, + }, + cancel: { + label: $t.t("cancel"), + noCaps: true, + flat: true, + }, persistent: true, }).onOk(async () => { let success = false; diff --git a/src/components/ModeTree.vue b/src/components/ModeTree.vue index 57beadf..5112f4b 100644 --- a/src/components/ModeTree.vue +++ b/src/components/ModeTree.vue @@ -275,7 +275,16 @@ export default defineComponent({ "," + $t.t("are you sure about the update") + "?", - cancel: true, + ok: { + label: $t.t("ok"), + noCaps: true, + flat: true, + }, + cancel: { + label: $t.t("cancel"), + noCaps: true, + flat: true, + }, persistent: true, }).onOk(async () => { try { diff --git a/src/components/RecoveryDatabaseDialog.vue b/src/components/RecoveryDatabaseDialog.vue index 9c1db80..bfaa774 100644 --- a/src/components/RecoveryDatabaseDialog.vue +++ b/src/components/RecoveryDatabaseDialog.vue @@ -167,7 +167,16 @@ export default defineComponent({ $q.dialog({ title: $t.t("Confirm"), message: $t.t("use this file to recovery data") + "?", - cancel: true, + ok: { + label: $t.t("ok"), + noCaps: true, + flat: true, + }, + cancel: { + label: $t.t("cancel"), + noCaps: true, + flat: true, + }, persistent: true, }) .onOk(() => { @@ -195,7 +204,16 @@ export default defineComponent({ "?" + "

", html: true, - cancel: true, + ok: { + label: $t.t("ok"), + noCaps: true, + flat: true, + }, + cancel: { + label: $t.t("cancel"), + noCaps: true, + flat: true, + }, persistent: true, }) .onOk(() => { diff --git a/src/components/SystemSettingDialog.vue b/src/components/SystemSettingDialog.vue index 3793df9..bb2d3b9 100644 --- a/src/components/SystemSettingDialog.vue +++ b/src/components/SystemSettingDialog.vue @@ -1486,7 +1486,16 @@ export default defineComponent({ "\n" + $t.t("the screen output may be abnormal") + "!", - cancel: true, + ok: { + label: $t.t("ok"), + noCaps: true, + flat: true, + }, + cancel: { + label: $t.t("cancel"), + noCaps: true, + flat: true, + }, persistent: true, }).onOk(_apply_graphics); } else { @@ -1528,7 +1537,16 @@ export default defineComponent({ $t.t( "the sound card takes effect only after it is restarted. Restart the system" ) + "?", - cancel: true, + ok: { + label: $t.t("ok"), + noCaps: true, + flat: true, + }, + cancel: { + label: $t.t("cancel"), + noCaps: true, + flat: true, + }, persistent: true, }).onOk(async () => { await GlobalData.getInstance() @@ -1857,6 +1875,7 @@ export default defineComponent({ persistent: true, ok: { label: $t.t("i have known"), + noCaps: true, flat: true, }, }); diff --git a/src/components/UpgradeDialog.vue b/src/components/UpgradeDialog.vue index a7be73d..0eb445d 100644 --- a/src/components/UpgradeDialog.vue +++ b/src/components/UpgradeDialog.vue @@ -215,7 +215,16 @@ export default defineComponent({ $q.dialog({ title: $t.t("Confirm"), message: $t.t("use this file to upgrade") + "?", - cancel: true, + ok: { + label: $t.t("ok"), + noCaps: true, + flat: true, + }, + cancel: { + label: $t.t("cancel"), + noCaps: true, + flat: true, + }, persistent: true, }) .onOk(() => { diff --git a/src/components/WindowRectEditDialog.vue b/src/components/WindowRectEditDialog.vue index 332cc7d..e33d527 100644 --- a/src/components/WindowRectEditDialog.vue +++ b/src/components/WindowRectEditDialog.vue @@ -334,7 +334,16 @@ export default defineComponent({ $t.t( "set the window rectangle beyond the desktop rectangle, the window rectangle will be clipped, are you sure to use this window rectangle" ) + "?", - cancel: true, + ok: { + label: $t.t("ok"), + noCaps: true, + flat: true, + }, + cancel: { + label: $t.t("cancel"), + noCaps: true, + flat: true, + }, persistent: true, }) .onOk(() => resolve_data()) diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts index cc4b549..84c6be8 100644 --- a/src/i18n/en-US/index.ts +++ b/src/i18n/en-US/index.ts @@ -3,6 +3,7 @@ export default { " ": " ", + ok: "Ok", title: "MediaPlayerWebAPP", failed: " Failed", success: " Successful", @@ -300,4 +301,7 @@ export default { "connect time out!": "Connect Time Out!", "login fail!": "Login Fail!", "unset power on start": "UnSet Power On Start", + "cancel upload file": "Cancel Upload File", + "are you sure power off device": "Are You Sure Power Off Device", + "input folder name": "Input Folder Name", }; diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts index c7c70c4..7b1f357 100644 --- a/src/i18n/zh-CN/index.ts +++ b/src/i18n/zh-CN/index.ts @@ -596,4 +596,5 @@ export default { "Host names can only be numbers and letters and _-": "主机名只能由数字、字母和_-组成", "Custom ISV": "优霸定制", + "are you sure power off device": "确定关机吗", }; diff --git a/src/pages/TopToolBar.vue b/src/pages/TopToolBar.vue index 85c5369..87f5e16 100644 --- a/src/pages/TopToolBar.vue +++ b/src/pages/TopToolBar.vue @@ -649,25 +649,41 @@ export default defineComponent({ window.location.reload(); } }, - async powerOff() { - let success = false; - try { - const response = await GlobalData.getInstance() - .getCurrentClient() - ?.deviceStandByMode(); - if (response) { - success = response?.success ?? false; - } - } catch {} - $q.notify({ - color: success ? "positive" : "negative", - icon: success ? "done" : "warning", - message: - $t.t("send power off command") + - (success ? $t.t("success") : $t.t("fail")) + - "!", - position: "top", - timeout: 1500, + powerOff() { + $q.dialog({ + title: $t.t("power off"), + message: $t.t("are you sure power off device") + "?", + ok: { + label: $t.t("ok"), + noCaps: true, + flat: true, + }, + cancel: { + label: $t.t("cancel"), + noCaps: true, + flat: true, + }, + persistent: true, + }).onOk(async () => { + let success = false; + try { + const response = await GlobalData.getInstance() + .getCurrentClient() + ?.deviceStandByMode(); + if (response) { + success = response?.success ?? false; + } + } catch {} + $q.notify({ + color: success ? "positive" : "negative", + icon: success ? "done" : "warning", + message: + $t.t("send power off command") + + (success ? $t.t("success") : $t.t("fail")) + + "!", + position: "top", + timeout: 1500, + }); }); }, async powerOn() {