X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=924e70581fa442d064413b2a9b6e5f862d8553aa;hp=142eb3f1c08960a8db7be4cbfe964574c5aa8d1c;hb=7c65709437184b09753d1bcacc02467b8f6171f1;hpb=20f81a58a9778fa7bc0dc4367f913437ed27c5e8

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 142eb3f1..924e7058 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -46,7 +46,7 @@
 #include "dialogs/about.hpp"
 #include "dialogs/connect.hpp"
 #include "dialogs/storeprogress.hpp"
-#include "toolbars/samplingbar.hpp"
+#include "toolbars/mainbar.hpp"
 #include "view/logicsignal.hpp"
 #include "view/view.hpp"
 #ifdef ENABLE_DECODE
@@ -61,7 +61,6 @@
 
 using std::list;
 using std::map;
-using std::pair;
 using std::shared_ptr;
 using std::string;
 
@@ -72,7 +71,7 @@ using sigrok::HardwareDevice;
 namespace pv {
 
 namespace view {
-class SelectableItem;
+class ViewItem;
 }
 
 const char *MainWindow::SettingOpenDirectory = "MainWindow/OpenDirectory";
@@ -95,6 +94,35 @@ MainWindow::MainWindow(DeviceManager &device_manager,
 	}
 }
 
+void MainWindow::run_stop()
+{
+	switch(session_.get_capture_state()) {
+	case Session::Stopped:
+		session_.start_capture([&](QString message) {
+			session_error("Capture failed", message); });
+		break;
+
+	case Session::AwaitingTrigger:
+	case Session::Running:
+		session_.stop_capture();
+		break;
+	}
+}
+
+void MainWindow::select_device(shared_ptr<Device> device)
+{
+	try {
+		session_.set_device(device);
+	} catch(const QString &e) {
+		QMessageBox msg(this);
+		msg.setText(e);
+		msg.setInformativeText(tr("Failed to Select Device"));
+		msg.setStandardButtons(QMessageBox::Ok);
+		msg.setIcon(QMessageBox::Warning);
+		msg.exec();
+	}
+}
+
 void MainWindow::setup_ui()
 {
 	setObjectName(QString::fromUtf8("MainWindow"));
@@ -255,14 +283,12 @@ void MainWindow::setup_ui()
 	addToolBar(toolbar);
 
 	// Setup the sampling bar
-	sampling_bar_ = new toolbars::SamplingBar(session_, this);
+	main_bar_ = new toolbars::MainBar(session_, *this);
 
 	// Populate the device list and select the initially selected device
 	update_device_list();
 
-	connect(sampling_bar_, SIGNAL(run_stop()), this,
-		SLOT(run_stop()));
-	addToolBar(sampling_bar_);
+	addToolBar(main_bar_);
 
 	// Set the title
 	setWindowTitle(tr("PulseView"));
@@ -351,7 +377,7 @@ void MainWindow::restore_ui_settings()
 	device = device_manager_.find_device_from_info(dev_info);
 
 	if (device) {
-		session_.set_device(device);
+		select_device(device);
 		update_device_list();
 	}
 
@@ -368,7 +394,7 @@ void MainWindow::session_error(
 
 void MainWindow::update_device_list()
 {
-	assert(sampling_bar_);
+	assert(main_bar_);
 
 	shared_ptr<Device> selected_device = session_.device();
 	list< shared_ptr<Device> > devices;
@@ -384,13 +410,7 @@ void MainWindow::update_device_list()
 		devices.push_back(selected_device);
 	assert(selected_device);
 
-	list< pair< shared_ptr<Device>, string> > device_list;
-
-	for (auto device : devices)
-		device_list.push_back(make_pair(
-			device, device_manager_.get_display_name(device)));
-
-	sampling_bar_->set_device_list(device_list, selected_device);
+	main_bar_->set_device_list(devices, selected_device);
 }
 
 void MainWindow::closeEvent(QCloseEvent *event)
@@ -484,7 +504,7 @@ void MainWindow::on_actionConnect_triggered()
 	// If the user selected a device, select it in the device list. Select the
 	// current device otherwise.
 	if (dlg.exec())
-		session_.set_device(dlg.get_selected_device());
+		select_device(dlg.get_selected_device());
 
 	update_device_list();
 }
@@ -541,24 +561,9 @@ void MainWindow::add_decoder(srd_decoder *decoder)
 #endif
 }
 
-void MainWindow::run_stop()
-{
-	switch(session_.get_capture_state()) {
-	case SigSession::Stopped:
-		session_.start_capture([&](QString message) {
-			session_error("Capture failed", message); });
-		break;
-
-	case SigSession::AwaitingTrigger:
-	case SigSession::Running:
-		session_.stop_capture();
-		break;
-	}
-}
-
 void MainWindow::capture_state_changed(int state)
 {
-	sampling_bar_->set_capture_state((pv::SigSession::capture_state)state);
+	main_bar_->set_capture_state((pv::Session::capture_state)state);
 }
 
 void MainWindow::device_selected()