Changeset 10401 for trunk/sources/HeuristicLab.HLScript.Views

Timestamp:

01/27/14 14:13:02 (10 years ago)

Author:

jkarder

Message:

#2136:

• renamed some HLScript files
• fixed a bug where variables could be renamed while a script was running
• the complete source code is now always visible
• removed "show generated code" feature

Location:

trunk/sources/HeuristicLab.HLScript.Views/3.3

Files:

• HeuristicLab.HLScript.Views-3.3.csproj (modified) (1 diff)
• ScriptView.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.HLScript.Views/3.3/HLScriptView.Designer.cs) (9 diffs)
• ScriptView.cs (moved) (moved from trunk/sources/HeuristicLab.HLScript.Views/3.3/HLScriptView.cs) (6 diffs)
• VariableStoreView.cs (modified) (1 diff)

trunk/sources/HeuristicLab.HLScript.Views/3.3/HeuristicLab.HLScript.Views-3.3.csproj

@@ -86 +86 @@
   <ItemGroup>
     <None Include="Plugin.cs.frame" />
-    <Compile Include="HLScriptView.cs">
+    <Compile Include="ScriptView.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="HLScriptView.Designer.cs">
-      <DependentUpon>HLScriptView.cs</DependentUpon>
+    <Compile Include="ScriptView.Designer.cs">
+      <DependentUpon>ScriptView.cs</DependentUpon>
     </Compile>
     <Compile Include="Plugin.cs" />

