Changeset 4441 for branches/OKB/HeuristicLab.Clients.OKB-3.3/Views

Timestamp:

09/20/10 05:15:15 (14 years ago)

Author:

swagner

Message:

Worked on OKB data model and services (#1174)

Location:

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

Files:

• AdministratorView.Designer.cs (modified) (7 diffs)
• AdministratorView.cs (modified) (4 diffs)
• AlgorithmView.Designer.cs (added)
• AlgorithmView.cs (added)
• NamedOKBItemView.Designer.cs (modified) (6 diffs)
• NamedOKBItemView.cs (modified) (1 diff)
• OKBItemView.Designer.cs (modified) (3 diffs)
• OKBItemView.cs (modified) (3 diffs)
• PlatformCollectionView.Designer.cs (added)
• PlatformCollectionView.cs (added)

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

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
+      this.components = new System.ComponentModel.Container();
       this.tabControl = new System.Windows.Forms.TabControl();
+      this.platformsTabPage = new System.Windows.Forms.TabPage();
+      this.platformCollectionView = new HeuristicLab.Clients.OKB.PlatformCollectionView();
       this.algorithmClassesTabPage = new System.Windows.Forms.TabPage();
       this.algorithmClassCollectionView = new HeuristicLab.Clients.OKB.AlgorithmClassCollectionView();
-      this.refreshButton = new System.Windows.Forms.Button();
       this.algorithmsTabPage = new System.Windows.Forms.TabPage();
       this.algorithmCollectionView = new HeuristicLab.Clients.OKB.AlgorithmCollectionView();
+      this.refreshButton = new System.Windows.Forms.Button();
+      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
       this.tabControl.SuspendLayout();
+      this.platformsTabPage.SuspendLayout();
       this.algorithmClassesTabPage.SuspendLayout();
       this.algorithmsTabPage.SuspendLayout();
@@ -61 +66 @@
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
+      this.tabControl.Controls.Add(this.platformsTabPage);
       this.tabControl.Controls.Add(this.algorithmClassesTabPage);
       this.tabControl.Controls.Add(this.algorithmsTabPage);
@@ -67 +73 @@
       this.tabControl.SelectedIndex = 0;
       this.tabControl.Size = new System.Drawing.Size(727, 406);
-      this.tabControl.TabIndex = 2;
+      this.tabControl.TabIndex = 1;
+      // 
+      // platformsTabPage
+      // 
+      this.platformsTabPage.Controls.Add(this.platformCollectionView);
+      this.platformsTabPage.Location = new System.Drawing.Point(4, 22);
+      this.platformsTabPage.Name = "platformsTabPage";
+      this.platformsTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.platformsTabPage.Size = new System.Drawing.Size(719, 380);
+      this.platformsTabPage.TabIndex = 2;
+      this.platformsTabPage.Text = "Platforms";
+      this.platformsTabPage.UseVisualStyleBackColor = true;
+      // 
+      // platformCollectionView
+      // 
+      this.platformCollectionView.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.platformCollectionView.Caption = "PlatformCollection View";
+      this.platformCollectionView.Content = null;
+      this.platformCollectionView.Location = new System.Drawing.Point(6, 6);
+      this.platformCollectionView.Name = "platformCollectionView";
+      this.platformCollectionView.ReadOnly = false;
+      this.platformCollectionView.Size = new System.Drawing.Size(707, 368);
+      this.platformCollectionView.TabIndex = 0;
       // 
       // algorithmClassesTabPage
@@ -91 +121 @@
       this.algorithmClassCollectionView.ReadOnly = false;
       this.algorithmClassCollectionView.Size = new System.Drawing.Size(707, 368);
-      this.algorithmClassCollectionView.TabIndex = 3;
-      // 
-      // refreshButton
-      // 
-      this.refreshButton.Location = new System.Drawing.Point(0, 0);
-      this.refreshButton.Name = "refreshButton";
-      this.refreshButton.Size = new System.Drawing.Size(75, 23);
-      this.refreshButton.TabIndex = 2;
-      this.refreshButton.Text = "&Refresh";
-      this.refreshButton.UseVisualStyleBackColor = true;
-      this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click);
+      this.algorithmClassCollectionView.TabIndex = 0;
       // 
       // algorithmsTabPage
@@ -125 +145 @@
       this.algorithmCollectionView.ReadOnly = false;
       this.algorithmCollectionView.Size = new System.Drawing.Size(707, 368);
