diff -r a5e4cb4bed43 -r cfcfd617216a Tasks/TaskFilterConfigDialog.ui --- a/Tasks/TaskFilterConfigDialog.ui Sat Apr 28 17:00:32 2012 +0200 +++ b/Tasks/TaskFilterConfigDialog.ui Sun Apr 29 16:42:02 2012 +0200 @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>TaskFilterConfigDialog</class> - <widget class="QDialog" name="TaskFilterConfigDialog" > - <property name="geometry" > + <widget class="QDialog" name="TaskFilterConfigDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,44 +10,44 @@ <height>470</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Task filter configuration</string> </property> - <property name="sizeGripEnabled" > + <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <widget class="QLabel" name="label" > - <property name="text" > - <string>Select the categories, the tasks list should be filtered on. Within each category, enter the selection criteria. The enabled categories are combined using an "<b>and</b>" operation.</string> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Select the categories, the tasks list should be filtered on. Within each category, enter the selection criteria. The enabled categories are combined using an "<b>and</b>" operation.</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> </property> - <property name="wordWrap" > + <property name="wordWrap"> <bool>true</bool> </property> </widget> </item> <item> - <widget class="QGroupBox" name="descriptionGroup" > - <property name="focusPolicy" > + <widget class="QGroupBox" name="descriptionGroup"> + <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Select to filter on the task description</string> </property> - <property name="title" > + <property name="title"> <string>Description</string> </property> - <property name="checkable" > + <property name="checkable"> <bool>true</bool> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <widget class="QLineEdit" name="descriptionEdit" > - <property name="toolTip" > + <widget class="QLineEdit" name="descriptionEdit"> + <property name="toolTip"> <string>Enter the description filter as a regular expression.</string> </property> </widget> @@ -55,23 +56,23 @@ </widget> </item> <item> - <widget class="QGroupBox" name="filenameGroup" > - <property name="focusPolicy" > + <widget class="QGroupBox" name="filenameGroup"> + <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Select to filter on the task filename</string> </property> - <property name="title" > + <property name="title"> <string>Filename</string> </property> - <property name="checkable" > + <property name="checkable"> <bool>true</bool> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <widget class="QLineEdit" name="filenameEdit" > - <property name="toolTip" > + <widget class="QLineEdit" name="filenameEdit"> + <property name="toolTip"> <string>Enter the filename filter as a wildcard expression.</string> </property> </widget> @@ -80,37 +81,24 @@ </widget> </item> <item> - <widget class="QGroupBox" name="typeGroup" > - <property name="focusPolicy" > + <widget class="QGroupBox" name="typeGroup"> + <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Select to filter on the task type</string> </property> - <property name="title" > + <property name="title"> <string>Type</string> </property> - <property name="checkable" > + <property name="checkable"> <bool>true</bool> </property> - <layout class="QHBoxLayout" > + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <widget class="QRadioButton" name="standardRadioButton" > - <property name="toolTip" > - <string>Select to show standard tasks only</string> - </property> - <property name="text" > - <string>Standard tasks</string> - </property> - </widget> - </item> - <item> - <widget class="QRadioButton" name="bugfixRadioButton" > - <property name="toolTip" > - <string>Select to show bugfix tasks only</string> - </property> - <property name="text" > - <string>Bugfix tasks</string> + <widget class="QComboBox" name="typeCombo"> + <property name="toolTip"> + <string>Select the task type to be shown</string> </property> </widget> </item> @@ -118,36 +106,36 @@ </widget> </item> <item> - <widget class="QGroupBox" name="scopeGroup" > - <property name="focusPolicy" > + <widget class="QGroupBox" name="scopeGroup"> + <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Select to filter on the task scope</string> </property> - <property name="title" > + <property name="title"> <string>Scope</string> </property> - <property name="checkable" > + <property name="checkable"> <bool>true</bool> </property> - <layout class="QHBoxLayout" > + <layout class="QHBoxLayout"> <item> - <widget class="QRadioButton" name="globalRadioButton" > - <property name="toolTip" > + <widget class="QRadioButton" name="globalRadioButton"> + <property name="toolTip"> <string>Select to show global tasks only</string> </property> - <property name="text" > + <property name="text"> <string>Global tasks</string> </property> </widget> </item> <item> - <widget class="QRadioButton" name="projectRadioButton" > - <property name="toolTip" > + <widget class="QRadioButton" name="projectRadioButton"> + <property name="toolTip"> <string>Select to show project tasks only</string> </property> - <property name="text" > + <property name="text"> <string>Project tasks</string> </property> </widget> @@ -156,36 +144,36 @@ </widget> </item> <item> - <widget class="QGroupBox" name="statusGroup" > - <property name="focusPolicy" > + <widget class="QGroupBox" name="statusGroup"> + <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Select to filter on the task completion status</string> </property> - <property name="title" > + <property name="title"> <string>Completion status</string> </property> - <property name="checkable" > + <property name="checkable"> <bool>true</bool> </property> - <layout class="QHBoxLayout" > + <layout class="QHBoxLayout"> <item> - <widget class="QRadioButton" name="uncompletedRadioButton" > - <property name="toolTip" > + <widget class="QRadioButton" name="uncompletedRadioButton"> + <property name="toolTip"> <string>Select to show uncompleted tasks only</string> </property> - <property name="text" > + <property name="text"> <string>Uncompleted tasks</string> </property> </widget> </item> <item> - <widget class="QRadioButton" name="completedRadioButton" > - <property name="toolTip" > + <widget class="QRadioButton" name="completedRadioButton"> + <property name="toolTip"> <string>Select to show completed tasks only</string> </property> - <property name="text" > + <property name="text"> <string>Completed tasks</string> </property> </widget> @@ -194,46 +182,46 @@ </widget> </item> <item> - <widget class="QGroupBox" name="priorityGroup" > - <property name="focusPolicy" > + <widget class="QGroupBox" name="priorityGroup"> + <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Select to filter on the task priority</string> </property> - <property name="title" > + <property name="title"> <string>Priority</string> </property> - <property name="checkable" > + <property name="checkable"> <bool>true</bool> </property> - <layout class="QHBoxLayout" > + <layout class="QHBoxLayout"> <item> - <widget class="QCheckBox" name="priorityHighCheckBox" > - <property name="toolTip" > + <widget class="QCheckBox" name="priorityHighCheckBox"> + <property name="toolTip"> <string>Select to show high priority tasks</string> </property> - <property name="text" > + <property name="text"> <string>High priority tasks</string> </property> </widget> </item> <item> - <widget class="QCheckBox" name="priorityNormalCheckBox" > - <property name="toolTip" > + <widget class="QCheckBox" name="priorityNormalCheckBox"> + <property name="toolTip"> <string>Select to show normal priority tasks</string> </property> - <property name="text" > + <property name="text"> <string>Normal priority tasks</string> </property> </widget> </item> <item> - <widget class="QCheckBox" name="priorityLowCheckBox" > - <property name="toolTip" > + <widget class="QCheckBox" name="priorityLowCheckBox"> + <property name="toolTip"> <string>Select to show low priority tasks</string> </property> - <property name="text" > + <property name="text"> <string>Low priority tasks</string> </property> </widget> @@ -242,11 +230,11 @@ </widget> </item> <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> @@ -259,8 +247,7 @@ <tabstop>filenameGroup</tabstop> <tabstop>filenameEdit</tabstop> <tabstop>typeGroup</tabstop> - <tabstop>standardRadioButton</tabstop> - <tabstop>bugfixRadioButton</tabstop> + <tabstop>typeCombo</tabstop> <tabstop>scopeGroup</tabstop> <tabstop>globalRadioButton</tabstop> <tabstop>projectRadioButton</tabstop> @@ -271,6 +258,7 @@ <tabstop>priorityHighCheckBox</tabstop> <tabstop>priorityNormalCheckBox</tabstop> <tabstop>priorityLowCheckBox</tabstop> + <tabstop>buttonBox</tabstop> </tabstops> <resources/> <connections> @@ -280,11 +268,11 @@ <receiver>TaskFilterConfigDialog</receiver> <slot>accept()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>46</x> <y>425</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>46</x> <y>445</y> </hint> @@ -296,11 +284,11 @@ <receiver>TaskFilterConfigDialog</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>168</x> <y>432</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>168</x> <y>452</y> </hint>