trunk/sources/HeuristicLab.HLScript.Views/3.3/ScriptView.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.HLScript.Views {
-  partial class HLScriptView {
+  partial class ScriptView {
     /// <summary> 
     /// Required designer variable.
@@ -46 +46 @@
     private void InitializeComponent() {
       this.compilationLabel = new System.Windows.Forms.Label();
-      this.showCodeButton = new System.Windows.Forms.Button();
       this.startStopButton = new System.Windows.Forms.Button();
       this.errorListView = new System.Windows.Forms.ListView();
@@ -61 +60 @@
       this.outputTabPage = new System.Windows.Forms.TabPage();
       this.outputTextBox = new System.Windows.Forms.TextBox();
+      this.variableStoreView = new HeuristicLab.HLScript.Views.VariableStoreView();
       this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
-      this.variableStoreView = new HeuristicLab.HLScript.Views.VariableStoreView();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -92 +91 @@
       this.compilationLabel.AutoSize = true;
       this.compilationLabel.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
-      this.compilationLabel.Location = new System.Drawing.Point(63, 32);
+      this.compilationLabel.Location = new System.Drawing.Point(33, 32);
       this.compilationLabel.Name = "compilationLabel";
       this.compilationLabel.Size = new System.Drawing.Size(69, 13);
       this.compilationLabel.TabIndex = 3;
       this.compilationLabel.Text = "Not compiled";
-      // 
-      // showCodeButton
-      // 
-      this.showCodeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.PrintPreview;
-      this.showCodeButton.Location = new System.Drawing.Point(33, 26);
-      this.showCodeButton.Name = "showCodeButton";
-      this.showCodeButton.Size = new System.Drawing.Size(24, 24);
-      this.showCodeButton.TabIndex = 2;
-      this.showCodeButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
-      this.toolTip.SetToolTip(this.showCodeButton, "Show generated code");
-      this.showCodeButton.UseVisualStyleBackColor = true;
-      this.showCodeButton.Click += new System.EventHandler(this.showCodeButton_Click);
       // 
       // startStopButton
@@ -179 +166 @@
       // splitContainer1
       // 
-      this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+      this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.splitContainer1.Location = new System.Drawing.Point(3, 56);
@@ -260 +247 @@
       this.outputTextBox.TabIndex = 0;
       this.outputTextBox.WordWrap = false;
+      // 
+      // variableStoreView
+      // 
+      this.variableStoreView.Caption = "ItemCollection View";
+      this.variableStoreView.Content = null;
+      this.variableStoreView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.variableStoreView.Location = new System.Drawing.Point(0, 0);
+      this.variableStoreView.Name = "variableStoreView";
+      this.variableStoreView.ReadOnly = false;
+      this.variableStoreView.Size = new System.Drawing.Size(188, 543);
+      this.variableStoreView.TabIndex = 0;
       // 
       // viewHost
@@ -275 +273 @@
       this.viewHost.ViewType = null;
       // 
-      // variableStoreView
-      // 
-      this.variableStoreView.Caption = "ItemCollection View";
-      this.variableStoreView.Content = null;
-      this.variableStoreView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.variableStoreView.Location = new System.Drawing.Point(0, 0);
-      this.variableStoreView.Name = "variableStoreView";
-      this.variableStoreView.ReadOnly = false;
-      this.variableStoreView.Size = new System.Drawing.Size(188, 543);
-      this.variableStoreView.TabIndex = 0;
-      // 
-      // HLScriptView
+      // ScriptView
       // 
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
@@ -292 +279 @@
       this.Controls.Add(this.startStopButton);
       this.Controls.Add(this.compilationLabel);
-      this.Controls.Add(this.showCodeButton);
-      this.Name = "HLScriptView";
+      this.Name = "ScriptView";
       this.Size = new System.Drawing.Size(835, 602);
-      this.Controls.SetChildIndex(this.showCodeButton, 0);
       this.Controls.SetChildIndex(this.compilationLabel, 0);
       this.Controls.SetChildIndex(this.startStopButton, 0);
@@ -322 +307 @@
     #endregion
 
-    private System.Windows.Forms.Button showCodeButton;
     private System.Windows.Forms.Label compilationLabel;
     private System.Windows.Forms.Button startStopButton;

trunk/sources/HeuristicLab.HLScript.Views/3.3/ScriptView.cs

@@ -26 +26 @@
 using System.Linq;
 using System.Windows.Forms;
-using HeuristicLab.CodeEditor;
 using HeuristicLab.Common;
 using HeuristicLab.Common.Resources;
@@ -34 +33 @@
 namespace HeuristicLab.HLScript.Views {
 
-  [View("HLScript View")]
-  [Content(typeof(HLScript), true)]
-  public partial class HLScriptView : NamedItemView {
+  [View("Script View")]
+  [Content(typeof(Script), true)]
+  public partial class ScriptView : NamedItemView {
     private bool running;
 
-    public new HLScript Content {
-      get { return (HLScript)base.Content; }
-      set { base.Content = (HLScript)value; }
-    }
-
-    public HLScriptView() {
+    public new Script Content {
+      get { return (Script)base.Content; }
+      set { base.Content = (Script)value; }
+    }
+
+    public ScriptView() {
       InitializeComponent();
     }
@@ -70 +69 @@
     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;
@@ -110 +111 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      startStopButton.Enabled = Content != null && !Locked;
-      showCodeButton.Enabled = Content != null && !string.IsNullOrEmpty(Content.CompilationUnitCode);
+      startStopButton.Enabled = Content != null && (!Locked || running);
       codeEditor.Enabled = Content != null && !Locked && !ReadOnly;
     }
@@ -125 +125 @@
           running = true;
         }
-    }
-
-    private void showCodeButton_Click(object sender, EventArgs e) {
-      new CodeViewer(Content.CompilationUnitCode).ShowDialog(this);
     }
 
@@ -203 +199 @@
         });
         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(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);
       }

trunk/sources/HeuristicLab.HLScript.Views/3.3/VariableStoreView.cs

@@ -114 +114 @@
         removeButton.Enabled = !Locked && !ReadOnly && variableListView.SelectedItems.Count > 0;
         variableListView.Enabled = true;
+        variableListView.LabelEdit = !Locked && !ReadOnly;
       }
     }