diff --git a/AdvertsingProfitControl/APCDatabase.accdb b/AdvertsingProfitControl/APCDatabase.accdb index d2e11d6..6ee917a 100644 Binary files a/AdvertsingProfitControl/APCDatabase.accdb and b/AdvertsingProfitControl/APCDatabase.accdb differ diff --git a/AdvertsingProfitControl/FrmAdSpecialRegister.Designer.cs b/AdvertsingProfitControl/FrmAdSpecialRegister.Designer.cs index ce326e5..1aeeded 100644 --- a/AdvertsingProfitControl/FrmAdSpecialRegister.Designer.cs +++ b/AdvertsingProfitControl/FrmAdSpecialRegister.Designer.cs @@ -33,11 +33,11 @@ this.currentAdSpecialKeyWords = new System.Windows.Forms.Label(); this.adSpecialKeyWordsListBox = new System.Windows.Forms.ListBox(); this.registerAdSpecialPanel = new System.Windows.Forms.Panel(); + this.notificationLabel = new System.Windows.Forms.Label(); this.enterNewKeyWordTextBox = new System.Windows.Forms.TextBox(); this.registerKeyWordButton = new System.Windows.Forms.Button(); this.enterKeyWordHeaderLabel = new System.Windows.Forms.Label(); this.DELETE = new System.Windows.Forms.Button(); - this.notificationLabel = new System.Windows.Forms.Label(); this.mainLayoutPanel.SuspendLayout(); this.registerAdSpecialPanel.SuspendLayout(); this.SuspendLayout(); @@ -54,12 +54,13 @@ this.mainLayoutPanel.Controls.Add(this.DELETE, 0, 2); this.mainLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.mainLayoutPanel.Location = new System.Drawing.Point(0, 0); + this.mainLayoutPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.mainLayoutPanel.Name = "mainLayoutPanel"; this.mainLayoutPanel.RowCount = 3; - this.mainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F)); + this.mainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 42F)); this.mainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.mainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.mainLayoutPanel.Size = new System.Drawing.Size(749, 563); + this.mainLayoutPanel.Size = new System.Drawing.Size(915, 676); this.mainLayoutPanel.TabIndex = 0; // // currentAdSpecialKeyWords @@ -67,9 +68,10 @@ this.currentAdSpecialKeyWords.AutoSize = true; this.currentAdSpecialKeyWords.Dock = System.Windows.Forms.DockStyle.Fill; this.currentAdSpecialKeyWords.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.currentAdSpecialKeyWords.Location = new System.Drawing.Point(377, 0); + this.currentAdSpecialKeyWords.Location = new System.Drawing.Point(461, 0); + this.currentAdSpecialKeyWords.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.currentAdSpecialKeyWords.Name = "currentAdSpecialKeyWords"; - this.currentAdSpecialKeyWords.Size = new System.Drawing.Size(369, 35); + this.currentAdSpecialKeyWords.Size = new System.Drawing.Size(450, 42); this.currentAdSpecialKeyWords.TabIndex = 0; this.currentAdSpecialKeyWords.Text = "Registered Key Words:"; // @@ -77,11 +79,12 @@ // this.adSpecialKeyWordsListBox.Dock = System.Windows.Forms.DockStyle.Fill; this.adSpecialKeyWordsListBox.FormattingEnabled = true; - this.adSpecialKeyWordsListBox.ItemHeight = 20; - this.adSpecialKeyWordsListBox.Location = new System.Drawing.Point(377, 38); + this.adSpecialKeyWordsListBox.ItemHeight = 24; + this.adSpecialKeyWordsListBox.Location = new System.Drawing.Point(461, 46); + this.adSpecialKeyWordsListBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.adSpecialKeyWordsListBox.Name = "adSpecialKeyWordsListBox"; this.mainLayoutPanel.SetRowSpan(this.adSpecialKeyWordsListBox, 2); - this.adSpecialKeyWordsListBox.Size = new System.Drawing.Size(369, 522); + this.adSpecialKeyWordsListBox.Size = new System.Drawing.Size(450, 626); this.adSpecialKeyWordsListBox.Sorted = true; this.adSpecialKeyWordsListBox.TabIndex = 1; // @@ -91,24 +94,36 @@ this.registerAdSpecialPanel.Controls.Add(this.enterNewKeyWordTextBox); this.registerAdSpecialPanel.Controls.Add(this.registerKeyWordButton); this.registerAdSpecialPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.registerAdSpecialPanel.Location = new System.Drawing.Point(3, 38); + this.registerAdSpecialPanel.Location = new System.Drawing.Point(4, 46); + this.registerAdSpecialPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.registerAdSpecialPanel.Name = "registerAdSpecialPanel"; - this.registerAdSpecialPanel.Size = new System.Drawing.Size(368, 258); + this.registerAdSpecialPanel.Size = new System.Drawing.Size(449, 309); this.registerAdSpecialPanel.TabIndex = 3; // + // notificationLabel + // + this.notificationLabel.AutoSize = true; + this.notificationLabel.Location = new System.Drawing.Point(11, 100); + this.notificationLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.notificationLabel.Name = "notificationLabel"; + this.notificationLabel.Size = new System.Drawing.Size(0, 25); + this.notificationLabel.TabIndex = 3; + // // enterNewKeyWordTextBox // - this.enterNewKeyWordTextBox.Location = new System.Drawing.Point(3, 14); + this.enterNewKeyWordTextBox.Location = new System.Drawing.Point(4, 17); + this.enterNewKeyWordTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.enterNewKeyWordTextBox.Name = "enterNewKeyWordTextBox"; - this.enterNewKeyWordTextBox.Size = new System.Drawing.Size(257, 26); + this.enterNewKeyWordTextBox.Size = new System.Drawing.Size(313, 29); this.enterNewKeyWordTextBox.TabIndex = 0; // // registerKeyWordButton // this.registerKeyWordButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.registerKeyWordButton.Location = new System.Drawing.Point(170, 211); + this.registerKeyWordButton.Location = new System.Drawing.Point(207, 252); + this.registerKeyWordButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.registerKeyWordButton.Name = "registerKeyWordButton"; - this.registerKeyWordButton.Size = new System.Drawing.Size(195, 44); + this.registerKeyWordButton.Size = new System.Drawing.Size(238, 53); this.registerKeyWordButton.TabIndex = 2; this.registerKeyWordButton.Text = "Add new Key Word"; this.registerKeyWordButton.UseVisualStyleBackColor = true; @@ -119,40 +134,35 @@ this.enterKeyWordHeaderLabel.AutoSize = true; this.enterKeyWordHeaderLabel.Dock = System.Windows.Forms.DockStyle.Fill; this.enterKeyWordHeaderLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.enterKeyWordHeaderLabel.Location = new System.Drawing.Point(3, 0); + this.enterKeyWordHeaderLabel.Location = new System.Drawing.Point(4, 0); + this.enterKeyWordHeaderLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.enterKeyWordHeaderLabel.Name = "enterKeyWordHeaderLabel"; - this.enterKeyWordHeaderLabel.Size = new System.Drawing.Size(368, 35); + this.enterKeyWordHeaderLabel.Size = new System.Drawing.Size(449, 42); this.enterKeyWordHeaderLabel.TabIndex = 4; this.enterKeyWordHeaderLabel.Text = "Enter New Ad Special Key Word:"; // // DELETE // this.DELETE.Enabled = false; - this.DELETE.Location = new System.Drawing.Point(3, 302); + this.DELETE.Location = new System.Drawing.Point(4, 363); + this.DELETE.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.DELETE.Name = "DELETE"; - this.DELETE.Size = new System.Drawing.Size(164, 36); + this.DELETE.Size = new System.Drawing.Size(200, 43); this.DELETE.TabIndex = 5; this.DELETE.Text = "Delete Ad Special"; this.DELETE.UseVisualStyleBackColor = true; this.DELETE.Click += new System.EventHandler(this.DELETE_Click); // - // notificationLabel - // - this.notificationLabel.AutoSize = true; - this.notificationLabel.Location = new System.Drawing.Point(9, 83); - this.notificationLabel.Name = "notificationLabel"; - this.notificationLabel.Size = new System.Drawing.Size(0, 20); - this.notificationLabel.TabIndex = 3; - // // FrmAdSpecialRegister // this.AcceptButton = this.registerKeyWordButton; - this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(749, 563); + this.AutoScaleDimensions = new System.Drawing.SizeF(168F, 168F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.ClientSize = new System.Drawing.Size(915, 676); this.Controls.Add(this.mainLayoutPanel); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "FrmAdSpecialRegister"; this.Text = "Register Ad Specials"; this.Load += new System.EventHandler(this.frmAdSpecialRegister_Load); diff --git a/AdvertsingProfitControl/FrmAddRecord.Designer.cs b/AdvertsingProfitControl/FrmAddRecord.Designer.cs index dd3c567..2fa4510 100644 --- a/AdvertsingProfitControl/FrmAddRecord.Designer.cs +++ b/AdvertsingProfitControl/FrmAddRecord.Designer.cs @@ -246,8 +246,8 @@ this.commentsAndDateLayoutPanel.AutoSize = true; this.commentsAndDateLayoutPanel.ColumnCount = 4; this.commentsAndDateLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 15F)); - this.commentsAndDateLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 35F)); - this.commentsAndDateLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 40F)); + this.commentsAndDateLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 34.21392F)); + this.commentsAndDateLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 40.72165F)); this.commentsAndDateLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F)); this.commentsAndDateLayoutPanel.Controls.Add(this.dateGroupBox, 0, 0); this.commentsAndDateLayoutPanel.Controls.Add(this.commentsGroupBox, 1, 0); @@ -305,7 +305,7 @@ this.commentsGroupBox.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); this.commentsGroupBox.Name = "commentsGroupBox"; this.commentsGroupBox.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.commentsGroupBox.Size = new System.Drawing.Size(533, 146); + this.commentsGroupBox.Size = new System.Drawing.Size(521, 146); this.commentsGroupBox.TabIndex = 1; this.commentsGroupBox.TabStop = false; this.commentsGroupBox.Text = "Comments"; @@ -318,13 +318,13 @@ this.commentsTextBox.Multiline = true; this.commentsTextBox.Name = "commentsTextBox"; this.commentsTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.commentsTextBox.Size = new System.Drawing.Size(523, 112); + this.commentsTextBox.Size = new System.Drawing.Size(511, 112); this.commentsTextBox.TabIndex = 0; // // errorReportingLabel // this.errorReportingLabel.AutoSize = true; - this.errorReportingLabel.Location = new System.Drawing.Point(780, 0); + this.errorReportingLabel.Location = new System.Drawing.Point(768, 0); this.errorReportingLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.errorReportingLabel.Name = "errorReportingLabel"; this.errorReportingLabel.Size = new System.Drawing.Size(0, 25); diff --git a/AdvertsingProfitControl/FrmMain.Designer.cs b/AdvertsingProfitControl/FrmMain.Designer.cs index 88c7741..82d1d26 100644 --- a/AdvertsingProfitControl/FrmMain.Designer.cs +++ b/AdvertsingProfitControl/FrmMain.Designer.cs @@ -61,7 +61,7 @@ this.perfectGrossProfitLabel = new System.Windows.Forms.Label(); this.grossProfitTotalSales = new System.Windows.Forms.Label(); this.grossProfitLessCostOfSales = new System.Windows.Forms.Label(); - this.taxableGroupBox = new System.Windows.Forms.GroupBox(); + this.costAnalysisGroupBox = new System.Windows.Forms.GroupBox(); this.usePreRenderedFilesCheckbox = new System.Windows.Forms.CheckBox(); this.dateSelectorPanel = new System.Windows.Forms.Panel(); this.printPreviewButton = new System.Windows.Forms.Button(); @@ -81,13 +81,15 @@ this.suppliersDataGridView = new System.Windows.Forms.DataGridView(); this.WeeklySalesTabPage = new System.Windows.Forms.TabPage(); this.weeklySalesDataGridView = new System.Windows.Forms.DataGridView(); + this.taxableTabPage = new System.Windows.Forms.TabPage(); + this.taxableDataGridView = new System.Windows.Forms.DataGridView(); this.mainTableLayoutPanel.SuspendLayout(); this.mainMenu.SuspendLayout(); this.commentMainTableLayoutPanel.SuspendLayout(); this.commentMainGroupBox.SuspendLayout(); this.profitAnalysisMainGroupBox.SuspendLayout(); this.grossProfitGroupBox.SuspendLayout(); - this.taxableGroupBox.SuspendLayout(); + this.costAnalysisGroupBox.SuspendLayout(); this.dateSelectorPanel.SuspendLayout(); this.mainViewTabControl.SuspendLayout(); this.projectionTab.SuspendLayout(); @@ -101,6 +103,8 @@ ((System.ComponentModel.ISupportInitialize)(this.suppliersDataGridView)).BeginInit(); this.WeeklySalesTabPage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.weeklySalesDataGridView)).BeginInit(); + this.taxableTabPage.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.taxableDataGridView)).BeginInit(); this.SuspendLayout(); // // mainTableLayoutPanel @@ -246,7 +250,7 @@ this.commentMainTableLayoutPanel.Controls.Add(this.commentMainGroupBox, 0, 0); this.commentMainTableLayoutPanel.Controls.Add(this.profitAnalysisMainGroupBox, 1, 0); this.commentMainTableLayoutPanel.Controls.Add(this.grossProfitGroupBox, 2, 0); - this.commentMainTableLayoutPanel.Controls.Add(this.taxableGroupBox, 3, 0); + this.commentMainTableLayoutPanel.Controls.Add(this.costAnalysisGroupBox, 3, 0); this.commentMainTableLayoutPanel.Controls.Add(this.dateSelectorPanel, 2, 1); this.commentMainTableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.commentMainTableLayoutPanel.Location = new System.Drawing.Point(5, 600); @@ -440,16 +444,16 @@ this.grossProfitLessCostOfSales.TabIndex = 1; this.grossProfitLessCostOfSales.Text = "Less Cost of Sales: "; // - // taxableGroupBox + // costAnalysisGroupBox // - this.taxableGroupBox.Controls.Add(this.usePreRenderedFilesCheckbox); - this.taxableGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.taxableGroupBox.Location = new System.Drawing.Point(1277, 3); - this.taxableGroupBox.Name = "taxableGroupBox"; - this.taxableGroupBox.Size = new System.Drawing.Size(444, 222); - this.taxableGroupBox.TabIndex = 3; - this.taxableGroupBox.TabStop = false; - this.taxableGroupBox.Text = "Taxable"; + this.costAnalysisGroupBox.Controls.Add(this.usePreRenderedFilesCheckbox); + this.costAnalysisGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.costAnalysisGroupBox.Location = new System.Drawing.Point(1277, 3); + this.costAnalysisGroupBox.Name = "costAnalysisGroupBox"; + this.costAnalysisGroupBox.Size = new System.Drawing.Size(444, 222); + this.costAnalysisGroupBox.TabIndex = 3; + this.costAnalysisGroupBox.TabStop = false; + this.costAnalysisGroupBox.Text = "Cost Analysis"; // // usePreRenderedFilesCheckbox // @@ -460,6 +464,7 @@ this.usePreRenderedFilesCheckbox.TabIndex = 5; this.usePreRenderedFilesCheckbox.Text = "Use Pre-rendered Files"; this.usePreRenderedFilesCheckbox.UseVisualStyleBackColor = true; + this.usePreRenderedFilesCheckbox.Visible = false; // // dateSelectorPanel // @@ -483,6 +488,7 @@ this.printPreviewButton.TabIndex = 4; this.printPreviewButton.Text = "Print Preview"; this.printPreviewButton.UseVisualStyleBackColor = true; + this.printPreviewButton.Visible = false; this.printPreviewButton.Click += new System.EventHandler(this.DisplayPrintPreview); // // yearComboBox @@ -528,6 +534,7 @@ this.mainViewTabControl.Controls.Add(this.actualSalesTab); this.mainViewTabControl.Controls.Add(this.suppliersTabPage); this.mainViewTabControl.Controls.Add(this.WeeklySalesTabPage); + this.mainViewTabControl.Controls.Add(this.taxableTabPage); this.mainViewTabControl.Dock = System.Windows.Forms.DockStyle.Fill; this.mainViewTabControl.Location = new System.Drawing.Point(5, 47); this.mainViewTabControl.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); @@ -701,9 +708,35 @@ this.weeklySalesDataGridView.Size = new System.Drawing.Size(1706, 492); this.weeklySalesDataGridView.TabIndex = 0; // + // taxableTabPage + // + this.taxableTabPage.Controls.Add(this.taxableDataGridView); + this.taxableTabPage.Location = new System.Drawing.Point(4, 33); + this.taxableTabPage.Name = "taxableTabPage"; + this.taxableTabPage.Padding = new System.Windows.Forms.Padding(3); + this.taxableTabPage.Size = new System.Drawing.Size(1716, 504); + this.taxableTabPage.TabIndex = 5; + this.taxableTabPage.Text = "Taxable"; + this.taxableTabPage.UseVisualStyleBackColor = true; + // + // taxableDataGridView + // + this.taxableDataGridView.AllowUserToAddRows = false; + this.taxableDataGridView.AllowUserToDeleteRows = false; + this.taxableDataGridView.AllowUserToResizeRows = false; + this.taxableDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.taxableDataGridView.Dock = System.Windows.Forms.DockStyle.Fill; + this.taxableDataGridView.Location = new System.Drawing.Point(3, 3); + this.taxableDataGridView.Name = "taxableDataGridView"; + this.taxableDataGridView.ReadOnly = true; + this.taxableDataGridView.RowTemplate.Height = 31; + this.taxableDataGridView.Size = new System.Drawing.Size(1710, 498); + this.taxableDataGridView.TabIndex = 0; + // // FrmMain // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.AutoScaleDimensions = new System.Drawing.SizeF(168F, 168F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.ClientSize = new System.Drawing.Size(1734, 892); this.Controls.Add(this.mainTableLayoutPanel); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); @@ -724,8 +757,8 @@ this.profitAnalysisMainGroupBox.PerformLayout(); this.grossProfitGroupBox.ResumeLayout(false); this.grossProfitGroupBox.PerformLayout(); - this.taxableGroupBox.ResumeLayout(false); - this.taxableGroupBox.PerformLayout(); + this.costAnalysisGroupBox.ResumeLayout(false); + this.costAnalysisGroupBox.PerformLayout(); this.dateSelectorPanel.ResumeLayout(false); this.dateSelectorPanel.PerformLayout(); this.mainViewTabControl.ResumeLayout(false); @@ -740,6 +773,8 @@ ((System.ComponentModel.ISupportInitialize)(this.suppliersDataGridView)).EndInit(); this.WeeklySalesTabPage.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.weeklySalesDataGridView)).EndInit(); + this.taxableTabPage.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.taxableDataGridView)).EndInit(); this.ResumeLayout(false); } @@ -774,7 +809,7 @@ private System.Windows.Forms.DataGridView weeklySalesDataGridView; private System.Windows.Forms.ToolStripMenuItem helpMainMenu; private System.Windows.Forms.ToolStripMenuItem showHideConsoleHelpMainMenu; - private System.Windows.Forms.GroupBox taxableGroupBox; + private System.Windows.Forms.GroupBox costAnalysisGroupBox; private System.Windows.Forms.Label grossProfitEstimatedWeeklyDeptmartmentExpenseLabel; private System.Windows.Forms.Label perfectGrossProfitLabel; private System.Windows.Forms.Label grossProfitDollarGrossProfitLabel; @@ -798,6 +833,8 @@ private System.Windows.Forms.CheckBox usePreRenderedFilesCheckbox; private System.Windows.Forms.ToolStripMenuItem newFormTestToolStripMenuItem; private System.Windows.Forms.LinkLabel shrinkLinkLabel; + private System.Windows.Forms.TabPage taxableTabPage; + private System.Windows.Forms.DataGridView taxableDataGridView; } } diff --git a/AdvertsingProfitControl/FrmMain.cs b/AdvertsingProfitControl/FrmMain.cs index c244ed0..a764d9b 100644 --- a/AdvertsingProfitControl/FrmMain.cs +++ b/AdvertsingProfitControl/FrmMain.cs @@ -24,10 +24,6 @@ namespace AdvertsingProfitControl public FrmMain() { InitializeComponent(); - - //Set the maximum and minimum sizes for the form. - //MaximumSize = new Size(1200, 650); - //MinimumSize = new Size(1000, 550); } private void frmMain_Load(object sender, EventArgs e) diff --git a/AdvertsingProfitControl/FrmManageAdItems.cs b/AdvertsingProfitControl/FrmManageAdItems.cs index 17f1b0d..df039a1 100644 --- a/AdvertsingProfitControl/FrmManageAdItems.cs +++ b/AdvertsingProfitControl/FrmManageAdItems.cs @@ -11,8 +11,6 @@ namespace AdvertsingProfitControl public FrmManageAdItems() { InitializeComponent(); - MaximumSize = new Size(550, 505); - MinimumSize = new Size(525, 480); } private void frmManageAdItems_Load(object sender, EventArgs e) diff --git a/AdvertsingProfitControl/NewAddRecord.Designer.cs b/AdvertsingProfitControl/NewAddRecord.Designer.cs index 8ccced5..598d0a4 100644 --- a/AdvertsingProfitControl/NewAddRecord.Designer.cs +++ b/AdvertsingProfitControl/NewAddRecord.Designer.cs @@ -99,6 +99,14 @@ this.informationPanel = new System.Windows.Forms.Panel(); this.informationLabel = new System.Windows.Forms.Label(); this.addRecordButton = new System.Windows.Forms.Button(); + this.debugPanel = new System.Windows.Forms.Panel(); + this.isCommentDirtyCheckBox = new System.Windows.Forms.CheckBox(); + this.isWeeklySalesDirtyCheckBox = new System.Windows.Forms.CheckBox(); + this.isTaxableDirtyCheckBox = new System.Windows.Forms.CheckBox(); + this.isCostAnalysisDirtyCheckBox = new System.Windows.Forms.CheckBox(); + this.clearFormFileMainMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.idButton = new System.Windows.Forms.Button(); + this.reminderLabel = new System.Windows.Forms.Label(); this.commentsGroupBox.SuspendLayout(); this.mainTabControl.SuspendLayout(); this.projectionTabPage.SuspendLayout(); @@ -109,6 +117,7 @@ ((System.ComponentModel.ISupportInitialize)(this.actualSalesDataGridView)).BeginInit(); this.invoicesTabPage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.invoicesDataGridView)).BeginInit(); + this.debugTabPage.SuspendLayout(); this.mainMenuStrip.SuspendLayout(); this.mainLayoutPanel.SuspendLayout(); this.costAnalysisGroupBox.SuspendLayout(); @@ -118,6 +127,7 @@ this.dateGroupBox.SuspendLayout(); this.dateTimeMaskedTextBoxPanel.SuspendLayout(); this.informationPanel.SuspendLayout(); + this.debugPanel.SuspendLayout(); this.SuspendLayout(); // // commentsGroupBox @@ -270,6 +280,7 @@ // // debugTabPage // + this.debugTabPage.Controls.Add(this.debugPanel); this.debugTabPage.Location = new System.Drawing.Point(4, 33); this.debugTabPage.Name = "debugTabPage"; this.debugTabPage.Padding = new System.Windows.Forms.Padding(3); @@ -294,6 +305,7 @@ // FileMainMenu // this.FileMainMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.clearFormFileMainMenu, this.exitFileMainMenu}); this.FileMainMenu.Name = "FileMainMenu"; this.FileMainMenu.Size = new System.Drawing.Size(56, 31); @@ -843,9 +855,89 @@ this.addRecordButton.UseVisualStyleBackColor = true; this.addRecordButton.Click += new System.EventHandler(this.AddRecordsButtonClick); // + // debugPanel + // + this.debugPanel.Controls.Add(this.reminderLabel); + this.debugPanel.Controls.Add(this.idButton); + this.debugPanel.Controls.Add(this.isCostAnalysisDirtyCheckBox); + this.debugPanel.Controls.Add(this.isTaxableDirtyCheckBox); + this.debugPanel.Controls.Add(this.isWeeklySalesDirtyCheckBox); + this.debugPanel.Controls.Add(this.isCommentDirtyCheckBox); + this.debugPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.debugPanel.Location = new System.Drawing.Point(3, 3); + this.debugPanel.Name = "debugPanel"; + this.debugPanel.Size = new System.Drawing.Size(1854, 504); + this.debugPanel.TabIndex = 0; + // + // isCommentDirtyCheckBox + // + this.isCommentDirtyCheckBox.AutoSize = true; + this.isCommentDirtyCheckBox.Location = new System.Drawing.Point(87, 122); + this.isCommentDirtyCheckBox.Name = "isCommentDirtyCheckBox"; + this.isCommentDirtyCheckBox.Size = new System.Drawing.Size(177, 29); + this.isCommentDirtyCheckBox.TabIndex = 0; + this.isCommentDirtyCheckBox.Text = "IsCommentDirty"; + this.isCommentDirtyCheckBox.UseVisualStyleBackColor = true; + // + // isWeeklySalesDirtyCheckBox + // + this.isWeeklySalesDirtyCheckBox.AutoSize = true; + this.isWeeklySalesDirtyCheckBox.Location = new System.Drawing.Point(87, 157); + this.isWeeklySalesDirtyCheckBox.Name = "isWeeklySalesDirtyCheckBox"; + this.isWeeklySalesDirtyCheckBox.Size = new System.Drawing.Size(208, 29); + this.isWeeklySalesDirtyCheckBox.TabIndex = 1; + this.isWeeklySalesDirtyCheckBox.Text = "IsWeeklySalesDirty"; + this.isWeeklySalesDirtyCheckBox.UseVisualStyleBackColor = true; + // + // isTaxableDirtyCheckBox + // + this.isTaxableDirtyCheckBox.AutoSize = true; + this.isTaxableDirtyCheckBox.Location = new System.Drawing.Point(87, 192); + this.isTaxableDirtyCheckBox.Name = "isTaxableDirtyCheckBox"; + this.isTaxableDirtyCheckBox.Size = new System.Drawing.Size(163, 29); + this.isTaxableDirtyCheckBox.TabIndex = 2; + this.isTaxableDirtyCheckBox.Text = "IsTaxableDirty"; + this.isTaxableDirtyCheckBox.UseVisualStyleBackColor = true; + // + // isCostAnalysisDirtyCheckBox + // + this.isCostAnalysisDirtyCheckBox.AutoSize = true; + this.isCostAnalysisDirtyCheckBox.Location = new System.Drawing.Point(87, 227); + this.isCostAnalysisDirtyCheckBox.Name = "isCostAnalysisDirtyCheckBox"; + this.isCostAnalysisDirtyCheckBox.Size = new System.Drawing.Size(207, 29); + this.isCostAnalysisDirtyCheckBox.TabIndex = 3; + this.isCostAnalysisDirtyCheckBox.Text = "IsCostAnalysisDirty"; + this.isCostAnalysisDirtyCheckBox.UseVisualStyleBackColor = true; + // + // clearFormFileMainMenu + // + this.clearFormFileMainMenu.Name = "clearFormFileMainMenu"; + this.clearFormFileMainMenu.Size = new System.Drawing.Size(240, 34); + this.clearFormFileMainMenu.Text = "&Clear Form"; + // + // idButton + // + this.idButton.Location = new System.Drawing.Point(54, 283); + this.idButton.Name = "idButton"; + this.idButton.Size = new System.Drawing.Size(286, 62); + this.idButton.TabIndex = 4; + this.idButton.Text = "Create / Clear Comments ID"; + this.idButton.UseVisualStyleBackColor = true; + this.idButton.Click += new System.EventHandler(this.idButton_Click); + // + // reminderLabel + // + this.reminderLabel.AutoSize = true; + this.reminderLabel.Location = new System.Drawing.Point(82, 94); + this.reminderLabel.Name = "reminderLabel"; + this.reminderLabel.Size = new System.Drawing.Size(659, 25); + this.reminderLabel.TabIndex = 5; + this.reminderLabel.Text = "These checkboxes Tag properties hold the ID for their respective elements."; + // // NewAddRecord // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.AutoScaleDimensions = new System.Drawing.SizeF(168F, 168F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.ClientSize = new System.Drawing.Size(1876, 961); this.Controls.Add(this.mainLayoutPanel); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); @@ -866,6 +958,7 @@ ((System.ComponentModel.ISupportInitialize)(this.actualSalesDataGridView)).EndInit(); this.invoicesTabPage.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.invoicesDataGridView)).EndInit(); + this.debugTabPage.ResumeLayout(false); this.mainMenuStrip.ResumeLayout(false); this.mainMenuStrip.PerformLayout(); this.mainLayoutPanel.ResumeLayout(false); @@ -883,6 +976,8 @@ this.dateTimeMaskedTextBoxPanel.PerformLayout(); this.informationPanel.ResumeLayout(false); this.informationPanel.PerformLayout(); + this.debugPanel.ResumeLayout(false); + this.debugPanel.PerformLayout(); this.ResumeLayout(false); } @@ -959,5 +1054,13 @@ private System.Windows.Forms.Panel informationPanel; private System.Windows.Forms.Label errorLabel; private System.Windows.Forms.Label informationLabel; + private System.Windows.Forms.ToolStripMenuItem clearFormFileMainMenu; + private System.Windows.Forms.Panel debugPanel; + private System.Windows.Forms.CheckBox isCostAnalysisDirtyCheckBox; + private System.Windows.Forms.CheckBox isTaxableDirtyCheckBox; + private System.Windows.Forms.CheckBox isWeeklySalesDirtyCheckBox; + private System.Windows.Forms.CheckBox isCommentDirtyCheckBox; + private System.Windows.Forms.Button idButton; + private System.Windows.Forms.Label reminderLabel; } } \ No newline at end of file diff --git a/AdvertsingProfitControl/NewAddRecord.cs b/AdvertsingProfitControl/NewAddRecord.cs index 7b13d4d..96baa11 100644 --- a/AdvertsingProfitControl/NewAddRecord.cs +++ b/AdvertsingProfitControl/NewAddRecord.cs @@ -98,6 +98,149 @@ namespace AdvertsingProfitControl invoicesDataGridView.EditingControlShowing += DisplaySupplierAutoComleteOnEditingShadowControl; //Finally build the last DataGridView for the form. ConstructInvoicesDataGridView();//No weekly sales table is nice. + //Subscribe the comments text box to check if changes have been made on leave. + commentsTextBox.Enter += StoreBeginningTextBoxValue; + commentsTextBox.Leave += CheckForTextChangeOnLeave; + //Subscribe the weekly sales text boxes to validation, update required checks and auto-complete methods. + sundayWeeklySalesTextBox.Enter += StoreBeginningTextBoxValue; + sundayWeeklySalesTextBox.Validating += ValidateWeeklySales; + mondayWeeklySalesTextBox.Enter += StoreBeginningTextBoxValue; + mondayWeeklySalesTextBox.Validating += ValidateWeeklySales; + tuesdayWeeklySalesTextBox.Enter += StoreBeginningTextBoxValue; + tuesdayWeeklySalesTextBox.Validating += ValidateWeeklySales; + wednesdayWeeklySalesTextBox.Enter += StoreBeginningTextBoxValue; + wednesdayWeeklySalesTextBox.Validating += ValidateWeeklySales; + thursdayWeeklySalesTextBox.Enter += StoreBeginningTextBoxValue; + thursdayWeeklySalesTextBox.Validating += ValidateWeeklySales; + fridayWeeklySalesTextBox.Enter += StoreBeginningTextBoxValue; + fridayWeeklySalesTextBox.Validating += ValidateWeeklySales; + saturdayWeeklySalesTextBox.Enter += StoreBeginningTextBoxValue; + saturdayWeeklySalesTextBox.Validating += ValidateWeeklySales; + totalWeeklySalesTextBox.Enter += StoreBeginningTextBoxValue; + totalWeeklySalesTextBox.Validating += ValidateWeeklySales; + //Subscribe the taxable text boxes to validation and update events. + sundayTaxableTextBox.Enter += StoreBeginningTextBoxValue; + sundayTaxableTextBox.Validating += ValidateTaxableFields; + mondayTaxableTextBox.Enter += StoreBeginningTextBoxValue; + mondayTaxableTextBox.Validating += ValidateTaxableFields; + tuesdayTaxableTextBox.Enter += StoreBeginningTextBoxValue; + tuesdayTaxableTextBox.Validating += ValidateTaxableFields; + wednesdayTaxableTextBox.Enter += StoreBeginningTextBoxValue; + wednesdayTaxableTextBox.Validating += ValidateTaxableFields; + thursdayTaxableTextBox.Enter += StoreBeginningTextBoxValue; + thursdayTaxableTextBox.Validating += ValidateTaxableFields; + fridayTaxableTextBox.Enter += StoreBeginningTextBoxValue; + fridayTaxableTextBox.Validating += ValidateTaxableFields; + saturdayTaxableTextBox.Enter += StoreBeginningTextBoxValue; + saturdayTaxableTextBox.Validating += ValidateTaxableFields; + totalTaxableTextBox.Enter += StoreBeginningTextBoxValue; + totalTaxableTextBox.Validating += ValidateTaxableFields; + } + + private void ValidateTaxableFields(object sender, CancelEventArgs e) + { + var textBox = (TextBox)sender; + if (_beginningCellValue == textBox.Text) return; + //There was a change to the starting value of the text box if we've made it this far. + if (textBox.Text != "") + { + double dollarValue; + if (double.TryParse(textBox.Text.Trim(), out dollarValue)) + { + //Input is valid so mark the section as dirty. + isTaxableDirtyCheckBox.Checked = true; + //And apply formatting. + textBox.Text = Math.Round(dollarValue, 2).ToString("N", new CultureInfo("en-US")); + //Check to see if the number is equal to zero (0) i.e. "0.00". + if (textBox.Text == @"0.00") textBox.Text = ""; + //Check to see if this is not the total weekly sales text box. + if (textBox.Name == totalTaxableTextBox.Name) return; + } + else + { + MessageBox.Show(@"The value must be numeric.", @"Input Must be Numeric"); + textBox.Text = ""; + } + } + //Update the total sales text box before returning. + var totalTaxable = 0.00; + if (sundayTaxableTextBox.Text != "") totalTaxable += double.Parse(sundayTaxableTextBox.Text); + if (mondayTaxableTextBox.Text != "") totalTaxable += double.Parse(mondayTaxableTextBox.Text); + if (tuesdayTaxableTextBox.Text != "") totalTaxable += double.Parse(tuesdayTaxableTextBox.Text); + if (wednesdayTaxableTextBox.Text != "") totalTaxable += double.Parse(wednesdayTaxableTextBox.Text); + if (thursdayTaxableTextBox.Text != "") totalTaxable += double.Parse(thursdayTaxableTextBox.Text); + if (fridayTaxableTextBox.Text != "") totalTaxable += double.Parse(fridayTaxableTextBox.Text); + if (saturdayTaxableTextBox.Text != "") totalTaxable += double.Parse(saturdayTaxableTextBox.Text); + if (Math.Abs(totalTaxable) > 0) + { + totalTaxableTextBox.Text = totalTaxable.ToString("N", new CultureInfo("en-US")); + } + else + { + //Check to see if the weekly sales have been added to the database. + if (isTaxableDirtyCheckBox.Tag == null) + { + //If the tag doesn't have an ID in it then we're clear to simply clear the is dirty flag. + isTaxableDirtyCheckBox.Checked = false; + } + totalTaxableTextBox.Text = ""; + } + } + + private void StoreBeginningTextBoxValue(object sender, EventArgs e) + { + var textBox = (TextBox) sender; + _beginningCellValue = textBox.Text; + } + + private void ValidateWeeklySales(object sender, CancelEventArgs e) + { + var textBox = (TextBox) sender; + if (_beginningCellValue == textBox.Text) return; + //There was a change to the starting value of the text box if we've made it this far. + if (textBox.Text != "") + { + double dollarValue; + if (double.TryParse(textBox.Text.Trim(), out dollarValue)) + { + //Input is valid so mark the section as dirty. + isWeeklySalesDirtyCheckBox.Checked = true; + //And apply formatting. + textBox.Text = Math.Round(dollarValue, 2).ToString("N", new CultureInfo("en-US")); + //Check to see if the number is equal to zero (0) i.e. "0.00". + if (textBox.Text == @"0.00") textBox.Text = ""; + //Check to see if this is not the total weekly sales text box. + if (textBox.Name == totalWeeklySalesTextBox.Name) return; + } + else + { + MessageBox.Show(@"The value must be numeric.", @"Input Must be Numeric"); + textBox.Text = ""; + } + } + //Update the total sales text box before returning. + var totalWeeklySales = 0.00; + if (sundayWeeklySalesTextBox.Text != "") totalWeeklySales += double.Parse(sundayWeeklySalesTextBox.Text); + if (mondayWeeklySalesTextBox.Text != "") totalWeeklySales += double.Parse(mondayWeeklySalesTextBox.Text); + if (tuesdayWeeklySalesTextBox.Text != "") totalWeeklySales += double.Parse(tuesdayWeeklySalesTextBox.Text); + if (wednesdayWeeklySalesTextBox.Text != "") totalWeeklySales += double.Parse(wednesdayWeeklySalesTextBox.Text); + if (thursdayWeeklySalesTextBox.Text != "") totalWeeklySales += double.Parse(thursdayWeeklySalesTextBox.Text); + if (fridayWeeklySalesTextBox.Text != "") totalWeeklySales += double.Parse(fridayWeeklySalesTextBox.Text); + if (saturdayWeeklySalesTextBox.Text != "") totalWeeklySales += double.Parse(saturdayWeeklySalesTextBox.Text); + if (Math.Abs(totalWeeklySales) > 0) + { + totalWeeklySalesTextBox.Text = totalWeeklySales.ToString("N", new CultureInfo("en-US")); + } + else + { + //Check to see if the weekly sales have been added to the database. + if (isWeeklySalesDirtyCheckBox.Tag == null) + { + //If the tag doesn't have an ID in it then we're clear to simply clear the is dirty flag. + isWeeklySalesDirtyCheckBox.Checked = false; + } + totalWeeklySalesTextBox.Text = ""; + } } #region Invoice Table Events @@ -288,7 +431,7 @@ namespace AdvertsingProfitControl /// /// /// - private void DisplayRowNumbers(object sender, DataGridViewRowsAddedEventArgs e) + private static void DisplayRowNumbers(object sender, DataGridViewRowsAddedEventArgs e) { var table = ((DataGridView)sender); table.Rows[e.RowIndex].HeaderCell.Value = (e.RowIndex + 1).ToString(); @@ -1547,6 +1690,46 @@ namespace AdvertsingProfitControl commentsGroupBox.ForeColor = (double)commentsTextBox.TextLength / commentsTextBox.MaxLength < .8 ? default(Color) : Color.DarkRed; commentsGroupBox.Text = @"Comments (Characters Remaining: " + (commentsTextBox.MaxLength - commentsTextBox.TextLength) + @")"; } + + private void CheckForTextChangeOnLeave(object sender, EventArgs e) + { + if (commentsTextBox.Text == _beginningCellValue) return; + //Clear white spaces and check if the string is null. + if (commentsTextBox.Text.Trim() == "" && isCommentDirtyCheckBox.Tag == null) + { + //The user cleared the comment(s) they were making but the comments were never committed to the database. + //So the comments are no longer dirty. + isCommentDirtyCheckBox.Checked = false; + } + else + { + //Otherwise the comment(s) were committed to the database and will need updating. + //If its empty then the record will be cleared from the database. + isCommentDirtyCheckBox.Checked = true; + } + } + + private void StoreBeginningTextValue(object sender, EventArgs e) + { + //Reduce and reuse. + _beginningCellValue = commentsTextBox.Text; + } + + #endregion + + #region Weekly Sales Events + + + #endregion + + #region Taxable Events + + + #endregion + + #region Cost Analysis Events + + #endregion #region DateTime Events @@ -2385,5 +2568,20 @@ namespace AdvertsingProfitControl } #endregion + + private void idButton_Click(object sender, EventArgs e) + { + if (isCommentDirtyCheckBox.Tag == null) + { + var ran = new Random(); + isCommentDirtyCheckBox.Tag = ran.Next(); + MessageBox.Show(@"Comment ID is now " + isCommentDirtyCheckBox.Tag, @"Debug ID Test"); + } + else + { + isCommentDirtyCheckBox.Tag = null; + MessageBox.Show(@"ID cleared from comments.", @"Clear ID Debug"); + } + } } } diff --git a/AdvertsingProfitControl/bin/Debug/AdvertsingProfitControl.vshost.application b/AdvertsingProfitControl/bin/Debug/AdvertsingProfitControl.vshost.application index 2833bbd..9784eb4 100644 --- a/AdvertsingProfitControl/bin/Debug/AdvertsingProfitControl.vshost.application +++ b/AdvertsingProfitControl/bin/Debug/AdvertsingProfitControl.vshost.application @@ -14,7 +14,7 @@ - uNpKtKGgY3WdCqpTJARuduXQEnYHDum4naMxK2seAZY= + sGFYIVV7/W3lYCXVUKinGP8+HnzRtuBko/4mLniApzs= diff --git a/AdvertsingProfitControl/bin/Debug/AdvertsingProfitControl.vshost.exe.manifest b/AdvertsingProfitControl/bin/Debug/AdvertsingProfitControl.vshost.exe.manifest index 2b25e19..3e8a29c 100644 --- a/AdvertsingProfitControl/bin/Debug/AdvertsingProfitControl.vshost.exe.manifest +++ b/AdvertsingProfitControl/bin/Debug/AdvertsingProfitControl.vshost.exe.manifest @@ -43,14 +43,14 @@ - + - miQ8SvKSYPgPCR7wkH2br43baRyA6z3qxRB6jWLSEB4= + usHPTgWtHUZgtHEvPN4oe9BDB+EUrs2IjXXHTcpDJnI= @@ -84,7 +84,7 @@ - L1S1NQ/iZ4fotWtEDbVeoia76lgWuMUfQqouemtj2z0= + EXv832xgnrJTLbEvUhk+7ekkWAMvfBMCvVv0Y6BILg0= diff --git a/AdvertsingProfitControl/frmManageAdItems.Designer.cs b/AdvertsingProfitControl/frmManageAdItems.Designer.cs index 4144301..f9f94bf 100644 --- a/AdvertsingProfitControl/frmManageAdItems.Designer.cs +++ b/AdvertsingProfitControl/frmManageAdItems.Designer.cs @@ -32,16 +32,16 @@ this.mainLayoutPanel = new System.Windows.Forms.TableLayoutPanel(); this.adItemListView = new System.Windows.Forms.ListView(); this.columnOnePanel = new System.Windows.Forms.Panel(); + this.addItemLabel = new System.Windows.Forms.Label(); + this.adItemTextBox = new System.Windows.Forms.TextBox(); + this.addItemButton = new System.Windows.Forms.Button(); + this.notificationLabel = new System.Windows.Forms.Label(); this.deleteSelectedItem = new System.Windows.Forms.Button(); this.adItemFilterComboBox = new System.Windows.Forms.ComboBox(); this.letterSelectionLabel = new System.Windows.Forms.Label(); this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.fileMainMenu = new System.Windows.Forms.ToolStripMenuItem(); this.closeFormFileMainMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.notificationLabel = new System.Windows.Forms.Label(); - this.addItemButton = new System.Windows.Forms.Button(); - this.adItemTextBox = new System.Windows.Forms.TextBox(); - this.addItemLabel = new System.Windows.Forms.Label(); this.mainLayoutPanel.SuspendLayout(); this.columnOnePanel.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -57,23 +57,23 @@ this.mainLayoutPanel.Controls.Add(this.menuStrip1, 0, 0); this.mainLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.mainLayoutPanel.Location = new System.Drawing.Point(0, 0); - this.mainLayoutPanel.Margin = new System.Windows.Forms.Padding(2); + this.mainLayoutPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.mainLayoutPanel.Name = "mainLayoutPanel"; this.mainLayoutPanel.RowCount = 3; - this.mainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 19F)); + this.mainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F)); this.mainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.mainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.mainLayoutPanel.Size = new System.Drawing.Size(496, 445); + this.mainLayoutPanel.Size = new System.Drawing.Size(909, 822); this.mainLayoutPanel.TabIndex = 0; // // adItemListView // this.adItemListView.Dock = System.Windows.Forms.DockStyle.Fill; - this.adItemListView.Location = new System.Drawing.Point(225, 21); - this.adItemListView.Margin = new System.Windows.Forms.Padding(2); + this.adItemListView.Location = new System.Drawing.Point(413, 39); + this.adItemListView.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.adItemListView.Name = "adItemListView"; this.mainLayoutPanel.SetRowSpan(this.adItemListView, 2); - this.adItemListView.Size = new System.Drawing.Size(269, 422); + this.adItemListView.Size = new System.Drawing.Size(492, 779); this.adItemListView.Sorting = System.Windows.Forms.SortOrder.Ascending; this.adItemListView.TabIndex = 5; this.adItemListView.UseCompatibleStateImageBehavior = false; @@ -89,20 +89,59 @@ this.columnOnePanel.Controls.Add(this.adItemFilterComboBox); this.columnOnePanel.Controls.Add(this.letterSelectionLabel); this.columnOnePanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.columnOnePanel.Location = new System.Drawing.Point(2, 21); - this.columnOnePanel.Margin = new System.Windows.Forms.Padding(2); + this.columnOnePanel.Location = new System.Drawing.Point(4, 39); + this.columnOnePanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.columnOnePanel.Name = "columnOnePanel"; this.mainLayoutPanel.SetRowSpan(this.columnOnePanel, 2); - this.columnOnePanel.Size = new System.Drawing.Size(219, 422); + this.columnOnePanel.Size = new System.Drawing.Size(401, 779); this.columnOnePanel.TabIndex = 1; // + // addItemLabel + // + this.addItemLabel.AutoSize = true; + this.addItemLabel.Location = new System.Drawing.Point(35, 378); + this.addItemLabel.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.addItemLabel.Name = "addItemLabel"; + this.addItemLabel.Size = new System.Drawing.Size(140, 25); + this.addItemLabel.TabIndex = 6; + this.addItemLabel.Text = "Add New Item:"; + // + // adItemTextBox + // + this.adItemTextBox.Location = new System.Drawing.Point(213, 373); + this.adItemTextBox.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.adItemTextBox.Name = "adItemTextBox"; + this.adItemTextBox.Size = new System.Drawing.Size(180, 29); + this.adItemTextBox.TabIndex = 2; + // + // addItemButton + // + this.addItemButton.Enabled = false; + this.addItemButton.Location = new System.Drawing.Point(213, 421); + this.addItemButton.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); + this.addItemButton.Name = "addItemButton"; + this.addItemButton.Size = new System.Drawing.Size(183, 59); + this.addItemButton.TabIndex = 3; + this.addItemButton.Text = "Add Item"; + this.addItemButton.UseVisualStyleBackColor = true; + this.addItemButton.Click += new System.EventHandler(this.addItemButton_Click); + // + // notificationLabel + // + this.notificationLabel.AutoSize = true; + this.notificationLabel.Location = new System.Drawing.Point(17, 78); + this.notificationLabel.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.notificationLabel.Name = "notificationLabel"; + this.notificationLabel.Size = new System.Drawing.Size(0, 25); + this.notificationLabel.TabIndex = 3; + // // deleteSelectedItem // this.deleteSelectedItem.Enabled = false; - this.deleteSelectedItem.Location = new System.Drawing.Point(9, 380); - this.deleteSelectedItem.Margin = new System.Windows.Forms.Padding(2); + this.deleteSelectedItem.Location = new System.Drawing.Point(17, 702); + this.deleteSelectedItem.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.deleteSelectedItem.Name = "deleteSelectedItem"; - this.deleteSelectedItem.Size = new System.Drawing.Size(120, 33); + this.deleteSelectedItem.Size = new System.Drawing.Size(220, 61); this.deleteSelectedItem.TabIndex = 4; this.deleteSelectedItem.Text = "Delete Selected Item"; this.deleteSelectedItem.UseVisualStyleBackColor = true; @@ -112,19 +151,19 @@ // this.adItemFilterComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.adItemFilterComboBox.FormattingEnabled = true; - this.adItemFilterComboBox.Location = new System.Drawing.Point(81, 2); - this.adItemFilterComboBox.Margin = new System.Windows.Forms.Padding(2); + this.adItemFilterComboBox.Location = new System.Drawing.Point(149, 4); + this.adItemFilterComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.adItemFilterComboBox.Name = "adItemFilterComboBox"; - this.adItemFilterComboBox.Size = new System.Drawing.Size(136, 21); + this.adItemFilterComboBox.Size = new System.Drawing.Size(246, 32); this.adItemFilterComboBox.TabIndex = 1; // // letterSelectionLabel // this.letterSelectionLabel.AutoSize = true; - this.letterSelectionLabel.Location = new System.Drawing.Point(6, 2); - this.letterSelectionLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.letterSelectionLabel.Location = new System.Drawing.Point(11, 4); + this.letterSelectionLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.letterSelectionLabel.Name = "letterSelectionLabel"; - this.letterSelectionLabel.Size = new System.Drawing.Size(71, 13); + this.letterSelectionLabel.Size = new System.Drawing.Size(129, 25); this.letterSelectionLabel.TabIndex = 0; this.letterSelectionLabel.Text = "Select a filter:"; // @@ -136,8 +175,8 @@ this.fileMainMenu}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Padding = new System.Windows.Forms.Padding(4, 1, 0, 1); - this.menuStrip1.Size = new System.Drawing.Size(496, 19); + this.menuStrip1.Padding = new System.Windows.Forms.Padding(7, 2, 0, 2); + this.menuStrip1.Size = new System.Drawing.Size(909, 35); this.menuStrip1.TabIndex = 2; this.menuStrip1.Text = "menuStrip1"; // @@ -146,60 +185,25 @@ this.fileMainMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.closeFormFileMainMenu}); this.fileMainMenu.Name = "fileMainMenu"; - this.fileMainMenu.Size = new System.Drawing.Size(37, 17); + this.fileMainMenu.Size = new System.Drawing.Size(56, 31); this.fileMainMenu.Text = "&File"; // // closeFormFileMainMenu // this.closeFormFileMainMenu.Name = "closeFormFileMainMenu"; - this.closeFormFileMainMenu.Size = new System.Drawing.Size(152, 22); + this.closeFormFileMainMenu.Size = new System.Drawing.Size(208, 34); this.closeFormFileMainMenu.Text = "&Close Form"; this.closeFormFileMainMenu.Click += new System.EventHandler(this.closeFormFileMainMenu_Click); // - // notificationLabel - // - this.notificationLabel.AutoSize = true; - this.notificationLabel.Location = new System.Drawing.Point(9, 42); - this.notificationLabel.Name = "notificationLabel"; - this.notificationLabel.Size = new System.Drawing.Size(0, 13); - this.notificationLabel.TabIndex = 3; - // - // addItemButton - // - this.addItemButton.Enabled = false; - this.addItemButton.Location = new System.Drawing.Point(116, 228); - this.addItemButton.Name = "addItemButton"; - this.addItemButton.Size = new System.Drawing.Size(100, 32); - this.addItemButton.TabIndex = 3; - this.addItemButton.Text = "Add Item"; - this.addItemButton.UseVisualStyleBackColor = true; - this.addItemButton.Click += new System.EventHandler(this.addItemButton_Click); - // - // adItemTextBox - // - this.adItemTextBox.Location = new System.Drawing.Point(116, 202); - this.adItemTextBox.Name = "adItemTextBox"; - this.adItemTextBox.Size = new System.Drawing.Size(100, 20); - this.adItemTextBox.TabIndex = 2; - // - // addItemLabel - // - this.addItemLabel.AutoSize = true; - this.addItemLabel.Location = new System.Drawing.Point(19, 205); - this.addItemLabel.Name = "addItemLabel"; - this.addItemLabel.Size = new System.Drawing.Size(77, 13); - this.addItemLabel.TabIndex = 6; - this.addItemLabel.Text = "Add New Item:"; - // // FrmManageAdItems // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(496, 445); + this.AutoScaleDimensions = new System.Drawing.SizeF(168F, 168F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.ClientSize = new System.Drawing.Size(909, 822); this.Controls.Add(this.mainLayoutPanel); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MainMenuStrip = this.menuStrip1; - this.Margin = new System.Windows.Forms.Padding(2); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmManageAdItems";