X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fsettings.cpp;h=1cd7d23c8bf83068e97a91a1e6d518feb528d34b;hp=2bbab122ffb3731159f2385f8c6457150ee0d1a2;hb=8962d7b3b640b5f07f26a4b4ebee839c4880b69d;hpb=829b23f65ebc0dd81e6ee94f7ea72a691dff1907

diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp
index 2bbab122..1cd7d23c 100644
--- a/pv/dialogs/settings.cpp
+++ b/pv/dialogs/settings.cpp
@@ -204,6 +204,7 @@ QPlainTextEdit *Settings::create_log_view() const
 QWidget *Settings::get_general_settings_form(QWidget *parent) const
 {
 	GlobalSettings settings;
+	QCheckBox *cb;
 
 	QWidget *form = new QWidget(parent);
 	QVBoxLayout *form_layout = new QVBoxLayout(form);
@@ -249,6 +250,10 @@ QWidget *Settings::get_general_settings_form(QWidget *parent) const
 	description_2->setAlignment(Qt::AlignRight);
 	general_layout->addRow(description_2);
 
+	cb = create_checkbox(GlobalSettings::Key_General_SaveWithSetup,
+		SLOT(on_general_save_with_setup_changed(int)));
+	general_layout->addRow(tr("Save session &setup along with .sr file"), cb);
+
 	return form;
 }
 
@@ -612,6 +617,12 @@ void Settings::on_general_style_changed(int state)
 	settings.apply_theme();
 }
 
+void Settings::on_general_save_with_setup_changed(int state)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_General_SaveWithSetup, state ? true : false);
+}
+
 void Settings::on_view_zoomToFitDuringAcq_changed(int state)
 {
 	GlobalSettings settings;
@@ -744,8 +755,7 @@ void Settings::on_log_saveToFile_clicked(bool checked)
 
 		if (out_stream.status() == QTextStream::Ok) {
 			QMessageBox msg(this);
-			msg.setText(tr("Success"));
-			msg.setInformativeText(tr("Log saved to %1.").arg(file_name));
+			msg.setText(tr("Success") + "\n\n" + tr("Log saved to %1.").arg(file_name));
 			msg.setStandardButtons(QMessageBox::Ok);
 			msg.setIcon(QMessageBox::Information);
 			msg.exec();
@@ -755,8 +765,7 @@ void Settings::on_log_saveToFile_clicked(bool checked)
 	}
 
 	QMessageBox msg(this);
-	msg.setText(tr("Error"));
-	msg.setInformativeText(tr("File %1 could not be written to.").arg(file_name));
+	msg.setText(tr("Error") + "\n\n" + tr("File %1 could not be written to.").arg(file_name));
 	msg.setStandardButtons(QMessageBox::Ok);
 	msg.setIcon(QMessageBox::Warning);
 	msg.exec();