Don't use QMessageBox::setInformativeText()

When using it, the extended error message text is not reliably appended
to the dialog text.

diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp
index 2bbab122ffb3731159f2385f8c6457150ee0d1a2..780a66655e91826083bad6e4932c8246f52959d0 100644 (file)
--- a/pv/dialogs/settings.cpp
+++ b/pv/dialogs/settings.cpp
@@ -744,8 +744,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 +754,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();

diff --git a/pv/dialogs/storeprogress.cpp b/pv/dialogs/storeprogress.cpp
index 9f4279cea8557a20423c799f0f6abe5785e142ee..2bca3476c434b53ff65e99b4774145dbff248592 100644 (file)
--- a/pv/dialogs/storeprogress.cpp
+++ b/pv/dialogs/storeprogress.cpp
@@ -82,8 +82,7 @@ void StoreProgress::show_error()
        qDebug() << "Error trying to save:" << session_.error();
 
        QMessageBox msg(parentWidget());
-       msg.setText(tr("Failed to save session."));
-       msg.setInformativeText(session_.error());
+       msg.setText(tr("Failed to save session.") + "\n\n" + session_.error());
        msg.setStandardButtons(QMessageBox::Ok);
        msg.setIcon(QMessageBox::Warning);
        msg.exec();

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index fd889e9e9176d6017c340f30d31d4b2b105b545d..960c38977ab98b49ef0d22061077cec2b2f64906 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -95,8 +95,7 @@ void MainWindow::show_session_error(const QString text, const QString info_text)
        qDebug() << "Notifying user of session error:" << info_text;
 
        QMessageBox msg;
-       msg.setText(text);
-       msg.setInformativeText(info_text);
+       msg.setText(text + "\n\n" + info_text);
        msg.setStandardButtons(QMessageBox::Ok);
        msg.setIcon(QMessageBox::Warning);
        msg.exec();

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index e6beb2b3ba704e198c8aff0076787a9d96798fe9..df1363db214ab45c3fbd977f5f2e562f0aaa58c7 100644 (file)
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -556,8 +556,7 @@ void MainBar::commit_sample_count()
 void MainBar::show_session_error(const QString text, const QString info_text)
 {
        QMessageBox msg(this);
-       msg.setText(text);
-       msg.setInformativeText(info_text);
+       msg.setText(text + "\n\n" + info_text);
        msg.setStandardButtons(QMessageBox::Ok);
        msg.setIcon(QMessageBox::Warning);
        msg.exec();

diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
index 9c7196bfb04f24e1c3322172ce023d12f12f4b36..65a2bf6c6a72f3e773b837e1941565bd7378012a 100644 (file)
--- a/pv/views/trace/decodetrace.cpp
+++ b/pv/views/trace/decodetrace.cpp
@@ -1036,8 +1036,7 @@ void DecodeTrace::export_annotations(vector<Annotation> *annotations) const
        }
 
        QMessageBox msg(owner_->view());
-       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();