gaozheng
/
geopro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor/pure-qt-ui #3

Merged
gaozheng merged 56 commits from refactor/pure-qt-ui into main 2026-06-10 18:41:53 +08:00
Conversation 0 Commits 56 Files Changed 31 +40 -18
3 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 107fed8182 - Show all commits

26
src/app/TopBar.cpp
View File

@ -138,6 +138,9 @@ TopBar::TopBar(QWidget* parent) : QWidget(parent) {
"#appToolBar { background:#FFFFFF; border-bottom:1px solid #E1E6EE; }"
"#topDivider { color:#E1E6EE; }"
"QToolButton::menu-indicator { image:none; }"
"#wsSwitcher { color:#1F2A3D; border:none; border-radius:8px; padding:8px 12px;"
" font-size:%6px; font-weight:%4; }"
"#wsSwitcher:hover { background:#EEF3FB; }"
"#avatar { background:#2D6CB5; color:white; border-radius:17px; font-weight:%2;"
" font-size:%1px; }"
"#userName { color:#1F2A3D; font-size:%3px; font-weight:%4; }"
@ -146,14 +149,15 @@ TopBar::TopBar(QWidget* parent) : QWidget(parent) {
.arg(type::kWeightBold)
.arg(type::kLabel)
.arg(type::kWeightSemibold)
.arg(type::kCaption));
.arg(type::kCaption)
.arg(type::kTitle));
auto* lay = new QHBoxLayout(this);
lay->setContentsMargins(14, 0, 14, 0);
lay->setSpacing(0);
// 工作空间切换器（Fluent ElaToolButton；数据驱动，初始占位文本待 setWorkspaces 填充）。
wsBtn_ = new ElaToolButton(this);
// 工作空间切换器（QToolButton + 主题化 QSS；下拉箭头用文字"▾"保证清晰；数据驱动）。
wsBtn_ = new QToolButton(this);
wsBtn_->setObjectName(QStringLiteral("wsSwitcher"));
setThemedGlyph(wsBtn_, Glyph::Workspace, kWorkspaceIcon); // 中性主题色(蓝只留给选中/激活)
wsBtn_->setIconSize(QSize(kWorkspaceIcon, kWorkspaceIcon));
@ -168,8 +172,8 @@ TopBar::TopBar(QWidget* parent) : QWidget(parent) {
lay->addWidget(makeDivider(this));
lay->addSpacing(10);
// 项目切换器（Fluent ElaToolButton；数据驱动）。
projBtn_ = new ElaToolButton(this);
// 项目切换器（QToolButton + 主题化 QSS；数据驱动）。
projBtn_ = new QToolButton(this);
projBtn_->setObjectName(QStringLiteral("wsSwitcher"));
setThemedGlyph(projBtn_, Glyph::Folder, kWorkspaceIcon); // 中性主题色
projBtn_->setIconSize(QSize(kWorkspaceIcon, kWorkspaceIcon));
@ -233,7 +237,7 @@ void TopBar::setWorkspaces(const std::vector<data::Workspace>& list, const QStri
group->addAction(a);
if (id == currentId) currentName = name;
QObject::connect(a, &QAction::triggered, this, [this, id, name]() {
wsBtn_->setText(name); // 立即反馈（下拉箭头由 ElaToolButton 自绘）
wsBtn_->setText(name + QStringLiteral(" ▾")); // 立即反馈
emit workspaceSwitchRequested(id);
});
}
@ -242,7 +246,8 @@ void TopBar::setWorkspaces(const std::vector<data::Workspace>& list, const QStri
none->setEnabled(false);
}
wsBtn_->setMenu(menu);
wsBtn_->setText(currentName.isEmpty() ? QStringLiteral("选择空间") : currentName);
wsBtn_->setText((currentName.isEmpty() ? QStringLiteral("选择空间") : currentName) +
QStringLiteral(" ▾"));
}
void TopBar::setProjects(const std::vector<data::ProjectSummary>& list, const QString& currentId,
@ -263,7 +268,7 @@ void TopBar::setProjects(const std::vector<data::ProjectSummary>& list, const QS
group->addAction(a);
if (id == currentId) currentName = name;
QObject::connect(a, &QAction::triggered, this, [this, id, name]() {
projBtn_->setText(name);
projBtn_->setText(name + QStringLiteral(" ▾"));
emit projectSwitchRequested(id);
});
}
@ -277,11 +282,12 @@ void TopBar::setProjects(const std::vector<data::ProjectSummary>& list, const QS
QObject::connect(all, &QAction::triggered, this, [this]() { emit allProjectsRequested(); });
}
projBtn_->setMenu(menu);
projBtn_->setText(currentName.isEmpty() ? QStringLiteral("选择项目") : currentName);
projBtn_->setText((currentName.isEmpty() ? QStringLiteral("选择项目") : currentName) +
QStringLiteral(" ▾"));
}
void TopBar::setProjectButtonText(const QString& name) {
projBtn_->setText(name);
projBtn_->setText(name + QStringLiteral(" ▾"));
}
} // namespace geopro::app

