From a3a2fa780eb72b427a8ae10e23d8f0c9fbc54801 Mon Sep 17 00:00:00 2001 From: EggMan20339 <99349302+EggMan20339@users.noreply.github.com> Date: Tue, 20 Feb 2024 10:06:03 -0500 Subject: [PATCH] added prescription tab --- .../frmInfo.Designer.cs | 240 +++++++++++++++--- Louis'-Pharmacy_CNSA212-FP/frmInfo.cs | 33 ++- Louis'-Pharmacy_CNSA212-FP/frmInfo.resx | 5 +- .../frmMain.Designer.cs | 32 ++- 4 files changed, 254 insertions(+), 56 deletions(-) diff --git a/Louis'-Pharmacy_CNSA212-FP/frmInfo.Designer.cs b/Louis'-Pharmacy_CNSA212-FP/frmInfo.Designer.cs index 55d6355..6dd53c7 100644 --- a/Louis'-Pharmacy_CNSA212-FP/frmInfo.Designer.cs +++ b/Louis'-Pharmacy_CNSA212-FP/frmInfo.Designer.cs @@ -80,10 +80,10 @@ namespace Louis__Pharmacy_CNSA212_FP this.Dosage = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Purpose = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.RxNum = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.cmuRx = new System.Windows.Forms.ContextMenuStrip(this.components); - this.cmuRxNew = new System.Windows.Forms.ToolStripMenuItem(); - this.cmuRxEdit = new System.Windows.Forms.ToolStripMenuItem(); - this.cmuRxDelete = new System.Windows.Forms.ToolStripMenuItem(); + this.cmuMedication = new System.Windows.Forms.ContextMenuStrip(this.components); + this.cmuMedicationNew = new System.Windows.Forms.ToolStripMenuItem(); + this.cmuMedicationEdit = new System.Windows.Forms.ToolStripMenuItem(); + this.cmuMedicationDelete = new System.Windows.Forms.ToolStripMenuItem(); this.tbpPhysician = new System.Windows.Forms.TabPage(); this.splcPhysician = new System.Windows.Forms.SplitContainer(); this.txtPhysicianID = new System.Windows.Forms.TextBox(); @@ -107,6 +107,21 @@ namespace Louis__Pharmacy_CNSA212_FP this.cmuPhysicianNew = new System.Windows.Forms.ToolStripMenuItem(); this.cmuPhysicianEdit = new System.Windows.Forms.ToolStripMenuItem(); this.cmuPhysicianDelete = new System.Windows.Forms.ToolStripMenuItem(); + this.tbcInfoPrescriptions = new System.Windows.Forms.TabPage(); + this.txtRxPatientID = new System.Windows.Forms.TextBox(); + this.txtRxMedicationID = new System.Windows.Forms.TextBox(); + this.txtRxPhysicianID = new System.Windows.Forms.TextBox(); + this.txtRxPrescriptionID = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.btnRxSearch = new System.Windows.Forms.Button(); + this.dgvRx = new System.Windows.Forms.DataGridView(); + this.cmuPrescription = new System.Windows.Forms.ContextMenuStrip(this.components); + this.cmuPrescriptionNew = new System.Windows.Forms.ToolStripMenuItem(); + this.cmuPrescriptionEdit = new System.Windows.Forms.ToolStripMenuItem(); + this.cmuPrescriptionDelete = new System.Windows.Forms.ToolStripMenuItem(); lblPatientFirst = new System.Windows.Forms.Label(); lblPatientLast = new System.Windows.Forms.Label(); lblPhysicianFirst = new System.Windows.Forms.Label(); @@ -125,7 +140,7 @@ namespace Louis__Pharmacy_CNSA212_FP this.splcPrescription.Panel2.SuspendLayout(); this.splcPrescription.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgvPrescription)).BeginInit(); - this.cmuRx.SuspendLayout(); + this.cmuMedication.SuspendLayout(); this.tbpPhysician.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splcPhysician)).BeginInit(); this.splcPhysician.Panel1.SuspendLayout(); @@ -133,6 +148,9 @@ namespace Louis__Pharmacy_CNSA212_FP this.splcPhysician.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgvPhysician)).BeginInit(); this.cmuPhysician.SuspendLayout(); + this.tbcInfoPrescriptions.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dgvRx)).BeginInit(); + this.cmuPrescription.SuspendLayout(); this.SuspendLayout(); // // lblPatientFirst @@ -176,6 +194,7 @@ namespace Louis__Pharmacy_CNSA212_FP this.tbcInfo.Controls.Add(this.tbpPatient); this.tbcInfo.Controls.Add(this.tbpMedication); this.tbcInfo.Controls.Add(this.tbpPhysician); + this.tbcInfo.Controls.Add(this.tbcInfoPrescriptions); this.tbcInfo.Location = new System.Drawing.Point(12, 12); this.tbcInfo.Name = "tbcInfo"; this.tbcInfo.SelectedIndex = 0; @@ -525,7 +544,7 @@ namespace Louis__Pharmacy_CNSA212_FP this.dgvPrescription.AllowUserToDeleteRows = false; this.dgvPrescription.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvPrescription.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Medication_id, this.MedicationName, this.IntakeMethod, this.Frequency, this.Dosage, this.Purpose, this.RxNum }); - this.dgvPrescription.ContextMenuStrip = this.cmuRx; + this.dgvPrescription.ContextMenuStrip = this.cmuMedication; this.dgvPrescription.Location = new System.Drawing.Point(3, 3); this.dgvPrescription.Name = "dgvPrescription"; this.dgvPrescription.ReadOnly = true; @@ -583,33 +602,33 @@ namespace Louis__Pharmacy_CNSA212_FP this.RxNum.Name = "RxNum"; this.RxNum.ReadOnly = true; // - // cmuRx + // cmuMedication // - this.cmuRx.ImageScalingSize = new System.Drawing.Size(20, 20); - this.cmuRx.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.cmuRxNew, this.cmuRxEdit, this.cmuRxDelete }); - this.cmuRx.Name = "cmuRx"; - this.cmuRx.Size = new System.Drawing.Size(108, 70); + this.cmuMedication.ImageScalingSize = new System.Drawing.Size(20, 20); + this.cmuMedication.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.cmuMedicationNew, this.cmuMedicationEdit, this.cmuMedicationDelete }); + this.cmuMedication.Name = "cmuMedication"; + this.cmuMedication.Size = new System.Drawing.Size(108, 70); // - // cmuRxNew + // cmuMedicationNew // - this.cmuRxNew.Name = "cmuRxNew"; - this.cmuRxNew.Size = new System.Drawing.Size(107, 22); - this.cmuRxNew.Text = "New"; - this.cmuRxNew.Click += new System.EventHandler(this.cmuRxNew_Click); + this.cmuMedicationNew.Name = "cmuMedicationNew"; + this.cmuMedicationNew.Size = new System.Drawing.Size(107, 22); + this.cmuMedicationNew.Text = "New"; + this.cmuMedicationNew.Click += new System.EventHandler(this.cmuRxNew_Click); // - // cmuRxEdit + // cmuMedicationEdit // - this.cmuRxEdit.Name = "cmuRxEdit"; - this.cmuRxEdit.Size = new System.Drawing.Size(107, 22); - this.cmuRxEdit.Text = "Edit"; - this.cmuRxEdit.Click += new System.EventHandler(this.cmuRxEdit_Click); + this.cmuMedicationEdit.Name = "cmuMedicationEdit"; + this.cmuMedicationEdit.Size = new System.Drawing.Size(107, 22); + this.cmuMedicationEdit.Text = "Edit"; + this.cmuMedicationEdit.Click += new System.EventHandler(this.cmuRxEdit_Click); // - // cmuRxDelete + // cmuMedicationDelete // - this.cmuRxDelete.Name = "cmuRxDelete"; - this.cmuRxDelete.Size = new System.Drawing.Size(107, 22); - this.cmuRxDelete.Text = "Delete"; - this.cmuRxDelete.Click += new System.EventHandler(this.cmuRxDelete_Click); + this.cmuMedicationDelete.Name = "cmuMedicationDelete"; + this.cmuMedicationDelete.Size = new System.Drawing.Size(107, 22); + this.cmuMedicationDelete.Text = "Delete"; + this.cmuMedicationDelete.Click += new System.EventHandler(this.cmuRxDelete_Click); // // tbpPhysician // @@ -645,8 +664,9 @@ namespace Louis__Pharmacy_CNSA212_FP // this.splcPhysician.Panel2.AutoScroll = true; this.splcPhysician.Panel2.Controls.Add(this.dgvPhysician); + this.splcPhysician.Panel2.Paint += new System.Windows.Forms.PaintEventHandler(this.Panel2_Paint); this.splcPhysician.Size = new System.Drawing.Size(727, 478); - this.splcPhysician.SplitterDistance = 210; + this.splcPhysician.SplitterDistance = 195; this.splcPhysician.TabIndex = 0; // // txtPhysicianID @@ -696,12 +716,12 @@ namespace Louis__Pharmacy_CNSA212_FP this.dgvPhysician.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvPhysician.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Phys_id, this.namefirst, this.namelast, this.initialsmiddle, this.cit, this.state, this.zipp, this.dobb, this.numberphone, this.gennder, this.Specialty }); this.dgvPhysician.ContextMenuStrip = this.cmuPhysician; - this.dgvPhysician.Location = new System.Drawing.Point(0, 0); + this.dgvPhysician.Location = new System.Drawing.Point(0, 3); this.dgvPhysician.Name = "dgvPhysician"; this.dgvPhysician.ReadOnly = true; this.dgvPhysician.RowHeadersWidth = 51; this.dgvPhysician.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvPhysician.Size = new System.Drawing.Size(727, 263); + this.dgvPhysician.Size = new System.Drawing.Size(727, 260); this.dgvPhysician.TabIndex = 0; this.dgvPhysician.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPhysician_CellContentClick_1); // @@ -835,6 +855,135 @@ namespace Louis__Pharmacy_CNSA212_FP this.cmuPhysicianDelete.Text = "Delete"; this.cmuPhysicianDelete.Click += new System.EventHandler(this.cmuPhysicianDelete_Click); // + // tbcInfoPrescriptions + // + this.tbcInfoPrescriptions.Controls.Add(this.txtRxPatientID); + this.tbcInfoPrescriptions.Controls.Add(this.txtRxMedicationID); + this.tbcInfoPrescriptions.Controls.Add(this.txtRxPhysicianID); + this.tbcInfoPrescriptions.Controls.Add(this.txtRxPrescriptionID); + this.tbcInfoPrescriptions.Controls.Add(this.label4); + this.tbcInfoPrescriptions.Controls.Add(this.label3); + this.tbcInfoPrescriptions.Controls.Add(this.label2); + this.tbcInfoPrescriptions.Controls.Add(this.label1); + this.tbcInfoPrescriptions.Controls.Add(this.btnRxSearch); + this.tbcInfoPrescriptions.Controls.Add(this.dgvRx); + this.tbcInfoPrescriptions.Location = new System.Drawing.Point(4, 22); + this.tbcInfoPrescriptions.Name = "tbcInfoPrescriptions"; + this.tbcInfoPrescriptions.Padding = new System.Windows.Forms.Padding(3); + this.tbcInfoPrescriptions.Size = new System.Drawing.Size(733, 484); + this.tbcInfoPrescriptions.TabIndex = 5; + this.tbcInfoPrescriptions.Text = "Prescriptions"; + this.tbcInfoPrescriptions.UseVisualStyleBackColor = true; + // + // txtRxPatientID + // + this.txtRxPatientID.Location = new System.Drawing.Point(138, 121); + this.txtRxPatientID.Name = "txtRxPatientID"; + this.txtRxPatientID.Size = new System.Drawing.Size(124, 20); + this.txtRxPatientID.TabIndex = 9; + // + // txtRxMedicationID + // + this.txtRxMedicationID.Location = new System.Drawing.Point(138, 98); + this.txtRxMedicationID.Name = "txtRxMedicationID"; + this.txtRxMedicationID.Size = new System.Drawing.Size(124, 20); + this.txtRxMedicationID.TabIndex = 8; + // + // txtRxPhysicianID + // + this.txtRxPhysicianID.Location = new System.Drawing.Point(138, 75); + this.txtRxPhysicianID.Name = "txtRxPhysicianID"; + this.txtRxPhysicianID.Size = new System.Drawing.Size(124, 20); + this.txtRxPhysicianID.TabIndex = 7; + // + // txtRxPrescriptionID + // + this.txtRxPrescriptionID.Location = new System.Drawing.Point(138, 52); + this.txtRxPrescriptionID.Name = "txtRxPrescriptionID"; + this.txtRxPrescriptionID.Size = new System.Drawing.Size(124, 20); + this.txtRxPrescriptionID.TabIndex = 6; + // + // label4 + // + this.label4.Location = new System.Drawing.Point(32, 73); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(100, 23); + this.label4.TabIndex = 5; + this.label4.Text = "Physician ID:"; + this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label3 + // + this.label3.Location = new System.Drawing.Point(32, 96); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(100, 23); + this.label3.TabIndex = 4; + this.label3.Text = "Medication ID:"; + this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label2 + // + this.label2.Location = new System.Drawing.Point(32, 119); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(100, 23); + this.label2.TabIndex = 3; + this.label2.Text = "Patient ID:"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label1 + // + this.label1.Location = new System.Drawing.Point(32, 50); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(100, 23); + this.label1.TabIndex = 2; + this.label1.Text = "Prescription ID:"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // btnRxSearch + // + this.btnRxSearch.Location = new System.Drawing.Point(32, 186); + this.btnRxSearch.Name = "btnRxSearch"; + this.btnRxSearch.Size = new System.Drawing.Size(75, 23); + this.btnRxSearch.TabIndex = 1; + this.btnRxSearch.Text = "Search"; + this.btnRxSearch.UseVisualStyleBackColor = true; + this.btnRxSearch.Click += new System.EventHandler(this.btnRxSearch_Click); + // + // dgvRx + // + this.dgvRx.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvRx.Location = new System.Drawing.Point(0, 236); + this.dgvRx.Name = "dgvRx"; + this.dgvRx.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dgvRx.Size = new System.Drawing.Size(730, 248); + this.dgvRx.TabIndex = 0; + // + // cmuPrescription + // + this.cmuPrescription.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.cmuPrescriptionNew, this.cmuPrescriptionEdit, this.cmuPrescriptionDelete }); + this.cmuPrescription.Name = "cmuPrescription"; + this.cmuPrescription.Size = new System.Drawing.Size(108, 70); + // + // cmuPrescriptionNew + // + this.cmuPrescriptionNew.Name = "cmuPrescriptionNew"; + this.cmuPrescriptionNew.Size = new System.Drawing.Size(107, 22); + this.cmuPrescriptionNew.Text = "New"; + // + // cmuPrescriptionEdit + // + this.cmuPrescriptionEdit.Name = "cmuPrescriptionEdit"; + this.cmuPrescriptionEdit.Size = new System.Drawing.Size(107, 22); + this.cmuPrescriptionEdit.Text = "Edit"; + this.cmuPrescriptionEdit.Click += new System.EventHandler(this.cmuPrescriptionEdit_Click); + // + // cmuPrescriptionDelete + // + this.cmuPrescriptionDelete.Name = "cmuPrescriptionDelete"; + this.cmuPrescriptionDelete.Size = new System.Drawing.Size(107, 22); + this.cmuPrescriptionDelete.Text = "Delete"; + this.cmuPrescriptionDelete.Click += new System.EventHandler(this.cmuPrescriptionDelete_Click); + // // frmInfo // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -862,7 +1011,7 @@ namespace Louis__Pharmacy_CNSA212_FP ((System.ComponentModel.ISupportInitialize)(this.splcPrescription)).EndInit(); this.splcPrescription.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dgvPrescription)).EndInit(); - this.cmuRx.ResumeLayout(false); + this.cmuMedication.ResumeLayout(false); this.tbpPhysician.ResumeLayout(false); this.splcPhysician.Panel1.ResumeLayout(false); this.splcPhysician.Panel1.PerformLayout(); @@ -871,9 +1020,27 @@ namespace Louis__Pharmacy_CNSA212_FP this.splcPhysician.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dgvPhysician)).EndInit(); this.cmuPhysician.ResumeLayout(false); + this.tbcInfoPrescriptions.ResumeLayout(false); + this.tbcInfoPrescriptions.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dgvRx)).EndInit(); + this.cmuPrescription.ResumeLayout(false); this.ResumeLayout(false); } + private System.Windows.Forms.TextBox txtRxPhysicianID; + private System.Windows.Forms.TextBox txtRxMedicationID; + private System.Windows.Forms.TextBox txtRxPatientID; + private System.Windows.Forms.Button btnRxSearch; + + private System.Windows.Forms.DataGridView dgvRx; + + private System.Windows.Forms.ContextMenuStrip cmuPrescription; + private System.Windows.Forms.ToolStripMenuItem cmuPrescriptionNew; + private System.Windows.Forms.ToolStripMenuItem cmuPrescriptionEdit; + private System.Windows.Forms.ToolStripMenuItem cmuPrescriptionDelete; + + private System.Windows.Forms.TabPage tbcInfoPrescriptions; + private System.Windows.Forms.DataGridViewTextBoxColumn MedicationName; private System.Windows.Forms.DataGridViewTextBoxColumn IntakeMethod; private System.Windows.Forms.DataGridViewTextBoxColumn Frequency; @@ -882,10 +1049,10 @@ namespace Louis__Pharmacy_CNSA212_FP private System.Windows.Forms.DataGridViewTextBoxColumn RxNum; private System.Windows.Forms.ContextMenuStrip cmuPatient; - private System.Windows.Forms.ContextMenuStrip cmuRx; - private System.Windows.Forms.ToolStripMenuItem cmuRxNew; - private System.Windows.Forms.ToolStripMenuItem cmuRxEdit; - private System.Windows.Forms.ToolStripMenuItem cmuRxDelete; + private System.Windows.Forms.ContextMenuStrip cmuMedication; + private System.Windows.Forms.ToolStripMenuItem cmuMedicationNew; + private System.Windows.Forms.ToolStripMenuItem cmuMedicationEdit; + private System.Windows.Forms.ToolStripMenuItem cmuMedicationDelete; private System.Windows.Forms.ToolStripMenuItem cmuPhysicianNew; private System.Windows.Forms.ToolStripMenuItem cmuPhysicianEdit; private System.Windows.Forms.ToolStripMenuItem cmuPhysicianDelete; @@ -948,5 +1115,10 @@ namespace Louis__Pharmacy_CNSA212_FP private System.Windows.Forms.Label lblPhysicianID; public System.Windows.Forms.TextBox txtPatientID; private System.Windows.Forms.Label lblPatientID; + System.Windows.Forms.Label label1 = new System.Windows.Forms.Label(); + System.Windows.Forms.Label label2 = new System.Windows.Forms.Label(); + System.Windows.Forms.Label label3 = new System.Windows.Forms.Label(); + System.Windows.Forms.Label label4 = new System.Windows.Forms.Label(); + System.Windows.Forms.TextBox txtRxPrescriptionID = new System.Windows.Forms.TextBox(); } } \ No newline at end of file diff --git a/Louis'-Pharmacy_CNSA212-FP/frmInfo.cs b/Louis'-Pharmacy_CNSA212-FP/frmInfo.cs index 61eba14..371ecff 100644 --- a/Louis'-Pharmacy_CNSA212-FP/frmInfo.cs +++ b/Louis'-Pharmacy_CNSA212-FP/frmInfo.cs @@ -40,8 +40,8 @@ namespace Louis__Pharmacy_CNSA212_FP cmuPatientDelete.Enabled = false; cmuPhysicianEdit.Enabled = false; cmuPhysicianDelete.Enabled = false; - cmuRxEdit.Enabled = false; - cmuRxDelete.Enabled = false; + cmuMedicationEdit.Enabled = false; + cmuMedicationDelete.Enabled = false; txtPatientFirst.Focus(); @@ -300,8 +300,8 @@ namespace Louis__Pharmacy_CNSA212_FP } - cmuRxEdit.Enabled = dgvPrescription.Rows.Count > 0; - cmuRxDelete.Enabled = dgvPrescription.Rows.Count > 0; + cmuMedicationEdit.Enabled = dgvPrescription.Rows.Count > 0; + cmuMedicationDelete.Enabled = dgvPrescription.Rows.Count > 0; dgvPrescription.Focus(); @@ -573,5 +573,30 @@ namespace Louis__Pharmacy_CNSA212_FP { } + + private void Panel2_Paint(object sender, PaintEventArgs e) + { + + } + + private void cmuPrescriptionNew_Click(object sender, EventArgs e) + { + + } + + private void cmuPrescriptionEdit_Click(object sender, EventArgs e) + { + + } + + private void cmuPrescriptionDelete_Click(object sender, EventArgs e) + { + + } + + private void btnRxSearch_Click(object sender, EventArgs e) + { + + } } } diff --git a/Louis'-Pharmacy_CNSA212-FP/frmInfo.resx b/Louis'-Pharmacy_CNSA212-FP/frmInfo.resx index fb69f30..11332cc 100644 --- a/Louis'-Pharmacy_CNSA212-FP/frmInfo.resx +++ b/Louis'-Pharmacy_CNSA212-FP/frmInfo.resx @@ -198,7 +198,7 @@ True - + 125, 17 @@ -237,6 +237,9 @@ 211, 17 + + 332, 17 + diff --git a/Louis'-Pharmacy_CNSA212-FP/frmMain.Designer.cs b/Louis'-Pharmacy_CNSA212-FP/frmMain.Designer.cs index 1d62181..a481430 100644 --- a/Louis'-Pharmacy_CNSA212-FP/frmMain.Designer.cs +++ b/Louis'-Pharmacy_CNSA212-FP/frmMain.Designer.cs @@ -48,8 +48,7 @@ this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuNavigation, this.mnuWindow, this.mnuHelp }); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Padding = new System.Windows.Forms.Padding(9, 3, 0, 3); - this.menuStrip1.Size = new System.Drawing.Size(1450, 35); + this.menuStrip1.Size = new System.Drawing.Size(967, 24); this.menuStrip1.TabIndex = 0; this.menuStrip1.Text = "menuStrip1"; // @@ -57,20 +56,20 @@ // this.mnuNavigation.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuNavigationView, this.mnuNavigationAURRefill }); this.mnuNavigation.Name = "mnuNavigation"; - this.mnuNavigation.Size = new System.Drawing.Size(110, 29); + this.mnuNavigation.Size = new System.Drawing.Size(77, 20); this.mnuNavigation.Text = "Navigation"; // // mnuNavigationView // this.mnuNavigationView.Name = "mnuNavigationView"; - this.mnuNavigationView.Size = new System.Drawing.Size(373, 30); - this.mnuNavigationView.Text = "Patient/Prescription/Physician Search"; + this.mnuNavigationView.Size = new System.Drawing.Size(302, 22); + this.mnuNavigationView.Text = "Patient/Prescription/Physician/Prescription"; this.mnuNavigationView.Click += new System.EventHandler(this.mnuNavigationView_Click); // // mnuNavigationAURRefill // this.mnuNavigationAURRefill.Name = "mnuNavigationAURRefill"; - this.mnuNavigationAURRefill.Size = new System.Drawing.Size(373, 30); + this.mnuNavigationAURRefill.Size = new System.Drawing.Size(302, 22); this.mnuNavigationAURRefill.Text = "Add/Update/Remove Refill"; this.mnuNavigationAURRefill.Click += new System.EventHandler(this.mnuNavigationAURRefill_Click); // @@ -78,41 +77,41 @@ // this.mnuWindow.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuWindowArrangeIcons, this.mnuWindowCascade, this.mnuWindowHorizontal, this.mnuWindowVertical, this.mnuWindowCloseAll }); this.mnuWindow.Name = "mnuWindow"; - this.mnuWindow.Size = new System.Drawing.Size(90, 29); + this.mnuWindow.Size = new System.Drawing.Size(63, 20); this.mnuWindow.Text = "Window"; // // mnuWindowArrangeIcons // this.mnuWindowArrangeIcons.Name = "mnuWindowArrangeIcons"; - this.mnuWindowArrangeIcons.Size = new System.Drawing.Size(194, 30); + this.mnuWindowArrangeIcons.Size = new System.Drawing.Size(147, 22); this.mnuWindowArrangeIcons.Text = "Arrange Icons"; this.mnuWindowArrangeIcons.Click += new System.EventHandler(this.mnuWindowArrangeIcons_Click); // // mnuWindowCascade // this.mnuWindowCascade.Name = "mnuWindowCascade"; - this.mnuWindowCascade.Size = new System.Drawing.Size(194, 30); + this.mnuWindowCascade.Size = new System.Drawing.Size(147, 22); this.mnuWindowCascade.Text = "Cascade"; this.mnuWindowCascade.Click += new System.EventHandler(this.mnuWindowCascade_Click); // // mnuWindowHorizontal // this.mnuWindowHorizontal.Name = "mnuWindowHorizontal"; - this.mnuWindowHorizontal.Size = new System.Drawing.Size(194, 30); + this.mnuWindowHorizontal.Size = new System.Drawing.Size(147, 22); this.mnuWindowHorizontal.Text = "Horizontal"; this.mnuWindowHorizontal.Click += new System.EventHandler(this.mnuWindowHorizontal_Click); // // mnuWindowVertical // this.mnuWindowVertical.Name = "mnuWindowVertical"; - this.mnuWindowVertical.Size = new System.Drawing.Size(194, 30); + this.mnuWindowVertical.Size = new System.Drawing.Size(147, 22); this.mnuWindowVertical.Text = "Vertical"; this.mnuWindowVertical.Click += new System.EventHandler(this.mnuWindowVertical_Click); // // mnuWindowCloseAll // this.mnuWindowCloseAll.Name = "mnuWindowCloseAll"; - this.mnuWindowCloseAll.Size = new System.Drawing.Size(194, 30); + this.mnuWindowCloseAll.Size = new System.Drawing.Size(147, 22); this.mnuWindowCloseAll.Text = "Close All"; this.mnuWindowCloseAll.Click += new System.EventHandler(this.mnuWindowCloseAll_Click); // @@ -120,25 +119,24 @@ // this.mnuHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuHelpAbout }); this.mnuHelp.Name = "mnuHelp"; - this.mnuHelp.Size = new System.Drawing.Size(61, 29); + this.mnuHelp.Size = new System.Drawing.Size(44, 20); this.mnuHelp.Text = "Help"; // // mnuHelpAbout // this.mnuHelpAbout.Name = "mnuHelpAbout"; - this.mnuHelpAbout.Size = new System.Drawing.Size(134, 30); + this.mnuHelpAbout.Size = new System.Drawing.Size(107, 22); this.mnuHelpAbout.Text = "About"; this.mnuHelpAbout.Click += new System.EventHandler(this.mnuHelpAbout_Click); // // frmMain // - this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1450, 942); + this.ClientSize = new System.Drawing.Size(967, 612); this.Controls.Add(this.menuStrip1); this.IsMdiContainer = true; this.MainMenuStrip = this.menuStrip1; - this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.Name = "frmMain"; this.Text = "frmMain"; this.Load += new System.EventHandler(this.frmMain_Load);