--- a/PLCOpenEditor.py	Tue Jul 17 12:25:50 2007 +0200
+++ b/PLCOpenEditor.py	Wed Jul 18 11:51:30 2007 +0200
@@ -557,7 +557,7 @@
         event.Skip()
 
     def OnGenerateProgramMenu(self, event):
-        dialog = wxFileDialog(self, "Choose a file", os.getcwd(), "",  "ST files (*.st)|*.st|All files|*.*", wxSAVE|wxCHANGE_DIR)
+        dialog = wxFileDialog(self, "Choose a file", os.getcwd(), self.Controler.GetProgramFilePath(),  "ST files (*.st)|*.st|All files|*.*", wxSAVE|wxCHANGE_DIR)
         if dialog.ShowModal() == wxID_OK:
             filepath = dialog.GetPath()
             if os.path.isdir(os.path.dirname(filepath)):
@@ -642,7 +642,6 @@
         event.Skip()
     
     def OnBlockTool(self, event):
-        self.ResetToolToggle(wxID_PLCOPENEDITORTOOLBARBLOCK)
         selected = self.TabsOpened.GetSelection()
         if selected != -1:
             self.TabsOpened.GetPage(selected).SetMode(MODE_BLOCK)
@@ -672,7 +671,7 @@
     def OnRungTool(self, event):
         selected = self.TabsOpened.GetSelection()
         if selected != -1:
-            self.TabsOpened.GetPage(selected).AddRung()
+            self.TabsOpened.GetPage(selected).AddLadderRung()
         event.Skip()
     
     def OnCoilTool(self, event):
@@ -690,13 +689,13 @@
             if self.DrawingMode == FREEDRAWING_MODE:
                 self.TabsOpened.GetPage(selected).SetMode(MODE_CONTACT)
             else:
-                self.TabsOpened.GetPage(selected).AddContact()
+                self.TabsOpened.GetPage(selected).AddLadderContact()
         event.Skip()
     
     def OnBranchTool(self, event): 
         selected = self.TabsOpened.GetSelection()
         if selected != -1:
-            self.TabsOpened.GetPage(selected).AddBranch()
+            self.TabsOpened.GetPage(selected).AddLadderBranch()
         event.Skip()    
     
     def OnInitialStepTool(self, event):