diff --git a/CHANGELOG.md b/CHANGELOG.md index f7824672df..b518b2bf0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -... +### Added + +### Fixed + +### Changed +- Updated CatalogueItemUI (https://github.com/HicServices/RDMP/issues/820) ## [7.0.4] - 2021-12-08 diff --git a/Rdmp.UI/MainFormUITabs/CatalogueItemUI.Designer.cs b/Rdmp.UI/MainFormUITabs/CatalogueItemUI.Designer.cs index 5f97e29e5b..dec4187617 100644 --- a/Rdmp.UI/MainFormUITabs/CatalogueItemUI.Designer.cs +++ b/Rdmp.UI/MainFormUITabs/CatalogueItemUI.Designer.cs @@ -48,230 +48,244 @@ private void InitializeComponent() this.label36 = new System.Windows.Forms.Label(); this.ci_tbName = new System.Windows.Forms.TextBox(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.panel4 = new System.Windows.Forms.Panel(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panel1 = new System.Windows.Forms.Panel(); - this.panel3 = new System.Windows.Forms.Panel(); - this.panel2 = new System.Windows.Forms.Panel(); - this.panel11 = new System.Windows.Forms.Panel(); - this.panel10 = new System.Windows.Forms.Panel(); - this.panel9 = new System.Windows.Forms.Panel(); - this.panel8 = new System.Windows.Forms.Panel(); - this.panel7 = new System.Windows.Forms.Panel(); - this.panel6 = new System.Windows.Forms.Panel(); - this.panel5 = new System.Windows.Forms.Panel(); + this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); - this.panel4.SuspendLayout(); - this.panel3.SuspendLayout(); - this.panel2.SuspendLayout(); - this.panel11.SuspendLayout(); - this.panel10.SuspendLayout(); - this.panel9.SuspendLayout(); - this.panel8.SuspendLayout(); - this.panel7.SuspendLayout(); - this.panel6.SuspendLayout(); - this.panel5.SuspendLayout(); + this.tableLayoutPanel1.SuspendLayout(); + this.tableLayoutPanel2.SuspendLayout(); this.SuspendLayout(); // // ci_tbID // - this.ci_tbID.Dock = System.Windows.Forms.DockStyle.Fill; - this.ci_tbID.Location = new System.Drawing.Point(120, 0); - this.ci_tbID.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.ci_tbID.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.ci_tbID.Location = new System.Drawing.Point(117, 3); + this.ci_tbID.Margin = new System.Windows.Forms.Padding(4, 3, 20, 3); this.ci_tbID.Name = "ci_tbID"; this.ci_tbID.ReadOnly = true; - this.ci_tbID.Size = new System.Drawing.Size(815, 23); + this.ci_tbID.Size = new System.Drawing.Size(302, 23); this.ci_tbID.TabIndex = 137; // // label28 // - this.label28.Dock = System.Windows.Forms.DockStyle.Left; - this.label28.Location = new System.Drawing.Point(0, 0); + this.label28.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.label28.AutoSize = true; + this.label28.Location = new System.Drawing.Point(4, 7); this.label28.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(120, 23); + this.label28.Size = new System.Drawing.Size(105, 15); this.label28.TabIndex = 147; - this.label28.Text = "Catalogue Item ID"; + this.label28.Text = "Catalogue Item ID:"; + this.label28.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // label27 // - this.label27.Dock = System.Windows.Forms.DockStyle.Left; - this.label27.Location = new System.Drawing.Point(0, 0); + this.label27.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label27.AutoSize = true; + this.label27.Location = new System.Drawing.Point(15, 0); this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(120, 92); + this.label27.Size = new System.Drawing.Size(105, 30); this.label27.TabIndex = 148; - this.label27.Text = "Statistical Concept and Methodology"; + this.label27.Text = "Statistical Concept\r\nand Methodology:"; + this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // label26 // - this.label26.Dock = System.Windows.Forms.DockStyle.Left; - this.label26.Location = new System.Drawing.Point(0, 0); + this.label26.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.label26.AutoSize = true; + this.label26.Location = new System.Drawing.Point(67, 36); this.label26.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(120, 23); + this.label26.Size = new System.Drawing.Size(42, 15); this.label26.TabIndex = 149; - this.label26.Text = "Name"; + this.label26.Text = "Name:"; + this.label26.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // ci_tbComments // this.ci_tbComments.AcceptsReturn = true; - this.ci_tbComments.Dock = System.Windows.Forms.DockStyle.Fill; - this.ci_tbComments.Location = new System.Drawing.Point(120, 0); + this.ci_tbComments.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.ci_tbComments.Location = new System.Drawing.Point(128, 485); this.ci_tbComments.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.ci_tbComments.Multiline = true; this.ci_tbComments.Name = "ci_tbComments"; this.ci_tbComments.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.ci_tbComments.Size = new System.Drawing.Size(815, 196); + this.ci_tbComments.Size = new System.Drawing.Size(287, 102); this.ci_tbComments.TabIndex = 146; // // label30 // - this.label30.Dock = System.Windows.Forms.DockStyle.Left; - this.label30.Location = new System.Drawing.Point(0, 0); + this.label30.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label30.AutoSize = true; + this.label30.Location = new System.Drawing.Point(7, 106); this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(120, 92); + this.label30.Size = new System.Drawing.Size(113, 15); this.label30.TabIndex = 150; - this.label30.Text = "Research Relevance"; + this.label30.Text = "Research Relevance:"; + this.label30.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // ci_tbLimitations // this.ci_tbLimitations.AcceptsReturn = true; - this.ci_tbLimitations.Dock = System.Windows.Forms.DockStyle.Fill; - this.ci_tbLimitations.Location = new System.Drawing.Point(120, 0); + this.ci_tbLimitations.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.ci_tbLimitations.Location = new System.Drawing.Point(128, 379); this.ci_tbLimitations.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.ci_tbLimitations.Multiline = true; this.ci_tbLimitations.Name = "ci_tbLimitations"; this.ci_tbLimitations.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.ci_tbLimitations.Size = new System.Drawing.Size(815, 92); + this.ci_tbLimitations.Size = new System.Drawing.Size(287, 100); this.ci_tbLimitations.TabIndex = 145; // // label31 // - this.label31.Dock = System.Windows.Forms.DockStyle.Left; - this.label31.Location = new System.Drawing.Point(0, 0); + this.label31.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label31.AutoSize = true; + this.label31.Location = new System.Drawing.Point(39, 58); this.label31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(120, 170); + this.label31.Size = new System.Drawing.Size(70, 15); this.label31.TabIndex = 151; - this.label31.Text = "Description"; + this.label31.Text = "Description:"; + this.label31.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // ci_tbTopics // - this.ci_tbTopics.Dock = System.Windows.Forms.DockStyle.Fill; - this.ci_tbTopics.Location = new System.Drawing.Point(120, 0); + this.ci_tbTopics.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.ci_tbTopics.Location = new System.Drawing.Point(128, 215); this.ci_tbTopics.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.ci_tbTopics.Name = "ci_tbTopics"; - this.ci_tbTopics.Size = new System.Drawing.Size(815, 23); + this.ci_tbTopics.Size = new System.Drawing.Size(287, 23); this.ci_tbTopics.TabIndex = 142; // // label32 // - this.label32.Dock = System.Windows.Forms.DockStyle.Left; - this.label32.Location = new System.Drawing.Point(0, 0); + this.label32.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label32.AutoSize = true; + this.label32.Location = new System.Drawing.Point(4, 270); this.label32.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(120, 92); + this.label32.Size = new System.Drawing.Size(116, 30); this.label32.TabIndex = 152; - this.label32.Text = "Aggregation ProcessPipelineData"; + this.label32.Text = "Aggregation\r\nProcessPipelineData:"; + this.label32.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // ci_tbAggregationMethod // this.ci_tbAggregationMethod.AcceptsReturn = true; - this.ci_tbAggregationMethod.Dock = System.Windows.Forms.DockStyle.Fill; - this.ci_tbAggregationMethod.Location = new System.Drawing.Point(120, 0); + this.ci_tbAggregationMethod.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.ci_tbAggregationMethod.Location = new System.Drawing.Point(128, 273); this.ci_tbAggregationMethod.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.ci_tbAggregationMethod.Multiline = true; this.ci_tbAggregationMethod.Name = "ci_tbAggregationMethod"; this.ci_tbAggregationMethod.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.ci_tbAggregationMethod.Size = new System.Drawing.Size(815, 92); + this.ci_tbAggregationMethod.Size = new System.Drawing.Size(287, 100); this.ci_tbAggregationMethod.TabIndex = 144; // // label33 // - this.label33.Dock = System.Windows.Forms.DockStyle.Left; - this.label33.Location = new System.Drawing.Point(0, 0); + this.label33.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.label33.AutoSize = true; + this.label33.Location = new System.Drawing.Point(82, 219); this.label33.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label33.Name = "label33"; - this.label33.Size = new System.Drawing.Size(120, 23); + this.label33.Size = new System.Drawing.Size(38, 15); this.label33.TabIndex = 153; - this.label33.Text = "Topic"; + this.label33.Text = "Topic:"; + this.label33.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // label34 // - this.label34.Dock = System.Windows.Forms.DockStyle.Left; - this.label34.Location = new System.Drawing.Point(0, 0); + this.label34.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.label34.AutoSize = true; + this.label34.Location = new System.Drawing.Point(54, 248); this.label34.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(120, 23); + this.label34.Size = new System.Drawing.Size(66, 15); this.label34.TabIndex = 154; - this.label34.Text = "Periodicity"; + this.label34.Text = "Periodicity:"; + this.label34.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // ci_tbResearchRelevance // this.ci_tbResearchRelevance.AcceptsReturn = true; - this.ci_tbResearchRelevance.Dock = System.Windows.Forms.DockStyle.Fill; - this.ci_tbResearchRelevance.Location = new System.Drawing.Point(120, 0); + this.ci_tbResearchRelevance.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.ci_tbResearchRelevance.Location = new System.Drawing.Point(128, 109); this.ci_tbResearchRelevance.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.ci_tbResearchRelevance.Multiline = true; this.ci_tbResearchRelevance.Name = "ci_tbResearchRelevance"; this.ci_tbResearchRelevance.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.ci_tbResearchRelevance.Size = new System.Drawing.Size(815, 92); + this.ci_tbResearchRelevance.Size = new System.Drawing.Size(287, 100); this.ci_tbResearchRelevance.TabIndex = 141; // // ci_ddPeriodicity // - this.ci_ddPeriodicity.Dock = System.Windows.Forms.DockStyle.Fill; this.ci_ddPeriodicity.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ci_ddPeriodicity.FormattingEnabled = true; - this.ci_ddPeriodicity.Location = new System.Drawing.Point(120, 0); + this.ci_ddPeriodicity.Location = new System.Drawing.Point(128, 244); this.ci_ddPeriodicity.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.ci_ddPeriodicity.Name = "ci_ddPeriodicity"; - this.ci_ddPeriodicity.Size = new System.Drawing.Size(815, 23); + this.ci_ddPeriodicity.Size = new System.Drawing.Size(250, 23); this.ci_ddPeriodicity.TabIndex = 143; // // ci_tbStatisticalConsiderations // this.ci_tbStatisticalConsiderations.AcceptsReturn = true; - this.ci_tbStatisticalConsiderations.Dock = System.Windows.Forms.DockStyle.Fill; - this.ci_tbStatisticalConsiderations.Location = new System.Drawing.Point(120, 0); + this.ci_tbStatisticalConsiderations.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.ci_tbStatisticalConsiderations.Location = new System.Drawing.Point(128, 3); this.ci_tbStatisticalConsiderations.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.ci_tbStatisticalConsiderations.Multiline = true; this.ci_tbStatisticalConsiderations.Name = "ci_tbStatisticalConsiderations"; this.ci_tbStatisticalConsiderations.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.ci_tbStatisticalConsiderations.Size = new System.Drawing.Size(815, 92); + this.ci_tbStatisticalConsiderations.Size = new System.Drawing.Size(287, 100); this.ci_tbStatisticalConsiderations.TabIndex = 140; // // label35 // - this.label35.Dock = System.Windows.Forms.DockStyle.Left; - this.label35.Location = new System.Drawing.Point(0, 0); + this.label35.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label35.AutoSize = true; + this.label35.Location = new System.Drawing.Point(51, 376); this.label35.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label35.Name = "label35"; - this.label35.Size = new System.Drawing.Size(120, 92); + this.label35.Size = new System.Drawing.Size(69, 15); this.label35.TabIndex = 155; - this.label35.Text = "Limitations"; + this.label35.Text = "Limitations:"; + this.label35.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // label36 // - this.label36.Dock = System.Windows.Forms.DockStyle.Left; - this.label36.Location = new System.Drawing.Point(0, 0); + this.label36.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label36.AutoSize = true; + this.label36.Location = new System.Drawing.Point(51, 482); this.label36.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label36.Name = "label36"; - this.label36.Size = new System.Drawing.Size(120, 196); + this.label36.Size = new System.Drawing.Size(69, 15); this.label36.TabIndex = 156; - this.label36.Text = "Comments"; + this.label36.Text = "Comments:"; + this.label36.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // ci_tbName // - this.ci_tbName.Dock = System.Windows.Forms.DockStyle.Fill; - this.ci_tbName.Location = new System.Drawing.Point(120, 0); - this.ci_tbName.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.ci_tbName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.ci_tbName.Location = new System.Drawing.Point(117, 32); + this.ci_tbName.Margin = new System.Windows.Forms.Padding(4, 3, 20, 3); this.ci_tbName.Name = "ci_tbName"; - this.ci_tbName.Size = new System.Drawing.Size(815, 23); + this.ci_tbName.Size = new System.Drawing.Size(302, 23); this.ci_tbName.TabIndex = 138; // // splitContainer1 @@ -286,133 +300,84 @@ private void InitializeComponent() // // splitContainer1.Panel1 // - this.splitContainer1.Panel1.Controls.Add(this.panel4); - this.splitContainer1.Panel1.Controls.Add(this.panel3); - this.splitContainer1.Panel1.Controls.Add(this.panel2); + this.splitContainer1.Panel1.Controls.Add(this.tableLayoutPanel1); // // splitContainer1.Panel2 // this.splitContainer1.Panel2.AutoScroll = true; - this.splitContainer1.Panel2.Controls.Add(this.panel11); - this.splitContainer1.Panel2.Controls.Add(this.panel10); - this.splitContainer1.Panel2.Controls.Add(this.panel9); - this.splitContainer1.Panel2.Controls.Add(this.panel8); - this.splitContainer1.Panel2.Controls.Add(this.panel7); - this.splitContainer1.Panel2.Controls.Add(this.panel6); - this.splitContainer1.Panel2.Controls.Add(this.panel5); - this.splitContainer1.Size = new System.Drawing.Size(939, 839); + this.splitContainer1.Panel2.Controls.Add(this.tableLayoutPanel2); + this.splitContainer1.Size = new System.Drawing.Size(445, 839); this.splitContainer1.SplitterDistance = 220; this.splitContainer1.SplitterWidth = 5; this.splitContainer1.TabIndex = 158; // - // panel4 - // - this.panel4.Controls.Add(this.panel1); - this.panel4.Controls.Add(this.label31); - this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel4.Location = new System.Drawing.Point(0, 46); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(935, 170); - this.panel4.TabIndex = 164; + // tableLayoutPanel1 + // + this.tableLayoutPanel1.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.tableLayoutPanel1.ColumnCount = 2; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.Controls.Add(this.ci_tbID, 1, 0); + this.tableLayoutPanel1.Controls.Add(this.label31, 0, 2); + this.tableLayoutPanel1.Controls.Add(this.panel1, 1, 2); + this.tableLayoutPanel1.Controls.Add(this.label26, 0, 1); + this.tableLayoutPanel1.Controls.Add(this.label28, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.ci_tbName, 1, 1); + this.tableLayoutPanel1.Location = new System.Drawing.Point(1, 1); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 3; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel1.Size = new System.Drawing.Size(439, 210); + this.tableLayoutPanel1.TabIndex = 162; // // panel1 // - this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel1.Location = new System.Drawing.Point(120, 0); - this.panel1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.panel1.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.panel1.Location = new System.Drawing.Point(117, 61); + this.panel1.Margin = new System.Windows.Forms.Padding(4, 3, 20, 3); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(815, 170); + this.panel1.Size = new System.Drawing.Size(302, 146); this.panel1.TabIndex = 161; // - // panel3 - // - this.panel3.Controls.Add(this.ci_tbName); - this.panel3.Controls.Add(this.label26); - this.panel3.Dock = System.Windows.Forms.DockStyle.Top; - this.panel3.Location = new System.Drawing.Point(0, 23); - this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(935, 23); - this.panel3.TabIndex = 163; - // - // panel2 - // - this.panel2.Controls.Add(this.ci_tbID); - this.panel2.Controls.Add(this.label28); - this.panel2.Dock = System.Windows.Forms.DockStyle.Top; - this.panel2.Location = new System.Drawing.Point(0, 0); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(935, 23); - this.panel2.TabIndex = 162; - // - // panel11 - // - this.panel11.Controls.Add(this.ci_tbComments); - this.panel11.Controls.Add(this.label36); - this.panel11.Dock = System.Windows.Forms.DockStyle.Top; - this.panel11.Location = new System.Drawing.Point(0, 414); - this.panel11.Name = "panel11"; - this.panel11.Size = new System.Drawing.Size(935, 196); - this.panel11.TabIndex = 163; - // - // panel10 - // - this.panel10.Controls.Add(this.ci_tbLimitations); - this.panel10.Controls.Add(this.label35); - this.panel10.Dock = System.Windows.Forms.DockStyle.Top; - this.panel10.Location = new System.Drawing.Point(0, 322); - this.panel10.Name = "panel10"; - this.panel10.Size = new System.Drawing.Size(935, 92); - this.panel10.TabIndex = 162; - // - // panel9 - // - this.panel9.Controls.Add(this.ci_tbAggregationMethod); - this.panel9.Controls.Add(this.label32); - this.panel9.Dock = System.Windows.Forms.DockStyle.Top; - this.panel9.Location = new System.Drawing.Point(0, 230); - this.panel9.Name = "panel9"; - this.panel9.Size = new System.Drawing.Size(935, 92); - this.panel9.TabIndex = 161; - // - // panel8 - // - this.panel8.Controls.Add(this.ci_ddPeriodicity); - this.panel8.Controls.Add(this.label34); - this.panel8.Dock = System.Windows.Forms.DockStyle.Top; - this.panel8.Location = new System.Drawing.Point(0, 207); - this.panel8.Name = "panel8"; - this.panel8.Size = new System.Drawing.Size(935, 23); - this.panel8.TabIndex = 160; - // - // panel7 - // - this.panel7.Controls.Add(this.ci_tbTopics); - this.panel7.Controls.Add(this.label33); - this.panel7.Dock = System.Windows.Forms.DockStyle.Top; - this.panel7.Location = new System.Drawing.Point(0, 184); - this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(935, 23); - this.panel7.TabIndex = 159; - // - // panel6 - // - this.panel6.Controls.Add(this.ci_tbResearchRelevance); - this.panel6.Controls.Add(this.label30); - this.panel6.Dock = System.Windows.Forms.DockStyle.Top; - this.panel6.Location = new System.Drawing.Point(0, 92); - this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(935, 92); - this.panel6.TabIndex = 158; - // - // panel5 - // - this.panel5.Controls.Add(this.ci_tbStatisticalConsiderations); - this.panel5.Controls.Add(this.label27); - this.panel5.Dock = System.Windows.Forms.DockStyle.Top; - this.panel5.Location = new System.Drawing.Point(0, 0); - this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(935, 92); - this.panel5.TabIndex = 157; + // tableLayoutPanel2 + // + this.tableLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.tableLayoutPanel2.ColumnCount = 2; + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel2.Controls.Add(this.label27, 0, 0); + this.tableLayoutPanel2.Controls.Add(this.ci_tbComments, 1, 6); + this.tableLayoutPanel2.Controls.Add(this.label36, 0, 6); + this.tableLayoutPanel2.Controls.Add(this.ci_tbLimitations, 1, 5); + this.tableLayoutPanel2.Controls.Add(this.label35, 0, 5); + this.tableLayoutPanel2.Controls.Add(this.ci_tbStatisticalConsiderations, 1, 0); + this.tableLayoutPanel2.Controls.Add(this.label30, 0, 1); + this.tableLayoutPanel2.Controls.Add(this.ci_tbResearchRelevance, 1, 1); + this.tableLayoutPanel2.Controls.Add(this.label33, 0, 2); + this.tableLayoutPanel2.Controls.Add(this.ci_tbAggregationMethod, 1, 4); + this.tableLayoutPanel2.Controls.Add(this.ci_tbTopics, 1, 2); + this.tableLayoutPanel2.Controls.Add(this.label32, 0, 4); + this.tableLayoutPanel2.Controls.Add(this.ci_ddPeriodicity, 1, 3); + this.tableLayoutPanel2.Controls.Add(this.label34, 0, 3); + this.tableLayoutPanel2.Location = new System.Drawing.Point(1, 3); + this.tableLayoutPanel2.Name = "tableLayoutPanel2"; + this.tableLayoutPanel2.RowCount = 7; + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel2.Size = new System.Drawing.Size(419, 590); + this.tableLayoutPanel2.TabIndex = 157; // // CatalogueItemUI // @@ -421,29 +386,15 @@ private void InitializeComponent() this.Controls.Add(this.splitContainer1); this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.Name = "CatalogueItemUI"; - this.Size = new System.Drawing.Size(939, 839); + this.Size = new System.Drawing.Size(445, 839); this.splitContainer1.Panel1.ResumeLayout(false); this.splitContainer1.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); - this.panel4.ResumeLayout(false); - this.panel3.ResumeLayout(false); - this.panel3.PerformLayout(); - this.panel2.ResumeLayout(false); - this.panel2.PerformLayout(); - this.panel11.ResumeLayout(false); - this.panel11.PerformLayout(); - this.panel10.ResumeLayout(false); - this.panel10.PerformLayout(); - this.panel9.ResumeLayout(false); - this.panel9.PerformLayout(); - this.panel8.ResumeLayout(false); - this.panel7.ResumeLayout(false); - this.panel7.PerformLayout(); - this.panel6.ResumeLayout(false); - this.panel6.PerformLayout(); - this.panel5.ResumeLayout(false); - this.panel5.PerformLayout(); + this.tableLayoutPanel1.ResumeLayout(false); + this.tableLayoutPanel1.PerformLayout(); + this.tableLayoutPanel2.ResumeLayout(false); + this.tableLayoutPanel2.PerformLayout(); this.ResumeLayout(false); } @@ -471,15 +422,7 @@ private void InitializeComponent() private System.Windows.Forms.TextBox ci_tbName; private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Panel panel2; - private System.Windows.Forms.Panel panel3; - private System.Windows.Forms.Panel panel4; - private System.Windows.Forms.Panel panel5; - private System.Windows.Forms.Panel panel6; - private System.Windows.Forms.Panel panel7; - private System.Windows.Forms.Panel panel8; - private System.Windows.Forms.Panel panel9; - private System.Windows.Forms.Panel panel10; - private System.Windows.Forms.Panel panel11; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; } } diff --git a/Rdmp.UI/MainFormUITabs/CatalogueItemUI.cs b/Rdmp.UI/MainFormUITabs/CatalogueItemUI.cs index 09eac6b82f..96341c713a 100644 --- a/Rdmp.UI/MainFormUITabs/CatalogueItemUI.cs +++ b/Rdmp.UI/MainFormUITabs/CatalogueItemUI.cs @@ -69,6 +69,7 @@ public override void SetDatabaseObject(IActivateItems activator, CatalogueItem d var f = new ScintillaTextEditorFactory(); _scintillaDescription = f.Create(null, null, null, true, false,activator.CurrentDirectory); _scintillaDescription.Font = System.Drawing.SystemFonts.DefaultFont; + _scintillaDescription.WrapMode = WrapMode.Word; panel1.Controls.Add(_scintillaDescription); }