127 message = _("Form isn't complete. Valid block type must be selected!") |
127 message = _("Form isn't complete. Valid block type must be selected!") |
128 elif name_enabled and block_name == "": |
128 elif name_enabled and block_name == "": |
129 message = _("Form isn't complete. Name must be filled!") |
129 message = _("Form isn't complete. Name must be filled!") |
130 if message is not None: |
130 if message is not None: |
131 self.ShowMessage(message) |
131 self.ShowMessage(message) |
132 elif name_enabled and self.TestBlockName(block_name): |
132 elif not name_enabled or self.TestBlockName(block_name): |
133 BlockPreviewDialog.OnOK(self, event) |
133 BlockPreviewDialog.OnOK(self, event) |
134 |
134 |
135 def SetValues(self, values): |
135 def SetValues(self, values): |
136 blocktype = values.get("type", None) |
136 blocktype = values.get("type", None) |
137 default_name_model = re.compile("%s[0-9]+" % blocktype) |
137 default_name_model = re.compile("%s[0-9]+" % blocktype) |
138 if blocktype is not None: |
138 if blocktype is not None: |
139 self.LibraryPanel.SelectTreeItem(blocktype, |
139 self.LibraryPanel.SelectTreeItem(blocktype, |
140 values.get("inputs", None)) |
140 values.get("inputs", None)) |
141 for name, value in values.items(): |
141 for name, value in values.items(): |
142 if name == "name": |
142 if name == "name": |
143 self.DefaultBlockName = value |
143 if value != "": |
144 if default_name_model.match(value) is None: |
144 self.DefaultBlockName = value |
145 self.CurrentBlockName = value |
145 if default_name_model.match(value) is None: |
|
146 self.CurrentBlockName = value |
146 self.BlockName.ChangeValue(value) |
147 self.BlockName.ChangeValue(value) |
147 elif name == "extension": |
148 elif name == "extension": |
148 self.Inputs.SetValue(value) |
149 self.Inputs.SetValue(value) |
149 elif name == "executionOrder": |
150 elif name == "executionOrder": |
150 self.ExecutionOrder.SetValue(value) |
151 self.ExecutionOrder.SetValue(value) |