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 ()));