Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'IobMan' into develop

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-12-27 14:08:10 +01:00
parent 2b73eb2a9d 76d181c357
commit c2cdef86c2
3 changed files with 43 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-MAN/IOBManPanel.Designer.cs
Generated
+16 -15
View File
@@ -33,9 +33,10 @@
this.btnClose = new System.Windows.Forms.Button();
this.MainTimer = new System.Windows.Forms.Timer(this.components);
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.lblApp = new System.Windows.Forms.ToolStripStatusLabel();
this.lblVers = new System.Windows.Forms.ToolStripStatusLabel();
this.tsProgBar = new System.Windows.Forms.ToolStripProgressBar();
this.tsslNumProc = new System.Windows.Forms.ToolStripStatusLabel();
this.lblVers = new System.Windows.Forms.ToolStripStatusLabel();
this.panel1 = new System.Windows.Forms.Panel();
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.processManagerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -53,7 +54,6 @@
this.btnRestartAll = new System.Windows.Forms.Button();
this.btnCloseAll = new System.Windows.Forms.Button();
this.dgvManagedItems = new System.Windows.Forms.DataGridView();
this.lblApp = new System.Windows.Forms.ToolStripStatusLabel();
this.statusStrip1.SuspendLayout();
this.panel1.SuspendLayout();
this.menuStrip1.SuspendLayout();
@@ -96,6 +96,19 @@
this.statusStrip1.TabIndex = 82;
this.statusStrip1.Text = "statusStrip1";
//
// lblApp
//
this.lblApp.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold);
this.lblApp.Name = "lblApp";
this.lblApp.Size = new System.Drawing.Size(12, 17);
this.lblApp.Text = "-";
//
// lblVers
//
this.lblVers.Name = "lblVers";
this.lblVers.Size = new System.Drawing.Size(49, 17);
this.lblVers.Text = "v 0.0.0.0";
//
// tsProgBar
//
this.tsProgBar.Name = "tsProgBar";
@@ -107,12 +120,6 @@
this.tsslNumProc.Size = new System.Drawing.Size(16, 17);
this.tsslNumProc.Text = "...";
//
// lblVers
//
this.lblVers.Name = "lblVers";
this.lblVers.Size = new System.Drawing.Size(49, 17);
this.lblVers.Text = "v 0.0.0.0";
//
// panel1
//
this.panel1.Controls.Add(this.menuStrip1);
@@ -315,13 +322,7 @@
this.dgvManagedItems.Size = new System.Drawing.Size(563, 339);
this.dgvManagedItems.TabIndex = 76;
this.dgvManagedItems.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvManagedItems_CellDoubleClick);
//
// lblApp
//
this.lblApp.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold);
this.lblApp.Name = "lblApp";
this.lblApp.Size = new System.Drawing.Size(12, 17);
this.lblApp.Text = "-";
this.dgvManagedItems.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dgvManagedItems_CellFormatting);
//
// IOBManPanel
//
IOB-MAN/IOBManPanel.cs
+26
View File
@@ -3,6 +3,7 @@ using System;
using System.Collections.Generic;
using System.Configuration;
using System.Diagnostics;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
@@ -781,6 +782,31 @@ namespace IOB_MAN
// riapro
apriChild();
}
private void dgvManagedItems_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e)
{
//e.CellStyle =
// If the column is the Artist column, check the
// value.
if (this.dgvManagedItems.Columns[e.ColumnIndex].Name == "isRunning")
{
if (e.Value != null)
{
// Check for the string "pink" in the cell.
bool isRunning = false;
bool.TryParse(e.Value.ToString(), out isRunning);
//stringValue = stringValue.ToLower();
if (!isRunning)
{
e.CellStyle.ForeColor = Color.Red;
DataGridViewCellStyle currstyle = dgvManagedItems[0, e.RowIndex].Style;
currstyle.ForeColor = Color.Red;
dgvManagedItems[3, e.RowIndex].Style = currstyle;
dgvManagedItems[3, e.RowIndex].Style = currstyle;
}
}
}
}
}
}
Jenkinsfile
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=629']) {
withEnv(['NEXT_BUILD_NUMBER=630']) {
// env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'