Changeset 10891 for stable/HeuristicLab.HLScript.Views/3.3

Timestamp:

05/26/14 16:38:08 (11 years ago)

Author:

abeham

Message:

#2136: merged r10359, r10391, r10401, r10506 to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.HLScript.Views (copied) (copied from trunk/sources/HeuristicLab.HLScript.Views)
• HeuristicLab.HLScript.Views/3.3 (modified) (1 prop)
• HeuristicLab.HLScript.Views/3.3/HLScriptView.Designer.cs (deleted)
• HeuristicLab.HLScript.Views/3.3/HLScriptView.cs (deleted)
• HeuristicLab.HLScript.Views/3.3/HeuristicLab.HLScript.Views-3.3.csproj (deleted)
• HeuristicLab.HLScript.Views/3.3/HeuristicLab.Scripting.Views-3.3.csproj (copied) (copied from trunk/sources/HeuristicLab.HLScript.Views/3.3/HeuristicLab.Scripting.Views-3.3.csproj)
• HeuristicLab.HLScript.Views/3.3/Plugin.cs.frame (modified) (3 diffs)
• HeuristicLab.HLScript.Views/3.3/Properties (modified) (1 prop)
• HeuristicLab.HLScript.Views/3.3/Properties/AssemblyInfo.cs.frame (modified) (2 diffs)
• HeuristicLab.HLScript.Views/3.3/ScriptView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.HLScript.Views/3.3/ScriptView.Designer.cs) (16 diffs)
• HeuristicLab.HLScript.Views/3.3/ScriptView.cs (copied) (copied from trunk/sources/HeuristicLab.HLScript.Views/3.3/ScriptView.cs) (9 diffs)
• HeuristicLab.HLScript.Views/3.3/VariableStoreView.Designer.cs (modified) (2 diffs)
• HeuristicLab.HLScript.Views/3.3/VariableStoreView.cs (modified) (6 diffs)

stable/HeuristicLab.HLScript.Views/3.3/Plugin.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -22 +22 @@
 using HeuristicLab.PluginInfrastructure;
 
