projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pv::DeviceManager now manages opening/closing devices
[pulseview.git]
/
pv
/
mainwindow.cpp
diff --git
a/pv/mainwindow.cpp
b/pv/mainwindow.cpp
index 16147b14ff6df87f0960a7783c8c07c928efe130..dcbaf1812ab268765e626d69f5c280042c6ff65e 100644
(file)
--- a/
pv/mainwindow.cpp
+++ b/
pv/mainwindow.cpp
@@
-60,7
+60,8
@@
MainWindow::MainWindow(DeviceManager &device_manager,
const char *open_file_name,
QWidget *parent) :
QMainWindow(parent),
const char *open_file_name,
QWidget *parent) :
QMainWindow(parent),
- _device_manager(device_manager)
+ _device_manager(device_manager),
+ _session(device_manager)
{
setup_ui();
if (open_file_name) {
{
setup_ui();
if (open_file_name) {
@@
-184,7
+185,7
@@
void MainWindow::setup_ui()
QMetaObject::connectSlotsByName(this);
// Setup the toolbar
QMetaObject::connectSlotsByName(this);
// Setup the toolbar
- _toolbar = new QToolBar(this);
+ _toolbar = new QToolBar(t
r("Main Toolbar"), t
his);
_toolbar->addAction(_action_open);
_toolbar->addSeparator();
_toolbar->addAction(_action_view_zoom_in);
_toolbar->addAction(_action_open);
_toolbar->addSeparator();
_toolbar->addAction(_action_view_zoom_in);
@@
-278,10
+279,12
@@
void MainWindow::on_actionOpen_triggered()
void MainWindow::on_actionConnect_triggered()
{
dialogs::Connect dlg(this, _device_manager);
void MainWindow::on_actionConnect_triggered()
{
dialogs::Connect dlg(this, _device_manager);
- if (!dlg.exec())
- return;
- struct sr_dev_inst *const sdi = dlg.get_selected_device();
+ // If the user selected a device, select it in the device list. Select the
+ // current device otherwise.
+ struct sr_dev_inst *const sdi = dlg.exec() ?
+ dlg.get_selected_device() : _session.get_device();
+
update_device_list(sdi);
}
update_device_list(sdi);
}