Changeset 4492

Timestamp:

09/25/10 03:32:18 (14 years ago)

Author:

swagner

Message:

Worked on OKB (#1174)

Location:

branches/OKB

Files:

• HeuristicLab.Clients.OKB-3.3/AdministratorMenuItem.cs (moved) (moved from branches/OKB/HeuristicLab.Clients.OKB-3.3/AdministrationMenuItem.cs) (1 diff)
• HeuristicLab.Clients.OKB-3.3/HeuristicLab.Clients.OKB-3.3.csproj (modified) (4 diffs)
• HeuristicLab.Clients.OKB-3.3/ServiceClients/Algorithm.cs (modified) (1 diff)
• HeuristicLab.Clients.OKB-3.3/ServiceClients/AlgorithmData.cs (modified) (1 diff)
• HeuristicLab.Clients.OKB-3.3/ServiceClients/DataType.cs (modified) (1 diff)
• HeuristicLab.Clients.OKB-3.3/ServiceClients/OKBItem.cs (modified) (1 diff)
• HeuristicLab.Clients.OKB-3.3/ServiceClients/Problem.cs (modified) (1 diff)
• HeuristicLab.Clients.OKB-3.3/ServiceClients/ProblemData.cs (added)
• HeuristicLab.Clients.OKB-3.3/Views/AlgorithmDataView.Designer.cs (modified) (7 diffs)
• HeuristicLab.Clients.OKB-3.3/Views/AlgorithmDataView.cs (modified) (10 diffs)
• HeuristicLab.Clients.OKB-3.3/Views/AlgorithmView.Designer.cs (modified) (10 diffs)
• HeuristicLab.Clients.OKB-3.3/Views/AlgorithmView.cs (modified) (5 diffs)
• HeuristicLab.Clients.OKB-3.3/Views/DataTypeView.Designer.cs (modified) (9 diffs)
• HeuristicLab.Clients.OKB-3.3/Views/DataTypeView.cs (modified) (6 diffs)
• HeuristicLab.Clients.OKB-3.3/Views/NamedOKBItemView.Designer.cs (modified) (6 diffs)
• HeuristicLab.Clients.OKB-3.3/Views/NamedOKBItemView.cs (modified) (1 diff)
• HeuristicLab.Clients.OKB-3.3/Views/OKBItemView.Designer.cs (modified) (3 diffs)
• HeuristicLab.Clients.OKB-3.3/Views/OKBItemView.cs (modified) (2 diffs)
• HeuristicLab.Clients.OKB-3.3/Views/ProblemDataView.Designer.cs (added)
• HeuristicLab.Clients.OKB-3.3/Views/ProblemDataView.cs (added)
• HeuristicLab.Clients.OKB-3.3/Views/ProblemView.Designer.cs (added)
• HeuristicLab.Clients.OKB-3.3/Views/ProblemView.cs (added)
• HeuristicLab.Services.OKB.DataAccess/3.3/SQL Scripts/Initialize OKB.sql (modified) (previous)
• HeuristicLab.Services.OKB/3.3/HeuristicLab.Services.OKB-3.3.csproj (modified) (1 diff)
• HeuristicLab.Services.OKB/3.3/app.config (modified) (1 diff)

branches/OKB/HeuristicLab.Clients.OKB-3.3/AdministratorMenuItem.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
-using System.Windows.Forms;
 using HeuristicLab.MainForm;
 using HeuristicLab.Optimizer;
 
 namespace HeuristicLab.Clients.OKB {
-  internal class AdministrationMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
-    private ToolStripMenuItem menuItem;
-
+  internal class AdministratorMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
     public override string Name {
-      get { return "&Administration"; }
+      get { return "&Administrator"; }
     }
     public override IEnumerable<string> Structure {

branches/OKB/HeuristicLab.Clients.OKB-3.3/HeuristicLab.Clients.OKB-3.3.csproj

@@ -76 +76 @@
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="AdministrationMenuItem.cs" />
+    <Compile Include="AdministratorMenuItem.cs" />
     <Compile Include="HeuristicLabClientsOKBPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -88 +88 @@
     <Compile Include="ServiceClients\AuthenticationServiceClient.cs" />
     <Compile Include="ServiceClients\AlgorithmData.cs" />
+    <Compile Include="ServiceClients\ProblemData.cs" />
     <Compile Include="ServiceClients\Problem.cs" />
     <Compile Include="ServiceClients\ProblemClass.cs" />
@@ -131 +132 @@
     <Compile Include="Views\AlgorithmDataView.Designer.cs">
       <DependentUpon>AlgorithmDataView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ProblemDataView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Views\ProblemDataView.Designer.cs">
+      <DependentUpon>ProblemDataView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ProblemView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Views\ProblemView.Designer.cs">
+      <DependentUpon>ProblemView.cs</DependentUpon>
     </Compile>
     <Compile Include="Views\ProblemCollectionView.cs">
@@ -183 +196 @@
     <None Include="HeuristicLabClientsOKBPlugin.cs.frame" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\AlgorithmDataView.resx">
-      <DependentUpon>AlgorithmDataView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\AlgorithmView.resx">
-      <DependentUpon>AlgorithmView.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/OKB/HeuristicLab.Clients.OKB-3.3/ServiceClients/Algorithm.cs

@@ -27 +27 @@
     public Algorithm() {
       Name = "New Algorithm";
+      PlatformId = 1;
+      AlgorithmClassId = 1;
     }
   }

branches/OKB/HeuristicLab.Clients.OKB-3.3/ServiceClients/AlgorithmData.cs

@@ -23 +23 @@
 
 namespace HeuristicLab.Clients.OKB {
-  public partial class AlgorithmData : IContent { }
+  public partial class AlgorithmData : IContent {
+    public AlgorithmData() {
+      Data = new byte[0];
+      DataTypeId = 1;
+    }
+  }
 }

branches/OKB/HeuristicLab.Clients.OKB-3.3/ServiceClients/DataType.cs

@@ -27 +27 @@
     public DataType() {
       Name = "New Data Type";
-      SqlName = "Blob";
+      SqlName = "varbinary";
+      PlatformId = 1;
     }
 

branches/OKB/HeuristicLab.Clients.OKB-3.3/ServiceClients/OKBItem.cs

@@ -92 +92 @@
     protected void RaisePropertyChanged(string propertyName) {
       OnPropertyChanged(new PropertyChangedEventArgs(propertyName));
-      if ((propertyName != "Modified") && (propertyName != "ItemImage")) {
+      if ((propertyName != "Id") && (propertyName != "Modified") && (propertyName != "ItemImage")) {
         Modified = true;
       }

branches/OKB/HeuristicLab.Clients.OKB-3.3/ServiceClients/Problem.cs

@@ -27 +27 @@
     public Problem() {
       Name = "New Problem";
+      PlatformId = 1;
+      ProblemClassId = 1;
     }
   }

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AlgorithmDataView.Designer.cs

@@ -46 +46 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AlgorithmDataView));
       this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
       this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
@@ -109 +108 @@
       this.viewHost.Caption = "View";
       this.viewHost.Content = null;
-      this.viewHost.Enabled = false;
+      this.viewHost.Enabled = true;
       this.viewHost.Location = new System.Drawing.Point(6, 19);
       this.viewHost.Name = "viewHost";
@@ -131 +130 @@
       // newDataButton
       // 
-      this.newDataButton.Image = ((System.Drawing.Image)(resources.GetObject("newDataButton.Image")));
+      this.newDataButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.NewDocument;
       this.newDataButton.Location = new System.Drawing.Point(90, 0);
       this.newDataButton.Name = "newDataButton";
@@ -142 +141 @@
       // saveFileButton
       // 
-      this.saveFileButton.Image = ((System.Drawing.Image)(resources.GetObject("saveFileButton.Image")));
+      this.saveFileButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Save;
       this.saveFileButton.Location = new System.Drawing.Point(150, 0);
       this.saveFileButton.Name = "saveFileButton";
@@ -153 +152 @@
       // openFileButton
       // 
-      this.openFileButton.Image = ((System.Drawing.Image)(resources.GetObject("openFileButton.Image")));
+      this.openFileButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Open;
       this.openFileButton.Location = new System.Drawing.Point(120, 0);
       this.openFileButton.Name = "openFileButton";
@@ -174 +173 @@
       // refreshDataButton
       // 
-      this.refreshDataButton.Image = ((System.Drawing.Image)(resources.GetObject("refreshDataButton.Image")));
+      this.refreshDataButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Refresh;
       this.refreshDataButton.Location = new System.Drawing.Point(0, 0);
       this.refreshDataButton.Name = "refreshDataButton";
@@ -185 +184 @@
       // storeDataButton
       // 
-      this.storeDataButton.Image = ((System.Drawing.Image)(resources.GetObject("storeDataButton.Image")));
+      this.storeDataButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.PublishToWeb;
       this.storeDataButton.Location = new System.Drawing.Point(30, 0);
       this.storeDataButton.Name = "storeDataButton";

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AlgorithmDataView.cs

@@ -21 +21 @@
 
 using System;
+using System.ComponentModel;
 using System.IO;
 using System.Linq;
@@ -36 +37 @@
   [Content(typeof(AlgorithmData), true)]
   public partial class AlgorithmDataView : AsynchronousContentView {
-    public long AlgorithmId { get; set; }
+    private long algorithmId;
+    public long AlgorithmId {
+      get { return algorithmId; }
+      set {
+        algorithmId = value;
+        if (Content != null) {
+          Content.AlgorithmId = value;
+          SetEnabledStateOfControls();
+        }
+      }
+    }
 
     public new AlgorithmData Content {
@@ -51 +62 @@
       dataTypeComboBox.DataSource = Administrator.Instance.DataTypes.ToList();
       dataTypeComboBox.SelectedIndex = -1;
+    }
+
+    protected override void DeregisterContentEvents() {
+      Content.PropertyChanged -= new PropertyChangedEventHandler(Content_PropertyChanged);
+      base.DeregisterContentEvents();
+    }
+    protected override void RegisterContentEvents() {
+      base.RegisterContentEvents();
+      Content.PropertyChanged += new PropertyChangedEventHandler(Content_PropertyChanged);
     }
 
@@ -79 +99 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      storeDataButton.Enabled = saveFileButton.Enabled = Content != null;
-      dataTypeComboBox.Enabled = Content != null && viewHost.Content == null;
+      newDataButton.Enabled = !ReadOnly;
+      openFileButton.Enabled = !ReadOnly;
+      saveFileButton.Enabled = (Content != null) && (((Content.Data != null) && (Content.Data.Length != 0)) || (viewHost.Content != null));
+      storeDataButton.Enabled = saveFileButton.Enabled && (Content.AlgorithmId != 0) && !ReadOnly;
+      dataTypeComboBox.Enabled = Content != null && viewHost.Content == null && !ReadOnly;
       fileTextBox.Enabled = Content != null;
       groupBox.Enabled = Content != null;
     }
 
+    private void Content_PropertyChanged(object sender, PropertyChangedEventArgs e) {
+      switch (e.PropertyName) {
+        case "DataTypeId":
+          dataTypeComboBox.SelectedItem = Administrator.Instance.DataTypes.FirstOrDefault(d => d.Id == Content.DataTypeId);
+          break;
+      }
+    }
+
     private void refreshDataButton_Click(object sender, EventArgs e) {
-      AlgorithmData data = Administrator.Instance.GetAlgorithmData(AlgorithmId);
-      Content = data;
+      BeginAsyncCall();
+      var call = new Action(delegate() {
+        AlgorithmData data = Administrator.Instance.GetAlgorithmData(AlgorithmId);
+        Content = data;
+      });
+      call.BeginInvoke(delegate(IAsyncResult result) {
+        call.EndInvoke(result);
+        EndAsyncCall();
+      }, null);
     }
     private void storeDataButton_Click(object sender, EventArgs e) {
@@ -95 +133 @@
             IAlgorithm algorithm = viewHost.Content as IAlgorithm;
             algorithm.Prepare(true);
-            algorithm.Problem = null;
             XmlGenerator.Serialize(algorithm, stream);
             stream.Close();
@@ -114 +151 @@
         if (dialog.ShowDialog(this) == DialogResult.OK) {
           try {
-            if (Content == null) Content = new AlgorithmData { AlgorithmId = AlgorithmId, Data = new byte[0] };
+            if (Content == null) Content = new AlgorithmData { AlgorithmId = AlgorithmId };
             viewHost.Content = (IContent)dialog.TypeSelector.CreateInstanceOfSelectedType();
             DataType dataType = Administrator.Instance.DataTypes.FirstOrDefault(d => d.Name == viewHost.Content.GetType().AssemblyQualifiedName);
             if (dataType == null) {
-              dataType = new DataType { Name = viewHost.Content.GetType().AssemblyQualifiedName, SqlName = "Blob" };
+              dataType = new DataType { Name = viewHost.Content.GetType().AssemblyQualifiedName, SqlName = "varbinary" };
               dataType.PlatformId = Administrator.Instance.Platforms.FirstOrDefault(p => p.Name == "HeuristicLab 3.3").Id;
-
-              Administrator.Instance.Store(dataType);
+              dataType.Store();
               Administrator.Instance.DataTypes.Add(dataType);
               dataTypeComboBox.DataSource = Administrator.Instance.DataTypes.OrderBy(d => d.Name).ToList();
             }
             dataTypeComboBox.SelectedItem = dataType;
-            dataTypeComboBox.Enabled = false;
             fileTextBox.Text = "-";
             noViewAvailableLabel.Visible = false;
+            SetEnabledStateOfControls();
           }
           catch (Exception ex) {
@@ -139 +175 @@
       if (openFileDialog.ShowDialog(this) == DialogResult.OK) {
         try {
-          if (Content == null) Content = new AlgorithmData { AlgorithmId = AlgorithmId, Data = new byte[0] };
+          if (Content == null) Content = new AlgorithmData { AlgorithmId = AlgorithmId };
           IAlgorithm algorithm = null;
           try {
@@ -151 +187 @@
             DataType dataType = Administrator.Instance.DataTypes.FirstOrDefault(d => d.Name == viewHost.Content.GetType().AssemblyQualifiedName);
             if (dataType == null) {
-              dataType = new DataType { Name = viewHost.Content.GetType().AssemblyQualifiedName, SqlName = "Blob" };
+              dataType = new DataType { Name = viewHost.Content.GetType().AssemblyQualifiedName, SqlName = "varbinary" };
               dataType.PlatformId = Administrator.Instance.Platforms.FirstOrDefault(p => p.Name == "HeuristicLab 3.3").Id;
-
-              Administrator.Instance.Store(dataType);
+              dataType.Store();
               Administrator.Instance.DataTypes.Add(dataType);
               dataTypeComboBox.DataSource = Administrator.Instance.DataTypes.OrderBy(d => d.Name).ToList();
@@ -169 +204 @@
             }
           }
-          dataTypeComboBox.Enabled = viewHost.Content == null;
           fileTextBox.Text = openFileDialog.FileName;
+          SetEnabledStateOfControls();
         }
         catch (Exception ex) {
@@ -198 +233 @@
       if (Content != null) Content.DataTypeId = ((DataType)dataTypeComboBox.SelectedItem).Id;
     }
+
+    private void BeginAsyncCall() {
+      if (InvokeRequired)
+        Invoke(new Action(BeginAsyncCall));
+      else {
+        Cursor = Cursors.AppStarting;
+        Enabled = false;
+      }
+    }
+    private void EndAsyncCall() {
+      if (InvokeRequired)
+        Invoke(new Action(EndAsyncCall));
+      else {
+        Cursor = Cursors.Default;
+        Enabled = true;
+      }
+    }
   }
 }

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AlgorithmView.Designer.cs

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AlgorithmView));
       this.platformLabel = new System.Windows.Forms.Label();
       this.platformComboBox = new System.Windows.Forms.ComboBox();
@@ -57 +56 @@
       this.dataTabPage = new System.Windows.Forms.TabPage();
       this.algorithmDataView = new HeuristicLab.Clients.OKB.AlgorithmDataView();
-      ((System.ComponentModel.ISupportInitialize)(this.modifiedPictureBox)).BeginInit();
       this.tabControl.SuspendLayout();
       this.usersTabPage.SuspendLayout();
@@ -66 +64 @@
       // 
       this.nameTextBox.Location = new System.Drawing.Point(90, 29);
-      this.nameTextBox.Size = new System.Drawing.Size(495, 20);
+      this.nameTextBox.Size = new System.Drawing.Size(543, 20);
       // 
       // descriptionTextBox
       // 
       this.descriptionTextBox.Location = new System.Drawing.Point(90, 55);
-      this.descriptionTextBox.Size = new System.Drawing.Size(495, 20);
+      this.descriptionTextBox.Size = new System.Drawing.Size(543, 20);
       // 
       // storeButton
       // 
       this.toolTip.SetToolTip(this.storeButton, "Store Data");
-      // 
-      // modifiedPictureBox
-      // 
-      this.modifiedPictureBox.Location = new System.Drawing.Point(591, 3);
       // 
       // platformLabel
@@ -98 +92 @@
       this.platformComboBox.Location = new System.Drawing.Point(90, 81);
       this.platformComboBox.Name = "platformComboBox";
-      this.platformComboBox.Size = new System.Drawing.Size(495, 21);
+      this.platformComboBox.Size = new System.Drawing.Size(543, 21);
       this.platformComboBox.TabIndex = 6;
       this.platformComboBox.SelectedValueChanged += new System.EventHandler(this.platformComboBox_SelectedValueChanged);
@@ -119 +113 @@
       this.algorithmClassComboBox.Location = new System.Drawing.Point(90, 108);
       this.algorithmClassComboBox.Name = "algorithmClassComboBox";
-      this.algorithmClassComboBox.Size = new System.Drawing.Size(495, 21);
+      this.algorithmClassComboBox.Size = new System.Drawing.Size(543, 21);
       this.algorithmClassComboBox.TabIndex = 8;
       this.algorithmClassComboBox.SelectedValueChanged += new System.EventHandler(this.algorithmClassComboBox_SelectedValueChanged);
@@ -165 +159 @@
       // storeUsersButton
       // 
-      this.storeUsersButton.Image = ((System.Drawing.Image)(resources.GetObject("storeUsersButton.Image")));
+      this.storeUsersButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.PublishToWeb;
       this.storeUsersButton.Location = new System.Drawing.Point(36, 6);
       this.storeUsersButton.Name = "storeUsersButton";
@@ -176 +170 @@
       // refreshUsersButton
       // 
-      this.refreshUsersButton.Image = ((System.Drawing.Image)(resources.GetObject("refreshUsersButton.Image")));
+      this.refreshUsersButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Refresh;
       this.refreshUsersButton.Location = new System.Drawing.Point(6, 6);
       this.refreshUsersButton.Name = "refreshUsersButton";
@@ -198 +192 @@
       // algorithmDataView
       // 
+      this.algorithmDataView.AlgorithmId = ((long)(0));
       this.algorithmDataView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
                   | System.Windows.Forms.AnchorStyles.Left)
