Don't use QMessageBox::setInformativeText()

[pulseview.git] / pv / dialogs / settings.cpp

diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp
index 1119b8fafe69e0ba2e091da13f0857d4cf220f6f..780a66655e91826083bad6e4932c8246f52959d0 100644 (file)
--- a/pv/dialogs/settings.cpp
+++ b/pv/dialogs/settings.cpp
@@ -300,7 +300,7 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const
                settings.value(GlobalSettings::Key_View_FillSignalHighAreaColor).value<uint32_t>()));
        connect(high_fill_cb, SIGNAL(selected(QColor)),
                this, SLOT(on_view_fillSignalHighAreaColor_changed(QColor)));
-       trace_view_layout->addRow(tr("Fill high areas of logic signals"), high_fill_cb);
+       trace_view_layout->addRow(tr("Color to fill high areas of logic signals with"), high_fill_cb);
 
        cb = create_checkbox(GlobalSettings::Key_View_ShowAnalogMinorGrid,
                SLOT(on_view_showAnalogMinorGrid_changed(int)));
@@ -319,6 +319,13 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const
                SLOT(on_view_snapDistance_changed(int)));
        trace_view_layout->addRow(tr("Maximum distance from edges before cursors snap to them"), snap_distance_sb);
 
+       ColorButton* cursor_fill_cb = new ColorButton(parent);
+       cursor_fill_cb->set_color(QColor::fromRgba(
+               settings.value(GlobalSettings::Key_View_CursorFillColor).value<uint32_t>()));
+       connect(cursor_fill_cb, SIGNAL(selected(QColor)),
+               this, SLOT(on_view_cursorFillColor_changed(QColor)));
+       trace_view_layout->addRow(tr("Color to fill cursor area with"), cursor_fill_cb);
+
        QComboBox *thr_disp_mode_cb = new QComboBox();
        thr_disp_mode_cb->addItem(tr("None"), GlobalSettings::ConvThrDispMode_None);
        thr_disp_mode_cb->addItem(tr("Background"), GlobalSettings::ConvThrDispMode_Background);
@@ -671,6 +678,12 @@ void Settings::on_view_snapDistance_changed(int value)
        settings.setValue(GlobalSettings::Key_View_SnapDistance, value);
 }
 
+void Settings::on_view_cursorFillColor_changed(QColor color)
+{
+       GlobalSettings settings;
+       settings.setValue(GlobalSettings::Key_View_CursorFillColor, color.rgba());
+}
+
 void Settings::on_view_conversionThresholdDispMode_changed(int state)
 {
        GlobalSettings settings;
@@ -731,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();
@@ -742,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();