feat: change video size to max size

This commit is contained in:
rankun 2020-01-18 16:19:51 +08:00
commit 31efc0de25
6 changed files with 35 additions and 26 deletions

View file

@ -80,11 +80,12 @@ void Dialog::initUI()
ui->bitRateBox->addItem("10000000"); ui->bitRateBox->addItem("10000000");
ui->bitRateBox->setCurrentIndex(2); ui->bitRateBox->setCurrentIndex(2);
ui->videoSizeBox->addItem("480"); ui->maxSizeBox->addItem("600");
ui->videoSizeBox->addItem("720"); ui->maxSizeBox->addItem("800");
ui->videoSizeBox->addItem("1080"); ui->maxSizeBox->addItem("1000");
ui->videoSizeBox->addItem("native"); ui->maxSizeBox->addItem("1200");
ui->videoSizeBox->setCurrentIndex(1); ui->maxSizeBox->addItem("native");
ui->maxSizeBox->setCurrentIndex(2);
ui->formatBox->addItem("mp4"); ui->formatBox->addItem("mp4");
ui->formatBox->addItem("mkv"); ui->formatBox->addItem("mkv");
@ -147,7 +148,7 @@ void Dialog::on_startServerBtn_clicked()
quint32 bitRate = ui->bitRateBox->currentText().trimmed().toUInt(); quint32 bitRate = ui->bitRateBox->currentText().trimmed().toUInt();
// this is ok that "native" toUshort is 0 // 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; Device::DeviceParams params;
params.serial = ui->serialBox->currentText().trimmed(); params.serial = ui->serialBox->currentText().trimmed();
params.maxSize = videoSize; params.maxSize = videoSize;

View file

@ -299,7 +299,7 @@
<item row="0" column="6"> <item row="0" column="6">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="text"> <property name="text">
<string>video size:</string> <string>max size:</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -318,7 +318,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="7"> <item row="0" column="7">
<widget class="QComboBox" name="videoSizeBox"> <widget class="QComboBox" name="maxSizeBox">
<property name="toolTip"> <property name="toolTip">
<string/> <string/>
</property> </property>

Binary file not shown.

View file

@ -16,22 +16,22 @@
<translation type="vanished">file transfer failed</translation> <translation type="vanished">file transfer failed</translation>
</message> </message>
<message> <message>
<location filename="../../device/device.cpp" line="101"/> <location filename="../../device/device.cpp" line="108"/>
<source>install apk</source> <source>install apk</source>
<translation>install apk</translation> <translation>install apk</translation>
</message> </message>
<message> <message>
<location filename="../../device/device.cpp" line="103"/> <location filename="../../device/device.cpp" line="110"/>
<source>file transfer</source> <source>file transfer</source>
<translation>file transfer</translation> <translation>file transfer</translation>
</message> </message>
<message> <message>
<location filename="../../device/device.cpp" line="106"/> <location filename="../../device/device.cpp" line="113"/>
<source>wait current %1 to complete</source> <source>wait current %1 to complete</source>
<translation>wait current %1 to complete</translation> <translation>wait current %1 to complete</translation>
</message> </message>
<message> <message>
<location filename="../../device/device.cpp" line="109"/> <location filename="../../device/device.cpp" line="116"/>
<source>%1 complete, save in %2</source> <source>%1 complete, save in %2</source>
<translation>%1 complete, save in %2</translation> <translation>%1 complete, save in %2</translation>
</message> </message>
@ -41,7 +41,7 @@
<translation type="vanished">%1 complete\n save in %2</translation> <translation type="vanished">%1 complete\n save in %2</translation>
</message> </message>
<message> <message>
<location filename="../../device/device.cpp" line="112"/> <location filename="../../device/device.cpp" line="119"/>
<source>%1 failed</source> <source>%1 failed</source>
<translation>%1 failed</translation> <translation>%1 failed</translation>
</message> </message>
@ -75,7 +75,7 @@
</message> </message>
<message> <message>
<location filename="../../dialog.ui" line="330"/> <location filename="../../dialog.ui" line="330"/>
<location filename="../../dialog.cpp" line="277"/> <location filename="../../dialog.cpp" line="286"/>
<source>select path</source> <source>select path</source>
<translation>select path</translation> <translation>select path</translation>
</message> </message>
@ -128,6 +128,11 @@
<source>use reverse</source> <source>use reverse</source>
<translation>use reverse</translation> <translation>use reverse</translation>
</message> </message>
<message>
<location filename="../../dialog.ui" line="302"/>
<source>max size:</source>
<translation>max size</translation>
</message>
<message> <message>
<location filename="../../dialog.ui" line="309"/> <location filename="../../dialog.ui" line="309"/>
<source>close screen</source> <source>close screen</source>
@ -173,9 +178,8 @@
<translation>bit rate:</translation> <translation>bit rate:</translation>
</message> </message>
<message> <message>
<location filename="../../dialog.ui" line="302"/>
<source>video size:</source> <source>video size:</source>
<translation>video size:</translation> <translation type="vanished">video size:</translation>
</message> </message>
<message> <message>
<location filename="../../dialog.ui" line="62"/> <location filename="../../dialog.ui" line="62"/>
@ -274,7 +278,7 @@
<translation type="vanished">file transfer failed</translation> <translation type="vanished">file transfer failed</translation>
</message> </message>
<message> <message>
<location filename="../../device/ui/videoform.cpp" line="396"/> <location filename="../../device/ui/videoform.cpp" line="407"/>
<source>file does not exist</source> <source>file does not exist</source>
<translation>file does not exist</translation> <translation>file does not exist</translation>
</message> </message>

