From 31efc0de25539e8cc5b372da5f8bf92c9676876e Mon Sep 17 00:00:00 2001
From: rankun <rankun@bytedance.com>
Date: Sat, 18 Jan 2020 16:19:51 +0800
Subject: [PATCH] feat: change video size to max size

---
 QtScrcpy/dialog.cpp              |  13 +++++++------
 QtScrcpy/dialog.ui               |   4 ++--
 QtScrcpy/res/i18n/QtScrcpy_en.qm | Bin 3112 -> 3104 bytes
 QtScrcpy/res/i18n/QtScrcpy_en.ts |  22 +++++++++++++---------
 QtScrcpy/res/i18n/QtScrcpy_zh.qm | Bin 2483 -> 2479 bytes
 QtScrcpy/res/i18n/QtScrcpy_zh.ts |  22 +++++++++++++---------
 6 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/QtScrcpy/dialog.cpp b/QtScrcpy/dialog.cpp
index eadd467..5469ab7 100644
--- a/QtScrcpy/dialog.cpp
+++ b/QtScrcpy/dialog.cpp
@@ -80,11 +80,12 @@ void Dialog::initUI()
     ui->bitRateBox->addItem("10000000");
     ui->bitRateBox->setCurrentIndex(2);
 
-    ui->videoSizeBox->addItem("480");
-    ui->videoSizeBox->addItem("720");
-    ui->videoSizeBox->addItem("1080");
-    ui->videoSizeBox->addItem("native");
-    ui->videoSizeBox->setCurrentIndex(1);
+    ui->maxSizeBox->addItem("600");
+    ui->maxSizeBox->addItem("800");
+    ui->maxSizeBox->addItem("1000");
+    ui->maxSizeBox->addItem("1200");
+    ui->maxSizeBox->addItem("native");
+    ui->maxSizeBox->setCurrentIndex(2);
 
     ui->formatBox->addItem("mp4");
     ui->formatBox->addItem("mkv");
@@ -147,7 +148,7 @@ void Dialog::on_startServerBtn_clicked()
 
     quint32 bitRate = ui->bitRateBox->currentText().trimmed().toUInt();
     // this is ok that "native" toUshort is 0
-    quint16 videoSize = ui->videoSizeBox->currentText().trimmed().toUShort();
+    quint16 videoSize = ui->maxSizeBox->currentText().trimmed().toUShort();
     Device::DeviceParams params;
     params.serial = ui->serialBox->currentText().trimmed();
     params.maxSize = videoSize;
diff --git a/QtScrcpy/dialog.ui b/QtScrcpy/dialog.ui
index 0f33bc2..1b77309 100644
--- a/QtScrcpy/dialog.ui
+++ b/QtScrcpy/dialog.ui
@@ -299,7 +299,7 @@
       <item row="0" column="6">
        <widget class="QLabel" name="label_4">
         <property name="text">
-         <string>video size:</string>
+         <string>max size:</string>
         </property>
        </widget>
       </item>
@@ -318,7 +318,7 @@
        </widget>
       </item>
       <item row="0" column="7">
-       <widget class="QComboBox" name="videoSizeBox">
+       <widget class="QComboBox" name="maxSizeBox">
         <property name="toolTip">
          <string/>
         </property>
