mirror of
https://github.com/WB3000/nusdownloader.git
synced 2024-06-01 00:38:49 +02:00
Added a few "Extras".
Script naming now covered.
This commit is contained in:
givememystuffplease
parent
3577de06cf
commit
eb6a8c9069
182
NUS Downloader/Form1.Designer.cs
generated
182
NUS Downloader/Form1.Designer.cs
generated
|
|
@ -72,6 +72,12 @@ namespace NUS_Downloader
|
|||
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();
|
||||
this.mainPageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.databasePageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.openNUSDDirectoryToolStripMenuItem = 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();
|
||||
|
|
@ -103,17 +109,17 @@ namespace NUS_Downloader
|
|||
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.databaseButton = 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.titleversion = new wmgCMS.WaterMarkTextBox();
|
||||
this.titleidbox = new wmgCMS.WaterMarkTextBox();
|
||||
this.dlprogress = new wyDay.Controls.Windows7ProgressBar();
|
||||
this.databaseStrip.SuspendLayout();
|
||||
this.extrasStrip.SuspendLayout();
|
||||
this.proxyBox.SuspendLayout();
|
||||
|
|
@ -371,41 +377,93 @@ namespace NUS_Downloader
|
|||
this.toolStripSeparator3,
|
||||
this.proxySettingsToolStripMenuItem,
|
||||
this.toolStripSeparator6,
|
||||
this.moreExtrasToolStripMenuItem,
|
||||
this.openNUSDDirectoryToolStripMenuItem,
|
||||
this.aboutNUSDToolStripMenuItem});
|
||||
this.extrasStrip.Name = "extrasStrip";
|
||||
this.extrasStrip.Size = new System.Drawing.Size(170, 82);
|
||||
this.extrasStrip.Size = new System.Drawing.Size(178, 148);
|
||||
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(169, 22);
|
||||
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(166, 6);
|
||||
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(169, 22);
|
||||
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(166, 6);
|
||||
this.toolStripSeparator6.Size = new System.Drawing.Size(174, 6);
|
||||
//
|
||||
// moreExtrasToolStripMenuItem
|
||||
//
|
||||
this.moreExtrasToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||
this.runFolderFixToolStripMenuItem,
|
||||
this.wiiBrewToolStripMenuItem});
|
||||
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(152, 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(152, 22);
|
||||
this.wiiBrewToolStripMenuItem.Text = "WiiBrew";
|
||||
//
|
||||
// mainPageToolStripMenuItem
|
||||
//
|
||||
this.mainPageToolStripMenuItem.Name = "mainPageToolStripMenuItem";
|
||||
this.mainPageToolStripMenuItem.Size = new System.Drawing.Size(152, 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(152, 22);
|
||||
this.databasePageToolStripMenuItem.Text = "Database Page";
|
||||
this.databasePageToolStripMenuItem.Click += new System.EventHandler(this.databasePageToolStripMenuItem_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);
|
||||
//
|
||||
// aboutNUSDToolStripMenuItem
|
||||
//
|
||||
this.aboutNUSDToolStripMenuItem.Image = global::NUS_Downloader.Properties.Resources.information;
|
||||
this.aboutNUSDToolStripMenuItem.Name = "aboutNUSDToolStripMenuItem";
|
||||
this.aboutNUSDToolStripMenuItem.Size = new System.Drawing.Size(169, 22);
|
||||
this.aboutNUSDToolStripMenuItem.Size = new System.Drawing.Size(177, 22);
|
||||
this.aboutNUSDToolStripMenuItem.Text = "About NUSD";
|
||||
this.aboutNUSDToolStripMenuItem.Click += new System.EventHandler(this.aboutNUSDToolStripMenuItem_Click);
|
||||
//
|
||||
|
|
@ -713,6 +771,52 @@ namespace NUS_Downloader
|
|||
this.richPanel.Size = new System.Drawing.Size(250, 268);
|
||||
this.richPanel.TabIndex = 56;
|
||||
//
|
||||
// databaseButton
|
||||
//
|
||||
this.databaseButton.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
|
||||
this.databaseButton.Location = new System.Drawing.Point(12, 5);
|
||||
this.databaseButton.Name = "databaseButton";
|
||||
this.databaseButton.Size = new System.Drawing.Size(85, 27);
|
||||
this.databaseButton.TabIndex = 20;
|
||||
this.databaseButton.Text = "Database...";
|
||||
this.databaseButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
|
||||
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)));
|
||||
|
|
@ -749,18 +853,6 @@ namespace NUS_Downloader
|
|||
this.iosPatchCheckbox.UseVisualStyleBackColor = true;
|
||||
this.iosPatchCheckbox.CheckedChanged += new System.EventHandler(this.iosPatchCheckbox_CheckedChanged);
|
||||
//
|
||||
// databaseButton
|
||||
//
|
||||
this.databaseButton.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
|
||||
this.databaseButton.Location = new System.Drawing.Point(12, 5);
|
||||
this.databaseButton.Name = "databaseButton";
|
||||
this.databaseButton.Size = new System.Drawing.Size(85, 27);
|
||||
this.databaseButton.TabIndex = 20;
|
||||
this.databaseButton.Text = "Database...";
|
||||
this.databaseButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
|
||||
this.databaseButton.UseVisualStyleBackColor = true;
|
||||
this.databaseButton.Click += new System.EventHandler(this.DatabaseButton_Click);
|
||||
//
|
||||
// keepenccontents
|
||||
//
|
||||
this.keepenccontents.Checked = true;
|
||||
|
|
@ -817,9 +909,9 @@ namespace NUS_Downloader
|
|||
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(195, 26);
|
||||
this.decryptbox.Size = new System.Drawing.Size(231, 26);
|
||||
this.decryptbox.TabIndex = 19;
|
||||
this.decryptbox.Text = "Create Decrypted Contents";
|
||||
this.decryptbox.Text = "Create Decrypted Contents (*.app)";
|
||||
this.decryptbox.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
|
||||
this.decryptbox.UseVisualStyleBackColor = true;
|
||||
//
|
||||
|
|
@ -839,40 +931,6 @@ 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;
|
||||
//
|
||||
// Form1
|
||||
//
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||
|
|
@ -905,7 +963,7 @@ namespace NUS_Downloader
|
|||
this.Text = "NUSD";
|
||||
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing);
|
||||
this.Load += new System.EventHandler(this.Form1_Load);
|
||||
this.MouseWheel += new System.Windows.Forms.MouseEventHandler(Form1_MouseWheel);
|
||||
this.MouseWheel += new System.Windows.Forms.MouseEventHandler(this.Form1_MouseWheel);
|
||||
this.databaseStrip.ResumeLayout(false);
|
||||
this.extrasStrip.ResumeLayout(false);
|
||||
this.proxyBox.ResumeLayout(false);
|
||||
|
|
@ -1000,6 +1058,12 @@ namespace NUS_Downloader
|
|||
private System.Windows.Forms.ToolStripMenuItem iosFakeMenuItem;
|
||||
private System.Windows.Forms.ToolStripMenuItem vcFakeMenuItem;
|
||||
private System.Windows.Forms.ToolStripMenuItem wwFakeMenuItem;
|
||||
private System.Windows.Forms.ToolStripMenuItem openNUSDDirectoryToolStripMenuItem;
|
||||
private System.Windows.Forms.ToolStripMenuItem moreExtrasToolStripMenuItem;
|
||||
private System.Windows.Forms.ToolStripMenuItem runFolderFixToolStripMenuItem;
|
||||
private System.Windows.Forms.ToolStripMenuItem wiiBrewToolStripMenuItem;
|
||||
private System.Windows.Forms.ToolStripMenuItem mainPageToolStripMenuItem;
|
||||
private System.Windows.Forms.ToolStripMenuItem databasePageToolStripMenuItem;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -109,8 +109,8 @@ namespace NUS_Downloader
|
|||
/* Fix proxy entry.
|
||||
if (!(String.IsNullOrEmpty(proxy_url)))
|
||||
while (String.IsNullOrEmpty(proxy_pwd))
|
||||
Thread.Sleep(1000);*/
|
||||
|
||||
Thread.Sleep(1000);
|
||||
|
||||
if ((args.Length == 1) && (args[0] == "folderfix"))
|
||||
{
|
||||
// Organizing folders from past NUSD releases...
|
||||
|
|
@ -120,11 +120,14 @@ namespace NUS_Downloader
|
|||
Debug.WriteLine("folderfix active");
|
||||
WriteStatus("Organizing your old folder structure...");
|
||||
folder_fixer.RunWorkerAsync();
|
||||
}
|
||||
}*/
|
||||
|
||||
if ((args.Length == 1) && (File.Exists(args[0])))
|
||||
{
|
||||
string script_content = File.ReadAllText(args[0]);
|
||||
FileInfo script_file = new FileInfo(args[0]);
|
||||
script_content += String.Format(";{0}", script_file.Name.Replace("." + script_file.Extension, ""));
|
||||
|
||||
BackgroundWorker scripter = new BackgroundWorker();
|
||||
scripter.DoWork += new DoWorkEventHandler(RunScriptBg);
|
||||
scripter.RunWorkerAsync(script_content);
|
||||
|
|
@ -147,15 +150,11 @@ namespace NUS_Downloader
|
|||
statusbox.SelectionColor = statusbox.ForeColor = normalcolor;
|
||||
if (version.StartsWith("SVN"))
|
||||
{
|
||||
WriteStatus("!!!!! THIS IS A DEBUG BUILD FROM SVN !!!!!", warningcolor);
|
||||
WriteStatus("Features CAN and WILL be broken in this build", warningcolor);
|
||||
WriteStatus("REMEMBER TO CHANGE TO THE RELEASE CONFIGURATION AND CHANGE VERSION NUMBER BEFORE BUILDING!", warningcolor);
|
||||
WriteStatus("!!!!! THIS IS A DEBUG BUILD FROM SVN !!!!!");
|
||||
WriteStatus("Features CAN and WILL be broken in this build!");
|
||||
WriteStatus("Devs: REMEMBER TO CHANGE TO THE RELEASE CONFIGURATION AND CHANGE VERSION NUMBER BEFORE BUILDING!");
|
||||
WriteStatus("\r\n");
|
||||
}
|
||||
/*
|
||||
KoreaMassUpdate.DropDownItemClicked += new ToolStripItemClickedEventHandler(upditem_itemclicked);
|
||||
NTSCMassUpdate.DropDownItemClicked += new ToolStripItemClickedEventHandler(upditem_itemclicked);
|
||||
PALMassUpdate.DropDownItemClicked += new ToolStripItemClickedEventHandler(upditem_itemclicked);*/
|
||||
|
||||
// Database BGLoader
|
||||
this.fds = new BackgroundWorker();
|
||||
|
|
@ -887,7 +886,6 @@ namespace NUS_Downloader
|
|||
Debug.WriteLine("Database: IosTitles added");
|
||||
worker.ReportProgress(50);
|
||||
|
||||
// This has been tested and is not the hanging code...
|
||||
ToolStripMenuItem[][] vcItems = databaseObj.LoadVirtualConsoleTitles();
|
||||
for (int a = 0; a < vcItems.Length; a++)
|
||||
{
|
||||
|
|
@ -1896,6 +1894,8 @@ namespace NUS_Downloader
|
|||
if (ofd.ShowDialog() != DialogResult.Cancel)
|
||||
{
|
||||
string script_content = File.ReadAllText(ofd.FileName);
|
||||
FileInfo script_file = new FileInfo(ofd.FileName);
|
||||
script_content += String.Format(";{0}", script_file.Name.Replace("." + script_file.Extension, ""));
|
||||
BackgroundWorker scripter = new BackgroundWorker();
|
||||
scripter.DoWork += new DoWorkEventHandler(RunScriptBg);
|
||||
scripter.RunWorkerAsync(script_content);
|
||||
|
|
@ -1915,7 +1915,9 @@ namespace NUS_Downloader
|
|||
if (scriptArgs.Length < 2)
|
||||
RunScript(scriptArgs[0], "random");
|
||||
else
|
||||
RunScript(scriptArgs[0], scriptArgs[1]);
|
||||
{
|
||||
RunScript(scriptArgs[0], RemoveIllegalCharacters(scriptArgs[1]));
|
||||
}
|
||||
/*
|
||||
script_mode = true;
|
||||
SetTextThreadSafe(statusbox, "");
|
||||
|
|
@ -2192,6 +2194,7 @@ namespace NUS_Downloader
|
|||
}
|
||||
folderpath = Path.Combine(this.CURRENT_DIR, Path.Combine("scripts", Path.Combine(folderpath, tsmi.Text)));
|
||||
string script_content = File.ReadAllText(folderpath);
|
||||
script_content += String.Format(";{0}", tsmi.Text.Replace(".nus", ""));
|
||||
BackgroundWorker scripter = new BackgroundWorker();
|
||||
scripter.DoWork += new DoWorkEventHandler(RunScriptBg);
|
||||
scripter.RunWorkerAsync(script_content);
|
||||
|
|
@ -2262,7 +2265,7 @@ namespace NUS_Downloader
|
|||
// Scripts from database are stored in tooltips...
|
||||
ToolStripMenuItem tsmi = (ToolStripMenuItem)sender;
|
||||
string script_content = tsmi.ToolTipText;
|
||||
// Debug.WriteLine(script_content);
|
||||
script_content += String.Format(";{0}", tsmi.Text);
|
||||
|
||||
BackgroundWorker scripter = new BackgroundWorker();
|
||||
scripter.DoWork += new DoWorkEventHandler(RunScriptBg);
|
||||
|
|
@ -2376,12 +2379,11 @@ namespace NUS_Downloader
|
|||
if (!File.Exists(scriptdir))
|
||||
Directory.CreateDirectory(scriptdir);
|
||||
|
||||
Debug.WriteLine(" - Output: " + scriptdir.Replace(CURRENT_DIR, ""));
|
||||
|
||||
// Parse entries
|
||||
string[] NUS_Entries = scriptstr.Split(Environment.NewLine.ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
|
||||
|
||||
WriteStatus(String.Format(" - Script loaded ({0} Titles)", NUS_Entries.Length));
|
||||
WriteStatus(" - Output: " + scriptdir.Replace(CURRENT_DIR, ""));
|
||||
|
||||
for (int a = 0; a < NUS_Entries.Length; a++)
|
||||
{
|
||||
|
|
@ -2441,7 +2443,7 @@ namespace NUS_Downloader
|
|||
|
||||
void Form1_MouseWheel(object sender, System.Windows.Forms.MouseEventArgs e)
|
||||
{
|
||||
Debug.WriteLine("Delta: " + e.Delta.ToString());
|
||||
//Debug.WriteLine("Delta: " + e.Delta.ToString());
|
||||
|
||||
if (SystemMenuList.DropDown.DisplayRectangle.Contains(e.Location) ||
|
||||
SystemMenuList.DropDown.Bounds.Contains(e.Location) ||
|
||||
|
|
@ -2471,5 +2473,45 @@ namespace NUS_Downloader
|
|||
|
||||
}
|
||||
}
|
||||
|
||||
private void openNUSDDirectoryToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
// Opens the directory NUSD is working in... (CURREND_DIR)
|
||||
Process.Start(CURRENT_DIR);
|
||||
}
|
||||
|
||||
private void mainPageToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
Process.Start("http://www.wiibrew.org/wiki/NUS_Downloader");
|
||||
}
|
||||
|
||||
private void databasePageToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
Process.Start("http://www.wiibrew.org/wiki/NUS_Downloader/database");
|
||||
}
|
||||
|
||||
private void extrasStrip_Opening(object sender, CancelEventArgs e)
|
||||
{
|
||||
// Show additional features based on held keys...
|
||||
#if DEBUG
|
||||
moreExtrasToolStripMenuItem.Visible = true;
|
||||
#else
|
||||
moreExtrasToolStripMenuItem.Visible = Control.ModifierKeys == Keys.Control; // If Ctrl Pressed.
|
||||
#endif
|
||||
}
|
||||
|
||||
private void runFolderFixToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
// Run folderfix to make \titles\
|
||||
// Organizing folders from past NUSD releases...
|
||||
BackgroundWorker folder_fixer = new BackgroundWorker();
|
||||
folder_fixer.DoWork += new DoWorkEventHandler(ReorganizePreviousFolderStructure);
|
||||
folder_fixer.RunWorkerCompleted += new RunWorkerCompletedEventHandler(ReorganizePreviousFolderStructure_Completed);
|
||||
Debug.WriteLine("folderfix active");
|
||||
WriteStatus("Organizing your old folder structure...");
|
||||
folder_fixer.RunWorkerAsync();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -127,7 +127,7 @@
|
|||
<value>285, 17</value>
|
||||
</metadata>
|
||||
<metadata name="scriptsStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>386, 21</value>
|
||||
<value>394, 17</value>
|
||||
</metadata>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -139,6 +139,7 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="Crystal_Clear_app_ark2.ico" />
|
||||
<None Include="Resources\wrench.png" />
|
||||
<None Include="Resources\script_start.png" />
|
||||
<None Include="Resources\package_green.png" />
|
||||
<None Include="Resources\package.png" />
|
||||
|
|
@ -155,6 +156,7 @@
|
|||
<None Include="Resources\drive_disk.png" />
|
||||
<None Include="Resources\bin_closed.png" />
|
||||
<None Include="Resources\arrow_ticker.gif" />
|
||||
<None Include="Resources\folder.png" />
|
||||
<Content Include="Resources\key.png" />
|
||||
<None Include="Resources\page_white_magnify.png" />
|
||||
<None Include="Resources\server_link.png" />
|
||||
|
|
|
|||
|
|
@ -376,6 +376,10 @@ namespace libWiiSharp
|
|||
fireDebug(" Parsing Ticket...");
|
||||
tik = Ticket.Load(Path.Combine(outputDir, "cetk"));
|
||||
}
|
||||
else
|
||||
{
|
||||
fireDebug(" Ticket Unavailable...");
|
||||
}
|
||||
|
||||
string[] encryptedContents = new string[tmd.NumOfContents];
|
||||
|
||||
|
|
|
|||
14
NUS Downloader/Properties/Resources.Designer.cs
generated
14
NUS Downloader/Properties/Resources.Designer.cs
generated
|
|
@ -151,6 +151,13 @@ namespace NUS_Downloader.Properties {
|
|||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap folder {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("folder", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap folder_table {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("folder_table", resourceCulture);
|
||||
|
|
@ -262,5 +269,12 @@ namespace NUS_Downloader.Properties {
|
|||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap wrench {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("wrench", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -118,15 +118,21 @@
|
|||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="server_connect" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\server_connect.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="package_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\package_delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="bullet_redorange" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\bullet_redorange.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="script_start" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\script_start.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="bullet_redgreen" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\bullet_redgreen.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="folder" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\folder.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="script_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\script_go.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
|
@ -139,8 +145,8 @@
|
|||
<data name="page_white_magnify" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\page_white_magnify.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="package_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\package_delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="box" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\box.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="script_code_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\script_code_red.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
@ -154,11 +160,11 @@
|
|||
<data name="server_link" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\server_link.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="server_connect" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\server_connect.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="arrow_ticker" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\arrow_ticker.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="box" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\box.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="script_start" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\script_start.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="bin_closed" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\bin_closed.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
@ -203,7 +209,7 @@
|
|||
<value>..\Resources\information.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="arrow_ticker" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\arrow_ticker.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="wrench" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\wrench.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
</root>
|
||||
Loading…
Reference in New Issue
Block a user