Index: gc_lang/fr/oxt/TextFormatter/TextFormatterEditor.py ================================================================== --- gc_lang/fr/oxt/TextFormatter/TextFormatterEditor.py +++ gc_lang/fr/oxt/TextFormatter/TextFormatterEditor.py @@ -137,10 +137,11 @@ self.xNewPattern = self._addWidget('newreplace', 'Edit', nX+65, nY1+20, 130, 10, FontDescriptor = xFDMono) self.xNewRepl = self._addWidget('newby', 'Edit', nX+200, nY1+20, 100, 10, FontDescriptor = xFDMono) self.xNewRegex = self._addWidget('newregex', 'CheckBox', nX+305, nY1+22, 35, nHeight, Label = ui.get("regex"), HelpText=ui.get("regex_help")) self.xNewCaseSens = self._addWidget('newcasesens', 'CheckBox', nX+340, nY1+22, 40, nHeight, Label = ui.get("casesens"), HelpText=ui.get("casesens_help"), State=True) + self._addWidget('order_info', 'FixedText', nX, nY1+32, 300, nHeight, Label = ui.get("order_info")) self._addWidget('add', 'Button', self.xDialog.Width-50, nY1+31, 40, 11, Label = ui.get('add')) lColumns = [ {"Title": ui.get("name"), "ColumnWidth": 80}, {"Title": ui.get("pattern"), "ColumnWidth": 160}, @@ -236,17 +237,18 @@ def selectionChanged (self, xGridSelectionEvent): try: aRows = self.xGridControl.getSelectedRows() if aRows and len(aRows) == 1: self.iSelectedRow = aRows[0] - self.sSelectedRuleName, sPattern, sRepl, sRegex, sCaseSens = self.xGridModel.GridDataModel.getRowData(self.iSelectedRow) + self.sSelectedRuleName, *_ = self.xGridModel.GridDataModel.getRowData(self.iSelectedRow) # fill fields + dRule = self.dRules[self.sSelectedRuleName] self.xEditName.Text = self.sSelectedRuleName - self.xEditPattern.Text = sPattern - self.xEditRepl.Text = sRepl - self.xEditRegex.State = sRegex == "True" - self.xEditCaseSens.State = sCaseSens == "True" + self.xEditPattern.Text = dRule["sPattern"] + self.xEditRepl.Text = dRule["sRepl"] + self.xEditRegex.State = dRule["bRegex"] + self.xEditCaseSens.State = dRule["bCaseSens"] # enable widgets self.xEditName.Enabled = True self.xEditPattern.Enabled = True self.xEditRepl.Enabled = True self.xEditRegex.Enabled = True @@ -310,11 +312,14 @@ xGridDataModel.addRow(xGridDataModel.RowCount + 1, self._getValuesForRow(sRuleName)) xGridDataModel.sortByColumn(0, True) self._clearAddFields() def _getValuesForRow (self, sRuleName): - return (sRuleName, self.dRules[sRuleName]["sPattern"], self.dRules[sRuleName]["sRepl"], str(self.dRules[sRuleName]["bRegex"]), str(self.dRules[sRuleName]["bCaseSens"])) + return (sRuleName, self.dRules[sRuleName]["sPattern"], + self.dRules[sRuleName]["sRepl"], + "✓" if self.dRules[sRuleName]["bRegex"] else "", + "✓" if self.dRules[sRuleName]["bCaseSens"] else "") def _checkRuleName (self, sRuleName): return re.search(r"^\w[\w_#.,;!?-]{,14}$", sRuleName) def modifyRule (self): Index: gc_lang/fr/oxt/TextFormatter/tfe_strings.py ================================================================== --- gc_lang/fr/oxt/TextFormatter/tfe_strings.py +++ gc_lang/fr/oxt/TextFormatter/tfe_strings.py @@ -26,10 +26,11 @@ "repl": "remplacer par", "regex": "Regex", "regex_help": "Une expression régulière est une forme de syntaxe décrivant un motif de recherche de caractères", "casesens": "Casse rigide", "casesens_help": "La casse des caractères sera respectée telle quelle.", + "order_info": "Les règles seront appliquées dans l’ordre alphabétique défini par leur nom.", "new_entry": "Nouvelle entrée", "edit_entry": "Entrée sélectionnée", "add": "Ajouter", @@ -78,10 +79,11 @@ "repl": "replace by", "regex": "Regex", "regex_help": "A regular expression is a kind of syntax describing a search pattern of characters", "casesens": "Case sensitivity", "casesens_help": "Characters case will be treated as written.", + "order_info": "Rules will applied according to the alphabetical order defined by their name.", "new_entry": "New entry", "edit_entry": "Selected entry", "add": "Add",