X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdialogs%2Fconnect.hpp;h=d9cf0a53cfc689b3142b64ae4d078b2a3b0ed7fc;hb=1ec3e43f7489cae3a9ca43e665044c8717f345f1;hp=a0bac740a71929dd378f550f05bda2f28e391a0b;hpb=7a01bd3654ed046216308fa64edfd79be7cd525f;p=pulseview.git
diff --git a/pv/dialogs/connect.hpp b/pv/dialogs/connect.hpp
index a0bac74..d9cf0a5 100644
--- a/pv/dialogs/connect.hpp
+++ b/pv/dialogs/connect.hpp
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#ifndef PULSEVIEW_PV_CONNECT_HPP
@@ -23,22 +22,32 @@
#include
+#include
#include
#include
#include
#include
+#include
#include
#include
#include
+#include
#include
+using std::shared_ptr;
+
namespace sigrok {
- class Driver;
- class HardwareDevice;
+class Driver;
+}
+
+namespace pv {
+namespace devices {
+class HardwareDevice;
+}
}
-Q_DECLARE_METATYPE(std::shared_ptr);
-Q_DECLARE_METATYPE(std::shared_ptr);
+Q_DECLARE_METATYPE(shared_ptr);
+Q_DECLARE_METATYPE(shared_ptr);
namespace pv {
@@ -53,19 +62,20 @@ class Connect : public QDialog
public:
Connect(QWidget *parent, pv::DeviceManager &device_manager);
- std::shared_ptr get_selected_device() const;
+ shared_ptr get_selected_device() const;
private:
void populate_drivers();
- void populate_serials(std::shared_ptr driver);
+ void populate_serials(shared_ptr driver);
void unset_connection();
- void set_serial_connection(std::shared_ptr driver);
-
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();
@@ -81,6 +91,11 @@ private:
QComboBox serial_devices_;
+ QWidget *tcp_config_;
+ QLineEdit *tcp_host_;
+ QSpinBox *tcp_port_;
+ QCheckBox *tcp_use_vxi_;
+
QPushButton scan_button_;
QListWidget device_list_;