@@ -224 +219 @@
       this.Controls.SetChildIndex(this.platformComboBox, 0);
       this.Controls.SetChildIndex(this.tabControl, 0);
-      this.Controls.SetChildIndex(this.modifiedPictureBox, 0);
       this.Controls.SetChildIndex(this.storeButton, 0);
       this.Controls.SetChildIndex(this.nameTextBox, 0);
@@ -230 +224 @@
       this.Controls.SetChildIndex(this.descriptionLabel, 0);
       this.Controls.SetChildIndex(this.descriptionTextBox, 0);
-      ((System.ComponentModel.ISupportInitialize)(this.modifiedPictureBox)).EndInit();
       this.tabControl.ResumeLayout(false);
       this.usersTabPage.ResumeLayout(false);

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AlgorithmView.cs

@@ -46 +46 @@
     }
 
-    protected override void DeregisterContentEvents() {
-      // ...
-      base.DeregisterContentEvents();
-    }
-    protected override void RegisterContentEvents() {
-      base.RegisterContentEvents();
-      // ...
-    }
-
     protected override void OnContentChanged() {
       base.OnContentChanged();
@@ -72 +63 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      platformComboBox.Enabled = Content != null;
-      algorithmClassComboBox.Enabled = Content != null;
+      platformComboBox.Enabled = (Content != null) && !ReadOnly;
+      algorithmClassComboBox.Enabled = (Content != null) && !ReadOnly;
       refreshUsersButton.Enabled = Content != null;
-      storeUsersButton.Enabled = usersListBox.DataSource != null;
-      usersListBox.Enabled = usersListBox.DataSource != null;
+      storeUsersButton.Enabled = (usersListBox.DataSource != null) && !ReadOnly;
+      usersListBox.Enabled = (usersListBox.DataSource != null) && !ReadOnly;
       algorithmDataView.Enabled = Content != null;
     }
