beremiz: comparison editors/CodeFileEditor.py

equal deleted inserted replaced

-:31e63e25b4cc
+:64beb9e9c749
 from editors.ConfTreeNodeEditor import ConfTreeNodeEditor
 from util.BitmapLibrary import GetBitmap
 from controls.CustomStyledTextCtrl import CustomStyledTextCtrl, faces, GetCursorPos, NAVIGATION_KEYS
 from controls.VariablePanel import VARIABLE_NAME_SUFFIX_MODEL
 from graphics.GraphicCommons import ERROR_HIGHLIGHT, SEARCH_RESULT_HIGHLIGHT, REFRESH_HIGHLIGHT_PERIOD
+from util.TranslationCatalogs import NoTranslate
 [STC_CODE_ERROR, STC_CODE_SEARCH_RESULT,
 STC_CODE_SECTION] = range(15, 18)
 HIGHLIGHT_TYPES = {
 SEARCH_RESULT_HIGHLIGHT: STC_CODE_SEARCH_RESULT,
 }
 EDGE_COLUMN = 80
 class CodeEditor(CustomStyledTextCtrl):
 KEYWORDS = []
 COMMENT_HEADER = ""
 def __init__(self, parent, window, controler):
 CustomStyledTextCtrl.__init__(self, parent, -1, wx.DefaultPosition,
 wx.Size(-1, 300), 0)
 self.SetMarginType(1, stc.STC_MARGIN_NUMBER)
 self.SetMarginWidth(1, 25)
 self.SetProperty("fold", "1")
 self.SetProperty("tab.timmy.whinge.level", "1")
-self.SetMargins(0,0)
+self.SetMargins(0, 0)
 self.SetViewWhiteSpace(False)
 self.SetEdgeMode(stc.STC_EDGE_BACKGROUND)
 self.SetEdgeColumn(EDGE_COLUMN)
 self.SectionsComments = {}
 for section in self.Controler.SECTIONS_NAMES:
 section_comment = " %s section " % (section)
 len_headers = EDGE_COLUMN - len(section_comment)
-section_comment = self.COMMENT_HEADER * (len_headers / 2) + \
+section_comment = \
-section_comment + \
+self.COMMENT_HEADER * (len_headers / 2) + \
-self.COMMENT_HEADER * (len_headers - len_headers / 2)
+section_comment + \
+self.COMMENT_HEADER * (len_headers - len_headers / 2)
 self.SectionsComments[section] = {
 "comment": section_comment,
 }
 section_end = "$"
 section_infos["pattern"] = re.compile(
 section_infos["comment"] + "(.*)" +
 section_end, re.DOTALL)
-self.SetModEventMask(wx.stc.STC_MOD_BEFOREINSERT|wx.stc.STC_MOD_BEFOREDELETE)
+self.SetModEventMask(wx.stc.STC_MOD_BEFOREINSERT | wx.stc.STC_MOD_BEFOREDELETE)
 self.Bind(wx.stc.EVT_STC_DO_DROP, self.OnDoDrop)
 self.Bind(wx.EVT_KILL_FOCUS, self.OnKillFocus)
 self.Bind(wx.stc.EVT_STC_MODIFIED, self.OnModification)
 self.CurrentFindHighlight = None
 def OnModification(self, event):
 if not self.DisableEvents:
 mod_type = event.GetModificationType()
-if not (mod_type&wx.stc.STC_PERFORMED_UNDO or mod_type&wx.stc.STC_PERFORMED_REDO):
+if not (mod_type & wx.stc.STC_PERFORMED_UNDO or mod_type & wx.stc.STC_PERFORMED_REDO):
-if mod_type&wx.stc.STC_MOD_BEFOREINSERT:
+if mod_type & wx.stc.STC_MOD_BEFOREINSERT:
-if self.CurrentAction == None:
+if self.CurrentAction is None:
 self.StartBuffering()
 elif self.CurrentAction[0] != "Add" or self.CurrentAction[1] != event.GetPosition() - 1:
 self.Controler.EndBuffering()
 self.StartBuffering()
 self.CurrentAction = ("Add", event.GetPosition())
 wx.CallAfter(self.RefreshModel)
