--- a/PLCOpenEditor.py Fri Oct 26 17:04:18 2007 +0200
+++ b/PLCOpenEditor.py Tue Oct 30 16:53:08 2007 +0100
@@ -365,7 +365,7 @@
if wx.Platform != '__WXMSW__':
self.TreeImageList = wx.ImageList(16, 16)
for language in LANGUAGES:
- self.TreeImageList.Add(wx.Bitmap(os.path.join(CWD, 'Images','%s.png'%language)))
+ self.TreeImageList.Add(wx.Bitmap(os.path.join(CWD, 'Images', '%s.png'%language)))
self.ProjectTree.AssignImageList(self.TreeImageList)
if self.ModeSolo:
@@ -814,11 +814,12 @@
message = "\"%s\" is a keyword. It can't be used!"%new_name
else:
item = event.GetItem()
+ old_name = self.ProjectTree.GetItemText(item)
itemtype = self.ProjectTree.GetPyData(item)
if itemtype == ITEM_PROJECT:
self.Controler.SetProjectProperties(name = new_name)
elif itemtype == ITEM_POU:
- if new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames()]:
+ 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.GetProjectPouVariables()]:
@@ -827,7 +828,6 @@
abort = True
messageDialog.Destroy()
if not abort:
- old_name = self.ProjectTree.GetItemText(item)
self.Controler.ChangePouName(old_name, new_name)
self.RefreshEditorNames(itemtype, old_name, new_name)
self.RefreshTabsOpenedTitles()
@@ -840,10 +840,9 @@
pou_name = self.ProjectTree.GetItemText(parent)
if new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames()]:
message = "A pou with \"%s\" as name exists!"%new_name
- elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariables(pou_name)]:
+ elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariables(pou_name) if name != old_name]:
message = "A variable with \"%s\" as name already exists in this pou!"%new_name
else:
- old_name = self.ProjectTree.GetItemText(item)
self.Controler.ChangePouTransitionName(pou_name, old_name, new_name)
self.RefreshEditorNames(itemtype, old_name, new_name)
self.RefreshTabsOpenedTitles()
@@ -856,15 +855,14 @@
pou_name = self.ProjectTree.GetItemText(parent)
if new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames()]:
message = "A pou with \"%s\" as name exists!"%new_name
- elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariables(pou_name)]:
+ elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariables(pou_name) if name != old_name]:
message = "A variable with \"%s\" as name already exists in this pou!"%new_name
else:
- old_name = self.ProjectTree.GetItemText(item)
self.Controler.ChangePouActionName(pou_name, old_name, new_name)
self.RefreshEditorNames(itemtype, old_name, new_name)
self.RefreshTabsOpenedTitles()
elif itemtype == ITEM_CONFIGURATION:
- if new_name.upper() in [name.upper() for name in self.Controler.GetProjectConfigNames()]:
+ 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()]:
@@ -878,7 +876,6 @@
abort = True
messageDialog.Destroy()
if not abort:
- old_name = self.ProjectTree.GetItemText(item)
self.Controler.ChangeConfigurationName(old_name, new_name)
self.RefreshEditorNames(itemtype, old_name, new_name)
self.RefreshTabsOpenedTitles()
@@ -903,7 +900,6 @@
abort = True
messageDialog.Destroy()
if not abort:
- old_name = self.ProjectTree.GetItemText(item)
self.Controler.ChangeConfigurationResourceName(config_name, old_name, new_name)
self.RefreshEditorNames(itemtype, old_name, new_name)
self.RefreshTabsOpenedTitles()
@@ -918,7 +914,8 @@
else:
wx.CallAfter(self.RefreshProjectTree)
window = self.TabsOpened.GetCurrentPage()
- window.RefreshView()
+ if window:
+ window.RefreshView()
event.Skip()
def OnProjectTreeItemBeginEdit(self, event):
@@ -1381,19 +1378,19 @@
parent.AddGrowableRow(0)
def _init_coll_MainSizer_Items(self, parent):
- parent.AddWindow(self.staticText1, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.staticText1, 0, border=4, flag=wx.GROW|wx.TOP)
parent.AddWindow(self.ProjectName, 0, border=0, flag=wx.GROW)
- parent.AddWindow(self.staticText2, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.staticText2, 0, border=4, flag=wx.GROW|wx.TOP)
parent.AddWindow(self.CompanyName, 0, border=0, flag=wx.GROW)
- parent.AddWindow(self.staticText3, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.staticText3, 0, border=4, flag=wx.GROW|wx.TOP)
parent.AddWindow(self.CompanyURL, 0, border=0, flag=wx.GROW)
- parent.AddWindow(self.staticText4, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.staticText4, 0, border=4, flag=wx.GROW|wx.TOP)
parent.AddWindow(self.ProductName, 0, border=0, flag=wx.GROW)
- parent.AddWindow(self.staticText5, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.staticText5, 0, border=4, flag=wx.GROW|wx.TOP)
parent.AddWindow(self.ProductVersion, 0, border=0, flag=wx.GROW)
- parent.AddWindow(self.staticText6, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.staticText6, 0, border=4, flag=wx.GROW|wx.TOP)
parent.AddWindow(self.ProductRelease, 0, border=0, flag=wx.GROW)
- parent.AddWindow(self.staticText7, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.staticText7, 0, border=4, flag=wx.GROW|wx.TOP)
parent.AddWindow(self.ContentDescription, 0, border=0, flag=wx.GROW)
def _init_coll_MainSizer_Growables(self, parent):
@@ -1564,11 +1561,11 @@
parent.AddGrowableRow(0)
def _init_coll_MainSizer_Items(self, parent):
- parent.AddWindow(self.staticText1, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.staticText1, 0, border=4, flag=wx.GROW|wx.TOP)
parent.AddWindow(self.PouName, 0, border=0, flag=wx.GROW)
- parent.AddWindow(self.staticText2, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.staticText2, 0, border=4, flag=wx.GROW|wx.TOP)
parent.AddWindow(self.PouType, 0, border=0, flag=wx.GROW)
- parent.AddWindow(self.staticText3, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.staticText3, 0, border=4, flag=wx.GROW|wx.TOP)
parent.AddWindow(self.Language, 0, border=0, flag=wx.GROW)
def _init_coll_MainSizer_Growables(self, parent):
@@ -1736,9 +1733,9 @@
parent.AddGrowableRow(0)
def _init_coll_MainSizer_Items(self, parent):
- parent.AddWindow(self.staticText1, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.staticText1, 0, border=4, flag=wx.GROW|wx.TOP)
parent.AddWindow(self.TransitionName, 0, border=0, flag=wx.GROW)
- parent.AddWindow(self.staticText2, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.staticText2, 0, border=4, flag=wx.GROW|wx.TOP)
parent.AddWindow(self.Language, 0, border=0, flag=wx.GROW)
def _init_coll_MainSizer_Growables(self, parent):
@@ -1875,9 +1872,9 @@
parent.AddGrowableRow(0)
def _init_coll_MainSizer_Items(self, parent):
- parent.AddWindow(self.staticText1, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.staticText1, 0, border=4, flag=wx.GROW|wx.TOP)
parent.AddWindow(self.ActionName, 0, border=0, flag=wx.GROW)
- parent.AddWindow(self.staticText2, 0, border=0, flag=wx.GROW)
+ parent.AddWindow(self.staticText2, 0, border=4, flag=wx.GROW|wx.TOP)
parent.AddWindow(self.Language, 0, border=0, flag=wx.GROW)
def _init_coll_MainSizer_Growables(self, parent):