From 2de857baeb092345920db829a7304c7a37b78fb5 Mon Sep 17 00:00:00 2001 From: taynpg Date: Mon, 2 Feb 2026 21:46:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=86=85=E5=AE=B9=E6=B8=85?= =?UTF-8?q?=E7=A9=BA=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 1 + Gui/Control/CompareControl.cpp | 22 +++++++++++----------- Gui/Control/LogControl.cpp | 10 ++++++++++ Gui/Control/LogControl.ui | 31 +++++++++++++++++++++++++++++-- 4 files changed, 51 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9c39c1d..1b35681 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,6 +23,7 @@ variables: # 功能新增 - 对照传输支持按照类型传输。 + - 添加日志内容清空按钮。 # 关于预构建包 diff --git a/Gui/Control/CompareControl.cpp b/Gui/Control/CompareControl.cpp index 275fdc2..838180b 100644 --- a/Gui/Control/CompareControl.cpp +++ b/Gui/Control/CompareControl.cpp @@ -45,17 +45,6 @@ void Compare::InitMenu() auto path = item->text(); emit sigTryVisit(false, path); }); - menu_->addAction(tr("添加新行"), this, [this]() { - int cnt = ui->tableWidget->rowCount(); - ui->tableWidget->insertRow(cnt); - auto item1 = new QTableWidgetItem(""); - auto item2 = new QTableWidgetItem(""); - auto item3 = new QTableWidgetItem(""); - ui->tableWidget->setItem(cnt, 0, item1); - ui->tableWidget->setItem(cnt, 1, item2); - ui->tableWidget->setItem(cnt, 2, item3); - }); - menu_->addAction(tr("删除"), this, [this]() { deleteSelectedRows(); }); menu_->addAction(tr("尝试打开本地路径"), this, [this]() { auto selected = ui->tableWidget->selectedItems(); if (selected.size() != 3) { @@ -70,6 +59,17 @@ void Compare::InitMenu() } QDesktopServices::openUrl(QUrl::fromLocalFile(path)); }); + menu_->addAction(tr("添加新行"), this, [this]() { + int cnt = ui->tableWidget->rowCount(); + ui->tableWidget->insertRow(cnt); + auto item1 = new QTableWidgetItem(""); + auto item2 = new QTableWidgetItem(""); + auto item3 = new QTableWidgetItem(""); + ui->tableWidget->setItem(cnt, 0, item1); + ui->tableWidget->setItem(cnt, 1, item2); + ui->tableWidget->setItem(cnt, 2, item3); + }); + menu_->addAction(tr("删除"), this, [this]() { deleteSelectedRows(); }); menu_->addAction(tr("上传"), this, [this]() { TransToRight(false); }); menu_->addAction(tr("下载"), this, [this]() { TransToLeft(false); }); menu_->addSeparator(); diff --git a/Gui/Control/LogControl.cpp b/Gui/Control/LogControl.cpp index 66361a3..da216ce 100644 --- a/Gui/Control/LogControl.cpp +++ b/Gui/Control/LogControl.cpp @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -25,6 +26,15 @@ void LogPrint::InitControl() connect(styleHints_, &QStyleHints::colorSchemeChanged, this, &LogPrint::ColorChange); #endif ui->pedText->setReadOnly(true); + + connect(ui->btnClear, &QPushButton::clicked, [this]() { + QMessageBox::StandardButton reply = QMessageBox::question(this, tr("确认清空"), tr("确定要清空所有内容吗?"), + QMessageBox::Yes | QMessageBox::No, QMessageBox::No); + + if (reply == QMessageBox::Yes) { + ui->pedText->clear(); + } + }); } std::string LogPrint::now_str() diff --git a/Gui/Control/LogControl.ui b/Gui/Control/LogControl.ui index 910a82b..620ce4b 100644 --- a/Gui/Control/LogControl.ui +++ b/Gui/Control/LogControl.ui @@ -6,8 +6,8 @@ 0 0 - 767 - 291 + 831 + 396 @@ -17,6 +17,33 @@ + + + + + + Qt::Orientation::Vertical + + + QSizePolicy::Policy::Maximum + + + + 20 + 4000 + + + + + + + + 清空 + + + + +