@@ -82 +73 @@
     protected override void OnContentPropertyChanged(string propertyName) {
       switch (propertyName) {
+        case "Id":
+          algorithmDataView.AlgorithmId = Content.Id;
+          break;
         case "PlatformId":
           platformComboBox.SelectedItem = Administrator.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
@@ -113 +107 @@
         foreach (Guid id in ids)
           usersListBox.SelectedItems.Add(users.First(u => u.Id == id));
-        usersListBox.Enabled = true;
+        usersListBox.Enabled = !ReadOnly;
         storeUsersButton.Enabled = false;
       }
@@ -122 +116 @@
     }
     private void usersListBox_SelectedIndexChanged(object sender, EventArgs e) {
-      storeUsersButton.Enabled = true;
+      storeUsersButton.Enabled = !ReadOnly;
     }
   }

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/DataTypeView.Designer.cs

@@ -48 +48 @@
       this.nameTextBox = new System.Windows.Forms.TextBox();
       this.sqlNameLabel = new System.Windows.Forms.Label();
-      this.sqlNameTextBox = new System.Windows.Forms.TextBox();
       this.platformLabel = new System.Windows.Forms.Label();
       this.platformComboBox = new System.Windows.Forms.ComboBox();
-      ((System.ComponentModel.ISupportInitialize)(this.modifiedPictureBox)).BeginInit();
+      this.comboBox1 = new System.Windows.Forms.ComboBox();
+      this.sqlNameComboBox = new System.Windows.Forms.ComboBox();
       this.SuspendLayout();
       // 
