X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.hpp;h=972549a8d1c9fd2f65b63e997eb37b1d6440459f;hb=720f47623827824dc77dd9dff643c06e570d9068;hp=344d21a824e7bb79e27bc28f0f44054e78d6b24c;hpb=7ceb2376de956f72e2055467efe0a16a68da4bd8;p=pulseview.git

diff --git a/pv/popups/channels.hpp b/pv/popups/channels.hpp
index 344d21a8..972549a8 100644
--- a/pv/popups/channels.hpp
+++ b/pv/popups/channels.hpp
@@ -28,7 +28,6 @@
 #include <QCheckBox>
 #include <QFormLayout>
 #include <QGridLayout>
-#include <QHBoxLayout>
 #include <QLabel>
 #include <QPushButton>
 #include <QSignalMapper>
@@ -71,16 +70,15 @@ public:
 
 private:
 	void set_all_channels(bool set);
+
 	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,
 		const vector< shared_ptr<pv::data::SignalBase> > sigs);
 
-	QGridLayout* create_channel_group_grid(
-		const vector< shared_ptr<pv::data::SignalBase> > sigs);
-
-private:
 	void showEvent(QShowEvent *event);
 
 private Q_SLOTS:
@@ -89,9 +87,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 +107,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_;
 };