update GUI and text. Fix translation bug

This commit is contained in:
Tian Zhou 2019-11-17 18:58:11 -05:00
parent 2a4a5c5b59
commit 0ae3486e5c
5 changed files with 241 additions and 221 deletions

View file

@ -26,20 +26,20 @@
<string>USB line</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="3" column="2">
<widget class="QPushButton" name="getIPBtn">
<item row="0" column="1">
<widget class="QComboBox" name="serialBox"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>get device ip</string>
</property>
<property name="autoDefault">
<bool>false</bool>
<string>device serial:</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="stopServerBtn">
<item row="3" column="2">
<widget class="QPushButton" name="getIPBtn">
<property name="text">
<string>stop server</string>
<string>get device IP</string>
</property>
<property name="autoDefault">
<bool>false</bool>
@ -49,33 +49,13 @@
<item row="3" column="1">
<widget class="QPushButton" name="updateDevice">
<property name="text">
<string>update device</string>
<string>refresh devices</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item row="3" column="3">
<widget class="QPushButton" name="startAdbdBtn">
<property name="text">
<string>start adbd</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>device serial:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="serialBox"/>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="startServerBtn">
<property name="text">
@ -93,6 +73,26 @@
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="stopServerBtn">
<property name="text">
<string>stop server</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item row="3" column="3">
<widget class="QPushButton" name="startAdbdBtn">
<property name="text">
<string>start adbd</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
@ -111,7 +111,7 @@
</sizepolicy>
</property>
<property name="text">
<string>connect</string>
<string>wireless connect</string>
</property>
<property name="autoDefault">
<bool>false</bool>
@ -172,7 +172,7 @@
</sizepolicy>
</property>
<property name="text">
<string>disconnect</string>
<string>wireless disconnect</string>
</property>
<property name="autoDefault">
<bool>false</bool>
@ -254,23 +254,10 @@
<string>Start Config</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="3" colspan="2">
<widget class="QComboBox" name="bitRateBox">
<property name="toolTip">
<string/>
</property>
<property name="currentText">
<string/>
</property>
</widget>
</item>
<item row="1" column="10" colspan="2">
<widget class="QPushButton" name="selectRecordPathBtn">
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_3">
<property name="text">
<string>select path</string>
</property>
<property name="autoDefault">
<bool>false</bool>
<string>bit rate:</string>
</property>
</widget>
</item>
@ -281,20 +268,6 @@
</property>
</widget>
</item>
<item row="3" column="10" colspan="2">
<widget class="QCheckBox" name="gameCheck">
<property name="text">
<string>custom map</string>
</property>
</widget>
</item>
<item row="0" column="8">
<widget class="QComboBox" name="videoSizeBox">
<property name="toolTip">
<string/>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QLabel" name="label_5">
<property name="text">
@ -308,13 +281,6 @@
<item row="0" column="11">
<widget class="QComboBox" name="formatBox"/>
</item>
<item row="3" column="8" colspan="2">
<widget class="QPushButton" name="applyScriptBtn">
<property name="text">
<string>apply</string>
</property>
</widget>
</item>
<item row="3" column="6" colspan="2">
<widget class="QPushButton" name="refreshGameScriptBtn">
<property name="text">
@ -338,56 +304,10 @@
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_3">
<item row="3" column="10" colspan="2">
<widget class="QCheckBox" name="gameCheck">
<property name="text">
<string>bit rate:</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="notDisplayCheck">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>background</string>
</property>
<property name="checkable">
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="3" colspan="7">
<widget class="QLineEdit" name="recordPathEdt">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="0" colspan="6">
<widget class="QComboBox" name="gameBox"/>
</item>
<item row="0" column="6" colspan="2">
<widget class="QLabel" name="label_4">
<property name="text">
<string>video size:</string>
</property>
</widget>
</item>
<item row="2" column="6" colspan="3">
<widget class="QCheckBox" name="closeScreenCheck">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>auto screen-off</string>
<string>custom map</string>
</property>
</widget>
</item>
@ -407,6 +327,86 @@
</property>
</widget>
</item>
<item row="2" column="0" colspan="3">
<widget class="QCheckBox" name="notDisplayCheck">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>background record</string>
</property>
<property name="checkable">
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="6" colspan="3">
<widget class="QCheckBox" name="closeScreenCheck">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>screen-off</string>
</property>
</widget>
</item>
<item row="1" column="10" colspan="2">
<widget class="QPushButton" name="selectRecordPathBtn">
<property name="text">
<string>select path</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item row="3" column="0" colspan="6">
<widget class="QComboBox" name="gameBox"/>
</item>
<item row="1" column="3" colspan="7">
<widget class="QLineEdit" name="recordPathEdt">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="2" colspan="2">
<widget class="QComboBox" name="bitRateBox">
<property name="toolTip">
<string/>
</property>
<property name="currentText">
<string/>
</property>
</widget>
</item>
<item row="3" column="8" colspan="2">
<widget class="QPushButton" name="applyScriptBtn">
<property name="text">
<string>apply</string>
</property>
</widget>
</item>
<item row="0" column="7" colspan="2">
<widget class="QComboBox" name="videoSizeBox">
<property name="toolTip">
<string/>
</property>
</widget>
</item>
<item row="0" column="4" colspan="3">
<widget class="QLabel" name="label_4">
<property name="text">
<string>video size:</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>

