Channel popup: Don't disable channels when clicking the enable buttons

[pulseview.git] / pv / popups / channels.hpp

diff --git a/pv/popups/channels.hpp b/pv/popups/channels.hpp
index d9c5b967f49980e682239b1729766ce8e819a4cb..344d21a824e7bb79e27bc28f0f44054e78d6b24c 100644 (file)
--- a/pv/popups/channels.hpp
+++ b/pv/popups/channels.hpp
@@ -28,6 +28,8 @@
 #include <QCheckBox>
 #include <QFormLayout>
 #include <QGridLayout>
+#include <QHBoxLayout>
+#include <QLabel>
 #include <QPushButton>
 #include <QSignalMapper>
 
@@ -69,7 +71,7 @@ public:
 
 private:
        void set_all_channels(bool set);
-       void set_all_channels_conditionally(
+       void enable_channels_conditionally(
                function<bool (const shared_ptr<data::SignalBase>)> cond_func);
 
        void populate_group(shared_ptr<sigrok::ChannelGroup> group,
@@ -103,7 +105,7 @@ private:
                check_box_signal_map_;
        map< shared_ptr<sigrok::ChannelGroup>, QLabel*> group_label_map_;
 
-       QGridLayout buttons_bar_;
+       QHBoxLayout buttons_bar_;
        QPushButton enable_all_channels_, disable_all_channels_;
        QPushButton enable_all_logic_channels_, enable_all_analog_channels_;
        QPushButton enable_all_named_channels_, enable_all_changing_channels_;