diff --git a/QtScrcpy/dialog.cpp b/QtScrcpy/dialog.cpp index c9d8be0..ccab826 100644 --- a/QtScrcpy/dialog.cpp +++ b/QtScrcpy/dialog.cpp @@ -221,6 +221,17 @@ void Dialog::outLog(const QString &log, bool newLine) }); } +bool Dialog::filterLog(const QString &log) +{ + if (log.contains("app_proces")) { + return true; + } + if (log.contains("Unable to set geometry")) { + return true; + } + return false; +} + bool Dialog::checkAdbRun() { if (m_adb.isRuning()) { @@ -328,10 +339,3 @@ void Dialog::on_applyScriptBtn_clicked() { m_deviceManage.updateScript(getGameScript(ui->gameBox->currentText())); } - -void Dialog::on_gameCheck_clicked(bool checked) -{ - if (checked) { - on_refreshGameScriptBtn_clicked(); - } -} diff --git a/QtScrcpy/dialog.h b/QtScrcpy/dialog.h index 7f58fa8..31bf7d8 100644 --- a/QtScrcpy/dialog.h +++ b/QtScrcpy/dialog.h @@ -21,6 +21,7 @@ public: ~Dialog(); void outLog(const QString& log, bool newLine = true); + bool filterLog(const QString & log); private slots: void on_updateDevice_clicked(); @@ -51,7 +52,6 @@ private slots: void on_refreshGameScriptBtn_clicked(); void on_applyScriptBtn_clicked(); - void on_gameCheck_clicked(bool checked); private: bool checkAdbRun(); diff --git a/QtScrcpy/dialog.ui b/QtScrcpy/dialog.ui index 98ce0c8..a768349 100644 --- a/QtScrcpy/dialog.ui +++ b/QtScrcpy/dialog.ui @@ -6,119 +6,424 @@ 0 0 - 513 - 495 + 420 + 471 + + + 420 + 0 + + - 600 - 2160 + 420 + 16777215 QtScrcpy - - - + + + - USB line + Start Config - - - - - - - - device serial: - + + + 3 + + + 5 + + + 5 + + + 5 + + + 5 + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + bit rate: + + + + + + + + + + + + + + + + + max size: + + + + + + + + + + + + + + record format: + + + + + + + - - - - get device IP - - - false - + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + record save path: + + + recordPathEdt + + + + + + + true + + + + + + + select path + + + false + + + + - - - - refresh devices - - - false - + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + + + + refresh script + + + + + + + apply + + + + - - - - start server - - - false - - - - - - - stop all server - - - - - - - stop server - - - false - - - - - - - start adbd - - - false - + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + background record + + + false + + + + + + + + 0 + 0 + + + + always on top + + + false + + + + + + + + 0 + 0 + + + + screen-off + + + + + + + + 0 + 0 + + + + reverse connection + + + true + + + + - + + + + USB line + + + + 3 + + + 5 + + + 5 + + + 5 + + + 5 + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + device serial: + + + + + + + + + + start server + + + false + + + + + + + stop server + + + false + + + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + stop all server + + + + + + + refresh devices + + + false + + + + + + + get device IP + + + false + + + + + + + start adbd + + + false + + + + + + + + + + Wireless - - - - - - 0 - 0 - - - - wireless connect - - - false - - - - + + + 3 + + + 5 + + + 5 + + + 5 + + + 5 + + @@ -131,7 +436,7 @@ - + @@ -150,8 +455,20 @@ - + + + + 0 + 0 + + + + + 40 + 16777215 + + @@ -163,10 +480,26 @@ - + + + + + 0 + 0 + + + + wireless connect + + + false + + + + - + 0 0 @@ -182,7 +515,87 @@ - + + + + adb + + + + 3 + + + 5 + + + 5 + + + 5 + + + 5 + + + + + adb command: + + + adbCommandEdt + + + + + + + devices + + + + + + + + 0 + 0 + + + + execute + + + + + + + + 0 + 0 + + + + terminate + + + + + + + + 0 + 0 + + + + clear + + + + + + + @@ -201,225 +614,10 @@ - - - - adb - - - - - - adb command: - - - adbCommandEdt - - - - - - - terminate - - - - - - - execute - - - - - - - devices - - - - - - - clear - - - - - - - - - - Start Config - - - - - - bit rate: - - - - - - - record format: - - - - - - - record save path: - - - recordPathEdt - - - - - - - - - - refresh script - - - - - - - - 0 - 0 - - - - reverse connection - - - true - - - - - - - - 0 - 0 - - - - always on top - - - false - - - - - - - - 0 - 0 - - - - background record - - - false - - - - - - - - 0 - 0 - - - - screen-off - - - - - - - select path - - - false - - - - - - - - - - true - - - - - - - - - - - - - - - - - apply - - - - - - - - - - - - - - max size: - - - - - - - bitRateBox - formatBox - recordPathEdt - selectRecordPathBtn - gameBox - refreshGameScriptBtn - serialBox - startServerBtn - stopServerBtn - stopAllServerBtn - updateDevice - getIPBtn - startAdbdBtn deviceIpEdt devicePortEdt wirelessConnectBtn diff --git a/QtScrcpy/main.cpp b/QtScrcpy/main.cpp index 833b047..2ccb6a6 100644 --- a/QtScrcpy/main.cpp +++ b/QtScrcpy/main.cpp @@ -91,6 +91,7 @@ void installTranslator() { static QTranslator translator; QLocale locale; QLocale::Language language = locale.language(); + //language = QLocale::English; QString languagePath = ":/i18n/"; switch (language) { case QLocale::Chinese: @@ -112,7 +113,7 @@ void myMessageOutput(QtMsgType type, const QMessageLogContext &context, const QS } if (QtDebugMsg < type) { - if (g_mainDlg && g_mainDlg->isVisible() && !msg.contains("app_proces")) { + if (g_mainDlg && g_mainDlg->isVisible() && !g_mainDlg->filterLog(msg)) { g_mainDlg->outLog(msg); } }