@@ -57 +57 @@
       // 
       this.toolTip.SetToolTip(this.storeButton, "Store Data");
-      // 
-      // modifiedPictureBox
-      // 
-      this.modifiedPictureBox.Location = new System.Drawing.Point(308, 3);
       // 
       // nameLabel
@@ -77 +73 @@
       this.nameTextBox.Location = new System.Drawing.Point(71, 29);
       this.nameTextBox.Name = "nameTextBox";
-      this.nameTextBox.Size = new System.Drawing.Size(231, 20);
+      this.nameTextBox.Size = new System.Drawing.Size(279, 20);
       this.nameTextBox.TabIndex = 2;
       this.nameTextBox.TextChanged += new System.EventHandler(this.nameTextBox_TextChanged);
@@ -91 +87 @@
       this.sqlNameLabel.Text = "&SQL Name:";
       // 
-      // sqlNameTextBox
-      // 
-      this.sqlNameTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.sqlNameTextBox.Location = new System.Drawing.Point(71, 55);
-      this.sqlNameTextBox.Name = "sqlNameTextBox";
-      this.sqlNameTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-      this.sqlNameTextBox.Size = new System.Drawing.Size(231, 20);
-      this.sqlNameTextBox.TabIndex = 4;
-      this.sqlNameTextBox.TextChanged += new System.EventHandler(this.sqlNameTextBox_TextChanged);
-      this.sqlNameTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sqlNameTextBox_KeyDown);
-      // 
       // platformLabel
       // 
       this.platformLabel.AutoSize = true;
