projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow, View::View: Fix two memory errors reported by valgrind
[pulseview.git]
/
pv
/
dialogs
/
connect.hpp
diff --git
a/pv/dialogs/connect.hpp
b/pv/dialogs/connect.hpp
index a8f793ac1dc3e8f4b73ee9b9f86ead60c19343c6..ce97ba80895959d8cf4241e2989e1af99116be28 100644
(file)
--- a/
pv/dialogs/connect.hpp
+++ b/
pv/dialogs/connect.hpp
@@
-23,11
+23,14
@@
#include <memory>
#include <memory>
+#include <QCheckBox>
#include <QComboBox>
#include <QDialog>
#include <QDialogButtonBox>
#include <QFormLayout>
#include <QComboBox>
#include <QDialog>
#include <QDialogButtonBox>
#include <QFormLayout>
+#include <QHBoxLayout>
#include <QLineEdit>
#include <QLineEdit>
+#include <QSpinBox>
#include <QListWidget>
#include <QPushButton>
#include <QVBoxLayout>
#include <QListWidget>
#include <QPushButton>
#include <QVBoxLayout>
@@
-67,10
+70,11
@@
private:
void unset_connection();
void unset_connection();
- void set_serial_connection(std::shared_ptr<sigrok::Driver> driver);
-
private Q_SLOTS:
private Q_SLOTS:
- void device_selected(int index);
+ void driver_selected(int index);
+
+ void serial_toggled(bool checked);
+ void tcp_toggled(bool checked);
void scan_pressed();
void scan_pressed();
@@
-86,6
+90,11
@@
private:
QComboBox serial_devices_;
QComboBox serial_devices_;
+ QWidget *tcp_config_;
+ QLineEdit *tcp_host_;
+ QSpinBox *tcp_port_;
+ QCheckBox *tcp_use_vxi_;
+
QPushButton scan_button_;
QListWidget device_list_;
QPushButton scan_button_;
QListWidget device_list_;