X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=1fb46e13ec483c9fc7da5fb83e544d669baf9046;hp=51ebda8369a05be3ec1d3555cb9e0e5f1bb24015;hb=0466001be51e779b23aaebec1cc9361305c07be9;hpb=baf867eddd4efbc465f5a3490b1ea21dfe7ba597

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 51ebda83..1fb46e13 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -40,6 +40,7 @@
 
 #include "mainwindow.hpp"
 
+#include "application.hpp"
 #include "devicemanager.hpp"
 #include "devices/hardwaredevice.hpp"
 #include "dialogs/settings.hpp"
@@ -71,7 +72,6 @@ MainWindow::MainWindow(DeviceManager &device_manager, QWidget *parent) :
 	QMainWindow(parent),
 	device_manager_(device_manager),
 	session_selector_(this),
-	session_state_mapper_(this),
 	icon_red_(":/icons/status-red.svg"),
 	icon_green_(":/icons/status-green.svg"),
 	icon_grey_(":/icons/status-grey.svg")
@@ -146,7 +146,7 @@ shared_ptr<views::ViewBase> MainWindow::add_view(views::ViewType type,
 	// Only use the view type in the name if it's not the main view
 	QString title;
 	if (main_bar)
-		title = QString("%1 (%2)").arg(session.name()).arg(views::ViewTypeNames[type]);
+		title = QString("%1 (%2)").arg(session.name(), views::ViewTypeNames[type]);
 	else
 		title = session.name();
 
@@ -306,6 +306,9 @@ shared_ptr<subwindows::SubWindowBase> MainWindow::add_subwindow(
 		dock->findChildren<QAbstractButton*>  // clazy:exclude=detaching-temporary
 			("qt_dockwidget_closebutton").front();
 
+	// Allow all subwindows to be closed via ESC.
+	close_btn->setShortcut(QKeySequence(Qt::Key_Escape));
+
 	connect(close_btn, SIGNAL(clicked(bool)),
 		this, SLOT(on_sub_window_close_clicked()));
 
@@ -329,9 +332,10 @@ shared_ptr<Session> MainWindow::add_session()
 		this, SLOT(on_add_view(views::ViewType, Session*)));
 	connect(session.get(), SIGNAL(name_changed()),
 		this, SLOT(on_session_name_changed()));
-	session_state_mapper_.setMapping(session.get(), session.get());
+	connect(session.get(), SIGNAL(device_changed()),
+		this, SLOT(on_session_device_changed()));
 	connect(session.get(), SIGNAL(capture_state_changed(int)),
-		&session_state_mapper_, SLOT(map()));
+		this, SLOT(on_session_capture_state_changed(int)));
 
 	sessions_.push_back(session);
 
@@ -547,8 +551,6 @@ void MainWindow::setup_ui()
 		this, SLOT(on_new_session_clicked()));
 	connect(run_stop_button_, SIGNAL(clicked(bool)),
 		this, SLOT(on_run_stop_clicked()));
-	connect(&session_state_mapper_, SIGNAL(mapped(QObject*)),
-		this, SLOT(on_capture_state_changed(QObject*)));
 	connect(settings_button_, SIGNAL(clicked(bool)),
 		this, SLOT(on_settings_clicked()));
 
@@ -563,6 +565,19 @@ void MainWindow::setup_ui()
 		this, SLOT(on_focus_changed()));
 }
 
+void MainWindow::update_acq_button(Session *session)
+{
+	int state = session->get_capture_state();
+
+	const QString run_caption =
+		session->using_file_device() ? tr("Reload") : tr("Run");
+
+	const QIcon *icons[] = {&icon_grey_, &icon_red_, &icon_green_};
+	run_stop_button_->setIcon(*icons[state]);
+	run_stop_button_->setText((state == pv::Session::Stopped) ?
+		run_caption : tr("Stop"));
+}
+
 void MainWindow::save_ui_settings()
 {
 	QSettings settings;
@@ -675,7 +690,7 @@ void MainWindow::on_focused_session_changed(shared_ptr<Session> session)
 	setWindowTitle(session->name() + " - " + WindowTitle);
 
 	// Update the state of the run/stop button, too
-	on_capture_state_changed(session.get());
+	update_acq_button(session.get());
 }
 
 void MainWindow::on_new_session_clicked()
@@ -736,21 +751,32 @@ void MainWindow::on_session_name_changed()
 		setWindowTitle(session->name() + " - " + WindowTitle);
 }
 
-void MainWindow::on_capture_state_changed(QObject *obj)
+void MainWindow::on_session_device_changed()
 {
-	Session *caller = qobject_cast<Session*>(obj);
+	Session *session = qobject_cast<Session*>(QObject::sender());
+	assert(session);
 
 	// Ignore if caller is not the currently focused session
 	// unless there is only one session
-	if ((sessions_.size() > 1) && (caller != last_focused_session_.get()))
+	if ((sessions_.size() > 1) && (session != last_focused_session_.get()))
 		return;
 
-	int state = caller->get_capture_state();
+	update_acq_button(session);
+}
 
-	const QIcon *icons[] = {&icon_grey_, &icon_red_, &icon_green_};
-	run_stop_button_->setIcon(*icons[state]);
-	run_stop_button_->setText((state == pv::Session::Stopped) ?
-		tr("Run") : tr("Stop"));
+void MainWindow::on_session_capture_state_changed(int state)
+{
+	(void)state;
+
+	Session *session = qobject_cast<Session*>(QObject::sender());
+	assert(session);
+
+	// Ignore if caller is not the currently focused session
+	// unless there is only one session
+	if ((sessions_.size() > 1) && (session != last_focused_session_.get()))
+		return;
+
+	update_acq_button(session);
 }
 
 void MainWindow::on_new_view(Session *session, int view_type)