Changeset 5874


Ignore:
Timestamp:
03/30/11 00:32:26 (11 years ago)
Author:
cneumuel
Message:

#1260

  • added missing DisposableWrapper.cs
  • resolved broken compatibility with trunk (due to #1416)
  • updated binaries
Location:
branches/HeuristicLab.Hive-3.3
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive 3.3.sln

    r5309 r5874  
    2929    ConfigMerger.exe = ConfigMerger.exe
    3030    HeuristicLab 3.3.vsmdi = HeuristicLab 3.3.vsmdi
    31     HeuristicLab.Hive 3.32.vsmdi = HeuristicLab.Hive 3.32.vsmdi
     31    HeuristicLab.Hive 3.3.vsmdi = HeuristicLab.Hive 3.3.vsmdi
    3232    LocalTestRun.testrunconfig = LocalTestRun.testrunconfig
    3333    PreBuildEvent.cmd = PreBuildEvent.cmd
     
    108108Global
    109109  GlobalSection(TestCaseManagementSettings) = postSolution
    110     CategoryFile = HeuristicLab.Hive 3.32.vsmdi
     110    CategoryFile = HeuristicLab.Hive 3.3.vsmdi
    111111  EndGlobalSection
    112112  GlobalSection(SolutionConfigurationPlatforms) = preSolution
  • branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager.Views/3.3/HiveExperimentView.Designer.cs

    r4769 r5874  
    8282      this.nameTextBox.Size = new System.Drawing.Size(663, 20);
    8383      //
    84       // descriptionTextBox
    85       //
    86       this.descriptionTextBox.Size = new System.Drawing.Size(663, 20);
    87       //
    8884      // tabControl
    8985      //
     
    145141      this.experimentNamedItemView.Name = "experimentNamedItemView";
    146142      this.experimentNamedItemView.ReadOnly = false;
    147       this.experimentNamedItemView.Size = new System.Drawing.Size(721, 52);
     143      this.experimentNamedItemView.Size = new System.Drawing.Size(721, 22);
    148144      this.experimentNamedItemView.TabIndex = 3;
    149145      //
     
    152148      this.viewExperimentButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    153149                  | System.Windows.Forms.AnchorStyles.Right)));
    154       this.viewExperimentButton.Location = new System.Drawing.Point(0, 94);
     150      this.viewExperimentButton.Location = new System.Drawing.Point(0, 64);
    155151      this.viewExperimentButton.Name = "viewExperimentButton";
    156152      this.viewExperimentButton.Size = new System.Drawing.Size(727, 23);
     
    361357      this.Name = "HiveExperimentView";
    362358      this.Size = new System.Drawing.Size(735, 524);
     359      this.Controls.SetChildIndex(this.infoLabel, 0);
    363360      this.Controls.SetChildIndex(this.reconnectButton, 0);
    364361      this.Controls.SetChildIndex(this.resetButton, 0);
     
    373370      this.Controls.SetChildIndex(this.tabControl, 0);
    374371      this.Controls.SetChildIndex(this.nameLabel, 0);
    375       this.Controls.SetChildIndex(this.descriptionLabel, 0);
    376372      this.Controls.SetChildIndex(this.nameTextBox, 0);
    377       this.Controls.SetChildIndex(this.descriptionTextBox, 0);
    378373      this.Controls.SetChildIndex(this.downloadExperimentPanel, 0);
    379374      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
  • branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager.Views/3.3/HiveExperimentView.cs

    r4760 r5874  
    101101      if (Content != null) {
    102102        this.nameTextBox.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
    103         this.descriptionTextBox.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
    104103        this.resourceIdsTextBox.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
    105104        this.hiveJobView.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
     
    132131        Invoke(new EventHandler(Content_Prepared), sender, e);
    133132      else {
    134         nameTextBox.Enabled = descriptionTextBox.Enabled = true;
     133        nameTextBox.Enabled = true;
    135134        Locked = false;
    136135        SetEnabledStateOfControls();
     
    141140        Invoke(new EventHandler(Content_Started), sender, e);
    142141      else {
    143         nameTextBox.Enabled = descriptionTextBox.Enabled = false;
     142        nameTextBox.Enabled = false;
    144143        SetEnabledStateOfControls();
    145144      }
     
    149148        Invoke(new EventHandler(Content_Paused), sender, e);
    150149      else {
    151         nameTextBox.Enabled = descriptionTextBox.Enabled = true;
     150        nameTextBox.Enabled = true;
    152151        SetEnabledStateOfControls();
    153152      }
     
    157156        Invoke(new EventHandler(Content_Stopped), sender, e);
    158157      else {
    159         nameTextBox.Enabled = descriptionTextBox.Enabled = true;
     158        nameTextBox.Enabled = true;
    160159        Locked = false;
    161160        SetEnabledStateOfControls();
  • branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager.Views/3.3/HiveExperimentView.resx

    r4769 r5874  
    113113  </resheader>
    114114  <resheader name="reader">
    115     <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
     115    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    116116  </resheader>
    117117  <resheader name="writer">
    118     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    119   </resheader>
    120   <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     118    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
     119  </resheader>
     120  <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    121121    <value>107, 17</value>
    122122  </metadata>
    123   <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     123  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    124124    <value>17, 17</value>
    125125  </metadata>
    126   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     126  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    127127  <data name="openExperimentButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    128128    <value>
     
    204204        fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
    205205        tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
    206         6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOvQAADr0BR/uQrQAAA2JJREFUOE9lk31MFHQY
     206        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOvAAADrwBlbxySQAAA2JJREFUOE9lk31MFHQY
    207207        x59JZIU62/QPF1gauDJXjkpyZLxVMEEubgpKU0NePKS6yp168qaJ4OIlMhUH6hRWChyuuuTaQjqFk8j0
    208208        MEhlURdMRgp0XERccfjpx7G1Vn8822+/fb/fz/f54xFA/jtDf03S4fyTloE/6PhlFNfvY0xMTCjZ/7X/
     
    268268</value>
    269269  </data>
    270   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     270  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    271271    <value>25</value>
    272272  </metadata>
  • branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager.Views/3.3/HiveJobView.Designer.cs

    r5399 r5874  
    193193      this.jobStatusGroupBox.Controls.Add(this.dateFinishedLabel);
    194194      this.jobStatusGroupBox.Controls.Add(this.exceptionTextBox);
    195       this.jobStatusGroupBox.Location = new System.Drawing.Point(6, 226);
     195      this.jobStatusGroupBox.Location = new System.Drawing.Point(6, 203);
    196196      this.jobStatusGroupBox.Name = "jobStatusGroupBox";
    197197      this.jobStatusGroupBox.Size = new System.Drawing.Size(610, 162);
     
    237237      this.optimizerGroupBox.Location = new System.Drawing.Point(6, 29);
    238238      this.optimizerGroupBox.Name = "optimizerGroupBox";
    239       this.optimizerGroupBox.Size = new System.Drawing.Size(610, 74);
     239      this.optimizerGroupBox.Size = new System.Drawing.Size(610, 47);
    240240      this.optimizerGroupBox.TabIndex = 28;
    241241      this.optimizerGroupBox.TabStop = false;
     
    251251      this.optimizerNamedItemView.Name = "optimizerNamedItemView";
    252252      this.optimizerNamedItemView.ReadOnly = false;
    253       this.optimizerNamedItemView.Size = new System.Drawing.Size(604, 51);
     253      this.optimizerNamedItemView.Size = new System.Drawing.Size(604, 21);
    254254      this.optimizerNamedItemView.TabIndex = 0;
    255255      //
     
    266266      this.configurationGroupBox.Controls.Add(this.computeInParallelLabel);
    267267      this.configurationGroupBox.Controls.Add(this.computeInParallelCheckBox);
    268       this.configurationGroupBox.Location = new System.Drawing.Point(6, 105);
     268      this.configurationGroupBox.Location = new System.Drawing.Point(6, 82);
    269269      this.configurationGroupBox.Name = "configurationGroupBox";
    270270      this.configurationGroupBox.Size = new System.Drawing.Size(610, 119);
  • branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3

    • Property svn:ignore
      •  

        old new  
        22obj
        33*.user
         4*.vs10x
Note: See TracChangeset for help on using the changeset viewer.