#include <QScrollBar>
#include <QSpinBox>
#include <QString>
+#include <QStyleFactory>
#include <QTextBrowser>
#include <QTextDocument>
#include <QTextStream>
general_group->setLayout(general_layout);
QComboBox *theme_cb = new QComboBox();
- for (pair<QString, QString> entry : Themes)
+ for (const pair<QString, QString>& entry : Themes)
theme_cb->addItem(entry.first, entry.second);
theme_cb->setCurrentIndex(
description_1->setAlignment(Qt::AlignRight);
general_layout->addRow(description_1);
+ QComboBox *style_cb = new QComboBox();
+ style_cb->addItem(tr("System Default"), "");
+ for (QString& s : QStyleFactory::keys())
+ style_cb->addItem(s, s);
+
+ const QString current_style =
+ settings.value(GlobalSettings::Key_General_Style).toString();
+ if (current_style.isEmpty())
+ style_cb->setCurrentIndex(0);
+ else
+ style_cb->setCurrentIndex(style_cb->findText(current_style, 0));
+
+ connect(style_cb, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(on_general_style_changed(int)));
+ general_layout->addRow(tr("Qt widget style"), style_cb);
+
+ QLabel *description_2 = new QLabel(tr("(Dark themes look best with the Fusion style)"));
+ description_2->setAlignment(Qt::AlignRight);
+ general_layout->addRow(description_2);
+
return form;
}
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)));
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);
GlobalSettings settings;
settings.setValue(GlobalSettings::Key_General_Theme, state);
settings.apply_theme();
+
+ QMessageBox msg(this);
+ msg.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+ msg.setIcon(QMessageBox::Question);
+
+ if (settings.current_theme_is_dark()) {
+ msg.setText(tr("You selected a dark theme.\n" \
+ "Should I set the user-adjustable colors to better suit your choice?\n\n" \
+ "Please keep in mind that PulseView may need a restart to display correctly."));
+ if (msg.exec() == QMessageBox::Yes)
+ settings.set_dark_theme_default_colors();
+ } else {
+ msg.setText(tr("You selected a bright theme.\n" \
+ "Should I set the user-adjustable colors to better suit your choice?\n\n" \
+ "Please keep in mind that PulseView may need a restart to display correctly."));
+ if (msg.exec() == QMessageBox::Yes)
+ settings.set_bright_theme_default_colors();
+ }
+}
+
+void Settings::on_general_style_changed(int state)
+{
+ GlobalSettings settings;
+
+ if (state == 0)
+ settings.setValue(GlobalSettings::Key_General_Style, "");
+ else
+ settings.setValue(GlobalSettings::Key_General_Style,
+ QStyleFactory::keys().at(state - 1));
+
+ settings.apply_theme();
}
void Settings::on_view_zoomToFitDuringAcq_changed(int state)
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;
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();
}
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();