-namespace HeuristicLab.HLScript.Views {
-  [Plugin("HeuristicLab.HLScript.Views", "3.3.9.$WCREV$")]
-  [PluginFile("HeuristicLab.HLScript.Views-3.3.dll", PluginFileType.Assembly)]
+namespace HeuristicLab.Scripting.Views {
+  [Plugin("HeuristicLab.Scripting.Views", "3.3.9.$WCREV$")]
+  [PluginFile("HeuristicLab.Scripting.Views-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.CodeEditor", "3.3")]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
@@ -31 +31 @@
   [PluginDependency("HeuristicLab.Core", "3.3")]
   [PluginDependency("HeuristicLab.Core.Views", "3.3")]
-  [PluginDependency("HeuristicLab.HLScript", "3.3")]
+  [PluginDependency("HeuristicLab.Scripting", "3.3")]
   [PluginDependency("HeuristicLab.MainForm", "3.3")]
   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
-  public class HeuristicLabHLScriptViewsPlugin : PluginBase {
+  public class HeuristicLabScriptingViewsPlugin : PluginBase {
   }
 }

stable/HeuristicLab.HLScript.Views/3.3/Properties/AssemblyInfo.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -27 +27 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("HeuristicLab.HLScript.Views")]
+[assembly: AssemblyTitle("HeuristicLab.Scripting.Views")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2013 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

stable/HeuristicLab.HLScript.Views/3.3/ScriptView.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.HLScript.Views {
+namespace HeuristicLab.Scripting.Views {
   partial class ScriptView {
     /// <summary> 
@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
+      this.components = new System.ComponentModel.Container();
       this.compilationLabel = new System.Windows.Forms.Label();
       this.startStopButton = new System.Windows.Forms.Button();
       this.errorListView = new System.Windows.Forms.ListView();
+      this.iconColumnHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
       this.categoryColumnHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
       this.errorNumberColumnHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
@@ -53 +55 @@
       this.columnColumnHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
       this.descriptionColumnHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+      this.imageList = new System.Windows.Forms.ImageList(this.components);
       this.codeEditor = new HeuristicLab.CodeEditor.CodeEditor();
       this.splitContainer1 = new System.Windows.Forms.SplitContainer();
       this.splitContainer2 = new System.Windows.Forms.SplitContainer();
-      this.tabControl1 = new System.Windows.Forms.TabControl();
-      this.errorListTabPage = new System.Windows.Forms.TabPage();
+      this.infoTabControl = new System.Windows.Forms.TabControl();
       this.outputTabPage = new System.Windows.Forms.TabPage();
       this.outputTextBox = new System.Windows.Forms.TextBox();
-      this.variableStoreView = new HeuristicLab.HLScript.Views.VariableStoreView();
+      this.errorListTabPage = new System.Windows.Forms.TabPage();
+      this.variableStoreView = new HeuristicLab.Scripting.Views.VariableStoreView();
       this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
+      this.compileButton = new System.Windows.Forms.Button();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -71 +75 @@
       this.splitContainer2.Panel2.SuspendLayout();
       this.splitContainer2.SuspendLayout();
-      this.tabControl1.SuspendLayout();
+      this.infoTabControl.SuspendLayout();
+      this.outputTabPage.SuspendLayout();
       this.errorListTabPage.SuspendLayout();
-      this.outputTabPage.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -91 +95 @@
       this.compilationLabel.AutoSize = true;
       this.compilationLabel.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
-      this.compilationLabel.Location = new System.Drawing.Point(33, 32);
+      this.compilationLabel.Location = new System.Drawing.Point(66, 32);
       this.compilationLabel.Name = "compilationLabel";
       this.compilationLabel.Size = new System.Drawing.Size(69, 13);
@@ -100 +104 @@
       // 
       this.startStopButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Play;
-      this.startStopButton.Location = new System.Drawing.Point(3, 26);
+      this.startStopButton.Location = new System.Drawing.Point(36, 26);
       this.startStopButton.Name = "startStopButton";
       this.startStopButton.Size = new System.Drawing.Size(24, 24);
@@ -112 +116 @@
       // 
       this.errorListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.iconColumnHeader,
             this.categoryColumnHeader,
             this.errorNumberColumnHeader,
@@ -124 +129 @@
       this.errorListView.Name = "errorListView";
       this.errorListView.Size = new System.Drawing.Size(623, 79);
+      this.errorListView.SmallImageList = this.imageList;
       this.errorListView.TabIndex = 0;
       this.errorListView.UseCompatibleStateImageBehavior = false;
       this.errorListView.View = System.Windows.Forms.View.Details;
       // 
+      // iconColumnHeader
+      // 
+      this.iconColumnHeader.Text = "";
+      // 
       // categoryColumnHeader
       // 
@@ -135 +145 @@
       // 
       this.errorNumberColumnHeader.Text = "Error Number";
-      this.errorNumberColumnHeader.Width = 78;
       // 
       // lineColumnHeader
       // 
       this.lineColumnHeader.Text = "Line";
-      this.lineColumnHeader.Width = 50;
       // 
       // columnColumnHeader
       // 
       this.columnColumnHeader.Text = "Column";
-      this.columnColumnHeader.Width = 50;
       // 
       // descriptionColumnHeader
       // 
       this.descriptionColumnHeader.Text = "Description";
-      this.descriptionColumnHeader.Width = 600;
+      // 
+      // imageList
+      // 
+      this.imageList.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;
+      this.imageList.ImageSize = new System.Drawing.Size(16, 16);
+      this.imageList.TransparentColor = System.Drawing.Color.Transparent;
       // 
       // codeEditor
@@ -197 +209 @@
       // splitContainer2.Panel2
       // 
-      this.splitContainer2.Panel2.Controls.Add(this.tabControl1);
+      this.splitContainer2.Panel2.Controls.Add(this.infoTabControl);
       this.splitContainer2.Size = new System.Drawing.Size(637, 543);
       this.splitContainer2.SplitterDistance = 428;
       this.splitContainer2.TabIndex = 5;
       // 
-      // tabControl1
-      // 
-      this.tabControl1.Controls.Add(this.errorListTabPage);
-      this.tabControl1.Controls.Add(this.outputTabPage);
-      this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.tabControl1.Location = new System.Drawing.Point(0, 0);
-      this.tabControl1.Name = "tabControl1";
-      this.tabControl1.SelectedIndex = 0;
-      this.tabControl1.Size = new System.Drawing.Size(637, 111);
-      this.tabControl1.TabIndex = 1;
-      // 
-      // errorListTabPage
-      // 
-      this.errorListTabPage.Controls.Add(this.errorListView);
-      this.errorListTabPage.Location = new System.Drawing.Point(4, 22);
-      this.errorListTabPage.Name = "errorListTabPage";
-      this.errorListTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.errorListTabPage.Size = new System.Drawing.Size(629, 85);
-      this.errorListTabPage.TabIndex = 0;
-      this.errorListTabPage.Text = "Error List";
-      this.errorListTabPage.UseVisualStyleBackColor = true;
+      // infoTabControl
+      // 
+      this.infoTabControl.Controls.Add(this.outputTabPage);
+      this.infoTabControl.Controls.Add(this.errorListTabPage);
+      this.infoTabControl.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.infoTabControl.Location = new System.Drawing.Point(0, 0);
+      this.infoTabControl.Name = "infoTabControl";
+      this.infoTabControl.SelectedIndex = 0;
+      this.infoTabControl.Size = new System.Drawing.Size(637, 111);
+      this.infoTabControl.TabIndex = 1;
       // 
       // outputTabPage
@@ -247 +248 @@
       this.outputTextBox.TabIndex = 0;
       this.outputTextBox.WordWrap = false;
+      // 
+      // errorListTabPage
+      // 
+      this.errorListTabPage.Controls.Add(this.errorListView);
+      this.errorListTabPage.Location = new System.Drawing.Point(4, 22);
+      this.errorListTabPage.Name = "errorListTabPage";
+      this.errorListTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.errorListTabPage.Size = new System.Drawing.Size(629, 85);
+      this.errorListTabPage.TabIndex = 0;
+      this.errorListTabPage.Text = "Error List";
+      this.errorListTabPage.UseVisualStyleBackColor = true;
       // 
       // variableStoreView
@@ -273 +285 @@
       this.viewHost.ViewType = null;
       // 
+      // compileButton
+      // 
+      this.compileButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Script;
+      this.compileButton.Location = new System.Drawing.Point(6, 26);
+      this.compileButton.Name = "compileButton";
+      this.compileButton.Size = new System.Drawing.Size(24, 24);
+      this.compileButton.TabIndex = 8;
+      this.compileButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
+      this.toolTip.SetToolTip(this.compileButton, "Compile (F6)");
+      this.compileButton.UseVisualStyleBackColor = true;
+      this.compileButton.Click += new System.EventHandler(this.compileButton_Click);
+      // 
       // ScriptView
       // 
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
+      this.Controls.Add(this.compileButton);
       this.Controls.Add(this.splitContainer1);
       this.Controls.Add(this.startStopButton);
@@ -287 +312 @@
       this.Controls.SetChildIndex(this.nameTextBox, 0);
       this.Controls.SetChildIndex(this.infoLabel, 0);
+      this.Controls.SetChildIndex(this.compileButton, 0);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.splitContainer1.Panel1.ResumeLayout(false);
@@ -296 +322 @@
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
       this.splitContainer2.ResumeLayout(false);
-      this.tabControl1.ResumeLayout(false);
-      this.errorListTabPage.ResumeLayout(false);
+      this.infoTabControl.ResumeLayout(false);
       this.outputTabPage.ResumeLayout(false);
       this.outputTabPage.PerformLayout();
+      this.errorListTabPage.ResumeLayout(false);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -320 +346 @@
     private System.Windows.Forms.ColumnHeader errorNumberColumnHeader;
     private System.Windows.Forms.ColumnHeader categoryColumnHeader;
-    private System.Windows.Forms.TabControl tabControl1;
+    private System.Windows.Forms.TabControl infoTabControl;
     private System.Windows.Forms.TabPage errorListTabPage;
     private System.Windows.Forms.TabPage outputTabPage;
     private System.Windows.Forms.TextBox outputTextBox;
+    private System.Windows.Forms.Button compileButton;
+    private System.Windows.Forms.ColumnHeader iconColumnHeader;
+    private System.Windows.Forms.ImageList imageList;
   }
 }

stable/HeuristicLab.HLScript.Views/3.3/ScriptView.cs

@@ -22 +22 @@
 using System;
 using System.CodeDom.Compiler;
-using System.Collections.Generic;
 using System.Drawing;
+using System.Globalization;
 using System.Linq;
 using System.Windows.Forms;
@@ -31 +31 @@
 using HeuristicLab.MainForm;
 
-namespace HeuristicLab.HLScript.Views {
+namespace HeuristicLab.Scripting.Views {
 
   [View("Script View")]
@@ -45 +45 @@
     public ScriptView() {
       InitializeComponent();
+      errorListView.SmallImageList.Images.AddRange(new Image[] { VSImageLibrary.Warning, VSImageLibrary.Error });
+      AdjustErrorListViewColumnSizes();
     }
 
@@ -68 +70 @@
     }
     private void Content_ScriptExecutionStarted(object sender, EventArgs e) {
-      Locked = true;
-      ReadOnly = true;
-      startStopButton.Image = VSImageLibrary.Stop;
-    }
-    private void Content_ScriptExecutionFinished(object sender, EventArgs e) {
-      Locked = false;
-      ReadOnly = false;
-      startStopButton.Image = VSImageLibrary.Play;
-      running = false;
+      if (InvokeRequired)
+        Invoke((Action<object, EventArgs>)Content_ScriptExecutionStarted, sender, e);
+      else {
+        Locked = true;
+        ReadOnly = true;
+        startStopButton.Image = VSImageLibrary.Stop;
+        infoTabControl.SelectedTab = outputTabPage;
+      }
+    }
+    private void Content_ScriptExecutionFinished(object sender, EventArgs<Exception> e) {
+      if (InvokeRequired)
+        Invoke((Action<object, EventArgs<Exception>>)Content_ScriptExecutionFinished, sender, e);
+      else {
+        Locked = false;
+        ReadOnly = false;
+        startStopButton.Image = VSImageLibrary.Play;
+        running = false;
+        var ex = e.Value;
+        if (ex != null)
+          PluginInfrastructure.ErrorHandling.ShowErrorDialog(this, ex);
+      }
     }
     private void Content_ConsoleOutputChanged(object sender, EventArgs<string> e) {
-      if (InvokeRequired) Invoke((Action<object, EventArgs<string>>)Content_ConsoleOutputChanged, sender, e);
+      if (InvokeRequired)
+        Invoke((Action<object, EventArgs<string>>)Content_ConsoleOutputChanged, sender, e);
       else {
         outputTextBox.AppendText(e.Value);
@@ -111 +126 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
+      compileButton.Enabled = Content != null && !Locked && !ReadOnly;
       startStopButton.Enabled = Content != null && (!Locked || running);
       codeEditor.Enabled = Content != null && !Locked && !ReadOnly;
@@ -116 +132 @@
 
     #region Child Control event handlers
+    private void compileButton_Click(object sender, EventArgs e) {
+      Compile();
+    }
+
     private void startStopButton_Click(object sender, EventArgs e) {
       if (running) {
@@ -134 +154 @@
     #region global HotKeys
     protected override bool ProcessCmdKey(ref Message msg, Keys keyData) {
-      if (keyData == Keys.F5) {
-        if (Content == null || Locked)
-          return base.ProcessCmdKey(ref msg, keyData);
-        outputTextBox.Clear();
-        bool result = Compile();
-        if (result) {
-          outputTextBox.Clear();
-          Content.Execute();
-          running = true;
-        }
-        return true;
-      } else if (keyData == (Keys.F5 | Keys.Shift)) {
-        Content.Kill();
+      switch (keyData) {
+        case Keys.F5:
+          if (Content != null && !Locked) {
+            if (Compile()) {
+              outputTextBox.Clear();
+              Content.Execute();
+              running = true;
+            } else
+              infoTabControl.SelectedTab = errorListTabPage;
+          }
+          break;
+        case Keys.F5 | Keys.Shift:
+          if (running) Content.Kill();
+          break;
+        case Keys.F6:
+          if (!Compile() || Content.CompileErrors.HasWarnings)
+            infoTabControl.SelectedTab = errorListTabPage;
+          break;
       }
       return base.ProcessCmdKey(ref msg, keyData);
@@ -157 +182 @@
       Locked = true;
       errorListView.Items.Clear();
-      outputTextBox.Clear();
-      outputTextBox.AppendText("Compiling ... ");
+      outputTextBox.Text = "Compiling ... ";
       try {
         Content.Compile();
@@ -165 +189 @@
       } catch {
         outputTextBox.AppendText("Compilation failed.");
-        ShowCompilationErrors();
         return false;
       } finally {
-        OnContentChanged();
+        ShowCompilationResults();
         ReadOnly = false;
         Locked = false;
-      }
-    }
-    #endregion
-
-    private void ShowCompilationErrors() {
+        OnContentChanged();
+      }
+    }
+    #endregion
+
+    private void ShowCompilationResults() {
       if (Content.CompileErrors.Count == 0) return;
-      var warnings = new List<CompilerError>();
-      var errors = new List<CompilerError>();
-      foreach (CompilerError ce in Content.CompileErrors) {
-        if (ce.IsWarning) warnings.Add(ce);
-        else errors.Add(ce);
-      }
-      var msgs = warnings.OrderBy(x => x.Line)
-                         .ThenBy(x => x.Column)
-                   .Concat(errors.OrderBy(x => x.Line)
-                                 .ThenBy(x => x.Column));
-      outputTextBox.AppendText(Environment.NewLine);
-      outputTextBox.AppendText("---");
-      outputTextBox.AppendText(Environment.NewLine);
+      var msgs = Content.CompileErrors.OfType<CompilerError>()
+                                      .OrderBy(x => x.IsWarning)
+                                      .ThenBy(x => x.Line)
+                                      .ThenBy(x => x.Column);
       foreach (var m in msgs) {
-        var item = new ListViewItem(new[] {
+        var item = new ListViewItem();
+        item.SubItems.AddRange(new[] {
           m.IsWarning ? "Warning" : "Error",
           m.ErrorNumber,
-          m.Line.ToString(),
-          m.Column.ToString(),
+          m.Line.ToString(CultureInfo.InvariantCulture),
+          m.Column.ToString(CultureInfo.InvariantCulture),
           m.ErrorText
         });
+        item.ImageIndex = m.IsWarning ? 0 : 1;
         errorListView.Items.Add(item);
-        outputTextBox.AppendText(string.Format("{0} {1} ({2}:{3}): {4}",
-                                 item.SubItems[0].Text,
-                                 item.SubItems[1].Text,
-                                 item.SubItems[2].Text,
-                                 item.SubItems[3].Text,
-                                 item.SubItems[4].Text));
-        outputTextBox.AppendText(Environment.NewLine);
-      }
+      }
+      AdjustErrorListViewColumnSizes();
+    }
+
+    private void AdjustErrorListViewColumnSizes() {
+      foreach (ColumnHeader ch in errorListView.Columns)
+        // adjusts the column width to the width of the column
+        // header or the column content, whichever is greater
+        ch.Width = -2;
     }
   }

stable/HeuristicLab.HLScript.Views/3.3/VariableStoreView.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -22 +22 @@
 using System.Windows.Forms;
 
-namespace HeuristicLab.HLScript.Views {
+namespace HeuristicLab.Scripting.Views {
   partial class VariableStoreView {
     /// <summary>

stable/HeuristicLab.HLScript.Views/3.3/VariableStoreView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -25 +25 @@
 using System.Drawing;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using HeuristicLab.Collections;
@@ -36 +37 @@
 using HeuristicLab.PluginInfrastructure;
 
-namespace HeuristicLab.HLScript.Views {
+namespace HeuristicLab.Scripting.Views {
   [View("ItemCollection View")]
   [Content(typeof(VariableStore), true)]
@@ -114 +115 @@
         removeButton.Enabled = !Locked && !ReadOnly && variableListView.SelectedItems.Count > 0;
         variableListView.Enabled = true;
+        variableListView.LabelEdit = !Locked && !ReadOnly;
       }
     }
@@ -287 +289 @@
     }
 
+    private readonly Regex SafeVariableNameRegex = new Regex("^[@]?[_a-zA-Z][_a-zA-Z0-9]*$");
     private void variableListView_AfterLabelEdit(object sender, LabelEditEventArgs e) {
-      if (!string.IsNullOrEmpty(e.Label)) {
+      string name = e.Label;
+      if (!string.IsNullOrEmpty(name) && SafeVariableNameRegex.IsMatch(name)) {
         var variable = (KeyValuePair<string, object>)variableListView.Items[e.Item].Tag;
-        if (!Content.ContainsKey(e.Label)) {
+        if (!Content.ContainsKey(name)) {
           Content.Remove(variable.Key);
-          Content.Add(e.Label, variable.Value);
+          Content.Add(name, variable.Value);
         }
       }
@@ -389 +393 @@
     }
     protected virtual void AdjustListViewColumnSizes() {
-      if (variableListView.Items.Count > 0) {
-        for (int i = 0; i < variableListView.Columns.Count; i++)
-          variableListView.Columns[i].AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
-      }
+      foreach (ColumnHeader ch in variableListView.Columns)
+        ch.Width = -2;
     }
     protected virtual void RebuildImageList() {