Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
09/14/18 11:47:37 (6 years ago)
Author:
abeham
Message:

#2817: updated to trunk r16140

Location:
branches/2817-BinPackingSpeedup
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2817-BinPackingSpeedup

  • branches/2817-BinPackingSpeedup/HeuristicLab.Clients.Hive.JobManager

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.JobManagermergedeligible
      /stable/HeuristicLab.Clients.Hive.JobManagermergedeligible
      /trunk/HeuristicLab.Clients.Hive.JobManagermergedeligible
      /branches/1721-RandomForestPersistence/HeuristicLab.Clients.Hive.JobManager10321-10322
      /branches/Algorithms.GradientDescent/HeuristicLab.Clients.Hive.JobManager5516-5520
      /branches/Async/HeuristicLab.Clients.Hive.JobManager13329-15286
      /branches/Benchmarking/sources/HeuristicLab.Clients.Hive.JobManager6917-7005
      /branches/CloningRefactoring/HeuristicLab.Clients.Hive.JobManager4656-4721
      /branches/CodeEditor/HeuristicLab.Clients.Hive.JobManager11700-11806
      /branches/DataAnalysis Refactoring/HeuristicLab.Clients.Hive.JobManager5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Clients.Hive.JobManager5815-6180
      /branches/DataAnalysis/HeuristicLab.Clients.Hive.JobManager4458-4459,​4462,​4464
      /branches/DataPreprocessing/HeuristicLab.Clients.Hive.JobManager10085-11101
      /branches/GP.Grammar.Editor/HeuristicLab.Clients.Hive.JobManager6284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Clients.Hive.JobManager5060
      /branches/HLScript/HeuristicLab.Clients.Hive.JobManager10331-10358
      /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Clients.Hive.JobManager11570-12508
      /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Clients.Hive.JobManager6123-9799
      /branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Clients.Hive.JobManager11130-12721
      /branches/HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager15377-15760
      /branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.JobManager12440-12877
      /branches/LogResidualEvaluator/HeuristicLab.Clients.Hive.JobManager10202-10483
      /branches/NET40/sources/HeuristicLab.Clients.Hive.JobManager5138-5162
      /branches/NSGA-II Changes/HeuristicLab.Clients.Hive.JobManager12033-12122
      /branches/ParallelEngine/HeuristicLab.Clients.Hive.JobManager5175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Clients.Hive.JobManager7568-7810
      /branches/QAPAlgorithms/HeuristicLab.Clients.Hive.JobManager6350-6627
      /branches/Restructure trunk solution/HeuristicLab.Clients.Hive.JobManager6828
      /branches/RuntimeOptimizer/HeuristicLab.Clients.Hive.JobManager8943-9078
      /branches/ScatterSearch (trunk integration)/HeuristicLab.Clients.Hive.JobManager7787-8333
      /branches/SlaveShutdown/HeuristicLab.Clients.Hive.JobManager8944-8956
      /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Clients.Hive.JobManager10204-10479
      /branches/SuccessProgressAnalysis/HeuristicLab.Clients.Hive.JobManager5370-5682
      /branches/Trunk/HeuristicLab.Clients.Hive.JobManager6829-6865
      /branches/UnloadJobs/HeuristicLab.Clients.Hive.JobManager9168-9215
      /branches/VNS/HeuristicLab.Clients.Hive.JobManager5594-5752
      /branches/crossvalidation-2434/HeuristicLab.Clients.Hive.JobManager12948-12950
      /branches/histogram/HeuristicLab.Clients.Hive.JobManager5959-6341
      /branches/symbreg-factors-2650/HeuristicLab.Clients.Hive.JobManager14232-14825
  • branches/2817-BinPackingSpeedup/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelectorDialog.Designer.cs

    r16140 r16141  
    4545    /// </summary>
    4646    private void InitializeComponent() {
    47       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HiveResourceSelectorDialog));
     47      this.components = new System.ComponentModel.Container();
    4848      this.okButton = new System.Windows.Forms.Button();
    4949      this.cancelButton = new System.Windows.Forms.Button();
    5050      this.refreshButton = new System.Windows.Forms.Button();
    51       this.hiveResourceSelector = new HeuristicLab.Clients.Hive.JobManager.Views.HiveResourceSelector();
     51      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
     52      this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
     53      this.hiveResourceSelector = new HeuristicLab.Clients.Hive.JobManager.Views.HiveProjectSelector();
     54      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    5255      this.SuspendLayout();
    5356      //
     
    5659      this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
    5760      this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
     61      this.okButton.Enabled = false;
    5862      this.okButton.Location = new System.Drawing.Point(405, 609);
    5963      this.okButton.Name = "okButton";
     
    6266      this.okButton.Text = "&OK";
    6367      this.okButton.UseVisualStyleBackColor = true;
     68      this.errorProvider.SetIconAlignment(this.okButton, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     69      this.errorProvider.SetIconPadding(this.okButton, 2);
    6470      //
    6571      // cancelButton
     
    8288      this.refreshButton.Size = new System.Drawing.Size(24, 24);
    8389      this.refreshButton.TabIndex = 3;
     90      this.toolTip.SetToolTip(this.refreshButton, "Refresh data");
    8491      this.refreshButton.UseVisualStyleBackColor = true;
    8592      this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click);
    8693      //
     94      // errorProvider
     95      //
     96      this.errorProvider.BlinkStyle = System.Windows.Forms.ErrorBlinkStyle.NeverBlink;
     97      this.errorProvider.ContainerControl = this;
     98      //
    8799      // hiveResourceSelector
    88100      //
    89       this.hiveResourceSelector.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    90             | System.Windows.Forms.AnchorStyles.Left)
     101      this.hiveResourceSelector.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     102            | System.Windows.Forms.AnchorStyles.Left) 
    91103            | System.Windows.Forms.AnchorStyles.Right)));
    92104      this.hiveResourceSelector.Caption = "View";
    93105      this.hiveResourceSelector.Content = null;
     106      this.hiveResourceSelector.JobId = new System.Guid("00000000-0000-0000-0000-000000000000");
    94107      this.hiveResourceSelector.Location = new System.Drawing.Point(12, 12);
    95108      this.hiveResourceSelector.Name = "hiveResourceSelector";
     109      this.hiveResourceSelector.ProjectId = null;
    96110      this.hiveResourceSelector.ReadOnly = false;
     111      this.hiveResourceSelector.SelectedProject = null;
     112      this.hiveResourceSelector.SelectedProjectId = null;
     113      this.hiveResourceSelector.SelectedResourceIds = null;
    97114      this.hiveResourceSelector.Size = new System.Drawing.Size(549, 591);
    98115      this.hiveResourceSelector.TabIndex = 0;
     116      this.hiveResourceSelector.SelectedProjectChanged += new System.EventHandler(this.hiveResourceSelector_SelectedProjectChanged);
     117      this.hiveResourceSelector.AssignedResourcesChanged += new System.EventHandler(this.hiveResourceSelector_SelectedResourcesChanged);
     118      this.hiveResourceSelector.ProjectsTreeViewDoubleClicked += new System.EventHandler(this.hiveResourceSelector_ProjectsTreeViewDoubleClicked);
    99119      //
    100120      // HiveResourceSelectorDialog
    101121      //
    102122      this.AcceptButton = this.okButton;
    103       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    104123      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    105124      this.CancelButton = this.cancelButton;
     
    115134      this.ShowInTaskbar = false;
    116135      this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
    117       this.Text = "Select Resources";
    118       this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.HiveResourceSelectorDialog_FormClosing);
     136      this.Text = "Select Project";
    119137      this.Load += new System.EventHandler(this.HiveResourceSelectorDialog_Load);
     138      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    120139      this.ResumeLayout(false);
    121140
     
    126145    protected System.Windows.Forms.Button okButton;
    127146    protected System.Windows.Forms.Button cancelButton;
    128     protected HiveResourceSelector hiveResourceSelector;
    129147    protected System.Windows.Forms.Button refreshButton;
     148    protected System.Windows.Forms.ToolTip toolTip;
     149    protected System.Windows.Forms.ErrorProvider errorProvider;
     150    protected HiveProjectSelector hiveResourceSelector;
    130151  }
    131152}
Note: See TracChangeset for help on using the changeset viewer.