From 6ce9a4aa71094ee7d9390fe93027bffaf8df0bf0 Mon Sep 17 00:00:00 2001 From: shi_jq Date: Thu, 13 Mar 2025 14:28:39 +0800 Subject: [PATCH] =?UTF-8?q?[ref]=E5=90=8C=E6=AD=A5711?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- product/src/tools/file_sync_tool/FileSync.ico | Bin 4286 -> 4286 bytes .../tools/file_sync_tool/file_sync_tool.pro | 2 +- .../src/tools/file_sync_tool/mainwindow.cpp | 50 +- product/src/tools/file_sync_tool/mainwindow.h | 5 +- .../src/tools/file_sync_tool/mainwindow.ui | 606 +++++++++--------- 5 files changed, 362 insertions(+), 301 deletions(-) diff --git a/product/src/tools/file_sync_tool/FileSync.ico b/product/src/tools/file_sync_tool/FileSync.ico index 3a998bed4b6dc1f1e9fb14b3edb076742e5a7117..f9068343af8dd491baed8308b653f35241375a9e 100644 GIT binary patch literal 4286 zcmeHIAx|7Z6#hsNByH#=B%}$VClDkxcmyOB2t-AHKn0?rq9m1=ExQW>fj}S-ClHYE z0}vG_s~QBmN16%*0#N}80)e=GZ(%O8vu`HA?KL5}yS$y5@4aunH*aQkff4?jO~?}m z4PX+$42=*LXoAZxqHp5mofW|FF|2@7fh<9Hkmkr$hJ)0WxhsMWFw_t4|4EFmtkKz1 z>*SQXG7Qce<3b3(B1|)n)jYw6({;>COWVxo5Ayrn{}_iR;dX>kYHicn)ZM3jIgZfa zcsG=T;rrSUS88wbIw_W%_&=QlZ?hDK4&J-dHec)ec!K9KzOnsC+u(YSn9rpWf1F2n zL;ObZ{h#}nVv)J-)uqpM{@`3~Z9WgS-HEZR`Lvqbn8uN_eP8?DK5B6m*3Q;3XN`M2 zTTAO}9NFtU#e3DKd@qV~A$LOYX__{saj1V?+^q-PZxzvLdqo>pe5Lpma%X9c>Kr58?$rxNjKhDzuJ`f) literal 4286 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 #include -#include #include #include #include @@ -14,14 +14,16 @@ #include #include "treefilterfun.h" #include "treeupdatefun.h" +#include "pub_widget/MessageBox.h" using namespace iot_public; MainWindow::MainWindow(QWidget *parent) : - QMainWindow(parent), + CustomUiMainWindow(parent), ui(new Ui::MainWindow) { ui->setupUi(this); setWindowIcon(QIcon(":/FileSync.ico")); + setWindowTitle(tr("文件同步")); m_updeteToLocalBtn = ui->pushButton_2; m_broadcastToDomainBtn = ui->pushButton_3; @@ -141,6 +143,9 @@ MainWindow::MainWindow(QWidget *parent) : slot_hostCbmCurrentIndexChanged(m_hostCbm->currentIndex()); slot_rootPathBtnClicked(); + + initStyle(); + setTitleWidget(ui->widget_2); } MainWindow::~MainWindow() @@ -240,6 +245,27 @@ void MainWindow::updateViewShow() m_filterEndTimeEdit->setEnabled(isEnable); } +void MainWindow::initStyle() +{ + QString qss = QString(); + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss", + "zh", + "light"); + + QFile qssfile1(QString::fromStdString(strFullPath)); + qssfile1.open(QFile::ReadOnly); + if (qssfile1.isOpen()) + { + qss += QLatin1String(qssfile1.readAll()); + qssfile1.close(); + } + + if (!qss.isEmpty()) + { + setStyleSheet(qss); + } +} + void MainWindow::slot_refeshBtnClicked() { @@ -391,8 +417,8 @@ void MainWindow::slot_broadcastToDomainBtnClicked() return; } - int ret = QMessageBox::question(this, "警告", "再次确定全域同步所选文件,是否同步?"); - if (ret != QMessageBox::Yes) + int ret = N_MessageBox::question(this, "警告", "再次确定全域同步所选文件,是否同步?"); + if (ret != N_MessageBox::Ok) { return; } @@ -535,8 +561,8 @@ void MainWindow::slot_clearTaskAction(bool) return; } - int ret = QMessageBox::question(this, "警告", QString("确定清理全域目录,清理多余文件?目录名[%1]").arg(pathFile)); - if (ret != QMessageBox::Yes) + int ret = N_MessageBox::question(this, "警告", QString("确定清理全域目录,清理多余文件?目录名[%1]").arg(pathFile)); + if (ret != N_MessageBox::Ok) { return; } @@ -590,8 +616,8 @@ void MainWindow::slot_comitModify(bool) return; } - int ret = QMessageBox::question(this, "警告", QString("确定提交修改文件?文件名[%1]").arg(pathFile)); - if (ret != QMessageBox::Yes) + int ret = N_MessageBox::question(this, "警告", QString("确定提交修改文件?文件名[%1]").arg(pathFile)); + if (ret != N_MessageBox::Ok) { return; } @@ -631,8 +657,8 @@ void MainWindow::slot_comitDel(bool) return; } - int ret = QMessageBox::question(this, "警告", QString("确定提交删除文件?文件名[%1]").arg(pathFile)); - if (ret != QMessageBox::Yes) + int ret = N_MessageBox::question(this, "警告", QString("确定提交删除文件?文件名[%1]").arg(pathFile)); + if (ret != N_MessageBox::Ok) { return; } @@ -856,8 +882,8 @@ bool MainWindow::recvExeTaskReuslt() bool MainWindow::removePathFile(const QString& pathFile) { - int ret = QMessageBox::question(this, "警告", QString("是否删除本地文件?")); - if (ret != QMessageBox::Yes) + int ret = N_MessageBox::question(this, "警告", QString("是否删除本地文件?")); + if (ret != N_MessageBox::Ok) { return false; } diff --git a/product/src/tools/file_sync_tool/mainwindow.h b/product/src/tools/file_sync_tool/mainwindow.h index 3bc98d7e..3bd0e105 100644 --- a/product/src/tools/file_sync_tool/mainwindow.h +++ b/product/src/tools/file_sync_tool/mainwindow.h @@ -13,6 +13,7 @@ #include "msgtrans.h" #include "treefilterfun.h" +#include "pub_widget/CustomMainWindow.h" namespace Ui { class MainWindow; @@ -23,7 +24,7 @@ using namespace iot_public; const static int TIME_OUT_DEF = 30; typedef QList QTreeWidgetItemList; -class MainWindow : public QMainWindow +class MainWindow : public CustomUiMainWindow { Q_OBJECT @@ -41,6 +42,8 @@ private: void updateViewShow(); + void initStyle(); + private slots: void slot_refeshBtnClicked(); void slot_rootPathBtnClicked(); diff --git a/product/src/tools/file_sync_tool/mainwindow.ui b/product/src/tools/file_sync_tool/mainwindow.ui index b83c6862..c1a43725 100644 --- a/product/src/tools/file_sync_tool/mainwindow.ui +++ b/product/src/tools/file_sync_tool/mainwindow.ui @@ -14,306 +14,330 @@ 文件同步助手 - - - - - - 0 - 0 - - - - - - - - - 主机节点 - - - - - - - - 0 - 0 - - - - - 150 - 0 - - - - - - - - Qt::Horizontal - - - - 10 - 20 - - - - - - - - + + + - - - - - - - - - - - 其他 - - - - - - - 全部 - - - - - - - Qt::Horizontal - - - - 48 - 20 - - - - - - - - 组态图形 - - - - - - - 报表 - - - - - - - 录波 - - - - - - - 配置 - - - - - - - - - - - - - 按时间过滤 - - - - - - - 开始时间 - - - - - - - yyyy/M/d HH:mm::ss - - - - - - - 结束时间 - - - - - - - - - yyyy/M/d HH:mm::ss - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - 关键字 - - - - - - - - 150 - 0 - - - - - 150 - 16777215 - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100 - 100 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - 根目录 - - - - - - - 刷新 - - - - - - - 上一级 - - - - - - - true - - - - - - - QAbstractItemView::ExtendedSelection - - - - 1 - - - - - - - - - - + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + - - - 24 + + + + 0 + 0 + + + + + + + + 主机节点 + + + + + + + + 0 + 0 + + + + + 150 + 0 + + + + + + + + Qt::Horizontal + + + + 10 + 20 + + + + + + + - - - <<更新到本机 - + + + + + + + + + + 其他 + + + + + + + 全部 + + + + + + + Qt::Horizontal + + + + 48 + 20 + + + + + + + + 组态图形 + + + + + + + 报表 + + + + + + + 录波 + + + + + + + 配置 + + + + + + + + + + + + + 按时间过滤 + + + + + + + 开始时间 + + + + + + + yyyy/M/d HH:mm::ss + + + + + + + 结束时间 + + + + + + + + + yyyy/M/d HH:mm::ss + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + 关键字 + + + + + + + + 150 + 0 + + + + + 150 + 16777215 + + + + + + + + + + + + + + + + + + + + + - - - 全站发布>> + + + + 100 + 100 + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + 根目录 + + + + + + + 刷新 + + + + + + + 上一级 + + + + + + + true + + + + + + + QAbstractItemView::ExtendedSelection + + + + 1 + + + + + - - - 中止任务 - + + + + + + 24 + + + + + + + <<更新到本机 + + + + + + + 全站发布>> + + + + + + + 中止任务 + + + + @@ -323,6 +347,14 @@ + + + WorkFrame + QWidget +

pub_widget/WorkFrame.h
+ 1 + +