Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #389

Merged
merged 25 commits into from
Apr 17, 2021
Merged

Dev #389

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
1d83b97
feat: update speed ratio script
barry-ran Mar 6, 2021
ffa8d50
feat: update install qt script
barry-ran Mar 6, 2021
b84b1ba
feat: update dmgbuild to 1.4.2
barry-ran Mar 6, 2021
9682d4e
fix: run error on win
barry-ran Mar 6, 2021
288694d
feat: update comment
barry-ran Mar 6, 2021
c6c5124
feat: sync scrcpy
barry-ran Mar 6, 2021
99a78c7
feat: shoutcut no repeat
barry-ran Mar 7, 2021
b1316c9
feat: volume allow repeat
barry-ran Mar 7, 2021
cb01b99
fix: set clipboard 16 len bug
barry-ran Mar 7, 2021
d0b5487
feat: add repeat
barry-ran Mar 7, 2021
367665e
feat: update platform-tools to 31.0.0
barry-ran Mar 7, 2021
33ffce2
feat: update speed ratio
barry-ran Mar 7, 2021
8171b5c
feat: update qm
barry-ran Mar 7, 2021
e77ce05
feat: 添加一键连接功能,添加参数保存功能,添加历史设备访问,添加设备命名 (#386)
msnh2012 Apr 11, 2021
3eea2b9
feat: disable single mod default
barry-ran Apr 17, 2021
d505932
fix: magnetic widget adsorb bug
barry-ran Apr 17, 2021
507f4b9
feat: perfect config
barry-ran Apr 17, 2021
836edf0
feat: trans simple mode
barry-ran Apr 17, 2021
3069bc2
chore: find device frome serial box
barry-ran Apr 17, 2021
9be8ec1
feat: add doublic click tip
barry-ran Apr 17, 2021
b479180
fix: nick name show error
barry-ran Apr 17, 2021
124738c
feat: config simple mode
barry-ran Apr 17, 2021
3f0afe7
docs: update readme
barry-ran Apr 17, 2021
e8d2e39
docs: update license
barry-ran Apr 17, 2021
b87dfff
Merge branch 'master' into dev
barry-ran Apr 17, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: update qm
Close #315
barry-ran committed Mar 7, 2021
commit 8171b5c14d3189015fec03316901e71811edf7b2
2 changes: 1 addition & 1 deletion QtScrcpy/main.cpp
Original file line number Diff line number Diff line change
@@ -106,7 +106,7 @@ int main(int argc, char *argv[])

qInfo(
"%s",
QObject::tr("This software is completely open source and free. Strictly used for illegal purposes, or at your own risk. You can download it at the "
QObject::tr("This software is completely open source and free. Use for illegal purposes is strictly prohibited, or at your own risk. You can download it at the "
"following address:")
.toUtf8()
.data());
Binary file modified QtScrcpy/res/i18n/QtScrcpy_en.qm
Binary file not shown.
46 changes: 38 additions & 8 deletions QtScrcpy/res/i18n/QtScrcpy_en.ts
Original file line number Diff line number Diff line change
@@ -16,22 +16,22 @@
<translation type="vanished">file transfer failed</translation>
</message>
<message>
<location filename="../../device/device.cpp" line="181"/>
<location filename="../../device/device.cpp" line="184"/>
<source>install apk</source>
<translation>install apk</translation>
</message>
<message>
<location filename="../../device/device.cpp" line="183"/>
<location filename="../../device/device.cpp" line="186"/>
<source>file transfer</source>
<translation>file transfer</translation>
</message>
<message>
<location filename="../../device/device.cpp" line="187"/>
<location filename="../../device/device.cpp" line="190"/>
<source>wait current %1 to complete</source>
<translation>wait current %1 to complete</translation>
</message>
<message>
<location filename="../../device/device.cpp" line="190"/>
<location filename="../../device/device.cpp" line="193"/>
<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="193"/>
<location filename="../../device/device.cpp" line="196"/>
<source>%1 failed</source>
<translation>%1 failed</translation>
</message>
@@ -228,6 +228,32 @@
<translation>no lock</translation>
</message>
</context>
<context>
<name>InputConvertGame</name>
<message>
<location filename="../../device/controller/inputconvert/inputconvertgame.cpp" line="507"/>
<source>current keymap mode: %1</source>
<translation>current keymap mode: %1</translation>
</message>
<message>
<location filename="../../device/controller/inputconvert/inputconvertgame.cpp" line="507"/>
<source>custom</source>
<translation>custom</translation>
</message>
<message>
<location filename="../../device/controller/inputconvert/inputconvertgame.cpp" line="507"/>
<source>normal</source>
<translation>normal</translation>
</message>
</context>
<context>
<name>KeyMap</name>
<message>
<location filename="../../device/controller/inputconvert/keymap/keymap.cpp" line="307"/>
<source>Script updated, current keymap mode:normal, Press ~ key to switch keymap mode</source>
<translation>Script updated, current keymap mode:normal, Press ~ key to switch keymap mode</translation>
</message>
</context>
<context>
<name>QObject</name>
<message>
@@ -241,9 +267,13 @@ You can download it at the following address:</source>
<translation type="vanished">This software is completely open source and free.\nStrictly used for illegal purposes, or at your own risk.\nYou can download it at the following address:</translation>
</message>
<message>
<location filename="../../main.cpp" line="108"/>
<source>This software is completely open source and free. Strictly used for illegal purposes, or at your own risk. You can download it at the following address:</source>
<translation>This software is completely open source and free. Strictly used for illegal purposes, or at your own risk. You can download it at the following address:</translation>
<translation type="vanished">This software is completely open source and free. Strictly used for illegal purposes, or at your own risk. You can download it at the following address:</translation>
</message>
<message>
<location filename="../../main.cpp" line="109"/>
<source>This software is completely open source and free. Use for illegal purposes is strictly prohibited, or at your own risk. You can download it at the following address:</source>
<translation>This software is completely open source and free. Use for illegal purposes is strictly prohibited, or at your own risk. You can download it at the following address:</translation>
</message>
</context>
<context>
@@ -337,7 +367,7 @@ You can download it at the following address:</source>
<translation type="vanished">file transfer failed</translation>
</message>
<message>
<location filename="../../device/ui/videoform.cpp" line="710"/>
<location filename="../../device/ui/videoform.cpp" line="749"/>
<source>file does not exist</source>
<translation>file does not exist</translation>
</message>
Binary file modified QtScrcpy/res/i18n/QtScrcpy_zh.qm
Binary file not shown.
46 changes: 38 additions & 8 deletions QtScrcpy/res/i18n/QtScrcpy_zh.ts
Original file line number Diff line number Diff line change
@@ -16,22 +16,22 @@
<translation type="vanished">文件传输失败</translation>
</message>
<message>
<location filename="../../device/device.cpp" line="181"/>
<location filename="../../device/device.cpp" line="184"/>
<source>install apk</source>
<translation>安装apk</translation>
</message>
<message>
<location filename="../../device/device.cpp" line="183"/>
<location filename="../../device/device.cpp" line="186"/>
<source>file transfer</source>
<translation>文件传输</translation>
</message>
<message>
<location filename="../../device/device.cpp" line="187"/>
<location filename="../../device/device.cpp" line="190"/>
<source>wait current %1 to complete</source>
<translation>等待当前%1完成</translation>
</message>
<message>
<location filename="../../device/device.cpp" line="190"/>
<location filename="../../device/device.cpp" line="193"/>
<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="193"/>
<location filename="../../device/device.cpp" line="196"/>
<source>%1 failed</source>
<translation>%1 失败</translation>
</message>
@@ -228,6 +228,32 @@
<translation>不锁定</translation>
</message>
</context>
<context>
<name>InputConvertGame</name>
<message>
<location filename="../../device/controller/inputconvert/inputconvertgame.cpp" line="507"/>
<source>current keymap mode: %1</source>
<translation>当前按键映射模式: %1</translation>
</message>
<message>
<location filename="../../device/controller/inputconvert/inputconvertgame.cpp" line="507"/>
<source>custom</source>
<translation>自定义</translation>
</message>
<message>
<location filename="../../device/controller/inputconvert/inputconvertgame.cpp" line="507"/>
<source>normal</source>
<translation>正常</translation>
</message>
</context>
<context>
<name>KeyMap</name>
<message>
<location filename="../../device/controller/inputconvert/keymap/keymap.cpp" line="307"/>
<source>Script updated, current keymap mode:normal, Press ~ key to switch keymap mode</source>
<translation>脚本已更新,当前按键映射模式:正常,按~键切换按键映射模式</translation>
</message>
</context>
<context>
<name>QObject</name>
<message>
@@ -241,9 +267,13 @@ You can download it at the following address:</source>
<translation type="vanished">本软件完全开源免费.\n严禁用于非法用途,否则后果自负.\n你可以在下面地址下载:</translation>
</message>
<message>
<location filename="../../main.cpp" line="108"/>
<source>This software is completely open source and free. Strictly used for illegal purposes, or at your own risk. You can download it at the following address:</source>
<translation>本软件完全开源免费,严禁用于非法用途,否则后果自负,你可以在下面地址下载:</translation>
<translation type="vanished">本软件完全开源免费,严禁用于非法用途,否则后果自负,你可以在下面地址下载:</translation>
</message>
<message>
<location filename="../../main.cpp" line="109"/>
<source>This software is completely open source and free. Use for illegal purposes is strictly prohibited, or at your own risk. You can download it at the following address:</source>
<translation>该软件是完全开源和免费的。 严禁将其用于非法目的,否则后果自负。 您可以从以下地址下载它:</translation>
</message>
</context>
<context>
@@ -337,7 +367,7 @@ You can download it at the following address:</source>
<translation type="vanished">文件传输失败</translation>
</message>
<message>
<location filename="../../device/ui/videoform.cpp" line="710"/>
<location filename="../../device/ui/videoform.cpp" line="749"/>
<source>file does not exist</source>
<translation>文件不存在</translation>
</message>