X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fsettings.cpp;h=1ac8a4c35f8b4203761cd36e2d877d6f1a6deb08;hp=bde6f1676c8a4bdf61178e546e08e702697c5913;hb=39e047cffdbfdb6dd10f3367e600887553a89d74;hpb=03443f37bb0245f686b4178709090dbc9da0c73a diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp index bde6f16..1ac8a4c 100644 --- a/pv/dialogs/settings.cpp +++ b/pv/dialogs/settings.cpp @@ -205,9 +205,9 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const QFormLayout *trace_view_layout = new QFormLayout(); trace_view_group->setLayout(trace_view_layout); - cb = create_checkbox(GlobalSettings::Key_View_ColouredBG, - SLOT(on_view_colouredBG_changed(int))); - trace_view_layout->addRow(tr("Use coloured trace &background"), cb); + cb = create_checkbox(GlobalSettings::Key_View_ColoredBG, + SLOT(on_view_coloredBG_changed(int))); + trace_view_layout->addRow(tr("Use colored trace &background"), cb); cb = create_checkbox(GlobalSettings::Key_View_ZoomToFitDuringAcq, SLOT(on_view_zoomToFitDuringAcq_changed(int))); @@ -233,6 +233,10 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const SLOT(on_view_showAnalogMinorGrid_changed(int))); trace_view_layout->addRow(tr("Show analog minor grid in addition to div grid"), cb); + cb = create_checkbox(GlobalSettings::Key_View_ShowHoverMarker, + SLOT(on_view_showHoverMarker_changed(int))); + trace_view_layout->addRow(tr("Highlight mouse cursor using a vertical marker line"), 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); @@ -264,9 +268,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); @@ -283,6 +288,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; @@ -310,14 +329,12 @@ QWidget *Settings::get_about_page(QWidget *parent) const QLabel *icon = new QLabel(); icon->setPixmap(QPixmap(QString::fromUtf8(":/icons/pulseview.svg"))); - /* Setup the version field */ - QLabel *version_info = new QLabel(); - version_info->setText(tr("%1 %2
%3
%4") - .arg(QApplication::applicationName(), - QApplication::applicationVersion(), + /* 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())); - version_info->setOpenExternalLinks(true); + gpl_home_info->setOpenExternalLinks(true); shared_ptr context = device_manager_.context(); @@ -327,10 +344,13 @@ QWidget *Settings::get_about_page(QWidget *parent) const s.append(""); - /* Library info */ + /* Version, library, and feature info */ s.append(""); + tr("Versions, libraries and features:") + ""); + s.append(QString("") + .arg(QApplication::applicationName(), + QApplication::applicationVersion())); s.append(QString("") .arg(QString("Qt"), qVersion())); s.append(QString("") @@ -460,10 +480,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(version_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); @@ -489,6 +513,7 @@ QWidget *Settings::get_logging_page(QWidget *parent) const // Background buffer size QSpinBox *buffersize_sb = new QSpinBox(); buffersize_sb->setSuffix(tr(" lines")); + buffersize_sb->setMinimum(Logging::MIN_BUFFER_SIZE); buffersize_sb->setMaximum(Logging::MAX_BUFFER_SIZE); buffersize_sb->setValue( settings.value(GlobalSettings::Key_Log_BufferSize).toInt()); @@ -571,10 +596,10 @@ void Settings::on_view_triggerIsZero_changed(int state) settings.setValue(GlobalSettings::Key_View_TriggerIsZeroTime, state ? true : false); } -void Settings::on_view_colouredBG_changed(int state) +void Settings::on_view_coloredBG_changed(int state) { GlobalSettings settings; - settings.setValue(GlobalSettings::Key_View_ColouredBG, state ? true : false); + settings.setValue(GlobalSettings::Key_View_ColoredBG, state ? true : false); } void Settings::on_view_stickyScrolling_changed(int state) @@ -595,6 +620,12 @@ void Settings::on_view_showAnalogMinorGrid_changed(int state) settings.setValue(GlobalSettings::Key_View_ShowAnalogMinorGrid, state ? true : false); } +void Settings::on_view_showHoverMarker_changed(int state) +{ + GlobalSettings settings; + settings.setValue(GlobalSettings::Key_View_ShowHoverMarker, state ? true : false); +} + void Settings::on_view_conversionThresholdDispMode_changed(int state) { GlobalSettings settings; @@ -613,12 +644,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); @@ -670,7 +709,7 @@ void Settings::on_log_popOut_clicked(bool checked) (void)checked; // Create the window as a sub-window so it closes when the main window closes - QMainWindow *window = new QMainWindow(0, Qt::SubWindow); + QMainWindow *window = new QMainWindow(nullptr, Qt::SubWindow); window->setObjectName(QString::fromUtf8("Log Window")); window->setWindowTitle(tr("%1 Log").arg(PV_TITLE));
" + - tr("Libraries and features:") + "
%1%2
%1%2
%1%2