From 4dedd8a584670d6adf2f45ec40c0830bd2973a76 Mon Sep 17 00:00:00 2001
From: fangxiang <fangxiang@cloudview.work>
Date: Thu, 5 May 2022 19:45:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0=E8=BD=AE?=
 =?UTF-8?q?=E8=AF=A2=E5=90=8E=E4=BD=BF=E7=94=A8=E9=94=AE=E9=BC=A0=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E7=BC=96=E8=BE=91=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?BUG=20=E5=B7=A5=E5=85=B7=E6=A0=8F=E6=B7=BB=E5=8A=A0=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3=E5=A4=A7=E5=B0=8F=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   2 +-
 public/new_icon/edit_window_rect.png          | Bin 0 -> 1154 bytes
 .../{edit_rect.png => edit_window_rect.png}   | Bin
 src/components/PollingSettingDialog.vue       |   2 +-
 src/components/SystemSettingDialog.vue        |  32 ++++++------
 src/i18n/en-US/index.ts                       |   1 +
 src/i18n/zh-CN/index.ts                       |   2 +
 src/pad/TopToolbar.vue                        |  49 ++++++++++++++++++
 src/pages/TopToolBar.vue                      |  47 +++++++++++++++++
 9 files changed, 117 insertions(+), 18 deletions(-)
 create mode 100644 public/new_icon/edit_window_rect.png
 rename public/pad/toolbar/{edit_rect.png => edit_window_rect.png} (100%)

diff --git a/package.json b/package.json
index ab52939..4b2561b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "media_player_client",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "A Quasar Framework app",
   "productName": "MediaPlayerClient",
   "author": "fangxiang <fangxiang@cloudview.work>",
