Changeset 3764 for trunk/sources/HeuristicLab.Core.Views/3.3/NamedItemView.cs

Timestamp:

05/11/10 12:03:25 (14 years ago)

Author:

mkommend

Message:

adapted view captions (ticket #893)

File:

• trunk/sources/HeuristicLab.Core.Views/3.3/NamedItemView.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Core.Views/3.3/NamedItemView.cs

@@ -41 +41 @@
     public NamedItemView() {
       InitializeComponent();
-      Caption = "NamedItem";
       errorProvider.SetIconAlignment(nameTextBox, ErrorIconAlignment.MiddleLeft);
       errorProvider.SetIconPadding(nameTextBox, 2);
@@ -60 +59 @@
       base.OnContentChanged();
       if (Content == null) {
-        Caption = "NamedItem";
         nameTextBox.Text = string.Empty;
         descriptionTextBox.Text = string.Empty;
         toolTip.SetToolTip(descriptionTextBox, string.Empty);
+        if (ViewAttribute.HasViewAttribute(this.GetType()))
+          this.Caption = ViewAttribute.GetViewName(this.GetType());
+        else
+          this.Caption = "NamedItem View";
       } else {
-        Caption = Content.Name + " (" + Content.GetType().Name + ")";
         nameTextBox.Text = Content.Name;
         descriptionTextBox.Text = Content.Description;
         toolTip.SetToolTip(descriptionTextBox, Content.Description);
+        Caption = Content.Name;
       }
       SetEnabledStateOfControls();
@@ -92 +94 @@
       if (InvokeRequired)
         Invoke(new EventHandler(Content_NameChanged), sender, e);
-      else
+      else {
         nameTextBox.Text = Content.Name;
+        Caption = Content.Name;
+      }
     }
     protected virtual void Content_DescriptionChanged(object sender, EventArgs e) {
@@ -106 +110 @@
     protected virtual void nameTextBox_Validating(object sender, CancelEventArgs e) {
       if ((Content != null) && (Content.CanChangeName)) {
+        if (string.IsNullOrEmpty(nameTextBox.Text)) {
+          e.Cancel = true;
+          errorProvider.SetError(nameTextBox, "Name cannot be empty");
+          nameTextBox.SelectAll();
+          return;
+        }
         Content.Name = nameTextBox.Text;
-
         // check if variable name was set successfully
         if (!Content.Name.Equals(nameTextBox.Text)) {