From 6502bae09156d19f972addda37b8f65e519b60e6 Mon Sep 17 00:00:00 2001
From: Chris PeBenito <cpebenito@tresys.com>
Date: Tue, 5 Apr 2016 15:26:49 -0400
Subject: [PATCH] apol: revise match all vs. equal options

Where subset is available, keep "match all" option since that is more
likely to be used.  Otherwise, change GUI to "Equal" for correctness.
---
 data/constraintquery.ui            |  4 ++--
 data/objclassquery.ui              |  4 ++--
 data/terulequery.ui                | 12 ++++++------
 setoolsgui/apol/constraintquery.py |  2 +-
 setoolsgui/apol/terulequery.py     |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/data/constraintquery.ui b/data/constraintquery.ui
index 54dd62a..a3654fc 100644
--- a/data/constraintquery.ui
+++ b/data/constraintquery.ui
@@ -657,7 +657,7 @@
            </spacer>
           </item>
           <item row="0" column="3">
-           <widget class="QCheckBox" name="perms_equal">
+           <widget class="QCheckBox" name="perms_subset">
             <property name="toolTip">
              <string>A matching rule will have all of the selected permissions.</string>
             </property>
@@ -783,7 +783,7 @@
   <tabstop>perms</tabstop>
   <tabstop>clear_perms</tabstop>
   <tabstop>invert_perms</tabstop>
-  <tabstop>perms_equal</tabstop>
+  <tabstop>perms_subset</tabstop>
   <tabstop>results_frame</tabstop>
   <tabstop>table_results</tabstop>
   <tabstop>raw_results</tabstop>
diff --git a/data/objclassquery.ui b/data/objclassquery.ui
index d94dde2..c6e4575 100644
--- a/data/objclassquery.ui
+++ b/data/objclassquery.ui
@@ -298,10 +298,10 @@
               <item row="0" column="2">
                <widget class="QCheckBox" name="perms_equal">
                 <property name="toolTip">
-                 <string>A matching class will have all of the selected permissions.</string>
+                 <string>A matching class will have a permission set equal to the selected permissions.</string>
                 </property>
                 <property name="text">
-                 <string>Match All</string>
+                 <string>Equal</string>
                 </property>
                </widget>
               </item>
diff --git a/data/terulequery.ui b/data/terulequery.ui
index 574f584..37b5c7e 100644
--- a/data/terulequery.ui
+++ b/data/terulequery.ui
@@ -844,10 +844,10 @@
           <item row="0" column="3">
            <widget class="QCheckBox" name="bools_equal">
             <property name="toolTip">
-             <string>A matching rule will have all of the selected Booleans in its conditional expression..</string>
+             <string>A matching rule will use a set of Booleans in its conditional expression equal to the selected Booleans.</string>
             </property>
             <property name="text">
-             <string>Match All</string>
+             <string>Equal</string>
             </property>
            </widget>
           </item>
@@ -898,10 +898,10 @@
           <item row="3" column="2">
            <widget class="QCheckBox" name="xperms_equal">
             <property name="toolTip">
-             <string>A matching rule will have all of the extended permissions.</string>
+             <string>A matching rule will have an extended permission set equal to the listed extended permissions.</string>
             </property>
             <property name="text">
-             <string>Match All</string>
+             <string>Equal</string>
             </property>
            </widget>
           </item>
@@ -933,7 +933,7 @@
            </spacer>
           </item>
           <item row="0" column="3">
-           <widget class="QCheckBox" name="perms_equal">
+           <widget class="QCheckBox" name="perms_subset">
             <property name="toolTip">
              <string>A matching rule will have all of the selected permissions.</string>
             </property>
@@ -1022,7 +1022,7 @@
   <tabstop>perms</tabstop>
   <tabstop>clear_perms</tabstop>
   <tabstop>invert_perms</tabstop>
-  <tabstop>perms_equal</tabstop>
+  <tabstop>perms_subset</tabstop>
   <tabstop>default_type</tabstop>
   <tabstop>default_regex</tabstop>
   <tabstop>bool_criteria</tabstop>
diff --git a/setoolsgui/apol/constraintquery.py b/setoolsgui/apol/constraintquery.py
index fc35fc4..7f1fec4 100644
--- a/setoolsgui/apol/constraintquery.py
+++ b/setoolsgui/apol/constraintquery.py
@@ -270,7 +270,7 @@ class ConstraintQueryTab(SEToolsWidget, QScrollArea):
                 rule_types.append(mode.objectName())
 
         self.query.ruletype = rule_types
-        self.query.perms_equal = self.perms_equal.isChecked()
+        self.query.perms_subset = self.perms_subset.isChecked()
 
         # start processing
         self.busy.setLabelText("Processing query...")
diff --git a/setoolsgui/apol/terulequery.py b/setoolsgui/apol/terulequery.py
index 93e4038..ee4b3d5 100644
--- a/setoolsgui/apol/terulequery.py
+++ b/setoolsgui/apol/terulequery.py
@@ -372,7 +372,7 @@ class TERuleQueryTab(SEToolsWidget, QScrollArea):
         self.query.ruletype = rule_types
         self.query.source_indirect = self.source_indirect.isChecked()
         self.query.target_indirect = self.target_indirect.isChecked()
-        self.query.perms_equal = self.perms_equal.isChecked()
+        self.query.perms_subset = self.perms_subset.isChecked()
         self.query.boolean_equal = self.bools_equal.isChecked()
 
         # if query is broad, show warning.