Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/04/12 16:45:02 (13 years ago)
Author:
spimming
Message:

#1680:

  • merged changes from trunk into branch
Location:
branches/HeuristicLab.Hive.Azure
Files:
5 deleted
18 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Hive.Azure

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Administrator/3.3

    • Property svn:ignore

      •  

        old new  
        11Plugin.cs
        22obj
         3*.vs10x

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Administrator/3.3/HeuristicLab.Clients.Hive.Administrator-3.3.csproj

    r6977 r7270  
    141141  </ItemGroup>
    142142  <ItemGroup>
    143     <EmbeddedResource Include="Views\HiveAdministratorView.resx">
    144       <DependentUpon>HiveAdministratorView.cs</DependentUpon>
    145     </EmbeddedResource>
    146     <EmbeddedResource Include="Views\Recurrence.resx">
    147       <DependentUpon>Recurrence.cs</DependentUpon>
    148     </EmbeddedResource>
    149     <EmbeddedResource Include="Views\ResourcesView.resx">
    150       <DependentUpon>ResourcesView.cs</DependentUpon>
    151     </EmbeddedResource>
    152     <EmbeddedResource Include="Views\ScheduleView.resx">
    153       <DependentUpon>ScheduleView.cs</DependentUpon>
    154     </EmbeddedResource>
    155     <EmbeddedResource Include="Views\SlaveView.resx">
    156       <DependentUpon>SlaveView.cs</DependentUpon>
    157     </EmbeddedResource>
    158   </ItemGroup>
    159   <ItemGroup>
    160143    <ProjectReference Include="..\..\HeuristicLab.Clients.Common\3.3\HeuristicLab.Clients.Common-3.3.csproj">
    161144      <Project>{730A9104-D4D1-4360-966B-E49B7571DDA3}</Project>

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Administrator/3.3/HiveAppointment.cs

    r6976 r7270  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Administrator/3.3/MenuItems/AdministratorMenuItem.cs

    r6976 r7270  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Administrator/3.3/Plugin.cs.frame

    r6979 r7270  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323
    2424namespace HeuristicLab.Clients.Hive.Administration {
    25   [Plugin("HeuristicLab.Clients.Hive.Administrator", "3.3.5.$WCREV$")]
     25  [Plugin("HeuristicLab.Clients.Hive.Administrator", "3.3.6.$WCREV$")]
    2626  [PluginFile("HeuristicLab.Clients.Hive.Administrator-3.3.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.Collections", "3.3")]
    2828  [PluginDependency("HeuristicLab.Common", "3.3")]
     29  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
    2930  [PluginDependency("HeuristicLab.Core", "3.3")]
    3031  [PluginDependency("HeuristicLab.Core.Views", "3.3")] 

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Administrator/3.3/Properties/AssemblyInfo.cs.frame

    r6976 r7270  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3232[assembly: AssemblyCompany("HEAL")]
    3333[assembly: AssemblyProduct("HeuristicLab")]
    34 [assembly: AssemblyCopyright("(c) 2002-2011 HEAL")]
     34[assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
    3535[assembly: AssemblyTrademark("")]
    3636[assembly: AssemblyCulture("")]
    … …  
    5555// [assembly: AssemblyVersion("1.0.*")]
    5656[assembly: AssemblyVersion("3.3.0.0")]
    57 [assembly: AssemblyFileVersion("3.3.0.$WCREV$")]
     57[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Administrator/3.3/RecurrentEvent.cs

    r6976 r7270  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Administrator/3.3/Views/HiveAdministratorView.Designer.cs

    r6976 r7270  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Administrator/3.3/Views/HiveAdministratorView.cs

    r6976 r7270  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Administrator/3.3/Views/Recurrence.Designer.cs

    r6976 r7270  
    2424    /// </summary>
    2525    private void InitializeComponent() {
    26       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Recurrence));
    2726      this.gbAppointment = new System.Windows.Forms.GroupBox();
    2827      this.chbade = new System.Windows.Forms.CheckBox();
    … …  
    243242      this.Controls.Add(this.gbAppointment);
    244243      this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
    245       this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
     244      this.Icon = HeuristicLab.Common.Resources.HeuristicLab.Icon;
    246245      this.Name = "Recurrence";
    247246      this.Text = "Recurrence";

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Administrator/3.3/Views/Recurrence.cs

    r6976 r7270  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.Designer.cs

    r7215 r7270  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    4747    private void InitializeComponent() {
    4848      this.components = new System.ComponentModel.Container();
    49       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ResourcesView));
    5049      this.imageListSlaveGroups = new System.Windows.Forms.ImageList(this.components);
    5150      this.splitSlaves = new System.Windows.Forms.SplitContainer();
    … …  
    103102      // btnRefresh
    104103      //
    105       this.btnRefresh.Image = ((System.Drawing.Image)(resources.GetObject("btnRefresh.Image")));
     104      this.btnRefresh.Image = HeuristicLab.Common.Resources.VSImageLibrary.Refresh;
    106105      this.btnRefresh.Location = new System.Drawing.Point(3, 3);
    107106      this.btnRefresh.Name = "btnRefresh";
    … …  
    122121      // btnSave
    123122      //
    124       this.btnSave.Image = ((System.Drawing.Image)(resources.GetObject("btnSave.Image")));
     123      this.btnSave.Image = HeuristicLab.Common.Resources.VSImageLibrary.PublishToWeb;
    125124      this.btnSave.Location = new System.Drawing.Point(93, 3);
    126125      this.btnSave.Name = "btnSave";
    … …  
    133132      // btnRemoveGroup
    134133      //
    135       this.btnRemoveGroup.Image = ((System.Drawing.Image)(resources.GetObject("btnRemoveGroup.Image")));
     134      this.btnRemoveGroup.Image = HeuristicLab.Common.Resources.VSImageLibrary.Remove;
    136135      this.btnRemoveGroup.Location = new System.Drawing.Point(63, 3);
    137136      this.btnRemoveGroup.Name = "btnRemoveGroup";
    … …  
    144143      // btnAddGroup
    145144      //
    146       this.btnAddGroup.Image = ((System.Drawing.Image)(resources.GetObject("btnAddGroup.Image")));
     145      this.btnAddGroup.Image = HeuristicLab.Common.Resources.VSImageLibrary.Add;
    147146      this.btnAddGroup.Location = new System.Drawing.Point(33, 3);
    148147      this.btnAddGroup.Name = "btnAddGroup";

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs

    r7215 r7270  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    5151    public ResourcesView() {
    5252      InitializeComponent();
    53       treeSlaveGroup.ImageList.Images.Add(HiveImageLibrary.Slave);
    54       treeSlaveGroup.ImageList.Images.Add(HiveImageLibrary.SlaveGroup);
     53      treeSlaveGroup.ImageList.Images.Add(HeuristicLab.Common.Resources.VSImageLibrary.MonitorLarge);
     54      treeSlaveGroup.ImageList.Images.Add(HeuristicLab.Common.Resources.VSImageLibrary.NetworkCenterLarge);
    5555
    5656      HiveAdminClient.Instance.Refreshing += new EventHandler(Instance_Refreshing);
    … …  
    170170    protected override void SetEnabledStateOfControls() {
    171171      base.SetEnabledStateOfControls();
     172      if (Content == null) {
     173        btnAddGroup.Enabled = false;
     174        btnRemoveGroup.Enabled = false;
     175        btnSave.Enabled = false;
     176      } else {
     177        btnAddGroup.Enabled = true;
     178        btnRemoveGroup.Enabled = true;
     179        btnSave.Enabled = true;
     180      }
    172181    }
    173182
    … …  
    337346
    338347    void ResetView() {
    339       treeSlaveGroup.Nodes.Clear();
    340 
    341       if (slaveView.Content != null && slaveView.Content is SlaveGroup) {
    342         slaveView.Content.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler(SlaveViewContent_PropertyChanged);
    343       }
    344       slaveView.Content = null;
    345       if (scheduleView.Content != null) {
    346         scheduleView.Content.Clear();
    347       }
    348       HiveAdminClient.Instance.ResetDowntime();
     348      if (this.InvokeRequired) {
     349        Invoke(new Action(ResetView));
     350      } else {
     351        treeSlaveGroup.Nodes.Clear();
     352
     353        if (slaveView.Content != null && slaveView.Content is SlaveGroup) {
     354          slaveView.Content.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler(SlaveViewContent_PropertyChanged);
     355        }
     356        slaveView.Content = null;
     357        if (scheduleView.Content != null) {
     358          scheduleView.Content.Clear();
     359        }
     360        HiveAdminClient.Instance.ResetDowntime();
     361      }
    349362    }
    350363
    351364    private void UpdateResources() {
    352       if (this.InvokeRequired) {
    353         this.Invoke(new Action(ResetView));
    354       } else {
    355         ResetView();
    356       }
     365      ResetView();
    357366
    358367      try {
    … …  
    361370      }
    362371      catch (MessageSecurityException) {
     372        ShowMessageSecurityException();
     373      }
     374      catch (AnonymousUserException) {
     375        ShowHiveInformationDialog();
     376      }
     377    }
     378
     379    private void ShowMessageSecurityException() {
     380      if (this.InvokeRequired) {
     381        Invoke(new Action(ShowMessageSecurityException));
     382      } else {
    363383        MessageBox.Show("A Message Security error has occured. This normally means that your user name or password is wrong.", "HeuristicLab Hive Administrator", MessageBoxButtons.OK, MessageBoxIcon.Error);
     384      }
     385    }
     386
     387    private void ShowHiveInformationDialog() {
     388      if (this.InvokeRequired) {
     389        Invoke(new Action(ShowHiveInformationDialog));
     390      } else {
     391        using (HiveInformationDialog dialog = new HiveInformationDialog()) {
     392          dialog.ShowDialog(this);
     393        }
    364394      }
    365395    }

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ScheduleView.Designer.cs

    r7215 r7270  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    4747      this.components = new System.ComponentModel.Container();
    4848      Calendar.DrawTool drawTool1 = new Calendar.DrawTool();
    49       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ScheduleView));
    5049      this.dvOnline = new Calendar.DayView();
    5150      this.txttimeTo = new System.Windows.Forms.DateTimePicker();
    … …  
    161160      // btnRecurrence
    162161      //
    163       this.btnRecurrence.Image = ((System.Drawing.Image)(resources.GetObject("btnRecurrence.Image")));
     162      this.btnRecurrence.Image = HeuristicLab.Common.Resources.VSImageLibrary.Timer;
    164163      this.btnRecurrence.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
    165164      this.btnRecurrence.Location = new System.Drawing.Point(135, 129);
    … …  
    174173      // btbDelete
    175174      //
    176       this.btbDelete.Image = ((System.Drawing.Image)(resources.GetObject("btbDelete.Image")));
     175      this.btbDelete.Image = HeuristicLab.Common.Resources.VSImageLibrary.Delete;
    177176      this.btbDelete.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
    178177      this.btbDelete.Location = new System.Drawing.Point(8, 129);
    … …  
    205204      // btCreate
    206205      //
    207       this.btCreate.Image = ((System.Drawing.Image)(resources.GetObject("btCreate.Image")));
     206      this.btCreate.Image = HeuristicLab.Common.Resources.VSImageLibrary.Add;
    208207      this.btCreate.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
    209208      this.btCreate.Location = new System.Drawing.Point(6, 93);
    … …  
    218217      // btnSaveCal
    219218      //
    220       this.btnSaveCal.Image = ((System.Drawing.Image)(resources.GetObject("btnSaveCal.Image")));
     219      this.btnSaveCal.Image = HeuristicLab.Common.Resources.VSImageLibrary.PublishToWeb;
    221220      this.btnSaveCal.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
    222221      this.btnSaveCal.Location = new System.Drawing.Point(633, 41);
    … …  
    231230      // btnClearCal
    232231      //
    233       this.btnClearCal.Image = ((System.Drawing.Image)(resources.GetObject("btnClearCal.Image")));
     232      this.btnClearCal.Image = HeuristicLab.Common.Resources.VSImageLibrary.Document;
    234233      this.btnClearCal.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
    235234      this.btnClearCal.Location = new System.Drawing.Point(633, 9);

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ScheduleView.cs

    r7215 r7270  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    228228    protected override void SetEnabledStateOfControls() {
    229229      base.SetEnabledStateOfControls();
     230      if (Content == null) {
     231        btnSaveCal.Enabled = false;
     232      } else {
     233        btnSaveCal.Enabled = true;
     234      }
    230235    }
    231236

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Administrator/3.3/Views/SlaveView.Designer.cs

    r6976 r7270  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Administrator/3.3/Views/SlaveView.cs

    r6976 r7270  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
Note: See TracChangeset for help on using the changeset viewer.