diff --git a/Forms/MainForm.Designer.cs b/Forms/MainForm.Designer.cs index a12f690..a909aaa 100644 --- a/Forms/MainForm.Designer.cs +++ b/Forms/MainForm.Designer.cs @@ -42,8 +42,7 @@ MainForm_TabPage3 = new TabPage(); tableLayoutPanelProjects1 = new TableLayoutPanel(); dataGridViewProjects = new DataGridView(); - MainForm_TabPage4 = new TabPage(); - tableLayoutPanelTasks1 = new TableLayoutPanel(); + groupBoxProjectWorkItems = new GroupBox(); splitContainerTasks1 = new SplitContainer(); treeViewTasks1 = new TreeView(); contextMenuStripTreeviewTasks = new ContextMenuStrip(components); @@ -67,8 +66,7 @@ MainForm_TabPage3.SuspendLayout(); tableLayoutPanelProjects1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridViewProjects).BeginInit(); - MainForm_TabPage4.SuspendLayout(); - tableLayoutPanelTasks1.SuspendLayout(); + groupBoxProjectWorkItems.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)splitContainerTasks1).BeginInit(); splitContainerTasks1.Panel1.SuspendLayout(); splitContainerTasks1.Panel2.SuspendLayout(); @@ -122,7 +120,6 @@ tabControlMainForm.Controls.Add(MainForm_TabPage1); tabControlMainForm.Controls.Add(MainForm_TabPage2); tabControlMainForm.Controls.Add(MainForm_TabPage3); - tabControlMainForm.Controls.Add(MainForm_TabPage4); tabControlMainForm.Dock = DockStyle.Fill; tabControlMainForm.Location = new Point(0, 40); tabControlMainForm.Name = "tabControlMainForm"; @@ -194,13 +191,14 @@ tableLayoutPanelProjects1.ColumnCount = 1; tableLayoutPanelProjects1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F)); tableLayoutPanelProjects1.Controls.Add(dataGridViewProjects, 0, 1); + tableLayoutPanelProjects1.Controls.Add(groupBoxProjectWorkItems, 0, 2); tableLayoutPanelProjects1.Dock = DockStyle.Fill; tableLayoutPanelProjects1.Location = new Point(0, 0); tableLayoutPanelProjects1.Name = "tableLayoutPanelProjects1"; tableLayoutPanelProjects1.RowCount = 3; tableLayoutPanelProjects1.RowStyles.Add(new RowStyle(SizeType.Absolute, 1F)); - tableLayoutPanelProjects1.RowStyles.Add(new RowStyle(SizeType.Percent, 100F)); - tableLayoutPanelProjects1.RowStyles.Add(new RowStyle(SizeType.Percent, 0F)); + tableLayoutPanelProjects1.RowStyles.Add(new RowStyle(SizeType.Percent, 40F)); + tableLayoutPanelProjects1.RowStyles.Add(new RowStyle(SizeType.Percent, 60F)); tableLayoutPanelProjects1.Size = new Size(1862, 966); tableLayoutPanelProjects1.TabIndex = 1; // @@ -214,38 +212,24 @@ dataGridViewProjects.Name = "dataGridViewProjects"; dataGridViewProjects.ReadOnly = true; dataGridViewProjects.RowHeadersWidth = 82; - dataGridViewProjects.Size = new Size(1856, 959); + dataGridViewProjects.Size = new Size(1856, 380); dataGridViewProjects.TabIndex = 0; // - // MainForm_TabPage4 + // groupBoxProjectWorkItems // - MainForm_TabPage4.Controls.Add(tableLayoutPanelTasks1); - MainForm_TabPage4.Location = new Point(8, 46); - MainForm_TabPage4.Name = "MainForm_TabPage4"; - MainForm_TabPage4.Size = new Size(1862, 966); - MainForm_TabPage4.TabIndex = 3; - MainForm_TabPage4.Text = "Tab 4"; - MainForm_TabPage4.UseVisualStyleBackColor = true; - // - // tableLayoutPanelTasks1 - // - tableLayoutPanelTasks1.ColumnCount = 1; - tableLayoutPanelTasks1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F)); - tableLayoutPanelTasks1.Controls.Add(splitContainerTasks1, 0, 1); - tableLayoutPanelTasks1.Dock = DockStyle.Fill; - tableLayoutPanelTasks1.Location = new Point(0, 0); - tableLayoutPanelTasks1.Name = "tableLayoutPanelTasks1"; - tableLayoutPanelTasks1.RowCount = 3; - tableLayoutPanelTasks1.RowStyles.Add(new RowStyle(SizeType.Percent, 0F)); - tableLayoutPanelTasks1.RowStyles.Add(new RowStyle(SizeType.Percent, 100F)); - tableLayoutPanelTasks1.RowStyles.Add(new RowStyle(SizeType.Percent, 0F)); - tableLayoutPanelTasks1.Size = new Size(1862, 966); - tableLayoutPanelTasks1.TabIndex = 0; + groupBoxProjectWorkItems.Controls.Add(splitContainerTasks1); + groupBoxProjectWorkItems.Dock = DockStyle.Fill; + groupBoxProjectWorkItems.Location = new Point(3, 390); + groupBoxProjectWorkItems.Name = "groupBoxProjectWorkItems"; + groupBoxProjectWorkItems.Size = new Size(1856, 573); + groupBoxProjectWorkItems.TabIndex = 1; + groupBoxProjectWorkItems.TabStop = false; + groupBoxProjectWorkItems.Text = "Work Items"; // // splitContainerTasks1 // splitContainerTasks1.Dock = DockStyle.Fill; - splitContainerTasks1.Location = new Point(3, 3); + splitContainerTasks1.Location = new Point(3, 35); splitContainerTasks1.Name = "splitContainerTasks1"; // // splitContainerTasks1.Panel1 @@ -255,9 +239,9 @@ // splitContainerTasks1.Panel2 // splitContainerTasks1.Panel2.Controls.Add(splitContainerTasks2); - splitContainerTasks1.Size = new Size(1856, 960); - splitContainerTasks1.SplitterDistance = 618; - splitContainerTasks1.TabIndex = 0; + splitContainerTasks1.Size = new Size(1850, 535); + splitContainerTasks1.SplitterDistance = 616; + splitContainerTasks1.TabIndex = 2; // // treeViewTasks1 // @@ -265,7 +249,7 @@ treeViewTasks1.Dock = DockStyle.Fill; treeViewTasks1.Location = new Point(0, 0); treeViewTasks1.Name = "treeViewTasks1"; - treeViewTasks1.Size = new Size(618, 960); + treeViewTasks1.Size = new Size(616, 535); treeViewTasks1.TabIndex = 0; // // contextMenuStripTreeviewTasks @@ -322,8 +306,8 @@ // splitContainerTasks2.Panel2 // splitContainerTasks2.Panel2.Controls.Add(tableLayoutPanelTasks2); - splitContainerTasks2.Size = new Size(1234, 960); - splitContainerTasks2.SplitterDistance = 411; + splitContainerTasks2.Size = new Size(1230, 535); + splitContainerTasks2.SplitterDistance = 228; splitContainerTasks2.TabIndex = 0; // // dataGridViewProjectTasks @@ -336,7 +320,7 @@ dataGridViewProjectTasks.Name = "dataGridViewProjectTasks"; dataGridViewProjectTasks.ReadOnly = true; dataGridViewProjectTasks.RowHeadersWidth = 82; - dataGridViewProjectTasks.Size = new Size(1234, 411); + dataGridViewProjectTasks.Size = new Size(1230, 228); dataGridViewProjectTasks.TabIndex = 0; // // tableLayoutPanelTasks2 @@ -351,7 +335,7 @@ tableLayoutPanelTasks2.RowCount = 2; tableLayoutPanelTasks2.RowStyles.Add(new RowStyle(SizeType.Percent, 25F)); tableLayoutPanelTasks2.RowStyles.Add(new RowStyle(SizeType.Percent, 75F)); - tableLayoutPanelTasks2.Size = new Size(1234, 545); + tableLayoutPanelTasks2.Size = new Size(1230, 303); tableLayoutPanelTasks2.TabIndex = 0; // // groupBoxTaskDescription @@ -360,7 +344,7 @@ groupBoxTaskDescription.Dock = DockStyle.Fill; groupBoxTaskDescription.Location = new Point(3, 3); groupBoxTaskDescription.Name = "groupBoxTaskDescription"; - groupBoxTaskDescription.Size = new Size(1228, 130); + groupBoxTaskDescription.Size = new Size(1224, 69); groupBoxTaskDescription.TabIndex = 0; groupBoxTaskDescription.TabStop = false; groupBoxTaskDescription.Text = "Description"; @@ -373,7 +357,7 @@ richTextBoxTaskDescription.Location = new Point(3, 35); richTextBoxTaskDescription.Name = "richTextBoxTaskDescription"; richTextBoxTaskDescription.ReadOnly = true; - richTextBoxTaskDescription.Size = new Size(1222, 92); + richTextBoxTaskDescription.Size = new Size(1218, 31); richTextBoxTaskDescription.TabIndex = 0; richTextBoxTaskDescription.Text = ""; // @@ -381,9 +365,9 @@ // groupBoxTaskComments.Controls.Add(richTextBoxTaskComments); groupBoxTaskComments.Dock = DockStyle.Fill; - groupBoxTaskComments.Location = new Point(3, 139); + groupBoxTaskComments.Location = new Point(3, 78); groupBoxTaskComments.Name = "groupBoxTaskComments"; - groupBoxTaskComments.Size = new Size(1228, 403); + groupBoxTaskComments.Size = new Size(1224, 222); groupBoxTaskComments.TabIndex = 1; groupBoxTaskComments.TabStop = false; groupBoxTaskComments.Text = "Comments"; @@ -396,7 +380,7 @@ richTextBoxTaskComments.Location = new Point(3, 35); richTextBoxTaskComments.Name = "richTextBoxTaskComments"; richTextBoxTaskComments.ReadOnly = true; - richTextBoxTaskComments.Size = new Size(1222, 365); + richTextBoxTaskComments.Size = new Size(1218, 184); richTextBoxTaskComments.TabIndex = 1; richTextBoxTaskComments.Text = ""; // @@ -421,8 +405,7 @@ MainForm_TabPage3.ResumeLayout(false); tableLayoutPanelProjects1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)dataGridViewProjects).EndInit(); - MainForm_TabPage4.ResumeLayout(false); - tableLayoutPanelTasks1.ResumeLayout(false); + groupBoxProjectWorkItems.ResumeLayout(false); splitContainerTasks1.Panel1.ResumeLayout(false); splitContainerTasks1.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)splitContainerTasks1).EndInit(); @@ -454,22 +437,21 @@ private TabPage MainForm_TabPage3; private TableLayoutPanel tableLayoutPanelProjects1; private DataGridView dataGridViewProjects; - private TabPage MainForm_TabPage4; - private TableLayoutPanel tableLayoutPanelTasks1; - private SplitContainer splitContainerTasks1; - private TreeView treeViewTasks1; private ContextMenuStrip contextMenuStripTreeviewTasks; private ToolStripMenuItem addTaskSubtaskToolStripMenuItem; private ToolStripMenuItem editThisTaskSubtaskToolStripMenuItem; private ToolStripMenuItem deleteThisTaskSubtaskToolStripMenuItem; private ToolStripSeparator toolStripSeparator1; private ToolStripMenuItem addACommentToolStripMenuItem; + private GroupBox groupBoxProjectWorkItems; + private SplitContainer splitContainerTasks1; + private TreeView treeViewTasks1; private SplitContainer splitContainerTasks2; private DataGridView dataGridViewProjectTasks; private TableLayoutPanel tableLayoutPanelTasks2; private GroupBox groupBoxTaskDescription; - private GroupBox groupBoxTaskComments; private RichTextBox richTextBoxTaskDescription; + private GroupBox groupBoxTaskComments; private RichTextBox richTextBoxTaskComments; } } diff --git a/Forms/MainForm.cs b/Forms/MainForm.cs index 4f98d20..ee3e4ee 100644 --- a/Forms/MainForm.cs +++ b/Forms/MainForm.cs @@ -40,7 +40,6 @@ namespace trakker tabControlMainForm.TabPages[0].Text = " Home "; tabControlMainForm.TabPages[1].Text = " Clients "; tabControlMainForm.TabPages[2].Text = " Projects "; - tabControlMainForm.TabPages[3].Text = " Work Items "; _ctrl = new Services.MainCtrl(this, connectionString); } @@ -504,14 +503,14 @@ namespace trakker DialogResult result = textAreaForm.ShowDialog(this); if (result == DialogResult.OK) { - if (string.IsNullOrEmpty(textAreaForm.Content)) return; + if (string.IsNullOrEmpty(textAreaForm.BasicText)) return; TaskData taskData = new TaskData(connectionString); try { PTaskComment comment = new() { TaskId = selectedTask?.GUID ?? string.Empty, - Comment = textAreaForm.Content ?? string.Empty, + Comment = textAreaForm.BasicText ?? string.Empty, }; taskData.SaveComment(comment); DialogExtensions.GenericSuccess($"Comment saved successfully for task '{selectedTask!.Node}'."); diff --git a/Forms/TextAreaForm.cs b/Forms/TextAreaForm.cs index 2481430..9131e4c 100644 --- a/Forms/TextAreaForm.cs +++ b/Forms/TextAreaForm.cs @@ -25,7 +25,10 @@ namespace newcle.us.Forms } [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - public string? Content { get { return Content_RichTextBox.Text; } set { Content_RichTextBox.Text = value; } } + public string? BasicText { get { return Content_RichTextBox.Text; } set { Content_RichTextBox.Text = value; } } + + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] + public string? RichText { get { return Content_RichTextBox.Rtf; } set { Content_RichTextBox.Rtf = value; } } public void ReadOnly() { @@ -54,7 +57,7 @@ namespace newcle.us.Forms private void copyToClipboardToolStripMenuItem_Click(object sender, EventArgs e) { - Clipboard.SetText(Content ?? ""); + Clipboard.SetText(BasicText ?? ""); DialogExtensions.GenericSuccess("Content successfully copied to clipboard"); } }