From e62bc0631ae067daae8676e9c8e9fae077de67ab Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Tue, 23 May 2023 17:41:11 +0200
Subject: [PATCH] Legacy1dDialog has all buttons
---
GUI/View/Import/Legacy1dDialog.cpp | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/GUI/View/Import/Legacy1dDialog.cpp b/GUI/View/Import/Legacy1dDialog.cpp
index 1bb8dd2e475..9bd5d51af23 100644
--- a/GUI/View/Import/Legacy1dDialog.cpp
+++ b/GUI/View/Import/Legacy1dDialog.cpp
@@ -13,6 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Import/Legacy1dDialog.h"
+#include "Device/IO/ImportSettings.h"
#include <QCheckBox>
#include <QComboBox>
#include <QFormLayout>
@@ -20,6 +21,7 @@
#include <QHBoxLayout>
#include <QLabel>
#include <QLineEdit>
+#include <QPushButton>
#include <QSpinBox>
#include <QVBoxLayout>
#include <QtGui>
@@ -27,8 +29,8 @@
Legacy1dDialog::Legacy1dDialog()
: m_allowFactors(false)
{
- setGeometry(0, 0, 486, 241);
- setWindowTitle("Form");
+ setWindowTitle("Define legacy input format");
+ setWindowFlags(Qt::Dialog);
auto vbox = new QVBoxLayout;
setLayout(vbox);
@@ -75,6 +77,18 @@ Legacy1dDialog::Legacy1dDialog()
m_qUnitCombo->addItem("1/nm");
m_qUnitCombo->addItem("1/Å");
+ auto buttonline = new QHBoxLayout;
+ vbox->addLayout(buttonline);
+
+ auto cancelButton = new QPushButton("Cancel");
+ buttonline->addWidget(cancelButton);
+ connect(cancelButton, &QPushButton::clicked, this, &Legacy1dDialog::reject);
+
+ auto okButton = new QPushButton("Save");
+ buttonline->addWidget(okButton);
+ okButton->setDefault(true);
+ connect(okButton, &QPushButton::clicked, this, &Legacy1dDialog::accept);
+
allowFactors(false);
connect(m_headerPrefixEdit, &QLineEdit::textChanged, [this]() { emit propertiesChanged(); });
--
GitLab