From c93122e5d064aa43e34ff3de65bc5b17fbd73b73 Mon Sep 17 00:00:00 2001 From: Mike Pluff Date: Wed, 31 Aug 2022 09:04:26 -0700 Subject: [PATCH] Fix Object Ref error --- SuperGrate/Main.Designer.cs | 63 ++++++++++++++++++++++--------------- SuperGrate/Main.resx | 17 +++------- 2 files changed, 42 insertions(+), 38 deletions(-) diff --git a/SuperGrate/Main.Designer.cs b/SuperGrate/Main.Designer.cs index 3f2db05..e4520ec 100644 --- a/SuperGrate/Main.Designer.cs +++ b/SuperGrate/Main.Designer.cs @@ -31,6 +31,7 @@ private void InitializeComponent() this.components = new System.ComponentModel.Container(); this.LogBox = new System.Windows.Forms.RichTextBox(); this.logTable = new System.Windows.Forms.TableLayoutPanel(); + this.pbMain = new SuperGrate.Controls.SGProgressBar(); this.spltContainer = new System.Windows.Forms.SplitContainer(); this.tblMainLayout = new System.Windows.Forms.TableLayoutPanel(); this.sourCompTabl = new System.Windows.Forms.TableLayoutPanel(); @@ -112,7 +113,7 @@ private void InitializeComponent() this.LogBox.Name = "LogBox"; this.LogBox.ReadOnly = true; this.helpProvider.SetShowHelp(this.LogBox, true); - this.LogBox.Size = new System.Drawing.Size(401, 323); + this.LogBox.Size = new System.Drawing.Size(332, 349); this.LogBox.TabIndex = 100; this.LogBox.Text = ""; this.LogBox.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.LogBox_LinkClicked); @@ -123,6 +124,7 @@ private void InitializeComponent() this.logTable.ColumnCount = 1; this.logTable.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.logTable.Controls.Add(this.LogBox, 0, 0); + this.logTable.Controls.Add(this.pbMain, 0, 1); this.logTable.Dock = System.Windows.Forms.DockStyle.Fill; this.logTable.Location = new System.Drawing.Point(0, 0); this.logTable.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); @@ -130,9 +132,21 @@ private void InitializeComponent() this.logTable.RowCount = 2; this.logTable.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.logTable.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.logTable.Size = new System.Drawing.Size(407, 361); + this.logTable.Size = new System.Drawing.Size(338, 387); this.logTable.TabIndex = 100; // + // pbMain + // + this.pbMain.Dock = System.Windows.Forms.DockStyle.Fill; + this.pbMain.ForeColor = System.Drawing.Color.Black; + this.pbMain.Location = new System.Drawing.Point(3, 361); + this.pbMain.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.pbMain.MarqueeAnimationSpeed = 30; + this.pbMain.Name = "pbMain"; + this.pbMain.Size = new System.Drawing.Size(332, 22); + this.pbMain.Style = System.Windows.Forms.ProgressBarStyle.Continuous; + this.pbMain.TabIndex = 100; + // // spltContainer // this.spltContainer.Dock = System.Windows.Forms.DockStyle.Fill; @@ -149,8 +163,8 @@ private void InitializeComponent() // this.spltContainer.Panel2.Controls.Add(this.logTable); this.spltContainer.Panel2MinSize = 300; - this.spltContainer.Size = new System.Drawing.Size(962, 361); - this.spltContainer.SplitterDistance = 551; + this.spltContainer.Size = new System.Drawing.Size(962, 387); + this.spltContainer.SplitterDistance = 620; this.spltContainer.TabIndex = 100; // // tblMainLayout @@ -178,7 +192,7 @@ private void InitializeComponent() this.tblMainLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tblMainLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 110F)); this.tblMainLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - this.tblMainLayout.Size = new System.Drawing.Size(551, 361); + this.tblMainLayout.Size = new System.Drawing.Size(620, 387); this.tblMainLayout.TabIndex = 100; this.tblMainLayout.Paint += new System.Windows.Forms.PaintEventHandler(this.tblMainLayout_Paint); // @@ -195,7 +209,7 @@ private void InitializeComponent() this.sourCompTabl.Name = "sourCompTabl"; this.sourCompTabl.RowCount = 1; this.sourCompTabl.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.sourCompTabl.Size = new System.Drawing.Size(421, 30); + this.sourCompTabl.Size = new System.Drawing.Size(490, 30); this.sourCompTabl.TabIndex = 101; // // tbSourceComputer @@ -209,7 +223,7 @@ private void InitializeComponent() this.tbSourceComputer.Margin = new System.Windows.Forms.Padding(3, 4, 6, 4); this.tbSourceComputer.Name = "tbSourceComputer"; this.helpProvider.SetShowHelp(this.tbSourceComputer, true); - this.tbSourceComputer.Size = new System.Drawing.Size(387, 27); + this.tbSourceComputer.Size = new System.Drawing.Size(456, 27); this.tbSourceComputer.TabIndex = 101; this.tbSourceComputer.TextChanged += new System.EventHandler(this.TbSourceComputer_TextChanged); this.tbSourceComputer.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TbSourceDestComputer_KeyDown); @@ -218,7 +232,7 @@ private void InitializeComponent() // this.btnAFillSrc.Dock = System.Windows.Forms.DockStyle.Fill; this.helpProvider.SetHelpString(this.btnAFillSrc, "This button will auto-fill the current computer\'s hostname."); - this.btnAFillSrc.Location = new System.Drawing.Point(396, 3); + this.btnAFillSrc.Location = new System.Drawing.Point(465, 3); this.btnAFillSrc.Margin = new System.Windows.Forms.Padding(0, 3, 2, 3); this.btnAFillSrc.Name = "btnAFillSrc"; this.helpProvider.SetShowHelp(this.btnAFillSrc, true); @@ -256,7 +270,7 @@ private void InitializeComponent() this.lblUserList.Location = new System.Drawing.Point(3, 90); this.lblUserList.Name = "lblUserList"; this.helpProvider.SetShowHelp(this.lblUserList, true); - this.lblUserList.Size = new System.Drawing.Size(124, 131); + this.lblUserList.Size = new System.Drawing.Size(124, 157); this.lblUserList.TabIndex = 100; this.lblUserList.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -267,11 +281,11 @@ private void InitializeComponent() this.btnStartStop.Enabled = false; this.helpProvider.SetHelpString(this.btnStartStop, "This button will start a migration, backup, or restoration and stop any other Sup" + "er Grate process."); - this.btnStartStop.Location = new System.Drawing.Point(3, 334); + this.btnStartStop.Location = new System.Drawing.Point(3, 360); this.btnStartStop.Margin = new System.Windows.Forms.Padding(3, 3, 2, 3); this.btnStartStop.Name = "btnStartStop"; this.helpProvider.SetShowHelp(this.btnStartStop, true); - this.btnStartStop.Size = new System.Drawing.Size(546, 24); + this.btnStartStop.Size = new System.Drawing.Size(615, 24); this.btnStartStop.TabIndex = 100; this.btnStartStop.UseVisualStyleBackColor = true; this.btnStartStop.Click += new System.EventHandler(this.BtStartStop_Click); @@ -291,7 +305,7 @@ private void InitializeComponent() this.tbleListUsersButtons.Name = "tbleListUsersButtons"; this.tbleListUsersButtons.RowCount = 1; this.tbleListUsersButtons.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tbleListUsersButtons.Size = new System.Drawing.Size(421, 30); + this.tbleListUsersButtons.Size = new System.Drawing.Size(490, 30); this.tbleListUsersButtons.TabIndex = 100; // // btnListSource @@ -302,7 +316,7 @@ private void InitializeComponent() this.btnListSource.Margin = new System.Windows.Forms.Padding(2, 3, 3, 3); this.btnListSource.Name = "btnListSource"; this.helpProvider.SetShowHelp(this.btnListSource, true); - this.btnListSource.Size = new System.Drawing.Size(135, 26); + this.btnListSource.Size = new System.Drawing.Size(158, 26); this.btnListSource.TabIndex = 100; this.btnListSource.Text = " List User Profiles"; this.btnListSource.UseVisualStyleBackColor = false; @@ -313,10 +327,10 @@ private void InitializeComponent() this.btnListStore.Dock = System.Windows.Forms.DockStyle.Fill; this.helpProvider.SetHelpString(this.btnListStore, "This button will list the user profiles that have already been backed up to the s" + "tore."); - this.btnListStore.Location = new System.Drawing.Point(143, 3); + this.btnListStore.Location = new System.Drawing.Point(166, 3); this.btnListStore.Name = "btnListStore"; this.helpProvider.SetShowHelp(this.btnListStore, true); - this.btnListStore.Size = new System.Drawing.Size(134, 26); + this.btnListStore.Size = new System.Drawing.Size(157, 26); this.btnListStore.TabIndex = 100; this.btnListStore.Text = " List Store"; this.btnListStore.Click += new System.EventHandler(this.BtnListStore_Click); @@ -327,11 +341,11 @@ private void InitializeComponent() this.btnDelete.Enabled = false; this.helpProvider.SetHelpString(this.btnDelete, "This button will delete user profiles from either the source computer or the stor" + "e."); - this.btnDelete.Location = new System.Drawing.Point(283, 3); + this.btnDelete.Location = new System.Drawing.Point(329, 3); this.btnDelete.Margin = new System.Windows.Forms.Padding(3, 3, 2, 3); this.btnDelete.Name = "btnDelete"; this.helpProvider.SetShowHelp(this.btnDelete, true); - this.btnDelete.Size = new System.Drawing.Size(136, 26); + this.btnDelete.Size = new System.Drawing.Size(159, 26); this.btnDelete.TabIndex = 100; this.btnDelete.Text = " Delete"; this.btnDelete.Click += new System.EventHandler(this.BtnDelete_Click); @@ -342,7 +356,7 @@ private void InitializeComponent() this.pnlLogoBorder.Controls.Add(this.imgLoadLogo); this.pnlLogoBorder.Dock = System.Windows.Forms.DockStyle.Fill; this.pnlLogoBorder.ForeColor = System.Drawing.Color.Transparent; - this.pnlLogoBorder.Location = new System.Drawing.Point(4, 221); + this.pnlLogoBorder.Location = new System.Drawing.Point(4, 247); this.pnlLogoBorder.Margin = new System.Windows.Forms.Padding(4, 0, 4, 4); this.pnlLogoBorder.Name = "pnlLogoBorder"; this.pnlLogoBorder.Padding = new System.Windows.Forms.Padding(1); @@ -379,14 +393,14 @@ private void InitializeComponent() this.destCompTabl.Name = "destCompTabl"; this.destCompTabl.RowCount = 1; this.destCompTabl.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.destCompTabl.Size = new System.Drawing.Size(421, 30); + this.destCompTabl.Size = new System.Drawing.Size(490, 30); this.destCompTabl.TabIndex = 102; // // btnAFillDest // this.btnAFillDest.Dock = System.Windows.Forms.DockStyle.Fill; this.helpProvider.SetHelpString(this.btnAFillDest, "This button will auto-fill the current computer\'s hostname."); - this.btnAFillDest.Location = new System.Drawing.Point(396, 3); + this.btnAFillDest.Location = new System.Drawing.Point(465, 3); this.btnAFillDest.Margin = new System.Windows.Forms.Padding(0, 3, 2, 3); this.btnAFillDest.Name = "btnAFillDest"; this.helpProvider.SetShowHelp(this.btnAFillDest, true); @@ -406,7 +420,7 @@ private void InitializeComponent() this.tbDestinationComputer.Margin = new System.Windows.Forms.Padding(3, 4, 6, 4); this.tbDestinationComputer.Name = "tbDestinationComputer"; this.helpProvider.SetShowHelp(this.tbDestinationComputer, true); - this.tbDestinationComputer.Size = new System.Drawing.Size(387, 27); + this.tbDestinationComputer.Size = new System.Drawing.Size(456, 27); this.tbDestinationComputer.TabIndex = 102; this.tbDestinationComputer.TextChanged += new System.EventHandler(this.TbDestinationComputer_TextChanged); this.tbDestinationComputer.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TbSourceDestComputer_KeyDown); @@ -424,7 +438,7 @@ private void InitializeComponent() this.listUsers.Name = "listUsers"; this.tblMainLayout.SetRowSpan(this.listUsers, 2); this.listUsers.ShowGroups = false; - this.listUsers.Size = new System.Drawing.Size(415, 235); + this.listUsers.Size = new System.Drawing.Size(484, 261); this.listUsers.TabIndex = 103; this.listUsers.UseCompatibleStateImageBehavior = false; this.listUsers.View = System.Windows.Forms.View.Details; @@ -683,14 +697,14 @@ private void InitializeComponent() this.metroLabel1.Size = new System.Drawing.Size(93, 17); this.metroLabel1.Style = MetroFramework.MetroColorStyle.Silver; this.metroLabel1.TabIndex = 101; - this.metroLabel1.Text = "| version 1.1.9"; + this.metroLabel1.Text = "| version 1.1.8"; this.metroLabel1.UseStyleColors = true; // // Main // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.BorderStyle = MetroFramework.Forms.MetroFormBorderStyle.FixedSingle; - this.ClientSize = new System.Drawing.Size(972, 426); + this.ClientSize = new System.Drawing.Size(972, 452); this.Controls.Add(this.metroLabel1); this.Controls.Add(this.spltContainer); this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -784,4 +798,3 @@ private void InitializeComponent() private MetroFramework.Controls.MetroLabel metroLabel1; } } - diff --git a/SuperGrate/Main.resx b/SuperGrate/Main.resx index 866a802..e7ef5a0 100644 --- a/SuperGrate/Main.resx +++ b/SuperGrate/Main.resx @@ -118,24 +118,15 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 341, 17 - - - 17, 17 + 258, 17 - 211, 17 + 17, 17 - 484, 17 - - - 341, 17 + 127, 17 - 640, 17 - - - 17, 17 + 379, 17 \ No newline at end of file