From aa6d7e6c557be5da38a650ba4e28645ca104c728 Mon Sep 17 00:00:00 2001 From: fangxiang Date: Mon, 4 Jul 2022 14:20:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8B=B1=E6=96=87=E7=BF=BB?= =?UTF-8?q?=E8=AF=91=E4=B8=BA=E5=A4=A7=E5=86=99=E5=BC=80=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 8 +- src/common/FileSuffixHelper.ts | 4 +- src/components/AdvancedDebugDialog.vue | 12 +- src/components/AdvancedIpAddressDialog.vue | 2 +- src/components/BackgroundImageDialog.vue | 2 + src/components/CenterControlButtonDialog.vue | 2 + src/components/CenterControlDialog.vue | 7 +- src/components/FileManageDialog.vue | 14 ++ src/components/GridSettingDialog.vue | 10 +- src/components/ModeDialog.vue | 2 + src/components/ModeGroupDialog.vue | 2 + src/components/PlanDialog.vue | 3 + src/components/PlanGroupDialog.vue | 2 + src/components/PlaylistDialog.vue | 3 + src/components/PollingSettingDialog.vue | 3 + src/components/RecoveryDatabaseDialog.vue | 2 + src/components/RegisterDialog.vue | 1 + src/components/SignalSourceDialog.vue | 2 + src/components/SignalSourceGroupDialog.vue | 2 + src/components/SubtitleDialog.vue | 2 + src/components/SystemSettingDialog.vue | 7 +- .../SystenSettingAdvancedNetworkDialog.vue | 9 +- src/components/TimingTaskDialog.vue | 2 + src/components/UpgradeDialog.vue | 2 + src/components/WindowRectEditDialog.vue | 2 + src/i18n/en-US/index.ts | 172 ++++++++++++++++++ src/i18n/zh-CN/index.ts | 1 - src/pad/BottomBar.vue | 4 + src/pages/LeftToolBar.vue | 4 +- src/pages/RightToolBar.vue | 4 +- src/pages/TopToolBar.vue | 2 +- 31 files changed, 276 insertions(+), 18 deletions(-) diff --git a/src/App.vue b/src/App.vue index 4618074..28251f3 100644 --- a/src/App.vue +++ b/src/App.vue @@ -144,8 +144,12 @@ export default defineComponent({ if (Math.abs(window.orientation) == 90) { landspace = !landspace; } - if (window.location.href.indexOf("___debug_ipad___") != -1) { - landspace = !landspace; + + { + const user_search = (window).user_search || {}; + if (typeof user_search == "object") { + landspace = typeof user_search["___debug_ipad___"] != "undefined"; + } } } if (window.innerHeight < 600) { diff --git a/src/common/FileSuffixHelper.ts b/src/common/FileSuffixHelper.ts index 77499b4..3ed1763 100644 --- a/src/common/FileSuffixHelper.ts +++ b/src/common/FileSuffixHelper.ts @@ -7,7 +7,7 @@ export default class FileSuffixHelper { public static get videoSuffix() { if (FileSuffixHelper.debug_mode) { - return null; + return ""; } return ( GlobalData.getInstance().applicationConfig?.video_suffix_filter || @@ -24,7 +24,7 @@ export default class FileSuffixHelper { public static get imageSuffix() { if (FileSuffixHelper.debug_mode) { - return null; + return ""; } return ( GlobalData.getInstance().applicationConfig?.image_suffix_filter || diff --git a/src/components/AdvancedDebugDialog.vue b/src/components/AdvancedDebugDialog.vue index 58b52b0..a2c737a 100644 --- a/src/components/AdvancedDebugDialog.vue +++ b/src/components/AdvancedDebugDialog.vue @@ -72,6 +72,7 @@ @@ -83,6 +84,7 @@ @@ -129,13 +132,17 @@ - {{ $t("device info") }} + + {{ $t("device info") }} + - {{ $t("restart") }} + + {{ $t("restart") }} + @@ -148,6 +155,7 @@ :loading="loading" flat :label="$t('Cancel')" + no-caps color="primary" v-close-popup /> diff --git a/src/components/AdvancedIpAddressDialog.vue b/src/components/AdvancedIpAddressDialog.vue index 43647c7..f18e3c5 100644 --- a/src/components/AdvancedIpAddressDialog.vue +++ b/src/components/AdvancedIpAddressDialog.vue @@ -127,7 +127,7 @@ - + @@ -82,6 +83,7 @@ ref="accept" flat :label="$t('Accept')" + no-caps :loading="loading" type="submit" color="primary" diff --git a/src/components/CenterControlButtonDialog.vue b/src/components/CenterControlButtonDialog.vue index 8d89bbd..b4f6452 100644 --- a/src/components/CenterControlButtonDialog.vue +++ b/src/components/CenterControlButtonDialog.vue @@ -101,6 +101,7 @@ ref="cancel" flat :label="$t('Cancel')" + no-caps :loading="loading" v-close-popup color="primary" @@ -110,6 +111,7 @@ ref="accept" flat :label="$t('Accept')" + no-caps :loading="loading" type="submit" color="primary" diff --git a/src/components/CenterControlDialog.vue b/src/components/CenterControlDialog.vue index 0f549e8..30123b5 100644 --- a/src/components/CenterControlDialog.vue +++ b/src/components/CenterControlDialog.vue @@ -52,11 +52,13 @@ > @@ -80,6 +82,7 @@
@@ -92,6 +94,7 @@ { filters.value = []; + console.log(filter); + if (filter == null || typeof filter == "undefined") { + return; + } + console.log(filter); if (filter) { for (const item of filter.split(";")) { diff --git a/src/components/GridSettingDialog.vue b/src/components/GridSettingDialog.vue index 8d8c419..d1ee139 100644 --- a/src/components/GridSettingDialog.vue +++ b/src/components/GridSettingDialog.vue @@ -72,6 +72,7 @@ :loading="loading" flat :label="$t('Cancel')" + no-caps color="primary" v-close-popup /> @@ -79,6 +80,7 @@ ref="accept" flat :label="$t('Accept')" + no-caps :loading="loading" type="submit" color="primary" @@ -122,8 +124,12 @@ export default defineComponent({ showDialog() { show_dialog.value = true; - rows.value = GlobalData.getInstance().applicationConfig?.wall_row ?? 1; - cols.value = GlobalData.getInstance().applicationConfig?.wall_col ?? 1; + rows.value = parseInt( + (GlobalData.getInstance().applicationConfig?.wall_row ?? 1).toString() + ); + cols.value = parseInt( + (GlobalData.getInstance().applicationConfig?.wall_col ?? 1).toString() + ); }, resetData() { loading.value = false; diff --git a/src/components/ModeDialog.vue b/src/components/ModeDialog.vue index 6fc1d55..73700a4 100644 --- a/src/components/ModeDialog.vue +++ b/src/components/ModeDialog.vue @@ -157,6 +157,7 @@ :loading="loading" flat :label="$t('Cancel')" + no-caps color="primary" v-close-popup /> @@ -164,6 +165,7 @@ ref="accept" flat :label="$t('Accept')" + no-caps :loading="loading" type="submit" color="primary" diff --git a/src/components/ModeGroupDialog.vue b/src/components/ModeGroupDialog.vue index dc71329..725fe47 100644 --- a/src/components/ModeGroupDialog.vue +++ b/src/components/ModeGroupDialog.vue @@ -131,6 +131,7 @@ :loading="loading" flat :label="$t('Cancel')" + no-caps color="primary" v-close-popup /> @@ -138,6 +139,7 @@ ref="accept" flat :label="$t('Accept')" + no-caps :loading="loading" type="submit" color="primary" diff --git a/src/components/PlanDialog.vue b/src/components/PlanDialog.vue index 8766708..cba7f1f 100644 --- a/src/components/PlanDialog.vue +++ b/src/components/PlanDialog.vue @@ -340,6 +340,7 @@ @@ -356,6 +358,7 @@ ref="accept" flat :label="$t('Accept')" + no-caps :loading="loading" type="submit" color="primary" diff --git a/src/components/PlanGroupDialog.vue b/src/components/PlanGroupDialog.vue index b45f9f6..944e976 100644 --- a/src/components/PlanGroupDialog.vue +++ b/src/components/PlanGroupDialog.vue @@ -131,6 +131,7 @@ :loading="loading" flat :label="$t('Cancel')" + no-caps color="primary" v-close-popup /> @@ -138,6 +139,7 @@ ref="accept" flat :label="$t('Accept')" + no-caps :loading="loading" type="submit" color="primary" diff --git a/src/components/PlaylistDialog.vue b/src/components/PlaylistDialog.vue index d8d6e75..e8cf39f 100644 --- a/src/components/PlaylistDialog.vue +++ b/src/components/PlaylistDialog.vue @@ -75,6 +75,7 @@ @@ -201,6 +203,7 @@ ref="accept" flat :label="$t('Accept')" + no-caps :loading="loading" type="submit" color="primary" diff --git a/src/components/RecoveryDatabaseDialog.vue b/src/components/RecoveryDatabaseDialog.vue index 4aced06..9c1db80 100644 --- a/src/components/RecoveryDatabaseDialog.vue +++ b/src/components/RecoveryDatabaseDialog.vue @@ -68,6 +68,7 @@ :loading="loading" flat :label="$t('Cancel')" + no-caps color="primary" v-close-popup /> @@ -75,6 +76,7 @@ ref="accept" flat :label="$t('Accept')" + no-caps :loading="loading" type="submit" color="primary" diff --git a/src/components/RegisterDialog.vue b/src/components/RegisterDialog.vue index db7a5da..5362bea 100644 --- a/src/components/RegisterDialog.vue +++ b/src/components/RegisterDialog.vue @@ -345,6 +345,7 @@ :disable="loading" flat :label="$t('Cancel')" + no-caps color="primary" v-close-popup /> diff --git a/src/components/SignalSourceDialog.vue b/src/components/SignalSourceDialog.vue index 2db839d..f120740 100644 --- a/src/components/SignalSourceDialog.vue +++ b/src/components/SignalSourceDialog.vue @@ -276,6 +276,7 @@ :loading="loading" flat :label="$t('Cancel')" + no-caps color="primary" v-close-popup /> @@ -284,6 +285,7 @@ flat :label="$t('Accept')" :loading="loading" + no-caps color="primary" type="submit" /> diff --git a/src/components/SignalSourceGroupDialog.vue b/src/components/SignalSourceGroupDialog.vue index 5a84e5f..6dbad0d 100644 --- a/src/components/SignalSourceGroupDialog.vue +++ b/src/components/SignalSourceGroupDialog.vue @@ -131,6 +131,7 @@ :loading="loading" flat :label="$t('Cancel')" + no-caps color="primary" v-close-popup /> @@ -138,6 +139,7 @@ ref="accept" flat :label="$t('Accept')" + no-caps :loading="loading" type="submit" color="primary" diff --git a/src/components/SubtitleDialog.vue b/src/components/SubtitleDialog.vue index d759aa3..28da4b6 100644 --- a/src/components/SubtitleDialog.vue +++ b/src/components/SubtitleDialog.vue @@ -143,6 +143,7 @@ :loading="loading" flat :label="$t('Cancel')" + no-caps color="primary" v-close-popup /> @@ -150,6 +151,7 @@ ref="accept" flat :label="$t('Accept')" + no-caps :loading="loading" type="submit" color="primary" diff --git a/src/components/SystemSettingDialog.vue b/src/components/SystemSettingDialog.vue index 9291a57..00ba7c4 100644 --- a/src/components/SystemSettingDialog.vue +++ b/src/components/SystemSettingDialog.vue @@ -50,12 +50,14 @@ > @@ -1035,7 +1040,7 @@ } .width_5_2_2 { - width: 18%; + width: 22%; } .width_5_3 { diff --git a/src/components/SystenSettingAdvancedNetworkDialog.vue b/src/components/SystenSettingAdvancedNetworkDialog.vue index b174de7..96171b6 100644 --- a/src/components/SystenSettingAdvancedNetworkDialog.vue +++ b/src/components/SystenSettingAdvancedNetworkDialog.vue @@ -132,11 +132,18 @@ - + diff --git a/src/components/TimingTaskDialog.vue b/src/components/TimingTaskDialog.vue index f47e815..0f8697b 100644 --- a/src/components/TimingTaskDialog.vue +++ b/src/components/TimingTaskDialog.vue @@ -161,6 +161,7 @@ :loading="loading" flat :label="$t('Cancel')" + no-caps color="primary" v-close-popup /> @@ -168,6 +169,7 @@ ref="accept" flat :label="$t('Accept')" + no-caps :loading="loading" type="submit" color="primary" diff --git a/src/components/UpgradeDialog.vue b/src/components/UpgradeDialog.vue index 6c2c196..4029d29 100644 --- a/src/components/UpgradeDialog.vue +++ b/src/components/UpgradeDialog.vue @@ -96,6 +96,7 @@ :loading="loading" flat :label="$t('Cancel')" + no-caps color="primary" v-close-popup /> @@ -104,6 +105,7 @@ flat :label="$t('Accept')" :loading="loading" + no-caps type="submit" color="primary" /> diff --git a/src/components/WindowRectEditDialog.vue b/src/components/WindowRectEditDialog.vue index 1fb2993..332cc7d 100644 --- a/src/components/WindowRectEditDialog.vue +++ b/src/components/WindowRectEditDialog.vue @@ -194,6 +194,7 @@ :loading="loading" flat :label="$t('Cancel')" + no-caps color="primary" v-close-popup /> @@ -201,6 +202,7 @@ ref="accept" flat :label="$t('Accept')" + no-caps :loading="loading" type="submit" color="primary" diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts index 7bd58fc..6a08ac0 100644 --- a/src/i18n/en-US/index.ts +++ b/src/i18n/en-US/index.ts @@ -25,4 +25,176 @@ export default { "set the window rectangle beyond the desktop rectangle, the window rectangle will be clipped, are you sure to use this window rectangle": "if the window size exceeds the desktop size, the window size will be clipped. Are you sure to use this window size", hour_2_: "hour", + "system setting": "System", + "grid setting": "Layout", + subtitle: "OSD", + "file manage": "Explorer", + rename: "Rename", + _copy2: "Copy", + _cut2: "Cut", + delete: "Delete", + "local disk": "Local Disk", + back: "Back", + forward: "Forward", + refresh: "Refresh", + paste: "Paste", + "create folder": "Create Folder", + "upload file": "Upload File", + "file count": "File Count", + "directoriy count": "Directoriy Count", + "free space": "Free Space", + "file size": "File Size", + "last edit time": "Last Edit Time", + operator: "Operator", + "file name": "File Name", + "wall row": "Wall Row", + "wall col": "Wall Col", + cancel: "Cancel", + accept: "Accept", + Cancel: "Cancel", + Accept: "Accept", + "move speed": "Move Speed", + "y offset": "Y Offset", + "pos x": "X Position", + width: "Width", + height: "Height", + enable: "Enable", + disable: "Disable", + "enable subtitle": "Enable OSD", + edit: "Edit", + add: "Add", + command: "Command", + "serial port setting": "RS232 Setting", + "baud rate": "Baud Rate", + "character size": "Character Size", + parity: "Parity", + "stop bits": "Stop Bits", + revert: "Revert", + submit: "Submit", + "add group": "Add Group", + mode: "Mode", + "update to current window list": "Update To Current Window List", + "add mode item": "Add Mode Item", + "signal source": "Signal", + "add signal source item": "Add Signal Item", + "lossy picture quality": "Lossy Picture Quality", + "lossless picture quality": "Lossless Picture Quality", + "signal polling": "Loop Signal", + "add polling": "Add Loop Signal", + plan: "Mode Plan", + "add plan item": "Add Mode Plan Item", + "set power on start": "Set Power On Start", + "parent group": "Parent Group", + "group name": "Group Name", + "add signal source": "Add Signal", + "edit signal source": "Edit Signal", + "signal source name": "Signal Name", + "signal source type": "Signal Type", + "file path": "File Path", + "multimedia file": "Multimedia File", + "new signal source": "New Signal", + "polling setting": "Loop Signal Setting", + "polling name": "Loop Signal Name", + "polling data": "Loop Signal Data", + delay: "Delay", + "add row": "Add Row", + "new polling": "New Loop Signal", + "add mode": "Add Mode", + "edit mode": "Edit Mode", + "mode name": "Mode Name", + "mode index": "Mode Index", + "add plan": "Add Mode Plan", + "edit plan": "Edit Mode Plan", + "plan name": "Mode Plan Name", + "plan data": "Mode Plan Data", + "play list": "Play List", + "close and reset": "Close And Reset", + "close and save": "Close And Save", + "select file": "Select File", + "background image setting": "Background", + "database import": "Import", + "database export": "Export", + upgrade: "Upgrade", + "register device": "Register Device", + about: "About", + function: "Function", + "output board": "Output Board", + commit: "Commit", + "mirroring output": "Mirroring Output", + language: "Language", + chinese: "Chinese", + english: "English", + "device info": "Device Info", + restart: "Restart", + "volume down": "Volume Down", + "volume up": "Volume Up", + mute: "Mute", + unmute: "UnMute", + "play prev": "Play Prev", + "play next": "Play Next", + play: "Play", + pause: "Pause", + "replace window": "Replace Window", + "close this window": "Close This Window", + "close other windows": "Close Other Windows", + "start polling": "Start Loop Signal", + "desktop width": "Desktop Width", + "desktop height": "Desktop Height", + "client version": "Client Version", + "server version": "Server Version", + "server commit": "Server Commit", + "server branch name": "Server Branch Name", + "server build date": "Server Build Date", + "kernel version": "Kernel Version", + "rootfs version": "RootFS Version", + "upgrade type": "Upgrade Type", + rootfs: "RootFS", + software: "Software", + "select software upgrade file": "Select Software Upgrade File", + "select rootfs upgrade file": "Select Rootfs Upgrade File", + "network setting": "Network Setting", + "output setting": "Output Setting", + "timing task": "Timing Task", + other: "Other", + "auto ip": "Auto IP", + "ip address": "Ip Address", + gateway: "Gateway", + netmask: "Netmask", + "mac address": "MAC Address", + advanced: "Advanced", + "revert and exit": "Revert And Exit", + apply: "Apply", + "current real resolution": "Current Real Resolution", + "output type": "Output Type", + "target resolution": "Target Resolution", + "device rotate": "Device Rotate", + "output audio card": "Output Audio Card", + "use ntp": "Use Ntp", + "ntp server": "Ntp Server", + "ntp sync delay(S)": "Ntp Sync Delay(S)", + "time zone": "Time Zone", + exit: "Exit", + "add timing task": "Add Timing Task", + name: "Name", + "task type": "Task Type", + time: "Time", + loop: "Loop", + "timing cycle": "Timing Exexute", + monday: "Monday", + tuesday: "Turesday", + wednsday: "Wednsday", + thursday: "Thursday", + friday: "Friday", + saturday: "Saturday", + sunday: "Sunday", + tf_card: "TF CARD", + usb1: "USB1", + usb2: "usb2", + usb3: "usb3", + usb4: "usb4", + usb5: "usb5", + usb6: "usb6", + usb7: "usb7", + usb8: "usb8", + usb9: "usb9", }; diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts index 6978ff7..1569cc8 100644 --- a/src/i18n/zh-CN/index.ts +++ b/src/i18n/zh-CN/index.ts @@ -441,7 +441,6 @@ export default { "file count": "文件数量", "directoriy count": "文件夹数量", "free space": "剩余空间", - "center contorl": "中控", "power on": "开机", "power off": "关机", "center control": "中控", diff --git a/src/pad/BottomBar.vue b/src/pad/BottomBar.vue index 7f4a78b..56cbc9f 100644 --- a/src/pad/BottomBar.vue +++ b/src/pad/BottomBar.vue @@ -21,6 +21,7 @@ > @@ -28,6 +29,7 @@ @@ -35,6 +37,7 @@ @@ -42,6 +45,7 @@ diff --git a/src/pages/LeftToolBar.vue b/src/pages/LeftToolBar.vue index 3aabf95..575885a 100644 --- a/src/pages/LeftToolBar.vue +++ b/src/pages/LeftToolBar.vue @@ -10,8 +10,8 @@ narrow-indicator style="color: red" > - - + + diff --git a/src/pages/RightToolBar.vue b/src/pages/RightToolBar.vue index 6755403..d8813e9 100644 --- a/src/pages/RightToolBar.vue +++ b/src/pages/RightToolBar.vue @@ -9,8 +9,8 @@ align="justify" narrow-indicator > - - + + diff --git a/src/pages/TopToolBar.vue b/src/pages/TopToolBar.vue index f4b986e..3d43573 100644 --- a/src/pages/TopToolBar.vue +++ b/src/pages/TopToolBar.vue @@ -236,7 +236,7 @@ flat stack icon="img:new_icon/center_control.png" - :label="$t('center contorl')" + :label="$t('center control')" class="q-mr-sm" @click="$refs.center_control_dialog.showDialog()" />