X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fsettings.cpp;h=3507c47203ec1cb92c865d628883d451cce62109;hp=4744567f6b0eef1d6eee0cc14e99e23e447cfae5;hb=b804a6da858bd130a54a8c7ccafd085302a2b3e8;hpb=641574bcc118be0b6dc3a65039ab3497f9d7241a

diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp
index 4744567..3507c47 100644
--- a/pv/dialogs/settings.cpp
+++ b/pv/dialogs/settings.cpp
@@ -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);
@@ -310,14 +314,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<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();
 
@@ -327,7 +329,16 @@ QWidget *Settings::get_about_page(QWidget *parent) const
 
 	s.append("<table>");
 
+	/* Application info */
+	s.append("<tr><td colspan=\"2\"><b>" +
+		tr("Application:") + "</b></td></tr>");
+
+	s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
+		.arg(QApplication::applicationName(),
+		QApplication::applicationVersion()));
+
 	/* Library info */
+	s.append("<tr><td colspan=\"2\"></td></tr>");
 	s.append("<tr><td colspan=\"2\"><b>" +
 		tr("Libraries and features:") + "</b></td></tr>");
 
@@ -462,7 +473,7 @@ QWidget *Settings::get_about_page(QWidget *parent) const
 
 	QGridLayout *layout = new QGridLayout();
 	layout->addWidget(icon, 0, 0, 1, 1);
-	layout->addWidget(version_info, 0, 1, 1, 1);
+	layout->addWidget(gpl_home_info, 0, 1, 1, 1);
 	layout->addWidget(support_list, 1, 1, 1, 1);
 
 	QWidget *page = new QWidget(parent);
@@ -489,6 +500,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());
@@ -595,6 +607,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;