-elif mod_type&wx.stc.STC_MOD_BEFOREDELETE:
+elif mod_type & wx.stc.STC_MOD_BEFOREDELETE:
-if self.CurrentAction == None:
+if self.CurrentAction is None:
 self.StartBuffering()
 elif self.CurrentAction[0] != "Delete" or self.CurrentAction[1] != event.GetPosition() + 1:
 self.Controler.EndBuffering()
 self.StartBuffering()
 self.CurrentAction = ("Delete", event.GetPosition())
 event.Skip()
 def OnDoDrop(self, event):
 try:
 values = eval(event.GetDragText())
-except:
+except Exception:
 values = event.GetDragText()
 if isinstance(values, tuple):
 message = None
 if values[3] == self.Controler.GetCurrentLocation():
 self.ResetBuffer()
 self.ParentWindow.RefreshFileMenu()
 self.ParentWindow.RefreshEditMenu()
 self.ParentWindow.RefreshPageTitles()
 def ResetBuffer(self):
-if self.CurrentAction != None:
+if self.CurrentAction is not None:
 self.Controler.EndBuffering()
 self.CurrentAction = None
 def GetCodeText(self):
 parts = self.Controler.GetTextParts()
 new_text = self.GetCodeText()
 if old_text != new_text:
 self.SetText(new_text)
 new_cursor_pos = GetCursorPos(old_text, new_text)
 self.LineScroll(column, line)
-if new_cursor_pos != None:
+if new_cursor_pos is not None:
 self.GotoPos(new_cursor_pos)
 else:
 self.GotoPos(old_cursor_pos)
 self.EmptyUndoBuffer()
 self.DisableEvents = False
 braceAtCaret = caretPos
 if braceAtCaret >= 0:
 braceOpposite = self.BraceMatch(braceAtCaret)
-if braceAtCaret != -1  and braceOpposite == -1:
+if braceAtCaret != -1 and braceOpposite == -1:
 self.BraceBadLight(braceAtCaret)
 else:
 self.BraceHighlight(braceAtCaret, braceOpposite)
 selected_text = self.GetSelectedText()
 if lastChild > lineNum:
 self.HideLines(lineNum+1, lastChild)
 lineNum = lineNum + 1
 def Expand(self, line, doExpand, force=False, visLevels=0, level=-1):
 lastChild = self.GetLastChild(line, level)
 line = line + 1
 else:
 if self.CurrentFindHighlight is not None:
 self.RemoveHighlight(*self.CurrentFindHighlight)
 self.CurrentFindHighlight = None
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 #                        Highlights showing functions
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 def OnRefreshHighlightsTimer(self, event):
 self.RefreshView(True)
 event.Skip()
 self.RefreshHighlightsTimer.Start(int(REFRESH_HIGHLIGHT_PERIOD * 1000), oneShot=True)
 self.RefreshView()
 def RemoveHighlight(self, start, end, highlight_type):
 highlight_type = HIGHLIGHT_TYPES.get(highlight_type, None)
-if (highlight_type is not None and
+if highlight_type is not None and \
-(start, end, highlight_type) in self.Highlights):
+(start, end, highlight_type) in self.Highlights:
 self.Highlights.remove((start, end, highlight_type))
 self.RefreshHighlightsTimer.Start(int(REFRESH_HIGHLIGHT_PERIOD * 1000), oneShot=True)
 def ShowHighlights(self):
 for start, end, highlight_type in self.Highlights:
 self.SetStyling(highlight_end_pos - highlight_start_pos, highlight_type)
 self.StartStyling(highlight_end_pos, 0x00)
 self.SetStyling(len(self.GetText()) - highlight_end_pos, stc.STC_STYLE_DEFAULT)
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 #                         Helper for VariablesGrid values
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 class VariablesTable(CustomTable):
 def GetValue(self, row, col):
 if row < self.GetNumberRows():
 ("AddVariableButton", "add_element", _("Add variable")),
 ("DeleteVariableButton", "remove_element", _("Remove variable")),
 ("UpVariableButton", "up", _("Move variable up")),
 ("DownVariableButton", "down", _("Move variable down"))]:
 button = wx.lib.buttons.GenBitmapButton(self, bitmap=GetBitmap(bitmap),
 size=wx.Size(28, 28), style=wx.NO_BORDER)
 button.SetToolTipString(help)
 setattr(self, name, button)
 controls_sizer.AddWindow(button, border=5, flag=wx.BOTTOM)
 self.VariablesGrid = CustomGrid(self, style=wx.VSCROLL)
 self.SetSizer(main_sizer)
 self.ParentWindow = window
 self.Controler = controler
