beremiz: comparison IDEFrame.py

equal deleted inserted replaced

-:69dfdb26f600
+:f9d32913bad4
 #  - Item id
 #  - Item callback function name
 #  - Item icon filename
 #  - Item tooltip text
 EditorToolBarItems = {
-"FBD":   [(True, FREEDRAWING_MODE|DRIVENDRAWING_MODE,
+"FBD":   [(True, FREEDRAWING_MODE | DRIVENDRAWING_MODE,
 ID_PLCOPENEDITOREDITORTOOLBARMOTION, "OnMotionTool",
 "move", _("Move the view")),
-(True, FREEDRAWING_MODE|DRIVENDRAWING_MODE,
+(True, FREEDRAWING_MODE | DRIVENDRAWING_MODE,
 ID_PLCOPENEDITOREDITORTOOLBARCOMMENT, "OnCommentTool",
 "add_comment", _("Create a new comment")),
-(True, FREEDRAWING_MODE|DRIVENDRAWING_MODE,
+(True, FREEDRAWING_MODE | DRIVENDRAWING_MODE,
 ID_PLCOPENEDITOREDITORTOOLBARVARIABLE, "OnVariableTool",
 "add_variable", _("Create a new variable")),
-(True, FREEDRAWING_MODE|DRIVENDRAWING_MODE,
+(True, FREEDRAWING_MODE | DRIVENDRAWING_MODE,
 ID_PLCOPENEDITOREDITORTOOLBARBLOCK, "OnBlockTool",
 "add_block", _("Create a new block")),
-(True, FREEDRAWING_MODE|DRIVENDRAWING_MODE,
+(True, FREEDRAWING_MODE | DRIVENDRAWING_MODE,
 ID_PLCOPENEDITOREDITORTOOLBARCONNECTION, "OnConnectionTool",
 "add_connection", _("Create a new connection"))],
-"LD":    [(True, FREEDRAWING_MODE|DRIVENDRAWING_MODE,
+"LD":    [(True, FREEDRAWING_MODE | DRIVENDRAWING_MODE,
 ID_PLCOPENEDITOREDITORTOOLBARMOTION, "OnMotionTool",
 "move", _("Move the view")),
 (True, FREEDRAWING_MODE,
 ID_PLCOPENEDITOREDITORTOOLBARCOMMENT, "OnCommentTool",
 "add_comment", _("Create a new comment")),
 ID_PLCOPENEDITOREDITORTOOLBARRUNG, "OnRungTool",
 "add_rung", _("Create a new rung")),
 (True, FREEDRAWING_MODE,
 ID_PLCOPENEDITOREDITORTOOLBARCOIL, "OnCoilTool",
 "add_coil", _("Create a new coil")),
-(False, FREEDRAWING_MODE|DRIVENDRAWING_MODE,
+(False, FREEDRAWING_MODE | DRIVENDRAWING_MODE,
 ID_PLCOPENEDITOREDITORTOOLBARCONTACT, "OnContactTool",
 "add_contact", _("Create a new contact")),
 (False, DRIVENDRAWING_MODE,
 ID_PLCOPENEDITOREDITORTOOLBARBRANCH, "OnBranchTool",
 "add_branch", _("Create a new branch")),
 (True, FREEDRAWING_MODE,
 ID_PLCOPENEDITOREDITORTOOLBARVARIABLE, "OnVariableTool",
 "add_variable", _("Create a new variable")),
-(False, FREEDRAWING_MODE|DRIVENDRAWING_MODE,
+(False, FREEDRAWING_MODE | DRIVENDRAWING_MODE,
 ID_PLCOPENEDITOREDITORTOOLBARBLOCK, "OnBlockTool",
 "add_block", _("Create a new block")),
 (True, FREEDRAWING_MODE,
 ID_PLCOPENEDITOREDITORTOOLBARCONNECTION, "OnConnectionTool",
 "add_connection", _("Create a new connection"))],
-"SFC":   [(True, FREEDRAWING_MODE|DRIVENDRAWING_MODE,
+"SFC":   [(True, FREEDRAWING_MODE | DRIVENDRAWING_MODE,
 ID_PLCOPENEDITOREDITORTOOLBARMOTION, "OnMotionTool",
 "move", _("Move the view")),
-(True, FREEDRAWING_MODE|DRIVENDRAWING_MODE,
+(True, FREEDRAWING_MODE | DRIVENDRAWING_MODE,
 ID_PLCOPENEDITOREDITORTOOLBARCOMMENT, "OnCommentTool",
 "add_comment", _("Create a new comment")),
-(True, FREEDRAWING_MODE|DRIVENDRAWING_MODE,
+(True, FREEDRAWING_MODE | DRIVENDRAWING_MODE,
 ID_PLCOPENEDITOREDITORTOOLBARINITIALSTEP, "OnInitialStepTool",
 "add_initial_step", _("Create a new initial step")),
-(False, FREEDRAWING_MODE|DRIVENDRAWING_MODE,
+(False, FREEDRAWING_MODE | DRIVENDRAWING_MODE,
 ID_PLCOPENEDITOREDITORTOOLBARSTEP, "OnStepTool",
 "add_step", _("Create a new step")),
 (True, FREEDRAWING_MODE,
 ID_PLCOPENEDITOREDITORTOOLBARTRANSITION, "OnTransitionTool",
 "add_transition", _("Create a new transition")),
-(False, FREEDRAWING_MODE|DRIVENDRAWING_MODE,
+(False, FREEDRAWING_MODE | DRIVENDRAWING_MODE,
 ID_PLCOPENEDITOREDITORTOOLBARACTIONBLOCK, "OnActionBlockTool",
 "add_action", _("Create a new action block")),
-(False, FREEDRAWING_MODE|DRIVENDRAWING_MODE,
+(False, FREEDRAWING_MODE | DRIVENDRAWING_MODE,
 ID_PLCOPENEDITOREDITORTOOLBARDIVERGENCE, "OnDivergenceTool",
 "add_divergence", _("Create a new divergence")),
-(False, FREEDRAWING_MODE|DRIVENDRAWING_MODE,
+(False, FREEDRAWING_MODE | DRIVENDRAWING_MODE,
 ID_PLCOPENEDITOREDITORTOOLBARJUMP, "OnJumpTool",
 "add_jump", _("Create a new jump")),
 (True, FREEDRAWING_MODE,
 ID_PLCOPENEDITOREDITORTOOLBARVARIABLE, "OnVariableTool",
 "add_variable", _("Create a new variable")),
 (True, FREEDRAWING_MODE,
 ID_PLCOPENEDITOREDITORTOOLBARCONTACT, "OnContactTool",
 "add_contact", _("Create a new contact"))],
 "ST":    [],
 "IL":    [],
-"debug": [(True, FREEDRAWING_MODE|DRIVENDRAWING_MODE,
+"debug": [(True, FREEDRAWING_MODE | DRIVENDRAWING_MODE,
 ID_PLCOPENEDITOREDITORTOOLBARMOTION, "OnMotionTool",
 "move", _("Move the view"))],
 }
 #-------------------------------------------------------------------------------
 self.ProjectTree = CustomTree(id=ID_PLCOPENEDITORPROJECTTREE,
 name='ProjectTree', parent=self.ProjectPanel,
 pos=wx.Point(0, 0), size=wx.Size(0, 0),
 style=wx.SUNKEN_BORDER,
-agwStyle=wx.TR_HAS_BUTTONS|wx.TR_SINGLE|wx.TR_EDIT_LABELS)
+agwStyle=wx.TR_HAS_BUTTONS | wx.TR_SINGLE | wx.TR_EDIT_LABELS)
 self.ProjectTree.SetBackgroundBitmap(GetBitmap("custom_tree_background"),
-wx.ALIGN_RIGHT|wx.ALIGN_BOTTOM)
+wx.ALIGN_RIGHT | wx.ALIGN_BOTTOM)
 add_menu = wx.Menu()
 self._init_coll_AddMenu_Items(add_menu)
 self.ProjectTree.SetAddMenu(add_menu)
 self.Bind(wx.EVT_TREE_ITEM_RIGHT_CLICK, self.OnProjectTreeRightUp,
 id=ID_PLCOPENEDITORPROJECTTREE)
 #-------------------------------------------------------------------------------
 ## Function displaying an Error dialog in PLCOpenEditor.
 #  @param message The message to display.
 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()
 ## Function displaying an Error dialog in PLCOpenEditor.
 #  @return False if closing cancelled.
 def CheckSaveBeforeClosing(self, title=_("Close Project")):
 if not self.Controler.ProjectIsSaved():
-dialog = wx.MessageDialog(self, _("There are changes, do you want to save?"), title, wx.YES_NO|wx.CANCEL|wx.ICON_QUESTION)
+dialog = wx.MessageDialog(self, _("There are changes, do you want to save?"), title, wx.YES_NO | wx.CANCEL | wx.ICON_QUESTION)
 answer = dialog.ShowModal()
 dialog.Destroy()
 if answer == wx.ID_YES:
 self.SaveProject()
 elif answer == wx.ID_CANCEL:
 printout = GraphicPrintout(window, page_size, margins, True)
 printout2 = GraphicPrintout(window, page_size, margins, True)
 preview = wx.PrintPreview(printout, printout2, data)
 if preview.Ok():
-preview_frame = wx.PreviewFrame(preview, self, _("Print preview"), style=wx.DEFAULT_FRAME_STYLE|wx.FRAME_FLOAT_ON_PARENT)
+preview_frame = wx.PreviewFrame(preview, self, _("Print preview"), style=wx.DEFAULT_FRAME_STYLE | wx.FRAME_FLOAT_ON_PARENT)
 preview_frame.Initialize()
 preview_canvas = preview.GetCanvas()
 preview_canvas.SetMinSize(preview_canvas.GetVirtualSize())
 elif item_infos["type"] == ITEM_POU:
 if new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames() if name != old_name]:
 message = _("\"%s\" pou already exists!") % new_name
 abort = True
 elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariableNames()]:
-messageDialog = wx.MessageDialog(self, _("A POU has an element named \"%s\". This could cause a conflict. Do you wish to continue?") % new_name, _("Error"), wx.YES_NO|wx.ICON_QUESTION)
+messageDialog = wx.MessageDialog(self, _("A POU has an element named \"%s\". This could cause a conflict. Do you wish to continue?") % new_name, _("Error"), wx.YES_NO | wx.ICON_QUESTION)
 if messageDialog.ShowModal() == wx.ID_NO:
 abort = True
 messageDialog.Destroy()
 if not abort:
 self.Controler.ChangePouName(old_name, new_name)
 elif item_infos["type"] == ITEM_CONFIGURATION:
 if new_name.upper() in [name.upper() for name in self.Controler.GetProjectConfigNames() if name != old_name]:
 message = _("\"%s\" config already exists!") % new_name
 abort = True
 elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames()]:
-messageDialog = wx.MessageDialog(self, _("There is a POU named \"%s\". This could cause a conflict. Do you wish to continue?") % new_name, _("Error"), wx.YES_NO|wx.ICON_QUESTION)
+messageDialog = wx.MessageDialog(self, _("There is a POU named \"%s\". This could cause a conflict. Do you wish to continue?") % new_name, _("Error"), wx.YES_NO | wx.ICON_QUESTION)
 if messageDialog.ShowModal() == wx.ID_NO:
 abort = True
 messageDialog.Destroy()
 elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariableNames()]:
-messageDialog = wx.MessageDialog(self, _("A POU has an element named \"%s\". This could cause a conflict. Do you wish to continue?") % new_name, _("Error"), wx.YES_NO|wx.ICON_QUESTION)
+messageDialog = wx.MessageDialog(self, _("A POU has an element named \"%s\". This could cause a conflict. Do you wish to continue?") % new_name, _("Error"), wx.YES_NO | wx.ICON_QUESTION)
 if messageDialog.ShowModal() == wx.ID_NO:
 abort = True
 messageDialog.Destroy()
 if not abort:
 self.Controler.ChangeConfigurationName(old_name, new_name)
 elif item_infos["type"] == ITEM_RESOURCE:
 if new_name.upper() in [name.upper() for name in self.Controler.GetProjectConfigNames()]:
 message = _("\"%s\" config already exists!") % new_name
 abort = True
 elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames()]:
-messageDialog = wx.MessageDialog(self, _("There is a POU named \"%s\". This could cause a conflict. Do you wish to continue?") % new_name, _("Error"), wx.YES_NO|wx.ICON_QUESTION)
+messageDialog = wx.MessageDialog(self, _("There is a POU named \"%s\". This could cause a conflict. Do you wish to continue?") % new_name, _("Error"), wx.YES_NO | wx.ICON_QUESTION)
 if messageDialog.ShowModal() == wx.ID_NO:
 abort = True
 messageDialog.Destroy()
 elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariableNames()]:
-messageDialog = wx.MessageDialog(self, _("A POU has an element named \"%s\". This could cause a conflict. Do you wish to continue?") % new_name, _("Error"), wx.YES_NO|wx.ICON_QUESTION)
+messageDialog = wx.MessageDialog(self, _("A POU has an element named \"%s\". This could cause a conflict. Do you wish to continue?") % new_name, _("Error"), wx.YES_NO | wx.ICON_QUESTION)
 if messageDialog.ShowModal() == wx.ID_NO:
 abort = True
 messageDialog.Destroy()
 if not abort:
 words = item_infos["tagname"].split("::")
 if not check_function(name):
 return True
 dialog = wx.MessageDialog(self,
 _("\"%s\" is used by one or more POUs. Do you wish to continue?") % name,
-title, wx.YES_NO|wx.ICON_QUESTION)
+title, wx.YES_NO | wx.ICON_QUESTION)
 answer = dialog.ShowModal()
 dialog.Destroy()
 return answer == wx.ID_YES
 def CheckDataTypeIsUsedBeforeDeletion(self, name):

changeset 1745	f9d32913bad4
parent 1744	69dfdb26f600
child 1749	d73b64672238