diff --git a/QtScrcpy/res/i18n/QtScrcpy_en.qm b/QtScrcpy/res/i18n/QtScrcpy_en.qm
index b92b58c2242ba0e70f28f190018ccfbbb0c46f03..89b24d126e77f9ddfab71e4c62a84cdf1479a3af 100644
GIT binary patch
delta 347
zcmZ1>u|Q&ibQb$R2DWde3=EvA4D2?c3=Eup3}&K>7#LWWF=S~sF)%P)W+=}+#K6E=
z&d{Uj%)r3-iP7@WIR*x%zYv-uiP2tm0Rsc`E5?AM(-{~T8yI)BOk!YQeag&zRgQsy
z^Ahu6t_2JXTmln&)fwX_Zk4ZJ%)X{~2Ll6#I{P!NM+^*Xy6oRQ;}{q?o^!+*on~NQ
zxWTa@?kNKUyD}&9uMG?gOevfWMyU)8Y?+*i7g!h=SaZ4LR!J~0uo`kzHFGgAu;_3d
zbDhe-z&4*d^1cEC1G5cxy~s-j29^Zw1KKwk7&sPle~>C+U|@U5^Louu1_piRU3}7(
zEes6otN2!57GYrE^5D;0A;rMJ@|b_u<yj02EOYqpc5Y>0U=+z@VBng+xr)(%MNWVr
vmm!g%f<b|ym?4v)iXoMQfq{X6je&uIGdHnf@_7!i&8t}dGi`p#;miyGPkC9L

delta 338
zcmZ1=u|i^kv=;{(1KT%K1_n-D26mfJ1_sVB1~bt`3=FJA3|ZPu3=B+{8On1HF)(n}
zGxTUWGcYiIVr1v?Vqjp`X0&{Cj)8&cFNEgEniwlCxRIIrsvH9Y=Pl;LTniW&xFjaF
zsxzifTq|F{nte_04h9AeefDQsj~EzOf3kn~jALNnc+U}Mbee&I;ReTsxTg#ZZ0|Xl
ze{Eo3U`pY1FiK@$U^C@RyuiZ1z-q}Qw@QM6f#omPG1sXK3~brlk@poC7?^Fi>qTBN
zFtF%wAJD$Zz`(JZ`-4;o0|VPyp4V%RGB7aj;*+*)VPH^a-^922vIqkMR{($J3MmE#
zmi7F*F3)0MV9DUW+qsp2fl(xrfq`rJ<|;-5md*EA|1;@`F_bZ6GNdr1GUPKTFcdRn
lGE_07GFWjiFfcH%F)%Q2mu04;<|`CuR;5~PKFblz3;@H`R+9h#

diff --git a/QtScrcpy/res/i18n/QtScrcpy_en.ts b/QtScrcpy/res/i18n/QtScrcpy_en.ts
index a5820d1..1552df7 100644
--- a/QtScrcpy/res/i18n/QtScrcpy_en.ts
+++ b/QtScrcpy/res/i18n/QtScrcpy_en.ts
@@ -16,22 +16,22 @@
         <translation type="vanished">file transfer failed</translation>
     </message>
     <message>
-        <location filename="../../device/device.cpp" line="101"/>
+        <location filename="../../device/device.cpp" line="108"/>
         <source>install apk</source>
         <translation>install apk</translation>
     </message>
     <message>
-        <location filename="../../device/device.cpp" line="103"/>
+        <location filename="../../device/device.cpp" line="110"/>
         <source>file transfer</source>
         <translation>file transfer</translation>
     </message>
     <message>
-        <location filename="../../device/device.cpp" line="106"/>
+        <location filename="../../device/device.cpp" line="113"/>
         <source>wait current %1 to complete</source>
         <translation>wait current %1 to complete</translation>
     </message>
     <message>
-        <location filename="../../device/device.cpp" line="109"/>
+        <location filename="../../device/device.cpp" line="116"/>
         <source>%1 complete, save in %2</source>
         <translation>%1 complete, save in %2</translation>
     </message>
@@ -41,7 +41,7 @@
         <translation type="vanished">%1 complete\n save in %2</translation>
     </message>
     <message>
-        <location filename="../../device/device.cpp" line="112"/>
+        <location filename="../../device/device.cpp" line="119"/>
         <source>%1 failed</source>
         <translation>%1 failed</translation>
     </message>
@@ -75,7 +75,7 @@
     </message>
     <message>
         <location filename="../../dialog.ui" line="330"/>
-        <location filename="../../dialog.cpp" line="277"/>
+        <location filename="../../dialog.cpp" line="286"/>
         <source>select path</source>
         <translation>select path</translation>
     </message>
@@ -128,6 +128,11 @@
         <source>use reverse</source>
         <translation>use reverse</translation>
     </message>
+    <message>
+        <location filename="../../dialog.ui" line="302"/>
+        <source>max size:</source>
+        <translation>max size</translation>
+    </message>
     <message>
         <location filename="../../dialog.ui" line="309"/>
         <source>close screen</source>
@@ -173,9 +178,8 @@
         <translation>bit rate:</translation>
     </message>
     <message>
-        <location filename="../../dialog.ui" line="302"/>
         <source>video size:</source>
-        <translation>video size:</translation>
+        <translation type="vanished">video size:</translation>
     </message>
     <message>
         <location filename="../../dialog.ui" line="62"/>
@@ -274,7 +278,7 @@
         <translation type="vanished">file transfer failed</translation>
     </message>
     <message>
-        <location filename="../../device/ui/videoform.cpp" line="396"/>
+        <location filename="../../device/ui/videoform.cpp" line="407"/>
         <source>file does not exist</source>
         <translation>file does not exist</translation>
     </message>
diff --git a/QtScrcpy/res/i18n/QtScrcpy_zh.qm b/QtScrcpy/res/i18n/QtScrcpy_zh.qm
index 5b1098de0707245cd5c0a750183f91b58c48418a..0fa54e36c971cce6c1e0204f0d42c051376d133e 100644
GIT binary patch
delta 344
zcmdliyk2;MOr{D0+c#4N26lD^cAHQJ26jCLGtos13@j-OS=vnu3{08~<++C#7}$du
zdNiFG7#K?!Egzj@U|{lv&}<cq_Oc5Y7?{}@1CCB-U|^JD+|@FPfq`W*Gxt?F1_t&8
z%!j!aFfg#6o7k()xO?JO`T9!sHN86+7}z}7pJ_c}U|>1P{@pW<fr0HdN1V}V1_p*D
z92?@EGBB_<b29(hz`($Gfz!b#m4SifJ7?kr76t|uV=lQ>5)2G1tXx&iTnr4%R$Rwi
zr!p|G%5z8FS72aZs^P8|dC9=QoW^}X`z8Ye+e+>aQY8!wtie35*BoVF&}VwUCvDln
zz`**BZ}nvn1_t(D{Fy7H7#NsO^Y6Mmi-Cc88votStqcqdS27tGI7~NJG1@W9aHKOt
rs>fJG|KMO?U|?WlU|`_PO{`ET&a6tc+Ps1#m1%MTJL_gA_Ch8A1JYNn

delta 323
zcmZ24yjggHjHd<z+c#4N26k=+cAHQJ26iI`Gtos13@jE5S=vnu3{08~<++C#7}&!Z
zdNiFG7#K?!*}1$J7+CumEgzj@U|{lv&}=mmW5os2nYpjZF)*+%VLr^YfPsPi(!^GE
z#{Co5%GcMjuj$>vz`*9q{!Hr;0|U!k_V1o?3=C}dIpT~?GcYhL;n)!Ol!1XYoRj(2
z1_lPk3!Dx{sSFG(r#TZZurM&Nuye_+l3-w9zR7jWbt(e`%V+M$`w9#UOf}r~A}<*j
zn60=EXy0UDU|Y-mL8^p-fmNO7^_rs$3``IBq%B(*7}Qxm@vXir!oa}(k3VyT6axeE
zeEwaRXE87^XYt?d+{(bfa3zz0fx~ih6{8*V<|iznOj2B($7W27v5NljUy6f)fq{XI
Wfq{X$EHfoFfATpNvCWq3WlR9<@Kvz@

diff --git a/QtScrcpy/res/i18n/QtScrcpy_zh.ts b/QtScrcpy/res/i18n/QtScrcpy_zh.ts
index 5a4fe1b..f790a38 100644
--- a/QtScrcpy/res/i18n/QtScrcpy_zh.ts
+++ b/QtScrcpy/res/i18n/QtScrcpy_zh.ts
@@ -16,22 +16,22 @@
         <translation type="vanished">文件传输失败</translation>
     </message>
     <message>
-        <location filename="../../device/device.cpp" line="101"/>
+        <location filename="../../device/device.cpp" line="108"/>
         <source>install apk</source>
         <translation>安装apk</translation>
     </message>
     <message>
-        <location filename="../../device/device.cpp" line="103"/>
+        <location filename="../../device/device.cpp" line="110"/>
         <source>file transfer</source>
         <translation>文件传输</translation>
     </message>
     <message>
-        <location filename="../../device/device.cpp" line="106"/>
+        <location filename="../../device/device.cpp" line="113"/>
         <source>wait current %1 to complete</source>
         <translation>等待当前%1完成</translation>
     </message>
     <message>
-        <location filename="../../device/device.cpp" line="109"/>
+        <location filename="../../device/device.cpp" line="116"/>
         <source>%1 complete, save in %2</source>
         <translation>%1完成,保存在%2</translation>
     </message>
@@ -41,7 +41,7 @@
         <translation type="vanished">%1完成\n 保存在 %2</translation>
     </message>
     <message>
-        <location filename="../../device/device.cpp" line="112"/>
+        <location filename="../../device/device.cpp" line="119"/>
         <source>%1 failed</source>
         <translation>%1 失败</translation>
     </message>
@@ -75,7 +75,7 @@
     </message>
     <message>
         <location filename="../../dialog.ui" line="330"/>
-        <location filename="../../dialog.cpp" line="277"/>
+        <location filename="../../dialog.cpp" line="286"/>
         <source>select path</source>
         <translation>选择路径</translation>
     </message>
@@ -128,6 +128,11 @@
         <source>use reverse</source>
         <translation>使用reverse</translation>
     </message>
+    <message>
+        <location filename="../../dialog.ui" line="302"/>
+        <source>max size:</source>
+        <translation>最大尺寸</translation>
+    </message>
     <message>
         <location filename="../../dialog.ui" line="309"/>
         <source>close screen</source>
@@ -173,9 +178,8 @@
         <translation>比特率：</translation>
     </message>
     <message>
-        <location filename="../../dialog.ui" line="302"/>
         <source>video size:</source>
-        <translation>视频尺寸：</translation>
+        <translation type="vanished">视频尺寸：</translation>
     </message>
     <message>
         <location filename="../../dialog.ui" line="62"/>
@@ -274,7 +278,7 @@
         <translation type="vanished">文件传输失败</translation>
     </message>
     <message>
-        <location filename="../../device/ui/videoform.cpp" line="396"/>
+        <location filename="../../device/ui/videoform.cpp" line="407"/>
         <source>file does not exist</source>
         <translation>文件不存在</translation>
     </message>