--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py Sat Apr 26 10:06:49 2014 +0200 +++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py Sat Apr 26 10:36:09 2014 +0200 @@ -140,177 +140,177 @@ """ self.__characterCategories = ( # display name code - (self.tr("Letter, Any"), "L"), - (self.tr("Letter, Lower case"), "Ll"), - (self.tr("Letter, Modifier"), "Lm"), - (self.tr("Letter, Other"), "Lo"), - (self.tr("Letter, Title case"), "Lt"), - (self.tr("Letter, Upper case"), "Lu"), - (self.tr("Letter, Lower, Upper or Title"), "L&"), - (self.tr("Mark, Any"), "M"), - (self.tr("Mark, Spacing"), "Mc"), - (self.tr("Mark, Enclosing"), "Me"), - (self.tr("Mark, Non-spacing"), "Mn"), - (self.tr("Number, Any"), "N"), - (self.tr("Number, Decimal"), "Nd"), - (self.tr("Number, Letter"), "Nl"), - (self.tr("Number, Other"), "No"), - (self.tr("Punctuation, Any"), "P"), - (self.tr("Punctuation, Connector"), "Pc"), - (self.tr("Punctuation, Dash"), "Pd"), - (self.tr("Punctuation, Close"), "Pe"), - (self.tr("Punctuation, Final"), "Pf"), - (self.tr("Punctuation, Initial"), "Pi"), - (self.tr("Punctuation, Other"), "Po"), - (self.tr("Punctuation, Open"), "Ps"), - (self.tr("Symbol, Any"), "S"), - (self.tr("Symbol, Currency"), "Sc"), - (self.tr("Symbol, Modifier"), "Sk"), - (self.tr("Symbol, Mathematical"), "Sm"), - (self.tr("Symbol, Other"), "So"), - (self.tr("Separator, Any"), "Z"), - (self.tr("Separator, Line"), "Zl"), - (self.tr("Separator, Paragraph"), "Zp"), - (self.tr("Separator, Space"), "Zs"), - (self.tr("Other, Any"), "C"), - (self.tr("Other, Control"), "Cc"), - (self.tr("Other, Format"), "Cf"), - (self.tr("Other, Unassigned"), "Cn"), - (self.tr("Other, Private Use"), "Co"), - (self.tr("Other, Surrogat"), "Cn"), + (self.tr("Letter, Any"), "L"), + (self.tr("Letter, Lower case"), "Ll"), + (self.tr("Letter, Modifier"), "Lm"), + (self.tr("Letter, Other"), "Lo"), + (self.tr("Letter, Title case"), "Lt"), + (self.tr("Letter, Upper case"), "Lu"), + (self.tr("Letter, Lower, Upper or Title"), "L&"), + (self.tr("Mark, Any"), "M"), + (self.tr("Mark, Spacing"), "Mc"), + (self.tr("Mark, Enclosing"), "Me"), + (self.tr("Mark, Non-spacing"), "Mn"), + (self.tr("Number, Any"), "N"), + (self.tr("Number, Decimal"), "Nd"), + (self.tr("Number, Letter"), "Nl"), + (self.tr("Number, Other"), "No"), + (self.tr("Punctuation, Any"), "P"), + (self.tr("Punctuation, Connector"), "Pc"), + (self.tr("Punctuation, Dash"), "Pd"), + (self.tr("Punctuation, Close"), "Pe"), + (self.tr("Punctuation, Final"), "Pf"), + (self.tr("Punctuation, Initial"), "Pi"), + (self.tr("Punctuation, Other"), "Po"), + (self.tr("Punctuation, Open"), "Ps"), + (self.tr("Symbol, Any"), "S"), + (self.tr("Symbol, Currency"), "Sc"), + (self.tr("Symbol, Modifier"), "Sk"), + (self.tr("Symbol, Mathematical"), "Sm"), + (self.tr("Symbol, Other"), "So"), + (self.tr("Separator, Any"), "Z"), + (self.tr("Separator, Line"), "Zl"), + (self.tr("Separator, Paragraph"), "Zp"), + (self.tr("Separator, Space"), "Zs"), + (self.tr("Other, Any"), "C"), + (self.tr("Other, Control"), "Cc"), + (self.tr("Other, Format"), "Cf"), + (self.tr("Other, Unassigned"), "Cn"), + (self.tr("Other, Private Use"), "Co"), + (self.tr("Other, Surrogat"), "Cn"), ) self.__specialCharacterCategories = ( # display name code - (self.tr("Alphanumeric"), "Xan"), - (self.tr("POSIX Space"), "Xps"), - (self.tr("Perl Space"), "Xsp"), - (self.tr("Universal Character"), "Xuc"), - (self.tr("Perl Word"), "Xan"), + (self.tr("Alphanumeric"), "Xan"), + (self.tr("POSIX Space"), "Xps"), + (self.tr("Perl Space"), "Xsp"), + (self.tr("Universal Character"), "Xuc"), + (self.tr("Perl Word"), "Xan"), ) self.__characterBlocks = ( # display name code - (self.tr("Arabic"), "Arabic"), - (self.tr("Armenian"), "Armenian"), - (self.tr("Avestan"), "Avestan"), - (self.tr("Balinese"), "Balinese"), - (self.tr("Bamum"), "Bamum"), - (self.tr("Batak"), "Batak"), - (self.tr("Bengali"), "Bengali"), - (self.tr("Bopomofo"), "Bopomofo"), - (self.tr("Brahmi"), "Brahmi"), - (self.tr("Braille"), "Braille"), - (self.tr("Buginese"), "Buginese"), - (self.tr("Buhid"), "Buhid"), - (self.tr("Canadian Aboriginal"), "Canadian_Aboriginal"), - (self.tr("Carian"), "Carian"), - (self.tr("Chakma"), "Chakma"), - (self.tr("Cham"), "Cham"), - (self.tr("Cherokee"), "Cherokee"), - (self.tr("Common"), "Common"), - (self.tr("Coptic"), "Coptic"), - (self.tr("Cuneiform"), "Cuneiform"), - (self.tr("Cypriot"), "Cypriot"), - (self.tr("Cyrillic"), "Cyrillic"), - (self.tr("Deseret"), "Deseret,"), - (self.tr("Devanagari"), "Devanagari"), - (self.tr("Egyptian Hieroglyphs"), "Egyptian_Hieroglyphs"), - (self.tr("Ethiopic"), "Ethiopic"), - (self.tr("Georgian"), "Georgian"), - (self.tr("Glagolitic"), "Glagolitic"), - (self.tr("Gothic"), "Gothic"), - (self.tr("Greek"), "Greek"), - (self.tr("Gujarati"), "Gujarati"), - (self.tr("Gurmukhi"), "Gurmukhi"), - (self.tr("Han"), "Han"), - (self.tr("Hangul"), "Hangul"), - (self.tr("Hanunoo"), "Hanunoo"), - (self.tr("Hebrew"), "Hebrew"), - (self.tr("Hiragana"), "Hiragana"), - (self.tr("Imperial Aramaic"), "Imperial_Aramaic"), - (self.tr("Inherited"), "Inherited"), - (self.tr("Inscriptional Pahlavi"), "Inscriptional_Pahlavi"), - (self.tr("Inscriptional Parthian"), "Inscriptional_Parthian"), - (self.tr("Javanese"), "Javanese"), - (self.tr("Kaithi"), "Kaithi"), - (self.tr("Kannada"), "Kannada"), - (self.tr("Katakana"), "Katakana"), - (self.tr("Kayah Li"), "Kayah_Li"), - (self.tr("Kharoshthi"), "Kharoshthi"), - (self.tr("Khmer"), "Khmer"), - (self.tr("Lao"), "Lao"), - (self.tr("Latin"), "Latin"), - (self.tr("Lepcha"), "Lepcha"), - (self.tr("Limbu"), "Limbu"), - (self.tr("Linear B"), "Linear_B"), - (self.tr("Lisu"), "Lisu"), - (self.tr("Lycian"), "Lycian"), - (self.tr("Lydian"), "Lydian"), - (self.tr("Malayalam"), "Malayalam"), - (self.tr("Mandaic"), "Mandaic"), - (self.tr("Meetei Mayek"), "Meetei_Mayek"), - (self.tr("Meroitic Cursive"), "Meroitic_Cursive"), - (self.tr("Meroitic Hieroglyphs"), "Meroitic_Hieroglyphs"), - (self.tr("Miao"), "Miao"), - (self.tr("Mongolian"), "Mongolian"), - (self.tr("Myanmar"), "Myanmar"), - (self.tr("New Tai Lue"), "New_Tai_Lue"), - (self.tr("N'Ko"), "Nko"), - (self.tr("Ogham"), "Ogham"), - (self.tr("Old Italic"), "Old_Italic"), - (self.tr("Old Persian"), "Old_Persian"), - (self.tr("Old South Arabian"), "Old_South_Arabian"), - (self.tr("Old Turkic"), "Old_Turkic,"), - (self.tr("Ol Chiki"), "Ol_Chiki"), - (self.tr("Oriya"), "Oriya"), - (self.tr("Osmanya"), "Osmanya"), - (self.tr("Phags-pa"), "Phags_Pa"), - (self.tr("Phoenician"), "Phoenician"), - (self.tr("Rejang"), "Rejang"), - (self.tr("Runic"), "Runic"), - (self.tr("Samaritan"), "Samaritan"), - (self.tr("Saurashtra"), "Saurashtra"), - (self.tr("Sharada"), "Sharada"), - (self.tr("Shavian"), "Shavian"), - (self.tr("Sinhala"), "Sinhala"), - (self.tr("Sora Sompeng"), "Sora_Sompeng"), - (self.tr("Sundanese"), "Sundanese"), - (self.tr("Syloti Nagri"), "Syloti_Nagri"), - (self.tr("Syriac"), "Syriac"), - (self.tr("Tagalog"), "Tagalog"), - (self.tr("Tagbanwa"), "Tagbanwa"), - (self.tr("Tai Le"), "Tai_Le"), - (self.tr("Tai Tham"), "Tai_Tham"), - (self.tr("Tai Viet"), "Tai_Viet"), - (self.tr("Takri"), "Takri"), - (self.tr("Tamil"), "Tamil"), - (self.tr("Telugu"), "Telugu"), - (self.tr("Thaana"), "Thaana"), - (self.tr("Thai"), "Thai"), - (self.tr("Tibetan"), "Tibetan"), - (self.tr("Tifinagh"), "Tifinagh"), - (self.tr("Ugaritic"), "Ugaritic"), - (self.tr("Vai"), "Vai"), - (self.tr("Yi"), "Yi"), + (self.tr("Arabic"), "Arabic"), + (self.tr("Armenian"), "Armenian"), + (self.tr("Avestan"), "Avestan"), + (self.tr("Balinese"), "Balinese"), + (self.tr("Bamum"), "Bamum"), + (self.tr("Batak"), "Batak"), + (self.tr("Bengali"), "Bengali"), + (self.tr("Bopomofo"), "Bopomofo"), + (self.tr("Brahmi"), "Brahmi"), + (self.tr("Braille"), "Braille"), + (self.tr("Buginese"), "Buginese"), + (self.tr("Buhid"), "Buhid"), + (self.tr("Canadian Aboriginal"), "Canadian_Aboriginal"), + (self.tr("Carian"), "Carian"), + (self.tr("Chakma"), "Chakma"), + (self.tr("Cham"), "Cham"), + (self.tr("Cherokee"), "Cherokee"), + (self.tr("Common"), "Common"), + (self.tr("Coptic"), "Coptic"), + (self.tr("Cuneiform"), "Cuneiform"), + (self.tr("Cypriot"), "Cypriot"), + (self.tr("Cyrillic"), "Cyrillic"), + (self.tr("Deseret"), "Deseret,"), + (self.tr("Devanagari"), "Devanagari"), + (self.tr("Egyptian Hieroglyphs"), "Egyptian_Hieroglyphs"), + (self.tr("Ethiopic"), "Ethiopic"), + (self.tr("Georgian"), "Georgian"), + (self.tr("Glagolitic"), "Glagolitic"), + (self.tr("Gothic"), "Gothic"), + (self.tr("Greek"), "Greek"), + (self.tr("Gujarati"), "Gujarati"), + (self.tr("Gurmukhi"), "Gurmukhi"), + (self.tr("Han"), "Han"), + (self.tr("Hangul"), "Hangul"), + (self.tr("Hanunoo"), "Hanunoo"), + (self.tr("Hebrew"), "Hebrew"), + (self.tr("Hiragana"), "Hiragana"), + (self.tr("Imperial Aramaic"), "Imperial_Aramaic"), + (self.tr("Inherited"), "Inherited"), + (self.tr("Inscriptional Pahlavi"), "Inscriptional_Pahlavi"), + (self.tr("Inscriptional Parthian"), "Inscriptional_Parthian"), + (self.tr("Javanese"), "Javanese"), + (self.tr("Kaithi"), "Kaithi"), + (self.tr("Kannada"), "Kannada"), + (self.tr("Katakana"), "Katakana"), + (self.tr("Kayah Li"), "Kayah_Li"), + (self.tr("Kharoshthi"), "Kharoshthi"), + (self.tr("Khmer"), "Khmer"), + (self.tr("Lao"), "Lao"), + (self.tr("Latin"), "Latin"), + (self.tr("Lepcha"), "Lepcha"), + (self.tr("Limbu"), "Limbu"), + (self.tr("Linear B"), "Linear_B"), + (self.tr("Lisu"), "Lisu"), + (self.tr("Lycian"), "Lycian"), + (self.tr("Lydian"), "Lydian"), + (self.tr("Malayalam"), "Malayalam"), + (self.tr("Mandaic"), "Mandaic"), + (self.tr("Meetei Mayek"), "Meetei_Mayek"), + (self.tr("Meroitic Cursive"), "Meroitic_Cursive"), + (self.tr("Meroitic Hieroglyphs"), "Meroitic_Hieroglyphs"), + (self.tr("Miao"), "Miao"), + (self.tr("Mongolian"), "Mongolian"), + (self.tr("Myanmar"), "Myanmar"), + (self.tr("New Tai Lue"), "New_Tai_Lue"), + (self.tr("N'Ko"), "Nko"), + (self.tr("Ogham"), "Ogham"), + (self.tr("Old Italic"), "Old_Italic"), + (self.tr("Old Persian"), "Old_Persian"), + (self.tr("Old South Arabian"), "Old_South_Arabian"), + (self.tr("Old Turkic"), "Old_Turkic,"), + (self.tr("Ol Chiki"), "Ol_Chiki"), + (self.tr("Oriya"), "Oriya"), + (self.tr("Osmanya"), "Osmanya"), + (self.tr("Phags-pa"), "Phags_Pa"), + (self.tr("Phoenician"), "Phoenician"), + (self.tr("Rejang"), "Rejang"), + (self.tr("Runic"), "Runic"), + (self.tr("Samaritan"), "Samaritan"), + (self.tr("Saurashtra"), "Saurashtra"), + (self.tr("Sharada"), "Sharada"), + (self.tr("Shavian"), "Shavian"), + (self.tr("Sinhala"), "Sinhala"), + (self.tr("Sora Sompeng"), "Sora_Sompeng"), + (self.tr("Sundanese"), "Sundanese"), + (self.tr("Syloti Nagri"), "Syloti_Nagri"), + (self.tr("Syriac"), "Syriac"), + (self.tr("Tagalog"), "Tagalog"), + (self.tr("Tagbanwa"), "Tagbanwa"), + (self.tr("Tai Le"), "Tai_Le"), + (self.tr("Tai Tham"), "Tai_Tham"), + (self.tr("Tai Viet"), "Tai_Viet"), + (self.tr("Takri"), "Takri"), + (self.tr("Tamil"), "Tamil"), + (self.tr("Telugu"), "Telugu"), + (self.tr("Thaana"), "Thaana"), + (self.tr("Thai"), "Thai"), + (self.tr("Tibetan"), "Tibetan"), + (self.tr("Tifinagh"), "Tifinagh"), + (self.tr("Ugaritic"), "Ugaritic"), + (self.tr("Vai"), "Vai"), + (self.tr("Yi"), "Yi"), ) self.__posixNamedSets = ( # display name code - (self.tr("Alphanumeric"), "alnum"), - (self.tr("Alphabetic"), "alpha"), - (self.tr("ASCII"), "ascii"), - (self.tr("Word Letter"), "word"), - (self.tr("Lower Case Letter"), "lower"), - (self.tr("Upper Case Letter"), "upper"), - (self.tr("Decimal Digit"), "digit"), - (self.tr("Hexadecimal Digit"), "xdigit"), - (self.tr("Space or Tab"), "blank"), - (self.tr("White Space"), "space"), - (self.tr("Printing (excl. space)"), "graph"), - (self.tr("Printing (incl. space)"), "print"), - (self.tr("Printing (excl. alphanumeric)"), "punct"), - (self.tr("Control Character"), "cntrl"), + (self.tr("Alphanumeric"), "alnum"), + (self.tr("Alphabetic"), "alpha"), + (self.tr("ASCII"), "ascii"), + (self.tr("Word Letter"), "word"), + (self.tr("Lower Case Letter"), "lower"), + (self.tr("Upper Case Letter"), "upper"), + (self.tr("Decimal Digit"), "digit"), + (self.tr("Hexadecimal Digit"), "xdigit"), + (self.tr("Space or Tab"), "blank"), + (self.tr("White Space"), "space"), + (self.tr("Printing (excl. space)"), "graph"), + (self.tr("Printing (incl. space)"), "print"), + (self.tr("Printing (excl. alphanumeric)"), "punct"), + (self.tr("Control Character"), "cntrl"), ) def __populateCharTypeCombo(self, combo, isSingle):