diff --git a/public/new_icon/edit_window_rect.png b/public/new_icon/edit_window_rect.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f8369951a74e388a1a10df36109ec25c0ca1add
GIT binary patch
literal 1154
zcmV-|1bzF7P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000C@Nkl<ZXo2mT
z&2Jk;7>A$v*tKIjO;RULn~#17(iWG3LMcU+5Jv<EAt)Ss;KYSXFZ?ZVr~p;sfK()o
z@E=r3Nkc?~P?`!9Cr;8hZES33cV~t}sOo(5Q|o#w@tmwZ%=~_{?>q0zyB42c`o*o0
z0b_Wskdj^*pvxxB-Bce=L;$!B>v|O8-Vdp0Mm4mD!<mT9AS5*QxiFxWAmw>@!lD5h
zq2<NCE?ytb(VO;KY$lIt5b@hmjhWRZR)OA(4Ch}N;EOj7knvQf^*t7mbzGia;mYJ3
z`fy(t7tamjC3w|$qNU)o@j>QG%gE#XnZ%2KP+k@bS+rKkQ2+DX8sASZGnUVA@!Tj`
zU(pB+Ur#JDS*r4Jv7e8M1w@NnEkP$?+p*5^&9ySum#R!GZ1CQ(Jg*IPbF<Rm(&Qr6
z!E!C&ov}Pwza>u{Tf0!FkwS1`d=Mq!*!~P-`7QvC_H}V#{2)`MDjyc}bnUUpB*Fl|
z`^WlucPx)=iIJ?Y`0}ko80S!8?@*V|O5o!lA0YBU;vr!Mo`zi^bgR<f+o>{ACaWL^
zk>mWy0mg^Aw>{rwpwbBWX?7K@M4}ATL&Mq89>#~ZKi_3Q3PILWsDv31Y*pZ$Joh>9
zzkx?iU>%~3)xNC;gmpB#eVhOl*|yBlwn{9GV>9P7^}z|U>kW=hl-O6U;k3l=k&I7E
z8x2_ge)RyGIgibp$NEq=!#7qLoi5`yLfk{D>l4ir%P2bs4J{jkS<1)rU;zV82o_Ei
zSUS;<j4_<zH{bvPw@wdZJbC{%A|O=_7@EC}Rq;(5y8#s%Du;SmJKO`UttJ7ZGs~nm
zHgPfLK&%FYbwpj7xi?3)AEXp?uhbcuUEO*sF%s)&Dm0Xe1?v0L_g7y47GAizfC@~k
zs}C_65XRByNwe_s;PzX%gn{{W`W7}YZD`xXW<WZ}{FxDgtlrvr00ij3a`e|lT$@gY
z@r96c>|3efH6u`Lg^q-Sv$x5u*0H)hML(8NrLim(2gt5BIP=5rjLfV6kiHvmcxo~B
z#BC*(N-T||kxTK%+ea9gS>edFMF!?8Sf$X-sBNncF}(pNAal0~z{05l6Q7<$2bTO_
zciJi*;yMcnfnN_v)kFGk-eKTY1-}*$`R#8O$6~-JNp7vq=^tlF{a0zNel}f!nBKtF
zc8N2XXRzw6#CDu^0*L8|{3QH;C+;-6LdZD?tV4^0b>@u2?$I3BWx!X0(Vi4aCaba4
zj0~AQD!R6AyRDZBSuTH4>_k336z3qdqbOQH&s7@tZh-(ODYkzFNicujt|RBx8hkZb
z#_Sbf3FgX;H6}|NXkSUbn<{g?bceGe`{+%32$8(M9NdeLY7jA1s&aMl9|}^S1(4Q~
z>7^RiO4Uwkd~B2yq<jyFKt}*lk@7uKomTcFNJVHs_v;AhYB<`{yKEay(yK%M1s-U3
UYBVwoZvX%Q07*qoM6N<$g6Sn5)c^nh

literal 0
HcmV?d00001

diff --git a/public/pad/toolbar/edit_rect.png b/public/pad/toolbar/edit_window_rect.png
similarity index 100%
rename from public/pad/toolbar/edit_rect.png
rename to public/pad/toolbar/edit_window_rect.png
diff --git a/src/components/PollingSettingDialog.vue b/src/components/PollingSettingDialog.vue
index 3ac64ad..075ae79 100644
--- a/src/components/PollingSettingDialog.vue
+++ b/src/components/PollingSettingDialog.vue
@@ -326,7 +326,7 @@ export default defineComponent({
       },
       addRow() {
         datas.value.push({
-          key: "operator_signal_source",
+          key: "operator_play_signal_source",
           value: GlobalData.getInstance().signal_source[0].uuid,
         });
 
diff --git a/src/components/SystemSettingDialog.vue b/src/components/SystemSettingDialog.vue
index bee221b..a5eee6a 100644
--- a/src/components/SystemSettingDialog.vue
+++ b/src/components/SystemSettingDialog.vue
@@ -944,22 +944,22 @@ export default defineComponent({
         label: "270°",
         value: 3,
       },
-      {
-        label: $t.t("horizontal flipped"),
-        value: 4,
-      },
-      {
-        label: $t.t("horizontal flipped") + "90°",
-        value: 5,
-      },
-      {
-        label: $t.t("horizontal flipped") + "180°",
-        value: 6,
-      },
-      {
-        label: $t.t("horizontal flipped") + "270°",
-        value: 7,
-      },
+      // {
+      //   label: $t.t("horizontal flipped"),
+      //   value: 4,
+      // },
+      // {
+      //   label: $t.t("horizontal flipped") + "90°",
+      //   value: 5,
+      // },
+      // {
+      //   label: $t.t("horizontal flipped") + "180°",
+      //   value: 6,
+      // },
+      // {
+      //   label: $t.t("horizontal flipped") + "270°",
+      //   value: 7,
+      // },
     ]);
     let device_resolution_type = ref("EDID");
     let device_resolution_type_options = ref([
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index f76ddff..eec29a4 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -19,6 +19,7 @@ export default {
   close: "Close",
   logout: "Logout",
   "window rect": "Window Size",
+  "toolbar edit window rect": "Window Size",
   "edit window rect": "Window Size Adjust",
   "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",
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index 4b6bcb4..db5cf43 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -496,4 +496,6 @@ export default {
   function: "功能",
   commit: "提交",
   "set device function": "设置设备功能成功",
+  operator_play_signal_source: "信号源",
+  "toolbar edit window rect": "窗口大小",
 };
diff --git a/src/pad/TopToolbar.vue b/src/pad/TopToolbar.vue
index 964ebac..16cc7ca 100644
--- a/src/pad/TopToolbar.vue
+++ b/src/pad/TopToolbar.vue
@@ -67,6 +67,7 @@
       :label="$t('win lower')"
       @click="lowerWindow"
     />
+
     <q-btn
       v-if="function_center_control"
       class="col-auto"
@@ -119,6 +120,18 @@
       class="col-auto"
       @click="$refs.subtitle_dialog.showDialog()"
     />
+
+    <q-btn
+      stretch
+      flat
+      stack
+      no-caps
+      icon="img:pad/toolbar/edit_window_rect.png"
+      :label="$t('toolbar edit window rect')"
+      class="col-auto"
+      @click="editRect"
+    />
+
     <q-btn
       class="col-auto"
       stretch
@@ -194,6 +207,7 @@
   <center-control-dialog ref="center_control_dialog" />
   <subtitle-dialog ref="subtitle_dialog" />
   <advanced-debug-dialog ref="advanced_debug_dialog" />
+  <window-rect-edit-dialog ref="window_rect_edit_dialog" />
 </template>
 
 <script lang="ts">
@@ -206,6 +220,7 @@ import FileManageDialog from "src/components/FileManageDialog.vue";
 import SubtitleDialog from "src/components/SubtitleDialog.vue";
 import CenterControlDialog from "src/components/CenterControlDialog.vue";
 import AdvancedDebugDialog from "src/components/AdvancedDebugDialog.vue";
+import WindowRectEditDialog from "src/components/WindowRectEditDialog.vue";
 
 import GlobalData from "src/common/GlobalData";
 import { Protocol } from "src/entities/WSProtocol";
@@ -218,12 +233,15 @@ export default defineComponent({
     CenterControlDialog,
     SubtitleDialog,
     AdvancedDebugDialog,
+    WindowRectEditDialog,
   },
   setup() {
     const $store = useStore();
     const $q = useQuasar();
     const $t = useI18n();
 
+    const window_rect_edit_dialog: Ref<any> = ref(null);
+
     const plan_running = computed(
       () => $store.state.current_running_plan.trim() != ""
     );
@@ -245,6 +263,7 @@ export default defineComponent({
     return {
       plan_running,
       function_center_control,
+      window_rect_edit_dialog,
 
       toogleFullScreen() {
         if (!$q.fullscreen.isCapable) {
@@ -400,6 +419,36 @@ export default defineComponent({
           timeout: 1500,
         });
       },
+      async editRect() {
+        if (window_rect_edit_dialog.value) {
+          try {
+            const window = $store.state.windows.find(
+              (element) =>
+                element && element.uuid == $store.state.selected_window
+            );
+            if (window) {
+              const result =
+                await window_rect_edit_dialog.value.showDialogAsync(
+                  window.x * $store.state.device_screen_width,
+                  window.y * $store.state.device_screen_height,
+                  window.width * $store.state.device_screen_width,
+                  window.height * $store.state.device_screen_height
+                );
+              if (result) {
+                let { x, y, width, height } = result;
+
+                x /= $store.state.device_screen_width;
+                y /= $store.state.device_screen_height;
+                width /= $store.state.device_screen_width;
+                height /= $store.state.device_screen_height;
+                GlobalData.getInstance()
+                  .getCurrentClient()
+                  ?.setWindowGeometry(window.window_id, x, y, width, height);
+              }
+            }
+          } catch {}
+        }
+      },
     };
   },
 });
diff --git a/src/pages/TopToolBar.vue b/src/pages/TopToolBar.vue
index ce114d9..d312100 100644
--- a/src/pages/TopToolBar.vue
+++ b/src/pages/TopToolBar.vue
@@ -132,6 +132,17 @@
         @click="lowerWindow"
       />
 
+      <q-btn
+        stretch
+        flat
+        stack
+        :disable="plan_running"
+        :icon="/*vertical_align_bottom*/ 'img:new_icon/edit_window_rect.png'"
+        :label="$t('toolbar edit window rect')"
+        class="q-mr-sm"
+        @click="editRect"
+      />
+
       <q-btn
         stretch
         flat
@@ -347,6 +358,7 @@
   <register-dialog ref="register_dialog" />
   <center-control-dialog ref="center_control_dialog" />
   <advanced-debug-dialog ref="advanced_debug_dialog" />
+  <window-rect-edit-dialog ref="window_rect_edit_dialog" />
 </template>
 
 <style scoped>
@@ -381,6 +393,7 @@ import EdgeBlendingDialog from "src/components/EdgeBlendingDialog.vue";
 import RegisterDialog from "src/components/RegisterDialog.vue";
 import CenterControlDialog from "src/components/CenterControlDialog.vue";
 import AdvancedDebugDialog from "src/components/AdvancedDebugDialog.vue";
+import WindowRectEditDialog from "src/components/WindowRectEditDialog.vue";
 
 import EventBus, { EventNamesDefine } from "src/common/EventBus";
 import { Protocol } from "src/entities/WSProtocol";
@@ -414,6 +427,7 @@ export default defineComponent({
     RegisterDialog,
     CenterControlDialog,
     AdvancedDebugDialog,
+    WindowRectEditDialog,
   },
 
   setup() {
@@ -437,6 +451,8 @@ export default defineComponent({
     let server_run_time = 0;
     let server_all_run_time = 0;
 
+    const window_rect_edit_dialog: Ref<any> = ref(null);
+
     const plan_running = computed(
       () => $store.state.current_running_plan.trim() != ""
     );
@@ -540,6 +556,7 @@ export default defineComponent({
       edge_blending_dialog,
       register_dialog,
       function_center_control,
+      window_rect_edit_dialog,
 
       async backupDB() {
         let client = GlobalData.getInstance().getCurrentClient();
@@ -785,6 +802,36 @@ export default defineComponent({
           }
         }
       },
+      async editRect() {
+        if (window_rect_edit_dialog.value) {
+          try {
+            const window = $store.state.windows.find(
+              (element) =>
+                element && element.uuid == $store.state.selected_window
+            );
+            if (window) {
+              const result =
+                await window_rect_edit_dialog.value.showDialogAsync(
+                  window.x * $store.state.device_screen_width,
+                  window.y * $store.state.device_screen_height,
+                  window.width * $store.state.device_screen_width,
+                  window.height * $store.state.device_screen_height
+                );
+              if (result) {
+                let { x, y, width, height } = result;
+
+                x /= $store.state.device_screen_width;
+                y /= $store.state.device_screen_height;
+                width /= $store.state.device_screen_width;
+                height /= $store.state.device_screen_height;
+                GlobalData.getInstance()
+                  .getCurrentClient()
+                  ?.setWindowGeometry(window.window_id, x, y, width, height);
+              }
+            }
+          } catch {}
+        }
+      },
     };
   },
 });