From ba03e2b9b9579d4a0750b8eaa9946774f556f545 Mon Sep 17 00:00:00 2001 From: Kathy Date: Mon, 8 Nov 2010 14:44:59 +0000 Subject: [PATCH] --- .../DisplayRO.Designer.cs | 81 ++++++++++++++----- PROMS/Volian.Controls.Library/DisplayRO.cs | 31 ++++++- 2 files changed, 88 insertions(+), 24 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplayRO.Designer.cs b/PROMS/Volian.Controls.Library/DisplayRO.Designer.cs index 41e0282a..7233d0c6 100644 --- a/PROMS/Volian.Controls.Library/DisplayRO.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplayRO.Designer.cs @@ -34,6 +34,7 @@ namespace Volian.Controls.Library this.lbROId = new DevComponents.DotNetBar.LabelX(); this.lblROID = new DevComponents.DotNetBar.LabelX(); this.pnlROButtons = new System.Windows.Forms.Panel(); + this.btnGoToRO = new DevComponents.DotNetBar.ButtonX(); this.btnPreviewRO = new DevComponents.DotNetBar.ButtonX(); this.btnCancelRO = new DevComponents.DotNetBar.ButtonX(); this.btnSaveRO = new DevComponents.DotNetBar.ButtonX(); @@ -51,12 +52,13 @@ namespace Volian.Controls.Library // this.tvROFST.Dock = System.Windows.Forms.DockStyle.Fill; this.tvROFST.HideSelection = false; - this.tvROFST.Location = new System.Drawing.Point(0, 286); - this.tvROFST.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tvROFST.Location = new System.Drawing.Point(0, 180); + this.tvROFST.Margin = new System.Windows.Forms.Padding(4); this.tvROFST.Name = "tvROFST"; - this.tvROFST.Size = new System.Drawing.Size(311, 338); + this.tvROFST.Size = new System.Drawing.Size(311, 444); this.tvROFST.TabIndex = 5; this.tvROFST.BeforeExpand += new System.Windows.Forms.TreeViewCancelEventHandler(this.tvROFST_BeforeExpand); + this.tvROFST.DoubleClick += new System.EventHandler(this.tvROFST_DoubleClick); this.tvROFST.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvROFST_AfterSelect); // // panelValue @@ -67,19 +69,24 @@ namespace Volian.Controls.Library this.panelValue.Controls.Add(this.panelRoValue); this.panelValue.Dock = System.Windows.Forms.DockStyle.Top; this.panelValue.Location = new System.Drawing.Point(0, 0); - this.panelValue.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panelValue.Margin = new System.Windows.Forms.Padding(4); this.panelValue.Name = "panelValue"; - this.panelValue.Size = new System.Drawing.Size(311, 122); + this.panelValue.Size = new System.Drawing.Size(311, 180); this.panelValue.TabIndex = 7; // // lbROId // + // + // + // + this.lbROId.BackgroundStyle.Class = ""; + this.lbROId.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lbROId.Dock = System.Windows.Forms.DockStyle.Left; this.lbROId.ForeColor = System.Drawing.SystemColors.Highlight; this.lbROId.Location = new System.Drawing.Point(61, 27); this.lbROId.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.lbROId.Name = "lbROId"; - this.lbROId.Size = new System.Drawing.Size(244, 29); + this.lbROId.Size = new System.Drawing.Size(244, 64); this.superTooltip1.SetSuperTooltip(this.lbROId, new DevComponents.DotNetBar.SuperTooltipInfo("RO ID", "", "The RO ID for the selected RO Value will be displayed here. Double-Click to open" + " the RO Editor.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(150, 80))); this.lbROId.TabIndex = 11; @@ -87,11 +94,16 @@ namespace Volian.Controls.Library // // lblROID // + // + // + // + this.lblROID.BackgroundStyle.Class = ""; + this.lblROID.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblROID.Dock = System.Windows.Forms.DockStyle.Left; this.lblROID.Location = new System.Drawing.Point(0, 27); this.lblROID.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.lblROID.Name = "lblROID"; - this.lblROID.Size = new System.Drawing.Size(61, 29); + this.lblROID.Size = new System.Drawing.Size(61, 64); this.superTooltip1.SetSuperTooltip(this.lblROID, new DevComponents.DotNetBar.SuperTooltipInfo("RO ID", "", "The RO ID for the selected RO Value will be displayed here.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(150, 80))); this.lblROID.TabIndex = 10; this.lblROID.Text = "RO ID:"; @@ -99,26 +111,43 @@ namespace Volian.Controls.Library // // pnlROButtons // + this.pnlROButtons.Controls.Add(this.btnGoToRO); this.pnlROButtons.Controls.Add(this.btnPreviewRO); this.pnlROButtons.Controls.Add(this.btnCancelRO); this.pnlROButtons.Controls.Add(this.btnSaveRO); this.pnlROButtons.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pnlROButtons.Location = new System.Drawing.Point(0, 56); - this.pnlROButtons.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pnlROButtons.Location = new System.Drawing.Point(0, 91); + this.pnlROButtons.Margin = new System.Windows.Forms.Padding(4); this.pnlROButtons.Name = "pnlROButtons"; - this.pnlROButtons.Size = new System.Drawing.Size(311, 66); + this.pnlROButtons.Size = new System.Drawing.Size(311, 89); this.pnlROButtons.TabIndex = 9; // + // btnGoToRO + // + this.btnGoToRO.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnGoToRO.CallBasePaintBackground = true; + this.btnGoToRO.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnGoToRO.Dock = System.Windows.Forms.DockStyle.Top; + this.btnGoToRO.Enabled = false; + this.btnGoToRO.Location = new System.Drawing.Point(0, 67); + this.btnGoToRO.Name = "btnGoToRO"; + this.btnGoToRO.Size = new System.Drawing.Size(311, 22); + this.btnGoToRO.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnGoToRO.TabIndex = 11; + this.btnGoToRO.Text = "Go To"; + this.btnGoToRO.Click += new System.EventHandler(this.btnGoToRO_Click); + // // btnPreviewRO // this.btnPreviewRO.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnPreviewRO.CallBasePaintBackground = true; this.btnPreviewRO.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnPreviewRO.Dock = System.Windows.Forms.DockStyle.Top; this.btnPreviewRO.Enabled = false; this.btnPreviewRO.Location = new System.Drawing.Point(0, 45); this.btnPreviewRO.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnPreviewRO.Name = "btnPreviewRO"; - this.btnPreviewRO.Size = new System.Drawing.Size(311, 23); + this.btnPreviewRO.Size = new System.Drawing.Size(311, 22); this.superTooltip1.SetSuperTooltip(this.btnPreviewRO, new DevComponents.DotNetBar.SuperTooltipInfo("Preview", "", "This will Preview the selected RO Table, X/Y Plot, or Image.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(150, 80))); this.btnPreviewRO.TabIndex = 10; this.btnPreviewRO.Text = "Preview"; @@ -127,11 +156,12 @@ namespace Volian.Controls.Library // btnCancelRO // this.btnCancelRO.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCancelRO.CallBasePaintBackground = true; this.btnCancelRO.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnCancelRO.Dock = System.Windows.Forms.DockStyle.Top; this.btnCancelRO.Enabled = false; this.btnCancelRO.Location = new System.Drawing.Point(0, 22); - this.btnCancelRO.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnCancelRO.Margin = new System.Windows.Forms.Padding(4); this.btnCancelRO.Name = "btnCancelRO"; this.btnCancelRO.Size = new System.Drawing.Size(311, 23); this.superTooltip1.SetSuperTooltip(this.btnCancelRO, new DevComponents.DotNetBar.SuperTooltipInfo("Cancel", "", "This become active when you about to replace an existing RO link in you procedure" + @@ -143,11 +173,12 @@ namespace Volian.Controls.Library // btnSaveRO // this.btnSaveRO.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnSaveRO.CallBasePaintBackground = true; this.btnSaveRO.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnSaveRO.Dock = System.Windows.Forms.DockStyle.Top; this.btnSaveRO.Enabled = false; this.btnSaveRO.Location = new System.Drawing.Point(0, 0); - this.btnSaveRO.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnSaveRO.Margin = new System.Windows.Forms.Padding(4); this.btnSaveRO.Name = "btnSaveRO"; this.btnSaveRO.Size = new System.Drawing.Size(311, 22); this.superTooltip1.SetSuperTooltip(this.btnSaveRO, new DevComponents.DotNetBar.SuperTooltipInfo("Save RO", "", resources.GetString("btnSaveRO.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(340, 125))); @@ -161,7 +192,7 @@ namespace Volian.Controls.Library this.panelRoValue.Controls.Add(this.lblROValue); this.panelRoValue.Dock = System.Windows.Forms.DockStyle.Top; this.panelRoValue.Location = new System.Drawing.Point(0, 0); - this.panelRoValue.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panelRoValue.Margin = new System.Windows.Forms.Padding(4); this.panelRoValue.Name = "panelRoValue"; this.panelRoValue.Size = new System.Drawing.Size(311, 27); this.panelRoValue.TabIndex = 8; @@ -173,12 +204,13 @@ namespace Volian.Controls.Library // // this.tbROValue.Border.Class = "TextBoxBorder"; + this.tbROValue.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.tbROValue.Dock = System.Windows.Forms.DockStyle.Top; this.tbROValue.Location = new System.Drawing.Point(64, 0); - this.tbROValue.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tbROValue.Margin = new System.Windows.Forms.Padding(4); this.tbROValue.Name = "tbROValue"; this.tbROValue.ReadOnly = true; - this.tbROValue.Size = new System.Drawing.Size(247, 22); + this.tbROValue.Size = new System.Drawing.Size(247, 26); this.superTooltip1.SetSuperTooltip(this.tbROValue, new DevComponents.DotNetBar.SuperTooltipInfo("RO Value", "", "The value of selected RO will be displayed here.\r\n\r\nExceptions:\r\n- Tables, X/Y Pl" + "ots, and Images will state what they are. The Preview button will display the va" + "lue.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(230, 135))); @@ -188,10 +220,15 @@ namespace Volian.Controls.Library // // lblROValue // + // + // + // + this.lblROValue.BackgroundStyle.Class = ""; + this.lblROValue.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblROValue.Dock = System.Windows.Forms.DockStyle.Left; this.lblROValue.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblROValue.Location = new System.Drawing.Point(0, 0); - this.lblROValue.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.lblROValue.Margin = new System.Windows.Forms.Padding(4); this.lblROValue.Name = "lblROValue"; this.lblROValue.Size = new System.Drawing.Size(64, 27); this.superTooltip1.SetSuperTooltip(this.lblROValue, new DevComponents.DotNetBar.SuperTooltipInfo("RO Value", "", "The value of selected RO will be displayed here.\r\n\r\nExceptions:\r\n- Tables, X/Y Pl" + @@ -207,13 +244,12 @@ namespace Volian.Controls.Library // // lbFound // - this.lbFound.Dock = System.Windows.Forms.DockStyle.Top; this.lbFound.FormattingEnabled = true; this.lbFound.ItemHeight = 16; - this.lbFound.Location = new System.Drawing.Point(0, 122); - this.lbFound.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.lbFound.Location = new System.Drawing.Point(0, 218); + this.lbFound.Margin = new System.Windows.Forms.Padding(4); this.lbFound.Name = "lbFound"; - this.lbFound.Size = new System.Drawing.Size(311, 164); + this.lbFound.Size = new System.Drawing.Size(311, 68); this.superTooltip1.SetSuperTooltip(this.lbFound, new DevComponents.DotNetBar.SuperTooltipInfo("Available ROs", "", "ROs that are available are displayed in a tree view. ", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.lbFound.TabIndex = 8; this.lbFound.Visible = false; @@ -226,7 +262,7 @@ namespace Volian.Controls.Library this.Controls.Add(this.tvROFST); this.Controls.Add(this.lbFound); this.Controls.Add(this.panelValue); - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.Margin = new System.Windows.Forms.Padding(4); this.Name = "DisplayRO"; this.Size = new System.Drawing.Size(311, 624); this.panelValue.ResumeLayout(false); @@ -251,5 +287,6 @@ namespace Volian.Controls.Library private DevComponents.DotNetBar.LabelX lbROId; private DevComponents.DotNetBar.SuperTooltip superTooltip1; private System.Windows.Forms.ListBox lbFound; + private DevComponents.DotNetBar.ButtonX btnGoToRO; } } diff --git a/PROMS/Volian.Controls.Library/DisplayRO.cs b/PROMS/Volian.Controls.Library/DisplayRO.cs index f0695d53..a1699b8e 100644 --- a/PROMS/Volian.Controls.Library/DisplayRO.cs +++ b/PROMS/Volian.Controls.Library/DisplayRO.cs @@ -58,7 +58,7 @@ namespace Volian.Controls.Library tbROValue.Text = null; lbROId.Text = ""; tvROFST.SelectedNode = null; - btnSaveRO.Enabled = btnCancelRO.Enabled = false; + btnGoToRO.Enabled = btnSaveRO.Enabled = btnCancelRO.Enabled = false; } } } @@ -173,6 +173,7 @@ namespace Volian.Controls.Library btnCancelRO.Enabled = false; btnSaveRO.Enabled = false; btnPreviewRO.Enabled = false; + btnGoToRO.Enabled = false; if (e.Node.Tag is ROFSTLookup.rochild) { @@ -186,6 +187,7 @@ namespace Volian.Controls.Library lbROId.Text = chld.appid; btnSaveRO.Enabled = ((_SavCurROLink == null) || !(chld.roid.Substring(0, 12).ToLower().Equals(SavROLink.ROID.Substring(0, 12).ToLower()))); btnCancelRO.Enabled = ((_SavCurROLink != null) && chld.roid.Substring(0, 12).ToLower() != SavROLink.ROID.Substring(0, 12).ToLower()); + btnGoToRO.Enabled = true; switch (chld.type) { case 1: // standard (regular) text RO type @@ -508,7 +510,7 @@ namespace Volian.Controls.Library _MyRTB.Focus(); } _MyRTB.inRoAdd = false; - btnSaveRO.Enabled = btnCancelRO.Enabled = btnPreviewRO.Enabled = false; + btnGoToRO.Enabled = btnSaveRO.Enabled = btnCancelRO.Enabled = btnPreviewRO.Enabled = false; _SavCurROLink = null; CurROLink = null; } @@ -775,5 +777,30 @@ namespace Volian.Controls.Library ExpandTree(child.MyChild.roid); } } + + private void btnGoToRO_Click(object sender, EventArgs e) + { + if (tvROFST.SelectedNode == null) return; + RunRoEditor(); + } + + private void RunRoEditor() + { + string roapp = Environment.GetEnvironmentVariable("roapp"); + Object obj = tvROFST.SelectedNode.Tag; + if (obj is ROFSTLookup.rochild) + { + ROFSTLookup.rochild roch = (ROFSTLookup.rochild)obj; + _SelectedRoidBeforeRoEditor = roch.roid; + string args = "\"" + _MyROFST.MyRODb.FolderPath + "\" " + roch.roid.ToLower(); + System.Diagnostics.Process.Start(roapp, args); + } + } + + private void tvROFST_DoubleClick(object sender, EventArgs e) + { + if (tvROFST.SelectedNode == null) return; + RunRoEditor(); + } } }