diff --git a/NUS Downloader/Form1.Designer.cs b/NUS Downloader/Form1.Designer.cs index 45ef0d3..9d6186c 100644 --- a/NUS Downloader/Form1.Designer.cs +++ b/NUS Downloader/Form1.Designer.cs @@ -110,9 +110,6 @@ namespace NUS_Downloader 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(); @@ -120,6 +117,10 @@ namespace NUS_Downloader this.packbox = new System.Windows.Forms.CheckBox(); this.decryptbox = new System.Windows.Forms.CheckBox(); this.localuse = new System.Windows.Forms.CheckBox(); + this.titleversion = new wmgCMS.WaterMarkTextBox(); + this.titleidbox = new wmgCMS.WaterMarkTextBox(); + this.dlprogress = new wyDay.Controls.Windows7ProgressBar(); + this.removeNUSDFilesFoldersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.databaseStrip.SuspendLayout(); this.extrasStrip.SuspendLayout(); this.proxyBox.SuspendLayout(); @@ -414,7 +415,8 @@ namespace NUS_Downloader // this.moreExtrasToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.runFolderFixToolStripMenuItem, - this.wiiBrewToolStripMenuItem}); + this.wiiBrewToolStripMenuItem, + this.removeNUSDFilesFoldersToolStripMenuItem}); this.moreExtrasToolStripMenuItem.Image = global::NUS_Downloader.Properties.Resources.wrench; this.moreExtrasToolStripMenuItem.Name = "moreExtrasToolStripMenuItem"; this.moreExtrasToolStripMenuItem.Size = new System.Drawing.Size(177, 22); @@ -424,7 +426,7 @@ namespace NUS_Downloader // runFolderFixToolStripMenuItem // this.runFolderFixToolStripMenuItem.Name = "runFolderFixToolStripMenuItem"; - this.runFolderFixToolStripMenuItem.Size = new System.Drawing.Size(144, 22); + this.runFolderFixToolStripMenuItem.Size = new System.Drawing.Size(206, 22); this.runFolderFixToolStripMenuItem.Text = "Run \'FolderFix\'"; this.runFolderFixToolStripMenuItem.Click += new System.EventHandler(this.runFolderFixToolStripMenuItem_Click); // @@ -434,7 +436,7 @@ namespace NUS_Downloader this.mainPageToolStripMenuItem, this.databasePageToolStripMenuItem}); this.wiiBrewToolStripMenuItem.Name = "wiiBrewToolStripMenuItem"; - this.wiiBrewToolStripMenuItem.Size = new System.Drawing.Size(144, 22); + this.wiiBrewToolStripMenuItem.Size = new System.Drawing.Size(206, 22); this.wiiBrewToolStripMenuItem.Text = "WiiBrew"; // // mainPageToolStripMenuItem @@ -783,40 +785,6 @@ namespace NUS_Downloader this.databaseButton.UseVisualStyleBackColor = true; this.databaseButton.Click += new System.EventHandler(this.DatabaseButton_Click); // - // titleversion - // - this.titleversion.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - 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, 21); - 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("Tahoma", 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, 21); - 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; - // // saveaswadbtn // this.saveaswadbtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -931,6 +899,47 @@ namespace NUS_Downloader this.localuse.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; this.localuse.UseVisualStyleBackColor = true; // + // titleversion + // + this.titleversion.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + 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, 21); + 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("Tahoma", 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, 21); + 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; + // + // 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); + // // Form1 // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1064,6 +1073,7 @@ namespace NUS_Downloader private System.Windows.Forms.ToolStripMenuItem wiiBrewToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mainPageToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem databasePageToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem removeNUSDFilesFoldersToolStripMenuItem; } } diff --git a/NUS Downloader/Form1.cs b/NUS Downloader/Form1.cs index 3d46c22..9b2ea1d 100644 --- a/NUS Downloader/Form1.cs +++ b/NUS Downloader/Form1.cs @@ -440,6 +440,14 @@ namespace NUS_Downloader { // Show extras menu extrasStrip.Show(Extrasbtn, 2, (2+Extrasbtn.Height)); + + + { + System.Windows.Forms.Timer timer = new System.Windows.Forms.Timer(); + timer.Interval = 52; + timer.Tick += new EventHandler(contextmenusTimer_Tick); + timer.Start(); + } } /// @@ -894,6 +902,52 @@ namespace NUS_Downloader { // Open Database button menu... databaseStrip.Show(databaseButton, 2, (2+databaseButton.Height)); + + //if (!e.Equals(EventArgs.Empty)) + { + System.Windows.Forms.Timer timer = new System.Windows.Forms.Timer(); + timer.Interval = 50; + timer.Tick += new EventHandler(contextmenusTimer_Tick); + timer.Start(); + } + } + + void contextmenusTimer_Tick(object sender, EventArgs e) + { + if (SystemMenuList.Pressed || IOSMenuList.Pressed || VCMenuList.Pressed || WiiWareMenuList.Pressed + || RegionCodesList.Pressed || scriptsLocalMenuEntry.Pressed || scriptsDatabaseToolStripMenuItem.Pressed + || emulateUpdate.Pressed) + return; + + if (databaseButton.ClientRectangle.Contains(databaseButton.PointToClient(MousePosition)) && ((System.Windows.Forms.Timer)sender).Interval != 50) + { + databaseStrip.Close(); + scriptsStrip.Close(); + extrasStrip.Close(); + DatabaseButton_Click(sender, EventArgs.Empty); + ((System.Windows.Forms.Timer)sender).Stop(); + } + + if (scriptsbutton.ClientRectangle.Contains(scriptsbutton.PointToClient(MousePosition)) && ((System.Windows.Forms.Timer)sender).Interval != 51) + { + databaseStrip.Close(); + scriptsStrip.Close(); + extrasStrip.Close(); + scriptsbutton_Click(sender, EventArgs.Empty); + ((System.Windows.Forms.Timer)sender).Stop(); + } + + if (Extrasbtn.ClientRectangle.Contains(Extrasbtn.PointToClient(MousePosition)) && ((System.Windows.Forms.Timer)sender).Interval != 52) + { + databaseStrip.Close(); + scriptsStrip.Close(); + extrasStrip.Close(); + extrasMenuButton_Click(sender, EventArgs.Empty); + ((System.Windows.Forms.Timer)sender).Stop(); + } + + + } /// @@ -2097,6 +2151,14 @@ namespace NUS_Downloader { // Show scripts menu scriptsStrip.Show(scriptsbutton, 2, (2+scriptsbutton.Height)); + + //if (!e.Equals(EventArgs.Empty)) + { + System.Windows.Forms.Timer timer = new System.Windows.Forms.Timer(); + timer.Interval = 51; + timer.Tick += new EventHandler(contextmenusTimer_Tick); + timer.Start(); + } } private void DatabaseEnabled(bool enabled) @@ -2611,6 +2673,31 @@ namespace NUS_Downloader folder_fixer.RunWorkerAsync(); } - + private void removeNUSDFilesFoldersToolStripMenuItem_Click(object sender, EventArgs e) + { + // Extras thing, remove all of NUSD files... + if (MessageBox.Show("This will delete all the files\folders you have downloaded from NUS! Are you sure you want to do this?", "Wait a second!", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) != System.Windows.Forms.DialogResult.Yes) + return; + + if (Directory.Exists(Path.Combine(CURRENT_DIR, "titles"))) + Directory.Delete(Path.Combine(CURRENT_DIR, "titles"), true); + if (Directory.Exists(Path.Combine(CURRENT_DIR, "scripts"))) + Directory.Delete(Path.Combine(CURRENT_DIR, "scripts"), true); + + if (File.Exists(Path.Combine(CURRENT_DIR, "database.xml"))) + File.Delete(Path.Combine(CURRENT_DIR, "database.xml")); + if (File.Exists(Path.Combine(CURRENT_DIR, "olddatabase.xml"))) + File.Delete(Path.Combine(CURRENT_DIR, "olddatabase.xml")); + + if (File.Exists(Path.Combine(CURRENT_DIR, "proxy.txt"))) + File.Delete(Path.Combine(CURRENT_DIR, "proxy.txt")); + + if (File.Exists(Path.Combine(CURRENT_DIR, "key.bin"))) + File.Delete(Path.Combine(CURRENT_DIR, "key.bin")); + if (File.Exists(Path.Combine(CURRENT_DIR, "kkey.bin"))) + File.Delete(Path.Combine(CURRENT_DIR, "kkey.bin")); + if (File.Exists(Path.Combine(CURRENT_DIR, "dsikey.bin"))) + File.Delete(Path.Combine(CURRENT_DIR, "dsikey.bin")); + } } } \ No newline at end of file diff --git a/NUS Downloader/Latest/NUS Downloader.exe b/NUS Downloader/Latest/NUS Downloader.exe index ff4355d..4ab3362 100644 Binary files a/NUS Downloader/Latest/NUS Downloader.exe and b/NUS Downloader/Latest/NUS Downloader.exe differ diff --git a/NUS Downloader/NUS Downloader.csproj b/NUS Downloader/NUS Downloader.csproj index 3b207f7..56bd73b 100644 --- a/NUS Downloader/NUS Downloader.csproj +++ b/NUS Downloader/NUS Downloader.csproj @@ -6,7 +6,7 @@ 9.0.30729 2.0 {DB1289FA-BA83-408F-A576-326E5EC4CC6D} - Exe + WinExe Properties NUS_Downloader NUS Downloader diff --git a/NUS Downloader/Program.cs b/NUS Downloader/Program.cs index c8b6b47..3dd4d1f 100644 --- a/NUS Downloader/Program.cs +++ b/NUS Downloader/Program.cs @@ -23,24 +23,26 @@ namespace NUS_Downloader /// /// The main entry point for the application. /// - [STAThread] + //[STAThread] static void Main(string[] args) { - Console.Title = "NUSD"; + //Console.Title = "NUSD"; // hide the console window - setConsoleWindowVisibility(false, Console.Title); + //setConsoleWindowVisibility(false, Console.Title); if (args.Length != 0) { // hide the console window - setConsoleWindowVisibility(true, Console.Title); + //setConsoleWindowVisibility(true, Console.Title); + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); Application.Run(new Form1(args)); } else { // hide the console window - setConsoleWindowVisibility(false, Console.Title); + //setConsoleWindowVisibility(false, Console.Title); Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false);