Changeset 7403


Ignore:
Timestamp:
01/24/12 13:49:23 (9 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:
2 added
4 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/HeuristicLab.Clients.Hive.CloudManager-3.3.csproj

    r7339 r7403  
    100100      <DependentUpon>CloudResourcesView.cs</DependentUpon>
    101101    </Compile>
     102    <Compile Include="Views\DeploymentView.cs">
     103      <SubType>UserControl</SubType>
     104    </Compile>
     105    <Compile Include="Views\DeploymentView.Designer.cs">
     106      <DependentUpon>DeploymentView.cs</DependentUpon>
     107    </Compile>
    102108    <Compile Include="Views\HiveCloudManagerView.cs">
    103109      <SubType>UserControl</SubType>
     
    105111    <Compile Include="Views\HiveCloudManagerView.Designer.cs">
    106112      <DependentUpon>HiveCloudManagerView.cs</DependentUpon>
     113    </Compile>
     114    <Compile Include="Views\HostedServiceView.cs">
     115      <SubType>UserControl</SubType>
     116    </Compile>
     117    <Compile Include="Views\HostedServiceView.Designer.cs">
     118      <DependentUpon>HostedServiceView.cs</DependentUpon>
    107119    </Compile>
    108120    <Compile Include="Views\SubscriptionView.cs">
     
    185197      <DependentUpon>CloudResourcesView.cs</DependentUpon>
    186198    </EmbeddedResource>
     199    <EmbeddedResource Include="Views\DeploymentView.resx">
     200      <DependentUpon>DeploymentView.cs</DependentUpon>
     201    </EmbeddedResource>
    187202    <EmbeddedResource Include="Views\HiveCloudManagerView.resx">
    188203      <DependentUpon>HiveCloudManagerView.cs</DependentUpon>
     204    </EmbeddedResource>
     205    <EmbeddedResource Include="Views\HostedServiceView.resx">
     206      <DependentUpon>HostedServiceView.cs</DependentUpon>
    189207    </EmbeddedResource>
    190208    <EmbeddedResource Include="Views\SubscriptionView.resx">
  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/Views/CloudResourcesView.Designer.cs

    r7389 r7403  
    2323      this.treeCloudResources = new System.Windows.Forms.TreeView();
    2424      this.imageListCloudResources = new System.Windows.Forms.ImageList(this.components);
    25       this.subscriptionView = new HeuristicLab.Clients.Hive.CloudManager.Views.SubscriptionView();
     25      this.gbDetails = new System.Windows.Forms.GroupBox();
     26      this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    2627      ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
    2728      this.splitContainer1.Panel1.SuspendLayout();
    2829      this.splitContainer1.Panel2.SuspendLayout();
    2930      this.splitContainer1.SuspendLayout();
     31      this.gbDetails.SuspendLayout();
    3032      this.SuspendLayout();
    3133      //
     
    4749      // splitContainer1.Panel2
    4850      //
    49       this.splitContainer1.Panel2.Controls.Add(this.subscriptionView);
     51      this.splitContainer1.Panel2.Controls.Add(this.gbDetails);
    5052      this.splitContainer1.Size = new System.Drawing.Size(804, 497);
    5153      this.splitContainer1.SplitterDistance = 275;
     
    119121      this.imageListCloudResources.TransparentColor = System.Drawing.Color.Transparent;
    120122      //
    121       // subscriptionView
     123      // gbDetails
    122124      //
    123       this.subscriptionView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     125      this.gbDetails.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     126            | System.Windows.Forms.AnchorStyles.Left)
    124127            | System.Windows.Forms.AnchorStyles.Right)));
    125       this.subscriptionView.Caption = "SubscriptionView";
    126       this.subscriptionView.Content = null;
    127       this.subscriptionView.Location = new System.Drawing.Point(6, 34);
    128       this.subscriptionView.Name = "subscriptionView";
    129       this.subscriptionView.ReadOnly = false;
    130       this.subscriptionView.Size = new System.Drawing.Size(516, 207);
    131       this.subscriptionView.TabIndex = 0;
     128      this.gbDetails.Controls.Add(this.viewHost);
     129      this.gbDetails.Location = new System.Drawing.Point(4, 34);
     130      this.gbDetails.Name = "gbDetails";
     131      this.gbDetails.Size = new System.Drawing.Size(518, 460);
     132      this.gbDetails.TabIndex = 1;
     133      this.gbDetails.TabStop = false;
     134      this.gbDetails.Text = "Details";
     135      //
     136      // viewHost
     137      //
     138      this.viewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     139            | System.Windows.Forms.AnchorStyles.Left)
     140            | System.Windows.Forms.AnchorStyles.Right)));
     141      this.viewHost.Caption = "View";
     142      this.viewHost.Content = null;
     143      this.viewHost.Enabled = false;
     144      this.viewHost.Location = new System.Drawing.Point(6, 12);
     145      this.viewHost.Name = "viewHost";
     146      this.viewHost.ReadOnly = false;
     147      this.viewHost.Size = new System.Drawing.Size(506, 442);
     148      this.viewHost.TabIndex = 0;
     149      this.viewHost.ViewsLabelVisible = true;
     150      this.viewHost.ViewType = null;
    132151      //
    133152      // CloudResourcesView
     
    143162      ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
    144163      this.splitContainer1.ResumeLayout(false);
     164      this.gbDetails.ResumeLayout(false);
    145165      this.ResumeLayout(false);
    146166
     
    157177    private System.Windows.Forms.Label lblRefresh;
    158178    private System.Windows.Forms.ImageList imageListCloudResources;
    159     private SubscriptionView subscriptionView;
     179    private System.Windows.Forms.GroupBox gbDetails;
     180    private MainForm.WindowsForms.ViewHost viewHost;
    160181  }
    161182}
  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/Views/CloudResourcesView.cs

    r7389 r7403  
    9999      SetEnabledStateOfControls();
    100100      if (Content == null) {
    101         subscriptionView.Content = null;
     101        viewHost.Content = null;
    102102        treeCloudResources.Nodes.Clear();
    103103      } else {
     
    112112
    113113          foreach (HostedService s in HostedServices) {
    114             if (s.SubscriptionId == sub.SubscriptionID) {
     114            if (s.Subscription.SubscriptionID == sub.SubscriptionID) {
    115115              TreeNode nodeServ = new TreeNode();
    116116              nodeServ.Tag = s;
     
    207207
    208208    private void treeCloudResources_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) {
    209       if (e.Node.Tag is Subscription) {
    210         subscriptionView.Visible = true;
    211         subscriptionView.Content = (Subscription)e.Node.Tag;
    212       } else {
    213         subscriptionView.Visible = false;
    214 
    215       }
     209      viewHost.Content = (IContent)e.Node.Tag;
    216210    }
    217211  }
  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/Views/HostedServiceView.Designer.cs

    r7390 r7403  
    4040      this.txtServiceName.Location = new System.Drawing.Point(86, 3);
    4141      this.txtServiceName.Name = "txtServiceName";
     42      this.txtServiceName.ReadOnly = true;
    4243      this.txtServiceName.Size = new System.Drawing.Size(348, 20);
    4344      this.txtServiceName.TabIndex = 0;
     
    7677      this.txtUrl.Location = new System.Drawing.Point(86, 30);
    7778      this.txtUrl.Name = "txtUrl";
     79      this.txtUrl.ReadOnly = true;
    7880      this.txtUrl.Size = new System.Drawing.Size(348, 20);
    7981      this.txtUrl.TabIndex = 4;
     
    8587      this.txtLocation.Location = new System.Drawing.Point(86, 57);
    8688      this.txtLocation.Name = "txtLocation";
     89      this.txtLocation.ReadOnly = true;
    8790      this.txtLocation.Size = new System.Drawing.Size(348, 20);
    8891      this.txtLocation.TabIndex = 5;
     
    103106      this.txtCoresUsed.Location = new System.Drawing.Point(86, 83);
    104107      this.txtCoresUsed.Name = "txtCoresUsed";
     108      this.txtCoresUsed.ReadOnly = true;
    105109      this.txtCoresUsed.Size = new System.Drawing.Size(348, 20);
    106110      this.txtCoresUsed.TabIndex = 7;
Note: See TracChangeset for help on using the changeset viewer.