diff --git a/IOB-MAN/App.config b/IOB-MAN/App.config index 2012bfbb..20f5c47a 100644 --- a/IOB-MAN/App.config +++ b/IOB-MAN/App.config @@ -7,7 +7,7 @@ - + diff --git a/IOB-MAN/IOBManPanel.Designer.cs b/IOB-MAN/IOBManPanel.Designer.cs index beed73f8..9e515e87 100644 --- a/IOB-MAN/IOBManPanel.Designer.cs +++ b/IOB-MAN/IOBManPanel.Designer.cs @@ -28,362 +28,358 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(IOBManPanel)); - 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.panel1 = new System.Windows.Forms.Panel(); - this.menuStrip1 = new System.Windows.Forms.MenuStrip(); - this.processManagerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.reloadConfRestartToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.forceCloseALLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.updateIOBWINToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.btnMaximixeAll = new System.Windows.Forms.Button(); - this.btnMinimizeAll = new System.Windows.Forms.Button(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.panel2 = new System.Windows.Forms.Panel(); - this.btnStartSel = new System.Windows.Forms.Button(); - this.btnMoreTOut = new System.Windows.Forms.Button(); - this.txtTOutAutoCheck = new System.Windows.Forms.TextBox(); - this.chkAutoRestart = new System.Windows.Forms.CheckBox(); - this.btnOpenAll = new System.Windows.Forms.Button(); - this.btnRestartAll = new System.Windows.Forms.Button(); - this.btnCloseAll = new System.Windows.Forms.Button(); - this.dgvManagedItems = new System.Windows.Forms.DataGridView(); - this.UI_Timer = new System.Windows.Forms.Timer(this.components); - this.forceCheckTimer = new System.Windows.Forms.Timer(this.components); - this.statusStrip1.SuspendLayout(); - this.panel1.SuspendLayout(); - this.menuStrip1.SuspendLayout(); - this.tableLayoutPanel1.SuspendLayout(); - this.panel2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dgvManagedItems)).BeginInit(); - this.SuspendLayout(); - // - // btnClose - // - this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnClose.BackColor = System.Drawing.SystemColors.WindowText; - this.btnClose.ForeColor = System.Drawing.Color.Yellow; - this.btnClose.Location = new System.Drawing.Point(14, 159); - this.btnClose.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.btnClose.Name = "btnClose"; - this.btnClose.Size = new System.Drawing.Size(128, 32); - this.btnClose.TabIndex = 70; - this.btnClose.Text = "Close SEL"; - this.btnClose.UseVisualStyleBackColor = false; - this.btnClose.Click += new System.EventHandler(this.btnClose_Click); - // - // MainTimer - // - this.MainTimer.Interval = 500; - this.MainTimer.Tick += new System.EventHandler(this.MainTimer_Tick); - // - // statusStrip1 - // - this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); - this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(IOBManPanel)); + 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.panel1 = new System.Windows.Forms.Panel(); + this.menuStrip1 = new System.Windows.Forms.MenuStrip(); + this.processManagerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.reloadConfRestartToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.forceCloseALLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.updateIOBWINToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.btnMaximixeAll = new System.Windows.Forms.Button(); + this.btnMinimizeAll = new System.Windows.Forms.Button(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.panel2 = new System.Windows.Forms.Panel(); + this.btnStartSel = new System.Windows.Forms.Button(); + this.btnMoreTOut = new System.Windows.Forms.Button(); + this.txtTOutAutoCheck = new System.Windows.Forms.TextBox(); + this.chkAutoRestart = new System.Windows.Forms.CheckBox(); + this.btnOpenAll = new System.Windows.Forms.Button(); + this.btnRestartAll = new System.Windows.Forms.Button(); + this.btnCloseAll = new System.Windows.Forms.Button(); + this.dgvManagedItems = new System.Windows.Forms.DataGridView(); + this.UI_Timer = new System.Windows.Forms.Timer(this.components); + this.forceCheckTimer = new System.Windows.Forms.Timer(this.components); + this.statusStrip1.SuspendLayout(); + this.panel1.SuspendLayout(); + this.menuStrip1.SuspendLayout(); + this.tableLayoutPanel1.SuspendLayout(); + this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dgvManagedItems)).BeginInit(); + this.SuspendLayout(); + // + // btnClose + // + this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnClose.BackColor = System.Drawing.SystemColors.WindowText; + this.btnClose.ForeColor = System.Drawing.Color.Yellow; + this.btnClose.Location = new System.Drawing.Point(10, 129); + this.btnClose.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnClose.Name = "btnClose"; + this.btnClose.Size = new System.Drawing.Size(96, 26); + this.btnClose.TabIndex = 70; + this.btnClose.Text = "Close SEL"; + this.btnClose.UseVisualStyleBackColor = false; + this.btnClose.Click += new System.EventHandler(this.btnClose_Click); + // + // MainTimer + // + this.MainTimer.Interval = 500; + this.MainTimer.Tick += new System.EventHandler(this.MainTimer_Tick); + // + // statusStrip1 + // + this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.lblApp, this.lblVers, this.tsProgBar, this.tsslNumProc}); - this.statusStrip1.Location = new System.Drawing.Point(0, 509); - this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 13, 0); - this.statusStrip1.Size = new System.Drawing.Size(919, 26); - 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(15, 20); - this.lblApp.Text = "-"; - // - // lblVers - // - this.lblVers.Name = "lblVers"; - this.lblVers.Size = new System.Drawing.Size(61, 20); - this.lblVers.Text = "v 0.0.0.0"; - // - // tsProgBar - // - this.tsProgBar.Name = "tsProgBar"; - this.tsProgBar.Size = new System.Drawing.Size(100, 18); - // - // tsslNumProc - // - this.tsslNumProc.Name = "tsslNumProc"; - this.tsslNumProc.Size = new System.Drawing.Size(18, 20); - this.tsslNumProc.Text = "..."; - // - // panel1 - // - this.panel1.Controls.Add(this.menuStrip1); - this.panel1.Dock = System.Windows.Forms.DockStyle.Top; - this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(919, 38); - this.panel1.TabIndex = 83; - // - // menuStrip1 - // - this.menuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); - this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.statusStrip1.Location = new System.Drawing.Point(0, 413); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 10, 0); + this.statusStrip1.Size = new System.Drawing.Size(689, 22); + 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"; + this.tsProgBar.Size = new System.Drawing.Size(75, 16); + // + // tsslNumProc + // + this.tsslNumProc.Name = "tsslNumProc"; + this.tsslNumProc.Size = new System.Drawing.Size(16, 17); + this.tsslNumProc.Text = "..."; + // + // panel1 + // + this.panel1.Controls.Add(this.menuStrip1); + this.panel1.Dock = System.Windows.Forms.DockStyle.Top; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(689, 31); + this.panel1.TabIndex = 83; + // + // menuStrip1 + // + this.menuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.processManagerToolStripMenuItem}); - this.menuStrip1.Location = new System.Drawing.Point(0, 0); - this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Padding = new System.Windows.Forms.Padding(5, 2, 0, 2); - this.menuStrip1.Size = new System.Drawing.Size(919, 28); - this.menuStrip1.TabIndex = 82; - this.menuStrip1.Text = "menuStrip1"; - // - // processManagerToolStripMenuItem - // - this.processManagerToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Padding = new System.Windows.Forms.Padding(4, 2, 0, 2); + this.menuStrip1.Size = new System.Drawing.Size(689, 24); + this.menuStrip1.TabIndex = 82; + this.menuStrip1.Text = "menuStrip1"; + // + // processManagerToolStripMenuItem + // + this.processManagerToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.reloadConfRestartToolStripMenuItem, this.forceCloseALLToolStripMenuItem, this.updateIOBWINToolStripMenuItem}); - this.processManagerToolStripMenuItem.Name = "processManagerToolStripMenuItem"; - this.processManagerToolStripMenuItem.Size = new System.Drawing.Size(77, 24); - this.processManagerToolStripMenuItem.Text = "&Manage"; - // - // reloadConfRestartToolStripMenuItem - // - this.reloadConfRestartToolStripMenuItem.Name = "reloadConfRestartToolStripMenuItem"; - this.reloadConfRestartToolStripMenuItem.Size = new System.Drawing.Size(236, 26); - this.reloadConfRestartToolStripMenuItem.Text = "&Reload conf + Restart"; - this.reloadConfRestartToolStripMenuItem.Click += new System.EventHandler(this.reloadConfRestartToolStripMenuItem_Click); - // - // forceCloseALLToolStripMenuItem - // - this.forceCloseALLToolStripMenuItem.Name = "forceCloseALLToolStripMenuItem"; - this.forceCloseALLToolStripMenuItem.Size = new System.Drawing.Size(236, 26); - this.forceCloseALLToolStripMenuItem.Text = "&Force Close ALL"; - this.forceCloseALLToolStripMenuItem.Click += new System.EventHandler(this.forceCloseALLToolStripMenuItem_Click); - // - // updateIOBWINToolStripMenuItem - // - this.updateIOBWINToolStripMenuItem.Name = "updateIOBWINToolStripMenuItem"; - this.updateIOBWINToolStripMenuItem.Size = new System.Drawing.Size(236, 26); - this.updateIOBWINToolStripMenuItem.Text = "Update IOB-&WIN"; - this.updateIOBWINToolStripMenuItem.Click += new System.EventHandler(this.updateIOBWINToolStripMenuItem_Click); - // - // btnMaximixeAll - // - this.btnMaximixeAll.BackColor = System.Drawing.SystemColors.Highlight; - this.btnMaximixeAll.ForeColor = System.Drawing.SystemColors.ControlLightLight; - this.btnMaximixeAll.Location = new System.Drawing.Point(15, 70); - this.btnMaximixeAll.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.btnMaximixeAll.Name = "btnMaximixeAll"; - this.btnMaximixeAll.Size = new System.Drawing.Size(128, 32); - this.btnMaximixeAll.TabIndex = 81; - this.btnMaximixeAll.Text = "Show ALL"; - this.btnMaximixeAll.UseVisualStyleBackColor = false; - this.btnMaximixeAll.Click += new System.EventHandler(this.btnMaximixeAll_Click); - // - // btnMinimizeAll - // - this.btnMinimizeAll.BackColor = System.Drawing.SystemColors.Highlight; - this.btnMinimizeAll.ForeColor = System.Drawing.SystemColors.ControlLightLight; - this.btnMinimizeAll.Location = new System.Drawing.Point(15, 107); - this.btnMinimizeAll.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.btnMinimizeAll.Name = "btnMinimizeAll"; - this.btnMinimizeAll.Size = new System.Drawing.Size(128, 32); - this.btnMinimizeAll.TabIndex = 80; - this.btnMinimizeAll.Text = "Hide ALL"; - this.btnMinimizeAll.UseVisualStyleBackColor = false; - this.btnMinimizeAll.Click += new System.EventHandler(this.btnMinimizeAll_Click); - // - // tableLayoutPanel1 - // - this.tableLayoutPanel1.ColumnCount = 2; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 160F)); - this.tableLayoutPanel1.Controls.Add(this.panel2, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.dgvManagedItems, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 38); - this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 1; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(919, 471); - this.tableLayoutPanel1.TabIndex = 85; - // - // panel2 - // - this.panel2.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.panel2.Controls.Add(this.btnStartSel); - this.panel2.Controls.Add(this.btnMoreTOut); - this.panel2.Controls.Add(this.txtTOutAutoCheck); - this.panel2.Controls.Add(this.chkAutoRestart); - this.panel2.Controls.Add(this.btnOpenAll); - this.panel2.Controls.Add(this.btnRestartAll); - this.panel2.Controls.Add(this.btnCloseAll); - this.panel2.Controls.Add(this.btnClose); - this.panel2.Controls.Add(this.btnMinimizeAll); - this.panel2.Controls.Add(this.btnMaximixeAll); - this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel2.Location = new System.Drawing.Point(762, 2); - this.panel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(154, 467); - this.panel2.TabIndex = 85; - // - // btnStartSel - // - this.btnStartSel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnStartSel.BackColor = System.Drawing.Color.Green; - this.btnStartSel.ForeColor = System.Drawing.Color.Yellow; - this.btnStartSel.Location = new System.Drawing.Point(12, 196); - this.btnStartSel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.btnStartSel.Name = "btnStartSel"; - this.btnStartSel.Size = new System.Drawing.Size(128, 32); - this.btnStartSel.TabIndex = 88; - this.btnStartSel.Text = "Start SEL"; - this.btnStartSel.UseVisualStyleBackColor = false; - this.btnStartSel.Click += new System.EventHandler(this.btnStartSel_Click); - // - // btnMoreTOut - // - this.btnMoreTOut.Location = new System.Drawing.Point(108, 377); - this.btnMoreTOut.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.btnMoreTOut.Name = "btnMoreTOut"; - this.btnMoreTOut.Size = new System.Drawing.Size(33, 28); - this.btnMoreTOut.TabIndex = 87; - this.btnMoreTOut.Text = "+"; - this.btnMoreTOut.UseVisualStyleBackColor = true; - this.btnMoreTOut.Visible = false; - this.btnMoreTOut.Click += new System.EventHandler(this.btnMoreTOut_Click); - // - // txtTOutAutoCheck - // - this.txtTOutAutoCheck.Location = new System.Drawing.Point(15, 377); - this.txtTOutAutoCheck.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.txtTOutAutoCheck.Name = "txtTOutAutoCheck"; - this.txtTOutAutoCheck.Size = new System.Drawing.Size(84, 22); - this.txtTOutAutoCheck.TabIndex = 86; - this.txtTOutAutoCheck.Visible = false; - this.txtTOutAutoCheck.TextChanged += new System.EventHandler(this.txtTOutAutoCheck_TextChanged); - // - // chkAutoRestart - // - this.chkAutoRestart.AutoSize = true; - this.chkAutoRestart.Checked = true; - this.chkAutoRestart.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkAutoRestart.Location = new System.Drawing.Point(15, 338); - this.chkAutoRestart.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.chkAutoRestart.Name = "chkAutoRestart"; - this.chkAutoRestart.Size = new System.Drawing.Size(109, 21); - this.chkAutoRestart.TabIndex = 85; - this.chkAutoRestart.Text = "Auto Restart"; - this.chkAutoRestart.UseVisualStyleBackColor = true; - this.chkAutoRestart.CheckedChanged += new System.EventHandler(this.chkAutoRestart_CheckedChanged); - // - // btnOpenAll - // - this.btnOpenAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnOpenAll.BackColor = System.Drawing.SystemColors.ButtonFace; - this.btnOpenAll.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.btnOpenAll.Location = new System.Drawing.Point(14, 15); - this.btnOpenAll.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.btnOpenAll.Name = "btnOpenAll"; - this.btnOpenAll.Size = new System.Drawing.Size(128, 32); - this.btnOpenAll.TabIndex = 84; - this.btnOpenAll.Text = "Open ALL"; - this.btnOpenAll.UseVisualStyleBackColor = false; - this.btnOpenAll.Click += new System.EventHandler(this.btnOpenAll_Click); - // - // btnRestartAll - // - this.btnRestartAll.BackColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnRestartAll.ForeColor = System.Drawing.SystemColors.ControlLightLight; - this.btnRestartAll.Location = new System.Drawing.Point(15, 300); - this.btnRestartAll.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.btnRestartAll.Name = "btnRestartAll"; - this.btnRestartAll.Size = new System.Drawing.Size(128, 32); - this.btnRestartAll.TabIndex = 83; - this.btnRestartAll.Text = "Restart ALL"; - this.btnRestartAll.UseVisualStyleBackColor = false; - this.btnRestartAll.Click += new System.EventHandler(this.btnRestartAll_Click); - // - // btnCloseAll - // - this.btnCloseAll.BackColor = System.Drawing.SystemColors.ControlDarkDark; - this.btnCloseAll.ForeColor = System.Drawing.SystemColors.ControlLightLight; - this.btnCloseAll.Location = new System.Drawing.Point(15, 263); - this.btnCloseAll.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.btnCloseAll.Name = "btnCloseAll"; - this.btnCloseAll.Size = new System.Drawing.Size(128, 32); - this.btnCloseAll.TabIndex = 82; - this.btnCloseAll.Text = "Close ALL"; - this.btnCloseAll.UseVisualStyleBackColor = false; - this.btnCloseAll.Click += new System.EventHandler(this.btnCloseAll_Click); - // - // dgvManagedItems - // - this.dgvManagedItems.AllowUserToAddRows = false; - this.dgvManagedItems.AllowUserToDeleteRows = false; - this.dgvManagedItems.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.processManagerToolStripMenuItem.Name = "processManagerToolStripMenuItem"; + this.processManagerToolStripMenuItem.Size = new System.Drawing.Size(62, 20); + this.processManagerToolStripMenuItem.Text = "&Manage"; + // + // reloadConfRestartToolStripMenuItem + // + this.reloadConfRestartToolStripMenuItem.Name = "reloadConfRestartToolStripMenuItem"; + this.reloadConfRestartToolStripMenuItem.Size = new System.Drawing.Size(187, 22); + this.reloadConfRestartToolStripMenuItem.Text = "&Reload conf + Restart"; + this.reloadConfRestartToolStripMenuItem.Click += new System.EventHandler(this.reloadConfRestartToolStripMenuItem_Click); + // + // forceCloseALLToolStripMenuItem + // + this.forceCloseALLToolStripMenuItem.Name = "forceCloseALLToolStripMenuItem"; + this.forceCloseALLToolStripMenuItem.Size = new System.Drawing.Size(187, 22); + this.forceCloseALLToolStripMenuItem.Text = "&Force Close ALL"; + this.forceCloseALLToolStripMenuItem.Click += new System.EventHandler(this.forceCloseALLToolStripMenuItem_Click); + // + // updateIOBWINToolStripMenuItem + // + this.updateIOBWINToolStripMenuItem.Name = "updateIOBWINToolStripMenuItem"; + this.updateIOBWINToolStripMenuItem.Size = new System.Drawing.Size(187, 22); + this.updateIOBWINToolStripMenuItem.Text = "Update IOB-&WIN"; + this.updateIOBWINToolStripMenuItem.Click += new System.EventHandler(this.updateIOBWINToolStripMenuItem_Click); + // + // btnMaximixeAll + // + this.btnMaximixeAll.BackColor = System.Drawing.SystemColors.Highlight; + this.btnMaximixeAll.ForeColor = System.Drawing.SystemColors.ControlLightLight; + this.btnMaximixeAll.Location = new System.Drawing.Point(11, 57); + this.btnMaximixeAll.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnMaximixeAll.Name = "btnMaximixeAll"; + this.btnMaximixeAll.Size = new System.Drawing.Size(96, 26); + this.btnMaximixeAll.TabIndex = 81; + this.btnMaximixeAll.Text = "Show ALL"; + this.btnMaximixeAll.UseVisualStyleBackColor = false; + this.btnMaximixeAll.Click += new System.EventHandler(this.btnMaximixeAll_Click); + // + // btnMinimizeAll + // + this.btnMinimizeAll.BackColor = System.Drawing.SystemColors.Highlight; + this.btnMinimizeAll.ForeColor = System.Drawing.SystemColors.ControlLightLight; + this.btnMinimizeAll.Location = new System.Drawing.Point(11, 87); + this.btnMinimizeAll.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnMinimizeAll.Name = "btnMinimizeAll"; + this.btnMinimizeAll.Size = new System.Drawing.Size(96, 26); + this.btnMinimizeAll.TabIndex = 80; + this.btnMinimizeAll.Text = "Hide ALL"; + this.btnMinimizeAll.UseVisualStyleBackColor = false; + this.btnMinimizeAll.Click += new System.EventHandler(this.btnMinimizeAll_Click); + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.ColumnCount = 2; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 120F)); + this.tableLayoutPanel1.Controls.Add(this.panel2, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.dgvManagedItems, 0, 0); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 31); + this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 1; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(689, 382); + this.tableLayoutPanel1.TabIndex = 85; + // + // panel2 + // + this.panel2.BackColor = System.Drawing.SystemColors.ControlLightLight; + this.panel2.Controls.Add(this.btnStartSel); + this.panel2.Controls.Add(this.btnMoreTOut); + this.panel2.Controls.Add(this.txtTOutAutoCheck); + this.panel2.Controls.Add(this.chkAutoRestart); + this.panel2.Controls.Add(this.btnOpenAll); + this.panel2.Controls.Add(this.btnRestartAll); + this.panel2.Controls.Add(this.btnCloseAll); + this.panel2.Controls.Add(this.btnClose); + this.panel2.Controls.Add(this.btnMinimizeAll); + this.panel2.Controls.Add(this.btnMaximixeAll); + this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel2.Location = new System.Drawing.Point(571, 2); + this.panel2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(116, 378); + this.panel2.TabIndex = 85; + // + // btnStartSel + // + this.btnStartSel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnStartSel.BackColor = System.Drawing.Color.Green; + this.btnStartSel.ForeColor = System.Drawing.Color.Yellow; + this.btnStartSel.Location = new System.Drawing.Point(9, 159); + this.btnStartSel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnStartSel.Name = "btnStartSel"; + this.btnStartSel.Size = new System.Drawing.Size(96, 26); + this.btnStartSel.TabIndex = 88; + this.btnStartSel.Text = "Start SEL"; + this.btnStartSel.UseVisualStyleBackColor = false; + this.btnStartSel.Click += new System.EventHandler(this.btnStartSel_Click); + // + // btnMoreTOut + // + this.btnMoreTOut.Location = new System.Drawing.Point(81, 306); + this.btnMoreTOut.Name = "btnMoreTOut"; + this.btnMoreTOut.Size = new System.Drawing.Size(25, 23); + this.btnMoreTOut.TabIndex = 87; + this.btnMoreTOut.Text = "+"; + this.btnMoreTOut.UseVisualStyleBackColor = true; + this.btnMoreTOut.Visible = false; + this.btnMoreTOut.Click += new System.EventHandler(this.btnMoreTOut_Click); + // + // txtTOutAutoCheck + // + this.txtTOutAutoCheck.Location = new System.Drawing.Point(11, 306); + this.txtTOutAutoCheck.Name = "txtTOutAutoCheck"; + this.txtTOutAutoCheck.Size = new System.Drawing.Size(64, 20); + this.txtTOutAutoCheck.TabIndex = 86; + this.txtTOutAutoCheck.Visible = false; + this.txtTOutAutoCheck.TextChanged += new System.EventHandler(this.txtTOutAutoCheck_TextChanged); + // + // chkAutoRestart + // + this.chkAutoRestart.AutoSize = true; + this.chkAutoRestart.Checked = true; + this.chkAutoRestart.CheckState = System.Windows.Forms.CheckState.Checked; + this.chkAutoRestart.Location = new System.Drawing.Point(11, 275); + this.chkAutoRestart.Name = "chkAutoRestart"; + this.chkAutoRestart.Size = new System.Drawing.Size(85, 17); + this.chkAutoRestart.TabIndex = 85; + this.chkAutoRestart.Text = "Auto Restart"; + this.chkAutoRestart.UseVisualStyleBackColor = true; + this.chkAutoRestart.CheckedChanged += new System.EventHandler(this.chkAutoRestart_CheckedChanged); + // + // btnOpenAll + // + this.btnOpenAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnOpenAll.BackColor = System.Drawing.SystemColors.ButtonFace; + this.btnOpenAll.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; + this.btnOpenAll.Location = new System.Drawing.Point(10, 12); + this.btnOpenAll.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnOpenAll.Name = "btnOpenAll"; + this.btnOpenAll.Size = new System.Drawing.Size(96, 26); + this.btnOpenAll.TabIndex = 84; + this.btnOpenAll.Text = "Open ALL"; + this.btnOpenAll.UseVisualStyleBackColor = false; + this.btnOpenAll.Click += new System.EventHandler(this.btnOpenAll_Click); + // + // btnRestartAll + // + this.btnRestartAll.BackColor = System.Drawing.SystemColors.ControlDarkDark; + this.btnRestartAll.ForeColor = System.Drawing.SystemColors.ControlLightLight; + this.btnRestartAll.Location = new System.Drawing.Point(11, 244); + this.btnRestartAll.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnRestartAll.Name = "btnRestartAll"; + this.btnRestartAll.Size = new System.Drawing.Size(96, 26); + this.btnRestartAll.TabIndex = 83; + this.btnRestartAll.Text = "Restart ALL"; + this.btnRestartAll.UseVisualStyleBackColor = false; + this.btnRestartAll.Click += new System.EventHandler(this.btnRestartAll_Click); + // + // btnCloseAll + // + this.btnCloseAll.BackColor = System.Drawing.SystemColors.ControlDarkDark; + this.btnCloseAll.ForeColor = System.Drawing.SystemColors.ControlLightLight; + this.btnCloseAll.Location = new System.Drawing.Point(11, 214); + this.btnCloseAll.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnCloseAll.Name = "btnCloseAll"; + this.btnCloseAll.Size = new System.Drawing.Size(96, 26); + this.btnCloseAll.TabIndex = 82; + this.btnCloseAll.Text = "Close ALL"; + this.btnCloseAll.UseVisualStyleBackColor = false; + this.btnCloseAll.Click += new System.EventHandler(this.btnCloseAll_Click); + // + // dgvManagedItems + // + this.dgvManagedItems.AllowUserToAddRows = false; + this.dgvManagedItems.AllowUserToDeleteRows = false; + this.dgvManagedItems.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.dgvManagedItems.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; - this.dgvManagedItems.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dgvManagedItems.Location = new System.Drawing.Point(4, 4); - this.dgvManagedItems.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.dgvManagedItems.Name = "dgvManagedItems"; - this.dgvManagedItems.ReadOnly = true; - this.dgvManagedItems.RowHeadersWidth = 51; - this.dgvManagedItems.Size = new System.Drawing.Size(751, 463); - this.dgvManagedItems.TabIndex = 76; - this.dgvManagedItems.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvManagedItems_CellDoubleClick); - this.dgvManagedItems.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dgvManagedItems_CellFormatting); - // - // UI_Timer - // - this.UI_Timer.Tick += new System.EventHandler(this.UI_Timer_Tick); - // - // forceCheckTimer - // - this.forceCheckTimer.Interval = 5000; - this.forceCheckTimer.Tick += new System.EventHandler(this.forceCheckTimer_Tick); - // - // IOBManPanel - // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.ControlLight; - this.ClientSize = new System.Drawing.Size(919, 535); - this.Controls.Add(this.tableLayoutPanel1); - this.Controls.Add(this.panel1); - this.Controls.Add(this.statusStrip1); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.IsMdiContainer = true; - this.MainMenuStrip = this.menuStrip1; - this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.Name = "IOBManPanel"; - this.Text = "IOB MANAGER"; - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.IOBManPanel_FormClosing); - this.statusStrip1.ResumeLayout(false); - this.statusStrip1.PerformLayout(); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); - this.menuStrip1.ResumeLayout(false); - this.menuStrip1.PerformLayout(); - this.tableLayoutPanel1.ResumeLayout(false); - this.panel2.ResumeLayout(false); - this.panel2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dgvManagedItems)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); + this.dgvManagedItems.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; + this.dgvManagedItems.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvManagedItems.Location = new System.Drawing.Point(3, 3); + this.dgvManagedItems.Name = "dgvManagedItems"; + this.dgvManagedItems.ReadOnly = true; + this.dgvManagedItems.RowHeadersWidth = 51; + this.dgvManagedItems.Size = new System.Drawing.Size(563, 376); + this.dgvManagedItems.TabIndex = 76; + this.dgvManagedItems.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvManagedItems_CellDoubleClick); + this.dgvManagedItems.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dgvManagedItems_CellFormatting); + // + // UI_Timer + // + this.UI_Timer.Tick += new System.EventHandler(this.UI_Timer_Tick); + // + // forceCheckTimer + // + this.forceCheckTimer.Interval = 5000; + this.forceCheckTimer.Tick += new System.EventHandler(this.forceCheckTimer_Tick); + // + // IOBManPanel + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.ControlLight; + this.ClientSize = new System.Drawing.Size(689, 435); + this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.panel1); + this.Controls.Add(this.statusStrip1); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.IsMdiContainer = true; + this.MainMenuStrip = this.menuStrip1; + this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.Name = "IOBManPanel"; + this.Text = "IOB MANAGER"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.IOBManPanel_FormClosing); + this.statusStrip1.ResumeLayout(false); + this.statusStrip1.PerformLayout(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); + this.tableLayoutPanel1.ResumeLayout(false); + this.panel2.ResumeLayout(false); + this.panel2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dgvManagedItems)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/IOB-MAN/IOBManPanel.cs b/IOB-MAN/IOBManPanel.cs index 1e4ae770..951c9811 100644 --- a/IOB-MAN/IOBManPanel.cs +++ b/IOB-MAN/IOBManPanel.cs @@ -583,6 +583,7 @@ namespace IOB_MAN /// Chiude item richiesto private void closeSingleChild(iobAdapt item) { + utils.lgInfo($"Chiusura processo | IOB: {item.CodIOB} | pid: {item.pID}"); // rimuovo item ElencoIOB.Remove(item); try @@ -832,7 +833,7 @@ namespace IOB_MAN private void IOBManPanel_FormClosing(object sender, FormClosingEventArgs e) { closeAllChild(true); - Thread.Sleep(500); + Thread.Sleep(250); closeAllChild(true); closeTimers(); } @@ -907,7 +908,7 @@ namespace IOB_MAN { // per iscurezza chiudo tutto closeAllChild(true); - Thread.Sleep(1000); + Thread.Sleep(500); // lettura conf file... loadConfig(); // apertura @@ -978,19 +979,20 @@ namespace IOB_MAN { // verifico se ci siano processi (da ARGS LIST) NON running --> li riavvio! Dictionary proc2restart = new Dictionary(); - Dictionary proc2close = new Dictionary(); int indice = 0; foreach (iobAdapt item in ElencoIOB.List) { - // se NON comunica da troppo (ultima comunicazione è > 5 minuti fa...) - if (!item.plcOk) - { - proc2close.Add(indice, item); - } // se NON E' running if (!item.isRunning) { // segno da eliminare e riavviare + utils.lgInfo($"Processo non in running | IOB: {item.CodIOB} | pid: {item.pID}"); + proc2restart.Add(indice, item); + } + // se NON comunica da troppo (ultima comunicazione è > 5 minuti fa...) + else if (!item.plcOk) + { + utils.lgInfo($"Processo non in PLC-Online | IOB: {item.CodIOB} | pid: {item.pID}"); proc2restart.Add(indice, item); } indice++; @@ -999,34 +1001,23 @@ namespace IOB_MAN // SE abilitato autorestart... if (chkAutoRestart.Checked) { - // in primis processo quelli che non comunicano e mi limito a chiuderli... - foreach (var item in proc2close) + // se ci sono processi da riavviare... + if (proc2restart.Count > 0) { - ElencoIOB.Remove(item); - utils.lgInfo($"Chiusura processo non in PLC-Online | IOB: {item.Value.CodIOB} | pid: {item.Value.pID}"); - // chiudo! - closeSingleChild(item.Value); + foreach (var item in proc2restart) + { + ElencoIOB.Remove(item); + // chiudo! + closeSingleChild(item.Value); + } + foreach (var item in proc2restart) + { + // riavvio! + startChildProc(item.Value.CodIOB, item.Key); + } + // update! + updateStatus(); } - foreach (var item in proc2close) - { - // riavvio! - startChildProc(item.Value.CodIOB, item.Key); - } - - // se ho da riavviare... elimino! - foreach (var dictVal in proc2restart) - { - ElencoIOB.Remove(dictVal.Value); - utils.lgInfo($"Chiusura processo non in running | IOB: {dictVal.Value.CodIOB} | pid: {dictVal.Value.pID}"); - } - // li faccio ripartire! - foreach (var item in proc2restart) - { - startChildProc(item.Value.CodIOB, item.Key); - } - - // update! - updateStatus(); } else { @@ -1047,7 +1038,7 @@ namespace IOB_MAN utils.lgInfo("Call reloadConfAndRestart: start full reload"); // per sicurezza chiudo tutto closeAllChild(true); - Thread.Sleep(1000); + Thread.Sleep(500); updateStatus(); // rileggo conf loadConfig(); @@ -1128,7 +1119,7 @@ namespace IOB_MAN { // chiude tutte closeAllChild(true); - Thread.Sleep(1000); + Thread.Sleep(500); updateStatus(); // apre solo 1 con conf "fake" x condurre update... apriOneUpdate(); @@ -1138,7 +1129,7 @@ namespace IOB_MAN { // chiude tutte closeAllChild(true); - Thread.Sleep(1000); + Thread.Sleep(500); updateStatus(); // apre solo 1 con conf "fake" x condurre update... apriOneUpdate(); diff --git a/IOB-MAN/IOBManPanel.resx b/IOB-MAN/IOBManPanel.resx index 8b5ba7a2..c22d7ef0 100644 --- a/IOB-MAN/IOBManPanel.resx +++ b/IOB-MAN/IOBManPanel.resx @@ -126,9 +126,6 @@ 420, 17 - - 420, 17 - 535, 17 diff --git a/IOB-MAN/Program.cs b/IOB-MAN/Program.cs index db962fc0..c8b8702d 100644 --- a/IOB-MAN/Program.cs +++ b/IOB-MAN/Program.cs @@ -6,17 +6,21 @@ using System.Windows.Forms; namespace IOB_MAN { - static class Program + internal static class Program { + #region Private Methods + /// /// The main entry point for the application. /// [STAThread] - static void Main() + private static void Main() { Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); Application.Run(new IOBManPanel()); } + + #endregion Private Methods } -} +} \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index a010cd62..af5ff313 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=758']) { + withEnv(['NEXT_BUILD_NUMBER=759']) { // env.versionNumber = VersionNumber(versionNumberString : '3.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '3.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN'