From b01466b3439c3d7b5fa48a8d40569a992ec5da5d Mon Sep 17 00:00:00 2001 From: givememystuffplease Date: Sun, 16 Jan 2011 04:10:51 +0000 Subject: [PATCH] Updating of all databases (DSi + Wii) --- NUS Downloader/Form1.Designer.cs | 794 +++++++++++------------ NUS Downloader/Form1.cs | 69 +- NUS Downloader/Latest/NUS Downloader.exe | Bin 472064 -> 472064 bytes 3 files changed, 440 insertions(+), 423 deletions(-) diff --git a/NUS Downloader/Form1.Designer.cs b/NUS Downloader/Form1.Designer.cs index a2028fd..15e9cda 100644 --- a/NUS Downloader/Form1.Designer.cs +++ b/NUS Downloader/Form1.Designer.cs @@ -44,49 +44,6 @@ namespace NUS_Downloader this.label1 = new System.Windows.Forms.Label(); this.wadnamebox = new System.Windows.Forms.TextBox(); this.databaseStrip = new System.Windows.Forms.ContextMenuStrip(this.components); - this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); - this.dSiWareToolStripMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.RegionCodesList = new System.Windows.Forms.ToolStripMenuItem(); - this.wiiRegionCodesMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.dsiRegionCodesMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); - this.extrasStrip = new System.Windows.Forms.ContextMenuStrip(this.components); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripSeparator6 = 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.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.iosPatchGroupBox = new System.Windows.Forms.GroupBox(); - this.label2 = new System.Windows.Forms.Label(); - this.iosPatchesListBox = new System.Windows.Forms.CheckedListBox(); - this.iosPatchGroupBoxOKbtn = new System.Windows.Forms.Button(); - this.richPanel = new System.Windows.Forms.Panel(); - this.databaseButton = new System.Windows.Forms.Button(); - this.titleversion = new wmgCMS.WaterMarkTextBox(); - this.titleidbox = new wmgCMS.WaterMarkTextBox(); - this.dlprogress = new wyDay.Controls.Windows7ProgressBar(); - this.saveaswadbtn = new System.Windows.Forms.Button(); - this.iosPatchCheckbox = new System.Windows.Forms.CheckBox(); - this.ProxyAssistBtn = new System.Windows.Forms.Button(); - this.keepenccontents = new System.Windows.Forms.CheckBox(); - this.clearButton = new System.Windows.Forms.Button(); - this.packbox = new System.Windows.Forms.CheckBox(); - this.decryptbox = new System.Windows.Forms.CheckBox(); - this.localuse = new System.Windows.Forms.CheckBox(); this.SystemMenuList = new System.Windows.Forms.ToolStripMenuItem(); this.systemFakeMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.IOSMenuList = new System.Windows.Forms.ToolStripMenuItem(); @@ -106,12 +63,22 @@ namespace NUS_Downloader this.vcFakeMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.WiiWareMenuList = new System.Windows.Forms.ToolStripMenuItem(); this.wwFakeMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); this.dsiSystemToolStripMenu = new System.Windows.Forms.ToolStripMenuItem(); this.dsiFakeSystemToolStripMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.dSiWareToolStripMenu = new System.Windows.Forms.ToolStripMenuItem(); this.dSiWareFakeToolStripMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.RegionCodesList = new System.Windows.Forms.ToolStripMenuItem(); + this.wiiRegionCodesMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.dsiRegionCodesMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.updateDatabaseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + 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.moreExtrasToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.runFolderFixToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.wiiBrewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -123,14 +90,47 @@ namespace NUS_Downloader this.openNUSDDirectoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.donateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.aboutNUSDToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + 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.scriptsLocalMenuEntry = new System.Windows.Forms.ToolStripMenuItem(); this.scriptsDatabaseToolStripMenuItem = 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.iosPatchGroupBox = new System.Windows.Forms.GroupBox(); + this.label2 = new System.Windows.Forms.Label(); + this.iosPatchesListBox = new System.Windows.Forms.CheckedListBox(); + this.iosPatchGroupBoxOKbtn = new System.Windows.Forms.Button(); + this.richPanel = new System.Windows.Forms.Panel(); + this.databaseButton = new System.Windows.Forms.Button(); + this.titleversion = new wmgCMS.WaterMarkTextBox(); + this.titleidbox = new wmgCMS.WaterMarkTextBox(); + this.dlprogress = new wyDay.Controls.Windows7ProgressBar(); + this.saveaswadbtn = new System.Windows.Forms.Button(); + this.iosPatchCheckbox = new System.Windows.Forms.CheckBox(); + this.keepenccontents = new System.Windows.Forms.CheckBox(); + this.clearButton = new System.Windows.Forms.Button(); + this.packbox = new System.Windows.Forms.CheckBox(); + this.decryptbox = new System.Windows.Forms.CheckBox(); + this.localuse = new System.Windows.Forms.CheckBox(); this.databaseStrip.SuspendLayout(); this.extrasStrip.SuspendLayout(); this.proxyBox.SuspendLayout(); @@ -222,26 +222,188 @@ namespace NUS_Downloader this.updateDatabaseToolStripMenuItem}); this.databaseStrip.Name = "databaseStrip"; this.databaseStrip.ShowItemToolTips = false; - this.databaseStrip.Size = new System.Drawing.Size(159, 352); + this.databaseStrip.Size = new System.Drawing.Size(164, 352); this.databaseStrip.Text = "Hidden"; this.databaseStrip.Closed += new System.Windows.Forms.ToolStripDropDownClosedEventHandler(this.anyStrip_Closed); // + // SystemMenuList + // + this.SystemMenuList.AutoSize = false; + this.SystemMenuList.Image = global::NUS_Downloader.Properties.Resources.wii16x16_copy; + this.SystemMenuList.Name = "SystemMenuList"; + this.SystemMenuList.Size = new System.Drawing.Size(158, 22); + this.SystemMenuList.Text = "System"; + // + // systemFakeMenuItem + // + this.systemFakeMenuItem.Image = global::NUS_Downloader.Properties.Resources.arrow_ticker; + this.systemFakeMenuItem.Name = "systemFakeMenuItem"; + this.systemFakeMenuItem.Size = new System.Drawing.Size(163, 22); + this.systemFakeMenuItem.Text = "System"; + this.systemFakeMenuItem.Visible = false; + // + // IOSMenuList + // + this.IOSMenuList.Image = global::NUS_Downloader.Properties.Resources.wii16x16_copy; + this.IOSMenuList.Name = "IOSMenuList"; + this.IOSMenuList.Size = new System.Drawing.Size(163, 22); + this.IOSMenuList.Text = "IOS"; + // + // iosFakeMenuItem + // + this.iosFakeMenuItem.Image = global::NUS_Downloader.Properties.Resources.arrow_ticker; + this.iosFakeMenuItem.Name = "iosFakeMenuItem"; + this.iosFakeMenuItem.Size = new System.Drawing.Size(163, 22); + this.iosFakeMenuItem.Text = "IOS"; + this.iosFakeMenuItem.Visible = false; + // + // VCMenuList + // + this.VCMenuList.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.C64MenuList, + this.GenesisMenuList, + this.MSXMenuList, + this.N64MenuList, + this.NeoGeoMenuList, + this.NESMenuList, + this.SegaMSMenuList, + this.SNESMenuList, + this.TurboGrafx16MenuList, + this.TurboGrafxCDMenuList, + this.VCArcadeMenuList}); + this.VCMenuList.Image = global::NUS_Downloader.Properties.Resources.wii16x16_copy; + this.VCMenuList.Name = "VCMenuList"; + this.VCMenuList.Size = new System.Drawing.Size(163, 22); + this.VCMenuList.Text = "Virtual Console"; + // + // C64MenuList + // + this.C64MenuList.Name = "C64MenuList"; + this.C64MenuList.Size = new System.Drawing.Size(182, 22); + this.C64MenuList.Text = "Commodore 64"; + // + // GenesisMenuList + // + this.GenesisMenuList.Name = "GenesisMenuList"; + this.GenesisMenuList.Size = new System.Drawing.Size(182, 22); + this.GenesisMenuList.Text = "Mega Drive/Genesis"; + // + // MSXMenuList + // + this.MSXMenuList.Name = "MSXMenuList"; + this.MSXMenuList.Size = new System.Drawing.Size(182, 22); + this.MSXMenuList.Text = "MSX"; + // + // N64MenuList + // + this.N64MenuList.Name = "N64MenuList"; + this.N64MenuList.Size = new System.Drawing.Size(182, 22); + this.N64MenuList.Text = "Nintendo 64"; + // + // NeoGeoMenuList + // + this.NeoGeoMenuList.Name = "NeoGeoMenuList"; + this.NeoGeoMenuList.Size = new System.Drawing.Size(182, 22); + this.NeoGeoMenuList.Text = "NeoGeo"; + // + // NESMenuList + // + this.NESMenuList.Name = "NESMenuList"; + this.NESMenuList.Size = new System.Drawing.Size(182, 22); + this.NESMenuList.Text = "NES"; + // + // SegaMSMenuList + // + this.SegaMSMenuList.Name = "SegaMSMenuList"; + this.SegaMSMenuList.Size = new System.Drawing.Size(182, 22); + this.SegaMSMenuList.Text = "Sega Master System"; + // + // SNESMenuList + // + this.SNESMenuList.Name = "SNESMenuList"; + this.SNESMenuList.Size = new System.Drawing.Size(182, 22); + this.SNESMenuList.Text = "SNES"; + // + // TurboGrafx16MenuList + // + this.TurboGrafx16MenuList.Name = "TurboGrafx16MenuList"; + this.TurboGrafx16MenuList.Size = new System.Drawing.Size(182, 22); + this.TurboGrafx16MenuList.Text = "TruboGrafx-16"; + // + // TurboGrafxCDMenuList + // + this.TurboGrafxCDMenuList.Name = "TurboGrafxCDMenuList"; + this.TurboGrafxCDMenuList.Size = new System.Drawing.Size(182, 22); + this.TurboGrafxCDMenuList.Text = "TurboGrafx-CD"; + // + // VCArcadeMenuList + // + this.VCArcadeMenuList.Name = "VCArcadeMenuList"; + this.VCArcadeMenuList.Size = new System.Drawing.Size(182, 22); + this.VCArcadeMenuList.Text = "Virtual Console Arcade"; + // + // vcFakeMenuItem + // + this.vcFakeMenuItem.Image = global::NUS_Downloader.Properties.Resources.arrow_ticker; + this.vcFakeMenuItem.Name = "vcFakeMenuItem"; + this.vcFakeMenuItem.Size = new System.Drawing.Size(163, 22); + this.vcFakeMenuItem.Text = "Virtual Console"; + this.vcFakeMenuItem.Visible = false; + // + // WiiWareMenuList + // + this.WiiWareMenuList.Image = global::NUS_Downloader.Properties.Resources.wii16x16_copy; + this.WiiWareMenuList.Name = "WiiWareMenuList"; + this.WiiWareMenuList.Size = new System.Drawing.Size(163, 22); + this.WiiWareMenuList.Text = "WiiWare"; + // + // wwFakeMenuItem + // + this.wwFakeMenuItem.Image = global::NUS_Downloader.Properties.Resources.arrow_ticker; + this.wwFakeMenuItem.Name = "wwFakeMenuItem"; + this.wwFakeMenuItem.Size = new System.Drawing.Size(163, 22); + this.wwFakeMenuItem.Text = "WiiWare"; + this.wwFakeMenuItem.Visible = false; + // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(155, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(160, 6); + // + // dsiSystemToolStripMenu + // + this.dsiSystemToolStripMenu.Image = global::NUS_Downloader.Properties.Resources.dsi16x16; + this.dsiSystemToolStripMenu.Name = "dsiSystemToolStripMenu"; + this.dsiSystemToolStripMenu.Size = new System.Drawing.Size(163, 22); + this.dsiSystemToolStripMenu.Text = "System"; + // + // dsiFakeSystemToolStripMenu + // + this.dsiFakeSystemToolStripMenu.Image = global::NUS_Downloader.Properties.Resources.arrow_ticker; + this.dsiFakeSystemToolStripMenu.Name = "dsiFakeSystemToolStripMenu"; + this.dsiFakeSystemToolStripMenu.Size = new System.Drawing.Size(163, 22); + this.dsiFakeSystemToolStripMenu.Text = "System"; + this.dsiFakeSystemToolStripMenu.Visible = false; // // dSiWareToolStripMenu // this.dSiWareToolStripMenu.Image = global::NUS_Downloader.Properties.Resources.dsi16x16; this.dSiWareToolStripMenu.Name = "dSiWareToolStripMenu"; - this.dSiWareToolStripMenu.Size = new System.Drawing.Size(158, 22); + this.dSiWareToolStripMenu.Size = new System.Drawing.Size(163, 22); this.dSiWareToolStripMenu.Text = "DSiWare"; // + // dSiWareFakeToolStripMenu + // + this.dSiWareFakeToolStripMenu.Image = global::NUS_Downloader.Properties.Resources.arrow_ticker; + this.dSiWareFakeToolStripMenu.Name = "dSiWareFakeToolStripMenu"; + this.dSiWareFakeToolStripMenu.Size = new System.Drawing.Size(163, 22); + this.dSiWareFakeToolStripMenu.Text = "DSiWare"; + this.dSiWareFakeToolStripMenu.Visible = false; + // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(155, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(160, 6); // // RegionCodesList // @@ -249,7 +411,7 @@ namespace NUS_Downloader this.wiiRegionCodesMenu, this.dsiRegionCodesMenu}); this.RegionCodesList.Name = "RegionCodesList"; - this.RegionCodesList.Size = new System.Drawing.Size(158, 22); + this.RegionCodesList.Size = new System.Drawing.Size(163, 22); this.RegionCodesList.Text = "Region Codes"; // // wiiRegionCodesMenu @@ -269,7 +431,15 @@ namespace NUS_Downloader // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(155, 6); + 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 Databases"; + this.updateDatabaseToolStripMenuItem.Click += new System.EventHandler(this.updateDatabaseToolStripMenuItem_Click); // // extrasStrip // @@ -290,16 +460,121 @@ namespace NUS_Downloader this.extrasStrip.Closed += new System.Windows.Forms.ToolStripDropDownClosedEventHandler(this.anyStrip_Closed); this.extrasStrip.Opening += new System.ComponentModel.CancelEventHandler(this.extrasStrip_Opening); // + // loadInfoFromTMDToolStripMenuItem + // + this.loadInfoFromTMDToolStripMenuItem.Image = global::NUS_Downloader.Properties.Resources.page_white_magnify; + this.loadInfoFromTMDToolStripMenuItem.Name = "loadInfoFromTMDToolStripMenuItem"; + this.loadInfoFromTMDToolStripMenuItem.Size = new System.Drawing.Size(177, 22); + this.loadInfoFromTMDToolStripMenuItem.Text = "Load Info from TMD"; + this.loadInfoFromTMDToolStripMenuItem.Click += new System.EventHandler(this.loadInfoFromTMDToolStripMenuItem_Click); + // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; this.toolStripSeparator3.Size = new System.Drawing.Size(174, 6); // + // proxySettingsToolStripMenuItem + // + this.proxySettingsToolStripMenuItem.Image = global::NUS_Downloader.Properties.Resources.server_link; + this.proxySettingsToolStripMenuItem.Name = "proxySettingsToolStripMenuItem"; + this.proxySettingsToolStripMenuItem.Size = new System.Drawing.Size(177, 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(174, 6); // + // moreExtrasToolStripMenuItem + // + this.moreExtrasToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.runFolderFixToolStripMenuItem, + this.wiiBrewToolStripMenuItem, + this.removeNUSDFilesFoldersToolStripMenuItem, + this.databaseToolStripMenuItem}); + this.moreExtrasToolStripMenuItem.Image = global::NUS_Downloader.Properties.Resources.wrench; + this.moreExtrasToolStripMenuItem.Name = "moreExtrasToolStripMenuItem"; + this.moreExtrasToolStripMenuItem.Size = new System.Drawing.Size(177, 22); + this.moreExtrasToolStripMenuItem.Text = "More Extras..."; + this.moreExtrasToolStripMenuItem.Visible = false; + // + // runFolderFixToolStripMenuItem + // + this.runFolderFixToolStripMenuItem.Name = "runFolderFixToolStripMenuItem"; + this.runFolderFixToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.runFolderFixToolStripMenuItem.Text = "Run \'FolderFix\'"; + this.runFolderFixToolStripMenuItem.Click += new System.EventHandler(this.runFolderFixToolStripMenuItem_Click); + // + // wiiBrewToolStripMenuItem + // + this.wiiBrewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mainPageToolStripMenuItem, + this.databasePageToolStripMenuItem}); + this.wiiBrewToolStripMenuItem.Name = "wiiBrewToolStripMenuItem"; + this.wiiBrewToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.wiiBrewToolStripMenuItem.Text = "WiiBrew"; + // + // mainPageToolStripMenuItem + // + this.mainPageToolStripMenuItem.Name = "mainPageToolStripMenuItem"; + this.mainPageToolStripMenuItem.Size = new System.Drawing.Size(147, 22); + this.mainPageToolStripMenuItem.Text = "Main Page"; + this.mainPageToolStripMenuItem.Click += new System.EventHandler(this.mainPageToolStripMenuItem_Click); + // + // databasePageToolStripMenuItem + // + this.databasePageToolStripMenuItem.Name = "databasePageToolStripMenuItem"; + this.databasePageToolStripMenuItem.Size = new System.Drawing.Size(147, 22); + this.databasePageToolStripMenuItem.Text = "Database Page"; + this.databasePageToolStripMenuItem.Click += new System.EventHandler(this.databasePageToolStripMenuItem_Click); + // + // removeNUSDFilesFoldersToolStripMenuItem + // + this.removeNUSDFilesFoldersToolStripMenuItem.Name = "removeNUSDFilesFoldersToolStripMenuItem"; + this.removeNUSDFilesFoldersToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.removeNUSDFilesFoldersToolStripMenuItem.Text = "Remove NUSD Files\\Folders"; + this.removeNUSDFilesFoldersToolStripMenuItem.Click += new System.EventHandler(this.removeNUSDFilesFoldersToolStripMenuItem_Click); + // + // databaseToolStripMenuItem + // + this.databaseToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.localTicketInventoryToolStripMenuItem}); + this.databaseToolStripMenuItem.Name = "databaseToolStripMenuItem"; + this.databaseToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.databaseToolStripMenuItem.Text = "Database"; + // + // localTicketInventoryToolStripMenuItem + // + this.localTicketInventoryToolStripMenuItem.Name = "localTicketInventoryToolStripMenuItem"; + this.localTicketInventoryToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.localTicketInventoryToolStripMenuItem.Text = "Local Ticket Inventory"; + this.localTicketInventoryToolStripMenuItem.Click += new System.EventHandler(this.localTicketInventoryToolStripMenuItem_Click); + // + // openNUSDDirectoryToolStripMenuItem + // + this.openNUSDDirectoryToolStripMenuItem.Image = global::NUS_Downloader.Properties.Resources.folder; + this.openNUSDDirectoryToolStripMenuItem.Name = "openNUSDDirectoryToolStripMenuItem"; + this.openNUSDDirectoryToolStripMenuItem.Size = new System.Drawing.Size(177, 22); + this.openNUSDDirectoryToolStripMenuItem.Text = "Open NUSD Directory"; + this.openNUSDDirectoryToolStripMenuItem.Click += new System.EventHandler(this.openNUSDDirectoryToolStripMenuItem_Click); + // + // donateToolStripMenuItem + // + this.donateToolStripMenuItem.Image = global::NUS_Downloader.Properties.Resources.money; + this.donateToolStripMenuItem.Name = "donateToolStripMenuItem"; + this.donateToolStripMenuItem.Size = new System.Drawing.Size(177, 22); + this.donateToolStripMenuItem.Text = "Donate!"; + this.donateToolStripMenuItem.Click += new System.EventHandler(this.donateToolStripMenuItem_Click); + // + // aboutNUSDToolStripMenuItem + // + this.aboutNUSDToolStripMenuItem.Image = global::NUS_Downloader.Properties.Resources.information; + this.aboutNUSDToolStripMenuItem.Name = "aboutNUSDToolStripMenuItem"; + this.aboutNUSDToolStripMenuItem.Size = new System.Drawing.Size(177, 22); + this.aboutNUSDToolStripMenuItem.Text = "About NUSD"; + this.aboutNUSDToolStripMenuItem.Click += new System.EventHandler(this.aboutNUSDToolStripMenuItem_Click); + // // proxyBox // this.proxyBox.BackColor = System.Drawing.Color.White; @@ -354,6 +629,17 @@ namespace NUS_Downloader 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; @@ -471,11 +757,73 @@ namespace NUS_Downloader this.scriptsStrip.Text = "Hidden"; this.scriptsStrip.Closed += new System.Windows.Forms.ToolStripDropDownClosedEventHandler(this.anyStrip_Closed); // + // scriptsLocalMenuEntry + // + this.scriptsLocalMenuEntry.Enabled = false; + this.scriptsLocalMenuEntry.Image = global::NUS_Downloader.Properties.Resources.script_code; + this.scriptsLocalMenuEntry.Name = "scriptsLocalMenuEntry"; + this.scriptsLocalMenuEntry.Overflow = System.Windows.Forms.ToolStripItemOverflow.AsNeeded; + this.scriptsLocalMenuEntry.Size = new System.Drawing.Size(205, 22); + this.scriptsLocalMenuEntry.Text = "Scripts (Local)"; + // + // scriptsDatabaseToolStripMenuItem + // + this.scriptsDatabaseToolStripMenuItem.Enabled = false; + this.scriptsDatabaseToolStripMenuItem.Image = global::NUS_Downloader.Properties.Resources.script_code_red; + this.scriptsDatabaseToolStripMenuItem.Name = "scriptsDatabaseToolStripMenuItem"; + this.scriptsDatabaseToolStripMenuItem.Size = new System.Drawing.Size(205, 22); + this.scriptsDatabaseToolStripMenuItem.Text = "Scripts (Database)"; + // + // loadNUSScriptToolStripMenuItem + // + this.loadNUSScriptToolStripMenuItem.Image = global::NUS_Downloader.Properties.Resources.script_go; + this.loadNUSScriptToolStripMenuItem.Name = "loadNUSScriptToolStripMenuItem"; + this.loadNUSScriptToolStripMenuItem.Size = new System.Drawing.Size(205, 22); + 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(202, 6); // + // emulateUpdate + // + this.emulateUpdate.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.uSANTSCToolStripMenuItem, + this.europePALToolStripMenuItem, + this.japanNTSCJToolStripMenuItem, + this.koreaToolStripMenuItem}); + this.emulateUpdate.Image = global::NUS_Downloader.Properties.Resources.server_connect; + this.emulateUpdate.Name = "emulateUpdate"; + this.emulateUpdate.Size = new System.Drawing.Size(205, 22); + this.emulateUpdate.Text = "Emulate Wii System Update"; + this.emulateUpdate.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.emulateUpdate_DropDownItemClicked); + // + // uSANTSCToolStripMenuItem + // + this.uSANTSCToolStripMenuItem.Name = "uSANTSCToolStripMenuItem"; + this.uSANTSCToolStripMenuItem.Size = new System.Drawing.Size(114, 22); + this.uSANTSCToolStripMenuItem.Text = "USA"; + // + // europePALToolStripMenuItem + // + this.europePALToolStripMenuItem.Name = "europePALToolStripMenuItem"; + this.europePALToolStripMenuItem.Size = new System.Drawing.Size(114, 22); + this.europePALToolStripMenuItem.Text = "EUROPE"; + // + // japanNTSCJToolStripMenuItem + // + this.japanNTSCJToolStripMenuItem.Name = "japanNTSCJToolStripMenuItem"; + this.japanNTSCJToolStripMenuItem.Size = new System.Drawing.Size(114, 22); + this.japanNTSCJToolStripMenuItem.Text = "JAPAN"; + // + // koreaToolStripMenuItem + // + this.koreaToolStripMenuItem.Name = "koreaToolStripMenuItem"; + this.koreaToolStripMenuItem.Size = new System.Drawing.Size(114, 22); + this.koreaToolStripMenuItem.Text = "KOREA"; + // // iosPatchGroupBox // this.iosPatchGroupBox.Controls.Add(this.label2); @@ -615,17 +963,6 @@ namespace NUS_Downloader this.iosPatchCheckbox.UseVisualStyleBackColor = true; this.iosPatchCheckbox.CheckedChanged += new System.EventHandler(this.iosPatchCheckbox_CheckedChanged); // - // 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; @@ -704,343 +1041,6 @@ namespace NUS_Downloader this.localuse.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; this.localuse.UseVisualStyleBackColor = true; // - // SystemMenuList - // - this.SystemMenuList.AutoSize = false; - this.SystemMenuList.Image = global::NUS_Downloader.Properties.Resources.wii16x16_copy; - this.SystemMenuList.Name = "SystemMenuList"; - this.SystemMenuList.Size = new System.Drawing.Size(158, 22); - this.SystemMenuList.Text = "System"; - // - // systemFakeMenuItem - // - this.systemFakeMenuItem.Image = global::NUS_Downloader.Properties.Resources.arrow_ticker; - this.systemFakeMenuItem.Name = "systemFakeMenuItem"; - this.systemFakeMenuItem.Size = new System.Drawing.Size(158, 22); - this.systemFakeMenuItem.Text = "System"; - this.systemFakeMenuItem.Visible = false; - // - // IOSMenuList - // - this.IOSMenuList.Image = global::NUS_Downloader.Properties.Resources.wii16x16_copy; - this.IOSMenuList.Name = "IOSMenuList"; - this.IOSMenuList.Size = new System.Drawing.Size(158, 22); - this.IOSMenuList.Text = "IOS"; - // - // iosFakeMenuItem - // - this.iosFakeMenuItem.Image = global::NUS_Downloader.Properties.Resources.arrow_ticker; - this.iosFakeMenuItem.Name = "iosFakeMenuItem"; - this.iosFakeMenuItem.Size = new System.Drawing.Size(158, 22); - this.iosFakeMenuItem.Text = "IOS"; - this.iosFakeMenuItem.Visible = false; - // - // VCMenuList - // - this.VCMenuList.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.C64MenuList, - this.GenesisMenuList, - this.MSXMenuList, - this.N64MenuList, - this.NeoGeoMenuList, - this.NESMenuList, - this.SegaMSMenuList, - this.SNESMenuList, - this.TurboGrafx16MenuList, - this.TurboGrafxCDMenuList, - this.VCArcadeMenuList}); - this.VCMenuList.Image = global::NUS_Downloader.Properties.Resources.wii16x16_copy; - this.VCMenuList.Name = "VCMenuList"; - this.VCMenuList.Size = new System.Drawing.Size(158, 22); - this.VCMenuList.Text = "Virtual Console"; - // - // C64MenuList - // - this.C64MenuList.Name = "C64MenuList"; - this.C64MenuList.Size = new System.Drawing.Size(182, 22); - this.C64MenuList.Text = "Commodore 64"; - // - // GenesisMenuList - // - this.GenesisMenuList.Name = "GenesisMenuList"; - this.GenesisMenuList.Size = new System.Drawing.Size(182, 22); - this.GenesisMenuList.Text = "Mega Drive/Genesis"; - // - // MSXMenuList - // - this.MSXMenuList.Name = "MSXMenuList"; - this.MSXMenuList.Size = new System.Drawing.Size(182, 22); - this.MSXMenuList.Text = "MSX"; - // - // N64MenuList - // - this.N64MenuList.Name = "N64MenuList"; - this.N64MenuList.Size = new System.Drawing.Size(182, 22); - this.N64MenuList.Text = "Nintendo 64"; - // - // NeoGeoMenuList - // - this.NeoGeoMenuList.Name = "NeoGeoMenuList"; - this.NeoGeoMenuList.Size = new System.Drawing.Size(182, 22); - this.NeoGeoMenuList.Text = "NeoGeo"; - // - // NESMenuList - // - this.NESMenuList.Name = "NESMenuList"; - this.NESMenuList.Size = new System.Drawing.Size(182, 22); - this.NESMenuList.Text = "NES"; - // - // SegaMSMenuList - // - this.SegaMSMenuList.Name = "SegaMSMenuList"; - this.SegaMSMenuList.Size = new System.Drawing.Size(182, 22); - this.SegaMSMenuList.Text = "Sega Master System"; - // - // SNESMenuList - // - this.SNESMenuList.Name = "SNESMenuList"; - this.SNESMenuList.Size = new System.Drawing.Size(182, 22); - this.SNESMenuList.Text = "SNES"; - // - // TurboGrafx16MenuList - // - this.TurboGrafx16MenuList.Name = "TurboGrafx16MenuList"; - this.TurboGrafx16MenuList.Size = new System.Drawing.Size(182, 22); - this.TurboGrafx16MenuList.Text = "TruboGrafx-16"; - // - // TurboGrafxCDMenuList - // - this.TurboGrafxCDMenuList.Name = "TurboGrafxCDMenuList"; - this.TurboGrafxCDMenuList.Size = new System.Drawing.Size(182, 22); - this.TurboGrafxCDMenuList.Text = "TurboGrafx-CD"; - // - // VCArcadeMenuList - // - this.VCArcadeMenuList.Name = "VCArcadeMenuList"; - this.VCArcadeMenuList.Size = new System.Drawing.Size(182, 22); - this.VCArcadeMenuList.Text = "Virtual Console Arcade"; - // - // vcFakeMenuItem - // - this.vcFakeMenuItem.Image = global::NUS_Downloader.Properties.Resources.arrow_ticker; - this.vcFakeMenuItem.Name = "vcFakeMenuItem"; - this.vcFakeMenuItem.Size = new System.Drawing.Size(158, 22); - this.vcFakeMenuItem.Text = "Virtual Console"; - this.vcFakeMenuItem.Visible = false; - // - // WiiWareMenuList - // - this.WiiWareMenuList.Image = global::NUS_Downloader.Properties.Resources.wii16x16_copy; - this.WiiWareMenuList.Name = "WiiWareMenuList"; - this.WiiWareMenuList.Size = new System.Drawing.Size(158, 22); - this.WiiWareMenuList.Text = "WiiWare"; - // - // wwFakeMenuItem - // - this.wwFakeMenuItem.Image = global::NUS_Downloader.Properties.Resources.arrow_ticker; - this.wwFakeMenuItem.Name = "wwFakeMenuItem"; - this.wwFakeMenuItem.Size = new System.Drawing.Size(158, 22); - this.wwFakeMenuItem.Text = "WiiWare"; - this.wwFakeMenuItem.Visible = false; - // - // dsiSystemToolStripMenu - // - this.dsiSystemToolStripMenu.Image = global::NUS_Downloader.Properties.Resources.dsi16x16; - this.dsiSystemToolStripMenu.Name = "dsiSystemToolStripMenu"; - this.dsiSystemToolStripMenu.Size = new System.Drawing.Size(158, 22); - this.dsiSystemToolStripMenu.Text = "System"; - // - // dsiFakeSystemToolStripMenu - // - this.dsiFakeSystemToolStripMenu.Image = global::NUS_Downloader.Properties.Resources.arrow_ticker; - this.dsiFakeSystemToolStripMenu.Name = "dsiFakeSystemToolStripMenu"; - this.dsiFakeSystemToolStripMenu.Size = new System.Drawing.Size(158, 22); - this.dsiFakeSystemToolStripMenu.Text = "System"; - this.dsiFakeSystemToolStripMenu.Visible = false; - // - // dSiWareFakeToolStripMenu - // - this.dSiWareFakeToolStripMenu.Image = global::NUS_Downloader.Properties.Resources.arrow_ticker; - this.dSiWareFakeToolStripMenu.Name = "dSiWareFakeToolStripMenu"; - this.dSiWareFakeToolStripMenu.Size = new System.Drawing.Size(158, 22); - this.dSiWareFakeToolStripMenu.Text = "DSiWare"; - this.dSiWareFakeToolStripMenu.Visible = false; - // - // updateDatabaseToolStripMenuItem - // - this.updateDatabaseToolStripMenuItem.Image = global::NUS_Downloader.Properties.Resources.database_save; - this.updateDatabaseToolStripMenuItem.Name = "updateDatabaseToolStripMenuItem"; - this.updateDatabaseToolStripMenuItem.Size = new System.Drawing.Size(158, 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(177, 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(177, 22); - this.proxySettingsToolStripMenuItem.Text = "Proxy Settings"; - this.proxySettingsToolStripMenuItem.Click += new System.EventHandler(this.proxySettingsToolStripMenuItem_Click); - // - // moreExtrasToolStripMenuItem - // - this.moreExtrasToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.runFolderFixToolStripMenuItem, - this.wiiBrewToolStripMenuItem, - this.removeNUSDFilesFoldersToolStripMenuItem, - this.databaseToolStripMenuItem}); - this.moreExtrasToolStripMenuItem.Image = global::NUS_Downloader.Properties.Resources.wrench; - this.moreExtrasToolStripMenuItem.Name = "moreExtrasToolStripMenuItem"; - this.moreExtrasToolStripMenuItem.Size = new System.Drawing.Size(177, 22); - this.moreExtrasToolStripMenuItem.Text = "More Extras..."; - this.moreExtrasToolStripMenuItem.Visible = false; - // - // runFolderFixToolStripMenuItem - // - this.runFolderFixToolStripMenuItem.Name = "runFolderFixToolStripMenuItem"; - this.runFolderFixToolStripMenuItem.Size = new System.Drawing.Size(206, 22); - this.runFolderFixToolStripMenuItem.Text = "Run \'FolderFix\'"; - this.runFolderFixToolStripMenuItem.Click += new System.EventHandler(this.runFolderFixToolStripMenuItem_Click); - // - // wiiBrewToolStripMenuItem - // - this.wiiBrewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.mainPageToolStripMenuItem, - this.databasePageToolStripMenuItem}); - this.wiiBrewToolStripMenuItem.Name = "wiiBrewToolStripMenuItem"; - this.wiiBrewToolStripMenuItem.Size = new System.Drawing.Size(206, 22); - this.wiiBrewToolStripMenuItem.Text = "WiiBrew"; - // - // mainPageToolStripMenuItem - // - this.mainPageToolStripMenuItem.Name = "mainPageToolStripMenuItem"; - this.mainPageToolStripMenuItem.Size = new System.Drawing.Size(147, 22); - this.mainPageToolStripMenuItem.Text = "Main Page"; - this.mainPageToolStripMenuItem.Click += new System.EventHandler(this.mainPageToolStripMenuItem_Click); - // - // databasePageToolStripMenuItem - // - this.databasePageToolStripMenuItem.Name = "databasePageToolStripMenuItem"; - this.databasePageToolStripMenuItem.Size = new System.Drawing.Size(147, 22); - this.databasePageToolStripMenuItem.Text = "Database Page"; - this.databasePageToolStripMenuItem.Click += new System.EventHandler(this.databasePageToolStripMenuItem_Click); - // - // removeNUSDFilesFoldersToolStripMenuItem - // - this.removeNUSDFilesFoldersToolStripMenuItem.Name = "removeNUSDFilesFoldersToolStripMenuItem"; - this.removeNUSDFilesFoldersToolStripMenuItem.Size = new System.Drawing.Size(206, 22); - this.removeNUSDFilesFoldersToolStripMenuItem.Text = "Remove NUSD Files\\Folders"; - this.removeNUSDFilesFoldersToolStripMenuItem.Click += new System.EventHandler(this.removeNUSDFilesFoldersToolStripMenuItem_Click); - // - // databaseToolStripMenuItem - // - this.databaseToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.localTicketInventoryToolStripMenuItem}); - this.databaseToolStripMenuItem.Name = "databaseToolStripMenuItem"; - this.databaseToolStripMenuItem.Size = new System.Drawing.Size(206, 22); - this.databaseToolStripMenuItem.Text = "Database"; - // - // localTicketInventoryToolStripMenuItem - // - this.localTicketInventoryToolStripMenuItem.Name = "localTicketInventoryToolStripMenuItem"; - this.localTicketInventoryToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.localTicketInventoryToolStripMenuItem.Text = "Local Ticket Inventory"; - this.localTicketInventoryToolStripMenuItem.Click += new System.EventHandler(this.localTicketInventoryToolStripMenuItem_Click); - // - // openNUSDDirectoryToolStripMenuItem - // - this.openNUSDDirectoryToolStripMenuItem.Image = global::NUS_Downloader.Properties.Resources.folder; - this.openNUSDDirectoryToolStripMenuItem.Name = "openNUSDDirectoryToolStripMenuItem"; - this.openNUSDDirectoryToolStripMenuItem.Size = new System.Drawing.Size(177, 22); - this.openNUSDDirectoryToolStripMenuItem.Text = "Open NUSD Directory"; - this.openNUSDDirectoryToolStripMenuItem.Click += new System.EventHandler(this.openNUSDDirectoryToolStripMenuItem_Click); - // - // donateToolStripMenuItem - // - this.donateToolStripMenuItem.Image = global::NUS_Downloader.Properties.Resources.money; - this.donateToolStripMenuItem.Name = "donateToolStripMenuItem"; - this.donateToolStripMenuItem.Size = new System.Drawing.Size(177, 22); - this.donateToolStripMenuItem.Text = "Donate!"; - this.donateToolStripMenuItem.Click += new System.EventHandler(this.donateToolStripMenuItem_Click); - // - // aboutNUSDToolStripMenuItem - // - this.aboutNUSDToolStripMenuItem.Image = global::NUS_Downloader.Properties.Resources.information; - this.aboutNUSDToolStripMenuItem.Name = "aboutNUSDToolStripMenuItem"; - this.aboutNUSDToolStripMenuItem.Size = new System.Drawing.Size(177, 22); - this.aboutNUSDToolStripMenuItem.Text = "About NUSD"; - this.aboutNUSDToolStripMenuItem.Click += new System.EventHandler(this.aboutNUSDToolStripMenuItem_Click); - // - // scriptsLocalMenuEntry - // - this.scriptsLocalMenuEntry.Enabled = false; - this.scriptsLocalMenuEntry.Image = global::NUS_Downloader.Properties.Resources.script_code; - this.scriptsLocalMenuEntry.Name = "scriptsLocalMenuEntry"; - this.scriptsLocalMenuEntry.Overflow = System.Windows.Forms.ToolStripItemOverflow.AsNeeded; - this.scriptsLocalMenuEntry.Size = new System.Drawing.Size(205, 22); - this.scriptsLocalMenuEntry.Text = "Scripts (Local)"; - // - // scriptsDatabaseToolStripMenuItem - // - this.scriptsDatabaseToolStripMenuItem.Enabled = false; - this.scriptsDatabaseToolStripMenuItem.Image = global::NUS_Downloader.Properties.Resources.script_code_red; - this.scriptsDatabaseToolStripMenuItem.Name = "scriptsDatabaseToolStripMenuItem"; - this.scriptsDatabaseToolStripMenuItem.Size = new System.Drawing.Size(205, 22); - this.scriptsDatabaseToolStripMenuItem.Text = "Scripts (Database)"; - // - // loadNUSScriptToolStripMenuItem - // - this.loadNUSScriptToolStripMenuItem.Image = global::NUS_Downloader.Properties.Resources.script_go; - this.loadNUSScriptToolStripMenuItem.Name = "loadNUSScriptToolStripMenuItem"; - this.loadNUSScriptToolStripMenuItem.Size = new System.Drawing.Size(205, 22); - this.loadNUSScriptToolStripMenuItem.Text = "Load NUS Script"; - this.loadNUSScriptToolStripMenuItem.Click += new System.EventHandler(this.loadNUSScriptToolStripMenuItem_Click); - // - // emulateUpdate - // - this.emulateUpdate.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.uSANTSCToolStripMenuItem, - this.europePALToolStripMenuItem, - this.japanNTSCJToolStripMenuItem, - this.koreaToolStripMenuItem}); - this.emulateUpdate.Image = global::NUS_Downloader.Properties.Resources.server_connect; - this.emulateUpdate.Name = "emulateUpdate"; - this.emulateUpdate.Size = new System.Drawing.Size(205, 22); - this.emulateUpdate.Text = "Emulate Wii System Update"; - this.emulateUpdate.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.emulateUpdate_DropDownItemClicked); - // - // uSANTSCToolStripMenuItem - // - this.uSANTSCToolStripMenuItem.Name = "uSANTSCToolStripMenuItem"; - this.uSANTSCToolStripMenuItem.Size = new System.Drawing.Size(114, 22); - this.uSANTSCToolStripMenuItem.Text = "USA"; - // - // europePALToolStripMenuItem - // - this.europePALToolStripMenuItem.Name = "europePALToolStripMenuItem"; - this.europePALToolStripMenuItem.Size = new System.Drawing.Size(114, 22); - this.europePALToolStripMenuItem.Text = "EUROPE"; - // - // japanNTSCJToolStripMenuItem - // - this.japanNTSCJToolStripMenuItem.Name = "japanNTSCJToolStripMenuItem"; - this.japanNTSCJToolStripMenuItem.Size = new System.Drawing.Size(114, 22); - this.japanNTSCJToolStripMenuItem.Text = "JAPAN"; - // - // koreaToolStripMenuItem - // - this.koreaToolStripMenuItem.Name = "koreaToolStripMenuItem"; - this.koreaToolStripMenuItem.Size = new System.Drawing.Size(114, 22); - this.koreaToolStripMenuItem.Text = "KOREA"; - // // Form1 // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; diff --git a/NUS Downloader/Form1.cs b/NUS Downloader/Form1.cs index b7b7f95..6f09329 100644 --- a/NUS Downloader/Form1.cs +++ b/NUS Downloader/Form1.cs @@ -1754,7 +1754,7 @@ namespace NUS_Downloader } /// - /// Retrieves the new database via WiiBrew. + /// Retrieves the new database file. /// /// Database as a String private void RetrieveNewDatabase(object sender, DoWorkEventArgs e) @@ -1763,42 +1763,53 @@ namespace NUS_Downloader WebClient databasedl = new WebClient(); // Proxy - databasedl = ConfigureWithProxy(databasedl); - - string wiibrewsource = - databasedl.DownloadString("http://www.wiibrew.org/wiki/NUS_Downloader/database?cachesmash=" + + //databasedl = ConfigureWithProxy(databasedl); + + string databaseSource = + databasedl.DownloadString(e.Argument.ToString() + "?cachesmash=" + System.DateTime.Now.ToString()); // Strip out HTML - wiibrewsource = Regex.Replace(wiibrewsource, @"<(.|\n)*?>", ""); + databaseSource = Regex.Replace(databaseSource, @"<(.|\n)*?>", ""); // Shrink to fix only the database string startofdatabase = "<database v"; string endofdatabase = "</database>"; - wiibrewsource = wiibrewsource.Substring(wiibrewsource.IndexOf(startofdatabase), - wiibrewsource.Length - wiibrewsource.IndexOf(startofdatabase)); - wiibrewsource = wiibrewsource.Substring(0, wiibrewsource.IndexOf(endofdatabase) + endofdatabase.Length); + databaseSource = databaseSource.Substring(databaseSource.IndexOf(startofdatabase), + databaseSource.Length - databaseSource.IndexOf(startofdatabase)); + databaseSource = databaseSource.Substring(0, databaseSource.IndexOf(endofdatabase) + endofdatabase.Length); // Fix ", <, >, and spaces - wiibrewsource = wiibrewsource.Replace("<", "<"); - wiibrewsource = wiibrewsource.Replace(">", ">"); - wiibrewsource = wiibrewsource.Replace(""", '"'.ToString()); - wiibrewsource = wiibrewsource.Replace(" ", " "); // Shouldn't occur, but they happen... + databaseSource = databaseSource.Replace("<", "<"); + databaseSource = databaseSource.Replace(">", ">"); + databaseSource = databaseSource.Replace(""", '"'.ToString()); + databaseSource = databaseSource.Replace(" ", " "); // Shouldn't occur, but they happen... // Return parsed xml database... - e.Result = wiibrewsource; + e.Result = databaseSource; } private void RetrieveNewDatabase_Completed(object sender, RunWorkerCompletedEventArgs e) { string database = e.Result.ToString(); + + string databaseFilename = ""; + if (database.Contains("DSISYSTEM")) + { + databaseFilename = "dsidatabase.xml"; + } + else if (database.Contains("0000000100000002")) + { + databaseFilename = "database.xml"; + } + try { Database db = new Database(); - db.LoadDatabaseToStream(Path.Combine(CURRENT_DIR, "database.xml")); + db.LoadDatabaseToStream(Path.Combine(CURRENT_DIR, databaseFilename)); string currentversion = db.GetDatabaseVersion(); string onlineversion = Database.GetDatabaseVersion(database); - WriteStatus(" - Database successfully parsed!"); + WriteStatus(String.Format(" - Database successfully parsed! ({0})", databaseFilename)); WriteStatus(" - Current Database Version: " + currentversion); WriteStatus(" - Online Database Version: " + onlineversion); @@ -1815,15 +1826,15 @@ namespace NUS_Downloader } bool isCreation = false; - if (File.Exists("database.xml")) + if (File.Exists(databaseFilename)) { - WriteStatus(" - Overwriting your current database.xml..."); - WriteStatus(" - The old database will become 'olddatabase.xml' in case the new one is faulty."); + WriteStatus(" - Overwriting your current database..."); + WriteStatus(" - The old database will become 'old*database.xml' in case the new one is faulty."); - string olddatabase = File.ReadAllText("database.xml"); - File.WriteAllText("olddatabase.xml", olddatabase); - File.Delete("database.xml"); - File.WriteAllText("database.xml", database); + string olddatabase = File.ReadAllText(databaseFilename); + File.WriteAllText("old" + databaseFilename, olddatabase); + File.Delete(databaseFilename); + File.WriteAllText(databaseFilename, database); } else { @@ -1851,12 +1862,19 @@ namespace NUS_Downloader private void updateDatabaseToolStripMenuItem_Click(object sender, EventArgs e) { statusbox.Text = ""; - WriteStatus("Updating your database.xml from Wiibrew.org"); + WriteStatus("Updating your databases from Wiibrew/DSibrew"); + + string[] wiibrewValues = new string[] { "http://www.wiibrew.org/wiki/NUS_Downloader/database", "http://www.dsibrew.org/wiki/NUS_Downloader/database" }; BackgroundWorker dbFetcher = new BackgroundWorker(); dbFetcher.DoWork += new DoWorkEventHandler(RetrieveNewDatabase); dbFetcher.RunWorkerCompleted += new RunWorkerCompletedEventHandler(RetrieveNewDatabase_Completed); - dbFetcher.RunWorkerAsync(); + dbFetcher.RunWorkerAsync(wiibrewValues[0]); + + BackgroundWorker dbDsiFetcher = new BackgroundWorker(); + dbDsiFetcher.DoWork += new DoWorkEventHandler(RetrieveNewDatabase); + dbDsiFetcher.RunWorkerCompleted += new RunWorkerCompletedEventHandler(RetrieveNewDatabase_Completed); + dbDsiFetcher.RunWorkerAsync(wiibrewValues[1]); } private void loadInfoFromTMDToolStripMenuItem_Click(object sender, EventArgs e) @@ -2943,7 +2961,6 @@ namespace NUS_Downloader databaseButton.Text = " [. ]"; else if (e.ProgressPercentage == 100) databaseButton.Text = " [..]"; - } private void wiiRegionCodesMenu_DropDownItemClicked(object sender, ToolStripItemClickedEventArgs e) diff --git a/NUS Downloader/Latest/NUS Downloader.exe b/NUS Downloader/Latest/NUS Downloader.exe index 65d0befd339a4705532a9b7b920f6f4e0bf23143..c9079200a3f208e31aa0714a19302e36d70396f8 100644 GIT binary patch delta 17446 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%0Aqi%J8Pzc~kwp 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 Mc?{T-*Xic}2WL>Yg#Z8m