-      this.platformLabel.Location = new System.Drawing.Point(3, 84);
+      this.platformLabel.Location = new System.Drawing.Point(3, 85);
       this.platformLabel.Name = "platformLabel";
       this.platformLabel.Size = new System.Drawing.Size(48, 13);
@@ -118 +102 @@
       this.platformComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
       this.platformComboBox.FormattingEnabled = true;
-      this.platformComboBox.Location = new System.Drawing.Point(71, 81);
+      this.platformComboBox.Location = new System.Drawing.Point(71, 82);
       this.platformComboBox.Name = "platformComboBox";
-      this.platformComboBox.Size = new System.Drawing.Size(231, 21);
+      this.platformComboBox.Size = new System.Drawing.Size(279, 21);
       this.platformComboBox.TabIndex = 6;
       this.platformComboBox.SelectedValueChanged += new System.EventHandler(this.platformComboBox_SelectedValueChanged);
+      // 
+      // comboBox1
+      // 
+      this.comboBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+      this.comboBox1.FormattingEnabled = true;
+      this.comboBox1.Location = new System.Drawing.Point(71, 55);
+      this.comboBox1.Name = "comboBox1";
+      this.comboBox1.Size = new System.Drawing.Size(279, 21);
+      this.comboBox1.TabIndex = 6;
+      this.comboBox1.SelectedValueChanged += new System.EventHandler(this.platformComboBox_SelectedValueChanged);
+      // 
+      // sqlNameComboBox
+      // 
+      this.sqlNameComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.sqlNameComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+      this.sqlNameComboBox.FormattingEnabled = true;
+      this.sqlNameComboBox.Items.AddRange(new object[] {
+            "bigint",
+            "bit",
+            "float",
+            "nvarchar",
+            "varbinary"});
+      this.sqlNameComboBox.Location = new System.Drawing.Point(71, 55);
+      this.sqlNameComboBox.Name = "sqlNameComboBox";
+      this.sqlNameComboBox.Size = new System.Drawing.Size(279, 21);
+      this.sqlNameComboBox.TabIndex = 4;
+      this.sqlNameComboBox.SelectedValueChanged += new System.EventHandler(this.sqlNameComboBox_SelectedValueChanged);
       // 
       // DataTypeView
