projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainBar: Prevent context menu from appearing
[pulseview.git]
/
pv
/
toolbars
/
mainbar.hpp
diff --git
a/pv/toolbars/mainbar.hpp
b/pv/toolbars/mainbar.hpp
index d5d42f5080497840eafc95db258f1ea19e4ca628..27c947007584c10675161a2814210b3f1a4bdaf5 100644
(file)
--- a/
pv/toolbars/mainbar.hpp
+++ b/
pv/toolbars/mainbar.hpp
@@
-28,10
+28,12
@@
#include <QComboBox>
#include <QDoubleSpinBox>
#include <QComboBox>
#include <QDoubleSpinBox>
+#include <QMenu>
#include <QToolBar>
#include <QToolButton>
#include <pv/session.hpp>
#include <QToolBar>
#include <QToolButton>
#include <pv/session.hpp>
+#include <pv/widgets/devicetoolbutton.hpp>
#include <pv/widgets/popuptoolbutton.hpp>
#include <pv/widgets/sweeptimingwidget.hpp>
#include <pv/widgets/popuptoolbutton.hpp>
#include <pv/widgets/sweeptimingwidget.hpp>
@@
-62,11
+64,7
@@
private:
public:
MainBar(Session &session, pv::MainWindow &main_window);
public:
MainBar(Session &session, pv::MainWindow &main_window);
- void set_device_list(
- const std::list< std::shared_ptr<sigrok::Device> > &devices,
- std::shared_ptr<sigrok::Device> selected);
-
- std::shared_ptr<sigrok::Device> get_selected_device() const;
+ void update_device_list();
void set_capture_state(pv::Session::capture_state state);
void set_capture_state(pv::Session::capture_state state);
@@
-96,8
+94,7
@@
private:
Session &session_;
MainWindow &main_window_;
Session &session_;
MainWindow &main_window_;
- QComboBox device_selector_;
- bool updating_device_selector_;
+ pv::widgets::DeviceToolButton device_selector_;
pv::widgets::PopupToolButton configure_button_;
QAction *configure_button_action_;
pv::widgets::PopupToolButton configure_button_;
QAction *configure_button_action_;