-self.VariablesDefaultValue = {"Name" : "", "Type" : DefaultType, "Initial": "",
+self.VariablesDefaultValue = {
-"Description":"", "OnChange":"", "Options":""}
+"Name":        "",
+"Type":        DefaultType,
+"Initial":     "",
+"Description": "",
+"OnChange":    "",
+"Options":     ""
+}
 self.Table = VariablesTable(self, [], self.GetVariableTableColnames())
 self.ColAlignements = [wx.ALIGN_RIGHT] +  \
 [wx.ALIGN_LEFT]*(len(self.VariablesDefaultValue))
 self.ColSizes = [20, 150] + [130]*(len(self.VariablesDefaultValue)-1)
 self.VariablesGrid.SetTable(self.Table)
 self.VariablesGrid.SetColAttr(col, attr)
 self.VariablesGrid.SetColSize(col, self.ColSizes[col])
 self.Table.ResetView(self.VariablesGrid)
 def GetVariableTableColnames(self):
-_ = lambda x : x
+_ = NoTranslate
-	return ["#", _("Name"),_("Type"), _("Initial"), _("Description"), _("OnChange"), _("Options")]
+return ["#",
+_("Name"),
+_("Type"),
+_("Initial"),
+_("Description"),
+_("OnChange"),
+_("Options")]
 def RefreshModel(self):
 self.Controler.SetVariables(self.Table.GetData())
 self.RefreshBuffer()
 def DoGetBestSize(self):
 return self.ParentWindow.GetPanelBestSize()
 def ShowErrorMessage(self, message):
-dialog = wx.MessageDialog(self, message, _("Error"), wx.OK|wx.ICON_ERROR)
+dialog = wx.MessageDialog(self, message, _("Error"), wx.OK | wx.ICON_ERROR)
 dialog.ShowModal()
 dialog.Destroy()
 def OnVariablesGridCellChange(self, event):
 row, col = event.GetRow(), event.GetCol()
 if event.GetCol() == 0:
 row = event.GetRow()
 data_type = self.Table.GetValueByName(row, "Type")
 var_name = self.Table.GetValueByName(row, "Name")
 data = wx.TextDataObject(str((var_name, "Global", data_type,
 self.Controler.GetCurrentLocation())))
 dragSource = wx.DropSource(self.VariablesGrid)
 dragSource.SetData(data)
 dragSource.DoDragDrop()
 return
 event.Skip()
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 #                          CodeFileEditor Main Frame Class
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 class CodeFileEditor(ConfTreeNodeEditor):
 CONFNODEEDITOR_TABS = []
 CODE_EDITOR = None
 def _create_CodePanel(self, prnt):
 self.CodeEditorPanel = wx.SplitterWindow(prnt)
 self.CodeEditorPanel.SetMinimumPaneSize(1)
 self.VariablesPanel = VariablesEditor(self.CodeEditorPanel,
-self.ParentWindow, self.Controler)
+self.ParentWindow,
+self.Controler)
 if self.CODE_EDITOR is not None:
 self.CodeEditor = self.CODE_EDITOR(self.CodeEditorPanel,
 self.ParentWindow, self.Controler)
 self.CodeEditorPanel.SplitHorizontally(self.VariablesPanel,
 self.CodeEditor, 150)
 else:
 self.CodeEditorPanel.Initialize(self.VariablesPanel)
 return self.CodeEditorPanel
 self.VariablesPanel.RefreshView()
 self.CodeEditor.RefreshView()
 def Find(self, direction, search_params):
 self.CodeEditor.Find(direction, search_params)

changeset 1784	64beb9e9c749
parent 1782	5b6ad7a7fd9d
child 1834	cd42b426028b