Changeset 7403

Timestamp:

01/24/12 13:49:23 (12 years ago)

Author:

spimming

Message:

#1680:

• Replace specific views with ViewHost
• DeploymentView initial commit

Location:

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3

Files:

• HeuristicLab.Clients.Hive.CloudManager-3.3.csproj (modified) (3 diffs)
• Views/CloudResourcesView.Designer.cs (modified) (5 diffs)
• Views/CloudResourcesView.cs (modified) (3 diffs)
• Views/DeploymentView.Designer.cs (added)
• Views/DeploymentView.cs (added)
• Views/HostedServiceView.Designer.cs (modified) (4 diffs)

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/HeuristicLab.Clients.Hive.CloudManager-3.3.csproj

@@ -100 +100 @@
       <DependentUpon>CloudResourcesView.cs</DependentUpon>
     </Compile>
+    <Compile Include="Views\DeploymentView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Views\DeploymentView.Designer.cs">
+      <DependentUpon>DeploymentView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Views\HiveCloudManagerView.cs">
       <SubType>UserControl</SubType>
@@ -105 +111 @@
     <Compile Include="Views\HiveCloudManagerView.Designer.cs">
       <DependentUpon>HiveCloudManagerView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Views\HostedServiceView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Views\HostedServiceView.Designer.cs">
+      <DependentUpon>HostedServiceView.cs</DependentUpon>
     </Compile>
     <Compile Include="Views\SubscriptionView.cs">
@@ -185 +197 @@
       <DependentUpon>CloudResourcesView.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Views\DeploymentView.resx">
+      <DependentUpon>DeploymentView.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Views\HiveCloudManagerView.resx">
       <DependentUpon>HiveCloudManagerView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Views\HostedServiceView.resx">
+      <DependentUpon>HostedServiceView.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\SubscriptionView.resx">

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/Views/CloudResourcesView.Designer.cs

@@ -23 +23 @@
       this.treeCloudResources = new System.Windows.Forms.TreeView();
       this.imageListCloudResources = new System.Windows.Forms.ImageList(this.components);
-      this.subscriptionView = new HeuristicLab.Clients.Hive.CloudManager.Views.SubscriptionView();
+      this.gbDetails = new System.Windows.Forms.GroupBox();
+      this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
       this.splitContainer1.Panel1.SuspendLayout();
       this.splitContainer1.Panel2.SuspendLayout();
       this.splitContainer1.SuspendLayout();
+      this.gbDetails.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -47 +49 @@
       // splitContainer1.Panel2
       // 
-      this.splitContainer1.Panel2.Controls.Add(this.subscriptionView);
+      this.splitContainer1.Panel2.Controls.Add(this.gbDetails);
       this.splitContainer1.Size = new System.Drawing.Size(804, 497);
       this.splitContainer1.SplitterDistance = 275;
@@ -119 +121 @@
       this.imageListCloudResources.TransparentColor = System.Drawing.Color.Transparent;
       // 
-      // subscriptionView
+      // gbDetails
       // 
-      this.subscriptionView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+      this.gbDetails.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.subscriptionView.Caption = "SubscriptionView";
-      this.subscriptionView.Content = null;
-      this.subscriptionView.Location = new System.Drawing.Point(6, 34);
-      this.subscriptionView.Name = "subscriptionView";
-      this.subscriptionView.ReadOnly = false;
-      this.subscriptionView.Size = new System.Drawing.Size(516, 207);
-      this.subscriptionView.TabIndex = 0;
+      this.gbDetails.Controls.Add(this.viewHost);
+      this.gbDetails.Location = new System.Drawing.Point(4, 34);
+      this.gbDetails.Name = "gbDetails";
+      this.gbDetails.Size = new System.Drawing.Size(518, 460);
+      this.gbDetails.TabIndex = 1;
+      this.gbDetails.TabStop = false;
+      this.gbDetails.Text = "Details";
+      // 
+      // viewHost
+      // 
+      this.viewHost.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.viewHost.Caption = "View";
+      this.viewHost.Content = null;
+      this.viewHost.Enabled = false;
+      this.viewHost.Location = new System.Drawing.Point(6, 12);
+      this.viewHost.Name = "viewHost";
+      this.viewHost.ReadOnly = false;
+      this.viewHost.Size = new System.Drawing.Size(506, 442);
+      this.viewHost.TabIndex = 0;
+      this.viewHost.ViewsLabelVisible = true;
+      this.viewHost.ViewType = null;
       // 
       // CloudResourcesView
@@ -143 +162 @@
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
       this.splitContainer1.ResumeLayout(false);
+      this.gbDetails.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -157 +177 @@
     private System.Windows.Forms.Label lblRefresh;
     private System.Windows.Forms.ImageList imageListCloudResources;
-    private SubscriptionView subscriptionView;
+    private System.Windows.Forms.GroupBox gbDetails;
+    private MainForm.WindowsForms.ViewHost viewHost;
   }
 }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/Views/CloudResourcesView.cs

@@ -99 +99 @@
       SetEnabledStateOfControls();
       if (Content == null) {
-        subscriptionView.Content = null;
+        viewHost.Content = null;
         treeCloudResources.Nodes.Clear();
       } else {
@@ -112 +112 @@
 
           foreach (HostedService s in HostedServices) {
-            if (s.SubscriptionId == sub.SubscriptionID) {
+            if (s.Subscription.SubscriptionID == sub.SubscriptionID) {
               TreeNode nodeServ = new TreeNode();
               nodeServ.Tag = s;
@@ -207 +207 @@
 
     private void treeCloudResources_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) {
-      if (e.Node.Tag is Subscription) {
-        subscriptionView.Visible = true;
-        subscriptionView.Content = (Subscription)e.Node.Tag;
-      } else {
-        subscriptionView.Visible = false;
-
-      }
+      viewHost.Content = (IContent)e.Node.Tag;
     }
   }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/Views/HostedServiceView.Designer.cs

@@ -40 +40 @@
       this.txtServiceName.Location = new System.Drawing.Point(86, 3);
       this.txtServiceName.Name = "txtServiceName";
+      this.txtServiceName.ReadOnly = true;
       this.txtServiceName.Size = new System.Drawing.Size(348, 20);
       this.txtServiceName.TabIndex = 0;
@@ -76 +77 @@
       this.txtUrl.Location = new System.Drawing.Point(86, 30);
       this.txtUrl.Name = "txtUrl";
+      this.txtUrl.ReadOnly = true;
       this.txtUrl.Size = new System.Drawing.Size(348, 20);
       this.txtUrl.TabIndex = 4;
@@ -85 +87 @@
       this.txtLocation.Location = new System.Drawing.Point(86, 57);
       this.txtLocation.Name = "txtLocation";
+      this.txtLocation.ReadOnly = true;
       this.txtLocation.Size = new System.Drawing.Size(348, 20);
       this.txtLocation.TabIndex = 5;
@@ -103 +106 @@
       this.txtCoresUsed.Location = new System.Drawing.Point(86, 83);
       this.txtCoresUsed.Name = "txtCoresUsed";
+      this.txtCoresUsed.ReadOnly = true;
       this.txtCoresUsed.Size = new System.Drawing.Size(348, 20);
       this.txtCoresUsed.TabIndex = 7;