From 257c1940c13c28f88b959d0e58bc1c44491df068 Mon Sep 17 00:00:00 2001 From: lh <2334563547@qq.com> Date: Wed, 18 Nov 2026 11:20:06 +0800 Subject: [PATCH] =?UTF-8?q?fix(Nm):=20=E7=BB=9F=E4=B8=80=E5=8A=A8=E7=94=BB?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2=E5=B9=B6=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BC=B8=E7=BC=A9=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 统一窗口主题、框架图标及底部按钮布局 - 调整速度输入框伸缩方式,移除固定最小宽度 - 整理初始化代码并补充中文注释和按钮翻译 --- Bin/Config/Lang/cn/nmNum_cn.qm | Bin 207132 -> 207274 bytes Bin/Config/Lang/cn/nmNum_cn.ts | 2 + .../nmWxPebiResultAnimationSettingsDlg.h | 12 +- .../nmWxPebiResultAnimationSettingsDlg.cpp | 116 +++++++++++------- 4 files changed, 84 insertions(+), 46 deletions(-) diff --git a/Bin/Config/Lang/cn/nmNum_cn.qm b/Bin/Config/Lang/cn/nmNum_cn.qm index af18f1e94c055f494eb138a109a4cb3677c59560..3cdbc85b5287130eda284bbcb07b0375fce5260d 100644 GIT binary patch delta 5975 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 N`?&Q%`sq{g{{RG{ZCd~U delta 5996 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 a9?njAnimation settings动画设置 Loop enabled启用循环 Speed (steps/second)速度(步/秒) + OK确定 + Cancel取消 nmWxPebiResultFilterSettingsDlg diff --git a/Include/nmNum/nmSubWxs/nmWxPebiResultAnimationSettingsDlg.h b/Include/nmNum/nmSubWxs/nmWxPebiResultAnimationSettingsDlg.h index 6888c76b..8d062f5e 100644 --- a/Include/nmNum/nmSubWxs/nmWxPebiResultAnimationSettingsDlg.h +++ b/Include/nmNum/nmSubWxs/nmWxPebiResultAnimationSettingsDlg.h @@ -1,10 +1,9 @@ #ifndef NMWXPEBIRESULTANIMATIONSETTINGSDLG_H #define NMWXPEBIRESULTANIMATIONSETTINGSDLG_H +#include "iDlgBase.h" #include "nmSubWxs_global.h" -#include - class QCheckBox; class QShowEvent; class QSpinBox; @@ -16,7 +15,7 @@ class QSpinBox; * 两个值并事务式提交,因此取消或关闭对话框不会改变窗口偏好。 */ class NM_SUB_WXS_EXPORT nmWxPebiResultAnimationSettingsDlg - : public QDialog + : public iDlgBase { Q_OBJECT @@ -46,6 +45,13 @@ protected: private: Q_DISABLE_COPY(nmWxPebiResultAnimationSettingsDlg) + /** @brief 创建统一主题下的表单与底栏,纵向余量不拉高输入控件。 */ + void createUi(); + /** @brief 创建随窗口横向伸展的速度输入框和循环选项。 */ + QWidget* createFields(); + /** @brief 创建靠右的标准确认、取消按钮,连接原有接受/拒绝流程。 */ + QWidget* createFooter(); + /** @brief 限制为正整数步/秒的速度输入框。 */ QSpinBox* m_pSpeedSpin; /** @brief 是否在末帧之后回到第 0 帧。 */ diff --git a/Src/nmNum/nmSubWxs/nmWxPebiResultAnimationSettingsDlg.cpp b/Src/nmNum/nmSubWxs/nmWxPebiResultAnimationSettingsDlg.cpp index f77c247e..c102e439 100644 --- a/Src/nmNum/nmSubWxs/nmWxPebiResultAnimationSettingsDlg.cpp +++ b/Src/nmNum/nmSubWxs/nmWxPebiResultAnimationSettingsDlg.cpp @@ -1,45 +1,38 @@ #include "nmWxPebiResultAnimationSettingsDlg.h" #include "nmPebiResultPlaybackController.h" +#include "ZxBaseUtil.h" #include -#include #include -#include -#include -#include +#include +#include +#include #include #include -#include +#include #include #include #include #include -namespace { - -QString resultAnimationIconPath(const QString& sFileName) -{ - const QString sApplicationDir = QCoreApplication::applicationDirPath(); - return sApplicationDir.section('/', 0, -2) + - "/Res/Icon/" + sFileName; -} - -} - nmWxPebiResultAnimationSettingsDlg:: nmWxPebiResultAnimationSettingsDlg( int nStepsPerSecond, bool bLoopEnabled, QWidget* pParent) - : QDialog(pParent), - m_pSpeedSpin(new QSpinBox(this)), - m_pLoopCheck(new QCheckBox(tr("Loop enabled"), this)) + : iDlgBase(pParent), + m_pSpeedSpin(nullptr), + m_pLoopCheck(nullptr) { setWindowTitle(tr("Animation settings")); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setModal(true); + // 接入统一窗口主题,同时沿用原窗口按 Esc 取消的行为。 + setIgnoreEsc(false); + createUi(); + // 控件只保存临时值,播放参数仍由调用方在确认后统一提交。 m_pSpeedSpin->setRange( nmPebiResultPlaybackController::MinimumPlaybackSpeed, nmPebiResultPlaybackController::MaximumPlaybackSpeed); @@ -51,35 +44,72 @@ nmWxPebiResultAnimationSettingsDlg( nmPebiResultPlaybackController::MaximumPlaybackSpeed))); m_pLoopCheck->setChecked(bLoopEnabled); - QFormLayout* pFormLayout = new QFormLayout(); - pFormLayout->addRow(tr("Speed (steps/second)"), m_pSpeedSpin); - pFormLayout->addRow(QString(), m_pLoopCheck); + // 范围及初值回填后计算推荐尺寸,窗口宽高由内容、字体及主题共同决定。 + adjustSize(); +} + +void nmWxPebiResultAnimationSettingsDlg::createUi() +{ + QVBoxLayout* pMainLayout = new QVBoxLayout(this); + pMainLayout->setContentsMargins(12, 10, 12, 0); + pMainLayout->setSpacing(10); + pMainLayout->addWidget(createFields()); + // 纵向余量留在内容与底栏之间,速度输入框和复选框不随窗口拉高。 + pMainLayout->addStretch(1); + pMainLayout->addWidget(createFooter()); +} + +QWidget* nmWxPebiResultAnimationSettingsDlg::createFields() +{ + QWidget* pFields = new QWidget(this); + pFields->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + QGridLayout* pLayout = new QGridLayout(pFields); + pLayout->setContentsMargins(0, 0, 0, 0); + pLayout->setHorizontalSpacing(6); + pLayout->setVerticalSpacing(6); + pLayout->setColumnStretch(1, 1); + QLabel* pSpeedLabel = new QLabel(tr("Speed (steps/second)"), pFields); + pSpeedLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter); + m_pSpeedSpin = new QSpinBox(pFields); + // 横向由布局分配剩余空间,纵向采用主题推荐高度,不固定像素尺寸。 + m_pSpeedSpin->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + m_pLoopCheck = new QCheckBox(tr("Loop enabled"), pFields); + pLayout->addWidget(pSpeedLabel, 0, 0); + pLayout->addWidget(m_pSpeedSpin, 0, 1); + pLayout->addWidget(m_pLoopCheck, 1, 1); + return pFields; +} + +QWidget* nmWxPebiResultAnimationSettingsDlg::createFooter() +{ + QWidget* pFooter = new QWidget(this); + pFooter->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); + QHBoxLayout* pLayout = new QHBoxLayout(pFooter); + pLayout->setContentsMargins(4, 5, 4, 5); + pLayout->setSpacing(8); + pLayout->addStretch(); + + // 与已统一的窗口共用底部边距和框架图标,按钮尺寸交给主题。 QDialogButtonBox* pButtonBox = new QDialogButtonBox( - QDialogButtonBox::Ok | QDialogButtonBox::Cancel, - Qt::Horizontal, this); + QDialogButtonBox::Ok | QDialogButtonBox::Cancel, + Qt::Horizontal, pFooter); QPushButton* pOkButton = pButtonBox->button(QDialogButtonBox::Ok); - QPushButton* pCancelButton = - pButtonBox->button(QDialogButtonBox::Cancel); - const QSize oButtonIconSize(16, 16); - pOkButton->setIcon(QIcon(resultAnimationIconPath( - QString::fromLatin1("OK.png")))); - pCancelButton->setIcon(QIcon(resultAnimationIconPath( - QString::fromLatin1("Cancel.png")))); - pOkButton->setIconSize(oButtonIconSize); - pCancelButton->setIconSize(oButtonIconSize); - pOkButton->setMinimumWidth(72); - pCancelButton->setMinimumWidth(72); - if(pButtonBox->layout() != nullptr) { - pButtonBox->layout()->setSpacing(6); - } + QPushButton* pCancelButton = pButtonBox->button(QDialogButtonBox::Cancel); + pOkButton->setText(tr("OK")); + pOkButton->setIcon(zxLoadIcon("OK")); + pOkButton->setDefault(true); + pCancelButton->setText(tr("Cancel")); + pCancelButton->setIcon(zxLoadIcon("Cancel")); + pCancelButton->setAutoDefault(false); + pLayout->addWidget(pButtonBox); connect(pButtonBox, SIGNAL(accepted()), this, SLOT(accept())); connect(pButtonBox, SIGNAL(rejected()), this, SLOT(reject())); - QVBoxLayout* pMainLayout = new QVBoxLayout(this); - pMainLayout->addLayout(pFormLayout); - pMainLayout->addWidget(pButtonBox); - setMinimumWidth(320); + setTabOrder(m_pSpeedSpin, m_pLoopCheck); + setTabOrder(m_pLoopCheck, pOkButton); + setTabOrder(pOkButton, pCancelButton); + return pFooter; } nmWxPebiResultAnimationSettingsDlg:: @@ -99,7 +129,7 @@ bool nmWxPebiResultAnimationSettingsDlg::isLoopEnabled() const void nmWxPebiResultAnimationSettingsDlg::showEvent(QShowEvent* pEvent) { - QDialog::showEvent(pEvent); + iDlgBase::showEvent(pEvent); m_pSpeedSpin->setFocus(Qt::OtherFocusReason); QTimer::singleShot(0, m_pSpeedSpin, SLOT(selectAll())); }