- Timestamp:
- 03/08/11 16:37:03 (13 years ago)
- Location:
- branches/HeuristicLab.Hive-3.4/sources
- Files:
-
- 3 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Hive-3.4/sources
- Property svn:ignore
-
old new 3 3 TestResults 4 4 PrecompiledWeb 5 CreateEventLogSources
-
- Property svn:ignore
-
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4
- Property svn:ignore
-
old new 3 3 *.user 4 4 HeuristicLabClientsHiveViewsPlugin.cs 5 *.vs10x
-
- Property svn:ignore
-
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveExperimentView.Designer.cs
r5458 r5637 68 68 this.downloadExperimentPanel = new System.Windows.Forms.Panel(); 69 69 this.useLocalPluginsCheckBox = new System.Windows.Forms.CheckBox(); 70 this. hiveJobView = new HeuristicLab.Clients.Hive.Views.HiveJobView();70 this.jobViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost(); 71 71 ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit(); 72 72 this.tabControl.SuspendLayout(); … … 81 81 this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft); 82 82 this.errorProvider.SetIconPadding(this.nameTextBox, 2); 83 this.nameTextBox.Size = new System.Drawing.Size( 670, 20);83 this.nameTextBox.Size = new System.Drawing.Size(727, 20); 84 84 // 85 85 // descriptionTextBox 86 86 // 87 this.descriptionTextBox.Size = new System.Drawing.Size( 670, 20);87 this.descriptionTextBox.Size = new System.Drawing.Size(727, 20); 88 88 // 89 89 // tabControl … … 98 98 this.tabControl.Name = "tabControl"; 99 99 this.tabControl.SelectedIndex = 0; 100 this.tabControl.Size = new System.Drawing.Size(7 42, 416);100 this.tabControl.Size = new System.Drawing.Size(799, 520); 101 101 this.tabControl.TabIndex = 4; 102 102 // … … 110 110 this.experimentTabPage.Name = "experimentTabPage"; 111 111 this.experimentTabPage.Padding = new System.Windows.Forms.Padding(3); 112 this.experimentTabPage.Size = new System.Drawing.Size(7 34, 390);112 this.experimentTabPage.Size = new System.Drawing.Size(791, 494); 113 113 this.experimentTabPage.TabIndex = 1; 114 114 this.experimentTabPage.Text = "Experiment"; … … 163 163 // jobsTabPage 164 164 // 165 this.jobsTabPage.Controls.Add(this. hiveJobView);165 this.jobsTabPage.Controls.Add(this.jobViewHost); 166 166 this.jobsTabPage.Location = new System.Drawing.Point(4, 22); 167 167 this.jobsTabPage.Name = "jobsTabPage"; 168 this.jobsTabPage.Size = new System.Drawing.Size(7 34, 390);168 this.jobsTabPage.Size = new System.Drawing.Size(791, 494); 169 169 this.jobsTabPage.TabIndex = 5; 170 170 this.jobsTabPage.Text = "Jobs"; … … 176 176 this.logTabPage.Location = new System.Drawing.Point(4, 22); 177 177 this.logTabPage.Name = "logTabPage"; 178 this.logTabPage.Size = new System.Drawing.Size(7 34, 390);178 this.logTabPage.Size = new System.Drawing.Size(791, 494); 179 179 this.logTabPage.TabIndex = 3; 180 180 this.logTabPage.Text = "Log"; … … 213 213 this.startButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); 214 214 this.startButton.Image = ((System.Drawing.Image)(resources.GetObject("startButton.Image"))); 215 this.startButton.Location = new System.Drawing.Point(0, 500);215 this.startButton.Location = new System.Drawing.Point(0, 604); 216 216 this.startButton.Name = "startButton"; 217 217 this.startButton.Size = new System.Drawing.Size(24, 24); … … 225 225 this.stopButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); 226 226 this.stopButton.Image = ((System.Drawing.Image)(resources.GetObject("stopButton.Image"))); 227 this.stopButton.Location = new System.Drawing.Point(60, 500);227 this.stopButton.Location = new System.Drawing.Point(60, 604); 228 228 this.stopButton.Name = "stopButton"; 229 229 this.stopButton.Size = new System.Drawing.Size(24, 24); … … 238 238 this.resetButton.Enabled = false; 239 239 this.resetButton.Image = ((System.Drawing.Image)(resources.GetObject("resetButton.Image"))); 240 this.resetButton.Location = new System.Drawing.Point(90, 500);240 this.resetButton.Location = new System.Drawing.Point(90, 604); 241 241 this.resetButton.Name = "resetButton"; 242 242 this.resetButton.Size = new System.Drawing.Size(24, 24); … … 250 250 this.executionTimeLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); 251 251 this.executionTimeLabel.AutoSize = true; 252 this.executionTimeLabel.Location = new System.Drawing.Point(5 16, 507);252 this.executionTimeLabel.Location = new System.Drawing.Point(573, 611); 253 253 this.executionTimeLabel.Name = "executionTimeLabel"; 254 254 this.executionTimeLabel.Size = new System.Drawing.Size(83, 13); … … 259 259 // 260 260 this.executionTimeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); 261 this.executionTimeTextBox.Location = new System.Drawing.Point(6 05, 504);261 this.executionTimeTextBox.Location = new System.Drawing.Point(662, 608); 262 262 this.executionTimeTextBox.Name = "executionTimeTextBox"; 263 263 this.executionTimeTextBox.ReadOnly = true; … … 270 270 this.pauseButton.Enabled = false; 271 271 this.pauseButton.Image = ((System.Drawing.Image)(resources.GetObject("pauseButton.Image"))); 272 this.pauseButton.Location = new System.Drawing.Point(30, 500);272 this.pauseButton.Location = new System.Drawing.Point(30, 604); 273 273 this.pauseButton.Name = "pauseButton"; 274 274 this.pauseButton.Size = new System.Drawing.Size(24, 24); … … 287 287 this.resourceIdsLabel.Text = "ResourceIds"; 288 288 // 289 // resource IdsTextBox289 // resourceNamesTextBox 290 290 // 291 291 this.resourceNamesTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 292 292 | System.Windows.Forms.AnchorStyles.Right))); 293 293 this.resourceNamesTextBox.Location = new System.Drawing.Point(72, 52); 294 this.resourceNamesTextBox.Name = "resource IdsTextBox";295 this.resourceNamesTextBox.Size = new System.Drawing.Size( 559, 20);294 this.resourceNamesTextBox.Name = "resourceNamesTextBox"; 295 this.resourceNamesTextBox.Size = new System.Drawing.Size(616, 20); 296 296 this.resourceNamesTextBox.TabIndex = 14; 297 297 this.resourceNamesTextBox.Validated += new System.EventHandler(this.resourceNamesTextBox_Validated); … … 301 301 this.disconnectButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); 302 302 this.disconnectButton.Enabled = false; 303 this.disconnectButton.Location = new System.Drawing.Point(234, 500);303 this.disconnectButton.Location = new System.Drawing.Point(234, 604); 304 304 this.disconnectButton.Name = "disconnectButton"; 305 305 this.disconnectButton.Size = new System.Drawing.Size(120, 24); … … 314 314 this.reconnectButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); 315 315 this.reconnectButton.Enabled = false; 316 this.reconnectButton.Location = new System.Drawing.Point(120, 500);316 this.reconnectButton.Location = new System.Drawing.Point(120, 604); 317 317 this.reconnectButton.Name = "reconnectButton"; 318 318 this.reconnectButton.Size = new System.Drawing.Size(108, 24); … … 335 335 this.useLocalPluginsCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); 336 336 this.useLocalPluginsCheckBox.AutoSize = true; 337 this.useLocalPluginsCheckBox.Location = new System.Drawing.Point(6 37, 54);337 this.useLocalPluginsCheckBox.Location = new System.Drawing.Point(694, 54); 338 338 this.useLocalPluginsCheckBox.Name = "useLocalPluginsCheckBox"; 339 339 this.useLocalPluginsCheckBox.Size = new System.Drawing.Size(105, 17); … … 343 343 this.useLocalPluginsCheckBox.CheckedChanged += new System.EventHandler(this.useLocalPluginsCheckBox_CheckedChanged); 344 344 // 345 // hiveJobView 346 // 347 this.hiveJobView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 348 | System.Windows.Forms.AnchorStyles.Left) 349 | System.Windows.Forms.AnchorStyles.Right))); 350 this.hiveJobView.Caption = "HiveJob View"; 351 this.hiveJobView.Content = null; 352 this.hiveJobView.Location = new System.Drawing.Point(2, 3); 353 this.hiveJobView.Name = "hiveJobView"; 354 this.hiveJobView.ReadOnly = true; 355 this.hiveJobView.Size = new System.Drawing.Size(722, 384); 356 this.hiveJobView.TabIndex = 0; 345 // jobViewHost 346 // 347 this.jobViewHost.Caption = "View"; 348 this.jobViewHost.Content = null; 349 this.jobViewHost.Dock = System.Windows.Forms.DockStyle.Fill; 350 this.jobViewHost.Enabled = false; 351 this.jobViewHost.Location = new System.Drawing.Point(0, 0); 352 this.jobViewHost.Name = "jobViewHost"; 353 this.jobViewHost.ReadOnly = false; 354 this.jobViewHost.Size = new System.Drawing.Size(791, 494); 355 this.jobViewHost.TabIndex = 0; 356 this.jobViewHost.ViewsLabelVisible = true; 357 this.jobViewHost.ViewType = null; 357 358 // 358 359 // HiveExperimentView … … 374 375 this.Controls.Add(this.reconnectButton); 375 376 this.Name = "HiveExperimentView"; 376 this.Size = new System.Drawing.Size(7 42, 524);377 this.Size = new System.Drawing.Size(799, 628); 377 378 this.Controls.SetChildIndex(this.nameTextBox, 0); 378 379 this.Controls.SetChildIndex(this.descriptionTextBox, 0); … … 425 426 private System.Windows.Forms.Button downloadExperimentButton; 426 427 private System.Windows.Forms.Panel downloadExperimentPanel; 427 private HiveJobView hiveJobView;428 428 private System.Windows.Forms.CheckBox useLocalPluginsCheckBox; 429 private MainForm.WindowsForms.ViewHost jobViewHost; 429 430 430 431 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveExperimentView.cs
r5458 r5637 105 105 this.descriptionTextBox.ReadOnly = Content.ExecutionState != ExecutionState.Prepared; 106 106 this.resourceNamesTextBox.ReadOnly = Content.ExecutionState != ExecutionState.Prepared; 107 this. hiveJobView.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;107 this.jobViewHost.ReadOnly = Content.ExecutionState != ExecutionState.Prepared; 108 108 this.useLocalPluginsCheckBox.Enabled = Content.ExecutionState == ExecutionState.Prepared; 109 109 … … 189 189 else { 190 190 if (Content != null) { 191 hiveJobView.Content = Content.HiveJob;191 jobViewHost.Content = Content.HiveJob; 192 192 experimentNamedItemView.Content = Content.GetExperiment(); 193 193 } else { 194 hiveJobView.Content = null;194 jobViewHost.Content = null; 195 195 experimentNamedItemView.Content = null; 196 196 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveJobView.designer.cs
r5597 r5637 56 56 this.runCollectionViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost(); 57 57 this.stateLogTabPage = new System.Windows.Forms.TabPage(); 58 this.stateLogViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost(); 58 59 this.logTabPage = new System.Windows.Forms.TabPage(); 59 60 this.logView = new HeuristicLab.Core.Views.LogView(); 60 this.stateLogViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();61 61 this.childHiveJobView = new HeuristicLab.Clients.Hive.Views.HiveJobListView(); 62 62 this.jobStatusGroupBox.SuspendLayout(); … … 249 249 this.optimizerNamedItemView.Caption = "NamedItem View"; 250 250 this.optimizerNamedItemView.Content = null; 251 this.optimizerNamedItemView.Location = new System.Drawing.Point( 0, 20);251 this.optimizerNamedItemView.Location = new System.Drawing.Point(6, 20); 252 252 this.optimizerNamedItemView.Name = "optimizerNamedItemView"; 253 253 this.optimizerNamedItemView.ReadOnly = false; 254 this.optimizerNamedItemView.Size = new System.Drawing.Size( 604, 51);254 this.optimizerNamedItemView.Size = new System.Drawing.Size(598, 51); 255 255 this.optimizerNamedItemView.TabIndex = 0; 256 256 // … … 411 411 this.stateLogTabPage.UseVisualStyleBackColor = true; 412 412 // 413 // logTabPage414 //415 this.logTabPage.Controls.Add(this.logView);416 this.logTabPage.Location = new System.Drawing.Point(4, 22);417 this.logTabPage.Name = "logTabPage";418 this.logTabPage.Padding = new System.Windows.Forms.Padding(3);419 this.logTabPage.Size = new System.Drawing.Size(619, 492);420 this.logTabPage.TabIndex = 1;421 this.logTabPage.Text = "Log";422 this.logTabPage.UseVisualStyleBackColor = true;423 //424 // logView425 //426 this.logView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)427 | System.Windows.Forms.AnchorStyles.Left)428 | System.Windows.Forms.AnchorStyles.Right)));429 this.logView.Caption = "Log View";430 this.logView.Content = null;431 this.logView.Location = new System.Drawing.Point(3, 3);432 this.logView.Name = "logView";433 this.logView.ReadOnly = false;434 this.logView.Size = new System.Drawing.Size(613, 486);435 this.logView.TabIndex = 0;436 //437 413 // stateLogViewHost 438 414 // … … 450 426 this.stateLogViewHost.ViewsLabelVisible = true; 451 427 this.stateLogViewHost.ViewType = null; 428 // 429 // logTabPage 430 // 431 this.logTabPage.Controls.Add(this.logView); 432 this.logTabPage.Location = new System.Drawing.Point(4, 22); 433 this.logTabPage.Name = "logTabPage"; 434 this.logTabPage.Padding = new System.Windows.Forms.Padding(3); 435 this.logTabPage.Size = new System.Drawing.Size(619, 492); 436 this.logTabPage.TabIndex = 1; 437 this.logTabPage.Text = "Log"; 438 this.logTabPage.UseVisualStyleBackColor = true; 439 // 440 // logView 441 // 442 this.logView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 443 | System.Windows.Forms.AnchorStyles.Left) 444 | System.Windows.Forms.AnchorStyles.Right))); 445 this.logView.Caption = "Log View"; 446 this.logView.Content = null; 447 this.logView.Location = new System.Drawing.Point(3, 3); 448 this.logView.Name = "logView"; 449 this.logView.ReadOnly = false; 450 this.logView.Size = new System.Drawing.Size(613, 486); 451 this.logView.TabIndex = 0; 452 452 // 453 453 // childHiveJobView … … 509 509 private System.Windows.Forms.TextBox jobIdTextBox; 510 510 private System.Windows.Forms.TabPage childJobsTabPage; 511 private HiveJobListView childHiveJobView;512 511 private System.Windows.Forms.GroupBox configurationGroupBox; 513 512 private System.Windows.Forms.TextBox priorityTextBox; … … 525 524 private System.Windows.Forms.TabPage stateLogTabPage; 526 525 private MainForm.WindowsForms.ViewHost stateLogViewHost; 526 private HiveJobListView childHiveJobView; 527 527 } 528 528 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/HeuristicLab.Clients.Hive.Views-3.4.csproj
r5636 r5637 132 132 <DependentUpon>UpdateControl.cs</DependentUpon> 133 133 </Compile> 134 <Compile Include="ExperimentManager\ItemTreeView.cs"> 135 <SubType>UserControl</SubType> 136 </Compile> 137 <Compile Include="ExperimentManager\ItemTreeView.designer.cs"> 138 <DependentUpon>ItemTreeView.cs</DependentUpon> 139 </Compile> 134 140 <Compile Include="ExperimentManager\StateLogGanttChartListView.cs"> 135 141 <SubType>UserControl</SubType> … … 246 252 <EmbeddedResource Include="Common\UpdateControl.resx"> 247 253 <DependentUpon>UpdateControl.cs</DependentUpon> 254 </EmbeddedResource> 255 <EmbeddedResource Include="ExperimentManager\ItemTreeView.resx"> 256 <DependentUpon>ItemTreeView.cs</DependentUpon> 248 257 </EmbeddedResource> 249 258 <EmbeddedResource Include="ExperimentManager\StateLogGanttChartListView.resx">
Note: See TracChangeset
for help on using the changeset viewer.