X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fsettings.cpp;h=0104b7c9e32f3de4c146c52ab6326e7fb8b68b9d;hp=a3738b73e0920da9163e129d53d63b7f8c4330ac;hb=d008cab11b7508601e793d47e53a87be9972aed1;hpb=87a97d8aa169936ec2dcd229df88b8c5b4a1411c diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp index a3738b73..0104b7c9 100644 --- a/pv/dialogs/settings.cpp +++ b/pv/dialogs/settings.cpp @@ -40,6 +40,8 @@ #include #endif +using std::shared_ptr; + namespace pv { namespace dialogs { @@ -55,11 +57,12 @@ Settings::Settings(DeviceManager &device_manager, QWidget *parent) : page_list->setViewMode(QListView::IconMode); page_list->setIconSize(QSize(icon_size, icon_size)); page_list->setMovement(QListView::Static); - page_list->setMaximumWidth(icon_size + icon_size/2); + page_list->setMaximumWidth(icon_size + (icon_size / 2)); page_list->setSpacing(12); pages = new QStackedWidget; create_pages(); + page_list->setCurrentIndex(page_list->model()->index(0, 0)); QHBoxLayout *tab_layout = new QHBoxLayout; tab_layout->addWidget(page_list); @@ -88,7 +91,7 @@ void Settings::create_pages() pages->addWidget(get_view_settings_form(pages)); QListWidgetItem *viewButton = new QListWidgetItem(page_list); - viewButton->setIcon(QIcon(":/icons/sigrok-logo-notext.svg")); + viewButton->setIcon(QIcon(":/icons/settings-views.svg")); viewButton->setText(tr("Views")); viewButton->setTextAlignment(Qt::AlignHCenter); viewButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); @@ -132,9 +135,30 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const connect(sticky_scrolling_cb, SIGNAL(stateChanged(int)), this, SLOT(on_view_stickyScrolling_changed(int))); trace_view_layout->addRow(tr("Always keep &newest samples at the right edge during capture"), sticky_scrolling_cb); + QCheckBox *show_sampling_points_cb = new QCheckBox(); + show_sampling_points_cb->setChecked(settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool()); + connect(show_sampling_points_cb, SIGNAL(stateChanged(int)), this, SLOT(on_view_showSamplingPoints_changed(int))); + trace_view_layout->addRow(tr("Show data &sampling points"), show_sampling_points_cb); + + QCheckBox *show_analog_minor_grid_cb = new QCheckBox(); + show_analog_minor_grid_cb->setChecked(settings.value(GlobalSettings::Key_View_ShowAnalogMinorGrid).toBool()); + connect(show_analog_minor_grid_cb, SIGNAL(stateChanged(int)), this, SLOT(on_view_showAnalogMinorGrid_changed(int))); + trace_view_layout->addRow(tr("Show analog minor grid in addition to vdiv grid"), show_analog_minor_grid_cb); + return form; } +#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 @@ -153,49 +177,63 @@ QWidget *Settings::get_about_page(QWidget *parent) const QApplication::organizationDomain())); version_info->setOpenExternalLinks(true); - std::shared_ptr context = device_manager_.context(); + shared_ptr context = device_manager_.context(); QString s; + + s.append(""); + s.append(""); + /* Library info */ + s.append(""); + s.append(QString("") + .arg(QString("Qt"), qVersion())); + s.append(QString("") + .arg(QString("libsigrok"), sr_package_version_string_get(), sr_lib_version_string_get())); +#ifdef ENABLE_DECODE + s.append(QString("") + .arg(QString("libsigrokdecode"), srd_package_version_string_get(), srd_lib_version_string_get())); +#endif + /* Set up the supported field */ s.append(""); + tr("Supported hardware drivers:") + ""); for (auto entry : context->drivers()) { - s.append(QString("") + s.append(QString("") .arg(QString::fromUtf8(entry.first.c_str()), QString::fromUtf8(entry.second->long_name().c_str()))); } s.append(""); + tr("Supported input formats:") + ""); for (auto entry : context->input_formats()) { - s.append(QString("") + s.append(QString("") .arg(QString::fromUtf8(entry.first.c_str()), QString::fromUtf8(entry.second->description().c_str()))); } s.append(""); + tr("Supported output formats:") + ""); for (auto entry : context->output_formats()) { - s.append(QString("") + s.append(QString("") .arg(QString::fromUtf8(entry.first.c_str()), QString::fromUtf8(entry.second->description().c_str()))); } #ifdef ENABLE_DECODE s.append(""); - for (const GSList *l = srd_decoder_list(); l; l = l->next) { + tr("Supported protocol decoders:") + ""); + 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; - s.append(QString("") + s.append(QString("") .arg(QString::fromUtf8(dec->id), QString::fromUtf8(dec->longname))); } + g_slist_free(sl); #endif s.append("
" + + tr("Used libraries:") + "
%1%2
%1%2 (lib version %3)
%1%2 (lib version %3)
" + - tr("Supported hardware drivers:") + - "
%1%2
%1%2
" + - tr("Supported input formats:") + - "
%1%2
%1%2
" + - tr("Supported output formats:") + - "
%1%2
%1%2
" + - tr("Supported protocol decoders:") + - "
%1%2
%1%2
"); @@ -259,6 +297,17 @@ void Settings::on_view_stickyScrolling_changed(int state) settings.setValue(GlobalSettings::Key_View_StickyScrolling, state ? true : false); } +void Settings::on_view_showSamplingPoints_changed(int state) +{ + GlobalSettings settings; + settings.setValue(GlobalSettings::Key_View_ShowSamplingPoints, state ? true : false); +} + +void Settings::on_view_showAnalogMinorGrid_changed(int state) +{ + GlobalSettings settings; + settings.setValue(GlobalSettings::Key_View_ShowAnalogMinorGrid, state ? true : false); +} } // namespace dialogs } // namespace pv