Free cookie consent management tool by TermsFeed Policy Generator

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

#1680:

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

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Hive.Azure

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

    • Property svn:ignore

      •  

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

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

    r6976 r7270  
    136136  </ItemGroup>
    137137  <ItemGroup>
    138     <EmbeddedResource Include="Views\HiveJobManagerView.resx">
    139       <DependentUpon>HiveJobManagerView.cs</DependentUpon>
    140       <SubType>Designer</SubType>
    141     </EmbeddedResource>
    142     <EmbeddedResource Include="Views\HiveJobPermissionView.resx">
    143       <DependentUpon>HiveJobPermissionView.cs</DependentUpon>
    144     </EmbeddedResource>
    145     <EmbeddedResource Include="Views\RefreshableHiveJobView.resx">
    146       <DependentUpon>RefreshableHiveJobView.cs</DependentUpon>
    147     </EmbeddedResource>
    148   </ItemGroup>
    149   <ItemGroup>
    150138    <ProjectReference Include="..\..\HeuristicLab.Clients.Hive.Views\3.3\HeuristicLab.Clients.Hive.Views-3.3.csproj">
    151139      <Project>{E1D6C801-892A-406A-B606-F158E36DD3C3}</Project>

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/JobManagerMenuItem.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.

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager/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.JobManager {
    25   [Plugin("HeuristicLab.Clients.Hive.JobManager", "3.3.5.$WCREV$")]
     25  [Plugin("HeuristicLab.Clients.Hive.JobManager", "3.3.6.$WCREV$")]
    2626  [PluginFile("HeuristicLab.Clients.Hive.JobManager-3.3.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.Clients.Hive", "3.3")]
    … …  
    2929  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3030  [PluginDependency("HeuristicLab.Common", "3.3")]
     31  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
    3132  [PluginDependency("HeuristicLab.Core", "3.3")]
    3233  [PluginDependency("HeuristicLab.Core.Views", "3.3")]

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager/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.JobManager/3.3/Views/HiveJobManagerView.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.
    … …  
    4545    /// </summary>
    4646    private void InitializeComponent() {
    47       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HiveJobManagerView));
    4847      this.hiveExperimentListView = new RefreshableHiveJobListView();
    4948      this.refreshButton = new System.Windows.Forms.Button();
    … …  
    6564      // refreshButton
    6665      //
    67       this.refreshButton.Image = ((System.Drawing.Image)(resources.GetObject("refreshButton.Image")));
     66      this.refreshButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Refresh;
    6867      this.refreshButton.Location = new System.Drawing.Point(3, 3);
    6968      this.refreshButton.Name = "refreshButton";

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.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.
    … …  
    2424using System.ServiceModel.Security;
    2525using System.Windows.Forms;
     26using HeuristicLab.Clients.Hive.Views;
    2627using HeuristicLab.Collections;
    2728using HeuristicLab.MainForm;
    … …  
    106107
    107108    private void HandleServiceException(Exception ex) {
    108       if (ex is MessageSecurityException) {
    109         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);
     109      if (this.InvokeRequired) {
     110        Invoke(new Action<Exception>(HandleServiceException), ex);
    110111      } else {
    111         ErrorHandling.ShowErrorDialog(this, "Refresh failed.", ex);
     112        if (ex is MessageSecurityException) {
     113          MessageBox.Show("A Message Security error has occured. This normally means that your user name or password is wrong.", "HeuristicLab Hive Job Manager", MessageBoxButtons.OK, MessageBoxIcon.Error);
     114        } else if (ex is AnonymousUserException) {
     115          using (HiveInformationDialog dialog = new HiveInformationDialog()) {
     116            dialog.ShowDialog(this);
     117          }
     118        } else {
     119          ErrorHandling.ShowErrorDialog(this, "Refresh failed.", ex);
     120        }
    112121      }
    113122    }

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionListView.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.

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionView.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.JobManager/3.3/Views/RefreshableHiveJobListView.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.
    … …  
    5454
    5555    protected override void removeButton_Click(object sender, EventArgs e) {
    56       DialogResult result = MessageBox.Show("This action will permanently delete this job (also on the hive server). Continue?", "HeuristicLab Hive Job Manager", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
    57       if (result == DialogResult.OK) {
    58         base.removeButton_Click(sender, e);
     56      DialogResult result = MessageBox.Show("This action will permanently delete this job (also on the Hive server). Continue?", "HeuristicLab Hive Job Manager", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
     57      if (result == DialogResult.Yes) {
     58        System.Windows.Forms.ListView.SelectedListViewItemCollection selectedItems = itemsListView.SelectedItems;
     59        bool inProgress = false;
     60        foreach (ListViewItem item in selectedItems) {                                 
     61          RefreshableJob job = item.Tag as RefreshableJob;
     62          if (job != null && job.IsProgressing) {
     63            inProgress = true;
     64            break;
     65          }
     66        }
     67
     68        if (inProgress) {
     69          MessageBox.Show("You can't delete jobs which are currently uploading or downloading." + Environment.NewLine + "Please wait for the jobs to complete and try again. ", "HeuristicLab Hive Job Manager", MessageBoxButtons.OK, MessageBoxIcon.Warning);
     70          return;
     71        } else {
     72          base.removeButton_Click(sender, e);
     73        }
    5974      }
    6075    }

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs

    r7215 r7270  
    2525    private void InitializeComponent() {
    2626      this.components = new System.ComponentModel.Container();
    27       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RefreshableHiveJobView));
    2827      this.tabControl = new System.Windows.Forms.TabControl();
    2928      this.tasksTabPage = new System.Windows.Forms.TabPage();
    … …  
    125124      // refreshPermissionsButton
    126125      //
    127       this.refreshPermissionsButton.Image = ((System.Drawing.Image)(resources.GetObject("refreshPermissionsButton.Image")));
     126      this.refreshPermissionsButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Refresh;
    128127      this.refreshPermissionsButton.Location = new System.Drawing.Point(3, 3);
    129128      this.refreshPermissionsButton.Name = "refreshPermissionsButton";
    … …  
    228227      //
    229228      this.startButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    230       this.startButton.Image = ((System.Drawing.Image)(resources.GetObject("startButton.Image")));
     229      this.startButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Play;
    231230      this.startButton.Location = new System.Drawing.Point(0, 536);
    232231      this.startButton.Name = "startButton";
    … …  
    240239      //
    241240      this.stopButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    242       this.stopButton.Image = ((System.Drawing.Image)(resources.GetObject("stopButton.Image")));
     241      this.stopButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Stop;
    243242      this.stopButton.Location = new System.Drawing.Point(60, 536);
    244243      this.stopButton.Name = "stopButton";
    … …  
    253252      this.resetButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    254253      this.resetButton.Enabled = false;
    255       this.resetButton.Image = ((System.Drawing.Image)(resources.GetObject("resetButton.Image")));
     254      this.resetButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Restart;
    256255      this.resetButton.Location = new System.Drawing.Point(90, 536);
    257256      this.resetButton.Name = "resetButton";
    … …  
    285284      this.pauseButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    286285      this.pauseButton.Enabled = false;
    287       this.pauseButton.Image = ((System.Drawing.Image)(resources.GetObject("pauseButton.Image")));
     286      this.pauseButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Pause;
    288287      this.pauseButton.Location = new System.Drawing.Point(30, 536);
    289288      this.pauseButton.Name = "pauseButton";
    … …  
    334333      // refreshButton
    335334      //
    336       this.refreshButton.Image = ((System.Drawing.Image)(resources.GetObject("refreshButton.Image")));
     335      this.refreshButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Refresh;
    337336      this.refreshButton.Location = new System.Drawing.Point(3, 0);
    338337      this.refreshButton.Name = "refreshButton";

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.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.
Note: See TracChangeset for help on using the changeset viewer.