X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=b6cca7b2edadb99d8313b7d92ccbf4313c028386;hb=051ba3b399abbd83fea8b7ef6f8876884ac0786c;hp=eaaea089964c9ba32c245e6d8641c6c592997a02;hpb=eb8269e3b5eebdd77e6a82d42bcfdfbc3f7613a9;p=pulseview.git

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index eaaea08..b6cca7b 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -43,7 +43,6 @@
 #include "globalsettings.hpp"
 #include "util.hpp"
 #include "devices/hardwaredevice.hpp"
-#include "dialogs/about.hpp"
 #include "dialogs/settings.hpp"
 #include "toolbars/mainbar.hpp"
 #include "view/view.hpp"
@@ -78,7 +77,6 @@ MainWindow::MainWindow(DeviceManager &device_manager,
 	device_manager_(device_manager),
 	session_selector_(this),
 	session_state_mapper_(this),
-	action_about_(new QAction(this)),
 	icon_red_(":/icons/status-red.svg"),
 	icon_green_(":/icons/status-green.svg"),
 	icon_grey_(":/icons/status-grey.svg")
@@ -89,6 +87,9 @@ MainWindow::MainWindow(DeviceManager &device_manager,
 	GlobalSettings::register_change_handler(GlobalSettings::Key_View_ColouredBG,
 		bind(&MainWindow::on_settingViewColouredBg_changed, this, _1));
 
+	GlobalSettings::register_change_handler(GlobalSettings::Key_View_ShowSamplingPoints,
+		bind(&MainWindow::on_settingViewShowSamplingPoints_changed, this, _1));
+
 	setup_ui();
 	restore_ui_settings();
 
@@ -124,11 +125,6 @@ MainWindow::~MainWindow()
 		remove_session(sessions_.front());
 }
 
-QAction* MainWindow::action_about() const
-{
-	return action_about_;
-}
-
 shared_ptr<views::ViewBase> MainWindow::get_active_view() const
 {
 	// If there's only one view, use it...
@@ -209,8 +205,8 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
 		views::TraceView::View *tv =
 			qobject_cast<views::TraceView::View*>(v.get());
 
-		tv->enable_sticky_scrolling(true);
 		tv->enable_coloured_bg(settings.value(GlobalSettings::Key_View_ColouredBG).toBool());
+		tv->enable_show_sampling_points(settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool());
 
 		if (!main_bar) {
 			/* Initial view, create the main bar */
@@ -351,12 +347,12 @@ void MainWindow::setup_ui()
 	view_sticky_scrolling_shortcut_ = new QShortcut(QKeySequence(Qt::Key_S), this, SLOT(on_view_sticky_scrolling_shortcut()));
 	view_sticky_scrolling_shortcut_->setAutoRepeat(false);
 
+	view_show_sampling_points_shortcut_ = new QShortcut(QKeySequence(Qt::Key_Period), this, SLOT(on_view_show_sampling_points_shortcut()));
+	view_show_sampling_points_shortcut_->setAutoRepeat(false);
+
 	view_coloured_bg_shortcut_ = new QShortcut(QKeySequence(Qt::Key_B), this, SLOT(on_view_coloured_bg_shortcut()));
 	view_coloured_bg_shortcut_->setAutoRepeat(false);
 
-	action_about_->setObjectName(QString::fromUtf8("actionAbout"));
-	action_about_->setToolTip(tr("&About..."));
-
 	// Set up the tab area
 	new_session_button_ = new QToolButton();
 	new_session_button_->setIcon(QIcon::fromTheme("document-new",
@@ -611,7 +607,7 @@ void MainWindow::on_run_stop_clicked()
 
 void MainWindow::on_settings_clicked()
 {
-	dialogs::Settings dlg;
+	dialogs::Settings dlg(device_manager_);
 	dlg.exec();
 }
 
@@ -727,21 +723,28 @@ void MainWindow::on_tab_close_requested(int index)
 		remove_session(session);
 }
 
+void MainWindow::on_view_coloured_bg_shortcut()
+{
+	GlobalSettings settings;
+
+	bool state = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
+	settings.setValue(GlobalSettings::Key_View_ColouredBG, !state);
+}
+
 void MainWindow::on_view_sticky_scrolling_shortcut()
 {
-	shared_ptr<views::ViewBase> viewbase = get_active_view();
-	views::TraceView::View* view =
-		qobject_cast<views::TraceView::View*>(viewbase.get());
-	if (view)
-		view->toggle_sticky_scrolling();
+	GlobalSettings settings;
+
+	bool state = settings.value(GlobalSettings::Key_View_StickyScrolling).toBool();
+	settings.setValue(GlobalSettings::Key_View_StickyScrolling, !state);
 }
 
-void MainWindow::on_view_coloured_bg_shortcut()
+void MainWindow::on_view_show_sampling_points_shortcut()
 {
 	GlobalSettings settings;
 
-	bool state = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
-	settings.setValue(GlobalSettings::Key_View_ColouredBG, !state);
+	bool state = settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool();
+	settings.setValue(GlobalSettings::Key_View_ShowSamplingPoints, !state);
 }
 
 void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value)
@@ -759,10 +762,19 @@ void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value)
 	}
 }
 
-void MainWindow::on_actionAbout_triggered()
+void MainWindow::on_settingViewShowSamplingPoints_changed(const QVariant new_value)
 {
-	dialogs::About dlg(device_manager_.context(), this);
-	dlg.exec();
+	bool state = new_value.toBool();
+
+	for (auto entry : view_docks_) {
+		shared_ptr<views::ViewBase> viewbase = entry.second;
+
+		// Only trace views have this setting
+		views::TraceView::View* view =
+				qobject_cast<views::TraceView::View*>(viewbase.get());
+		if (view)
+			view->enable_show_sampling_points(state);
+	}
 }
 
 void MainWindow::on_close_current_tab()