From bc2687df7cca8157ec19e895453fee8b226edc35 Mon Sep 17 00:00:00 2001 From: rankun <870709864@qq.com> Date: Sat, 11 May 2024 15:40:11 +0800 Subject: [PATCH 01/12] feat: update core --- QtScrcpy/QtScrcpyCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QtScrcpy/QtScrcpyCore b/QtScrcpy/QtScrcpyCore index 7699431..5f03590 160000 --- a/QtScrcpy/QtScrcpyCore +++ b/QtScrcpy/QtScrcpyCore @@ -1 +1 @@ -Subproject commit 769943161f99dbc7b0c55f7f769e32729ab06693 +Subproject commit 5f0359053fb67f2226fcc87919aee0de17d2079b From 05bfbe6e5c180322d050a56f5a36f70220fe203a Mon Sep 17 00:00:00 2001 From: Barry <870709864@qq.com> Date: Sun, 26 May 2024 16:53:01 +0800 Subject: [PATCH 02/12] docs: update README_zh.md --- README_zh.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_zh.md b/README_zh.md index 536519a..f6706bd 100644 --- a/README_zh.md +++ b/README_zh.md @@ -42,7 +42,7 @@ QtScrcpy 可以通过 USB / 网络连接Android设备，并进行显示和控制 - cpu占用率低：纯C++开发，高性能GPU视频渲染 - 高分辨率：可调节，最大支持安卓终端的原生分辨率 - 完美中文输入：支持闲鱼app，支持三星手机 -- 免费版最多投屏20台，功能无限制(除了自动重新投屏) +- 免费版最多投屏10台，功能无限制(除了自动重新投屏) - 极限投屏使用教程：https://lrbnfell4p.feishu.cn/docx/QRMhd9nImorAGgxVLlmczxSdnYf - 极限投屏qq交流群：822464342 - 极限投屏界面预览： From 8baa406bc6bcf0da66ccdd62e78b7599199d4932 Mon Sep 17 00:00:00 2001 From: Teoh Han Hui Date: Tue, 9 Jul 2024 17:12:45 +0800 Subject: [PATCH 03/12] Fix outdated link to GitHub Actions workflow runs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1561f6e..5e6f7a3 100644 --- a/README.md +++ b/README.md @@ -124,7 +124,7 @@ For users in other distros, you can use the prebuilt archives from Releases: - [`QtScrcpy`][github-download] -or you can get it at [GitHub Actions](https://github.com/UjhhgtgTeams/QtScrcpy/actions/workflows/ubuntu.yml), in branch `dev` and download the latest artifact. +or you can get it at [GitHub Actions](https://github.com/barry-ran/QtScrcpy/actions/workflows/ubuntu.yml), in branch `dev` and download the latest artifact. or you can [build it yourself](#Build) (not recommended, get it in Actions if you can) From 5354ae0173e3418c8d37852bc9b4c3edd9df5439 Mon Sep 17 00:00:00 2001 From: Fanxing Date: Fri, 6 Dec 2024 16:33:15 +0800 Subject: [PATCH 04/12] feat: Option to show/hide the toolbar when connecting a device. (#1042) * Option to show/hide the toolbar when connecting a device. * Modify the code as required. --- QtScrcpy/res/i18n/en_US.qm | Bin 5379 -> 5450 bytes QtScrcpy/res/i18n/en_US.ts | 12 ++- QtScrcpy/res/i18n/zh_CN.qm | Bin 4148 -> 4203 bytes QtScrcpy/res/i18n/zh_CN.ts | 12 ++- QtScrcpy/ui/dialog.cpp | 8 +- QtScrcpy/ui/dialog.ui | 161 +++++++++++++++++++------------------ QtScrcpy/ui/videoform.cpp | 9 ++- QtScrcpy/ui/videoform.h | 6 +- QtScrcpy/util/config.cpp | 5 ++ QtScrcpy/util/config.h | 1 + 10 files changed, 121 insertions(+), 93 deletions(-) diff --git a/QtScrcpy/res/i18n/en_US.qm b/QtScrcpy/res/i18n/en_US.qm index b73a8391d5b1eca645952a8fd37ee22b0bbe96bd..a8f465e077c8cb679a70069fbb3fd75bb027b3d1 100644 GIT binary patch delta 173 zcmZqHI;Ay1j?rMEygB2_iQ#Tcf{GL8%QI$9+#fEO%U1EYi-CdLnQa1}3j>2tz+`ns zea1zT!x{A@?{OwxU}0boFySnX_`<-z^_7cTZz}_XkjUiujQWf(CZA_?7o5$v`mzWE z1N#QP+m4?Y82G delta 121 zcmX@5)vPr^j!|Qxyg6gm#BetzfkzYP%QI?C+#fEe$5!#Ui-CdLnQa1}3j>3Y;AC}1 zea7U;;f(r{^EneQurM(2f8{KV_`<-z^_7cTZz}_X;MK|V8TA=gPCn1*&KbkE`mzWE c1N(-_>P$L}8#ae9{p6qQAk49OiqJMD08^kNwEzGB diff --git a/QtScrcpy/res/i18n/en_US.ts b/QtScrcpy/res/i18n/en_US.ts index 5a5dcdd..793171b 100644 --- a/QtScrcpy/res/i18n/en_US.ts +++ b/QtScrcpy/res/i18n/en_US.ts @@ -135,10 +135,6 @@ Start Config Start Config - - record save path: - record save path: - select path select path @@ -297,5 +293,13 @@ auto update auto update + + show toolbar + show toolbar + + + record save path: + record save path: + diff --git a/QtScrcpy/res/i18n/zh_CN.qm b/QtScrcpy/res/i18n/zh_CN.qm index 3664aea870300d3fd6fc4f466d44c675af434bb2..4794f808002cfb9062ec980163941f9b890bba00 100644 GIT binary patch delta 269 zcmdm@@LFMl9HYTRd2`0}iQ(>yhbPXLXZ$&Ff4HP2TgBrp1_lm$wh4SL3=F*M*d3&W z85p=WPu6EtW8zht9L}hp7{Zx&frWvAhl8^;;tK-<2R9eD-c|+%-Wo2sRT2yg3|AmD zcMX@k{SyWTwsH>G19KJkiT!R24BY-a zPH`a&3|ucKKWEfee8{)@vIqkMYZu>b$4?9l+}HUP9JcFNufq{X6je&uIr#K_O ST%jaCKPM@%XtN}rG!p>F+DTUc delta 251 zcmaE@uti~l9HYiWd2>dKiQ(>yQzp)rXFN4=f4C$UTgBrp1_lm$wh4SL3=F*W><-ex z3=CXbC+jn+G4Xt#9L}hpsLGjmfrWvA`zB{;#1{qz4sI@Py{!xkyuMs=t0Wj07_LBQ z?m8}c`zH(xZ1G$U$M!KWaLaI2HFGgAaK7Nqubaxiz?05>K>H>G19KJkiT!R24BUY{ zPH`a&3|y}#KWEf8+r+o}vIqkMYZt%5<8=%ST&?_>S&tbQxYzJ!u8?A2;PU3LeI3BS zz~0Kg>+&oH1}?Eo1_s_2n?soVx%m0wLj%tH-;IvweIMWQUuyFPo_fa334Gj40FH)5 AZU6uP diff --git a/QtScrcpy/res/i18n/zh_CN.ts b/QtScrcpy/res/i18n/zh_CN.ts index 6a71c1b..4cd66c4 100644 --- a/QtScrcpy/res/i18n/zh_CN.ts +++ b/QtScrcpy/res/i18n/zh_CN.ts @@ -135,10 +135,6 @@ Start Config 启动配置 - - record save path: - 录像保存路径： - select path 选择路径 @@ -297,5 +293,13 @@ auto update 自动刷新 + + show toolbar + 显示工具栏 + + + record save path: + 录像保存路径 + diff --git a/QtScrcpy/ui/dialog.cpp b/QtScrcpy/ui/dialog.cpp index 756837b..dfedcfb 100644 --- a/QtScrcpy/ui/dialog.cpp +++ b/QtScrcpy/ui/dialog.cpp @@ -195,6 +195,7 @@ void Dialog::updateBootConfig(bool toView) ui->stayAwakeCheck->setChecked(config.keepAlive); ui->useSingleModeCheck->setChecked(config.simpleMode); ui->autoUpdatecheckBox->setChecked(config.autoUpdateDevice); + ui->showToolbar->setChecked(config.showToolbar); } else { UserBootConfig config; @@ -213,6 +214,8 @@ void Dialog::updateBootConfig(bool toView) config.keepAlive = ui->stayAwakeCheck->isChecked(); config.simpleMode = ui->useSingleModeCheck->isChecked(); config.autoUpdateDevice = ui->autoUpdatecheckBox->isChecked(); + config.showToolbar = ui->showToolbar->isChecked(); + Config::getInstance().setUserBootConfig(config); } } @@ -447,14 +450,15 @@ void Dialog::onDeviceConnected(bool success, const QString &serial, const QStrin if (!success) { return; } - - auto videoForm = new VideoForm(ui->framelessCheck->isChecked(), Config::getInstance().getSkin()); + auto videoForm = new VideoForm(ui->framelessCheck->isChecked(), Config::getInstance().getSkin(), ui->showToolbar->isChecked()); videoForm->setSerial(serial); qsc::IDeviceManage::getInstance().getDevice(serial)->setUserData(static_cast(videoForm)); qsc::IDeviceManage::getInstance().getDevice(serial)->registerDeviceObserver(videoForm); + videoForm->showFPS(ui->fpsCheck->isChecked()); + if (ui->alwaysTopCheck->isChecked()) { videoForm->staysOnTop(); } diff --git a/QtScrcpy/ui/dialog.ui b/QtScrcpy/ui/dialog.ui index 81860e6..630c0de 100644 --- a/QtScrcpy/ui/dialog.ui +++ b/QtScrcpy/ui/dialog.ui @@ -7,7 +7,7 @@ 0 0 1293 - 454 + 502 @@ -255,7 +255,7 @@ - Qt::ClickFocus + Qt::FocusPolicy::ClickFocus @@ -626,6 +626,80 @@ 0 + + + + + 0 + 0 + + + + show fps + + + + + + + + 0 + 0 + + + + background record + + + false + + + + + + + + 0 + 0 + + + + always on top + + + false + + + + + + + + 0 + 0 + + + + record screen + + + + + + + + 0 + 0 + + + + reverse connection + + + true + + + @@ -652,80 +726,6 @@ - - - - - 0 - 0 - - - - always on top - - - false - - - - - - - - 0 - 0 - - - - background record - - - false - - - - - - - - 0 - 0 - - - - reverse connection - - - true - - - - - - - - 0 - 0 - - - - record screen - - - - - - - - 0 - 0 - - - - show fps - - - @@ -739,6 +739,13 @@ + + + + show toolbar + + + @@ -1146,7 +1153,7 @@ - Qt::Vertical + Qt::Orientation::Vertical diff --git a/QtScrcpy/ui/videoform.cpp b/QtScrcpy/ui/videoform.cpp index bbed173..085c847 100644 --- a/QtScrcpy/ui/videoform.cpp +++ b/QtScrcpy/ui/videoform.cpp @@ -21,13 +21,14 @@ #include "ui_videoform.h" #include "videoform.h" -VideoForm::VideoForm(bool framelessWindow, bool skin, QWidget *parent) : QWidget(parent), ui(new Ui::videoForm), m_skin(skin) +VideoForm::VideoForm(bool framelessWindow, bool skin, bool showToolbar, QWidget *parent) : QWidget(parent), ui(new Ui::videoForm), m_skin(skin) { ui->setupUi(this); initUI(); installShortcut(); updateShowSize(size()); bool vertical = size().height() > size().width(); + this->show_toolbar = showToolbar; if (m_skin) { updateStyleSheet(vertical); } @@ -479,7 +480,7 @@ void VideoForm::switchFullScreen() if (m_skin) { updateStyleSheet(m_frameSize.height() > m_frameSize.width()); } - showToolForm(true); + showToolForm(this->show_toolbar); #ifdef Q_OS_WIN32 ::SetThreadExecutionState(ES_CONTINUOUS); #endif @@ -721,9 +722,9 @@ void VideoForm::paintEvent(QPaintEvent *paint) void VideoForm::showEvent(QShowEvent *event) { Q_UNUSED(event) - if (!isFullScreen()) { + if (!isFullScreen() && this->show_toolbar) { QTimer::singleShot(500, this, [this](){ - showToolForm(); + showToolForm(this->show_toolbar); }); } } diff --git a/QtScrcpy/ui/videoform.h b/QtScrcpy/ui/videoform.h index acda4e6..75b032a 100644 --- a/QtScrcpy/ui/videoform.h +++ b/QtScrcpy/ui/videoform.h @@ -19,7 +19,7 @@ class VideoForm : public QWidget, public qsc::DeviceObserver { Q_OBJECT public: - explicit VideoForm(bool framelessWindow = false, bool skin = true, QWidget *parent = 0); + explicit VideoForm(bool framelessWindow = false, bool skin = true, bool showToolBar = true, QWidget *parent = 0); ~VideoForm(); void staysOnTop(bool top = true); @@ -32,7 +32,6 @@ public: void removeBlackRect(); void showFPS(bool show); void switchFullScreen(); - bool isHost(); private: @@ -85,6 +84,9 @@ private: bool m_skin = true; QPoint m_fullScreenBeforePos; QString m_serial; + + //Whether to display the toolbar when connecting a device. + bool show_toolbar = true; }; #endif // VIDEOFORM_H diff --git a/QtScrcpy/util/config.cpp b/QtScrcpy/util/config.cpp index b75f0f7..5915cf2 100644 --- a/QtScrcpy/util/config.cpp +++ b/QtScrcpy/util/config.cpp @@ -96,6 +96,9 @@ #define COMMON_TRAY_MESSAGE_SHOWN_KEY "TrayMessageShown" #define COMMON_TRAY_MESSAGE_SHOWN_DEF false +#define COMMON_SHOW_TOOLBAR_KEY "showToolbar" +#define COMMON_SHOW_TOOLBAR_DEF true + // device config #define SERIAL_WINDOW_RECT_KEY_X "WindowRectX" #define SERIAL_WINDOW_RECT_KEY_Y "WindowRectY" @@ -163,6 +166,7 @@ void Config::setUserBootConfig(const UserBootConfig &config) m_userData->setValue(COMMON_KEEP_ALIVE_KEY, config.keepAlive); m_userData->setValue(COMMON_SIMPLE_MODE_KEY, config.simpleMode); m_userData->setValue(COMMON_AUTO_UPDATE_DEVICE_KEY, config.autoUpdateDevice); + m_userData->setValue(COMMON_SHOW_TOOLBAR_KEY, config.showToolbar); m_userData->endGroup(); m_userData->sync(); } @@ -186,6 +190,7 @@ UserBootConfig Config::getUserBootConfig() config.keepAlive = m_userData->value(COMMON_KEEP_ALIVE_KEY, COMMON_KEEP_ALIVE_DEF).toBool(); config.simpleMode = m_userData->value(COMMON_SIMPLE_MODE_KEY, COMMON_SIMPLE_MODE_DEF).toBool(); config.autoUpdateDevice = m_userData->value(COMMON_AUTO_UPDATE_DEVICE_KEY, COMMON_AUTO_UPDATE_DEVICE_DEF).toBool(); + config.showToolbar =m_userData->value(COMMON_SHOW_TOOLBAR_KEY,COMMON_SHOW_TOOLBAR_DEF).toBool(); m_userData->endGroup(); return config; } diff --git a/QtScrcpy/util/config.h b/QtScrcpy/util/config.h index 1f55126..6f3c1d9 100644 --- a/QtScrcpy/util/config.h +++ b/QtScrcpy/util/config.h @@ -22,6 +22,7 @@ struct UserBootConfig bool keepAlive = false; bool simpleMode = false; bool autoUpdateDevice = true; + bool showToolbar = true; }; class QSettings; From 1496b767b7e96fc96303ecffef1941f404864679 Mon Sep 17 00:00:00 2001 From: barry <870709867@qq.com> Date: Fri, 6 Dec 2024 22:03:30 +0800 Subject: [PATCH 05/12] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0scrcpy-server?= =?UTF-8?q?=203.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QtScrcpy/QtScrcpyCore | 2 +- config/config.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/QtScrcpy/QtScrcpyCore b/QtScrcpy/QtScrcpyCore index 5f03590..950878c 160000 --- a/QtScrcpy/QtScrcpyCore +++ b/QtScrcpy/QtScrcpyCore @@ -1 +1 @@ -Subproject commit 5f0359053fb67f2226fcc87919aee0de17d2079b +Subproject commit 950878cb7ba6244ec073ba810517e9deef0d7930 diff --git a/config/config.ini b/config/config.ini index 0b8a1f8..adb2bd3 100644 --- a/config/config.ini +++ b/config/config.ini @@ -10,7 +10,7 @@ RenderExpiredFrames=0 # 视频解码方式：-1 自动，0 软解，1 dx硬解，2 opengl硬解 UseDesktopOpenGL=-1 # scrcpy-server的版本号（不要修改） -ServerVersion=2.4 +ServerVersion=3.0.2 # scrcpy-server推送到安卓设备的路径 ServerPath=/data/local/tmp/scrcpy-server.jar # 自定义adb路径，例如D:/android/tools/adb.exe From 9fa4b6672caef07ebcddaa9cc317d5727bc12b78 Mon Sep 17 00:00:00 2001 From: barry <870709867@qq.com> Date: Fri, 6 Dec 2024 22:25:28 +0800 Subject: [PATCH 06/12] =?UTF-8?q?fix:=20=E5=BD=95=E5=88=B6=E6=9C=80?= =?UTF-8?q?=E5=90=8E=E4=B8=80=E5=B8=A7pts=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QtScrcpy/QtScrcpyCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QtScrcpy/QtScrcpyCore b/QtScrcpy/QtScrcpyCore index 950878c..81647c6 160000 --- a/QtScrcpy/QtScrcpyCore +++ b/QtScrcpy/QtScrcpyCore @@ -1 +1 @@ -Subproject commit 950878cb7ba6244ec073ba810517e9deef0d7930 +Subproject commit 81647c6a17f34d9a4344bcf1f048badeac435e54 From d0d6356f37deff57b512622e01dfa1c47ab593cd Mon Sep 17 00:00:00 2001 From: barry <870709867@qq.com> Date: Fri, 6 Dec 2024 23:43:53 +0800 Subject: [PATCH 07/12] =?UTF-8?q?fix:=20=E9=80=82=E9=85=8D3.0.2=E7=9A=84?= =?UTF-8?q?=E9=94=81=E5=AE=9A=E9=87=87=E9=9B=86=E6=96=B9=E5=90=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QtScrcpy/QtScrcpyCore | 2 +- QtScrcpy/ui/dialog.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/QtScrcpy/QtScrcpyCore b/QtScrcpy/QtScrcpyCore index 81647c6..eb8b783 160000 --- a/QtScrcpy/QtScrcpyCore +++ b/QtScrcpy/QtScrcpyCore @@ -1 +1 @@ -Subproject commit 81647c6a17f34d9a4344bcf1f048badeac435e54 +Subproject commit eb8b7837b18d4d2c13276d90884feb7f1c37d7ba diff --git a/QtScrcpy/ui/dialog.cpp b/QtScrcpy/ui/dialog.cpp index dfedcfb..493060c 100644 --- a/QtScrcpy/ui/dialog.cpp +++ b/QtScrcpy/ui/dialog.cpp @@ -311,7 +311,10 @@ void Dialog::on_startServerBtn_clicked() params.useReverse = ui->useReverseCheck->isChecked(); params.display = !ui->notDisplayCheck->isChecked(); params.renderExpiredFrames = Config::getInstance().getRenderExpiredFrames(); - params.lockVideoOrientation = ui->lockOrientationBox->currentIndex() - 1; + if (ui->lockOrientationBox->currentIndex() > 0) { + params.captureOrientationLock = 1; + params.captureOrientation = (ui->lockOrientationBox->currentIndex() - 1) * 90; + } params.stayAwake = ui->stayAwakeCheck->isChecked(); params.recordFile = ui->recordScreenCheck->isChecked(); params.recordPath = ui->recordPathEdt->text().trimmed(); From 7c0b32de9a455ab8c5c27d0c1a3df6087661acfa Mon Sep 17 00:00:00 2001 From: barry <870709867@qq.com> Date: Fri, 6 Dec 2024 23:49:07 +0800 Subject: [PATCH 08/12] feat: add star history --- README.md | 4 ++++ README_zh.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/README.md b/README.md index 5e6f7a3..cbd2bb4 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,10 @@ You can control all your phones at the same time. ![group-control-demo](docs/image/group-control.gif) +## Star History + +[![Star History Chart](https://api.star-history.com/svg?repos=barry-ran/QtScrcpy&type=Date)](https://star-history.com/#barry-ran/QtScrcpy&Date) + ## Thanks QtScrcpy is based on [Genymobile](https://github.com/Genymobile)'s [scrcpy](https://github.com/Genymobile/scrcpy) project. Thanks a lot! diff --git a/README_zh.md b/README_zh.md index f6706bd..2c9f7e2 100644 --- a/README_zh.md +++ b/README_zh.md @@ -69,6 +69,10 @@ QtScrcpy 可以通过 USB / 网络连接Android设备，并进行显示和控制 ## 批量操作 你可以同时控制所有的手机 +## Star历史 + +[![Star History Chart](https://api.star-history.com/svg?repos=barry-ran/QtScrcpy&type=Date)](https://star-history.com/#barry-ran/QtScrcpy&Date) + ![gc](docs/image/group-control.gif) ## 感谢 From 9e613986bf6e48dbee45c6da24b081d9c77b5308 Mon Sep 17 00:00:00 2001 From: barry <870709867@qq.com> Date: Fri, 6 Dec 2024 23:51:41 +0800 Subject: [PATCH 09/12] chore: update upload-artifact v4 --- .github/workflows/macos.yml | 2 +- .github/workflows/ubuntu.yml | 4 ++-- .github/workflows/windows.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 5fb9788..a2fc36c 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -65,7 +65,7 @@ jobs: mv ci/build/QtScrcpy.app ci/build/${{ env.publish_name }}.app mv ci/build/QtScrcpy.dmg ci/build/${{ env.publish_name }}.dmg echo "::set-output name=package-name::${{ env.publish_name }}" - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 with: name: ${{ steps.package.outputs.package-name }}.zip path: ci/build/${{ steps.package.outputs.package-name }}.dmg diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 48a3dc9..3baa43a 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -50,7 +50,7 @@ jobs: run: | ci/linux/build_for_linux.sh "RelWithDebInfo" - name: Upload RelWithDebInfo - uses: actions/upload-artifact@v3.1.0 + uses: actions/upload-artifact@v4 with: name: QtScrcpy-${{ matrix.os }}-${{ matrix.qt-arch-install }}-RelWithDebInfo path: output/x64/RelWithDebInfo/* @@ -60,7 +60,7 @@ jobs: run: | ci/linux/build_for_linux.sh "Release" - name: Upload Release - uses: actions/upload-artifact@v3.1.0 + uses: actions/upload-artifact@v4 with: name: QtScrcpy-${{ matrix.os }}-${{ matrix.qt-arch-install }}-Release path: output/x64/Release/* diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 89c0fa6..4d1b3a3 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -100,7 +100,7 @@ jobs: echo "::set-output name=package-name::${{ env.publish_name }}" # 上传artifacts # https://help.github.com/en/actions/configuring-and-managing-workflows/persisting-workflow-data-using-artifacts - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 with: name: ${{ steps.package.outputs.package-name }}.zip path: ci\build\${{ steps.package.outputs.package-name }} From 43f5747cfeec85fddff2d05fbd27d78aac6991d4 Mon Sep 17 00:00:00 2001 From: barry <870709867@qq.com> Date: Sat, 7 Dec 2024 00:02:18 +0800 Subject: [PATCH 10/12] chore: update ci mac 14 --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index a2fc36c..b6c342a 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -13,7 +13,7 @@ on: jobs: build: name: Build - runs-on: macos-11 + runs-on: macos-14 strategy: matrix: qt-ver: [5.15.2] From a60c2ee906ce094f410c0252097e3c4ae712031b Mon Sep 17 00:00:00 2001 From: barry <870709867@qq.com> Date: Sat, 7 Dec 2024 00:05:37 +0800 Subject: [PATCH 11/12] chore: update ci action --- .github/workflows/macos.yml | 4 ++-- .github/workflows/ubuntu.yml | 4 ++-- .github/workflows/windows.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index b6c342a..aaf52ed 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -26,12 +26,12 @@ jobs: steps: - name: Cache Qt id: cache-qt - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ${{ env.qt-install-path }}/${{ matrix.qt-arch-install }} key: ${{ runner.os }}/${{ matrix.qt-ver }}/${{ matrix.qt-arch-install }} - name: Install Qt - uses: jurplel/install-qt-action@v2.13.0 + uses: jurplel/install-qt-action@v4.1.1 with: version: ${{ matrix.qt-ver }} cached: ${{ steps.cache-qt.outputs.cache-hit }} diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 3baa43a..0dd2b1c 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -27,13 +27,13 @@ jobs: plantform-des: ubuntu steps: - name: Install Qt - uses: jurplel/install-qt-action@v2.13.0 + uses: jurplel/install-qt-action@v4.1.1 with: version: ${{ matrix.qt-ver }} cached: ${{ steps.cache-qt.outputs.cache-hit }} - name: Cache Qt id: cache-qt - uses: actions/cache@v3.0.6 + uses: actions/cache@v4 with: path: ${{ env.qt-install-path }}/${{ matrix.qt-arch-install }} key: ${{ runner.os }}/${{ matrix.qt-ver }}/${{ matrix.qt-arch-install }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 4d1b3a3..1051598 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -47,14 +47,14 @@ jobs: steps: - name: Cache Qt id: cache-qt - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ${{ env.qt-install-path }}/${{ matrix.qt-arch-install }} key: ${{ runner.os }}/${{ matrix.qt-ver }}/${{ matrix.qt-arch }} # 安装Qt - name: Install Qt # 使用外部action。这个action专门用来安装Qt - uses: jurplel/install-qt-action@v2.13.0 + uses: jurplel/install-qt-action@v4.1.1 with: # Version of Qt to install version: ${{ matrix.qt-ver }} From 723b4efb0f5b8ee8f40d0e631bfdfbd8561ea205 Mon Sep 17 00:00:00 2001 From: barry <870709867@qq.com> Date: Sat, 7 Dec 2024 00:24:44 +0800 Subject: [PATCH 12/12] fix: wireles connect btn too big --- QtScrcpy/ui/dialog.ui | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/QtScrcpy/ui/dialog.ui b/QtScrcpy/ui/dialog.ui index 630c0de..e46e06b 100644 --- a/QtScrcpy/ui/dialog.ui +++ b/QtScrcpy/ui/dialog.ui @@ -255,7 +255,7 @@ - Qt::FocusPolicy::ClickFocus + Qt::NoFocus @@ -1147,18 +1147,21 @@ - + 0 0 - Qt::Orientation::Vertical + Qt::Vertical + + + QSizePolicy::Expanding - 20 - 40 + 40 + 20