--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.ui Sat Apr 28 16:12:31 2012 +0200 +++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.ui Sat Apr 28 17:00:32 2012 +0200 @@ -1,73 +1,102 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>QRegExpWizardCharactersDialog</class> - <widget class="QDialog" name="QRegExpWizardCharactersDialog" > - <property name="geometry" > + <widget class="QDialog" name="QRegExpWizardCharactersDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>800</width> + <width>850</width> <height>500</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Editor for character sets</string> </property> - <property name="sizeGripEnabled" > + <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <widget class="QCheckBox" name="negativeCheckBox" > - <property name="text" > + <widget class="QCheckBox" name="negativeCheckBox"> + <property name="text"> <string>The defined characters should not match</string> </property> </widget> </item> <item> - <widget class="QGroupBox" name="groupBox" > - <property name="title" > + <widget class="QGroupBox" name="predefinedBox"> + <property name="title"> <string>Predefined character ranges</string> </property> - <layout class="QGridLayout" > - <item row="1" column="2" > - <widget class="QCheckBox" name="nonWhitespaceCheckBox" > - <property name="text" > - <string>Non-whitespace characters</string> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QCheckBox" name="wordCharCheckBox"> + <property name="text"> + <string>Word character</string> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QCheckBox" name="nonDigitsCheckBox" > - <property name="text" > + <item row="0" column="1" rowspan="2"> + <widget class="QCheckBox" name="digitsCheckBox"> + <property name="text"> + <string>Digits</string> + </property> + </widget> + </item> + <item row="0" column="2" rowspan="2"> + <widget class="QCheckBox" name="whitespaceCheckBox"> + <property name="text"> + <string>Whitespace characters</string> + </property> + </widget> + </item> + <item row="1" column="0" rowspan="2"> + <widget class="QCheckBox" name="nonWordCharCheckBox"> + <property name="text"> + <string>Non-word characters</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QCheckBox" name="nonDigitsCheckBox"> + <property name="text"> <string>Non-digits</string> </property> </widget> </item> - <item row="0" column="2" > - <widget class="QCheckBox" name="whitespaceCheckBox" > - <property name="text" > - <string>Whitespace characters</string> + <item row="2" column="2"> + <widget class="QCheckBox" name="nonWhitespaceCheckBox"> + <property name="text"> + <string>Non-whitespace characters</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QCheckBox" name="w3cInitialIdentifierCheckBox"> + <property name="text"> + <string>Initial name character</string> </property> </widget> </item> - <item row="0" column="1" > - <widget class="QCheckBox" name="digitsCheckBox" > - <property name="text" > - <string>Digits</string> + <item row="3" column="1" colspan="2"> + <widget class="QCheckBox" name="w3cNmtokenCheckBox"> + <property name="text"> + <string>Name character</string> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QCheckBox" name="nonWordCharCheckBox" > - <property name="text" > - <string>Non-word characters</string> + <item row="4" column="0"> + <widget class="QCheckBox" name="w3cNonInitialIdentifierCheckBox"> + <property name="text"> + <string>Non-initial name character</string> </property> </widget> </item> - <item row="0" column="0" > - <widget class="QCheckBox" name="wordCharCheckBox" > - <property name="text" > - <string>Word character</string> + <item row="4" column="1" colspan="2"> + <widget class="QCheckBox" name="w3cNonNmtokenCheckBox"> + <property name="text"> + <string>Non-name character</string> </property> </widget> </item> @@ -75,44 +104,44 @@ </widget> </item> <item> - <widget class="QGroupBox" name="singlesBox" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Preferred" > + <widget class="QGroupBox" name="singlesBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="title" > + <property name="title"> <string>Single character</string> </property> </widget> </item> <item> - <widget class="QGroupBox" name="rangesBox" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Preferred" > + <widget class="QGroupBox" name="rangesBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="title" > + <property name="title"> <string>Character ranges</string> </property> </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> </item> </layout> </widget> - <layoutdefault spacing="6" margin="6" /> + <layoutdefault spacing="6" margin="6"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <tabstops> <tabstop>negativeCheckBox</tabstop> @@ -122,6 +151,11 @@ <tabstop>nonDigitsCheckBox</tabstop> <tabstop>whitespaceCheckBox</tabstop> <tabstop>nonWhitespaceCheckBox</tabstop> + <tabstop>w3cInitialIdentifierCheckBox</tabstop> + <tabstop>w3cNonInitialIdentifierCheckBox</tabstop> + <tabstop>w3cNmtokenCheckBox</tabstop> + <tabstop>w3cNonNmtokenCheckBox</tabstop> + <tabstop>buttonBox</tabstop> </tabstops> <resources/> <connections> @@ -131,11 +165,11 @@ <receiver>QRegExpWizardCharactersDialog</receiver> <slot>accept()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>80</x> <y>482</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>80</x> <y>499</y> </hint> @@ -147,11 +181,11 @@ <receiver>QRegExpWizardCharactersDialog</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>229</x> <y>480</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>229</x> <y>498</y> </hint>