Merge remote-tracking branch 'github/master' into d2d

[apitrace] / gui / ui / settings.ui

diff --git a/gui/ui/settings.ui b/gui/ui/settings.ui
index 1e8407075787fa3935c82be90f22d2ae0cc14042..1d2da3e9c4dace78a2aaee5cd49d7b4e5b90bc14 100644 (file)
--- a/gui/ui/settings.ui
+++ b/gui/ui/settings.ui
@@ -2,12 +2,15 @@
 <ui version="4.0">
  <class>Settings</class>
  <widget class="QDialog" name="Settings">
+  <property name="enabled">
+   <bool>true</bool>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>316</width>
-    <height>128</height>
+    <width>571</width>
+    <height>334</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,35 +19,98 @@
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="groupBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="title">
-      <string>Filtered Events</string>
+      <string>Hidden Events</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="QCheckBox" name="extensionsBox">
-        <property name="text">
-         <string>Extension queries</string>
-        </property>
-       </widget>
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QCheckBox" name="extensionsBox">
+          <property name="text">
+           <string>Extension queries</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="functionsBox">
+          <property name="text">
+           <string>Function resolution</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
-      <item row="0" column="1">
-       <widget class="QCheckBox" name="functionsBox">
-        <property name="text">
-         <string>Function resolution</string>
-        </property>
-       </widget>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QCheckBox" name="errorsBox">
+          <property name="text">
+           <string>Error queries</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="statesBox">
+          <property name="text">
+           <string>Extra state queries</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
-      <item row="1" column="0">
-       <widget class="QCheckBox" name="errorsBox">
-        <property name="text">
-         <string>Error queries</string>
-        </property>
-       </widget>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <item>
+         <widget class="QCheckBox" name="customBox">
+          <property name="text">
+           <string>Custom</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="customEdit">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="showFilterBox">
+     <property name="title">
+      <string>Only show the following events</string>
+     </property>
+     <property name="checkable">
+      <bool>true</bool>
+     </property>
+     <property name="checked">
+      <bool>false</bool>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QComboBox" name="showFilterCB"/>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="showFilterEdit"/>
       </item>
-      <item row="1" column="1">
-       <widget class="QCheckBox" name="statesBox">
+      <item>
+       <widget class="QLabel" name="label">
         <property name="text">
-         <string>Extra state queries</string>
+         <string>You can specify one of the predefined categories or create a custom regexp to show only a specific set of events.</string>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
         </property>
        </widget>
       </item>
@@ -72,8 +138,8 @@
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
+     <x>252</x>
+     <y>329</y>
     </hint>
     <hint type="destinationlabel">
      <x>157</x>
@@ -88,8 +154,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
+     <x>320</x>
+     <y>329</y>
     </hint>
     <hint type="destinationlabel">
      <x>286</x>
@@ -97,5 +163,21 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>customBox</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>customEdit</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>63</x>
+     <y>151</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>107</x>
+     <y>151</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>