@@ -128 +142 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.sqlNameComboBox);
+      this.Controls.Add(this.comboBox1);
       this.Controls.Add(this.platformComboBox);
-      this.Controls.Add(this.sqlNameTextBox);
       this.Controls.Add(this.platformLabel);
       this.Controls.Add(this.sqlNameLabel);
@@ -135 +150 @@
       this.Controls.Add(this.nameTextBox);
       this.Name = "DataTypeView";
-      this.Size = new System.Drawing.Size(350, 229);
-      this.Controls.SetChildIndex(this.modifiedPictureBox, 0);
+      this.Size = new System.Drawing.Size(350, 126);
       this.Controls.SetChildIndex(this.storeButton, 0);
       this.Controls.SetChildIndex(this.nameTextBox, 0);
@@ -142 +156 @@
       this.Controls.SetChildIndex(this.sqlNameLabel, 0);
       this.Controls.SetChildIndex(this.platformLabel, 0);
-      this.Controls.SetChildIndex(this.sqlNameTextBox, 0);
       this.Controls.SetChildIndex(this.platformComboBox, 0);
-      ((System.ComponentModel.ISupportInitialize)(this.modifiedPictureBox)).EndInit();
+      this.Controls.SetChildIndex(this.comboBox1, 0);
+      this.Controls.SetChildIndex(this.sqlNameComboBox, 0);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -155 +169 @@
     private System.Windows.Forms.Label nameLabel;
     private System.Windows.Forms.Label sqlNameLabel;
