X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fsettings.cpp;h=1cd7d23c8bf83068e97a91a1e6d518feb528d34b;hp=3507c47203ec1cb92c865d628883d451cce62109;hb=8962d7b3b640b5f07f26a4b4ebee839c4880b69d;hpb=b804a6da858bd130a54a8c7ccafd085302a2b3e8 diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp index 3507c472..1cd7d23c 100644 --- a/pv/dialogs/settings.cpp +++ b/pv/dialogs/settings.cpp @@ -20,7 +20,6 @@ #include "config.h" #include -#include #include #include @@ -36,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -43,9 +43,11 @@ #include "settings.hpp" +#include "pv/application.hpp" #include "pv/devicemanager.hpp" #include "pv/globalsettings.hpp" #include "pv/logging.hpp" +#include "pv/widgets/colorbutton.hpp" #include @@ -53,7 +55,7 @@ #include #endif -using std::shared_ptr; +using pv::widgets::ColorButton; namespace pv { namespace dialogs { @@ -124,6 +126,15 @@ Settings::Settings(DeviceManager &device_manager, QWidget *parent) : void Settings::create_pages() { + // General page + pages->addWidget(get_general_settings_form(pages)); + + QListWidgetItem *generalButton = new QListWidgetItem(page_list); + generalButton->setIcon(QIcon(":/icons/settings-general.png")); + generalButton->setText(tr("General")); + generalButton->setTextAlignment(Qt::AlignVCenter); + generalButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); + // View page pages->addWidget(get_view_settings_form(pages)); @@ -190,6 +201,62 @@ QPlainTextEdit *Settings::create_log_view() const return log_view; } +QWidget *Settings::get_general_settings_form(QWidget *parent) const +{ + GlobalSettings settings; + QCheckBox *cb; + + QWidget *form = new QWidget(parent); + QVBoxLayout *form_layout = new QVBoxLayout(form); + + // General settings + QGroupBox *general_group = new QGroupBox(tr("General")); + form_layout->addWidget(general_group); + + QFormLayout *general_layout = new QFormLayout(); + general_group->setLayout(general_layout); + + QComboBox *theme_cb = new QComboBox(); + for (const pair& entry : Themes) + theme_cb->addItem(entry.first, entry.second); + + theme_cb->setCurrentIndex( + settings.value(GlobalSettings::Key_General_Theme).toInt()); + connect(theme_cb, SIGNAL(currentIndexChanged(int)), + this, SLOT(on_general_theme_changed_changed(int))); + general_layout->addRow(tr("User interface theme"), theme_cb); + + QLabel *description_1 = new QLabel(tr("(You may need to restart PulseView for all UI elements to update)")); + 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); + + 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; +} + QWidget *Settings::get_view_settings_form(QWidget *parent) const { GlobalSettings settings; @@ -229,6 +296,17 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const SLOT(on_view_showSamplingPoints_changed(int))); trace_view_layout->addRow(tr("Show data &sampling points"), cb); + cb = create_checkbox(GlobalSettings::Key_View_FillSignalHighAreas, + SLOT(on_view_fillSignalHighAreas_changed(int))); + trace_view_layout->addRow(tr("Fill high areas of logic signals"), cb); + + ColorButton* high_fill_cb = new ColorButton(parent); + high_fill_cb->set_color(QColor::fromRgba( + settings.value(GlobalSettings::Key_View_FillSignalHighAreaColor).value())); + connect(high_fill_cb, SIGNAL(selected(QColor)), + this, SLOT(on_view_fillSignalHighAreaColor_changed(QColor))); + 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))); trace_view_layout->addRow(tr("Show analog minor grid in addition to div grid"), cb); @@ -237,6 +315,22 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const SLOT(on_view_showHoverMarker_changed(int))); trace_view_layout->addRow(tr("Highlight mouse cursor using a vertical marker line"), cb); + QSpinBox *snap_distance_sb = new QSpinBox(); + snap_distance_sb->setRange(0, 1000); + snap_distance_sb->setSuffix(tr(" pixels")); + snap_distance_sb->setValue( + settings.value(GlobalSettings::Key_View_SnapDistance).toInt()); + connect(snap_distance_sb, SIGNAL(valueChanged(int)), this, + 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())); + 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); @@ -268,9 +362,10 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const return form; } -QWidget *Settings::get_decoder_settings_form(QWidget *parent) const +QWidget *Settings::get_decoder_settings_form(QWidget *parent) { #ifdef ENABLE_DECODE + GlobalSettings settings; QCheckBox *cb; QWidget *form = new QWidget(parent); @@ -287,6 +382,20 @@ QWidget *Settings::get_decoder_settings_form(QWidget *parent) const SLOT(on_dec_initialStateConfigurable_changed(int))); decoder_layout->addRow(tr("Allow configuration of &initial signal state"), cb); + // Annotation export settings + ann_export_format_ = new QLineEdit(); + ann_export_format_->setText( + settings.value(GlobalSettings::Key_Dec_ExportFormat).toString()); + connect(ann_export_format_, SIGNAL(textChanged(const QString&)), + this, SLOT(on_dec_exportFormat_changed(const QString&))); + decoder_layout->addRow(tr("Annotation export format"), ann_export_format_); + QLabel *description_1 = new QLabel(tr("%s = sample range; %d: decoder name; %c: row name; %q: use quotations marks")); + description_1->setAlignment(Qt::AlignRight); + decoder_layout->addRow(description_1); + QLabel *description_2 = new QLabel(tr("%1: longest annotation text; %a: all annotation texts")); + description_2->setAlignment(Qt::AlignRight); + decoder_layout->addRow(description_2); + return form; #else (void)parent; @@ -294,173 +403,74 @@ QWidget *Settings::get_decoder_settings_form(QWidget *parent) const #endif } -#ifdef ENABLE_DECODE -static gint sort_pds(gconstpointer a, gconstpointer b) -{ - const struct srd_decoder *sda, *sdb; - - sda = (const struct srd_decoder *)a; - sdb = (const struct srd_decoder *)b; - return strcmp(sda->id, sdb->id); -} -#endif - QWidget *Settings::get_about_page(QWidget *parent) const { -#ifdef ENABLE_DECODE - struct srd_decoder *dec; -#endif + Application* a = qobject_cast(QApplication::instance()); QLabel *icon = new QLabel(); icon->setPixmap(QPixmap(QString::fromUtf8(":/icons/pulseview.svg"))); - /* Setup the license field, with the project homepage link. */ + // Setup the license field with the project homepage link QLabel *gpl_home_info = new QLabel(); gpl_home_info->setText(tr("%1
%2").arg( tr("GNU GPL, version 3 or later"), QApplication::organizationDomain())); gpl_home_info->setOpenExternalLinks(true); - shared_ptr context = device_manager_.context(); - QString s; s.append(""); s.append(""); - /* Application info */ s.append(""); - - s.append(QString("") - .arg(QApplication::applicationName(), - QApplication::applicationVersion())); - - /* Library info */ - s.append(""); - s.append(""); - - s.append(QString("") - .arg(QString("Qt"), qVersion())); - s.append(QString("") - .arg(QString("glibmm"), PV_GLIBMM_VERSION)); - s.append(QString("") - .arg(QString("Boost"), BOOST_LIB_VERSION)); - - s.append(QString("") - .arg(QString("libsigrok"), SR_PACKAGE_VERSION_STRING, - SR_LIB_VERSION_STRING, sr_package_version_string_get(), - sr_lib_version_string_get())); - - GSList *l_orig = sr_buildinfo_libs_get(); - for (GSList *l = l_orig; l; l = l->next) { - GSList *m = (GSList *)l->data; - const char *lib = (const char *)m->data; - const char *version = (const char *)m->next->data; - s.append(QString("") - .arg(QString(lib), QString(version))); - g_slist_free_full(m, g_free); - } - g_slist_free(l_orig); - - char *host = sr_buildinfo_host_get(); - s.append(QString("") - .arg(QString(host))); - g_free(host); - - char *scpi_backends = sr_buildinfo_scpi_backends_get(); - s.append(QString("") - .arg(QString(scpi_backends))); - g_free(scpi_backends); - -#ifdef ENABLE_DECODE - s.append(QString("") - .arg(QString("libsigrokdecode"), SRD_PACKAGE_VERSION_STRING, - SRD_LIB_VERSION_STRING, srd_package_version_string_get(), - srd_lib_version_string_get())); - - l_orig = srd_buildinfo_libs_get(); - for (GSList *l = l_orig; l; l = l->next) { - GSList *m = (GSList *)l->data; - const char *lib = (const char *)m->data; - const char *version = (const char *)m->next->data; - s.append(QString("") - .arg(QString(lib), QString(version))); - g_slist_free_full(m, g_free); - } - g_slist_free(l_orig); - - host = srd_buildinfo_host_get(); - s.append(QString("") - .arg(QString(host))); - g_free(host); -#endif + tr("Versions, libraries and features:") + ""); + for (pair &entry : a->get_version_info()) + s.append(QString("") + .arg(entry.first, entry.second)); s.append(""); s.append(""); - - l_orig = sr_resourcepaths_get(SR_RESOURCE_FIRMWARE); - for (GSList *l = l_orig; l; l = l->next) - s.append(QString("").arg( - QString((char*)l->data))); - g_slist_free_full(l_orig, g_free); + for (QString &entry : a->get_fw_path_list()) + s.append(QString("").arg(entry)); #ifdef ENABLE_DECODE s.append(""); s.append(""); - - l_orig = srd_searchpaths_get(); - for (GSList *l = l_orig; l; l = l->next) - s.append(QString("").arg( - QString((char*)l->data))); - g_slist_free_full(l_orig, g_free); + for (QString &entry : a->get_pd_path_list()) + s.append(QString("").arg(entry)); #endif - /* Set up the supported field */ s.append(""); s.append(""); - for (auto entry : context->drivers()) { + for (pair &entry : a->get_driver_list()) s.append(QString("") - .arg(QString::fromUtf8(entry.first.c_str()), - QString::fromUtf8(entry.second->long_name().c_str()))); - } + .arg(entry.first, entry.second)); s.append(""); s.append(""); - for (auto entry : context->input_formats()) { + for (pair &entry : a->get_input_format_list()) s.append(QString("") - .arg(QString::fromUtf8(entry.first.c_str()), - QString::fromUtf8(entry.second->description().c_str()))); - } + .arg(entry.first, entry.second)); s.append(""); s.append(""); - for (auto entry : context->output_formats()) { + for (pair &entry : a->get_output_format_list()) s.append(QString("") - .arg(QString::fromUtf8(entry.first.c_str()), - QString::fromUtf8(entry.second->description().c_str()))); - } + .arg(entry.first, entry.second)); #ifdef ENABLE_DECODE s.append(""); s.append(""); - GSList *sl = g_slist_copy((GSList *)srd_decoder_list()); - sl = g_slist_sort(sl, sort_pds); - for (const GSList *l = sl; l; l = l->next) { - dec = (struct srd_decoder *)l->data; + for (pair &entry : a->get_pd_list()) s.append(QString("") - .arg(QString::fromUtf8(dec->id), - QString::fromUtf8(dec->longname))); - } - g_slist_free(sl); + .arg(entry.first, entry.second)); #endif s.append("
" + - tr("Application:") + "
%1%2
" + - tr("Libraries and features:") + "
%1%2
%1%2
%1%2
%1%2/%3 (rt: %4/%5)
- %1%2
- Host%1
- SCPI backends%1
%1%2/%3 (rt: %4/%5)
- %1%2
- Host%1
%1%2
" + tr("Firmware search paths:") + "
%1
%1
" + tr("Protocol decoder search paths:") + "
%1
%1
" + tr("Supported hardware drivers:") + "
%1%2
" + tr("Supported input formats:") + "
%1%2
" + tr("Supported output formats:") + "
%1%2
" + tr("Supported protocol decoders:") + "
%1%2
"); @@ -471,10 +481,14 @@ QWidget *Settings::get_about_page(QWidget *parent) const QTextBrowser *support_list = new QTextBrowser(); support_list->setDocument(supported_doc); - QGridLayout *layout = new QGridLayout(); - layout->addWidget(icon, 0, 0, 1, 1); - layout->addWidget(gpl_home_info, 0, 1, 1, 1); - layout->addWidget(support_list, 1, 1, 1, 1); + QHBoxLayout *h_layout = new QHBoxLayout(); + h_layout->setAlignment(Qt::AlignLeft); + h_layout->addWidget(icon); + h_layout->addWidget(gpl_home_info); + + QVBoxLayout *layout = new QVBoxLayout(); + layout->addLayout(h_layout); + layout->addWidget(support_list); QWidget *page = new QWidget(parent); page->setLayout(layout); @@ -565,6 +579,50 @@ void Settings::on_page_changed(QListWidgetItem *current, QListWidgetItem *previo pages->setCurrentIndex(page_list->row(current)); } +void Settings::on_general_theme_changed_changed(int state) +{ + 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_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; @@ -601,6 +659,18 @@ void Settings::on_view_showSamplingPoints_changed(int state) settings.setValue(GlobalSettings::Key_View_ShowSamplingPoints, state ? true : false); } +void Settings::on_view_fillSignalHighAreas_changed(int state) +{ + GlobalSettings settings; + settings.setValue(GlobalSettings::Key_View_FillSignalHighAreas, state ? true : false); +} + +void Settings::on_view_fillSignalHighAreaColor_changed(QColor color) +{ + GlobalSettings settings; + settings.setValue(GlobalSettings::Key_View_FillSignalHighAreaColor, color.rgba()); +} + void Settings::on_view_showAnalogMinorGrid_changed(int state) { GlobalSettings settings; @@ -613,6 +683,18 @@ void Settings::on_view_showHoverMarker_changed(int state) settings.setValue(GlobalSettings::Key_View_ShowHoverMarker, state ? true : false); } +void Settings::on_view_snapDistance_changed(int value) +{ + GlobalSettings settings; + 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; @@ -631,12 +713,20 @@ void Settings::on_view_defaultLogicHeight_changed(int value) settings.setValue(GlobalSettings::Key_View_DefaultLogicHeight, value); } +#ifdef ENABLE_DECODE void Settings::on_dec_initialStateConfigurable_changed(int state) { GlobalSettings settings; settings.setValue(GlobalSettings::Key_Dec_InitialStateConfigurable, state ? true : false); } +void Settings::on_dec_exportFormat_changed(const QString &text) +{ + GlobalSettings settings; + settings.setValue(GlobalSettings::Key_Dec_ExportFormat, text); +} +#endif + void Settings::on_log_logLevel_changed(int value) { logging.set_log_level(value); @@ -665,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(); @@ -676,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();