-      this.algorithmCollectionView.TabIndex = 2;
+      this.algorithmCollectionView.TabIndex = 0;
+      // 
+      // refreshButton
+      // 
+      this.refreshButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Refresh;
+      this.refreshButton.Location = new System.Drawing.Point(0, 0);
+      this.refreshButton.Name = "refreshButton";
+      this.refreshButton.Size = new System.Drawing.Size(24, 24);
+      this.refreshButton.TabIndex = 0;
+      this.toolTip.SetToolTip(this.refreshButton, "Refresh Data");
+      this.refreshButton.UseVisualStyleBackColor = true;
+      this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click);
       // 
       // AdministratorView
@@ -136 +167 @@
       this.Size = new System.Drawing.Size(727, 435);
       this.tabControl.ResumeLayout(false);
+      this.platformsTabPage.ResumeLayout(false);
       this.algorithmClassesTabPage.ResumeLayout(false);
       this.algorithmsTabPage.ResumeLayout(false);
@@ -150 +182 @@
     private AlgorithmClassCollectionView algorithmClassCollectionView;
     private AlgorithmCollectionView algorithmCollectionView;
+    private System.Windows.Forms.ToolTip toolTip;
+    private System.Windows.Forms.TabPage platformsTabPage;
+    private PlatformCollectionView platformCollectionView;
 
   }

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

@@ -53 +53 @@
       base.OnContentChanged();
       if (Content == null) {
+        platformCollectionView.Content = null;
         algorithmClassCollectionView.Content = null;
         algorithmCollectionView.Content = null;
       } else {
+        platformCollectionView.Content = Content.Platforms;
         algorithmClassCollectionView.Content = Content.AlgorithmClasses;
         algorithmCollectionView.Content = Content.Algorithms;
@@ -64 +66 @@
       base.SetEnabledStateOfControls();
       refreshButton.Enabled = Content != null;
+      platformCollectionView.Enabled = Content != null;
       algorithmClassCollectionView.Enabled = Content != null;
       algorithmCollectionView.Enabled = Content != null;
@@ -72 +75 @@
         Invoke(new EventHandler(Content_Refreshing), sender, e);
       } else {
-        Enabled = false;
         Cursor = Cursors.AppStarting;
+        refreshButton.Enabled = false;
+        tabControl.Enabled = false;
       }
     }
@@ -80 +84 @@
         Invoke(new EventHandler(Content_Refreshed), sender, e);
       } else {
+        platformCollectionView.Content = Content.Platforms;
         algorithmClassCollectionView.Content = Content.AlgorithmClasses;
         algorithmCollectionView.Content = Content.Algorithms;
+        refreshButton.Enabled = true;
+        tabControl.Enabled = true;
         Cursor = Cursors.Default;
-        Enabled = true;
       }
     }

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

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.components = new System.ComponentModel.Container();
       this.nameLabel = new System.Windows.Forms.Label();
       this.nameTextBox = new System.Windows.Forms.TextBox();
       this.descriptionLabel = new System.Windows.Forms.Label();
       this.descriptionTextBox = new System.Windows.Forms.TextBox();
-      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+      ((System.ComponentModel.ISupportInitialize)(this.modifiedPictureBox)).BeginInit();
       this.SuspendLayout();
+      // 
+      // storeButton
+      // 
+      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
@@ -68 +76 @@
       this.nameTextBox.Location = new System.Drawing.Point(72, 29);
       this.nameTextBox.Name = "nameTextBox";
-      this.nameTextBox.Size = new System.Drawing.Size(279, 20);
+      this.nameTextBox.Size = new System.Drawing.Size(230, 20);
       this.nameTextBox.TabIndex = 2;
+      this.nameTextBox.TextChanged += new System.EventHandler(this.nameTextBox_TextChanged);
       this.nameTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.nameTextBox_KeyDown);
-      this.nameTextBox.Validated += new System.EventHandler(this.nameTextBox_Validated);
       // 
       // descriptionLabel
@@ -89 +97 @@
       this.descriptionTextBox.Name = "descriptionTextBox";
       this.descriptionTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-      this.descriptionTextBox.Size = new System.Drawing.Size(279, 20);
+      this.descriptionTextBox.Size = new System.Drawing.Size(230, 20);
       this.descriptionTextBox.TabIndex = 4;