Binary file not shown.

View file

@ -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="115"/>
<source>install apk</source>
<translation>install apk</translation>
</message>
<message>
<location filename="../../device/device.cpp" line="103"/>
<location filename="../../device/device.cpp" line="117"/>
<source>file transfer</source>
<translation>file transfer</translation>
</message>
<message>
<location filename="../../device/device.cpp" line="106"/>
<location filename="../../device/device.cpp" line="120"/>
<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="123"/>
<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="126"/>
<source>%1 failed</source>
<translation>%1 failed</translation>
</message>
@ -54,92 +54,102 @@
<translation>Wireless</translation>
</message>
<message>
<location filename="../../dialog.ui" line="147"/>
<location filename="../../dialog.ui" line="114"/>
<source>wireless connect</source>
<translation>wireless connect</translation>
</message>
<message>
<location filename="../../dialog.ui" line="157"/>
<location filename="../../dialog.ui" line="175"/>
<source>wireless disconnect</source>
<translation>wireless disconnect</translation>
</message>
<message>
<location filename="../../dialog.ui" line="236"/>
<location filename="../../dialog.ui" line="254"/>
<source>Start Config</source>
<translation>Start Config</translation>
</message>
<message>
<location filename="../../dialog.ui" line="292"/>
<location filename="../../dialog.ui" line="274"/>
<source>record save path:</source>
<translation>record save path:</translation>
</message>
<message>
<location filename="../../dialog.ui" line="330"/>
<location filename="../../dialog.cpp" line="277"/>
<location filename="../../dialog.ui" line="362"/>
<location filename="../../dialog.cpp" line="280"/>
<source>select path</source>
<translation>select path</translation>
</message>
<message>
<location filename="../../dialog.ui" line="340"/>
<location filename="../../dialog.ui" line="267"/>
<source>record format</source>
<translation>record format:</translation>
</message>
<message>
<source>Game for Peace</source>
<translation type="vanished">Game for Peace</translation>
<source>PUBG mobile</source>
<translation type="vanished">PUBG mobile</translation>
</message>
<message>
<location filename="../../dialog.ui" line="249"/>
<source>background</source>
<translation>background</translation>
</message>
<message>
<location filename="../../dialog.ui" line="92"/>
<location filename="../../dialog.ui" line="72"/>
<source>stop all server</source>
<translation>stop all server</translation>
</message>
<message>
<location filename="../../dialog.ui" line="195"/>
<location filename="../../dialog.ui" line="213"/>
<source>adb command:</source>
<translation>adb command:</translation>
</message>
<message>
<location filename="../../dialog.ui" line="205"/>
<location filename="../../dialog.ui" line="223"/>
<source>terminate</source>
<translation>terminate</translation>
</message>
<message>
<location filename="../../dialog.ui" line="212"/>
<location filename="../../dialog.ui" line="230"/>
<source>execute</source>
<translation>execute</translation>
</message>
<message>
<location filename="../../dialog.ui" line="226"/>
<location filename="../../dialog.ui" line="244"/>
<source>clear</source>
<translation>clear</translation>
</message>
<message>
<location filename="../../dialog.ui" line="269"/>
<location filename="../../dialog.ui" line="339"/>
<source>background record</source>
<translation>background record</translation>
</message>
<message>
<location filename="../../dialog.ui" line="392"/>
<source>apply</source>
<translation>apply</translation>
</message>
<message>
<location filename="../../dialog.ui" line="300"/>
<source>reverse connection</source>
<translation>reverse connection</translation>
</message>
<message>
<location filename="../../dialog.ui" line="42"/>
<source>get device IP</source>
<translation>get device IP</translation>
</message>
<message>
<location filename="../../dialog.ui" line="355"/>
<source>screen-off</source>
<translation>turn screen off</translation>
</message>
<message>
<location filename="../../dialog.ui" line="323"/>
<source>always on top</source>
<translation>always on top</translation>
</message>
<message>
<location filename="../../dialog.ui" line="279"/>
<source>use reverse</source>
<translation>use reverse</translation>
</message>
<message>
<location filename="../../dialog.ui" line="309"/>
<source>close screen</source>
<translation>close screen</translation>
</message>
<message>
<location filename="../../dialog.ui" line="363"/>
<location filename="../../dialog.ui" line="287"/>
<source>refresh script</source>
<translation>refresh script</translation>
</message>
<message>
<location filename="../../dialog.ui" line="370"/>
<location filename="../../dialog.ui" line="310"/>
<source>custom map</source>
<translation>custom map</translation>
</message>
@ -149,17 +159,17 @@
<translation>USB line</translation>
</message>
<message>
<location filename="../../dialog.ui" line="42"/>
<location filename="../../dialog.ui" line="79"/>
<source>stop server</source>
<translation>stop server</translation>
</message>
<message>
<location filename="../../dialog.ui" line="82"/>
<location filename="../../dialog.ui" line="62"/>
<source>start server</source>
<translation>start server</translation>
</message>
<message>
<location filename="../../dialog.ui" line="72"/>
<location filename="../../dialog.ui" line="35"/>
<source>device serial:</source>
<translation>device serial:</translation>
</message>
@ -168,29 +178,24 @@
<translation type="vanished">Config</translation>
</message>
<message>
<location filename="../../dialog.ui" line="242"/>
<location filename="../../dialog.ui" line="260"/>
<source>bit rate:</source>
<translation>bit rate:</translation>
</message>
<message>
<location filename="../../dialog.ui" line="302"/>
<location filename="../../dialog.ui" line="406"/>
<source>video size:</source>
<translation>video size:</translation>
</message>
<message>
<location filename="../../dialog.ui" line="62"/>
<location filename="../../dialog.ui" line="89"/>
<source>start adbd</source>
<translation>start adbd</translation>
</message>
<message>
<location filename="../../dialog.ui" line="32"/>
<source>get device ip</source>
<translation>get device ip</translation>
</message>
<message>
<location filename="../../dialog.ui" line="52"/>
<source>update device</source>
<translation>update device</translation>
<source>refresh devices</source>
<translation>refresh devices</translation>
</message>
</context>
<context>
@ -258,6 +263,11 @@
<source>return</source>
<translation>return</translation>
</message>
<message>
<location filename="../../device/ui/toolform.ui" line="139"/>
<source>screen shot</source>
<translation>screen shot</translation>
</message>
</context>
<context>
<name>VideoForm</name>
@ -274,7 +284,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>

