# HG changeset patch
# User Laurent Bessard
# Date 1370819739 -7200
# Node ID 0c8b8ef9559ba26d2c2f8ae6be17b3e29c2c6e84
# Parent  a5d1d2a2f3660289e2c76417320b130217d19074
Fixed support for default function block name in FBDBlockDialog

diff -r a5d1d2a2f366 -r 0c8b8ef9559b dialogs/BlockPreviewDialog.py
--- a/dialogs/BlockPreviewDialog.py	Mon Jun 10 00:55:57 2013 +0200
+++ b/dialogs/BlockPreviewDialog.py	Mon Jun 10 01:15:39 2013 +0200
@@ -80,7 +80,8 @@
             format = _("\"%s\" is a keyword. It can't be used!")
         elif uppercase_block_name in self.Controller.GetProjectPouNames():
             format = _("\"%s\" pou already exists!")
-        elif (self.DefaultBlockName.upper() != uppercase_block_name and 
+        elif ((self.DefaultBlockName is None or 
+               self.DefaultBlockName.upper() != uppercase_block_name) and 
               uppercase_block_name in self.Controller.GetEditedElementVariables(
                                                                 self.TagName)):
             format = _("\"%s\" element for this pou already exists!")
diff -r a5d1d2a2f366 -r 0c8b8ef9559b dialogs/FBDBlockDialog.py
--- a/dialogs/FBDBlockDialog.py	Mon Jun 10 00:55:57 2013 +0200
+++ b/dialogs/FBDBlockDialog.py	Mon Jun 10 01:15:39 2013 +0200
@@ -129,7 +129,7 @@
             message = _("Form isn't complete. Name must be filled!")
         if message is not None:
             self.ShowMessage(message)
-        elif name_enabled and self.TestBlockName(block_name):
+        elif not name_enabled or self.TestBlockName(block_name):
             BlockPreviewDialog.OnOK(self, event)
 
     def SetValues(self, values):
@@ -140,9 +140,10 @@
                                              values.get("inputs", None))
         for name, value in values.items():
             if name == "name":
-                self.DefaultBlockName = value
-                if default_name_model.match(value) is None:
-                    self.CurrentBlockName = value
+                if value != "":
+                    self.DefaultBlockName = value
+                    if default_name_model.match(value) is None:
+                        self.CurrentBlockName = value
                 self.BlockName.ChangeValue(value)
             elif name == "extension":
                 self.Inputs.SetValue(value)