+      this.descriptionTextBox.TextChanged += new System.EventHandler(this.descriptionTextBox_TextChanged);
       this.descriptionTextBox.DoubleClick += new System.EventHandler(this.descriptionTextBox_DoubleClick);
-      this.descriptionTextBox.Validated += new System.EventHandler(this.descriptionTextBox_Validated);
       // 
       // NamedOKBItemView
@@ -103 +111 @@
       this.Controls.Add(this.nameTextBox);
       this.Name = "NamedOKBItemView";
-      this.Size = new System.Drawing.Size(351, 80);
+      this.Size = new System.Drawing.Size(350, 229);
+      this.Controls.SetChildIndex(this.modifiedPictureBox, 0);
       this.Controls.SetChildIndex(this.storeButton, 0);
       this.Controls.SetChildIndex(this.nameTextBox, 0);
@@ -109 +118 @@
       this.Controls.SetChildIndex(this.descriptionLabel, 0);
       this.Controls.SetChildIndex(this.descriptionTextBox, 0);
+      ((System.ComponentModel.ISupportInitialize)(this.modifiedPictureBox)).EndInit();
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -120 +130 @@
     protected System.Windows.Forms.Label descriptionLabel;
     protected System.Windows.Forms.TextBox descriptionTextBox;
-    protected System.Windows.Forms.ToolTip toolTip;
   }
 }

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

@@ -91 +91 @@
       }
     }
-    protected virtual void nameTextBox_Validated(object sender, EventArgs e) {
-      Content.Name = nameTextBox.Text;
+    protected virtual void nameTextBox_TextChanged(object sender, EventArgs e) {
+      if (nameTextBox.Text != Content.Name)
+        Content.Name = nameTextBox.Text;
     }
-    protected virtual void descriptionTextBox_Validated(object sender, EventArgs e) {
-      Content.Description = descriptionTextBox.Text;
+    protected virtual void descriptionTextBox_TextChanged(object sender, EventArgs e) {
+      if (descriptionTextBox.Text != Content.Description)
+        Content.Description = descriptionTextBox.Text;
     }
 

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

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
+      this.components = new System.ComponentModel.Container();
       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();
       // 
       // storeButton
       // 
+      this.storeButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.PublishToWeb;
       this.storeButton.Location = new System.Drawing.Point(0, 0);
       this.storeButton.Name = "storeButton";
-      this.storeButton.Size = new System.Drawing.Size(75, 23);
+      this.storeButton.Size = new System.Drawing.Size(24, 24);
       this.storeButton.TabIndex = 0;
-      this.storeButton.Text = "&Store";
+      this.toolTip.SetToolTip(this.storeButton, "Store Data");
       this.storeButton.UseVisualStyleBackColor = true;
       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
@@ -62 +80 @@
       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(315, 292);
+      this.Size = new System.Drawing.Size(354, 308);
+      ((System.ComponentModel.ISupportInitialize)(this.modifiedPictureBox)).EndInit();
       this.ResumeLayout(false);
 
@@ -72 +92 @@
 
     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

@@ -43 +43 @@
     protected override void DeregisterContentEvents() {
       Content.PropertyChanged -= new PropertyChangedEventHandler(Content_PropertyChanged);
+      Content.ModifiedChanged -= new EventHandler(Content_ModifiedChanged);
       base.DeregisterContentEvents();
     }
@@ -48 +49 @@
       base.RegisterContentEvents();
       Content.PropertyChanged += new PropertyChangedEventHandler(Content_PropertyChanged);
+      Content.ModifiedChanged += new EventHandler(Content_ModifiedChanged);
     }
 
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      storeButton.Enabled = Content != null;
+      storeButton.Enabled = (Content != null) && Content.Modified;
+      modifiedPictureBox.Visible = (Content != null) && Content.Modified;
     }
 
@@ -63 +66 @@
     }
     protected virtual void OnContentPropertyChanged(string propertyName) { }
+    protected virtual void Content_ModifiedChanged(object sender, EventArgs e) {
+      if (InvokeRequired)
+        Invoke(new EventHandler(Content_ModifiedChanged), sender, e);
+      else {
+        storeButton.Enabled = Content.Modified;
+        modifiedPictureBox.Visible = Content.Modified;
+      }
+    }
 
     protected virtual void storeButton_Click(object sender, EventArgs e) {