From 9b53e7ce0169b88d4bc930160fac5cf2d597536c Mon Sep 17 00:00:00 2001 From: rankun Date: Fri, 31 Jan 2020 21:14:33 +0800 Subject: [PATCH] feat: add record screen checkbox --- QtScrcpy/device/device.cpp | 2 +- QtScrcpy/dialog.cpp | 32 +++++++++---- QtScrcpy/dialog.h | 2 + QtScrcpy/dialog.ui | 71 ++++++++++++++++------------- QtScrcpy/res/i18n/QtScrcpy_en.qm | Bin 3280 -> 3286 bytes QtScrcpy/res/i18n/QtScrcpy_en.ts | 76 ++++++++++++++++--------------- QtScrcpy/res/i18n/QtScrcpy_zh.qm | Bin 2587 -> 2585 bytes QtScrcpy/res/i18n/QtScrcpy_zh.ts | 76 ++++++++++++++++--------------- 8 files changed, 146 insertions(+), 113 deletions(-) diff --git a/QtScrcpy/device/device.cpp b/QtScrcpy/device/device.cpp index 1532438..cebc2f6 100644 --- a/QtScrcpy/device/device.cpp +++ b/QtScrcpy/device/device.cpp @@ -271,7 +271,7 @@ bool Device::saveFrame(const AVFrame* frame) QString absFilePath; QString fileDir(Config::getInstance().getRecordPath()); if (fileDir.isEmpty()) { - qWarning() << "please select record path!!!"; + qWarning() << "please select record save path!!!"; return false; } QDateTime dateTime = QDateTime::currentDateTime(); diff --git a/QtScrcpy/dialog.cpp b/QtScrcpy/dialog.cpp index d947d03..095aa96 100644 --- a/QtScrcpy/dialog.cpp +++ b/QtScrcpy/dialog.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include "dialog.h" #include "ui_dialog.h" @@ -136,14 +137,16 @@ void Dialog::on_startServerBtn_clicked() outLog("start server...", false); QString absFilePath; - QString fileDir(ui->recordPathEdt->text().trimmed()); - if (!fileDir.isEmpty()) { - QDateTime dateTime = QDateTime::currentDateTime(); - QString fileName = dateTime.toString("_yyyyMMdd_hhmmss_zzz"); - QString ext = ui->formatBox->currentText().trimmed(); - fileName = windowTitle() + fileName + "." + ext; - QDir dir(fileDir); - absFilePath = dir.absoluteFilePath(fileName); + if (ui->recordScreenCheck->isChecked()) { + QString fileDir(ui->recordPathEdt->text().trimmed()); + if (!fileDir.isEmpty()) { + QDateTime dateTime = QDateTime::currentDateTime(); + QString fileName = dateTime.toString("_yyyyMMdd_hhmmss_zzz"); + QString ext = ui->formatBox->currentText().trimmed(); + fileName = windowTitle() + fileName + "." + ext; + QDir dir(fileDir); + absFilePath = dir.absoluteFilePath(fileName); + } } quint32 bitRate = ui->bitRateBox->currentText().trimmed().toUInt(); @@ -343,3 +346,16 @@ void Dialog::on_applyScriptBtn_clicked() { m_deviceManage.updateScript(getGameScript(ui->gameBox->currentText())); } + +void Dialog::on_recordScreenCheck_clicked(bool checked) +{ + if (!checked) { + return; + } + + QString fileDir(ui->recordPathEdt->text().trimmed()); + if (fileDir.isEmpty()) { + qWarning() << "please select record save path!!!"; + ui->recordScreenCheck->setChecked(false); + } +} diff --git a/QtScrcpy/dialog.h b/QtScrcpy/dialog.h index 2f036de..d04645e 100644 --- a/QtScrcpy/dialog.h +++ b/QtScrcpy/dialog.h @@ -54,6 +54,8 @@ private slots: void on_applyScriptBtn_clicked(); + void on_recordScreenCheck_clicked(bool checked); + private: bool checkAdbRun(); void initUI(); diff --git a/QtScrcpy/dialog.ui b/QtScrcpy/dialog.ui index a768349..0d4440a 100644 --- a/QtScrcpy/dialog.ui +++ b/QtScrcpy/dialog.ui @@ -195,7 +195,7 @@ - + 0 @@ -208,7 +208,27 @@ 0 - + + + + record screen + + + + + + + + 0 + 0 + + + + screen-off + + + + @@ -224,36 +244,7 @@ - - - - - 0 - 0 - - - - always on top - - - false - - - - - - - - 0 - 0 - - - - screen-off - - - - + @@ -269,6 +260,22 @@ + + + + + 0 + 0 + + + + always on top + + + false + + + diff --git a/QtScrcpy/res/i18n/QtScrcpy_en.qm b/QtScrcpy/res/i18n/QtScrcpy_en.qm index f8fd86bfdaf2232076c0a3c768c1747e6b7f9213..f73b8033ea1af9c87da3872d716401e3e5f5a63d 100644 GIT binary patch delta 438 zcmca0c};SHOnn*y+c#4N2F_jvcAHQJ2F`5^W}=H27}(A+WRzPnFfc7+$kJ|NU|3=ABn813a87#Ns8GX@-;&cMLfz__br5(5J}FEjU5 zIR*x<3g*LH3m6!MM l7*auE3`GnnlOJ%2^YIp?Cg&HWC=@3brKaX>-o+-y1^^|?Y?uH5 delta 450 zcmca6c|mf5Onm|a+c#4N2F`W{cAHQJ2F?u(W}=H27}!oQWRzPnFfc7+$kJ|NU|^oW zP@a2;fr0ZTLyx920|VnHM$1R%7#KK?FxtyGFfg#_GX@-;&cMLfz__br5(5J}J2UrH zIR*xjKd(q&;z`(%3_GXJI0|V0qb_Z!;1_o9ec6aTk3=E9>*?ac%F)(nk zvajjg!N9=L$^K015d#CeKl^vjI0gnzPmVaF(+ms@H#i-PQW+T7yEzjturM&N^>da+ zd|_Z<=HZfCCBab7z!uEqaBLp~1M5kys%9<*29`qZ1KKwk7&uwEPwaPNU|^Htaf%CJ zU|?>xGXMYp diff --git a/QtScrcpy/res/i18n/QtScrcpy_en.ts b/QtScrcpy/res/i18n/QtScrcpy_en.ts index 10a7b53..77a9daa 100644 --- a/QtScrcpy/res/i18n/QtScrcpy_en.ts +++ b/QtScrcpy/res/i18n/QtScrcpy_en.ts @@ -16,22 +16,22 @@ file transfer failed - + install apk install apk - + file transfer file transfer - + wait current %1 to complete wait current %1 to complete - + %1 complete, save in %2 %1 complete, save in %2 @@ -41,7 +41,7 @@ %1 complete\n save in %2 - + %1 failed %1 failed @@ -49,128 +49,132 @@ Dialog - + Wireless Wireless - + wireless connect wireless connect - + wireless disconnect wireless disconnect - + Start Config Start Config - + record save path: record save path: - - + + select path select path - + record format： record format: - + + record screen + record screen + + + stop all server stop all server - + adb command: adb command: - + terminate terminate - + execute execute - + clear clear - + reverse connection reverse connection - auto enable - auto enable + auto enable - + background record background record - + screen-off screen-off - + apply apply - + max size: max size: - + always on top always on top - + refresh script refresh script - + get device IP get device IP - + USB line USB line - + stop server stop server - + start server start server - + device serial: device serial: @@ -179,17 +183,17 @@ Config - + bit rate: bit rate: - + start adbd start adbd - + refresh devices refresh devices @@ -280,7 +284,7 @@ file transfer failed - + file does not exist file does not exist diff --git a/QtScrcpy/res/i18n/QtScrcpy_zh.qm b/QtScrcpy/res/i18n/QtScrcpy_zh.qm index b5d1de87d7e8e6b3f3488372ce884bea844c3a7c..2a1e8848f5d1e72c9dd218c3312990f606430e85 100644 GIT binary patch delta 438 zcmbO&GE-!NOnndo+c#4N26j^hcAHQJ2KE>RGtos146J$#8ReD?42=I6vb38R7?|1^ z%5x7fFt9f=^k_OWFff)dT0T0*z`(YQ(O%Ahfq|KoG2rNQ1_nkc#$7Fw7#LV%nYpjZ zF)*8A{kH9(OS?Fh#LV;B#SM zV13DU{8bAB1A`meiv}kK1_lOp2Wepj1{OAUckQPP42+)aJ$w2X7}%Gyuj$>vz`$0{ z{!Hr;0|V=1_V1o?3=Hg?9C1dc85kIra5@;JGBB_nPc#C|sh29`xUPH`a&3@kQ0b>>$X z7}(G8yk2vZfr05hpR{EQ0|T23-|EXE3=AA0{0fiPF)%P+cAHQJ2KG1xGtos146FtW8ReD?42=I6vb38R7?^f2 zl;<8|U|?@%=+Sg$U|=j^w0v}qfq`uWqrIF10|T=;W5Chr3=E7?jJsMUF)*;kGjm^+ zV_;za!+e-)0Rsbv7E7elEd~b0*{tkoS_}+KcUaqB3o$U%GnBAZJnmv(VCrF;z~{oi z!1|i)_^TEM1_n2_7Y$Af3=9lxZ?>2+FfggHJ4g#NFtBj2yK6sXU|{rQ@7dGGz`(we zeNFEU1_riD_Gem;7#LWmvVZrCV_;zC=7=*o&A`C0gww$&m4SivFlXWg76t~E|D2@} zUlw0|SEygDQhzbWf51gU;rejM7X>JdLk{R)px6 mYBWlv>u`WQ&A`CGomg6uuaKITn3R*cc?t6Y#?4b$TUh|AU2Sv# diff --git a/QtScrcpy/res/i18n/QtScrcpy_zh.ts b/QtScrcpy/res/i18n/QtScrcpy_zh.ts index c79f3af..7f9721d 100644 --- a/QtScrcpy/res/i18n/QtScrcpy_zh.ts +++ b/QtScrcpy/res/i18n/QtScrcpy_zh.ts @@ -16,22 +16,22 @@ 文件传输失败 - + install apk 安装apk - + file transfer 文件传输 - + wait current %1 to complete 等待当前%1完成 - + %1 complete, save in %2 %1完成,保存在%2 @@ -41,7 +41,7 @@ %1完成\n 保存在 %2 - + %1 failed %1 失败 @@ -49,128 +49,132 @@ Dialog - + Wireless 无线 - + wireless connect 无线连接 - + wireless disconnect 无线断开 - + Start Config 启动配置 - + record save path: 录像保存路径： - - + + select path 选择路径 - + record format： 录制格式： - + + record screen + 录制屏幕 + + + stop all server 停止所有服务 - + adb command: adb命令： - + terminate 终止 - + execute 执行 - + clear 清理 - + reverse connection 反向连接 - auto enable - 自动启用脚本 + 自动启用脚本 - + background record 后台录制 - + screen-off 自动息屏 - + apply 应用脚本 - + max size: 最大尺寸： - + always on top 窗口置顶 - + refresh script 刷新脚本 - + get device IP 获取设备IP - + USB line USB线 - + stop server 停止服务 - + start server 启动服务 - + device serial: 设备序列号： @@ -179,17 +183,17 @@ 配置 - + bit rate: 比特率： - + start adbd 启动adbd - + refresh devices 刷新设备列表 @@ -280,7 +284,7 @@ 文件传输失败 - + file does not exist 文件不存在