From 5e52c78e1db2271171d38121e3de7b552b0199a5 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 11 Apr 2026 19:54:12 +0200 Subject: [PATCH] Fixed #2315: Changing dialog title and 'cancel' button to 'close' --- src/layui/layui/LayoutViewFunctionDialog.ui | 2 +- src/layui/layui/layDialogs.cc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/layui/layui/LayoutViewFunctionDialog.ui b/src/layui/layui/LayoutViewFunctionDialog.ui index f85efd10a..82309f6f0 100644 --- a/src/layui/layui/LayoutViewFunctionDialog.ui +++ b/src/layui/layui/LayoutViewFunctionDialog.ui @@ -40,7 +40,7 @@ - QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok + QDialogButtonBox::Apply|QDialogButtonBox::Close|QDialogButtonBox::Ok diff --git a/src/layui/layui/layDialogs.cc b/src/layui/layui/layDialogs.cc index 6b009a9b7..a303c6dd0 100644 --- a/src/layui/layui/layDialogs.cc +++ b/src/layui/layui/layDialogs.cc @@ -384,12 +384,12 @@ END_PROTECTED; LayoutViewFunctionDialog::LayoutViewFunctionDialog (QWidget *parent, const QString &title, const QString &label) : QDialog (parent) { - setObjectName (QString::fromUtf8 ("layout_view_function_dialog")); - setWindowTitle (title); - mp_ui = new Ui::LayoutViewFunctionDialog (); mp_ui->setupUi (this); + setObjectName (QString::fromUtf8 ("layout_view_function_dialog")); + setWindowTitle (title); + mp_ui->label->setText (label); connect (mp_ui->buttonBox->button (QDialogButtonBox::Apply), SIGNAL (pressed ()), this, SLOT (apply_clicked ()));