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)));
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);
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);
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 quotes for ann text"));
+ 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;
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<br />%3<br /><a href=\"http://%4\">%4</a>")
- .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<br /><a href=\"http://%2\">%2</a>").arg(
tr("GNU GPL, version 3 or later"),
QApplication::organizationDomain()));
- version_info->setOpenExternalLinks(true);
+ gpl_home_info->setOpenExternalLinks(true);
shared_ptr<sigrok::Context> context = device_manager_.context();
s.append("<table>");
- /* Library info */
+ /* Version, library, and feature info */
s.append("<tr><td colspan=\"2\"><b>" +
- tr("Libraries and features:") + "</b></td></tr>");
+ tr("Versions, libraries and features:") + "</b></td></tr>");
+ s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
+ .arg(QApplication::applicationName(),
+ QApplication::applicationVersion()));
s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
.arg(QString("Qt"), qVersion()));
s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
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);
// 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());
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)
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;
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);
(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));