X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fsettings.cpp;h=ef916f1a57c842c9d34475eb4d7760b077c4dc63;hp=c1833f0df74c0a1de6f93794fb9149b39b57d92d;hb=e91fb166608133382baa1a90cc022bfa47d649de;hpb=72df22b8e67cd47cca3d55a52fd058d37460f1fe

diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp
index c1833f0d..ef916f1a 100644
--- a/pv/dialogs/settings.cpp
+++ b/pv/dialogs/settings.cpp
@@ -149,9 +149,13 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const
 		SLOT(on_view_colouredBG_changed(int)));
 	trace_view_layout->addRow(tr("Use coloured trace &background"), cb);
 
-	cb = create_checkbox(GlobalSettings::Key_View_AlwaysZoomToFit,
-		SLOT(on_view_alwaysZoomToFit_changed(int)));
-	trace_view_layout->addRow(tr("Constantly perform &zoom-to-fit during capture"), cb);
+	cb = create_checkbox(GlobalSettings::Key_View_ZoomToFitDuringAcq,
+		SLOT(on_view_zoomToFitDuringAcq_changed(int)));
+	trace_view_layout->addRow(tr("Constantly perform &zoom-to-fit during acquisition"), cb);
+
+	cb = create_checkbox(GlobalSettings::Key_View_ZoomToFitAfterAcq,
+		SLOT(on_view_zoomToFitAfterAcq_changed(int)));
+	trace_view_layout->addRow(tr("Perform a zoom-to-&fit when acquisition stops"), cb);
 
 	cb = create_checkbox(GlobalSettings::Key_View_StickyScrolling,
 		SLOT(on_view_stickyScrolling_changed(int)));
@@ -211,7 +215,7 @@ QWidget *Settings::get_about_page(QWidget *parent) const
 #endif
 
 	QLabel *icon = new QLabel();
-	icon->setPixmap(QPixmap(QString::fromUtf8(":/icons/sigrok-logo-notext.svg")));
+	icon->setPixmap(QPixmap(QString::fromUtf8(":/icons/pulseview.svg")));
 
 	/* Setup the version field */
 	QLabel *version_info = new QLabel();
@@ -376,10 +380,16 @@ void Settings::on_page_changed(QListWidgetItem *current, QListWidgetItem *previo
 	pages->setCurrentIndex(page_list->row(current));
 }
 
-void Settings::on_view_alwaysZoomToFit_changed(int state)
+void Settings::on_view_zoomToFitDuringAcq_changed(int state)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_View_ZoomToFitDuringAcq, state ? true : false);
+}
+
+void Settings::on_view_zoomToFitAfterAcq_changed(int state)
 {
 	GlobalSettings settings;
-	settings.setValue(GlobalSettings::Key_View_AlwaysZoomToFit, state ? true : false);
+	settings.setValue(GlobalSettings::Key_View_ZoomToFitAfterAcq, state ? true : false);
 }
 
 void Settings::on_view_colouredBG_changed(int state)