Binary file not shown.

View file

@ -16,22 +16,22 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../../device/device.cpp" line="101"/>
<location filename="../../device/device.cpp" line="115"/>
<source>install apk</source>
<translation>apk</translation>
</message>
<message>
<location filename="../../device/device.cpp" line="103"/>
<location filename="../../device/device.cpp" line="117"/>
<source>file transfer</source>
<translation></translation>
</message>
<message>
<location filename="../../device/device.cpp" line="106"/>
<location filename="../../device/device.cpp" line="120"/>
<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="123"/>
<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="126"/>
<source>%1 failed</source>
<translation>%1 </translation>
</message>
@ -54,92 +54,102 @@
<translation>线</translation>
</message>
<message>
<location filename="../../dialog.ui" line="147"/>
<location filename="../../dialog.ui" line="114"/>
<source>wireless connect</source>
<translation>线</translation>
<translation>wireless connect</translation>
</message>
<message>
<location filename="../../dialog.ui" line="157"/>
<location filename="../../dialog.ui" line="175"/>
<source>wireless disconnect</source>
<translation>线</translation>
<translation>wireless disconnect</translation>
</message>
<message>
<location filename="../../dialog.ui" line="236"/>
<location filename="../../dialog.ui" line="254"/>
<source>Start Config</source>
<translation></translation>
</message>
<message>
<location filename="../../dialog.ui" line="292"/>
<location filename="../../dialog.ui" line="274"/>
<source>record save path:</source>
<translation></translation>
</message>
<message>
<location filename="../../dialog.ui" line="330"/>
<location filename="../../dialog.cpp" line="277"/>
<location filename="../../dialog.ui" line="362"/>
<location filename="../../dialog.cpp" line="280"/>
<source>select path</source>
<translation></translation>
</message>
<message>
<location filename="../../dialog.ui" line="340"/>
<location filename="../../dialog.ui" line="267"/>
<source>record format</source>
<translation></translation>
</message>
<message>
<source>Game for Peace</source>
<source>PUBG mobile</source>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../../dialog.ui" line="249"/>
<source>background</source>
<translation></translation>
</message>
<message>
<location filename="../../dialog.ui" line="92"/>
<location filename="../../dialog.ui" line="72"/>
<source>stop all server</source>
<translation></translation>
</message>
<message>
<location filename="../../dialog.ui" line="195"/>
<location filename="../../dialog.ui" line="213"/>
<source>adb command:</source>
<translation>adb命令</translation>
<translation>adb命令</translation>
</message>
<message>
<location filename="../../dialog.ui" line="205"/>
<location filename="../../dialog.ui" line="223"/>
<source>terminate</source>
<translation></translation>
</message>
<message>
<location filename="../../dialog.ui" line="212"/>
<location filename="../../dialog.ui" line="230"/>
<source>execute</source>
<translation></translation>
</message>
<message>
<location filename="../../dialog.ui" line="226"/>
<location filename="../../dialog.ui" line="244"/>
<source>clear</source>
<translation></translation>
</message>
<message>
<location filename="../../dialog.ui" line="269"/>
<location filename="../../dialog.ui" line="339"/>
<source>background record</source>
<translation></translation>
</message>
<message>
<location filename="../../dialog.ui" line="392"/>
<source>apply</source>
<translation></translation>
</message>
<message>
<location filename="../../dialog.ui" line="300"/>
<source>reverse connection</source>
<translation></translation>
</message>
<message>
<location filename="../../dialog.ui" line="42"/>
<source>get device IP</source>
<translation>IP</translation>
</message>
<message>
<location filename="../../dialog.ui" line="355"/>
<source>screen-off</source>
<translation></translation>
</message>
<message>
<location filename="../../dialog.ui" line="323"/>
<source>always on top</source>
<translation></translation>
</message>
<message>
<location filename="../../dialog.ui" line="279"/>
<source>use reverse</source>
<translation>使reverse</translation>
</message>
<message>
<location filename="../../dialog.ui" line="309"/>
<source>auto screen-off</source>
<translation></translation>
</message>
<message>
<location filename="../../dialog.ui" line="363"/>
<location filename="../../dialog.ui" line="287"/>
<source>refresh script</source>
<translation></translation>
</message>
<message>
<location filename="../../dialog.ui" line="370"/>
<location filename="../../dialog.ui" line="310"/>
<source>custom map</source>
<translation></translation>
</message>
@ -149,17 +159,17 @@
<translation>USB线</translation>
</message>
<message>
<location filename="../../dialog.ui" line="42"/>
<location filename="../../dialog.ui" line="79"/>
<source>stop server</source>
<translation></translation>
</message>
<message>
<location filename="../../dialog.ui" line="82"/>
<location filename="../../dialog.ui" line="62"/>
<source>start server</source>
<translation></translation>
</message>
<message>
<location filename="../../dialog.ui" line="72"/>
<location filename="../../dialog.ui" line="35"/>
<source>device serial:</source>
<translation></translation>
</message>
@ -168,28 +178,23 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../../dialog.ui" line="242"/>
<location filename="../../dialog.ui" line="260"/>
<source>bit rate:</source>
<translation></translation>
</message>
<message>
<location filename="../../dialog.ui" line="302"/>
<location filename="../../dialog.ui" line="406"/>
<source>video size:</source>
<translation></translation>
</message>
<message>
<location filename="../../dialog.ui" line="62"/>
<location filename="../../dialog.ui" line="89"/>
<source>start adbd</source>
<translation>adbd</translation>
</message>
<message>
<location filename="../../dialog.ui" line="32"/>
<source>get device ip</source>
<translation>IP</translation>
</message>
<message>
<location filename="../../dialog.ui" line="52"/>
<source>update device</source>
<source>refresh devices</source>
<translation></translation>
</message>
</context>
@ -258,6 +263,11 @@
<source>return</source>
<translation></translation>
</message>
<message>
<location filename="../../device/ui/toolform.ui" line="139"/>
<source>screen shot</source>
<translation></translation>
</message>
</context>
<context>
<name>VideoForm</name>
@ -274,7 +284,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>