From 491402f7bbe3e780680101658a46e8fc0e953a83 Mon Sep 17 00:00:00 2001 From: taynpg Date: Sat, 7 Jun 2025 10:22:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80theme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 5 + CMakeLists.txt | 3 +- MainWidget.cpp | 17 +- MainWidget.h | 8 +- MainWidget.ui | 545 +++++++++++++++++++++--------------------- main.cpp | 7 +- 6 files changed, 302 insertions(+), 283 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..2dabecf --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "files.associations": { + "qapplication": "cpp" + } +} \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index cc82670..01db85d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,12 +43,13 @@ set(PROJECT_SOURCES src/xml_opr.h src/xml_opr.cpp src/config.h src/config.cpp public_def.cpp public_def.h resource/ico.rc src/attribute_edit.ui src/attribute_edit.h - src/attribute_edit.cpp flatgray.qrc + src/attribute_edit.cpp src/data_edit.h src/data_edit.cpp src/data_edit.ui src/QCustomQLineEdit.h src/QCustomQLineEdit.cpp form/qformatset.h form/qformatset.cpp form/qformatset.ui resource/QtTheme.qrc resource.qrc + #flatgray.qrc ) if (MSVC) diff --git a/MainWidget.cpp b/MainWidget.cpp index 65ab38c..cca0a3b 100644 --- a/MainWidget.cpp +++ b/MainWidget.cpp @@ -2,7 +2,6 @@ #include #include -#include #include #include #include @@ -16,7 +15,7 @@ constexpr std::size_t g_OnePage = 100; namespace fs = std::filesystem; -MainWidget::MainWidget(QWidget* parent) : QWidget(parent), ui(new Ui::MainWidget) +MainWidget::MainWidget(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWidget) { ui->setupUi(this); @@ -140,16 +139,12 @@ MainWidget::MainWidget(QWidget* parent) : QWidget(parent), ui(new Ui::MainWidget restoreGeometry(settings.value("geometry").toByteArray()); settings.endGroup(); - //QFile qss_file("://qss/lightblue.css"); - // QFile qss_file("://qss/flatgray.css"); - // if (qss_file.open(QFile::ReadOnly)) { - // qApp->setStyleSheet(qss_file.readAll()); - // } + // QFile qss_file("://qss/lightblue.css"); + // QFile qss_file("://qss/flatgray.css"); + // if (qss_file.open(QFile::ReadOnly)) { + // qApp->setStyleSheet(qss_file.readAll()); + // } - QFile file(":/QtTheme/theme/Flat/Light/Blue/Pink.qss"); - if (file.open(QFile::ReadOnly)) { - setStyleSheet(file.readAll()); - } init_menu(); // 基本处理 base_init(""); diff --git a/MainWidget.h b/MainWidget.h index a27b4af..692b9c4 100644 --- a/MainWidget.h +++ b/MainWidget.h @@ -2,12 +2,13 @@ #define MAINWIDGET_H #include +#include +#include #include #include #include #include #include -#include #include "conf_setting.h" #include "src/attribute_edit.h" @@ -42,7 +43,7 @@ class MainWidget; QT_END_NAMESPACE using ump_t = std::unordered_map; -class MainWidget : public QWidget +class MainWidget : public QMainWindow { Q_OBJECT @@ -53,8 +54,7 @@ public: public: void set_work_exe(char* path); void generate_table_widget(); - void push_content(const std::vector& eles, std::size_t page = 1, - bool auto_jump_pre = false); + void push_content(const std::vector& eles, std::size_t page = 1, bool auto_jump_pre = false); private: bool read(const QString& file_path); diff --git a/MainWidget.ui b/MainWidget.ui index 9336959..1513e9e 100644 --- a/MainWidget.ui +++ b/MainWidget.ui @@ -1,333 +1,346 @@ MainWidget - + 0 0 - 1139 - 591 + 1171 + 538 - MainWidget + MainWindow - - - - - 1基本信息 - - + + + + + + 1基本信息 + + + + + + 历史 + + + + + + + 选择文件 + + + + + + + 重排版（单独） + + + + + + + + + + + + + 加载 + + + + + + + 备份 + + + + + + + 重排序 + + + + + + + 保存 + + + + + + + + + + 2.操作 + + + + + + Qt::Orientation::Vertical + + + + + + + 所选 + + + + + + + 所有页 + + + + + + + 当前页 + + + + + + + 全局 + + + + + + + + + + 一般替 + + + + + + + 正则替 + + + + + + + + + + Qt::Orientation::Vertical + + + + + + + 区分大小 + + + + + + + + 0 + 0 + + + + + + + + 搜索 + + + + + + + 重置 + + + + + + + + + + 3.数据 + + + + + + + 0 + 0 + + + + + + + + + - + - 历史 + 退出 - + - 选择文件 + 导出 - + - 重排版（单独） + 导入 - + - - - - - - 加载 - - - - - - - 备份 - - - - - - - 重排序 - - - - - - - 保存 - - - - - - - - - - 2.操作 - - - - + - Qt::Orientation::Vertical + Qt::Orientation::Horizontal - + + + 40 + 20 + + + - + - 所选 + 配置设置 - - - 所有页 - - - - - - - 当前页 - - - - - - - 全局 - - - - - - - - - - 一般替 - - - - - - - 正则替 - - - - - - - - + - Qt::Orientation::Vertical + Qt::Orientation::Horizontal - + + + 40 + 20 + + + - - - 区分大小 - - - - - + - + 0 0 - - - - - - 搜索 + + + 50 + 16777215 + - + - 重置 + / - - - - - - - 3.数据 - - - + - + 0 0 + + + 50 + 16777215 + + + + + + + + 页 + + + + + + + 跳转 + + + + + + + 上一页 + + + + + + + 下一页 + - - - - - - - - 退出 - - - - - - - 导出 - - - - - - - 导入 - - - - - - - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - - - - - 配置设置 - - - - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 50 - 16777215 - - - - - - - - / - - - - - - - - 0 - 0 - - - - - 50 - 16777215 - - - - - - - - 页 - - - - - - - 跳转 - - - - - - - 上一页 - - - - - - - 下一页 - - - - - - + + + + + + + 0 + 0 + 1171 + 33 + + + + diff --git a/main.cpp b/main.cpp index 71bf2dc..2da8fda 100644 --- a/main.cpp +++ b/main.cpp @@ -1,6 +1,6 @@ #include #include - +#include #include "MainWidget.h" int main(int argc, char *argv[]) @@ -16,6 +16,11 @@ int main(int argc, char *argv[]) //a.setStyle("windows"); #endif + QFile file(":/QtTheme/theme/Flat/Light/Blue/Pink.qss"); + if (file.open(QFile::ReadOnly)) { + a.setStyleSheet(file.readAll()); + } + #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); #endif