This commit is contained in:
2011-04-08 13:15:41 +00:00
parent 2d16db5bf2
commit 76dd59be14
9 changed files with 495 additions and 441 deletions

View File

@@ -77,13 +77,13 @@ namespace VEPROMS
this.tv = new Volian.Controls.Library.vlnTreeView();
this.infoPanel = new DevComponents.DotNetBar.ExpandablePanel();
this.infoTabs = new DevComponents.DotNetBar.TabControl();
this.infotabControlPanelTransitions = new DevComponents.DotNetBar.TabControlPanel();
this.displayTransition = new Volian.Controls.Library.DisplayTransition();
this.infotabTransition = new DevComponents.DotNetBar.TabItem(this.components);
this.infotabControlPanelTags = new DevComponents.DotNetBar.TabControlPanel();
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
this.displayTags = new Volian.Controls.Library.DisplayTags();
this.infotabTags = new DevComponents.DotNetBar.TabItem(this.components);
this.infotabControlPanelTransitions = new DevComponents.DotNetBar.TabControlPanel();
this.displayTransition = new Volian.Controls.Library.DisplayTransition();
this.infotabTransition = new DevComponents.DotNetBar.TabItem(this.components);
this.infotabControlPanelRO = new DevComponents.DotNetBar.TabControlPanel();
this.displayRO = new Volian.Controls.Library.DisplayRO();
this.infotabRO = new DevComponents.DotNetBar.TabItem(this.components);
@@ -117,9 +117,9 @@ namespace VEPROMS
this.infoPanel.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.infoTabs)).BeginInit();
this.infoTabs.SuspendLayout();
this.infotabControlPanelTransitions.SuspendLayout();
this.infotabControlPanelTags.SuspendLayout();
this.panelEx1.SuspendLayout();
this.infotabControlPanelTransitions.SuspendLayout();
this.infotabControlPanelRO.SuspendLayout();
this.toolsPanel.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.toolsTabs)).BeginInit();
@@ -438,7 +438,7 @@ namespace VEPROMS
this.lblItemID,
this.lblResolution,
this.btnEditItem});
this.bottomBar.Location = new System.Drawing.Point(5, 624);
this.bottomBar.Location = new System.Drawing.Point(5, 622);
this.bottomBar.Name = "bottomBar";
this.bottomBar.Size = new System.Drawing.Size(1185, 29);
this.bottomBar.Stretch = true;
@@ -547,7 +547,7 @@ namespace VEPROMS
this.epAnnotations.Expanded = false;
this.epAnnotations.ExpandedBounds = new System.Drawing.Rectangle(4, 544, 1187, 202);
this.epAnnotations.ExpandOnTitleClick = true;
this.epAnnotations.Location = new System.Drawing.Point(5, 598);
this.epAnnotations.Location = new System.Drawing.Point(5, 596);
this.epAnnotations.Name = "epAnnotations";
this.epAnnotations.Size = new System.Drawing.Size(1185, 26);
this.epAnnotations.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -617,7 +617,7 @@ namespace VEPROMS
this.epProcedures.ExpandOnTitleClick = true;
this.epProcedures.Location = new System.Drawing.Point(5, 57);
this.epProcedures.Name = "epProcedures";
this.epProcedures.Size = new System.Drawing.Size(30, 541);
this.epProcedures.Size = new System.Drawing.Size(30, 539);
this.epProcedures.Style.Alignment = System.Drawing.StringAlignment.Center;
this.epProcedures.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.epProcedures.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@@ -663,7 +663,7 @@ namespace VEPROMS
this.infoPanel.ExpandOnTitleClick = true;
this.infoPanel.Location = new System.Drawing.Point(927, 57);
this.infoPanel.Name = "infoPanel";
this.infoPanel.Size = new System.Drawing.Size(230, 541);
this.infoPanel.Size = new System.Drawing.Size(230, 539);
this.infoPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
this.infoPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.infoPanel.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@@ -689,15 +689,15 @@ namespace VEPROMS
//
this.infoTabs.BackColor = System.Drawing.Color.Transparent;
this.infoTabs.CanReorderTabs = true;
this.infoTabs.Controls.Add(this.infotabControlPanelTransitions);
this.infoTabs.Controls.Add(this.infotabControlPanelTags);
this.infoTabs.Controls.Add(this.infotabControlPanelTransitions);
this.infoTabs.Controls.Add(this.infotabControlPanelRO);
this.infoTabs.Dock = System.Windows.Forms.DockStyle.Fill;
this.infoTabs.Location = new System.Drawing.Point(0, 26);
this.infoTabs.Name = "infoTabs";
this.infoTabs.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold);
this.infoTabs.SelectedTabIndex = 0;
this.infoTabs.Size = new System.Drawing.Size(230, 515);
this.infoTabs.Size = new System.Drawing.Size(230, 513);
this.infoTabs.TabAlignment = DevComponents.DotNetBar.eTabStripAlignment.Right;
this.infoTabs.TabIndex = 1;
this.infoTabs.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox;
@@ -708,6 +708,46 @@ namespace VEPROMS
this.infoTabs.ThemeAware = true;
this.infoTabs.Visible = false;
//
// infotabControlPanelTransitions
//
this.infotabControlPanelTransitions.Controls.Add(this.displayTransition);
this.infotabControlPanelTransitions.Dock = System.Windows.Forms.DockStyle.Fill;
this.infotabControlPanelTransitions.Location = new System.Drawing.Point(0, 0);
this.infotabControlPanelTransitions.Name = "infotabControlPanelTransitions";
this.infotabControlPanelTransitions.Padding = new System.Windows.Forms.Padding(1);
this.infotabControlPanelTransitions.Size = new System.Drawing.Size(203, 513);
this.infotabControlPanelTransitions.Style.BackColor1.Color = System.Drawing.SystemColors.Control;
this.infotabControlPanelTransitions.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.infotabControlPanelTransitions.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top)
| DevComponents.DotNetBar.eBorderSide.Bottom)));
this.infotabControlPanelTransitions.Style.GradientAngle = 180;
this.infotabControlPanelTransitions.TabIndex = 5;
this.infotabControlPanelTransitions.TabItem = this.infotabTransition;
this.infotabControlPanelTransitions.ThemeAware = true;
this.infotabControlPanelTransitions.Click += new System.EventHandler(this.infotabTransition_Click);
//
// displayTransition
//
this.displayTransition.AutoSize = true;
this.displayTransition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.displayTransition.CurTrans = null;
this.displayTransition.Dock = System.Windows.Forms.DockStyle.Fill;
this.displayTransition.Location = new System.Drawing.Point(1, 1);
this.displayTransition.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.displayTransition.MyRTB = null;
this.displayTransition.Name = "displayTransition";
this.displayTransition.RangeColor = System.Drawing.Color.LightGray;
this.displayTransition.Size = new System.Drawing.Size(201, 511);
this.displayTransition.TabIndex = 0;
//
// infotabTransition
//
this.infotabTransition.AttachedControl = this.infotabControlPanelTransitions;
this.infotabTransition.Name = "infotabTransition";
this.infotabTransition.Text = "Transition";
this.infotabTransition.Visible = false;
this.infotabTransition.Click += new System.EventHandler(this.infotabTransition_Click);
//
// infotabControlPanelTags
//
this.infotabControlPanelTags.Controls.Add(this.panelEx1);
@@ -715,7 +755,7 @@ namespace VEPROMS
this.infotabControlPanelTags.Location = new System.Drawing.Point(0, 0);
this.infotabControlPanelTags.Name = "infotabControlPanelTags";
this.infotabControlPanelTags.Padding = new System.Windows.Forms.Padding(1);
this.infotabControlPanelTags.Size = new System.Drawing.Size(203, 515);
this.infotabControlPanelTags.Size = new System.Drawing.Size(203, 513);
this.infotabControlPanelTags.Style.BackColor1.Color = System.Drawing.SystemColors.Control;
this.infotabControlPanelTags.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.infotabControlPanelTags.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top)
@@ -733,7 +773,7 @@ namespace VEPROMS
this.panelEx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelEx1.Location = new System.Drawing.Point(1, 1);
this.panelEx1.Name = "panelEx1";
this.panelEx1.Size = new System.Drawing.Size(201, 513);
this.panelEx1.Size = new System.Drawing.Size(201, 511);
this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center;
this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.Transparent;
this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.SlateGray;
@@ -765,46 +805,6 @@ namespace VEPROMS
this.infotabTags.Visible = false;
this.infotabTags.Click += new System.EventHandler(this.infotabTags_Click);
//
// infotabControlPanelTransitions
//
this.infotabControlPanelTransitions.Controls.Add(this.displayTransition);
this.infotabControlPanelTransitions.Dock = System.Windows.Forms.DockStyle.Fill;
this.infotabControlPanelTransitions.Location = new System.Drawing.Point(0, 0);
this.infotabControlPanelTransitions.Name = "infotabControlPanelTransitions";
this.infotabControlPanelTransitions.Padding = new System.Windows.Forms.Padding(1);
this.infotabControlPanelTransitions.Size = new System.Drawing.Size(203, 515);
this.infotabControlPanelTransitions.Style.BackColor1.Color = System.Drawing.SystemColors.Control;
this.infotabControlPanelTransitions.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.infotabControlPanelTransitions.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top)
| DevComponents.DotNetBar.eBorderSide.Bottom)));
this.infotabControlPanelTransitions.Style.GradientAngle = 180;
this.infotabControlPanelTransitions.TabIndex = 5;
this.infotabControlPanelTransitions.TabItem = this.infotabTransition;
this.infotabControlPanelTransitions.ThemeAware = true;
this.infotabControlPanelTransitions.Click += new System.EventHandler(this.infotabTransition_Click);
//
// displayTransition
//
this.displayTransition.AutoSize = true;
this.displayTransition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.displayTransition.CurTrans = null;
this.displayTransition.Dock = System.Windows.Forms.DockStyle.Fill;
this.displayTransition.Location = new System.Drawing.Point(1, 1);
this.displayTransition.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.displayTransition.MyRTB = null;
this.displayTransition.Name = "displayTransition";
this.displayTransition.RangeColor = System.Drawing.Color.LightGray;
this.displayTransition.Size = new System.Drawing.Size(201, 513);
this.displayTransition.TabIndex = 0;
//
// infotabTransition
//
this.infotabTransition.AttachedControl = this.infotabControlPanelTransitions;
this.infotabTransition.Name = "infotabTransition";
this.infotabTransition.Text = "Transition";
this.infotabTransition.Visible = false;
this.infotabTransition.Click += new System.EventHandler(this.infotabTransition_Click);
//
// infotabControlPanelRO
//
this.infotabControlPanelRO.Controls.Add(this.displayRO);
@@ -812,7 +812,7 @@ namespace VEPROMS
this.infotabControlPanelRO.Location = new System.Drawing.Point(0, 0);
this.infotabControlPanelRO.Name = "infotabControlPanelRO";
this.infotabControlPanelRO.Padding = new System.Windows.Forms.Padding(1);
this.infotabControlPanelRO.Size = new System.Drawing.Size(203, 515);
this.infotabControlPanelRO.Size = new System.Drawing.Size(203, 513);
this.infotabControlPanelRO.Style.BackColor1.Color = System.Drawing.SystemColors.Control;
this.infotabControlPanelRO.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.infotabControlPanelRO.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top)
@@ -833,7 +833,8 @@ namespace VEPROMS
this.displayRO.MyRTB = null;
this.displayRO.Name = "displayRO";
this.displayRO.ProgressBar = null;
this.displayRO.Size = new System.Drawing.Size(201, 513);
this.displayRO.ROTypeFilter = VEPROMS.CSLA.Library.E_ROValueType.All;
this.displayRO.Size = new System.Drawing.Size(201, 511);
this.displayRO.TabControl = null;
this.displayRO.TabIndex = 0;
//
@@ -888,7 +889,7 @@ namespace VEPROMS
this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
this.expandableSplitter1.Location = new System.Drawing.Point(35, 57);
this.expandableSplitter1.Name = "expandableSplitter1";
this.expandableSplitter1.Size = new System.Drawing.Size(3, 541);
this.expandableSplitter1.Size = new System.Drawing.Size(3, 539);
this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007;
this.expandableSplitter1.TabIndex = 5;
this.expandableSplitter1.TabStop = false;
@@ -920,7 +921,7 @@ namespace VEPROMS
this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(205)))), ((int)(((byte)(208)))), ((int)(((byte)(213)))));
this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
this.expandableSplitter2.Location = new System.Drawing.Point(38, 595);
this.expandableSplitter2.Location = new System.Drawing.Point(38, 593);
this.expandableSplitter2.Name = "expandableSplitter2";
this.expandableSplitter2.Size = new System.Drawing.Size(889, 3);
this.expandableSplitter2.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007;
@@ -956,7 +957,7 @@ namespace VEPROMS
this.expandableSplitter3.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
this.expandableSplitter3.Location = new System.Drawing.Point(924, 57);
this.expandableSplitter3.Name = "expandableSplitter3";
this.expandableSplitter3.Size = new System.Drawing.Size(3, 538);
this.expandableSplitter3.Size = new System.Drawing.Size(3, 536);
this.expandableSplitter3.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007;
this.expandableSplitter3.TabIndex = 7;
this.expandableSplitter3.TabStop = false;
@@ -982,7 +983,7 @@ namespace VEPROMS
this.toolsPanel.ExpandOnTitleClick = true;
this.toolsPanel.Location = new System.Drawing.Point(1160, 57);
this.toolsPanel.Name = "toolsPanel";
this.toolsPanel.Size = new System.Drawing.Size(30, 541);
this.toolsPanel.Size = new System.Drawing.Size(30, 539);
this.toolsPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
this.toolsPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.toolsPanel.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@@ -1184,7 +1185,7 @@ namespace VEPROMS
this.expandableSplitter4.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
this.expandableSplitter4.Location = new System.Drawing.Point(1157, 57);
this.expandableSplitter4.Name = "expandableSplitter4";
this.expandableSplitter4.Size = new System.Drawing.Size(3, 541);
this.expandableSplitter4.Size = new System.Drawing.Size(3, 539);
this.expandableSplitter4.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007;
this.expandableSplitter4.TabIndex = 3;
this.expandableSplitter4.TabStop = false;
@@ -1210,7 +1211,7 @@ namespace VEPROMS
this.tc.Name = "tc";
this.tc.RibbonExpanded = true;
this.tc.SelectedDisplayTabItem = null;
this.tc.Size = new System.Drawing.Size(886, 538);
this.tc.Size = new System.Drawing.Size(886, 536);
this.tc.TabIndex = 8;
this.tc.PanelTabDisplay += new Volian.Controls.Library.StepPanelTabDisplayEvent(this.tc_PanelTabDisplay);
this.tc.WordSectionClose += new Volian.Controls.Library.StepPanelWordSectionCloseEvent(this.tc_WordSectionClose);
@@ -1225,7 +1226,7 @@ namespace VEPROMS
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScroll = true;
this.ClientSize = new System.Drawing.Size(1195, 655);
this.ClientSize = new System.Drawing.Size(1195, 653);
this.Controls.Add(this.tc);
this.Controls.Add(this.expandableSplitter3);
this.Controls.Add(this.expandableSplitter2);
@@ -1250,10 +1251,10 @@ namespace VEPROMS
this.infoPanel.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.infoTabs)).EndInit();
this.infoTabs.ResumeLayout(false);
this.infotabControlPanelTags.ResumeLayout(false);
this.panelEx1.ResumeLayout(false);
this.infotabControlPanelTransitions.ResumeLayout(false);
this.infotabControlPanelTransitions.PerformLayout();
this.infotabControlPanelTags.ResumeLayout(false);
this.panelEx1.ResumeLayout(false);
this.infotabControlPanelRO.ResumeLayout(false);
this.toolsPanel.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.toolsTabs)).EndInit();

View File

@@ -273,6 +273,7 @@ namespace VEPROMS
//displayRO.EnabledChanged += new EventHandler(displayRO_EnabledChanged);
tc.Enter += new EventHandler(tc_Enter);
tc.Leave += new EventHandler(tc_Leave);
tc.ToggleRibbonExpanded += new DisplayTabControlEvent(tc_ToggleRibbonExpanded);
this.Deactivate += new EventHandler(frmVEPROMS_Deactivate);
if (VlnSettings.DemoMode) StepRTB.MyFontFamily = GetFamily("Bookman Old Style");
}
@@ -282,6 +283,12 @@ namespace VEPROMS
if (ff.Name == name) return ff;
return null;
}
void tc_ToggleRibbonExpanded(object sender, EventArgs args)
{
Volian.Base.Library.vlnStackTrace.ShowStackLocal("tc_ToggleRibbonExpanded {0}", ribbonControl1.Expanded);
ribbonControl1.Expanded = !ribbonControl1.Expanded;
}
void frmVEPROMS_Deactivate(object sender, EventArgs e)
{
tc.HideCaret(); // Hide the pseudo caret