--- a/Viewer.py	Tue Sep 15 15:02:23 2009 +0200
+++ b/Viewer.py	Wed Sep 16 12:00:58 2009 +0200
@@ -33,7 +33,8 @@
 from plcopen.structures import *
 from PLCControler import ITEM_POU
 
-from Dialogs import *
+from dialogs import *
+from graphics import *
 
 from types import TupleType
 
@@ -1712,7 +1713,7 @@
         return width, height
     
     def AddNewBlock(self, bbox):
-        dialog = BlockPropertiesDialog(self.ParentWindow, self.Controler)
+        dialog = FBDBlockDialog(self.ParentWindow, self.Controler)
         dialog.SetPreviewFont(self.GetFont())
         dialog.SetBlockList(self.Controler.GetBlockTypes(self.TagName, self.Debug))
         dialog.SetPouNames(self.Controler.GetProjectPouNames(self.Debug))
@@ -1742,9 +1743,9 @@
     def AddNewVariable(self, bbox):
         words = self.TagName.split("::")
         if words[0] == "T":
-            dialog = VariablePropertiesDialog(self.ParentWindow, self.Controler, words[2])
+            dialog = FBDVariableDialog(self.ParentWindow, self.Controler, words[2])
         else:
-            dialog = VariablePropertiesDialog(self.ParentWindow, self.Controler)
+            dialog = FBDVariableDialog(self.ParentWindow, self.Controler)
         dialog.SetPreviewFont(self.GetFont())
         dialog.SetMinVariableSize((bbox.width, bbox.height))
         varlist = []
@@ -1773,7 +1774,7 @@
         dialog.Destroy()
 
     def AddNewConnection(self, bbox):
-        dialog = ConnectionPropertiesDialog(self.ParentWindow, self.Controler)
+        dialog = ConnectionDialog(self.ParentWindow, self.Controler)
         dialog.SetPreviewFont(self.GetFont())
         dialog.SetPouNames(self.Controler.GetProjectPouNames(self.Debug))
         dialog.SetPouElementNames(self.Controler.GetEditedElementVariables(self.TagName, self.Debug))
@@ -1891,7 +1892,7 @@
         dialog.Destroy()
 
     def AddNewStep(self, bbox, initial = False):
-        dialog = StepContentDialog(self.ParentWindow, self.Controler, initial)
+        dialog = SFCStepDialog(self.ParentWindow, self.Controler, initial)
         dialog.SetPreviewFont(self.GetFont())
         dialog.SetPouNames(self.Controler.GetProjectPouNames(self.Debug))
         dialog.SetVariables(self.Controler.GetEditedElementInterfaceVars(self.TagName, self.Debug))
@@ -1926,7 +1927,7 @@
         dialog.Destroy()
 
     def AddNewTransition(self, bbox):
-        dialog = TransitionContentDialog(self.ParentWindow, self.Controler, self.GetDrawingMode() == FREEDRAWING_MODE)
+        dialog = SFCTransitionDialog(self.ParentWindow, self.Controler, self.GetDrawingMode() == FREEDRAWING_MODE)
         dialog.SetPreviewFont(self.GetFont())
         dialog.SetTransitions(self.Controler.GetEditedElementTransitions(self.TagName, self.Debug))
         if dialog.ShowModal() == wx.ID_OK:
@@ -1946,7 +1947,7 @@
         dialog.Destroy()
 
     def AddNewDivergence(self, bbox):
-        dialog = DivergenceCreateDialog(self.ParentWindow, self.Controler)
+        dialog = SFCDivergenceDialog(self.ParentWindow, self.Controler)
         dialog.SetPreviewFont(self.GetFont())
         dialog.SetMinSize((bbox.width, bbox.height))
         if dialog.ShowModal() == wx.ID_OK:
@@ -2013,7 +2014,7 @@
 #-------------------------------------------------------------------------------
 
     def EditBlockContent(self, block):
-        dialog = BlockPropertiesDialog(self.ParentWindow, self.Controler)
+        dialog = FBDBlockDialog(self.ParentWindow, self.Controler)
         dialog.SetPreviewFont(self.GetFont())
         dialog.SetBlockList(self.Controler.GetBlockTypes(self.TagName, self.Debug))
         dialog.SetPouNames(self.Controler.GetProjectPouNames(self.Debug))
@@ -2055,9 +2056,9 @@
     def EditVariableContent(self, variable):
         words = self.TagName.split("::")
         if words[0] == "T":
-            dialog = VariablePropertiesDialog(self.ParentWindow, self.Controler, words[2])
+            dialog = FBDVariableDialog(self.ParentWindow, self.Controler, words[2])
         else:
-            dialog = VariablePropertiesDialog(self.ParentWindow, self.Controler)
+            dialog = FBDVariableDialog(self.ParentWindow, self.Controler)
         dialog.SetPreviewFont(self.GetFont())
         dialog.SetMinVariableSize(variable.GetSize())
         varlist = []
@@ -2095,7 +2096,7 @@
         dialog.Destroy()
 
     def EditConnectionContent(self, connection):
-        dialog = ConnectionPropertiesDialog(self.ParentWindow, self.Controler)
+        dialog = ConnectionDialog(self.ParentWindow, self.Controler)
         dialog.SetPreviewFont(self.GetFont())
         dialog.SetPouNames(self.Controler.GetProjectPouNames(self.Debug))
         dialog.SetPouElementNames(self.Controler.GetEditedElementVariables(self.TagName, self.Debug))
@@ -2201,7 +2202,7 @@
         dialog.Destroy()
 
     def EditStepContent(self, step):
-        dialog = StepContentDialog(self.ParentWindow, self.Controler, step.GetInitial())
+        dialog = SFCStepDialog(self.ParentWindow, self.Controler, step.GetInitial())
         dialog.SetPreviewFont(self.GetFont())
         dialog.SetPouNames(self.Controler.GetProjectPouNames(self.Debug))
         dialog.SetVariables(self.Controler.GetEditedElementInterfaceVars(self.TagName, self.Debug))
@@ -2238,7 +2239,7 @@
             step.Refresh(rect)
         
     def EditTransitionContent(self, transition):
-        dialog = TransitionContentDialog(self.ParentWindow, self.Controler, self.GetDrawingMode() == FREEDRAWING_MODE)
+        dialog = SFCTransitionDialog(self.ParentWindow, self.Controler, self.GetDrawingMode() == FREEDRAWING_MODE)
         dialog.SetPreviewFont(self.GetFont())
         dialog.SetTransitions(self.Controler.GetEditedElementTransitions(self.TagName, self.Debug))
         dialog.SetValues({"type":transition.GetType(),"value":transition.GetCondition(), "priority":transition.GetPriority()})