--- a/objdictgen/objdictedit.py Tue Oct 02 10:32:11 2007 +0200
+++ b/objdictgen/objdictedit.py Tue Oct 02 14:06:30 2007 +0200
@@ -306,7 +306,7 @@
for filepath in filesOpen:
result = self.Manager.OpenFileInCurrent(filepath)
if type(result) == IntType:
- new_editingpanel = EditingPanel(self, self.Manager)
+ new_editingpanel = EditingPanel(self.FileOpened, self, self.Manager)
new_editingpanel.SetIndex(result)
self.FileOpened.AddPage(new_editingpanel, "")
window = self.FileOpened.GetPage(0)
@@ -323,9 +323,6 @@
self.RefreshTitle()
self.RefreshMainMenu()
- def GetNoteBook(self):
- return self.FileOpened
-
def OnAddSDOServerMenu(self, event):
self.Manager.AddSDOServerToCurrent()
self.RefreshBufferState()
@@ -579,7 +576,7 @@
options = dialog.GetOptions()
result = self.Manager.CreateNewNode(name, id, nodetype, description, profile, filepath, NMT, options)
if type(result) == IntType:
- new_editingpanel = EditingPanel(self, self.Manager)
+ new_editingpanel = EditingPanel(self.FileOpened, self, self.Manager)
new_editingpanel.SetIndex(result)
self.FileOpened.AddPage(new_editingpanel, "")
self.FileOpened.SetSelection(self.FileOpened.GetPageCount() - 1)
@@ -593,6 +590,7 @@
message = wx.MessageDialog(self, result, "ERROR", wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
+ dialog.Destroy()
event.Skip()
def OnOpenMenu(self, event):
@@ -607,7 +605,7 @@
if os.path.isfile(filepath):
result = self.Manager.OpenFileInCurrent(filepath)
if type(result) == IntType:
- new_editingpanel = EditingPanel(self, self.Manager)
+ new_editingpanel = EditingPanel(self.FileOpened, self, self.Manager)
new_editingpanel.SetIndex(result)
self.FileOpened.AddPage(new_editingpanel, "")
self.FileOpened.SetSelection(self.FileOpened.GetPageCount() - 1)
@@ -702,7 +700,7 @@
if os.path.isfile(filepath):
result = self.Manager.ImportCurrentFromEDSFile(filepath)
if type(result) == IntType:
- new_editingpanel = EditingPanel(self, self.Manager)
+ new_editingpanel = EditingPanel(self.FileOpened, self, self.Manager)
new_editingpanel.SetIndex(result)
self.FileOpened.AddPage(new_editingpanel, "")
self.FileOpened.SetSelection(self.FileOpened.GetPageCount() - 1)