diff --git a/NovetusLauncher/.vs/NovetusLauncher/v14/.suo b/NovetusLauncher/.vs/NovetusLauncher/v14/.suo index c08809e..059cfbd 100644 Binary files a/NovetusLauncher/.vs/NovetusLauncher/v14/.suo and b/NovetusLauncher/.vs/NovetusLauncher/v14/.suo differ diff --git a/NovetusLauncher/NovetusFuncs/Downloader.cs b/NovetusLauncher/NovetusFuncs/Downloader.cs index d2070b0..cb627c4 100644 --- a/NovetusLauncher/NovetusFuncs/Downloader.cs +++ b/NovetusLauncher/NovetusFuncs/Downloader.cs @@ -11,15 +11,13 @@ class Downloader private string downloadOutcome; private string downloadOutcomeAddText; private static string downloadOutcomeException; - private ProgressBar downloadProgress; private SaveFileDialog saveFileDialog1; - public Downloader(string url, string name, string filter, ProgressBar progress) + public Downloader(string url, string name, string filter) { fileName = name; fileURL = url; fileFilter = filter; - downloadProgress = progress; } public void setDownloadOutcome(string text) @@ -137,9 +135,4 @@ class Downloader // Return total bytes processed to caller. return bytesProcessed; } - - void wc_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e) - { - downloadProgress.Value = e.ProgressPercentage; - } } diff --git a/NovetusLauncher/NovetusLauncher/ItemMaker.Designer.cs b/NovetusLauncher/NovetusLauncher/ItemMaker.Designer.cs index ec87d08..dc67a0d 100644 --- a/NovetusLauncher/NovetusLauncher/ItemMaker.Designer.cs +++ b/NovetusLauncher/NovetusLauncher/ItemMaker.Designer.cs @@ -44,7 +44,6 @@ namespace NovetusLauncher this.label3 = new System.Windows.Forms.Label(); this.comboBox1 = new System.Windows.Forms.ComboBox(); this.checkBox1 = new System.Windows.Forms.CheckBox(); - this.progressBar1 = new System.Windows.Forms.ProgressBar(); this.label1 = new System.Windows.Forms.Label(); this.textBox1 = new System.Windows.Forms.TextBox(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); @@ -113,7 +112,7 @@ namespace NovetusLauncher // // checkBox1 // - this.checkBox1.Location = new System.Drawing.Point(12, 126); + this.checkBox1.Location = new System.Drawing.Point(12, 109); this.checkBox1.Name = "checkBox1"; this.checkBox1.Size = new System.Drawing.Size(220, 24); this.checkBox1.TabIndex = 9; @@ -121,13 +120,6 @@ namespace NovetusLauncher this.checkBox1.UseVisualStyleBackColor = true; this.checkBox1.CheckedChanged += new System.EventHandler(this.CheckBox1CheckedChanged); // - // progressBar1 - // - this.progressBar1.Location = new System.Drawing.Point(3, 110); - this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(238, 10); - this.progressBar1.TabIndex = 10; - // // label1 // this.label1.Location = new System.Drawing.Point(33, 9); @@ -148,10 +140,9 @@ namespace NovetusLauncher this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.ClientSize = new System.Drawing.Size(244, 152); + this.ClientSize = new System.Drawing.Size(244, 136); this.Controls.Add(this.textBox1); this.Controls.Add(this.label1); - this.Controls.Add(this.progressBar1); this.Controls.Add(this.checkBox1); this.Controls.Add(this.comboBox1); this.Controls.Add(this.label3); @@ -178,7 +169,6 @@ namespace NovetusLauncher private System.Windows.Forms.TextBox textBox2; private System.Windows.Forms.Button button1; private System.Windows.Forms.CheckBox checkBox1; - private System.Windows.Forms.ProgressBar progressBar1; private System.Windows.Forms.Label label1; private System.Windows.Forms.TextBox textBox1; } diff --git a/NovetusLauncher/NovetusLauncher/ItemMaker.cs b/NovetusLauncher/NovetusLauncher/ItemMaker.cs index c127a0e..05e3848 100644 --- a/NovetusLauncher/NovetusLauncher/ItemMaker.cs +++ b/NovetusLauncher/NovetusLauncher/ItemMaker.cs @@ -48,7 +48,7 @@ namespace NovetusLauncher MessageBox.Show(helptext, "Novetus Item SDK", MessageBoxButtons.OK, MessageBoxIcon.Information); } - Downloader download = new Downloader(fullURL, textBox1.Text, "Roblox Model (*.rbxm)|*.rbxm|Roblox Mesh (*.mesh)|*.mesh|PNG Image (*.png)|*.png|WAV Sound (*.wav)|*.wav", progressBar1); + Downloader download = new Downloader(fullURL, textBox1.Text, "Roblox Model (*.rbxm)|*.rbxm|Roblox Mesh (*.mesh)|*.mesh|PNG Image (*.png)|*.png|WAV Sound (*.wav)|*.wav"); try {