Changeset 1717


Ignore:
Timestamp:
04/30/09 13:23:40 (12 years ago)
Author:
aleitner
Message:

JobDetails and Images for job fixed (#600)

Location:
trunk/sources/HeuristicLab.Hive.Server.Console/3.2
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerConsole.Designer.cs

    r1711 r1717  
    138138      this.tbUserName.Size = new System.Drawing.Size(189, 20);
    139139      this.tbUserName.TabIndex = 2;
    140      // this.tbUserName.TextChanged += new System.EventHandler(this.tbUserName_TextChanged);
    141140      this.tbUserName.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.HiveServerConsole_KeyPress);
    142141      //
  • trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.Designer.cs

    r1657 r1717  
    2828      this.menuStrip1 = new System.Windows.Forms.MenuStrip();
    2929      this.informationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
     30      this.refreshToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    3031      this.closeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    3132      this.addToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
     
    8586      this.tcManagementConsole = new System.Windows.Forms.TabControl();
    8687      this.checkBox1 = new System.Windows.Forms.CheckBox();
    87       this.refreshToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    8888      this.menuStrip1.SuspendLayout();
    8989      this.plClientDetails.SuspendLayout();
     
    130130      this.informationToolStripMenuItem.Text = "Management";
    131131      //
     132      // refreshToolStripMenuItem
     133      //
     134      this.refreshToolStripMenuItem.Name = "refreshToolStripMenuItem";
     135      this.refreshToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
     136      this.refreshToolStripMenuItem.Text = "Refresh";
     137      this.refreshToolStripMenuItem.Click += new System.EventHandler(this.refreshToolStripMenuItem_Click);
     138      //
    132139      // closeToolStripMenuItem
    133140      //
    134141      this.closeToolStripMenuItem.Name = "closeToolStripMenuItem";
    135       this.closeToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
     142      this.closeToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
    136143      this.closeToolStripMenuItem.Text = "Close";
    137144      this.closeToolStripMenuItem.Click += new System.EventHandler(this.Close_Click);
     
    574581      this.ilSmallImgJob.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("ilSmallImgJob.ImageStream")));
    575582      this.ilSmallImgJob.TransparentColor = System.Drawing.Color.Transparent;
    576       this.ilSmallImgJob.Images.SetKeyName(0, "Forward.png");
    577       this.ilSmallImgJob.Images.SetKeyName(1, "ok.png");
     583      this.ilSmallImgJob.Images.SetKeyName(0, "ok.png");
     584      this.ilSmallImgJob.Images.SetKeyName(1, "Forward.png");
    578585      this.ilSmallImgJob.Images.SetKeyName(2, "pause.png");
    579586      //
     
    677684      this.checkBox1.Text = "checkBox1";
    678685      this.checkBox1.UseVisualStyleBackColor = true;
    679       //
    680       // refreshToolStripMenuItem
    681       //
    682       this.refreshToolStripMenuItem.Name = "refreshToolStripMenuItem";
    683       this.refreshToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
    684       this.refreshToolStripMenuItem.Text = "Refresh";
    685       this.refreshToolStripMenuItem.Click += new System.EventHandler(this.refreshToolStripMenuItem_Click);
    686686      //
    687687      // HiveServerManagementConsole
  • trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.cs

    r1657 r1717  
    395395      lvSnapshots.Enabled = true;
    396396      currentJob = jobs.List[i];
    397       pbJobControl.Image = ilLargeImgJob.Images[0];
     397      if (currentJob.State == State.offline) {
     398        pbJobControl.Image = ilLargeImgJob.Images[2];
     399      } else if (currentJob.State == State.calculating) {
     400        pbJobControl.Image = ilLargeImgJob.Images[1];
     401      } else if (currentJob.State == State.finished) {
     402        pbJobControl.Image = ilLargeImgJob.Images[0];
     403      }
    398404      lblJobName.Text = currentJob.Id.ToString();
    399405      progressJob.Value = (int)(currentJob.Percentage * 100);
     
    455461            if (state == State.finished) {
    456462              lvJobControl.Items[i].Group = jobGroup[1];
     463              lvJobControl.Items[i].ImageIndex = 0;
    457464              System.Diagnostics.Debug.WriteLine("finished");
    458465            } else if (state == State.calculating) {
    459466              lvJobControl.Items[i].Group = jobGroup[0];
     467              lvJobControl.Items[i].ImageIndex = 1;
    460468              System.Diagnostics.Debug.WriteLine("calculating");
    461469            } else if (state == State.offline) {
    462470              lvJobControl.Items[i].Group = jobGroup[2];
     471              lvJobControl.Items[i].ImageIndex = 2;
    463472              System.Diagnostics.Debug.WriteLine("offline");
    464473
     
    469478      } else if (change.ChangeType == Change.Create) {
    470479        ListViewItem lvi = new ListViewItem(
    471           change.ID.ToString(), 0, jobGroup[2]);
     480          change.ID.ToString(), 2, jobGroup[2]);
    472481        jobObjects.Add(change.ID, lvi);
    473482        lvJobControl.Items.Add(lvi);
     
    768777
    769778            found = true;
     779            bool change = false;
     780            if (job.State != jobold.State) {
     781              change = true;
     782            }
    770783            if (job.State != State.offline) {
    771784              if ((!IsEqual(job.Client, jobold.Client)) || (job.State != jobold.State)
    772785                   || (job.Percentage != jobold.Percentage)) {
    773                 changes.Add(new Changes { Types = Type.Job, ID = job.Id, ChangeType = Change.Update, Position = i });
     786                change = true;
    774787              }
    775788            } else if (job.DateCalculated != jobold.DateCalculated) {
     789              change = true;
     790            }
     791            if (change) {
    776792              changes.Add(new Changes { Types = Type.Job, ID = job.Id, ChangeType = Change.Update, Position = i });
    777793            }
  • trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.resx

    r1657 r1717  
    308308    <value>462, 9</value>
    309309  </metadata>
    310   <metadata name="updaterWoker.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    311     <value>388, 41</value>
    312   </metadata>
    313310  <metadata name="contextMenuJob.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    314311    <value>252, 44</value>
     
    350347        AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
    351348        AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
    352         AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wMAAccLrAGhAwABbAo2
    353         ATUBoQMAAWcLTQGhEgACrALbB9UB2wHUAawBoQEAAVABNgI3AjYGNwI2AaEBAAFMAU0CWQJTBlkBUwFN
    354         AaEQAAGhAawN1AGsAaEONgE1AaEBTQFTAk0KUwFNEAABxw7UAawBbA82AYwBUwJNC1MBTRAAAccE1AHc
    355         CdQBrAFsBjYBVwg2AWcCTQJTAZoB/wGaAVMC/wRTAU0QAAHHBNQC/wHcB9QBrAFsBTYBGwH/CDYBZwFN
    356         A1MBmgH/ARoBUwL/BFMBTRAAAccE1AT/AdwF1AGsAWwENgFYAv8B9gc2AWcEUwGaAf8BGgFTAv8EUwFN
    357         EAABxwTUBv8B2wPUAawBbAQ2Af8B9gE2Af8BnwY2AWcEUwGaAf8BGgFTAv8EUwFNEAABxwTUBP8B9AXU
    358         AawBbAQ2AXkCNgFYAf8BWAU2AWcEUwGaAf8BGgFTAv8EUwFNEAABxwTUA/8H1AGsAWwINgEbAf8FNgFn
    359         BFMBmgH/ARoBUwL/BFMBTRAAAccE1AH/CdQBrAFsCTYB/wGfBDYBZwRTAXUBGgF6AVMCGgRTAU0QAAHH
    360         DtQBrAFsDTYBNwE2AWcOUwFNEAABxwGtDNQB2wGsAYYMNgI3ATYBhg5TAU0RAAGsAdUB2wjUAtsBrAHH
    361         AQABNgw3ATYBbAEAAU0CeglTAXoBTQFnEQABoQKsAbMH1AGzAqwCAAGhAzYHNwI2AVACAAHEAk0JUwFN
    362         AUwUAArHAaEFAAGGCWwBoQUAAYYIZwGMAaESAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUA
     349        AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wMAAWwKNgE1AaEDAAHH
     350        C6wBoQMAAWcLTQGhEgABUAE2AjcCNgY3AjYBoQEAAqwC2wfVAdsB1AGsAaEBAAFMAU0CWQJTBlkBUwFN
     351        AaEQAAGhDjYBNQGhAawN1AGsAaEBTQFTAk0KUwFNEAABbA82AccO1AGsAYwBUwJNC1MBTRAAAWwGNgFX
     352        CDYBxwTUAdwJ1AGsAWcCTQJTAZoB/wGaAVMC/wRTAU0QAAFsBTYBGwH/CDYBxwTUAv8B3AfUAawBZwFN
     353        A1MBmgH/ARoBUwL/BFMBTRAAAWwENgFYAv8B9gc2AccE1AT/AdwF1AGsAWcEUwGaAf8BGgFTAv8EUwFN
     354        EAABbAQ2Af8B9gE2Af8BnwY2AccE1Ab/AdsD1AGsAWcEUwGaAf8BGgFTAv8EUwFNEAABbAQ2AXkCNgFY
     355        Af8BWAU2AccE1AT/AfQF1AGsAWcEUwGaAf8BGgFTAv8EUwFNEAABbAg2ARsB/wU2AccE1AP/B9QBrAFn
     356        BFMBmgH/ARoBUwL/BFMBTRAAAWwJNgH/AZ8ENgHHBNQB/wnUAawBZwRTAXUBGgF6AVMCGgRTAU0QAAFs
     357        DTYBNwE2AccO1AGsAWcOUwFNEAABhgw2AjcBNgHHAa0M1AHbAawBhg5TAU0RAAE2DDcBNgFsAQABrAHV
     358        AdsI1ALbAawBxwEAAU0CeglTAXoBTQFnEQABoQM2BzcCNgFQAgABoQKsAbMH1AGzAqwCAAHEAk0JUwFN
     359        AUwUAAGGCWwBoQUACscBoQUAAYYIZwGMAaESAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUA
    363360        AYAXAAP/AQABwAEBAcABAQHAAQECAAGAAQABgAEAAYBbAAGAAQABgAEAAYADAAGAAQEBgAEBAYABAQIA
    364361        AeABAwHgAQMB4AEDAgAL
    365362</value>
    366363  </data>
     364  <metadata name="updaterWoker.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     365    <value>388, 41</value>
     366  </metadata>
    367367  <metadata name="ilSmallImgClient.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    368368    <value>17, 50</value>
Note: See TracChangeset for help on using the changeset viewer.