-    private System.Windows.Forms.TextBox sqlNameTextBox;
     private System.Windows.Forms.Label platformLabel;
     private System.Windows.Forms.ComboBox platformComboBox;
+    private System.Windows.Forms.ComboBox comboBox1;
+    private System.Windows.Forms.ComboBox sqlNameComboBox;
   }
 }

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/DataTypeView.cs

@@ -21 +21 @@
 
 using System;
+using System.Linq;
 using System.Windows.Forms;
-using System.Linq;
-using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
@@ -49 +48 @@
       if (Content == null) {
         nameTextBox.Text = string.Empty;
-        sqlNameTextBox.Text = string.Empty;
+        sqlNameComboBox.SelectedIndex = -1;
         platformComboBox.SelectedIndex = -1;
         if (ViewAttribute.HasViewAttribute(this.GetType()))
@@ -57 +56 @@
       } else {
         nameTextBox.Text = Content.Name;
-        sqlNameTextBox.Text = Content.SqlName;
+        sqlNameComboBox.Text = Content.SqlName;
         platformComboBox.SelectedItem = Administrator.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
         Caption = Content.Name;
@@ -65 +64 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      if (Content == null) {
-        nameTextBox.Enabled = false;
-        sqlNameTextBox.Enabled = false;
-        platformComboBox.Enabled = false;
-      } else {
-        nameTextBox.Enabled = true;
-        nameTextBox.ReadOnly = ReadOnly;
-        sqlNameTextBox.Enabled = true;
-        sqlNameTextBox.ReadOnly = ReadOnly;
-        platformComboBox.Enabled = true;
-      }
+      nameTextBox.Enabled = Content != null;
+      nameTextBox.ReadOnly = ReadOnly;
+      sqlNameComboBox.Enabled = (Content != null) && !ReadOnly;
+      platformComboBox.Enabled = (Content != null) && !ReadOnly;
     }
 
@@ -85 +77 @@
           break;
         case "SqlName":
-          sqlNameTextBox.Text = Content.SqlName;
+          sqlNameComboBox.Text = Content.SqlName;
           break;
         case "PlatformId":
@@ -105 +97 @@
         Content.Name = nameTextBox.Text;
     }
