TERuleQueryTab: convert radio buttons to checkboxes.

Keep UI consistent.
This commit is contained in:
Chris PeBenito 2015-06-07 10:22:43 -04:00
parent ce70c48c28
commit 13d6531947

View File

@ -79,8 +79,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>738</width> <width>98</width>
<height>210</height> <height>88</height>
</rect> </rect>
</property> </property>
<attribute name="label"> <attribute name="label">
@ -391,23 +391,6 @@
<string>Target Type/Attribute</string> <string>Target Type/Attribute</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="gridLayout_5">
<item row="1" column="2">
<widget class="QRadioButton" name="target_regex">
<property name="text">
<string>Regular Expression</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QRadioButton" name="target_exact">
<property name="text">
<string>Exact Match</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLineEdit" name="target"> <widget class="QLineEdit" name="target">
<property name="sizePolicy"> <property name="sizePolicy">
@ -430,7 +413,17 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="2">
<widget class="QCheckBox" name="target_regex">
<property name="toolTip">
<string>Use regular expressions to match the target type/attribute.</string>
</property>
<property name="text">
<string>Regex</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QCheckBox" name="target_indirect"> <widget class="QCheckBox" name="target_indirect">
<property name="toolTip"> <property name="toolTip">
<string>If the rule target is an attribute, indirect will match the criteria against the contents of the attribute, rather than the attribute itself.</string> <string>If the rule target is an attribute, indirect will match the criteria against the contents of the attribute, rather than the attribute itself.</string>
@ -568,22 +561,18 @@
<string>Default Type</string> <string>Default Type</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_4">
<item row="1" column="1"> <item row="0" column="2">
<widget class="QRadioButton" name="default_regex"> <spacer name="horizontalSpacer_6">
<property name="text"> <property name="orientation">
<string>Regular Expression</string> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> <property name="sizeHint" stdset="0">
</item> <size>
<item row="0" column="1"> <width>40</width>
<widget class="QRadioButton" name="default_exact"> <height>20</height>
<property name="text"> </size>
<string>Exact Match</string>
</property> </property>
<property name="checked"> </spacer>
<bool>true</bool>
</property>
</widget>
</item> </item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLineEdit" name="default_type"> <widget class="QLineEdit" name="default_type">
@ -607,18 +596,15 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="0" column="1">
<spacer name="horizontalSpacer_6"> <widget class="QCheckBox" name="default_regex">
<property name="orientation"> <property name="toolTip">
<enum>Qt::Horizontal</enum> <string>Use regular expressions to match the default type.</string>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="text">
<size> <string>Regex</string>
<width>40</width>
<height>20</height>
</size>
</property> </property>
</spacer> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
@ -629,16 +615,6 @@
<string>Permission Set</string> <string>Permission Set</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_6"> <layout class="QGridLayout" name="gridLayout_6">
<item row="1" column="3">
<widget class="QRadioButton" name="perms_equal">
<property name="toolTip">
<string>A matching rule will have all of the selected permissions.</string>
</property>
<property name="text">
<string>Match All</string>
</property>
</widget>
</item>
<item row="1" column="2"> <item row="1" column="2">
<widget class="QPushButton" name="invert_perms"> <widget class="QPushButton" name="invert_perms">
<property name="text"> <property name="text">
@ -689,15 +665,12 @@
</spacer> </spacer>
</item> </item>
<item row="0" column="3"> <item row="0" column="3">
<widget class="QRadioButton" name="perms_any"> <widget class="QCheckBox" name="perms_equal">
<property name="toolTip"> <property name="toolTip">
<string>A matching rule will have at least one of the selected permissions.</string> <string>A matching rule will have all of the selected permissions.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Match Any</string> <string>Match All</string>
</property>
<property name="checked">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
@ -716,19 +689,6 @@
<string>Source Type/Attribute</string> <string>Source Type/Attribute</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="1" column="0">
<widget class="QCheckBox" name="source_indirect">
<property name="toolTip">
<string>If the rule source is an attribute, indirect will match the criteria against the contents of the attribute, rather than the attribute itself.</string>
</property>
<property name="text">
<string>Indirect</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="3"> <item row="0" column="3">
<spacer name="horizontalSpacer_2"> <spacer name="horizontalSpacer_2">
<property name="orientation"> <property name="orientation">
@ -765,16 +725,22 @@
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QRadioButton" name="source_regex"> <widget class="QCheckBox" name="source_regex">
<property name="toolTip">
<string>Use regular expressions to match the source type/attribute.</string>
</property>
<property name="text"> <property name="text">
<string>Regular Expression</string> <string>Regex</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QRadioButton" name="source_exact"> <widget class="QCheckBox" name="source_indirect">
<property name="toolTip">
<string>If the rule source is an attribute, indirect will match the criteria against the contents of the attribute, rather than the attribute itself.</string>
</property>
<property name="text"> <property name="text">
<string>Exact Match</string> <string>Indirect</string>
</property> </property>
<property name="checked"> <property name="checked">
<bool>true</bool> <bool>true</bool>
@ -811,12 +777,6 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>250</width> <width>250</width>
@ -876,29 +836,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="3">
<widget class="QRadioButton" name="bools_any">
<property name="toolTip">
<string>A matching rule will have at least one of the selected Booleans in its conditional expression..</string>
</property>
<property name="text">
<string>Match Any</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QRadioButton" name="bools_equal">
<property name="toolTip">
<string>A matching rule will have all of the selected Booleans in its conditional expression..</string>
</property>
<property name="text">
<string>Match All</string>
</property>
</widget>
</item>
<item row="0" column="2"> <item row="0" column="2">
<widget class="QPushButton" name="clear_bools"> <widget class="QPushButton" name="clear_bools">
<property name="text"> <property name="text">
@ -919,6 +856,16 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<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>
</property>
<property name="text">
<string>Match All</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -955,12 +902,8 @@
<tabstop>clear_ruletypes</tabstop> <tabstop>clear_ruletypes</tabstop>
<tabstop>all_ruletypes</tabstop> <tabstop>all_ruletypes</tabstop>
<tabstop>source</tabstop> <tabstop>source</tabstop>
<tabstop>source_indirect</tabstop>
<tabstop>source_exact</tabstop>
<tabstop>source_regex</tabstop> <tabstop>source_regex</tabstop>
<tabstop>target</tabstop> <tabstop>target</tabstop>
<tabstop>target_indirect</tabstop>
<tabstop>target_exact</tabstop>
<tabstop>target_regex</tabstop> <tabstop>target_regex</tabstop>
<tabstop>tclass</tabstop> <tabstop>tclass</tabstop>
<tabstop>clear_class</tabstop> <tabstop>clear_class</tabstop>
@ -968,15 +911,9 @@
<tabstop>perms</tabstop> <tabstop>perms</tabstop>
<tabstop>clear_perms</tabstop> <tabstop>clear_perms</tabstop>
<tabstop>invert_perms</tabstop> <tabstop>invert_perms</tabstop>
<tabstop>perms_any</tabstop>
<tabstop>perms_equal</tabstop>
<tabstop>default_type</tabstop> <tabstop>default_type</tabstop>
<tabstop>default_exact</tabstop>
<tabstop>default_regex</tabstop>
<tabstop>bool_criteria</tabstop> <tabstop>bool_criteria</tabstop>
<tabstop>clear_bools</tabstop> <tabstop>clear_bools</tabstop>
<tabstop>bools_any</tabstop>
<tabstop>bools_equal</tabstop>
<tabstop>results_expander</tabstop> <tabstop>results_expander</tabstop>
<tabstop>table_results</tabstop> <tabstop>table_results</tabstop>
<tabstop>raw_results</tabstop> <tabstop>raw_results</tabstop>