X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.hpp;h=54d24340d7d85229db92576df8efc17bab24a7fc;hp=56a7bd1a643abf3611106afc91d3e7e42a5bd3d0;hb=f4ab4b5c657e5613caba82feaa81a8a400e4f331;hpb=5b35d18ccf2e5a8949d1b4b37d06bf527480e547

diff --git a/pv/popups/channels.hpp b/pv/popups/channels.hpp
index 56a7bd1..54d2434 100644
--- a/pv/popups/channels.hpp
+++ b/pv/popups/channels.hpp
@@ -25,8 +25,10 @@
 #include <memory>
 #include <vector>
 
+#include <QCheckBox>
 #include <QFormLayout>
-#include <QHBoxLayout>
+#include <QGridLayout>
+#include <QLabel>
 #include <QPushButton>
 #include <QSignalMapper>
 
@@ -37,9 +39,6 @@ using std::map;
 using std::shared_ptr;
 using std::vector;
 
-class QCheckBox;
-class QGridLayout;
-
 namespace sigrok {
 	class ChannelGroup;
 }
@@ -71,7 +70,10 @@ 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 disable_channels_conditionally(
 		function<bool (const shared_ptr<data::SignalBase>)> cond_func);
 
 	void populate_group(shared_ptr<sigrok::ChannelGroup> group,
@@ -80,7 +82,6 @@ private:
 	QGridLayout* create_channel_group_grid(
 		const vector< shared_ptr<pv::data::SignalBase> > sigs);
 
-private:
 	void showEvent(QShowEvent *event);
 
 private Q_SLOTS:
@@ -89,9 +90,13 @@ private Q_SLOTS:
 	void enable_all_channels();
 	void disable_all_channels();
 	void enable_all_logic_channels();
+	void disable_all_logic_channels();
 	void enable_all_analog_channels();
+	void disable_all_analog_channels();
 	void enable_all_named_channels();
+	void disable_all_unnamed_channels();
 	void enable_all_changing_channels();
+	void disable_all_non_changing_channels();
 
 private:
 	pv::Session &session_;
@@ -105,10 +110,12 @@ private:
 		check_box_signal_map_;
 	map< shared_ptr<sigrok::ChannelGroup>, QLabel*> group_label_map_;
 
-	QHBoxLayout buttons_bar_;
+	QGridLayout filter_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_;
+	QPushButton enable_all_logic_channels_, disable_all_logic_channels_;
+	QPushButton enable_all_analog_channels_, disable_all_analog_channels_;
+	QPushButton enable_all_named_channels_, disable_all_unnamed_channels_;
+	QPushButton enable_all_changing_channels_, disable_all_non_changing_channels_;
 
 	QSignalMapper check_box_mapper_;
 };