Binary file not shown.

View file

@ -16,22 +16,22 @@
<translation type="vanished"></translation> <translation type="vanished"></translation>
</message> </message>
<message> <message>
<location filename="../../device/device.cpp" line="101"/> <location filename="../../device/device.cpp" line="108"/>
<source>install apk</source> <source>install apk</source>
<translation>apk</translation> <translation>apk</translation>
</message> </message>
<message> <message>
<location filename="../../device/device.cpp" line="103"/> <location filename="../../device/device.cpp" line="110"/>
<source>file transfer</source> <source>file transfer</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../../device/device.cpp" line="106"/> <location filename="../../device/device.cpp" line="113"/>
<source>wait current %1 to complete</source> <source>wait current %1 to complete</source>
<translation>%1</translation> <translation>%1</translation>
</message> </message>
<message> <message>
<location filename="../../device/device.cpp" line="109"/> <location filename="../../device/device.cpp" line="116"/>
<source>%1 complete, save in %2</source> <source>%1 complete, save in %2</source>
<translation>%1,%2</translation> <translation>%1,%2</translation>
</message> </message>
@ -41,7 +41,7 @@
<translation type="vanished">%1\n %2</translation> <translation type="vanished">%1\n %2</translation>
</message> </message>
<message> <message>
<location filename="../../device/device.cpp" line="112"/> <location filename="../../device/device.cpp" line="119"/>
<source>%1 failed</source> <source>%1 failed</source>
<translation>%1 </translation> <translation>%1 </translation>
</message> </message>
@ -75,7 +75,7 @@
</message> </message>
<message> <message>
<location filename="../../dialog.ui" line="330"/> <location filename="../../dialog.ui" line="330"/>
<location filename="../../dialog.cpp" line="277"/> <location filename="../../dialog.cpp" line="286"/>
<source>select path</source> <source>select path</source>
<translation></translation> <translation></translation>
</message> </message>
@ -128,6 +128,11 @@
<source>use reverse</source> <source>use reverse</source>
<translation>使reverse</translation> <translation>使reverse</translation>
</message> </message>
<message>
<location filename="../../dialog.ui" line="302"/>
<source>max size:</source>
<translation></translation>
</message>
<message> <message>
<location filename="../../dialog.ui" line="309"/> <location filename="../../dialog.ui" line="309"/>
<source>close screen</source> <source>close screen</source>
@ -173,9 +178,8 @@
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../../dialog.ui" line="302"/>
<source>video size:</source> <source>video size:</source>
<translation></translation> <translation type="vanished"></translation>
</message> </message>
<message> <message>
<location filename="../../dialog.ui" line="62"/> <location filename="../../dialog.ui" line="62"/>
@ -274,7 +278,7 @@
<translation type="vanished"></translation> <translation type="vanished"></translation>
</message> </message>
<message> <message>
<location filename="../../device/ui/videoform.cpp" line="396"/> <location filename="../../device/ui/videoform.cpp" line="407"/>
<source>file does not exist</source> <source>file does not exist</source>
<translation></translation> <translation></translation>
</message> </message>