6
src/app/TopBar.hpp
View File

@ -3,7 +3,7 @@
#include <vector>
#include "repo/RepoTypes.hpp"
class ElaToolButton;
class QToolButton;
namespace geopro::app {
@ -28,8 +28,8 @@ signals:
void logoutRequested(); // 头像菜单「退出登录」
private:
ElaToolButton* wsBtn_ = nullptr;
ElaToolButton* projBtn_ = nullptr;
QToolButton* wsBtn_ = nullptr;
QToolButton* projBtn_ = nullptr;
};
} // namespace geopro::app

26
src/app/main.cpp
View File

@ -39,6 +39,7 @@
#include <QModelIndex>
#include <QStandardItem>
#include <QStandardItemModel>
#include <QToolButton>
#include <QKeySequence>
#include <QProcess>
#include <QSettings>
@ -327,17 +328,29 @@ void buildWorkbench(QMainWindow& window, geopro::data::LocalSampleRepository& re
centerLayout->setContentsMargins(0, 0, 0, 0);
centerLayout->setSpacing(0);
// 工具条：「二维地图/三维视图」两个互斥可勾选按钮(Fluent ElaToolButton)。默认二维地图。
// 分段工具条按钮样式（QToolButton + 主题化 QSS）：选中=强调色文字 + 强调色下划线，明暗都清晰。
// ElaToolButton 选中只画极淡 BasicHover、且不可经 QSS 改，故这类需清晰选中态的用 QToolButton。
const QString kBarBtnQss =
QStringLiteral(
"QToolButton{ border:none; border-radius:6px; padding:6px 12px; color:#1F2A3D;"
" font-size:%1px; }"
"QToolButton:hover{ background:#EEF3FB; }"
"QToolButton:checked{ color:#2D6CB5; font-weight:%2;"
" border-bottom:2px solid #2D6CB5; }")
.arg(geopro::app::type::kBody)
.arg(geopro::app::type::kWeightSemibold);
// 工具条：「二维地图/三维视图」两个互斥可勾选按钮。默认二维地图。
auto* viewToolBar = new QWidget();
auto* viewBarLay = new QHBoxLayout(viewToolBar);
viewBarLay->setContentsMargins(8, 6, 8, 6);
viewBarLay->setSpacing(6);
auto* viewGroup = new QButtonGroup(viewToolBar);
viewGroup->setExclusive(true);
auto* act2D = new ElaToolButton(viewToolBar);
auto* act2D = new QToolButton(viewToolBar);
act2D->setText(QStringLiteral("二维地图"));
act2D->setCheckable(true);
auto* act3D = new ElaToolButton(viewToolBar);
auto* act3D = new QToolButton(viewToolBar);
act3D->setText(QStringLiteral("三维视图"));
act3D->setCheckable(true);
viewGroup->addButton(act2D);
@ -346,6 +359,7 @@ void buildWorkbench(QMainWindow& window, geopro::data::LocalSampleRepository& re
viewBarLay->addWidget(act3D);
viewBarLay->addStretch();
act2D->setChecked(true); // 默认二维地图
geopro::app::applyThemedStyleSheet(viewToolBar, kBarBtnQss);
centerLayout->addWidget(viewToolBar);
centerLayout->addWidget(vtkWidget, 1);
@ -473,13 +487,14 @@ void buildWorkbench(QMainWindow& window, geopro::data::LocalSampleRepository& re
detailLayout->setContentsMargins(0, 0, 0, 0);
detailLayout->setSpacing(0);
// 工具条对齐原型：「原数据 | 网格数据」互斥 +「显示异常/电极/等值线」开关（Fluent ElaToolButton）。
// 工具条对齐原型：「原数据 | 网格数据」互斥 +「显示异常/电极/等值线」开关。
// QToolButton + 主题化 QSS（选中=强调色文字+下划线，明暗都清晰）。
auto* detailToolBar = new QWidget();
auto* detailBarLay = new QHBoxLayout(detailToolBar);
detailBarLay->setContentsMargins(8, 6, 8, 6);
detailBarLay->setSpacing(6);
auto makeBarBtn = [detailToolBar](const QString& text, bool checkable) {
auto* b = new ElaToolButton(detailToolBar);
auto* b = new QToolButton(detailToolBar);
b->setText(text);
b->setCheckable(checkable);
return b;
@ -509,6 +524,7 @@ void buildWorkbench(QMainWindow& window, geopro::data::LocalSampleRepository& re
detailBarLay->addWidget(actShowElectrodes);
detailBarLay->addWidget(actShowContour);
detailBarLay->addStretch();
geopro::app::applyThemedStyleSheet(detailToolBar, kBarBtnQss);
detailLayout->addWidget(detailToolBar);
detailLayout->addWidget(detailWidget, 1);