diff --git a/NUS Downloader/Form1.Designer.cs b/NUS Downloader/Form1.Designer.cs index 0e27e1a..8cc55c5 100644 --- a/NUS Downloader/Form1.Designer.cs +++ b/NUS Downloader/Form1.Designer.cs @@ -33,14 +33,11 @@ this.Extrasbtn = new System.Windows.Forms.Button(); this.downloadstartbtn = new System.Windows.Forms.Button(); this.statusbox = new System.Windows.Forms.TextBox(); - this.packbox = new System.Windows.Forms.CheckBox(); this.localuse = new System.Windows.Forms.CheckBox(); this.NUSDownloader = new System.ComponentModel.BackgroundWorker(); this.label1 = new System.Windows.Forms.Label(); - this.button2 = new System.Windows.Forms.Button(); this.wadnamebox = new System.Windows.Forms.TextBox(); this.ignoreticket = new System.Windows.Forms.CheckBox(); - this.decryptbox = new System.Windows.Forms.CheckBox(); this.databaseButton = new System.Windows.Forms.Button(); this.databaseStrip = new System.Windows.Forms.ContextMenuStrip(this.components); this.SystemMenuList = new System.Windows.Forms.ToolStripMenuItem(); @@ -62,47 +59,53 @@ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.RegionCodesList = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); - this.updateDatabaseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.button3 = new System.Windows.Forms.Button(); this.extrasStrip = new System.Windows.Forms.ContextMenuStrip(this.components); - this.loadInfoFromTMDToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.proxySettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); - this.getCommonKeyMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.commonKeykeybinToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.koreanKeykkeybinToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveaswadbox = new System.Windows.Forms.CheckBox(); - this.deletecontentsbox = new System.Windows.Forms.CheckBox(); + this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); this.proxyBox = new System.Windows.Forms.GroupBox(); this.label13 = new System.Windows.Forms.Label(); this.label12 = new System.Windows.Forms.Label(); this.ProxyUser = new System.Windows.Forms.TextBox(); this.SaveProxyBtn = new System.Windows.Forms.Button(); - this.ProxyAssistBtn = new System.Windows.Forms.Button(); this.ProxyURL = new System.Windows.Forms.TextBox(); this.ProxyVerifyBox = new System.Windows.Forms.GroupBox(); + this.SaveProxyPwdPermanentBtn = new System.Windows.Forms.Button(); + this.checkBox1 = new System.Windows.Forms.CheckBox(); this.SaveProxyPwdBtn = new System.Windows.Forms.Button(); this.label14 = new System.Windows.Forms.Label(); this.ProxyPwdBox = new System.Windows.Forms.TextBox(); this.consoleCBox = new System.Windows.Forms.ComboBox(); this.scriptsbutton = new System.Windows.Forms.Button(); this.scriptsStrip = new System.Windows.Forms.ContextMenuStrip(this.components); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.titleversion = new wmgCMS.WaterMarkTextBox(); + this.titleidbox = new wmgCMS.WaterMarkTextBox(); + this.dlprogress = new wyDay.Controls.Windows7ProgressBar(); + this.ProxyAssistBtn = new System.Windows.Forms.Button(); + this.keepenccontents = new System.Windows.Forms.CheckBox(); + this.button3 = new System.Windows.Forms.Button(); + this.packbox = new System.Windows.Forms.CheckBox(); + this.decryptbox = new System.Windows.Forms.CheckBox(); + this.saveaswadbox = new System.Windows.Forms.CheckBox(); + this.updateDatabaseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.loadInfoFromTMDToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.proxySettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.getCommonKeyMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.commonKeykeybinToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.koreanKeykkeybinToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.aboutNUSDToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.scriptsLocalMenuEntry = new System.Windows.Forms.ToolStripMenuItem(); this.scriptsDatabaseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.PALMassUpdate = new System.Windows.Forms.ToolStripMenuItem(); + this.NTSCMassUpdate = new System.Windows.Forms.ToolStripMenuItem(); + this.KoreaMassUpdate = new System.Windows.Forms.ToolStripMenuItem(); this.loadNUSScriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.emulateUpdate = new System.Windows.Forms.ToolStripMenuItem(); this.uSANTSCToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.europePALToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.japanNTSCJToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.koreaToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.titleversion = new wmgCMS.WaterMarkTextBox(); - this.titleidbox = new wmgCMS.WaterMarkTextBox(); - this.dlprogress = new wyDay.Controls.Windows7ProgressBar(); - this.PALMassUpdate = new System.Windows.Forms.ToolStripMenuItem(); - this.NTSCMassUpdate = new System.Windows.Forms.ToolStripMenuItem(); - this.KoreaMassUpdate = new System.Windows.Forms.ToolStripMenuItem(); this.databaseStrip.SuspendLayout(); this.extrasStrip.SuspendLayout(); this.proxyBox.SuspendLayout(); @@ -142,25 +145,13 @@ this.statusbox.Size = new System.Drawing.Size(250, 268); this.statusbox.TabIndex = 5; // - // packbox - // - this.packbox.AutoSize = true; - this.packbox.Location = new System.Drawing.Point(12, 416); - this.packbox.Name = "packbox"; - this.packbox.Size = new System.Drawing.Size(92, 17); - this.packbox.TabIndex = 6; - this.packbox.Text = "Pack -> WAD"; - this.packbox.UseVisualStyleBackColor = true; - this.packbox.CheckedChanged += new System.EventHandler(this.packbox_CheckedChanged); - this.packbox.EnabledChanged += new System.EventHandler(this.packbox_EnabledChanged); - // // localuse // this.localuse.AutoSize = true; this.localuse.Checked = true; this.localuse.CheckState = System.Windows.Forms.CheckState.Checked; this.localuse.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.localuse.Location = new System.Drawing.Point(104, 463); + this.localuse.Location = new System.Drawing.Point(186, 391); this.localuse.Name = "localuse"; this.localuse.Size = new System.Drawing.Size(76, 17); this.localuse.TabIndex = 8; @@ -181,48 +172,27 @@ this.label1.TabIndex = 10; this.label1.Text = "v"; // - // button2 - // - this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button2.Location = new System.Drawing.Point(154, 389); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(53, 21); - this.button2.TabIndex = 14; - this.button2.Text = "About"; - this.button2.UseVisualStyleBackColor = true; - this.button2.Click += new System.EventHandler(this.button2_Click); - // // wadnamebox // this.wadnamebox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.wadnamebox.Enabled = false; this.wadnamebox.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.wadnamebox.Location = new System.Drawing.Point(102, 416); + this.wadnamebox.Location = new System.Drawing.Point(116, 416); this.wadnamebox.MaxLength = 99999; this.wadnamebox.Name = "wadnamebox"; - this.wadnamebox.Size = new System.Drawing.Size(160, 18); + this.wadnamebox.Size = new System.Drawing.Size(146, 18); this.wadnamebox.TabIndex = 17; // // ignoreticket // this.ignoreticket.AutoSize = true; - this.ignoreticket.Location = new System.Drawing.Point(104, 440); + this.ignoreticket.Location = new System.Drawing.Point(76, 391); this.ignoreticket.Name = "ignoreticket"; this.ignoreticket.Size = new System.Drawing.Size(89, 17); this.ignoreticket.TabIndex = 18; this.ignoreticket.Text = "Ignore Ticket"; this.ignoreticket.UseVisualStyleBackColor = true; // - // decryptbox - // - this.decryptbox.AutoSize = true; - this.decryptbox.Location = new System.Drawing.Point(199, 440); - this.decryptbox.Name = "decryptbox"; - this.decryptbox.Size = new System.Drawing.Size(63, 17); - this.decryptbox.TabIndex = 19; - this.decryptbox.Text = "Decrypt"; - this.decryptbox.UseVisualStyleBackColor = true; - // // databaseButton // this.databaseButton.FlatStyle = System.Windows.Forms.FlatStyle.Popup; @@ -376,25 +346,6 @@ this.toolStripSeparator4.Name = "toolStripSeparator4"; this.toolStripSeparator4.Size = new System.Drawing.Size(160, 6); // - // updateDatabaseToolStripMenuItem - // - this.updateDatabaseToolStripMenuItem.Image = global::NUS_Downloader.Properties.Resources.database_save; - this.updateDatabaseToolStripMenuItem.Name = "updateDatabaseToolStripMenuItem"; - this.updateDatabaseToolStripMenuItem.Size = new System.Drawing.Size(163, 22); - this.updateDatabaseToolStripMenuItem.Text = "Update Database"; - this.updateDatabaseToolStripMenuItem.Click += new System.EventHandler(this.updateDatabaseToolStripMenuItem_Click); - // - // button3 - // - this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button3.Location = new System.Drawing.Point(213, 383); - this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(49, 27); - this.button3.TabIndex = 31; - this.button3.Text = "Clear"; - this.button3.UseVisualStyleBackColor = true; - this.button3.Click += new System.EventHandler(this.button3_Click_1); - // // extrasStrip // this.extrasStrip.AllowMerge = false; @@ -403,81 +354,26 @@ this.toolStripSeparator3, this.proxySettingsToolStripMenuItem, this.toolStripSeparator6, - this.getCommonKeyMenuItem}); + this.getCommonKeyMenuItem, + this.toolStripSeparator5, + this.aboutNUSDToolStripMenuItem}); this.extrasStrip.Name = "extrasStrip"; - this.extrasStrip.Size = new System.Drawing.Size(183, 82); - // - // loadInfoFromTMDToolStripMenuItem - // - this.loadInfoFromTMDToolStripMenuItem.Image = global::NUS_Downloader.Properties.Resources.page_white_magnify; - this.loadInfoFromTMDToolStripMenuItem.Name = "loadInfoFromTMDToolStripMenuItem"; - this.loadInfoFromTMDToolStripMenuItem.Size = new System.Drawing.Size(182, 22); - this.loadInfoFromTMDToolStripMenuItem.Text = "Load Info from TMD"; - this.loadInfoFromTMDToolStripMenuItem.Click += new System.EventHandler(this.loadInfoFromTMDToolStripMenuItem_Click); + this.extrasStrip.Size = new System.Drawing.Size(183, 110); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; this.toolStripSeparator3.Size = new System.Drawing.Size(179, 6); // - // proxySettingsToolStripMenuItem - // - this.proxySettingsToolStripMenuItem.Image = global::NUS_Downloader.Properties.Resources.server_link; - this.proxySettingsToolStripMenuItem.Name = "proxySettingsToolStripMenuItem"; - this.proxySettingsToolStripMenuItem.Size = new System.Drawing.Size(182, 22); - this.proxySettingsToolStripMenuItem.Text = "Proxy Settings"; - this.proxySettingsToolStripMenuItem.Click += new System.EventHandler(this.proxySettingsToolStripMenuItem_Click); - // // toolStripSeparator6 // this.toolStripSeparator6.Name = "toolStripSeparator6"; this.toolStripSeparator6.Size = new System.Drawing.Size(179, 6); // - // getCommonKeyMenuItem + // toolStripSeparator5 // - this.getCommonKeyMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.commonKeykeybinToolStripMenuItem, - this.koreanKeykkeybinToolStripMenuItem}); - this.getCommonKeyMenuItem.Image = global::NUS_Downloader.Properties.Resources.key; - this.getCommonKeyMenuItem.Name = "getCommonKeyMenuItem"; - this.getCommonKeyMenuItem.Size = new System.Drawing.Size(182, 22); - this.getCommonKeyMenuItem.Text = "Retrieve Key"; - // - // commonKeykeybinToolStripMenuItem - // - this.commonKeykeybinToolStripMenuItem.Name = "commonKeykeybinToolStripMenuItem"; - this.commonKeykeybinToolStripMenuItem.Size = new System.Drawing.Size(196, 22); - this.commonKeykeybinToolStripMenuItem.Text = "Common Key (key.bin)"; - this.commonKeykeybinToolStripMenuItem.Click += new System.EventHandler(this.commonKeykeybinToolStripMenuItem_Click); - // - // koreanKeykkeybinToolStripMenuItem - // - this.koreanKeykkeybinToolStripMenuItem.Name = "koreanKeykkeybinToolStripMenuItem"; - this.koreanKeykkeybinToolStripMenuItem.Size = new System.Drawing.Size(196, 22); - this.koreanKeykkeybinToolStripMenuItem.Text = "Korean Key (kkey.bin)"; - this.koreanKeykkeybinToolStripMenuItem.Click += new System.EventHandler(this.koreanKeykkeybinToolStripMenuItem_Click); - // - // saveaswadbox - // - this.saveaswadbox.AutoSize = true; - this.saveaswadbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.saveaswadbox.Location = new System.Drawing.Point(22, 437); - this.saveaswadbox.Name = "saveaswadbox"; - this.saveaswadbox.Size = new System.Drawing.Size(58, 16); - this.saveaswadbox.TabIndex = 43; - this.saveaswadbox.Text = "SaveAs"; - this.saveaswadbox.UseVisualStyleBackColor = true; - // - // deletecontentsbox - // - this.deletecontentsbox.AutoSize = true; - this.deletecontentsbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.deletecontentsbox.Location = new System.Drawing.Point(22, 454); - this.deletecontentsbox.Name = "deletecontentsbox"; - this.deletecontentsbox.Size = new System.Drawing.Size(62, 28); - this.deletecontentsbox.TabIndex = 44; - this.deletecontentsbox.Text = "Delete\r\nContents"; - this.deletecontentsbox.UseVisualStyleBackColor = true; + this.toolStripSeparator5.Name = "toolStripSeparator5"; + this.toolStripSeparator5.Size = new System.Drawing.Size(179, 6); // // proxyBox // @@ -488,7 +384,7 @@ this.proxyBox.Controls.Add(this.SaveProxyBtn); this.proxyBox.Controls.Add(this.ProxyAssistBtn); this.proxyBox.Controls.Add(this.ProxyURL); - this.proxyBox.Location = new System.Drawing.Point(33, 221); + this.proxyBox.Location = new System.Drawing.Point(31, 250); this.proxyBox.Name = "proxyBox"; this.proxyBox.Size = new System.Drawing.Size(212, 114); this.proxyBox.TabIndex = 45; @@ -533,17 +429,6 @@ this.SaveProxyBtn.UseVisualStyleBackColor = true; this.SaveProxyBtn.Click += new System.EventHandler(this.SaveProxyBtn_Click); // - // ProxyAssistBtn - // - this.ProxyAssistBtn.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.ProxyAssistBtn.Image = global::NUS_Downloader.Properties.Resources.help; - this.ProxyAssistBtn.Location = new System.Drawing.Point(177, 79); - this.ProxyAssistBtn.Name = "ProxyAssistBtn"; - this.ProxyAssistBtn.Size = new System.Drawing.Size(29, 26); - this.ProxyAssistBtn.TabIndex = 28; - this.ProxyAssistBtn.UseVisualStyleBackColor = true; - this.ProxyAssistBtn.Click += new System.EventHandler(this.ProxyAssistBtn_Click); - // // ProxyURL // this.ProxyURL.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -555,17 +440,44 @@ // ProxyVerifyBox // this.ProxyVerifyBox.BackColor = System.Drawing.SystemColors.Control; + this.ProxyVerifyBox.Controls.Add(this.SaveProxyPwdPermanentBtn); + this.ProxyVerifyBox.Controls.Add(this.checkBox1); this.ProxyVerifyBox.Controls.Add(this.SaveProxyPwdBtn); this.ProxyVerifyBox.Controls.Add(this.label14); this.ProxyVerifyBox.Controls.Add(this.ProxyPwdBox); - this.ProxyVerifyBox.Location = new System.Drawing.Point(33, 202); + this.ProxyVerifyBox.Location = new System.Drawing.Point(31, 222); this.ProxyVerifyBox.Name = "ProxyVerifyBox"; - this.ProxyVerifyBox.Size = new System.Drawing.Size(212, 75); + this.ProxyVerifyBox.Size = new System.Drawing.Size(212, 133); this.ProxyVerifyBox.TabIndex = 46; this.ProxyVerifyBox.TabStop = false; this.ProxyVerifyBox.Text = "Verify Credentials"; this.ProxyVerifyBox.Visible = false; // + // SaveProxyPwdPermanentBtn + // + this.SaveProxyPwdPermanentBtn.Enabled = false; + this.SaveProxyPwdPermanentBtn.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + this.SaveProxyPwdPermanentBtn.Location = new System.Drawing.Point(9, 104); + this.SaveProxyPwdPermanentBtn.Name = "SaveProxyPwdPermanentBtn"; + this.SaveProxyPwdPermanentBtn.Size = new System.Drawing.Size(197, 23); + this.SaveProxyPwdPermanentBtn.TabIndex = 36; + this.SaveProxyPwdPermanentBtn.Text = "Save (To File)"; + this.SaveProxyPwdPermanentBtn.UseVisualStyleBackColor = true; + this.SaveProxyPwdPermanentBtn.Click += new System.EventHandler(this.SaveProxyPwdPermanentBtn_Click); + // + // checkBox1 + // + this.checkBox1.AutoSize = true; + this.checkBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.checkBox1.Location = new System.Drawing.Point(9, 72); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.Size = new System.Drawing.Size(197, 28); + this.checkBox1.TabIndex = 35; + this.checkBox1.Text = "I accept that by storing my password\r\nanyone can open the proxy file and view it." + + ""; + this.checkBox1.UseVisualStyleBackColor = true; + this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged); + // // SaveProxyPwdBtn // this.SaveProxyPwdBtn.FlatStyle = System.Windows.Forms.FlatStyle.Popup; @@ -598,6 +510,7 @@ // // consoleCBox // + this.consoleCBox.DropDownWidth = 38; this.consoleCBox.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.consoleCBox.FormattingEnabled = true; this.consoleCBox.Items.AddRange(new object[] { @@ -630,7 +543,183 @@ this.emulateUpdate}); this.scriptsStrip.Name = "scriptsStrip"; this.scriptsStrip.ShowItemToolTips = false; - this.scriptsStrip.Size = new System.Drawing.Size(220, 120); + this.scriptsStrip.Size = new System.Drawing.Size(220, 98); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(216, 6); + // + // titleversion + // + this.titleversion.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.titleversion.Location = new System.Drawing.Point(204, 38); + this.titleversion.MaxLength = 8; + this.titleversion.Name = "titleversion"; + this.titleversion.Size = new System.Drawing.Size(58, 20); + this.titleversion.TabIndex = 50; + this.titleversion.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.titleversion.WaterMarkColor = System.Drawing.Color.Silver; + this.titleversion.WaterMarkText = "Version"; + this.titleversion.TextChanged += new System.EventHandler(this.titleversion_TextChanged); + // + // titleidbox + // + this.titleidbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.titleidbox.Location = new System.Drawing.Point(12, 38); + this.titleidbox.MaxLength = 16; + this.titleidbox.Name = "titleidbox"; + this.titleidbox.Size = new System.Drawing.Size(176, 20); + this.titleidbox.TabIndex = 49; + this.titleidbox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.titleidbox.WaterMarkColor = System.Drawing.Color.Silver; + this.titleidbox.WaterMarkText = "Title ID"; + this.titleidbox.TextChanged += new System.EventHandler(this.titleidbox_TextChanged); + // + // dlprogress + // + this.dlprogress.ContainerControl = this; + this.dlprogress.Location = new System.Drawing.Point(12, 95); + this.dlprogress.Name = "dlprogress"; + this.dlprogress.Size = new System.Drawing.Size(250, 15); + this.dlprogress.TabIndex = 47; + // + // ProxyAssistBtn + // + this.ProxyAssistBtn.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + this.ProxyAssistBtn.Image = global::NUS_Downloader.Properties.Resources.help; + this.ProxyAssistBtn.Location = new System.Drawing.Point(177, 79); + this.ProxyAssistBtn.Name = "ProxyAssistBtn"; + this.ProxyAssistBtn.Size = new System.Drawing.Size(29, 26); + this.ProxyAssistBtn.TabIndex = 28; + this.ProxyAssistBtn.UseVisualStyleBackColor = true; + this.ProxyAssistBtn.Click += new System.EventHandler(this.ProxyAssistBtn_Click); + // + // keepenccontents + // + this.keepenccontents.Checked = true; + this.keepenccontents.CheckState = System.Windows.Forms.CheckState.Checked; + this.keepenccontents.Image = global::NUS_Downloader.Properties.Resources.package; + this.keepenccontents.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.keepenccontents.Location = new System.Drawing.Point(12, 437); + this.keepenccontents.Name = "keepenccontents"; + this.keepenccontents.Size = new System.Drawing.Size(165, 25); + this.keepenccontents.TabIndex = 52; + this.keepenccontents.Text = "Keep Encrypted Contents"; + this.keepenccontents.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.keepenccontents.UseVisualStyleBackColor = true; + // + // button3 + // + this.button3.BackColor = System.Drawing.Color.Transparent; + this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button3.Image = global::NUS_Downloader.Properties.Resources.picture_empty; + this.button3.Location = new System.Drawing.Point(239, 363); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(23, 21); + this.button3.TabIndex = 31; + this.button3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.button3.UseVisualStyleBackColor = false; + this.button3.Click += new System.EventHandler(this.button3_Click_1); + this.button3.MouseEnter += new System.EventHandler(this.button3_MouseEnter); + this.button3.MouseLeave += new System.EventHandler(this.button3_MouseLeave); + // + // packbox + // + this.packbox.Image = global::NUS_Downloader.Properties.Resources.box; + this.packbox.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.packbox.Location = new System.Drawing.Point(12, 414); + this.packbox.Name = "packbox"; + this.packbox.Size = new System.Drawing.Size(98, 22); + this.packbox.TabIndex = 6; + this.packbox.Text = " Pack WAD"; + this.packbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.packbox.UseVisualStyleBackColor = true; + this.packbox.CheckedChanged += new System.EventHandler(this.packbox_CheckedChanged); + this.packbox.EnabledChanged += new System.EventHandler(this.packbox_EnabledChanged); + // + // decryptbox + // + this.decryptbox.Image = global::NUS_Downloader.Properties.Resources.package_green; + this.decryptbox.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.decryptbox.Location = new System.Drawing.Point(12, 462); + this.decryptbox.Name = "decryptbox"; + this.decryptbox.Size = new System.Drawing.Size(172, 24); + this.decryptbox.TabIndex = 19; + this.decryptbox.Text = "Create Decrypted Contents"; + this.decryptbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.decryptbox.UseVisualStyleBackColor = true; + // + // saveaswadbox + // + this.saveaswadbox.Appearance = System.Windows.Forms.Appearance.Button; + this.saveaswadbox.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.saveaswadbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.saveaswadbox.Image = global::NUS_Downloader.Properties.Resources.disk; + this.saveaswadbox.Location = new System.Drawing.Point(230, 433); + this.saveaswadbox.Name = "saveaswadbox"; + this.saveaswadbox.Size = new System.Drawing.Size(32, 22); + this.saveaswadbox.TabIndex = 43; + this.saveaswadbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.saveaswadbox.UseVisualStyleBackColor = true; + this.saveaswadbox.MouseEnter += new System.EventHandler(this.saveaswadbox_MouseEnter); + this.saveaswadbox.MouseLeave += new System.EventHandler(this.saveaswadbox_MouseLeave); + // + // updateDatabaseToolStripMenuItem + // + this.updateDatabaseToolStripMenuItem.Image = global::NUS_Downloader.Properties.Resources.database_save; + this.updateDatabaseToolStripMenuItem.Name = "updateDatabaseToolStripMenuItem"; + this.updateDatabaseToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.updateDatabaseToolStripMenuItem.Text = "Update Database"; + this.updateDatabaseToolStripMenuItem.Click += new System.EventHandler(this.updateDatabaseToolStripMenuItem_Click); + // + // loadInfoFromTMDToolStripMenuItem + // + this.loadInfoFromTMDToolStripMenuItem.Image = global::NUS_Downloader.Properties.Resources.page_white_magnify; + this.loadInfoFromTMDToolStripMenuItem.Name = "loadInfoFromTMDToolStripMenuItem"; + this.loadInfoFromTMDToolStripMenuItem.Size = new System.Drawing.Size(182, 22); + this.loadInfoFromTMDToolStripMenuItem.Text = "Load Info from TMD"; + this.loadInfoFromTMDToolStripMenuItem.Click += new System.EventHandler(this.loadInfoFromTMDToolStripMenuItem_Click); + // + // proxySettingsToolStripMenuItem + // + this.proxySettingsToolStripMenuItem.Image = global::NUS_Downloader.Properties.Resources.server_link; + this.proxySettingsToolStripMenuItem.Name = "proxySettingsToolStripMenuItem"; + this.proxySettingsToolStripMenuItem.Size = new System.Drawing.Size(182, 22); + this.proxySettingsToolStripMenuItem.Text = "Proxy Settings"; + this.proxySettingsToolStripMenuItem.Click += new System.EventHandler(this.proxySettingsToolStripMenuItem_Click); + // + // getCommonKeyMenuItem + // + this.getCommonKeyMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.commonKeykeybinToolStripMenuItem, + this.koreanKeykkeybinToolStripMenuItem}); + this.getCommonKeyMenuItem.Image = global::NUS_Downloader.Properties.Resources.key; + this.getCommonKeyMenuItem.Name = "getCommonKeyMenuItem"; + this.getCommonKeyMenuItem.Size = new System.Drawing.Size(182, 22); + this.getCommonKeyMenuItem.Text = "Retrieve Key"; + // + // commonKeykeybinToolStripMenuItem + // + this.commonKeykeybinToolStripMenuItem.Name = "commonKeykeybinToolStripMenuItem"; + this.commonKeykeybinToolStripMenuItem.Size = new System.Drawing.Size(196, 22); + this.commonKeykeybinToolStripMenuItem.Text = "Common Key (key.bin)"; + this.commonKeykeybinToolStripMenuItem.Click += new System.EventHandler(this.commonKeykeybinToolStripMenuItem_Click); + // + // koreanKeykkeybinToolStripMenuItem + // + this.koreanKeykkeybinToolStripMenuItem.Name = "koreanKeykkeybinToolStripMenuItem"; + this.koreanKeykkeybinToolStripMenuItem.Size = new System.Drawing.Size(196, 22); + this.koreanKeykkeybinToolStripMenuItem.Text = "Korean Key (kkey.bin)"; + this.koreanKeykkeybinToolStripMenuItem.Click += new System.EventHandler(this.koreanKeykkeybinToolStripMenuItem_Click); + // + // aboutNUSDToolStripMenuItem + // + this.aboutNUSDToolStripMenuItem.Image = global::NUS_Downloader.Properties.Resources.help; + this.aboutNUSDToolStripMenuItem.Name = "aboutNUSDToolStripMenuItem"; + this.aboutNUSDToolStripMenuItem.Size = new System.Drawing.Size(182, 22); + this.aboutNUSDToolStripMenuItem.Text = "About NUSD"; + this.aboutNUSDToolStripMenuItem.Click += new System.EventHandler(this.aboutNUSDToolStripMenuItem_Click); // // scriptsLocalMenuEntry // @@ -652,6 +741,27 @@ this.scriptsDatabaseToolStripMenuItem.Size = new System.Drawing.Size(219, 22); this.scriptsDatabaseToolStripMenuItem.Text = "Scripts (Database)"; // + // PALMassUpdate + // + this.PALMassUpdate.Enabled = false; + this.PALMassUpdate.Name = "PALMassUpdate"; + this.PALMassUpdate.Size = new System.Drawing.Size(104, 22); + this.PALMassUpdate.Text = "PAL"; + // + // NTSCMassUpdate + // + this.NTSCMassUpdate.Enabled = false; + this.NTSCMassUpdate.Name = "NTSCMassUpdate"; + this.NTSCMassUpdate.Size = new System.Drawing.Size(104, 22); + this.NTSCMassUpdate.Text = "NTSC"; + // + // KoreaMassUpdate + // + this.KoreaMassUpdate.Enabled = false; + this.KoreaMassUpdate.Name = "KoreaMassUpdate"; + this.KoreaMassUpdate.Size = new System.Drawing.Size(104, 22); + this.KoreaMassUpdate.Text = "Korea"; + // // loadNUSScriptToolStripMenuItem // this.loadNUSScriptToolStripMenuItem.Image = global::NUS_Downloader.Properties.Resources.script_go; @@ -660,11 +770,6 @@ this.loadNUSScriptToolStripMenuItem.Text = "Load NUS Script"; this.loadNUSScriptToolStripMenuItem.Click += new System.EventHandler(this.loadNUSScriptToolStripMenuItem_Click); // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(216, 6); - // // emulateUpdate // this.emulateUpdate.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -702,92 +807,36 @@ this.koreaToolStripMenuItem.Size = new System.Drawing.Size(117, 22); this.koreaToolStripMenuItem.Text = "KOREA"; // - // titleversion - // - this.titleversion.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); - this.titleversion.Location = new System.Drawing.Point(204, 38); - this.titleversion.MaxLength = 8; - this.titleversion.Name = "titleversion"; - this.titleversion.Size = new System.Drawing.Size(58, 20); - this.titleversion.TabIndex = 50; - this.titleversion.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.titleversion.WaterMarkColor = System.Drawing.Color.Silver; - this.titleversion.WaterMarkText = "Version"; - this.titleversion.TextChanged += new System.EventHandler(this.titleversion_TextChanged); - // - // titleidbox - // - this.titleidbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); - this.titleidbox.Location = new System.Drawing.Point(12, 38); - this.titleidbox.MaxLength = 16; - this.titleidbox.Name = "titleidbox"; - this.titleidbox.Size = new System.Drawing.Size(176, 20); - this.titleidbox.TabIndex = 49; - this.titleidbox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.titleidbox.WaterMarkColor = System.Drawing.Color.Silver; - this.titleidbox.WaterMarkText = "Title ID"; - this.titleidbox.TextChanged += new System.EventHandler(this.titleidbox_TextChanged); - // - // dlprogress - // - this.dlprogress.ContainerControl = this; - this.dlprogress.Location = new System.Drawing.Point(12, 95); - this.dlprogress.Name = "dlprogress"; - this.dlprogress.Size = new System.Drawing.Size(250, 15); - this.dlprogress.TabIndex = 47; - // - // PALMassUpdate - // - this.PALMassUpdate.Enabled = false; - this.PALMassUpdate.Name = "PALMassUpdate"; - this.PALMassUpdate.Size = new System.Drawing.Size(152, 22); - this.PALMassUpdate.Text = "PAL"; - // - // NTSCMassUpdate - // - this.NTSCMassUpdate.Enabled = false; - this.NTSCMassUpdate.Name = "NTSCMassUpdate"; - this.NTSCMassUpdate.Size = new System.Drawing.Size(152, 22); - this.NTSCMassUpdate.Text = "NTSC"; - // - // KoreaMassUpdate - // - this.KoreaMassUpdate.Enabled = false; - this.KoreaMassUpdate.Name = "KoreaMassUpdate"; - this.KoreaMassUpdate.Size = new System.Drawing.Size(152, 22); - this.KoreaMassUpdate.Text = "Korea"; - // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(274, 492); + this.ClientSize = new System.Drawing.Size(274, 491); + this.Controls.Add(this.ProxyVerifyBox); + this.Controls.Add(this.proxyBox); this.Controls.Add(this.scriptsbutton); this.Controls.Add(this.titleversion); this.Controls.Add(this.titleidbox); this.Controls.Add(this.dlprogress); this.Controls.Add(this.consoleCBox); - this.Controls.Add(this.deletecontentsbox); - this.Controls.Add(this.button3); - this.Controls.Add(this.ProxyVerifyBox); - this.Controls.Add(this.saveaswadbox); - this.Controls.Add(this.proxyBox); - this.Controls.Add(this.wadnamebox); - this.Controls.Add(this.button2); this.Controls.Add(this.databaseButton); - this.Controls.Add(this.decryptbox); + this.Controls.Add(this.keepenccontents); + this.Controls.Add(this.button3); this.Controls.Add(this.label1); - this.Controls.Add(this.packbox); this.Controls.Add(this.statusbox); - this.Controls.Add(this.ignoreticket); this.Controls.Add(this.downloadstartbtn); - this.Controls.Add(this.localuse); + this.Controls.Add(this.wadnamebox); this.Controls.Add(this.Extrasbtn); + this.Controls.Add(this.ignoreticket); + this.Controls.Add(this.packbox); + this.Controls.Add(this.decryptbox); + this.Controls.Add(this.localuse); + this.Controls.Add(this.saveaswadbox); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; - this.MaximumSize = new System.Drawing.Size(545, 520); - this.MinimumSize = new System.Drawing.Size(280, 520); + this.MaximumSize = new System.Drawing.Size(280, 519); + this.MinimumSize = new System.Drawing.Size(280, 519); this.Name = "Form1"; this.Text = "NUSD"; this.Load += new System.EventHandler(this.Form1_Load); @@ -812,7 +861,6 @@ private System.Windows.Forms.CheckBox localuse; private System.ComponentModel.BackgroundWorker NUSDownloader; private System.Windows.Forms.Label label1; - private System.Windows.Forms.Button button2; private System.Windows.Forms.TextBox wadnamebox; private System.Windows.Forms.CheckBox ignoreticket; private System.Windows.Forms.CheckBox decryptbox; @@ -840,7 +888,6 @@ private System.Windows.Forms.ToolStripMenuItem loadInfoFromTMDToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; private System.Windows.Forms.CheckBox saveaswadbox; - private System.Windows.Forms.CheckBox deletecontentsbox; private System.Windows.Forms.ToolStripMenuItem proxySettingsToolStripMenuItem; private System.Windows.Forms.GroupBox proxyBox; private System.Windows.Forms.TextBox ProxyUser; @@ -878,6 +925,11 @@ private System.Windows.Forms.ToolStripMenuItem PALMassUpdate; private System.Windows.Forms.ToolStripMenuItem NTSCMassUpdate; private System.Windows.Forms.ToolStripMenuItem KoreaMassUpdate; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator5; + private System.Windows.Forms.ToolStripMenuItem aboutNUSDToolStripMenuItem; + private System.Windows.Forms.CheckBox checkBox1; + private System.Windows.Forms.Button SaveProxyPwdPermanentBtn; + private System.Windows.Forms.CheckBox keepenccontents; } } diff --git a/NUS Downloader/Form1.cs b/NUS Downloader/Form1.cs index 41e86cd..d9b7768 100644 --- a/NUS Downloader/Form1.cs +++ b/NUS Downloader/Form1.cs @@ -176,17 +176,14 @@ namespace NUS_Downloader private void Form1_Load(object sender, EventArgs e) { - this.Text = String.Format("NUSD - {0} - WB3000", version); ; + this.Text = String.Format("NUSD - {0}", version); ; this.Size = this.MinimumSize; consoleCBox.SelectedIndex = 0; } private bool NUSDFileExists(string filename) { - if (File.Exists(Path.Combine(CURRENT_DIR, filename))) - return true; - else - return false; + return File.Exists(Path.Combine(CURRENT_DIR, filename)); } /// @@ -195,14 +192,14 @@ namespace NUS_Downloader /// private void BootChecks() { - /* Check if correct thread... + //Check if correct thread... if (this.InvokeRequired) { Debug.WriteLine("InvokeRequired..."); BootChecksCallback bcc = new BootChecksCallback(BootChecks); this.Invoke(bcc); return; - }*/ + } // Check for Wii common key bin file... if (NUSDFileExists("key.bin") == false) @@ -276,7 +273,14 @@ namespace NUS_Downloader WriteStatus("Proxy settings detected."); string[] proxy_file = File.ReadAllLines(Path.Combine(CURRENT_DIR, "proxy.txt")); proxy_url = proxy_file[0]; - if (proxy_file.Length > 1) + + // If proxy\nuser\npassword + if (proxy_file.Length > 2) + { + proxy_usr = proxy_file[1]; + proxy_pwd = proxy_file[2]; + } + else if (proxy_file.Length > 1) { proxy_usr = proxy_file[1]; SetAllEnabled(false); @@ -1280,7 +1284,7 @@ namespace NUS_Downloader packer.PackWAD(); // Delete contents now... - if (deletecontentsbox.Checked) + if (keepenccontents.Checked == false) { WriteStatus("Deleting contents..."); File.Delete(Path.Combine(totaldirectory, tmdfilename)); @@ -1324,51 +1328,6 @@ namespace NUS_Downloader } } - private void button2_Click(object sender, EventArgs e) - { - // Display About Text... - statusbox.Text = ""; - WriteStatus("NUS Downloader (NUSD)"); - WriteStatus("You are running version: " + version); - WriteStatus("This application created by WB3000"); - WriteStatus("Various sections contributed by lukegb"); - WriteStatus(""); - - if (File.Exists(Path.Combine(CURRENT_DIR, "key.bin")) == false) - WriteStatus("Wii Decryption: Need (key.bin)"); - else - WriteStatus("Wii Decryption: OK"); - - if (File.Exists(Path.Combine(CURRENT_DIR, "kkey.bin")) == false) - WriteStatus("Wii Korea Decryption: Need (kkey.bin)"); - else - WriteStatus("Wii Korea Decryption: OK"); - - if (File.Exists(Path.Combine(CURRENT_DIR, "dsikey.bin")) == false) - WriteStatus("DSi Decryption: Need (dsikey.bin)"); - else - WriteStatus("DSi Decryption: OK"); - - if (File.Exists(Path.Combine(CURRENT_DIR, "database.xml")) == false) - WriteStatus("Database: Need (database.xml)"); - else - WriteStatus("Database: OK"); - - if (IsWin7()) - WriteStatus("Windows 7 Features: Enabled"); - - WriteStatus(""); - WriteStatus("Special thanks to:"); - WriteStatus(" * Crediar for his wadmaker tool + source, and for the advice!"); - WriteStatus(" * SquidMan/Galaxy/comex/Xuzz for advice/sources."); - WriteStatus(" * Pasta for database compilation assistance."); - WriteStatus(" * #WiiDev for answering the tough questions."); - WriteStatus(" * Anyone who helped beta test on GBATemp!"); - WriteStatus(" * Famfamfam for the Silk Icon Set."); - WriteStatus(" * Wyatt O'Day for the Windows7ProgressBar Control."); - WriteStatus(" * Napo7 for testing proxy usage."); - } - private void packbox_CheckedChanged(object sender, EventArgs e) { if (packbox.Checked == true) @@ -2837,7 +2796,7 @@ namespace NUS_Downloader private void packbox_EnabledChanged(object sender, EventArgs e) { saveaswadbox.Enabled = packbox.Enabled; - deletecontentsbox.Enabled = packbox.Enabled; + //deletecontentsbox.Enabled = packbox.Enabled; } private void SaveProxyBtn_Click(object sender, EventArgs e) @@ -2924,8 +2883,7 @@ namespace NUS_Downloader private void ProxyAssistBtn_Click(object sender, EventArgs e) { MessageBox.Show("If you are behind a proxy, set these settings to get through to NUS." + - " If you have an alternate port for accessing your proxy, add ':' followed by the port." + - " You will be prompted for your password each time you run NUSD, for privacy purposes."); + " If you have an alternate port for accessing your proxy, add ':' followed by the port."); } private void loadNUSScriptToolStripMenuItem_Click(object sender, EventArgs e) @@ -3127,53 +3085,152 @@ namespace NUS_Downloader void OrganizeScripts(object sender, DoWorkEventArgs e) { //throw new NotImplementedException(); - try - { - // Add directories w/ scripts in \scripts\ - foreach (string directory in Directory.GetDirectories(Path.Combine(CURRENT_DIR, "scripts"), "*", SearchOption.TopDirectoryOnly)) - { - if (Directory.GetFiles(directory, "*.nus", SearchOption.TopDirectoryOnly).Length > 0) - { - DirectoryInfo dinfo = new DirectoryInfo(directory); - ToolStripMenuItem folder_item = new ToolStripMenuItem(); - folder_item.Text = dinfo.Name + Path.DirectorySeparatorChar; - folder_item.Image = Properties.Resources.folder_table; - - foreach (string nusscript in Directory.GetFiles(directory, "*.nus", SearchOption.TopDirectoryOnly)) - { - FileInfo finfo = new FileInfo(nusscript); - ToolStripMenuItem nus_script_item = new ToolStripMenuItem(); - nus_script_item.Text = finfo.Name; - nus_script_item.Image = Properties.Resources.script_go; - folder_item.DropDownItems.Add(nus_script_item); - - // TODO: OnItemClicked... - } - - scriptsLocalMenuEntry.DropDownItems.Add(folder_item); - } - } - - // Add scripts in \scripts\ - foreach (string nusscript in Directory.GetFiles(Path.Combine(CURRENT_DIR, "scripts"), "*.nus", SearchOption.TopDirectoryOnly)) - { - FileInfo finfo = new FileInfo(nusscript); - ToolStripMenuItem nus_script_item = new ToolStripMenuItem(); - nus_script_item.Text = finfo.Name; - nus_script_item.Image = Properties.Resources.script_go; - scriptsLocalMenuEntry.DropDownItems.Add(nus_script_item); - - // TODO: OnItemClicked... - } - - } - catch (DirectoryNotFoundException) + if (Directory.Exists(Path.Combine(CURRENT_DIR, "scripts")) == false) { WriteStatus("Scripts directory not found..."); WriteStatus("- Creating it."); Directory.CreateDirectory(Path.Combine(CURRENT_DIR, "scripts")); } - } + + // Add directories w/ scripts in \scripts\ + foreach (string directory in Directory.GetDirectories(Path.Combine(CURRENT_DIR, "scripts"), "*", SearchOption.TopDirectoryOnly)) + { + if (Directory.GetFiles(directory, "*.nus", SearchOption.TopDirectoryOnly).Length > 0) + { + DirectoryInfo dinfo = new DirectoryInfo(directory); + ToolStripMenuItem folder_item = new ToolStripMenuItem(); + folder_item.Text = dinfo.Name + Path.DirectorySeparatorChar; + folder_item.Image = Properties.Resources.folder_table; + + + foreach (string nusscript in Directory.GetFiles(directory, "*.nus", SearchOption.TopDirectoryOnly)) + { + FileInfo finfo = new FileInfo(nusscript); + ToolStripMenuItem nus_script_item = new ToolStripMenuItem(); + nus_script_item.Text = finfo.Name; + nus_script_item.Image = Properties.Resources.script_go; + folder_item.DropDownItems.Add(nus_script_item); + + // TODO: OnItemClicked... + } + + scriptsLocalMenuEntry.DropDownItems.Add(folder_item); + } + } + + // Add scripts in \scripts\ + foreach (string nusscript in Directory.GetFiles(Path.Combine(CURRENT_DIR, "scripts"), "*.nus", SearchOption.TopDirectoryOnly)) + { + FileInfo finfo = new FileInfo(nusscript); + ToolStripMenuItem nus_script_item = new ToolStripMenuItem(); + nus_script_item.Text = finfo.Name; + nus_script_item.Image = Properties.Resources.script_go; + scriptsLocalMenuEntry.DropDownItems.Add(nus_script_item); + + // TODO: OnItemClicked... + } + + + } + + private void aboutNUSDToolStripMenuItem_Click(object sender, EventArgs e) + { + // Display About Text... + statusbox.Text = ""; + WriteStatus("NUS Downloader (NUSD)"); + WriteStatus("You are running version: " + version); + WriteStatus("This application created by WB3000"); + WriteStatus("Various sections contributed by lukegb"); + WriteStatus(""); + + if (NUSDFileExists("key.bin") == false) + WriteStatus("Wii Decryption: Need (key.bin)"); + else + WriteStatus("Wii Decryption: OK"); + + if (NUSDFileExists("kkey.bin") == false) + WriteStatus("Wii Korea Decryption: Need (kkey.bin)"); + else + WriteStatus("Wii Korea Decryption: OK"); + + if (NUSDFileExists("dsikey.bin") == false) + WriteStatus("DSi Decryption: Need (dsikey.bin)"); + else + WriteStatus("DSi Decryption: OK"); + + if (NUSDFileExists("database.xml") == false) + WriteStatus("Database: Need (database.xml)"); + else + WriteStatus("Database: OK"); + + if (IsWin7()) + WriteStatus("Windows 7 Features: Enabled"); + + WriteStatus(""); + WriteStatus("Special thanks to:"); + WriteStatus(" * Crediar for his wadmaker tool + source, and for the advice!"); + WriteStatus(" * SquidMan/Galaxy/comex/Xuzz for advice/sources."); + WriteStatus(" * Pasta for database compilation assistance."); + WriteStatus(" * #WiiDev for answering the tough questions."); + WriteStatus(" * Anyone who helped beta test on GBATemp!"); + WriteStatus(" * Famfamfam for the Silk Icon Set."); + WriteStatus(" * Wyatt O'Day for the Windows7ProgressBar Control."); + WriteStatus(" * Napo7 for testing proxy usage."); + } + + private void checkBox1_CheckedChanged(object sender, EventArgs e) + { + SaveProxyPwdPermanentBtn.Enabled = checkBox1.Checked; + } + + private void SaveProxyPwdPermanentBtn_Click(object sender, EventArgs e) + { + proxy_pwd = ProxyPwdBox.Text; + + string proxy_file = File.ReadAllText(Path.Combine(CURRENT_DIR, "proxy.txt")); + + proxy_file += String.Format("\n{0}", proxy_pwd); + + File.WriteAllText(Path.Combine(CURRENT_DIR, "proxy.txt"), proxy_file); + + ProxyVerifyBox.Visible = false; + SetAllEnabled(true); + WriteStatus("To delete all traces of proxy settings, delete the proxy.txt file!"); + } + + private void button3_MouseEnter(object sender, EventArgs e) + { + // expand clear button + button3.Location = new Point(194, 363); + button3.Size = new System.Drawing.Size(68, 21); + button3.Text = "Clear"; + button3.ImageAlign = ContentAlignment.MiddleLeft; + } + + private void button3_MouseLeave(object sender, EventArgs e) + { + // shrink clear button + button3.Location = new Point(239, 363); + button3.Size = new System.Drawing.Size(23, 21); + button3.Text = String.Empty; + button3.ImageAlign = ContentAlignment.MiddleCenter; + } + + private void saveaswadbox_MouseEnter(object sender, EventArgs e) + { + saveaswadbox.Location = new Point(200, 433); + saveaswadbox.Size = new Size(62, 22); + saveaswadbox.Text = "Save As..."; + button3.ImageAlign = ContentAlignment.MiddleLeft; + } + + private void saveaswadbox_MouseLeave(object sender, EventArgs e) + { + saveaswadbox.Location = new Point(230, 433); + saveaswadbox.Size = new Size(32, 22); + saveaswadbox.Text = String.Empty; + saveaswadbox.ImageAlign = ContentAlignment.MiddleCenter; + } } } \ No newline at end of file diff --git a/NUS Downloader/NUS Downloader.csproj b/NUS Downloader/NUS Downloader.csproj index 3e876e3..8f9b058 100644 --- a/NUS Downloader/NUS Downloader.csproj +++ b/NUS Downloader/NUS Downloader.csproj @@ -124,10 +124,18 @@ + + + + + + + + diff --git a/NUS Downloader/Properties/Resources.Designer.cs b/NUS Downloader/Properties/Resources.Designer.cs index 9ee5827..4678771 100644 --- a/NUS Downloader/Properties/Resources.Designer.cs +++ b/NUS Downloader/Properties/Resources.Designer.cs @@ -74,6 +74,13 @@ namespace NUS_Downloader.Properties { } } + internal static System.Drawing.Bitmap box { + get { + object obj = ResourceManager.GetObject("box", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap bug_add { get { object obj = ResourceManager.GetObject("bug_add", resourceCulture); @@ -144,6 +151,13 @@ namespace NUS_Downloader.Properties { } } + internal static System.Drawing.Bitmap disk { + get { + object obj = ResourceManager.GetObject("disk", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap folder_table { get { object obj = ResourceManager.GetObject("folder_table", resourceCulture); @@ -158,6 +172,20 @@ namespace NUS_Downloader.Properties { } } + internal static System.Drawing.Bitmap help1 { + get { + object obj = ResourceManager.GetObject("help1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap information { + get { + object obj = ResourceManager.GetObject("information", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap key { get { object obj = ResourceManager.GetObject("key", resourceCulture); @@ -172,6 +200,13 @@ namespace NUS_Downloader.Properties { } } + internal static System.Drawing.Bitmap package { + get { + object obj = ResourceManager.GetObject("package", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap package_add { get { object obj = ResourceManager.GetObject("package_add", resourceCulture); @@ -186,6 +221,13 @@ namespace NUS_Downloader.Properties { } } + internal static System.Drawing.Bitmap package_green { + get { + object obj = ResourceManager.GetObject("package_green", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap page_white_magnify { get { object obj = ResourceManager.GetObject("page_white_magnify", resourceCulture); @@ -193,6 +235,13 @@ namespace NUS_Downloader.Properties { } } + internal static System.Drawing.Bitmap picture_empty { + get { + object obj = ResourceManager.GetObject("picture_empty", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap script_code { get { object obj = ResourceManager.GetObject("script_code", resourceCulture); @@ -227,5 +276,12 @@ namespace NUS_Downloader.Properties { return ((System.Drawing.Bitmap)(obj)); } } + + internal static System.Drawing.Bitmap telephone_add { + get { + object obj = ResourceManager.GetObject("telephone_add", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/NUS Downloader/Properties/Resources.resx b/NUS Downloader/Properties/Resources.resx index fa8873f..1c34454 100644 --- a/NUS Downloader/Properties/Resources.resx +++ b/NUS Downloader/Properties/Resources.resx @@ -118,26 +118,41 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\direction_down.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\package_delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\bug_add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\arrow_up.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\script_code.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\bullet_redorange.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\arrow_down.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\bullet_redgreen.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\arrow_down.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\bug_error.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\help.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\key.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\page_white_magnify.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\package_delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\script_code_red.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\bullet_red.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\script_go.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\server_link.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -145,50 +160,59 @@ ..\Resources\server_connect.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\bullet_red.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\direction_down.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\bullet_green.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\box.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\page_white_magnify.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\bug_error.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\script_go.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\connect.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\bullet_orange.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\help1.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\link.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\script_code_red.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\connect.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\key.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\bullet_redorange.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\package_add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\help.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\package.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\database_save.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + + ..\Resources\bullet_green.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\bullet_orange.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\folder_table.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\picture_empty.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\telephone_add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\package_green.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\bug_add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\script_code.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\package_add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\information.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + + ..\Resources\disk.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/NUS Downloader/Resources/box.png b/NUS Downloader/Resources/box.png new file mode 100644 index 0000000..8443c23 Binary files /dev/null and b/NUS Downloader/Resources/box.png differ diff --git a/NUS Downloader/Resources/disk.png b/NUS Downloader/Resources/disk.png new file mode 100644 index 0000000..99d532e Binary files /dev/null and b/NUS Downloader/Resources/disk.png differ diff --git a/NUS Downloader/Resources/help1.png b/NUS Downloader/Resources/help1.png new file mode 100644 index 0000000..5c87017 Binary files /dev/null and b/NUS Downloader/Resources/help1.png differ diff --git a/NUS Downloader/Resources/information.png b/NUS Downloader/Resources/information.png new file mode 100644 index 0000000..12cd1ae Binary files /dev/null and b/NUS Downloader/Resources/information.png differ diff --git a/NUS Downloader/Resources/package.png b/NUS Downloader/Resources/package.png new file mode 100644 index 0000000..da3c2a2 Binary files /dev/null and b/NUS Downloader/Resources/package.png differ diff --git a/NUS Downloader/Resources/package_green.png b/NUS Downloader/Resources/package_green.png new file mode 100644 index 0000000..25b28bb Binary files /dev/null and b/NUS Downloader/Resources/package_green.png differ diff --git a/NUS Downloader/Resources/picture_empty.png b/NUS Downloader/Resources/picture_empty.png new file mode 100644 index 0000000..abd2b9b Binary files /dev/null and b/NUS Downloader/Resources/picture_empty.png differ diff --git a/NUS Downloader/Resources/telephone_add.png b/NUS Downloader/Resources/telephone_add.png new file mode 100644 index 0000000..5591cfc Binary files /dev/null and b/NUS Downloader/Resources/telephone_add.png differ