-    private void sqlNameTextBox_KeyDown(object sender, KeyEventArgs e) {
-      if ((e.KeyCode == Keys.Enter) || (e.KeyCode == Keys.Return))
-        sqlNameLabel.Focus();  // set focus on label to validate data
-      if (e.KeyCode == Keys.Escape) {
-        sqlNameTextBox.Text = Content.SqlName;
-        sqlNameLabel.Focus();  // set focus on label to validate data
+    private void sqlNameComboBox_SelectedValueChanged(object sender, EventArgs e) {
+      if (sqlNameComboBox.Text != Content.SqlName) {
+        Content.SqlName = sqlNameComboBox.Text;
       }
-    }
-    private void sqlNameTextBox_TextChanged(object sender, EventArgs e) {
-      if (sqlNameTextBox.Text != Content.SqlName)
-        Content.SqlName = sqlNameTextBox.Text;
     }
     private void platformComboBox_SelectedValueChanged(object sender, System.EventArgs e) {

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/NamedOKBItemView.Designer.cs

@@ -49 +49 @@
       this.descriptionLabel = new System.Windows.Forms.Label();
       this.descriptionTextBox = new System.Windows.Forms.TextBox();
-      ((System.ComponentModel.ISupportInitialize)(this.modifiedPictureBox)).BeginInit();
       this.SuspendLayout();
       // 
@@ -55 +54 @@
       // 
       this.toolTip.SetToolTip(this.storeButton, "Store Data");
-      // 
-      // modifiedPictureBox
-      // 
-      this.modifiedPictureBox.Location = new System.Drawing.Point(308, 3);
-      this.modifiedPictureBox.Size = new System.Drawing.Size(39, 130);
       // 
       // nameLabel
@@ -76 +70 @@
       this.nameTextBox.Location = new System.Drawing.Point(72, 29);
       this.nameTextBox.Name = "nameTextBox";
-      this.nameTextBox.Size = new System.Drawing.Size(230, 20);
+      this.nameTextBox.Size = new System.Drawing.Size(278, 20);
       this.nameTextBox.TabIndex = 2;
       this.nameTextBox.TextChanged += new System.EventHandler(this.nameTextBox_TextChanged);
@@ -97 +91 @@
       this.descriptionTextBox.Name = "descriptionTextBox";
       this.descriptionTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-      this.descriptionTextBox.Size = new System.Drawing.Size(230, 20);
+      this.descriptionTextBox.Size = new System.Drawing.Size(278, 20);
       this.descriptionTextBox.TabIndex = 4;
       this.descriptionTextBox.TextChanged += new System.EventHandler(this.descriptionTextBox_TextChanged);
@@ -111 +105 @@
       this.Controls.Add(this.nameTextBox);
       this.Name = "NamedOKBItemView";
-      this.Size = new System.Drawing.Size(350, 229);
-      this.Controls.SetChildIndex(this.modifiedPictureBox, 0);
+      this.Size = new System.Drawing.Size(350, 93);
       this.Controls.SetChildIndex(this.storeButton, 0);
       this.Controls.SetChildIndex(this.nameTextBox, 0);
@@ -118 +111 @@
       this.Controls.SetChildIndex(this.descriptionLabel, 0);
       this.Controls.SetChildIndex(this.descriptionTextBox, 0);
-      ((System.ComponentModel.ISupportInitialize)(this.modifiedPictureBox)).EndInit();
       this.ResumeLayout(false);
       this.PerformLayout();

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/NamedOKBItemView.cs

@@ -60 +60 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      if (Content == null) {
-        nameTextBox.Enabled = false;
-        descriptionTextBox.Enabled = false;
-      } else {
-        nameTextBox.Enabled = true;
-        nameTextBox.ReadOnly = ReadOnly;
-        descriptionTextBox.Enabled = true;
-        descriptionTextBox.ReadOnly = ReadOnly;
-      }
+      nameTextBox.Enabled = Content != null;
+      nameTextBox.ReadOnly = ReadOnly;
+      descriptionTextBox.Enabled = Content != null;
+      descriptionTextBox.ReadOnly = ReadOnly;
     }
 

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/OKBItemView.Designer.cs

@@ -48 +48 @@
       this.storeButton = new System.Windows.Forms.Button();
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-      this.modifiedPictureBox = new System.Windows.Forms.PictureBox();
-      ((System.ComponentModel.ISupportInitialize)(this.modifiedPictureBox)).BeginInit();
       this.SuspendLayout();
       // 
@@ -63 +61 @@
       this.storeButton.Click += new System.EventHandler(this.storeButton_Click);
       // 
-      // modifiedPictureBox
-      // 
-      this.modifiedPictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-      this.modifiedPictureBox.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.HighPriorityLarge;
-      this.modifiedPictureBox.Location = new System.Drawing.Point(312, 3);
-      this.modifiedPictureBox.Name = "modifiedPictureBox";
-      this.modifiedPictureBox.Size = new System.Drawing.Size(39, 130);
-      this.modifiedPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
-      this.modifiedPictureBox.TabIndex = 1;
-      this.modifiedPictureBox.TabStop = false;
-      this.toolTip.SetToolTip(this.modifiedPictureBox, "Data Modified");
-      this.modifiedPictureBox.Visible = false;
-      // 
       // OKBItemView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.modifiedPictureBox);
       this.Controls.Add(this.storeButton);
       this.Name = "OKBItemView";
       this.Size = new System.Drawing.Size(354, 308);
-      ((System.ComponentModel.ISupportInitialize)(this.modifiedPictureBox)).EndInit();
       this.ResumeLayout(false);
 
@@ -93 +76 @@
     protected System.Windows.Forms.Button storeButton;
     protected System.Windows.Forms.ToolTip toolTip;
-    protected System.Windows.Forms.PictureBox modifiedPictureBox;
 
 

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/OKBItemView.cs

@@ -54 +54 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      storeButton.Enabled = (Content != null) && Content.Modified;
-      modifiedPictureBox.Visible = (Content != null) && Content.Modified;
+      storeButton.Enabled = (Content != null) && !ReadOnly && Content.Modified;
     }
 
@@ -69 +68 @@
       if (InvokeRequired)
         Invoke(new EventHandler(Content_ModifiedChanged), sender, e);
-      else {
-        storeButton.Enabled = Content.Modified;
-        modifiedPictureBox.Visible = Content.Modified;
-      }
+      else
+        SetEnabledStateOfControls();
     }
 

branches/OKB/HeuristicLab.Services.OKB/3.3/HeuristicLab.Services.OKB-3.3.csproj

@@ -149 +149 @@
       <FlavorProperties GUID="{3D9AD99F-2412-4246-B90B-4EAA41C64699}">
         <WcfProjectProperties>
-          <AutoStart>False</AutoStart>
+          <AutoStart>True</AutoStart>
         </WcfProjectProperties>
       </FlavorProperties>

branches/OKB/HeuristicLab.Services.OKB/3.3/app.config

@@ -9 +9 @@
 
   <system.web>
+    <compilation debug="true" />
     <membership>
       <providers>