--- a/dialogs/BrowseLocationsDialog.py Fri May 04 19:20:46 2012 +0200
+++ b/dialogs/BrowseLocationsDialog.py Mon May 07 18:53:16 2012 +0200
@@ -22,7 +22,7 @@
import wx
from plcopen.structures import LOCATIONDATATYPES
-from PLCControler import LOCATION_PLUGIN, LOCATION_MODULE, LOCATION_GROUP, LOCATION_VAR_INPUT, LOCATION_VAR_OUTPUT, LOCATION_VAR_MEMORY
+from PLCControler import LOCATION_CONFNODE, LOCATION_MODULE, LOCATION_GROUP, LOCATION_VAR_INPUT, LOCATION_VAR_OUTPUT, LOCATION_VAR_MEMORY
CWD = os.path.split(os.path.split(os.path.realpath(__file__))[0])[0]
@@ -131,7 +131,7 @@
# Icons for items
for imgname, itemtype in [
- ("CONFIGURATION", LOCATION_PLUGIN),
+ ("CONFIGURATION", LOCATION_CONFNODE),
("RESOURCE", LOCATION_MODULE),
("PROGRAM", LOCATION_GROUP),
("VAR_INPUT", LOCATION_VAR_INPUT),
@@ -157,7 +157,7 @@
root = self.LocationsTree.GetRootItem()
if not root.IsOk():
if wx.Platform == '__WXMSW__':
- root = self.LocationsTree.AddRoot(_('Plugins'))
+ root = self.LocationsTree.AddRoot(_('ConfNodes'))
else:
root = self.LocationsTree.AddRoot("")
self.GenerateLocationsTreeBranch(root, self.Locations)
@@ -171,7 +171,7 @@
item, root_cookie = self.LocationsTree.GetFirstChild(root, 0)
for loc_infos in locations:
infos = loc_infos.copy()
- if infos["type"] in [LOCATION_PLUGIN, LOCATION_MODULE, LOCATION_GROUP] or\
+ if infos["type"] in [LOCATION_CONFNODE, LOCATION_MODULE, LOCATION_GROUP] or\
infos["type"] in self.Filter and (infos["IEC_type"] == self.VarType or
infos["IEC_type"] is None and LOCATION_SIZES[self.VarType] == infos["size"]):
children = [child for child in infos.pop("children")]
@@ -193,7 +193,7 @@
def OnLocationsTreeItemActivated(self, event):
infos = self.LocationsTree.GetPyData(event.GetItem())
- if infos["type"] not in [LOCATION_PLUGIN, LOCATION_MODULE, LOCATION_GROUP]:
+ if infos["type"] not in [LOCATION_CONFNODE, LOCATION_MODULE, LOCATION_GROUP]:
wx.CallAfter(self.EndModal, wx.ID_OK)
event.Skip()
@@ -210,7 +210,7 @@
var_infos = None
if selected.IsOk():
var_infos = self.LocationsTree.GetPyData(selected)
- if var_infos is None or var_infos["type"] in [LOCATION_PLUGIN, LOCATION_MODULE, LOCATION_GROUP]:
+ if var_infos is None or var_infos["type"] in [LOCATION_CONFNODE, LOCATION_MODULE, LOCATION_GROUP]:
message = wx.MessageDialog(self, _("A location must be selected!"), _("Error"), wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()