diff --git a/AdvertsingProfitControl/FrmIntegrityCheck.cs b/AdvertsingProfitControl/FrmIntegrityCheck.cs index 2f8fe22..1861e43 100644 --- a/AdvertsingProfitControl/FrmIntegrityCheck.cs +++ b/AdvertsingProfitControl/FrmIntegrityCheck.cs @@ -162,10 +162,12 @@ namespace AdvertsingProfitControl if (damagedTablesListView.Items.Count == 0) { dbCcResultLabel.Text = @"No errors in the database have been detected."; + repairButton.Enabled = false; } else { dbCcResultLabel.Text = @"One or more errors have been found, refer to the 'Damaged Tables' section for details."; + repairButton.Enabled = true; } } catch (SqlException e) diff --git a/AdvertsingProfitControl/FrmLoginForm.Designer.cs b/AdvertsingProfitControl/FrmLoginForm.Designer.cs index 60ad585..b8396a1 100644 --- a/AdvertsingProfitControl/FrmLoginForm.Designer.cs +++ b/AdvertsingProfitControl/FrmLoginForm.Designer.cs @@ -49,30 +49,30 @@ // serverNameLable // this.serverNameLable.AutoSize = true; - this.serverNameLable.Location = new System.Drawing.Point(27, 64); - this.serverNameLable.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.serverNameLable.Location = new System.Drawing.Point(22, 53); + this.serverNameLable.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.serverNameLable.Name = "serverNameLable"; - this.serverNameLable.Size = new System.Drawing.Size(133, 25); + this.serverNameLable.Size = new System.Drawing.Size(105, 20); this.serverNameLable.TabIndex = 1; this.serverNameLable.Text = "Server Name:"; // // authenticationTypeLabel // this.authenticationTypeLabel.AutoSize = true; - this.authenticationTypeLabel.Location = new System.Drawing.Point(18, 130); - this.authenticationTypeLabel.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.authenticationTypeLabel.Location = new System.Drawing.Point(15, 108); + this.authenticationTypeLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); this.authenticationTypeLabel.Name = "authenticationTypeLabel"; - this.authenticationTypeLabel.Size = new System.Drawing.Size(142, 25); + this.authenticationTypeLabel.Size = new System.Drawing.Size(116, 20); this.authenticationTypeLabel.TabIndex = 3; this.authenticationTypeLabel.Text = "Authentication:"; // // connectButton // this.connectButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.connectButton.Location = new System.Drawing.Point(515, 309); - this.connectButton.Margin = new System.Windows.Forms.Padding(6); + this.connectButton.Location = new System.Drawing.Point(421, 257); + this.connectButton.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.connectButton.Name = "connectButton"; - this.connectButton.Size = new System.Drawing.Size(157, 42); + this.connectButton.Size = new System.Drawing.Size(128, 35); this.connectButton.TabIndex = 5; this.connectButton.Text = "Connect"; this.connectButton.UseVisualStyleBackColor = true; @@ -86,62 +86,69 @@ this.authenticationTypeComboBox.Items.AddRange(new object[] { "Windows Authentication", "SQL Server Authentication"}); - this.authenticationTypeComboBox.Location = new System.Drawing.Point(179, 130); + this.authenticationTypeComboBox.Location = new System.Drawing.Point(146, 108); + this.authenticationTypeComboBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.authenticationTypeComboBox.MaxDropDownItems = 5; this.authenticationTypeComboBox.Name = "authenticationTypeComboBox"; - this.authenticationTypeComboBox.Size = new System.Drawing.Size(280, 32); + this.authenticationTypeComboBox.Size = new System.Drawing.Size(230, 28); this.authenticationTypeComboBox.TabIndex = 2; // // loginLabel // this.loginLabel.AutoSize = true; - this.loginLabel.Location = new System.Drawing.Point(94, 196); + this.loginLabel.Location = new System.Drawing.Point(77, 163); + this.loginLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.loginLabel.Name = "loginLabel"; - this.loginLabel.Size = new System.Drawing.Size(66, 25); + this.loginLabel.Size = new System.Drawing.Size(52, 20); this.loginLabel.TabIndex = 6; this.loginLabel.Text = "Login:"; // // passwordLabel // this.passwordLabel.AutoSize = true; - this.passwordLabel.Location = new System.Drawing.Point(56, 262); + this.passwordLabel.Location = new System.Drawing.Point(46, 218); + this.passwordLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.passwordLabel.Name = "passwordLabel"; - this.passwordLabel.Size = new System.Drawing.Size(104, 25); + this.passwordLabel.Size = new System.Drawing.Size(82, 20); this.passwordLabel.TabIndex = 7; this.passwordLabel.Text = "Password:"; // // loginTextBox // this.loginTextBox.Enabled = false; - this.loginTextBox.Location = new System.Drawing.Point(179, 196); + this.loginTextBox.Location = new System.Drawing.Point(146, 163); + this.loginTextBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.loginTextBox.Name = "loginTextBox"; - this.loginTextBox.Size = new System.Drawing.Size(280, 29); + this.loginTextBox.Size = new System.Drawing.Size(230, 26); this.loginTextBox.TabIndex = 3; // // passwordTextBox // this.passwordTextBox.Enabled = false; - this.passwordTextBox.Location = new System.Drawing.Point(179, 259); + this.passwordTextBox.Location = new System.Drawing.Point(146, 216); + this.passwordTextBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.passwordTextBox.Name = "passwordTextBox"; this.passwordTextBox.PasswordChar = '*'; this.passwordTextBox.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.passwordTextBox.Size = new System.Drawing.Size(280, 29); + this.passwordTextBox.Size = new System.Drawing.Size(230, 26); this.passwordTextBox.TabIndex = 4; // // serverNameComboBox // this.serverNameComboBox.FormattingEnabled = true; - this.serverNameComboBox.Location = new System.Drawing.Point(179, 64); + this.serverNameComboBox.Location = new System.Drawing.Point(146, 53); + this.serverNameComboBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.serverNameComboBox.Name = "serverNameComboBox"; - this.serverNameComboBox.Size = new System.Drawing.Size(452, 32); + this.serverNameComboBox.Size = new System.Drawing.Size(371, 28); this.serverNameComboBox.TabIndex = 1; // // informationLabel // this.informationLabel.AutoSize = true; - this.informationLabel.Location = new System.Drawing.Point(12, 307); + this.informationLabel.Location = new System.Drawing.Point(10, 256); + this.informationLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.informationLabel.Name = "informationLabel"; - this.informationLabel.Size = new System.Drawing.Size(0, 25); + this.informationLabel.Size = new System.Drawing.Size(0, 20); this.informationLabel.TabIndex = 11; // // mainMenu @@ -151,7 +158,8 @@ this.databaseToolsToolStripMenuItem}); this.mainMenu.Location = new System.Drawing.Point(0, 0); this.mainMenu.Name = "mainMenu"; - this.mainMenu.Size = new System.Drawing.Size(687, 38); + this.mainMenu.Padding = new System.Windows.Forms.Padding(5, 2, 0, 2); + this.mainMenu.Size = new System.Drawing.Size(562, 33); this.mainMenu.TabIndex = 12; this.mainMenu.Text = "menuStrip1"; // @@ -161,30 +169,29 @@ this.backupRestoreMainMenu, this.checkIntegrityToolStripMenuItem}); this.databaseToolsToolStripMenuItem.Name = "databaseToolsToolStripMenuItem"; - this.databaseToolsToolStripMenuItem.Size = new System.Drawing.Size(165, 34); + this.databaseToolsToolStripMenuItem.Size = new System.Drawing.Size(144, 29); this.databaseToolsToolStripMenuItem.Text = "&Database Tools"; // // backupRestoreMainMenu // this.backupRestoreMainMenu.Name = "backupRestoreMainMenu"; - this.backupRestoreMainMenu.Size = new System.Drawing.Size(287, 34); + this.backupRestoreMainMenu.Size = new System.Drawing.Size(252, 30); this.backupRestoreMainMenu.Text = "&Backup and Restore"; this.backupRestoreMainMenu.Click += new System.EventHandler(this.backupRestoreToolStripMenuItem_Click); // // checkIntegrityToolStripMenuItem // this.checkIntegrityToolStripMenuItem.Name = "checkIntegrityToolStripMenuItem"; - this.checkIntegrityToolStripMenuItem.Size = new System.Drawing.Size(287, 34); + this.checkIntegrityToolStripMenuItem.Size = new System.Drawing.Size(252, 30); this.checkIntegrityToolStripMenuItem.Text = "&Check Integrity"; - this.checkIntegrityToolStripMenuItem.Visible = false; this.checkIntegrityToolStripMenuItem.Click += new System.EventHandler(this.checkIntegrityToolStripMenuItem_Click); // // FrmLoginForm // this.AcceptButton = this.connectButton; - this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(687, 366); + this.ClientSize = new System.Drawing.Size(562, 305); this.Controls.Add(this.informationLabel); this.Controls.Add(this.serverNameComboBox); this.Controls.Add(this.passwordTextBox); @@ -199,7 +206,7 @@ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MainMenuStrip = this.mainMenu; - this.Margin = new System.Windows.Forms.Padding(6); + this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.MaximizeBox = false; this.Name = "FrmLoginForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; diff --git a/AdvertsingProfitControl/FrmMain.Designer.cs b/AdvertsingProfitControl/FrmMain.Designer.cs index 04d51de..e4edf06 100644 --- a/AdvertsingProfitControl/FrmMain.Designer.cs +++ b/AdvertsingProfitControl/FrmMain.Designer.cs @@ -112,6 +112,7 @@ this.grossProfitEstimatedWeeklyDeptmartmentExpenseLabel = new System.Windows.Forms.Label(); this.perfectGrossProfitLabel = new System.Windows.Forms.Label(); this.grossProfitDollarGrossProfitLabel = new System.Windows.Forms.Label(); + this.checkIntegrityToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mainMenu.SuspendLayout(); this.mainTableLayoutPanel.SuspendLayout(); this.commentMainTableLayoutPanel.SuspendLayout(); @@ -138,9 +139,9 @@ // printPreviewButton // this.printPreviewButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.printPreviewButton.Location = new System.Drawing.Point(180, 271); + this.printPreviewButton.Location = new System.Drawing.Point(153, 232); this.printPreviewButton.Name = "printPreviewButton"; - this.printPreviewButton.Size = new System.Drawing.Size(174, 49); + this.printPreviewButton.Size = new System.Drawing.Size(149, 42); this.printPreviewButton.TabIndex = 4; this.printPreviewButton.Text = "Generate Report"; this.printPreviewButton.UseVisualStyleBackColor = true; @@ -160,8 +161,8 @@ this.debugMainMenu}); this.mainMenu.Location = new System.Drawing.Point(0, 0); this.mainMenu.Name = "mainMenu"; - this.mainMenu.Padding = new System.Windows.Forms.Padding(10, 3, 0, 3); - this.mainMenu.Size = new System.Drawing.Size(1847, 40); + this.mainMenu.Padding = new System.Windows.Forms.Padding(9, 3, 0, 3); + this.mainMenu.Size = new System.Drawing.Size(1583, 34); this.mainMenu.TabIndex = 1; this.mainMenu.Text = "menuStrip1"; // @@ -170,13 +171,13 @@ this.fileMainMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.exitFileMainMenu}); this.fileMainMenu.Name = "fileMainMenu"; - this.fileMainMenu.Size = new System.Drawing.Size(56, 34); + this.fileMainMenu.Size = new System.Drawing.Size(50, 28); this.fileMainMenu.Text = "&File"; // // exitFileMainMenu // this.exitFileMainMenu.Name = "exitFileMainMenu"; - this.exitFileMainMenu.Size = new System.Drawing.Size(138, 34); + this.exitFileMainMenu.Size = new System.Drawing.Size(123, 30); this.exitFileMainMenu.Text = "E&xit"; this.exitFileMainMenu.Click += new System.EventHandler(this.ExitProgram); // @@ -186,20 +187,20 @@ this.addRecordsToolStripMenuItem, this.modifyRecordMainMenu}); this.recordsToolStripMenuItem.Name = "recordsToolStripMenuItem"; - this.recordsToolStripMenuItem.Size = new System.Drawing.Size(98, 34); + this.recordsToolStripMenuItem.Size = new System.Drawing.Size(87, 28); this.recordsToolStripMenuItem.Text = "&Records"; // // addRecordsToolStripMenuItem // this.addRecordsToolStripMenuItem.Name = "addRecordsToolStripMenuItem"; - this.addRecordsToolStripMenuItem.Size = new System.Drawing.Size(323, 34); + this.addRecordsToolStripMenuItem.Size = new System.Drawing.Size(283, 30); this.addRecordsToolStripMenuItem.Text = "&Add New Record"; this.addRecordsToolStripMenuItem.Click += new System.EventHandler(this.DisplayNewRecordForm); // // modifyRecordMainMenu // this.modifyRecordMainMenu.Name = "modifyRecordMainMenu"; - this.modifyRecordMainMenu.Size = new System.Drawing.Size(323, 34); + this.modifyRecordMainMenu.Size = new System.Drawing.Size(283, 30); this.modifyRecordMainMenu.Text = "&Modify Existing Record "; this.modifyRecordMainMenu.Click += new System.EventHandler(this.DisplayModifyRecordForm); // @@ -209,20 +210,20 @@ this.generateReportMenuItem, this.settingsToolStripMenuItem}); this.reportsMainMenu.Name = "reportsMainMenu"; - this.reportsMainMenu.Size = new System.Drawing.Size(95, 34); + this.reportsMainMenu.Size = new System.Drawing.Size(85, 28); this.reportsMainMenu.Text = "R&eports"; // // generateReportMenuItem // this.generateReportMenuItem.Name = "generateReportMenuItem"; - this.generateReportMenuItem.Size = new System.Drawing.Size(256, 34); + this.generateReportMenuItem.Size = new System.Drawing.Size(224, 30); this.generateReportMenuItem.Text = "&Generate Report"; this.generateReportMenuItem.Click += new System.EventHandler(this.GenerateReportMenuItemClick); // // settingsToolStripMenuItem // this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; - this.settingsToolStripMenuItem.Size = new System.Drawing.Size(256, 34); + this.settingsToolStripMenuItem.Size = new System.Drawing.Size(224, 30); this.settingsToolStripMenuItem.Text = "&Paper Settings"; this.settingsToolStripMenuItem.Click += new System.EventHandler(this.DisplayReportSizeSettingsForm); // @@ -233,15 +234,16 @@ this.clearRecordToolsMainMenu, this.manageItemsToolsMainMenu, this.manageSuppliersToolsMainMenu, - this.adSpecialKeyWordsToolsMainMenu}); + this.adSpecialKeyWordsToolsMainMenu, + this.checkIntegrityToolStripMenuItem}); this.toolsMainMenu.Name = "toolsMainMenu"; - this.toolsMainMenu.Size = new System.Drawing.Size(72, 34); + this.toolsMainMenu.Size = new System.Drawing.Size(65, 28); this.toolsMainMenu.Text = "&Tools"; // // backupRestoreToolsMainMenu // this.backupRestoreToolsMainMenu.Name = "backupRestoreToolsMainMenu"; - this.backupRestoreToolsMainMenu.Size = new System.Drawing.Size(282, 34); + this.backupRestoreToolsMainMenu.Size = new System.Drawing.Size(247, 30); this.backupRestoreToolsMainMenu.Text = "&Database Backup"; this.backupRestoreToolsMainMenu.Click += new System.EventHandler(this.DisplayDatabaseRecoveryFormOnBackupRestoreClick); // @@ -251,41 +253,41 @@ this.clearCurrentRecordSelectedDateToolsMainMenu, this.clearCurrentActiveYearTools}); this.clearRecordToolsMainMenu.Name = "clearRecordToolsMainMenu"; - this.clearRecordToolsMainMenu.Size = new System.Drawing.Size(282, 34); + this.clearRecordToolsMainMenu.Size = new System.Drawing.Size(247, 30); this.clearRecordToolsMainMenu.Text = "&Clear Record(s)"; // // clearCurrentRecordSelectedDateToolsMainMenu // this.clearCurrentRecordSelectedDateToolsMainMenu.Name = "clearCurrentRecordSelectedDateToolsMainMenu"; - this.clearCurrentRecordSelectedDateToolsMainMenu.Size = new System.Drawing.Size(272, 34); + this.clearCurrentRecordSelectedDateToolsMainMenu.Size = new System.Drawing.Size(235, 30); this.clearCurrentRecordSelectedDateToolsMainMenu.Text = "C&urrent Record"; this.clearCurrentRecordSelectedDateToolsMainMenu.Click += new System.EventHandler(this.ClearCurrentRecord); // // clearCurrentActiveYearTools // this.clearCurrentActiveYearTools.Name = "clearCurrentActiveYearTools"; - this.clearCurrentActiveYearTools.Size = new System.Drawing.Size(272, 34); + this.clearCurrentActiveYearTools.Size = new System.Drawing.Size(235, 30); this.clearCurrentActiveYearTools.Text = "Clear Current &Year"; this.clearCurrentActiveYearTools.Click += new System.EventHandler(this.ClearActiveDateYearRecords); // // manageItemsToolsMainMenu // this.manageItemsToolsMainMenu.Name = "manageItemsToolsMainMenu"; - this.manageItemsToolsMainMenu.Size = new System.Drawing.Size(282, 34); + this.manageItemsToolsMainMenu.Size = new System.Drawing.Size(247, 30); this.manageItemsToolsMainMenu.Text = "Manage Ad &Items"; this.manageItemsToolsMainMenu.Click += new System.EventHandler(this.DisplayAdItemManager); // // manageSuppliersToolsMainMenu // this.manageSuppliersToolsMainMenu.Name = "manageSuppliersToolsMainMenu"; - this.manageSuppliersToolsMainMenu.Size = new System.Drawing.Size(282, 34); + this.manageSuppliersToolsMainMenu.Size = new System.Drawing.Size(247, 30); this.manageSuppliersToolsMainMenu.Text = "Manage &Suppliers"; this.manageSuppliersToolsMainMenu.Click += new System.EventHandler(this.manageSuppliersToolsMainMenu_Click); // // adSpecialKeyWordsToolsMainMenu // this.adSpecialKeyWordsToolsMainMenu.Name = "adSpecialKeyWordsToolsMainMenu"; - this.adSpecialKeyWordsToolsMainMenu.Size = new System.Drawing.Size(282, 34); + this.adSpecialKeyWordsToolsMainMenu.Size = new System.Drawing.Size(247, 30); this.adSpecialKeyWordsToolsMainMenu.Text = "R&egister Ad Special"; this.adSpecialKeyWordsToolsMainMenu.Click += new System.EventHandler(this.DisplayRegisterAdSpecial); // @@ -296,27 +298,27 @@ this.showHideConsoleHelpMainMenu, this.examineLogsToolStripMenuItem}); this.helpMainMenu.Name = "helpMainMenu"; - this.helpMainMenu.Size = new System.Drawing.Size(68, 34); + this.helpMainMenu.Size = new System.Drawing.Size(61, 28); this.helpMainMenu.Text = "&Help"; // // dbVersionHelpMainMenu // this.dbVersionHelpMainMenu.Name = "dbVersionHelpMainMenu"; - this.dbVersionHelpMainMenu.Size = new System.Drawing.Size(288, 34); + this.dbVersionHelpMainMenu.Size = new System.Drawing.Size(253, 30); this.dbVersionHelpMainMenu.Text = "&Verison Information"; this.dbVersionHelpMainMenu.Click += new System.EventHandler(this.DisplayProductVersionNumbers); // // showHideConsoleHelpMainMenu // this.showHideConsoleHelpMainMenu.Name = "showHideConsoleHelpMainMenu"; - this.showHideConsoleHelpMainMenu.Size = new System.Drawing.Size(288, 34); + this.showHideConsoleHelpMainMenu.Size = new System.Drawing.Size(253, 30); this.showHideConsoleHelpMainMenu.Text = "Sh&ow/Hide Console"; this.showHideConsoleHelpMainMenu.Click += new System.EventHandler(this.ShowHideLogConsole); // // examineLogsToolStripMenuItem // this.examineLogsToolStripMenuItem.Name = "examineLogsToolStripMenuItem"; - this.examineLogsToolStripMenuItem.Size = new System.Drawing.Size(288, 34); + this.examineLogsToolStripMenuItem.Size = new System.Drawing.Size(253, 30); this.examineLogsToolStripMenuItem.Text = "Examine &Logs"; this.examineLogsToolStripMenuItem.Click += new System.EventHandler(this.ViewLogFiles); // @@ -327,28 +329,28 @@ this.addRecordToolStripMenuItem, this.testToolStripMenuItem}); this.debugMainMenu.Name = "debugMainMenu"; - this.debugMainMenu.Size = new System.Drawing.Size(87, 34); + this.debugMainMenu.Size = new System.Drawing.Size(78, 28); this.debugMainMenu.Text = "Debug"; this.debugMainMenu.Visible = false; // // rawViewDebugMainMenu // this.rawViewDebugMainMenu.Name = "rawViewDebugMainMenu"; - this.rawViewDebugMainMenu.Size = new System.Drawing.Size(213, 34); + this.rawViewDebugMainMenu.Size = new System.Drawing.Size(210, 30); this.rawViewDebugMainMenu.Text = "Ra&w View"; this.rawViewDebugMainMenu.Click += new System.EventHandler(this.DisplayRawDatabaseView); // // addRecordToolStripMenuItem // this.addRecordToolStripMenuItem.Name = "addRecordToolStripMenuItem"; - this.addRecordToolStripMenuItem.Size = new System.Drawing.Size(213, 34); + this.addRecordToolStripMenuItem.Size = new System.Drawing.Size(210, 30); this.addRecordToolStripMenuItem.Text = "Add Re&cord"; this.addRecordToolStripMenuItem.Click += new System.EventHandler(this.DisplayLegacyAddRecord); // // testToolStripMenuItem // this.testToolStripMenuItem.Name = "testToolStripMenuItem"; - this.testToolStripMenuItem.Size = new System.Drawing.Size(213, 34); + this.testToolStripMenuItem.Size = new System.Drawing.Size(210, 30); this.testToolStripMenuItem.Text = "Test"; this.testToolStripMenuItem.Click += new System.EventHandler(this.testToolStripMenuItem_Click); // @@ -364,13 +366,13 @@ this.mainTableLayoutPanel.Controls.Add(this.grossProfitGroupBox, 1, 2); this.mainTableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.mainTableLayoutPanel.Location = new System.Drawing.Point(0, 0); - this.mainTableLayoutPanel.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.mainTableLayoutPanel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.mainTableLayoutPanel.Name = "mainTableLayoutPanel"; this.mainTableLayoutPanel.RowCount = 3; - this.mainTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F)); + this.mainTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 34F)); this.mainTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 60F)); this.mainTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 40F)); - this.mainTableLayoutPanel.Size = new System.Drawing.Size(1847, 892); + this.mainTableLayoutPanel.Size = new System.Drawing.Size(1583, 765); this.mainTableLayoutPanel.TabIndex = 0; // // commentMainTableLayoutPanel @@ -385,12 +387,12 @@ this.commentMainTableLayoutPanel.Controls.Add(this.taxableGroupBox, 2, 0); this.commentMainTableLayoutPanel.Controls.Add(this.dateTimeGroupBox, 0, 0); this.commentMainTableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.commentMainTableLayoutPanel.Location = new System.Drawing.Point(5, 557); - this.commentMainTableLayoutPanel.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.commentMainTableLayoutPanel.Location = new System.Drawing.Point(4, 477); + this.commentMainTableLayoutPanel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.commentMainTableLayoutPanel.Name = "commentMainTableLayoutPanel"; this.commentMainTableLayoutPanel.RowCount = 1; this.commentMainTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.commentMainTableLayoutPanel.Size = new System.Drawing.Size(1467, 329); + this.commentMainTableLayoutPanel.Size = new System.Drawing.Size(1258, 283); this.commentMainTableLayoutPanel.TabIndex = 5; // // profitAnalysisMainGroupBox @@ -404,9 +406,9 @@ this.profitAnalysisMainGroupBox.Controls.Add(this.remainingSalesLabel); this.profitAnalysisMainGroupBox.Controls.Add(this.totalProfitFromAdItemsLabel); this.profitAnalysisMainGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.profitAnalysisMainGroupBox.Location = new System.Drawing.Point(955, 3); + this.profitAnalysisMainGroupBox.Location = new System.Drawing.Point(819, 3); this.profitAnalysisMainGroupBox.Name = "profitAnalysisMainGroupBox"; - this.profitAnalysisMainGroupBox.Size = new System.Drawing.Size(509, 323); + this.profitAnalysisMainGroupBox.Size = new System.Drawing.Size(436, 277); this.profitAnalysisMainGroupBox.TabIndex = 2; this.profitAnalysisMainGroupBox.TabStop = false; this.profitAnalysisMainGroupBox.Text = "Profit Analysis"; @@ -414,9 +416,9 @@ // errorLabel // this.errorLabel.AutoSize = true; - this.errorLabel.Location = new System.Drawing.Point(11, 246); + this.errorLabel.Location = new System.Drawing.Point(9, 211); this.errorLabel.Name = "errorLabel"; - this.errorLabel.Size = new System.Drawing.Size(0, 25); + this.errorLabel.Size = new System.Drawing.Size(0, 20); this.errorLabel.TabIndex = 8; // // shrinkLinkLabel @@ -425,9 +427,9 @@ this.shrinkLinkLabel.LinkArea = new System.Windows.Forms.LinkArea(0, 0); this.shrinkLinkLabel.LinkBehavior = System.Windows.Forms.LinkBehavior.HoverUnderline; this.shrinkLinkLabel.LinkColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); - this.shrinkLinkLabel.Location = new System.Drawing.Point(11, 29); + this.shrinkLinkLabel.Location = new System.Drawing.Point(9, 25); this.shrinkLinkLabel.Name = "shrinkLinkLabel"; - this.shrinkLinkLabel.Size = new System.Drawing.Size(205, 25); + this.shrinkLinkLabel.Size = new System.Drawing.Size(164, 20); this.shrinkLinkLabel.TabIndex = 6; this.shrinkLinkLabel.Text = "Assuming 30% Shrink"; this.shrinkLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.ChangeShrinkOnLinkClick); @@ -435,60 +437,60 @@ // departmentSalesLabel // this.departmentSalesLabel.AutoSize = true; - this.departmentSalesLabel.Location = new System.Drawing.Point(11, 64); - this.departmentSalesLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.departmentSalesLabel.Location = new System.Drawing.Point(9, 55); + this.departmentSalesLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.departmentSalesLabel.Name = "departmentSalesLabel"; - this.departmentSalesLabel.Size = new System.Drawing.Size(179, 25); + this.departmentSalesLabel.Size = new System.Drawing.Size(146, 20); this.departmentSalesLabel.TabIndex = 0; this.departmentSalesLabel.Text = "Department Sales: "; // // totalProfitReturnLabel // this.totalProfitReturnLabel.AutoSize = true; - this.totalProfitReturnLabel.Location = new System.Drawing.Point(11, 279); - this.totalProfitReturnLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.totalProfitReturnLabel.Location = new System.Drawing.Point(9, 239); + this.totalProfitReturnLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.totalProfitReturnLabel.Name = "totalProfitReturnLabel"; - this.totalProfitReturnLabel.Size = new System.Drawing.Size(178, 25); + this.totalProfitReturnLabel.Size = new System.Drawing.Size(146, 20); this.totalProfitReturnLabel.TabIndex = 5; this.totalProfitReturnLabel.Text = "Total Profit Return: "; // // salesProducedLabel // this.salesProducedLabel.AutoSize = true; - this.salesProducedLabel.Location = new System.Drawing.Point(11, 97); - this.salesProducedLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.salesProducedLabel.Location = new System.Drawing.Point(9, 83); + this.salesProducedLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.salesProducedLabel.Name = "salesProducedLabel"; - this.salesProducedLabel.Size = new System.Drawing.Size(300, 25); + this.salesProducedLabel.Size = new System.Drawing.Size(240, 20); this.salesProducedLabel.TabIndex = 1; this.salesProducedLabel.Text = "Sales Produced By Ad Items (A):"; // // totalProfitReturnFromRemaingLabel // this.totalProfitReturnFromRemaingLabel.AutoSize = true; - this.totalProfitReturnFromRemaingLabel.Location = new System.Drawing.Point(11, 221); - this.totalProfitReturnFromRemaingLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.totalProfitReturnFromRemaingLabel.Location = new System.Drawing.Point(9, 189); + this.totalProfitReturnFromRemaingLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.totalProfitReturnFromRemaingLabel.Name = "totalProfitReturnFromRemaingLabel"; - this.totalProfitReturnFromRemaingLabel.Size = new System.Drawing.Size(220, 50); + this.totalProfitReturnFromRemaingLabel.Size = new System.Drawing.Size(178, 40); this.totalProfitReturnFromRemaingLabel.TabIndex = 4; this.totalProfitReturnFromRemaingLabel.Text = "Total Profit Return \r\nFrom Remaining Sales: "; // // remainingSalesLabel // this.remainingSalesLabel.AutoSize = true; - this.remainingSalesLabel.Location = new System.Drawing.Point(11, 130); - this.remainingSalesLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.remainingSalesLabel.Location = new System.Drawing.Point(9, 111); + this.remainingSalesLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.remainingSalesLabel.Name = "remainingSalesLabel"; - this.remainingSalesLabel.Size = new System.Drawing.Size(170, 25); + this.remainingSalesLabel.Size = new System.Drawing.Size(137, 20); this.remainingSalesLabel.TabIndex = 2; this.remainingSalesLabel.Text = "Remaining Sales: "; // // totalProfitFromAdItemsLabel // this.totalProfitFromAdItemsLabel.AutoSize = true; - this.totalProfitFromAdItemsLabel.Location = new System.Drawing.Point(11, 163); - this.totalProfitFromAdItemsLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.totalProfitFromAdItemsLabel.Location = new System.Drawing.Point(9, 140); + this.totalProfitFromAdItemsLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.totalProfitFromAdItemsLabel.Name = "totalProfitFromAdItemsLabel"; - this.totalProfitFromAdItemsLabel.Size = new System.Drawing.Size(182, 50); + this.totalProfitFromAdItemsLabel.Size = new System.Drawing.Size(147, 40); this.totalProfitFromAdItemsLabel.TabIndex = 3; this.totalProfitFromAdItemsLabel.Text = "Total Profit Return \r\nFrom Ad Items (B): "; // @@ -503,9 +505,9 @@ this.weeklySalesGroupBox.Controls.Add(this.wednesdayWeeklySalesLabel); this.weeklySalesGroupBox.Controls.Add(this.sundayWeeklySalesLabel); this.weeklySalesGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.weeklySalesGroupBox.Location = new System.Drawing.Point(369, 3); + this.weeklySalesGroupBox.Location = new System.Drawing.Point(317, 3); this.weeklySalesGroupBox.Name = "weeklySalesGroupBox"; - this.weeklySalesGroupBox.Size = new System.Drawing.Size(287, 323); + this.weeklySalesGroupBox.Size = new System.Drawing.Size(245, 277); this.weeklySalesGroupBox.TabIndex = 3; this.weeklySalesGroupBox.TabStop = false; this.weeklySalesGroupBox.Text = "Weekly Sales"; @@ -513,72 +515,72 @@ // saturdayWeeklySalesLabel // this.saturdayWeeklySalesLabel.AutoSize = true; - this.saturdayWeeklySalesLabel.Location = new System.Drawing.Point(7, 221); + this.saturdayWeeklySalesLabel.Location = new System.Drawing.Point(6, 189); this.saturdayWeeklySalesLabel.Name = "saturdayWeeklySalesLabel"; - this.saturdayWeeklySalesLabel.Size = new System.Drawing.Size(97, 25); + this.saturdayWeeklySalesLabel.Size = new System.Drawing.Size(77, 20); this.saturdayWeeklySalesLabel.TabIndex = 7; this.saturdayWeeklySalesLabel.Text = "Saturday:"; // // totalWeeklySalesLabel // this.totalWeeklySalesLabel.AutoSize = true; - this.totalWeeklySalesLabel.Location = new System.Drawing.Point(7, 253); + this.totalWeeklySalesLabel.Location = new System.Drawing.Point(6, 217); this.totalWeeklySalesLabel.Name = "totalWeeklySalesLabel"; - this.totalWeeklySalesLabel.Size = new System.Drawing.Size(117, 25); + this.totalWeeklySalesLabel.Size = new System.Drawing.Size(92, 20); this.totalWeeklySalesLabel.TabIndex = 6; this.totalWeeklySalesLabel.Text = "Total Sales:"; // // thursdayWeeklySalesLabel // this.thursdayWeeklySalesLabel.AutoSize = true; - this.thursdayWeeklySalesLabel.Location = new System.Drawing.Point(7, 157); + this.thursdayWeeklySalesLabel.Location = new System.Drawing.Point(6, 135); this.thursdayWeeklySalesLabel.Name = "thursdayWeeklySalesLabel"; - this.thursdayWeeklySalesLabel.Size = new System.Drawing.Size(101, 25); + this.thursdayWeeklySalesLabel.Size = new System.Drawing.Size(78, 20); this.thursdayWeeklySalesLabel.TabIndex = 5; this.thursdayWeeklySalesLabel.Text = "Thursday:"; // // fridayWeeklySalesLabel // this.fridayWeeklySalesLabel.AutoSize = true; - this.fridayWeeklySalesLabel.Location = new System.Drawing.Point(7, 189); + this.fridayWeeklySalesLabel.Location = new System.Drawing.Point(6, 162); this.fridayWeeklySalesLabel.Name = "fridayWeeklySalesLabel"; - this.fridayWeeklySalesLabel.Size = new System.Drawing.Size(72, 25); + this.fridayWeeklySalesLabel.Size = new System.Drawing.Size(56, 20); this.fridayWeeklySalesLabel.TabIndex = 4; this.fridayWeeklySalesLabel.Text = "Friday:"; // // mondayWeeklySalesLabel // this.mondayWeeklySalesLabel.AutoSize = true; - this.mondayWeeklySalesLabel.Location = new System.Drawing.Point(7, 61); + this.mondayWeeklySalesLabel.Location = new System.Drawing.Point(6, 52); this.mondayWeeklySalesLabel.Name = "mondayWeeklySalesLabel"; - this.mondayWeeklySalesLabel.Size = new System.Drawing.Size(89, 25); + this.mondayWeeklySalesLabel.Size = new System.Drawing.Size(69, 20); this.mondayWeeklySalesLabel.TabIndex = 3; this.mondayWeeklySalesLabel.Text = "Monday:"; // // tuesadayWeeklySalesLabel // this.tuesadayWeeklySalesLabel.AutoSize = true; - this.tuesadayWeeklySalesLabel.Location = new System.Drawing.Point(7, 93); + this.tuesadayWeeklySalesLabel.Location = new System.Drawing.Point(6, 80); this.tuesadayWeeklySalesLabel.Name = "tuesadayWeeklySalesLabel"; - this.tuesadayWeeklySalesLabel.Size = new System.Drawing.Size(95, 25); + this.tuesadayWeeklySalesLabel.Size = new System.Drawing.Size(73, 20); this.tuesadayWeeklySalesLabel.TabIndex = 2; this.tuesadayWeeklySalesLabel.Text = "Tuesday:"; // // wednesdayWeeklySalesLabel // this.wednesdayWeeklySalesLabel.AutoSize = true; - this.wednesdayWeeklySalesLabel.Location = new System.Drawing.Point(7, 125); + this.wednesdayWeeklySalesLabel.Location = new System.Drawing.Point(6, 107); this.wednesdayWeeklySalesLabel.Name = "wednesdayWeeklySalesLabel"; - this.wednesdayWeeklySalesLabel.Size = new System.Drawing.Size(124, 25); + this.wednesdayWeeklySalesLabel.Size = new System.Drawing.Size(97, 20); this.wednesdayWeeklySalesLabel.TabIndex = 1; this.wednesdayWeeklySalesLabel.Text = "Wednesday:"; // // sundayWeeklySalesLabel // this.sundayWeeklySalesLabel.AutoSize = true; - this.sundayWeeklySalesLabel.Location = new System.Drawing.Point(7, 29); + this.sundayWeeklySalesLabel.Location = new System.Drawing.Point(6, 25); this.sundayWeeklySalesLabel.Name = "sundayWeeklySalesLabel"; - this.sundayWeeklySalesLabel.Size = new System.Drawing.Size(86, 25); + this.sundayWeeklySalesLabel.Size = new System.Drawing.Size(67, 20); this.sundayWeeklySalesLabel.TabIndex = 0; this.sundayWeeklySalesLabel.Text = "Sunday:"; // @@ -593,9 +595,9 @@ this.taxableGroupBox.Controls.Add(this.wednesdayTaxableLabel); this.taxableGroupBox.Controls.Add(this.sundayTaxableLabel); this.taxableGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.taxableGroupBox.Location = new System.Drawing.Point(662, 3); + this.taxableGroupBox.Location = new System.Drawing.Point(568, 3); this.taxableGroupBox.Name = "taxableGroupBox"; - this.taxableGroupBox.Size = new System.Drawing.Size(287, 323); + this.taxableGroupBox.Size = new System.Drawing.Size(245, 277); this.taxableGroupBox.TabIndex = 4; this.taxableGroupBox.TabStop = false; this.taxableGroupBox.Text = "Taxable"; @@ -603,72 +605,72 @@ // mondayTaxableLabel // this.mondayTaxableLabel.AutoSize = true; - this.mondayTaxableLabel.Location = new System.Drawing.Point(6, 67); + this.mondayTaxableLabel.Location = new System.Drawing.Point(5, 57); this.mondayTaxableLabel.Name = "mondayTaxableLabel"; - this.mondayTaxableLabel.Size = new System.Drawing.Size(89, 25); + this.mondayTaxableLabel.Size = new System.Drawing.Size(69, 20); this.mondayTaxableLabel.TabIndex = 7; this.mondayTaxableLabel.Text = "Monday:"; // // tuesdayTaxableLabel // this.tuesdayTaxableLabel.AutoSize = true; - this.tuesdayTaxableLabel.Location = new System.Drawing.Point(6, 100); + this.tuesdayTaxableLabel.Location = new System.Drawing.Point(5, 86); this.tuesdayTaxableLabel.Name = "tuesdayTaxableLabel"; - this.tuesdayTaxableLabel.Size = new System.Drawing.Size(95, 25); + this.tuesdayTaxableLabel.Size = new System.Drawing.Size(73, 20); this.tuesdayTaxableLabel.TabIndex = 6; this.tuesdayTaxableLabel.Text = "Tuesday:"; // // saturdayTaxableLabel // this.saturdayTaxableLabel.AutoSize = true; - this.saturdayTaxableLabel.Location = new System.Drawing.Point(6, 232); + this.saturdayTaxableLabel.Location = new System.Drawing.Point(5, 199); this.saturdayTaxableLabel.Name = "saturdayTaxableLabel"; - this.saturdayTaxableLabel.Size = new System.Drawing.Size(97, 25); + this.saturdayTaxableLabel.Size = new System.Drawing.Size(77, 20); this.saturdayTaxableLabel.TabIndex = 5; this.saturdayTaxableLabel.Text = "Saturday:"; // // totalTaxableLabel // this.totalTaxableLabel.AutoSize = true; - this.totalTaxableLabel.Location = new System.Drawing.Point(6, 265); + this.totalTaxableLabel.Location = new System.Drawing.Point(5, 227); this.totalTaxableLabel.Name = "totalTaxableLabel"; - this.totalTaxableLabel.Size = new System.Drawing.Size(62, 25); + this.totalTaxableLabel.Size = new System.Drawing.Size(48, 20); this.totalTaxableLabel.TabIndex = 4; this.totalTaxableLabel.Text = "Total:"; // // fridayTaxableLabel // this.fridayTaxableLabel.AutoSize = true; - this.fridayTaxableLabel.Location = new System.Drawing.Point(6, 199); + this.fridayTaxableLabel.Location = new System.Drawing.Point(5, 171); this.fridayTaxableLabel.Name = "fridayTaxableLabel"; - this.fridayTaxableLabel.Size = new System.Drawing.Size(72, 25); + this.fridayTaxableLabel.Size = new System.Drawing.Size(56, 20); this.fridayTaxableLabel.TabIndex = 3; this.fridayTaxableLabel.Text = "Friday:"; // // thursdayTaxableLabel // this.thursdayTaxableLabel.AutoSize = true; - this.thursdayTaxableLabel.Location = new System.Drawing.Point(6, 166); + this.thursdayTaxableLabel.Location = new System.Drawing.Point(5, 142); this.thursdayTaxableLabel.Name = "thursdayTaxableLabel"; - this.thursdayTaxableLabel.Size = new System.Drawing.Size(101, 25); + this.thursdayTaxableLabel.Size = new System.Drawing.Size(78, 20); this.thursdayTaxableLabel.TabIndex = 2; this.thursdayTaxableLabel.Text = "Thursday:"; // // wednesdayTaxableLabel // this.wednesdayTaxableLabel.AutoSize = true; - this.wednesdayTaxableLabel.Location = new System.Drawing.Point(6, 133); + this.wednesdayTaxableLabel.Location = new System.Drawing.Point(5, 114); this.wednesdayTaxableLabel.Name = "wednesdayTaxableLabel"; - this.wednesdayTaxableLabel.Size = new System.Drawing.Size(124, 25); + this.wednesdayTaxableLabel.Size = new System.Drawing.Size(97, 20); this.wednesdayTaxableLabel.TabIndex = 1; this.wednesdayTaxableLabel.Text = "Wednesday:"; // // sundayTaxableLabel // this.sundayTaxableLabel.AutoSize = true; - this.sundayTaxableLabel.Location = new System.Drawing.Point(6, 31); + this.sundayTaxableLabel.Location = new System.Drawing.Point(5, 27); this.sundayTaxableLabel.Name = "sundayTaxableLabel"; - this.sundayTaxableLabel.Size = new System.Drawing.Size(86, 25); + this.sundayTaxableLabel.Size = new System.Drawing.Size(67, 20); this.sundayTaxableLabel.TabIndex = 0; this.sundayTaxableLabel.Text = "Sunday:"; // @@ -678,13 +680,14 @@ this.dateTimeGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; this.dateTimeGroupBox.Location = new System.Drawing.Point(3, 3); this.dateTimeGroupBox.Name = "dateTimeGroupBox"; - this.dateTimeGroupBox.Size = new System.Drawing.Size(360, 323); + this.dateTimeGroupBox.Size = new System.Drawing.Size(308, 277); this.dateTimeGroupBox.TabIndex = 5; this.dateTimeGroupBox.TabStop = false; // // monthCalendar // - this.monthCalendar.Location = new System.Drawing.Point(0, 23); + this.monthCalendar.Location = new System.Drawing.Point(0, 20); + this.monthCalendar.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8); this.monthCalendar.MaxSelectionCount = 1; this.monthCalendar.Name = "monthCalendar"; this.monthCalendar.ShowTodayCircle = false; @@ -697,21 +700,21 @@ this.mainViewTabControl.Controls.Add(this.actualSalesTab); this.mainViewTabControl.Controls.Add(this.suppliersTabPage); this.mainViewTabControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.mainViewTabControl.Location = new System.Drawing.Point(5, 46); - this.mainViewTabControl.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.mainViewTabControl.Location = new System.Drawing.Point(4, 39); + this.mainViewTabControl.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.mainViewTabControl.Name = "mainViewTabControl"; this.mainViewTabControl.SelectedIndex = 0; - this.mainViewTabControl.Size = new System.Drawing.Size(1467, 499); + this.mainViewTabControl.Size = new System.Drawing.Size(1258, 428); this.mainViewTabControl.TabIndex = 3; // // projectionTab // this.projectionTab.Controls.Add(this.projectionsDataGridView); - this.projectionTab.Location = new System.Drawing.Point(4, 33); - this.projectionTab.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.projectionTab.Location = new System.Drawing.Point(4, 29); + this.projectionTab.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.projectionTab.Name = "projectionTab"; - this.projectionTab.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.projectionTab.Size = new System.Drawing.Size(1459, 462); + this.projectionTab.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.projectionTab.Size = new System.Drawing.Size(1250, 395); this.projectionTab.TabIndex = 0; this.projectionTab.Text = "Projections"; this.projectionTab.UseVisualStyleBackColor = true; @@ -726,23 +729,23 @@ this.projectionsDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.projectionsDataGridView.Dock = System.Windows.Forms.DockStyle.Fill; this.projectionsDataGridView.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnKeystroke; - this.projectionsDataGridView.Location = new System.Drawing.Point(5, 6); - this.projectionsDataGridView.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.projectionsDataGridView.Location = new System.Drawing.Point(4, 5); + this.projectionsDataGridView.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.projectionsDataGridView.Name = "projectionsDataGridView"; this.projectionsDataGridView.ReadOnly = true; this.projectionsDataGridView.RowHeadersVisible = false; this.projectionsDataGridView.ShowCellErrors = false; this.projectionsDataGridView.ShowRowErrors = false; - this.projectionsDataGridView.Size = new System.Drawing.Size(1449, 450); + this.projectionsDataGridView.Size = new System.Drawing.Size(1242, 385); this.projectionsDataGridView.TabIndex = 0; // // inventoryTabPage // this.inventoryTabPage.Controls.Add(this.inventoryDataGridView); - this.inventoryTabPage.Location = new System.Drawing.Point(4, 33); + this.inventoryTabPage.Location = new System.Drawing.Point(4, 29); this.inventoryTabPage.Name = "inventoryTabPage"; this.inventoryTabPage.Padding = new System.Windows.Forms.Padding(3); - this.inventoryTabPage.Size = new System.Drawing.Size(1459, 462); + this.inventoryTabPage.Size = new System.Drawing.Size(1249, 395); this.inventoryTabPage.TabIndex = 4; this.inventoryTabPage.Text = "Inventory"; this.inventoryTabPage.UseVisualStyleBackColor = true; @@ -761,16 +764,16 @@ this.inventoryDataGridView.RowHeadersVisible = false; this.inventoryDataGridView.RowTemplate.Height = 28; this.inventoryDataGridView.ShowRowErrors = false; - this.inventoryDataGridView.Size = new System.Drawing.Size(1453, 456); + this.inventoryDataGridView.Size = new System.Drawing.Size(1243, 389); this.inventoryDataGridView.TabIndex = 0; // // actualSalesTab // this.actualSalesTab.Controls.Add(this.actualSalesMainLayoutPanel); - this.actualSalesTab.Location = new System.Drawing.Point(4, 33); - this.actualSalesTab.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.actualSalesTab.Location = new System.Drawing.Point(4, 29); + this.actualSalesTab.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.actualSalesTab.Name = "actualSalesTab"; - this.actualSalesTab.Size = new System.Drawing.Size(1459, 462); + this.actualSalesTab.Size = new System.Drawing.Size(1249, 395); this.actualSalesTab.TabIndex = 2; this.actualSalesTab.Text = "Actual Sales"; this.actualSalesTab.UseVisualStyleBackColor = true; @@ -782,12 +785,12 @@ this.actualSalesMainLayoutPanel.Controls.Add(this.actualSalesDataGridView, 0, 0); this.actualSalesMainLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.actualSalesMainLayoutPanel.Location = new System.Drawing.Point(0, 0); - this.actualSalesMainLayoutPanel.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.actualSalesMainLayoutPanel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.actualSalesMainLayoutPanel.Name = "actualSalesMainLayoutPanel"; this.actualSalesMainLayoutPanel.RowCount = 1; this.actualSalesMainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.actualSalesMainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 462F)); - this.actualSalesMainLayoutPanel.Size = new System.Drawing.Size(1459, 462); + this.actualSalesMainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 396F)); + this.actualSalesMainLayoutPanel.Size = new System.Drawing.Size(1249, 395); this.actualSalesMainLayoutPanel.TabIndex = 0; // // actualSalesDataGridView @@ -800,24 +803,24 @@ this.actualSalesDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.actualSalesDataGridView.Dock = System.Windows.Forms.DockStyle.Fill; this.actualSalesDataGridView.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnKeystroke; - this.actualSalesDataGridView.Location = new System.Drawing.Point(5, 6); - this.actualSalesDataGridView.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.actualSalesDataGridView.Location = new System.Drawing.Point(4, 5); + this.actualSalesDataGridView.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.actualSalesDataGridView.Name = "actualSalesDataGridView"; this.actualSalesDataGridView.ReadOnly = true; this.actualSalesDataGridView.RowHeadersVisible = false; this.actualSalesDataGridView.ShowCellErrors = false; this.actualSalesDataGridView.ShowRowErrors = false; - this.actualSalesDataGridView.Size = new System.Drawing.Size(1449, 450); + this.actualSalesDataGridView.Size = new System.Drawing.Size(1241, 385); this.actualSalesDataGridView.TabIndex = 1; // // suppliersTabPage // this.suppliersTabPage.Controls.Add(this.invoicesDataGridView); - this.suppliersTabPage.Location = new System.Drawing.Point(4, 33); - this.suppliersTabPage.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.suppliersTabPage.Location = new System.Drawing.Point(4, 29); + this.suppliersTabPage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.suppliersTabPage.Name = "suppliersTabPage"; - this.suppliersTabPage.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.suppliersTabPage.Size = new System.Drawing.Size(1459, 462); + this.suppliersTabPage.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.suppliersTabPage.Size = new System.Drawing.Size(1249, 395); this.suppliersTabPage.TabIndex = 1; this.suppliersTabPage.Text = "Invoices"; this.suppliersTabPage.UseVisualStyleBackColor = true; @@ -832,28 +835,28 @@ this.invoicesDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.invoicesDataGridView.Dock = System.Windows.Forms.DockStyle.Fill; this.invoicesDataGridView.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnKeystroke; - this.invoicesDataGridView.Location = new System.Drawing.Point(5, 6); - this.invoicesDataGridView.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.invoicesDataGridView.Location = new System.Drawing.Point(4, 5); + this.invoicesDataGridView.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.invoicesDataGridView.Name = "invoicesDataGridView"; this.invoicesDataGridView.ReadOnly = true; this.invoicesDataGridView.RowHeadersVisible = false; - this.invoicesDataGridView.Size = new System.Drawing.Size(1449, 450); + this.invoicesDataGridView.Size = new System.Drawing.Size(1241, 385); this.invoicesDataGridView.TabIndex = 0; // // commentsAndAnalysisLayoutPanel // this.commentsAndAnalysisLayoutPanel.ColumnCount = 1; this.commentsAndAnalysisLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.commentsAndAnalysisLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.commentsAndAnalysisLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.commentsAndAnalysisLayoutPanel.Controls.Add(this.costAnalysisGroupBox, 0, 1); this.commentsAndAnalysisLayoutPanel.Controls.Add(this.commentMainGroupBox, 0, 0); this.commentsAndAnalysisLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.commentsAndAnalysisLayoutPanel.Location = new System.Drawing.Point(1480, 43); + this.commentsAndAnalysisLayoutPanel.Location = new System.Drawing.Point(1269, 37); this.commentsAndAnalysisLayoutPanel.Name = "commentsAndAnalysisLayoutPanel"; this.commentsAndAnalysisLayoutPanel.RowCount = 2; this.commentsAndAnalysisLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.commentsAndAnalysisLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.commentsAndAnalysisLayoutPanel.Size = new System.Drawing.Size(364, 505); + this.commentsAndAnalysisLayoutPanel.Size = new System.Drawing.Size(311, 432); this.commentsAndAnalysisLayoutPanel.TabIndex = 6; // // costAnalysisGroupBox @@ -865,9 +868,9 @@ this.costAnalysisGroupBox.Controls.Add(this.salesPerManHourLabel); this.costAnalysisGroupBox.Controls.Add(this.button1); this.costAnalysisGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.costAnalysisGroupBox.Location = new System.Drawing.Point(3, 255); + this.costAnalysisGroupBox.Location = new System.Drawing.Point(3, 219); this.costAnalysisGroupBox.Name = "costAnalysisGroupBox"; - this.costAnalysisGroupBox.Size = new System.Drawing.Size(358, 247); + this.costAnalysisGroupBox.Size = new System.Drawing.Size(305, 210); this.costAnalysisGroupBox.TabIndex = 4; this.costAnalysisGroupBox.TabStop = false; this.costAnalysisGroupBox.Text = "Cost Analysis"; @@ -875,9 +878,9 @@ // usePreRenderedFilesCheckbox // this.usePreRenderedFilesCheckbox.AutoSize = true; - this.usePreRenderedFilesCheckbox.Location = new System.Drawing.Point(7, 208); + this.usePreRenderedFilesCheckbox.Location = new System.Drawing.Point(6, 178); this.usePreRenderedFilesCheckbox.Name = "usePreRenderedFilesCheckbox"; - this.usePreRenderedFilesCheckbox.Size = new System.Drawing.Size(239, 29); + this.usePreRenderedFilesCheckbox.Size = new System.Drawing.Size(198, 24); this.usePreRenderedFilesCheckbox.TabIndex = 5; this.usePreRenderedFilesCheckbox.Text = "Use Pre-rendered Files"; this.usePreRenderedFilesCheckbox.UseVisualStyleBackColor = true; @@ -886,44 +889,44 @@ // suppliesLabel // this.suppliesLabel.AutoSize = true; - this.suppliesLabel.Location = new System.Drawing.Point(8, 149); + this.suppliesLabel.Location = new System.Drawing.Point(7, 128); this.suppliesLabel.Name = "suppliesLabel"; - this.suppliesLabel.Size = new System.Drawing.Size(94, 25); + this.suppliesLabel.Size = new System.Drawing.Size(74, 20); this.suppliesLabel.TabIndex = 8; this.suppliesLabel.Text = "Supplies:"; // // salaryDollarsLabel // this.salaryDollarsLabel.AutoSize = true; - this.salaryDollarsLabel.Location = new System.Drawing.Point(8, 109); + this.salaryDollarsLabel.Location = new System.Drawing.Point(7, 93); this.salaryDollarsLabel.Name = "salaryDollarsLabel"; - this.salaryDollarsLabel.Size = new System.Drawing.Size(139, 25); + this.salaryDollarsLabel.Size = new System.Drawing.Size(110, 20); this.salaryDollarsLabel.TabIndex = 7; this.salaryDollarsLabel.Text = "Salary Dollars:"; // // salaryPercentageLabel // this.salaryPercentageLabel.AutoSize = true; - this.salaryPercentageLabel.Location = new System.Drawing.Point(8, 69); + this.salaryPercentageLabel.Location = new System.Drawing.Point(7, 59); this.salaryPercentageLabel.Name = "salaryPercentageLabel"; - this.salaryPercentageLabel.Size = new System.Drawing.Size(179, 25); + this.salaryPercentageLabel.Size = new System.Drawing.Size(143, 20); this.salaryPercentageLabel.TabIndex = 6; this.salaryPercentageLabel.Text = "Salary Percentage:"; // // salesPerManHourLabel // this.salesPerManHourLabel.AutoSize = true; - this.salesPerManHourLabel.Location = new System.Drawing.Point(8, 29); + this.salesPerManHourLabel.Location = new System.Drawing.Point(7, 25); this.salesPerManHourLabel.Name = "salesPerManHourLabel"; - this.salesPerManHourLabel.Size = new System.Drawing.Size(194, 25); + this.salesPerManHourLabel.Size = new System.Drawing.Size(155, 20); this.salesPerManHourLabel.TabIndex = 5; this.salesPerManHourLabel.Text = "Sales Per Man Hour:"; // // button1 // - this.button1.Location = new System.Drawing.Point(37, 303); + this.button1.Location = new System.Drawing.Point(32, 260); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(138, 49); + this.button1.Size = new System.Drawing.Size(118, 42); this.button1.TabIndex = 4; this.button1.Text = "Print Preview"; this.button1.UseVisualStyleBackColor = true; @@ -933,11 +936,11 @@ // this.commentMainGroupBox.Controls.Add(this.commentsTextBox); this.commentMainGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.commentMainGroupBox.Location = new System.Drawing.Point(5, 6); - this.commentMainGroupBox.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.commentMainGroupBox.Location = new System.Drawing.Point(4, 5); + this.commentMainGroupBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.commentMainGroupBox.Name = "commentMainGroupBox"; - this.commentMainGroupBox.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.commentMainGroupBox.Size = new System.Drawing.Size(354, 240); + this.commentMainGroupBox.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.commentMainGroupBox.Size = new System.Drawing.Size(303, 206); this.commentMainGroupBox.TabIndex = 1; this.commentMainGroupBox.TabStop = false; this.commentMainGroupBox.Text = "Comments"; @@ -945,12 +948,12 @@ // commentsTextBox // this.commentsTextBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.commentsTextBox.Location = new System.Drawing.Point(5, 28); + this.commentsTextBox.Location = new System.Drawing.Point(4, 24); this.commentsTextBox.Multiline = true; this.commentsTextBox.Name = "commentsTextBox"; this.commentsTextBox.ReadOnly = true; this.commentsTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.commentsTextBox.Size = new System.Drawing.Size(344, 206); + this.commentsTextBox.Size = new System.Drawing.Size(295, 177); this.commentsTextBox.TabIndex = 0; // // grossProfitGroupBox @@ -962,9 +965,9 @@ this.grossProfitGroupBox.Controls.Add(this.perfectGrossProfitLabel); this.grossProfitGroupBox.Controls.Add(this.grossProfitDollarGrossProfitLabel); this.grossProfitGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.grossProfitGroupBox.Location = new System.Drawing.Point(1480, 554); + this.grossProfitGroupBox.Location = new System.Drawing.Point(1269, 475); this.grossProfitGroupBox.Name = "grossProfitGroupBox"; - this.grossProfitGroupBox.Size = new System.Drawing.Size(364, 335); + this.grossProfitGroupBox.Size = new System.Drawing.Size(311, 287); this.grossProfitGroupBox.TabIndex = 7; this.grossProfitGroupBox.TabStop = false; this.grossProfitGroupBox.Text = "Gross Profit"; @@ -972,56 +975,63 @@ // grossProfitLessCostOfSales // this.grossProfitLessCostOfSales.AutoSize = true; - this.grossProfitLessCostOfSales.Location = new System.Drawing.Point(6, 67); + this.grossProfitLessCostOfSales.Location = new System.Drawing.Point(5, 57); this.grossProfitLessCostOfSales.Name = "grossProfitLessCostOfSales"; - this.grossProfitLessCostOfSales.Size = new System.Drawing.Size(187, 25); + this.grossProfitLessCostOfSales.Size = new System.Drawing.Size(150, 20); this.grossProfitLessCostOfSales.TabIndex = 1; this.grossProfitLessCostOfSales.Text = "Less Cost of Sales: "; // // grossProfitTotalSales // this.grossProfitTotalSales.AutoSize = true; - this.grossProfitTotalSales.Location = new System.Drawing.Point(6, 35); + this.grossProfitTotalSales.Location = new System.Drawing.Point(5, 30); this.grossProfitTotalSales.Name = "grossProfitTotalSales"; - this.grossProfitTotalSales.Size = new System.Drawing.Size(122, 25); + this.grossProfitTotalSales.Size = new System.Drawing.Size(96, 20); this.grossProfitTotalSales.TabIndex = 0; this.grossProfitTotalSales.Text = "Total Sales: "; // // grossProfitEstimatedWeeklyDeptmartmentExpenseLabel // this.grossProfitEstimatedWeeklyDeptmartmentExpenseLabel.AutoSize = true; - this.grossProfitEstimatedWeeklyDeptmartmentExpenseLabel.Location = new System.Drawing.Point(6, 163); + this.grossProfitEstimatedWeeklyDeptmartmentExpenseLabel.Location = new System.Drawing.Point(5, 140); this.grossProfitEstimatedWeeklyDeptmartmentExpenseLabel.Name = "grossProfitEstimatedWeeklyDeptmartmentExpenseLabel"; - this.grossProfitEstimatedWeeklyDeptmartmentExpenseLabel.Size = new System.Drawing.Size(206, 50); + this.grossProfitEstimatedWeeklyDeptmartmentExpenseLabel.Size = new System.Drawing.Size(168, 40); this.grossProfitEstimatedWeeklyDeptmartmentExpenseLabel.TabIndex = 4; this.grossProfitEstimatedWeeklyDeptmartmentExpenseLabel.Text = "Estimated Weekly \r\nDepartment Expense: "; // // perfectGrossProfitLabel // this.perfectGrossProfitLabel.AutoSize = true; - this.perfectGrossProfitLabel.Location = new System.Drawing.Point(6, 131); + this.perfectGrossProfitLabel.Location = new System.Drawing.Point(5, 112); this.perfectGrossProfitLabel.Name = "perfectGrossProfitLabel"; - this.perfectGrossProfitLabel.Size = new System.Drawing.Size(196, 25); + this.perfectGrossProfitLabel.Size = new System.Drawing.Size(160, 20); this.perfectGrossProfitLabel.TabIndex = 3; this.perfectGrossProfitLabel.Text = "Percent Gross Profit: "; // // grossProfitDollarGrossProfitLabel // this.grossProfitDollarGrossProfitLabel.AutoSize = true; - this.grossProfitDollarGrossProfitLabel.Location = new System.Drawing.Point(6, 99); + this.grossProfitDollarGrossProfitLabel.Location = new System.Drawing.Point(5, 85); this.grossProfitDollarGrossProfitLabel.Name = "grossProfitDollarGrossProfitLabel"; - this.grossProfitDollarGrossProfitLabel.Size = new System.Drawing.Size(179, 25); + this.grossProfitDollarGrossProfitLabel.Size = new System.Drawing.Size(146, 20); this.grossProfitDollarGrossProfitLabel.TabIndex = 2; this.grossProfitDollarGrossProfitLabel.Text = "Dollar Gross Profit: "; // + // checkIntegrityToolStripMenuItem + // + this.checkIntegrityToolStripMenuItem.Name = "checkIntegrityToolStripMenuItem"; + this.checkIntegrityToolStripMenuItem.Size = new System.Drawing.Size(247, 30); + this.checkIntegrityToolStripMenuItem.Text = "&Check Integrity"; + this.checkIntegrityToolStripMenuItem.Click += new System.EventHandler(this.checkIntegrityToolStripMenuItem_Click); + // // FrmMain // - this.AutoScaleDimensions = new System.Drawing.SizeF(168F, 168F); + this.AutoScaleDimensions = new System.Drawing.SizeF(144F, 144F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.ClientSize = new System.Drawing.Size(1847, 892); + this.ClientSize = new System.Drawing.Size(1583, 765); this.Controls.Add(this.mainTableLayoutPanel); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.Name = "FrmMain"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Advertising Profit Control"; @@ -1145,6 +1155,7 @@ private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem generateReportMenuItem; private System.Windows.Forms.ToolStripMenuItem backupRestoreToolsMainMenu; + private System.Windows.Forms.ToolStripMenuItem checkIntegrityToolStripMenuItem; } } diff --git a/AdvertsingProfitControl/FrmMain.cs b/AdvertsingProfitControl/FrmMain.cs index feb49d4..4dd548b 100644 --- a/AdvertsingProfitControl/FrmMain.cs +++ b/AdvertsingProfitControl/FrmMain.cs @@ -277,6 +277,14 @@ namespace AdvertsingProfitControl RowParser.BuildAdSpecialListings(); } + private void checkIntegrityToolStripMenuItem_Click(object sender, EventArgs e) + { + //Considering we're at the main form, it can be a safe bet that this program's connection string + //property is set correctly, so simply use that for the Integrity form. + var t = new FrmIntegrityCheck(Properties.Settings.Default.ConnectionString); + t.ShowDialog(); + } + private void ShowHideLogConsole(object sender, EventArgs e) { if (_console.IsVisable) @@ -1136,10 +1144,7 @@ namespace AdvertsingProfitControl private void testToolStripMenuItem_Click(object sender, EventArgs e) { - //Considering we're at the main form, it can be a safe bet that this program's connection string - //property is set correctly, so simply use that for the Integrity form. - var t = new FrmIntegrityCheck(Properties.Settings.Default.ConnectionString); - t.ShowDialog(); + MessageBox.Show("You shouldn't be seeing this message box btw.", "No Easter Eggs Here!"); } } } \ No newline at end of file diff --git a/AdvertsingProfitControl/frmIntegrityCheck.Designer.cs b/AdvertsingProfitControl/frmIntegrityCheck.Designer.cs index 6da9607..45f8987 100644 --- a/AdvertsingProfitControl/frmIntegrityCheck.Designer.cs +++ b/AdvertsingProfitControl/frmIntegrityCheck.Designer.cs @@ -62,23 +62,26 @@ this.mainLayoutPanel.Controls.Add(this.informationLabel, 1, 1); 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, 2, 2, 2); this.mainLayoutPanel.Name = "mainLayoutPanel"; this.mainLayoutPanel.RowCount = 4; - this.mainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); + this.mainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); this.mainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); this.mainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); this.mainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); - this.mainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.mainLayoutPanel.Size = new System.Drawing.Size(1087, 754); + this.mainLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); + this.mainLayoutPanel.Size = new System.Drawing.Size(889, 628); this.mainLayoutPanel.TabIndex = 0; // // systemTablesGroupBox // this.systemTablesGroupBox.Controls.Add(this.systemTablesListBox); this.systemTablesGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.systemTablesGroupBox.Location = new System.Drawing.Point(3, 33); + this.systemTablesGroupBox.Location = new System.Drawing.Point(2, 27); + this.systemTablesGroupBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.systemTablesGroupBox.Name = "systemTablesGroupBox"; - this.systemTablesGroupBox.Size = new System.Drawing.Size(537, 235); + this.systemTablesGroupBox.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.systemTablesGroupBox.Size = new System.Drawing.Size(440, 197); this.systemTablesGroupBox.TabIndex = 0; this.systemTablesGroupBox.TabStop = false; this.systemTablesGroupBox.Text = "System Tables"; @@ -87,19 +90,22 @@ // this.systemTablesListBox.Dock = System.Windows.Forms.DockStyle.Fill; this.systemTablesListBox.FormattingEnabled = true; - this.systemTablesListBox.ItemHeight = 24; - this.systemTablesListBox.Location = new System.Drawing.Point(3, 25); + this.systemTablesListBox.ItemHeight = 20; + this.systemTablesListBox.Location = new System.Drawing.Point(2, 21); + this.systemTablesListBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.systemTablesListBox.Name = "systemTablesListBox"; - this.systemTablesListBox.Size = new System.Drawing.Size(531, 207); + this.systemTablesListBox.Size = new System.Drawing.Size(436, 174); this.systemTablesListBox.TabIndex = 0; // // userTablesGroupBox // this.userTablesGroupBox.Controls.Add(this.userTablesListBox); this.userTablesGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.userTablesGroupBox.Location = new System.Drawing.Point(3, 274); + this.userTablesGroupBox.Location = new System.Drawing.Point(2, 228); + this.userTablesGroupBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.userTablesGroupBox.Name = "userTablesGroupBox"; - this.userTablesGroupBox.Size = new System.Drawing.Size(537, 235); + this.userTablesGroupBox.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.userTablesGroupBox.Size = new System.Drawing.Size(440, 197); this.userTablesGroupBox.TabIndex = 1; this.userTablesGroupBox.TabStop = false; this.userTablesGroupBox.Text = "User Tables"; @@ -108,18 +114,20 @@ // this.userTablesListBox.Dock = System.Windows.Forms.DockStyle.Fill; this.userTablesListBox.FormattingEnabled = true; - this.userTablesListBox.ItemHeight = 24; - this.userTablesListBox.Location = new System.Drawing.Point(3, 25); + this.userTablesListBox.ItemHeight = 20; + this.userTablesListBox.Location = new System.Drawing.Point(2, 21); + this.userTablesListBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.userTablesListBox.Name = "userTablesListBox"; - this.userTablesListBox.Size = new System.Drawing.Size(531, 207); + this.userTablesListBox.Size = new System.Drawing.Size(436, 174); this.userTablesListBox.TabIndex = 1; // // dbCcResultLabel // this.dbCcResultLabel.AutoSize = true; - this.dbCcResultLabel.Location = new System.Drawing.Point(546, 271); + this.dbCcResultLabel.Location = new System.Drawing.Point(446, 226); + this.dbCcResultLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.dbCcResultLabel.Name = "dbCcResultLabel"; - this.dbCcResultLabel.Size = new System.Drawing.Size(0, 25); + this.dbCcResultLabel.Size = new System.Drawing.Size(0, 20); this.dbCcResultLabel.TabIndex = 0; // // databaseCheckResultPanel @@ -128,17 +136,19 @@ this.databaseCheckResultPanel.Controls.Add(this.button2); this.databaseCheckResultPanel.Controls.Add(this.repairButton); this.databaseCheckResultPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.databaseCheckResultPanel.Location = new System.Drawing.Point(546, 515); + this.databaseCheckResultPanel.Location = new System.Drawing.Point(446, 429); + this.databaseCheckResultPanel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.databaseCheckResultPanel.Name = "databaseCheckResultPanel"; - this.databaseCheckResultPanel.Size = new System.Drawing.Size(538, 236); + this.databaseCheckResultPanel.Size = new System.Drawing.Size(441, 197); this.databaseCheckResultPanel.TabIndex = 2; // // suggestionLabel // this.suggestionLabel.AutoSize = true; - this.suggestionLabel.Location = new System.Drawing.Point(10, 9); + this.suggestionLabel.Location = new System.Drawing.Point(8, 7); + this.suggestionLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.suggestionLabel.Name = "suggestionLabel"; - this.suggestionLabel.Size = new System.Drawing.Size(80, 25); + this.suggestionLabel.Size = new System.Drawing.Size(65, 20); this.suggestionLabel.TabIndex = 3; this.suggestionLabel.Text = "what do"; this.suggestionLabel.Visible = false; @@ -146,9 +156,10 @@ // button2 // this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.button2.Location = new System.Drawing.Point(352, 175); + this.button2.Location = new System.Drawing.Point(289, 146); + this.button2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(177, 52); + this.button2.Size = new System.Drawing.Size(145, 43); this.button2.TabIndex = 2; this.button2.Text = "Verify Integrity"; this.button2.UseVisualStyleBackColor = true; @@ -156,9 +167,11 @@ // repairButton // this.repairButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.repairButton.Location = new System.Drawing.Point(15, 175); + this.repairButton.Enabled = false; + this.repairButton.Location = new System.Drawing.Point(12, 146); + this.repairButton.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.repairButton.Name = "repairButton"; - this.repairButton.Size = new System.Drawing.Size(177, 52); + this.repairButton.Size = new System.Drawing.Size(145, 43); this.repairButton.TabIndex = 1; this.repairButton.Text = "Attempt Repairs"; this.repairButton.UseVisualStyleBackColor = true; @@ -168,9 +181,11 @@ // this.damagedTablesGroupBox.Controls.Add(this.damagedTablesListView); this.damagedTablesGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.damagedTablesGroupBox.Location = new System.Drawing.Point(3, 515); + this.damagedTablesGroupBox.Location = new System.Drawing.Point(2, 429); + this.damagedTablesGroupBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.damagedTablesGroupBox.Name = "damagedTablesGroupBox"; - this.damagedTablesGroupBox.Size = new System.Drawing.Size(537, 236); + this.damagedTablesGroupBox.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.damagedTablesGroupBox.Size = new System.Drawing.Size(440, 197); this.damagedTablesGroupBox.TabIndex = 3; this.damagedTablesGroupBox.TabStop = false; this.damagedTablesGroupBox.Text = "Damaged Tables"; @@ -178,9 +193,10 @@ // damagedTablesListView // this.damagedTablesListView.Dock = System.Windows.Forms.DockStyle.Fill; - this.damagedTablesListView.Location = new System.Drawing.Point(3, 25); + this.damagedTablesListView.Location = new System.Drawing.Point(2, 21); + this.damagedTablesListView.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.damagedTablesListView.Name = "damagedTablesListView"; - this.damagedTablesListView.Size = new System.Drawing.Size(531, 208); + this.damagedTablesListView.Size = new System.Drawing.Size(436, 174); this.damagedTablesListView.TabIndex = 0; this.damagedTablesListView.UseCompatibleStateImageBehavior = false; this.damagedTablesListView.View = System.Windows.Forms.View.List; @@ -188,19 +204,21 @@ // informationLabel // this.informationLabel.AutoSize = true; - this.informationLabel.Location = new System.Drawing.Point(546, 30); + this.informationLabel.Location = new System.Drawing.Point(446, 25); + this.informationLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.informationLabel.Name = "informationLabel"; - this.informationLabel.Size = new System.Drawing.Size(464, 125); + this.informationLabel.Size = new System.Drawing.Size(380, 100); this.informationLabel.TabIndex = 4; this.informationLabel.Text = resources.GetString("informationLabel.Text"); // // FrmIntegrityCheck // - this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1087, 754); + this.ClientSize = new System.Drawing.Size(889, 628); this.Controls.Add(this.mainLayoutPanel); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.Name = "FrmIntegrityCheck"; this.Text = "Verify Database Integrity"; this.mainLayoutPanel.ResumeLayout(false);