diff --git a/.gitignore b/.gitignore index f14af3d..3a99554 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,5 @@ legacy/ /FriishProduce/LanguageEditor.Designer.cs /FriishProduce/LanguageEditor.resx /FriishProduce/Emanuals +/VCManualCreator /FriishProduce/Strings/de.json diff --git a/FriishProduce/App.config b/FriishProduce/App.config index 35be944..3e09469 100644 --- a/FriishProduce/App.config +++ b/FriishProduce/App.config @@ -24,7 +24,7 @@ 1 - True + False False @@ -33,7 +33,7 @@ False - True + False @@ -93,7 +93,7 @@ - 87 + 100 diff --git a/FriishProduce/MainForm.Designer.cs b/FriishProduce/MainForm.Designer.cs index 605ecae..9183349 100644 --- a/FriishProduce/MainForm.Designer.cs +++ b/FriishProduce/MainForm.Designer.cs @@ -520,7 +520,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem menu_about_app; private System.Windows.Forms.ToolStripSeparator toolStripSeparator5; private System.Windows.Forms.Panel MainPanel; - private System.Windows.Forms.Label welcome; private System.Windows.Forms.ToolStrip ToolStrip; private System.Windows.Forms.ToolStripButton ToolStrip_OpenROM; private System.Windows.Forms.ToolStripButton ToolStrip_OpenImage; @@ -542,6 +541,7 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem menu_open_project; private System.Windows.Forms.ToolStripButton ToolStrip_SaveAs; private System.Windows.Forms.ToolStripButton ToolStrip_OpenProject; + private System.Windows.Forms.Label welcome; } } diff --git a/FriishProduce/MainForm.cs b/FriishProduce/MainForm.cs index 88fdb48..c121812 100644 --- a/FriishProduce/MainForm.cs +++ b/FriishProduce/MainForm.cs @@ -343,7 +343,7 @@ private void OpenImage_Click(object sender, EventArgs e) private void Tutorial_Click(object sender, EventArgs e) { - var tut = new Tutorial() { Text = menu_tutorial.Text, Font = Font }; + var tut = new Tutorial() { Text = menu_tutorial.Text }; tut.ShowDialog(); tut.Dispose(); } diff --git a/FriishProduce/Options/VC_N64.Designer.cs b/FriishProduce/Options/VC_N64.Designer.cs index 5f6d144..ba7f0f3 100644 --- a/FriishProduce/Options/VC_N64.Designer.cs +++ b/FriishProduce/Options/VC_N64.Designer.cs @@ -37,7 +37,7 @@ internal sealed partial class VC_N64 : global::System.Configuration.ApplicationS [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] + [global::System.Configuration.DefaultSettingValueAttribute("False")] public string patch_fixbrightness { get { return ((string)(this["patch_fixbrightness"])); @@ -73,7 +73,7 @@ internal sealed partial class VC_N64 : global::System.Configuration.ApplicationS [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] + [global::System.Configuration.DefaultSettingValueAttribute("False")] public string patch_autosizerom { get { return ((string)(this["patch_autosizerom"])); diff --git a/FriishProduce/Options/VC_N64.settings b/FriishProduce/Options/VC_N64.settings index 6bdb8cd..f3428be 100644 --- a/FriishProduce/Options/VC_N64.settings +++ b/FriishProduce/Options/VC_N64.settings @@ -6,7 +6,7 @@ 1 - True + False False @@ -15,7 +15,7 @@ False - True + False \ No newline at end of file diff --git a/FriishProduce/Options/VC_SEGA.Designer.cs b/FriishProduce/Options/VC_SEGA.Designer.cs index e6a176a..4138484 100644 --- a/FriishProduce/Options/VC_SEGA.Designer.cs +++ b/FriishProduce/Options/VC_SEGA.Designer.cs @@ -25,7 +25,7 @@ internal sealed partial class VC_SEGA : global::System.Configuration.Application [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("87")] + [global::System.Configuration.DefaultSettingValueAttribute("100")] public string console_brightness { get { return ((string)(this["console_brightness"])); diff --git a/FriishProduce/Options/VC_SEGA.settings b/FriishProduce/Options/VC_SEGA.settings index 6067228..f4da616 100644 --- a/FriishProduce/Options/VC_SEGA.settings +++ b/FriishProduce/Options/VC_SEGA.settings @@ -3,7 +3,7 @@ - 87 + 100 diff --git a/FriishProduce/ProjectForm.Designer.cs b/FriishProduce/ProjectForm.Designer.cs index 3d21a18..57229c6 100644 --- a/FriishProduce/ProjectForm.Designer.cs +++ b/FriishProduce/ProjectForm.Designer.cs @@ -44,11 +44,12 @@ private void InitializeComponent() this.SaveDataTitle = new System.Windows.Forms.TextBox(); this.label16 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.COPanel_VC = new System.Windows.Forms.Panel(); + this.manual_type = new System.Windows.Forms.Label(); + this.manual_type_list = new System.Windows.Forms.ComboBox(); this.label3 = new System.Windows.Forms.Label(); this.InjectorsList = new System.Windows.Forms.ComboBox(); this.MethodOptions = new System.Windows.Forms.Button(); - this.COPanel_VC = new System.Windows.Forms.Panel(); - this.CustomManual = new System.Windows.Forms.CheckBox(); this.COPanel_Forwarder = new System.Windows.Forms.Panel(); this.groupBox8 = new System.Windows.Forms.GroupBox(); this.FStorage_SD = new System.Windows.Forms.RadioButton(); @@ -79,9 +80,9 @@ private void InitializeComponent() this.label8 = new System.Windows.Forms.Label(); this.BannerTitle = new System.Windows.Forms.TextBox(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.base_name = new System.Windows.Forms.Label(); this.ImportWAD = new System.Windows.Forms.RadioButton(); this.DownloadWAD = new System.Windows.Forms.RadioButton(); - this.base_name = new System.Windows.Forms.Label(); this.title_id = new System.Windows.Forms.Label(); this.panel1 = new System.Windows.Forms.Panel(); this.baseID = new System.Windows.Forms.Label(); @@ -143,6 +144,7 @@ private void InitializeComponent() resources.GetString("imageintpl.Items")}); resources.ApplyResources(this.imageintpl, "imageintpl"); this.imageintpl.Name = "imageintpl"; + this.imageintpl.Tag = "image_interpolation_mode"; this.imageintpl.SelectedIndexChanged += new System.EventHandler(this.InterpolationChanged); // // image_fit @@ -208,16 +210,38 @@ private void InitializeComponent() // // groupBox3 // + this.groupBox3.Controls.Add(this.COPanel_VC); this.groupBox3.Controls.Add(this.label3); this.groupBox3.Controls.Add(this.InjectorsList); this.groupBox3.Controls.Add(this.MethodOptions); - this.groupBox3.Controls.Add(this.COPanel_VC); this.groupBox3.Controls.Add(this.COPanel_Forwarder); resources.ApplyResources(this.groupBox3, "groupBox3"); this.groupBox3.Name = "groupBox3"; this.groupBox3.TabStop = false; this.groupBox3.Tag = "content_options"; // + // COPanel_VC + // + this.COPanel_VC.Controls.Add(this.manual_type); + this.COPanel_VC.Controls.Add(this.manual_type_list); + resources.ApplyResources(this.COPanel_VC, "COPanel_VC"); + this.COPanel_VC.Name = "COPanel_VC"; + // + // manual_type + // + resources.ApplyResources(this.manual_type, "manual_type"); + this.manual_type.Name = "manual_type"; + this.manual_type.Tag = "manual_type"; + // + // manual_type_list + // + this.manual_type_list.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.manual_type_list.FormattingEnabled = true; + resources.ApplyResources(this.manual_type_list, "manual_type_list"); + this.manual_type_list.Name = "manual_type_list"; + this.manual_type_list.Tag = "manual_type"; + this.manual_type_list.SelectedIndexChanged += new System.EventHandler(this.CustomManual_CheckedChanged); + // // label3 // resources.ApplyResources(this.label3, "label3"); @@ -243,20 +267,6 @@ private void InitializeComponent() this.MethodOptions.UseVisualStyleBackColor = true; this.MethodOptions.Click += new System.EventHandler(this.OpenInjectorOptions); // - // COPanel_VC - // - this.COPanel_VC.Controls.Add(this.CustomManual); - resources.ApplyResources(this.COPanel_VC, "COPanel_VC"); - this.COPanel_VC.Name = "COPanel_VC"; - // - // CustomManual - // - resources.ApplyResources(this.CustomManual, "CustomManual"); - this.CustomManual.Name = "CustomManual"; - this.CustomManual.Tag = "import_manual"; - this.CustomManual.UseVisualStyleBackColor = true; - this.CustomManual.CheckedChanged += new System.EventHandler(this.CustomManual_CheckedChanged); - // // COPanel_Forwarder // this.COPanel_Forwarder.Controls.Add(this.groupBox8); @@ -521,6 +531,13 @@ private void InitializeComponent() this.groupBox2.TabStop = false; this.groupBox2.Tag = "base"; // + // base_name + // + resources.ApplyResources(this.base_name, "base_name"); + this.base_name.Name = "base_name"; + this.base_name.Tag = "base_name"; + this.base_name.UseMnemonic = false; + // // ImportWAD // resources.ApplyResources(this.ImportWAD, "ImportWAD"); @@ -539,13 +556,6 @@ private void InitializeComponent() this.DownloadWAD.UseVisualStyleBackColor = true; this.DownloadWAD.CheckedChanged += new System.EventHandler(this.OpenWAD_CheckedChanged); // - // base_name - // - resources.ApplyResources(this.base_name, "base_name"); - this.base_name.Name = "base_name"; - this.base_name.Tag = "base_name"; - this.base_name.UseMnemonic = false; - // // title_id // resources.ApplyResources(this.title_id, "title_id"); @@ -702,7 +712,6 @@ private void InitializeComponent() private System.Windows.Forms.ComboBox InjectorsList; private System.Windows.Forms.Label label3; private System.Windows.Forms.CheckBox Patch; - private System.Windows.Forms.CheckBox CustomManual; private System.Windows.Forms.Label label11; internal System.Windows.Forms.OpenFileDialog BrowsePatch; private System.Windows.Forms.Panel COPanel_VC; @@ -724,5 +733,7 @@ private void InitializeComponent() private System.Windows.Forms.RadioButton DownloadWAD; private System.Windows.Forms.RadioButton ImportWAD; private Ookii.Dialogs.WinForms.VistaFolderBrowserDialog BrowseManual; + private System.Windows.Forms.Label manual_type; + private System.Windows.Forms.ComboBox manual_type_list; } } \ No newline at end of file diff --git a/FriishProduce/ProjectForm.cs b/FriishProduce/ProjectForm.cs index 6ff18dc..8844004 100644 --- a/FriishProduce/ProjectForm.cs +++ b/FriishProduce/ProjectForm.cs @@ -74,7 +74,8 @@ public void Save() p.Creator = Creator; p.ROM = ROM?.Path; p.PatchFile = PatchFile; - p.Manual = Manual; + p.ManualIndex = manual_type_list.SelectedIndex; + p.ManualFile = Manual; p.Img = Img?.Source ?? null; p.ForwarderOptions = (FStorage_USB.Checked, toggleSwitch1.Checked); p.Options = CO?.Options ?? null; @@ -133,13 +134,16 @@ public void RefreshForm() baseID.Location = new Point(baseMax, title_id.Location.Y); // Selected index properties - imageintpl.Items.Clear(); - imageintpl.Items.AddRange(Program.Lang.StringArray("image_interpolation_mode", Name)); + Program.Lang.Control(imageintpl, Name); imageintpl.SelectedIndex = Properties.Settings.Default.image_interpolation; + // Manual + Program.Lang.Control(manual_type, Name); + Program.AutoSizeControl(manual_type_list, manual_type); + // Regions lists TargetRegion.Items.Clear(); - TargetRegion.Items.Add(Program.Lang.String("region_orig")); + TargetRegion.Items.Add(Program.Lang.String("keep_original")); TargetRegion.Items.Add(Program.Lang.String("region_rf")); TargetRegion.SelectedIndex = 0; @@ -374,7 +378,8 @@ private void Form_Shown(object sender, EventArgs e) toggleSwitch1.Checked = Options.FORWARDER.Default.nand_loader.ToLower().Contains("vwii"); LinkSaveData.Checked = Properties.Settings.Default.link_save_data; - CustomManual.Enabled = false; + manual_type_list.SelectedIndex = 0; + manual_type_list.Enabled = false; foreach (var customManualConsole in new List() // Confirmed to have an algorithm exist for NES, SNES, N64, SEGA, PCE, NEO { Console.NES, @@ -385,7 +390,7 @@ private void Form_Shown(object sender, EventArgs e) // Console.PCE, // Console.NEO }) - if (Console == customManualConsole) CustomManual.Enabled = true; + if (Console == customManualConsole) manual_type_list.Enabled = true; AddBases(); @@ -432,13 +437,13 @@ private void Form_Shown(object sender, EventArgs e) LinkSaveData.Checked = ParentProject.LinkSaveDataTitle; imageintpl.SelectedIndex = ParentProject.ImageOptions.Item1; image_fit.Checked = ParentProject.ImageOptions.Item2; + ToggleControls(!string.IsNullOrEmpty(ROM?.Path)); PatchFile = File.Exists(ParentProject.PatchFile) ? ParentProject.PatchFile : null; Patch.Checked = !string.IsNullOrWhiteSpace(ParentProject.PatchFile); - LoadManual(ParentProject.Manual); + LoadManual(ParentProject.ManualIndex, ParentProject.ManualFile); ParentProject = null; - ToggleControls(!string.IsNullOrEmpty(ROM?.Path)); } FStorage_SD.Checked = !FStorage_USB.Checked; @@ -726,10 +731,12 @@ public bool LoadWAD(string path) return false; } - public void LoadManual(string path, bool isFolder = true) + public void LoadManual(int index, string path = null, bool isFolder = true) { if (File.Exists(path) && !isFolder) { + index = 2; + using (ZipFile ZIP = ZipFile.Read(path)) { int applicable = 0; @@ -762,6 +769,8 @@ public void LoadManual(string path, bool isFolder = true) else if (Directory.Exists(path) && isFolder) { + index = 2; + // Check if is a valid emanual contents folder // **************** string folder = path; @@ -801,7 +810,8 @@ public void LoadManual(string path, bool isFolder = true) goto End; End: - CustomManual.Checked = Manual != null; + if (Manual == null && index >= 2) index = 0; + manual_type_list.SelectedIndex = index; } public void LoadImage() @@ -1171,7 +1181,8 @@ public void WiiVCInject() // Set path to manual (if it exists) and load WAD // ******* VC.Manual = Manual != null ? new ZipFile("manual") : null; - if (VC.Manual != null) VC.Manual.AddDirectory(Manual); + VC.KeepOrigManual = manual_type_list.SelectedIndex == 1; + if (VC.Manual != null && manual_type_list.SelectedIndex == 2) VC.Manual.AddDirectory(Manual); // Actually inject everything // ******* @@ -1558,6 +1569,12 @@ private void ResetContentOptions() CO.Icon = Icon.FromHandle(Properties.Resources.wrench.GetHicon()); } + if (!isVCMode && Manual != null) + { + Manual = null; + manual_type_list.SelectedIndex = 0; + } + #region Toggle savedata panel LinkSaveData.Visible = SaveIcon_Panel.Visible = SaveDataTitle.Visible = ShowSaveData; label16.Visible = !ShowSaveData; @@ -1612,33 +1629,17 @@ private void ChannelTitle_Locale_CheckedChanged(object sender, EventArgs e) private void CustomManual_CheckedChanged(object sender, EventArgs e) { - if (CustomManual.Checked && CustomManual.Enabled && Manual == null) + if (manual_type_list.Enabled && manual_type_list.SelectedIndex == 2 && Manual == null) { if (!Properties.Settings.Default.donotshow_000) MessageBox.Show((sender as Control).Text, Program.Lang.Msg(6), 0); - if (BrowseManual.ShowDialog() == DialogResult.OK) - { - LoadManual(BrowseManual.SelectedPath, true); - CheckExport(); - } - - else - { - if (Manual != null) - { - LoadManual(null); - CheckExport(); - } - - CustomManual.Checked = false; - } + if (BrowseManual.ShowDialog() == DialogResult.OK) LoadManual(manual_type_list.SelectedIndex, BrowseManual.SelectedPath, true); + else if (Manual != null) LoadManual(manual_type_list.SelectedIndex, null); } - else if (!CustomManual.Checked && Manual != null && CustomManual.Enabled) - { - LoadManual(null); - CheckExport(); - } + else if ((manual_type_list.SelectedIndex < 2 && Manual != null) || !manual_type_list.Enabled) LoadManual(0); + + CheckExport(); } private void Patch_CheckedChanged(object sender, EventArgs e) diff --git a/FriishProduce/ProjectForm.resx b/FriishProduce/ProjectForm.resx index cd8c30c..584ded7 100644 --- a/FriishProduce/ProjectForm.resx +++ b/FriishProduce/ProjectForm.resx @@ -133,7 +133,82 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + label12 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox6 + + + 0 + + + imageintpl + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox6 + + + 1 + + + image_fit + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox6 + + + 2 + + + image_stretch + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox6 + + + 3 + + + False + + + 778, 364 + + + 312, 116 + + + 39 + + + image + + + groupBox6 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + True @@ -249,38 +324,86 @@ 3 - + + 137, 17 + + + WAD|*.wad + + + LinkSaveData + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox7 + + + 0 + + + SaveIcon_Panel + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox7 + + + 1 + + + SaveDataTitle + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox7 + + + 2 + + + label16 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox7 + + + 3 + + False - - 778, 364 + + 500, 364 - - 312, 115 + + 271, 116 - - 39 + + 40 - - image + + save_data - - groupBox6 + + groupBox7 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 7 - - - 137, 17 - - - WAD|*.wad + + 6 True @@ -373,7 +496,7 @@ 3, 16 - 265, 96 + 265, 97 38 @@ -399,32 +522,77 @@ 3 - - False + + True - - 500, 364 + + 0, 4 - - 271, 115 + + 67, 13 - - 40 + + 0 - - save_data + + manual_type - - groupBox7 + + manual_type - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this + + COPanel_VC - - 6 + + 0 + + + 0, 0 + + + 421, 21 + + + 1 + + + manual_type_list + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + COPanel_VC + + + 1 + + + 12, 64 + + + 458, 25 + + + 42 + + + False + + + COPanel_VC + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox3 + + + 0 True @@ -454,7 +622,7 @@ groupBox3 - 0 + 1 12, 37 @@ -475,7 +643,7 @@ groupBox3 - 1 + 2 False @@ -502,76 +670,82 @@ groupBox3 - 2 - - - True - - - NoControl + 3 - - 0, 1 + + groupBox8 - - 94, 17 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 6 + + COPanel_Forwarder - - import_manual + + 0 - - CustomManual + + groupBox9 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - COPanel_VC + + COPanel_Forwarder - - 0 + + 1 - - 12, 64 + + 12, 65 - - 377, 20 + + 421, 40 - + 42 - + False - - COPanel_VC + + COPanel_Forwarder - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + groupBox3 - - 3 + + 4 - - True + + False - - 8, 16 + + 10, 364 - - 40, 17 + + 483, 116 - - 19 + + 35 - - SD + + content_options + + + groupBox3 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 FStorage_SD @@ -585,21 +759,6 @@ 0 - - True - - - 57, 16 - - - 47, 17 - - - 20 - - - USB - FStorage_USB @@ -616,7 +775,7 @@ 0, 0 - 184, 40 + 200, 40 23 @@ -636,20 +795,59 @@ 0 - + True - - 48, 18 + + 8, 16 - - 22, 13 + + 40, 17 - - 21 + + 19 - - Wii + + SD + + + FStorage_SD + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox8 + + + 0 + + + True + + + 57, 16 + + + 47, 17 + + + 20 + + + USB + + + FStorage_USB + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox8 + + + 1 toggleSwitchL1 @@ -663,15 +861,6 @@ 0 - - 8, 17 - - - 35, 15 - - - 20 - toggleSwitch1 @@ -685,10 +874,10 @@ 1 - 193, 0 + 219, 0 - 184, 40 + 200, 40 23 @@ -708,56 +897,53 @@ 1 - - 12, 64 - - - 377, 40 + + True - - 42 + + 48, 18 - - False + + 22, 13 - - COPanel_Forwarder + + 21 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Wii - - groupBox3 + + toggleSwitchL1 - - 4 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - False + + groupBox9 - - 10, 364 + + 0 - - 483, 115 + + 8, 17 - - 35 + + 35, 15 - - content_options + + 20 - - groupBox3 + + toggleSwitch1 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + JCS.ToggleSwitch, ToggleSwitch, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - $this + + groupBox9 - - 5 + + 1 True @@ -822,6 +1008,141 @@ 3 + + title_id_2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 0 + + + ChannelTitle_Locale + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 1 + + + TargetRegion + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 2 + + + label13 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 3 + + + TitleID + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 4 + + + label15 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 5 + + + Random + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 6 + + + ChannelTitle + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 7 + + + short_channel_name + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 8 + + + False + + + 10, 258 + + + 483, 100 + + + 39 + + + channel + + + groupBox4 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 8 + NoControl @@ -1092,32 +1413,56 @@ 8 - + + software_name + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 1 + + + filename + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 2 + + False - - 10, 258 + + 10, 7 - - 483, 100 + + 483, 104 - - 39 + + 34 - - channel + + rom_info - - groupBox4 + + groupBox1 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 8 + + 3 True @@ -1140,71 +1485,143 @@ software_name - + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 1 + + + True + + + NoControl + + + 9, 20 + + + 46, 13 + + + 0 + + + filename + + + filename + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 2 + + + Players + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox5 + + + 0 + + + ReleaseYear + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox5 + + + 1 + + + label10 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox1 + + groupBox5 - - 1 + + 2 - - True + + label9 - - NoControl + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 9, 20 + + groupBox5 - - 46, 13 + + 3 - - 0 + + label8 - - filename + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - filename + + groupBox5 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4 - - groupBox1 + + BannerTitle - - 2 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + groupBox5 + + + 5 + + False - - 10, 7 + + 500, 258 - - 483, 104 + + 451, 100 - - 34 + + 33 - - rom_info + + banner - - groupBox1 + + groupBox5 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 3 + + 2 343, 69 @@ -1368,32 +1785,140 @@ 5 - + + base_name + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 0 + + + ImportWAD + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 1 + + + DownloadWAD + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 2 + + + title_id + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 3 + + + panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 4 + + + baseID + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 5 + + + BaseRegion + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 6 + + + Base + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 7 + + + baseName + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox2 + + + 8 + + False - - 500, 258 + + 10, 117 - - 451, 100 + + 483, 135 - - 33 + + 40 - - banner + + base - - groupBox5 + + groupBox2 - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 2 + + 9 True @@ -1659,33 +2184,6 @@ 8 - - False - - - 10, 117 - - - 483, 135 - - - 40 - - - base - - - groupBox2 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 9 - 355, 17 @@ -1755,6 +2253,9 @@ 1100, 490 + + NoControl + No diff --git a/FriishProduce/Resources/tutorial.rtf b/FriishProduce/Resources/tutorial.rtf index a248e64..af92e37 100644 Binary files a/FriishProduce/Resources/tutorial.rtf and b/FriishProduce/Resources/tutorial.rtf differ diff --git a/FriishProduce/SettingsForm.Designer.cs b/FriishProduce/SettingsForm.Designer.cs index 0e3e062..a2f4c00 100644 --- a/FriishProduce/SettingsForm.Designer.cs +++ b/FriishProduce/SettingsForm.Designer.cs @@ -32,12 +32,12 @@ private void InitializeComponent() System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SettingsForm)); this.lngList = new System.Windows.Forms.ComboBox(); this.vc_n64_options = new System.Windows.Forms.GroupBox(); + this.vc_n64_romc_type = new System.Windows.Forms.Label(); this.vc_n64_patch_autosizerom = new System.Windows.Forms.CheckBox(); + this.vc_n64_romc_type_list = new System.Windows.Forms.ComboBox(); this.vc_n64_patch_expandedram = new System.Windows.Forms.CheckBox(); this.vc_n64_patch_fixcrashes = new System.Windows.Forms.CheckBox(); this.vc_n64_patch_fixbrightness = new System.Windows.Forms.CheckBox(); - this.vc_n64_romc_type = new System.Windows.Forms.GroupBox(); - this.vc_n64_romc_type_list = new System.Windows.Forms.ComboBox(); this.DownloadBanners = new System.Windows.Forms.Button(); this.b_ok = new System.Windows.Forms.Button(); this.b_cancel = new System.Windows.Forms.Button(); @@ -81,12 +81,6 @@ private void InitializeComponent() this.label1 = new System.Windows.Forms.Label(); this.SEGA_console_brightness = new System.Windows.Forms.TrackBar(); this.vc_pce = new System.Windows.Forms.Panel(); - this.vc_pce_display = new System.Windows.Forms.GroupBox(); - this.vc_pce_y_offset_l = new System.Windows.Forms.Label(); - this.vc_pce_y_offset = new System.Windows.Forms.NumericUpDown(); - this.vc_pce_sprline = new System.Windows.Forms.CheckBox(); - this.vc_pce_raster = new System.Windows.Forms.CheckBox(); - this.vc_pce_hide_overscan = new System.Windows.Forms.CheckBox(); this.vc_pce_system = new System.Windows.Forms.GroupBox(); this.vc_pce_backupram = new System.Windows.Forms.CheckBox(); this.vc_pce_europe_switch = new JCS.ToggleSwitch(); @@ -95,7 +89,15 @@ private void InitializeComponent() this.vc_pce_sgenable = new System.Windows.Forms.Label(); this.vc_pce_padbutton = new System.Windows.Forms.Label(); this.vc_pce_sgenable_switch = new JCS.ToggleSwitch(); + this.vc_pce_display = new System.Windows.Forms.GroupBox(); + this.vc_pce_y_offset_l = new System.Windows.Forms.Label(); + this.vc_pce_y_offset = new System.Windows.Forms.NumericUpDown(); + this.vc_pce_sprline = new System.Windows.Forms.CheckBox(); + this.vc_pce_raster = new System.Windows.Forms.CheckBox(); + this.vc_pce_hide_overscan = new System.Windows.Forms.CheckBox(); this.adobe_flash = new System.Windows.Forms.Panel(); + this.flash_strap_reminder = new System.Windows.Forms.GroupBox(); + this.flash_strap_reminder_list = new System.Windows.Forms.ComboBox(); this.flash_controls = new System.Windows.Forms.GroupBox(); this.flash_qwerty_keyboard = new System.Windows.Forms.CheckBox(); this.flash_mouse = new System.Windows.Forms.CheckBox(); @@ -108,10 +110,7 @@ private void InitializeComponent() this.flash_vff_cache_size_list = new System.Windows.Forms.ComboBox(); this.LanguageList = new System.Windows.Forms.ComboBox(); this.panel2 = new System.Windows.Forms.Panel(); - this.flash_strap_reminder = new System.Windows.Forms.GroupBox(); - this.flash_strap_reminder_list = new System.Windows.Forms.ComboBox(); this.vc_n64_options.SuspendLayout(); - this.vc_n64_romc_type.SuspendLayout(); this.bottomPanel1.SuspendLayout(); this.bottomPanel2.SuspendLayout(); this.panel1.SuspendLayout(); @@ -131,15 +130,15 @@ private void InitializeComponent() this.vc_sega_display.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.SEGA_console_brightness)).BeginInit(); this.vc_pce.SuspendLayout(); + this.vc_pce_system.SuspendLayout(); this.vc_pce_display.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.vc_pce_y_offset)).BeginInit(); - this.vc_pce_system.SuspendLayout(); this.adobe_flash.SuspendLayout(); + this.flash_strap_reminder.SuspendLayout(); this.flash_controls.SuspendLayout(); this.flash_quality.SuspendLayout(); this.flash_save_data.SuspendLayout(); this.panel2.SuspendLayout(); - this.flash_strap_reminder.SuspendLayout(); this.SuspendLayout(); // // lngList @@ -153,7 +152,9 @@ private void InitializeComponent() // // vc_n64_options // + this.vc_n64_options.Controls.Add(this.vc_n64_romc_type); this.vc_n64_options.Controls.Add(this.vc_n64_patch_autosizerom); + this.vc_n64_options.Controls.Add(this.vc_n64_romc_type_list); this.vc_n64_options.Controls.Add(this.vc_n64_patch_expandedram); this.vc_n64_options.Controls.Add(this.vc_n64_patch_fixcrashes); this.vc_n64_options.Controls.Add(this.vc_n64_patch_fixbrightness); @@ -162,6 +163,12 @@ private void InitializeComponent() this.vc_n64_options.TabStop = false; this.vc_n64_options.Tag = "vc_options"; // + // vc_n64_romc_type + // + resources.ApplyResources(this.vc_n64_romc_type, "vc_n64_romc_type"); + this.vc_n64_romc_type.Name = "vc_n64_romc_type"; + this.vc_n64_romc_type.Tag = "romc_type"; + // // vc_n64_patch_autosizerom // resources.ApplyResources(this.vc_n64_patch_autosizerom, "vc_n64_patch_autosizerom"); @@ -169,6 +176,14 @@ private void InitializeComponent() this.vc_n64_patch_autosizerom.Tag = "patch_autosizerom"; this.vc_n64_patch_autosizerom.UseVisualStyleBackColor = true; // + // vc_n64_romc_type_list + // + this.vc_n64_romc_type_list.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.vc_n64_romc_type_list.FormattingEnabled = true; + resources.ApplyResources(this.vc_n64_romc_type_list, "vc_n64_romc_type_list"); + this.vc_n64_romc_type_list.Name = "vc_n64_romc_type_list"; + this.vc_n64_romc_type_list.Tag = "romc_type"; + // // vc_n64_patch_expandedram // resources.ApplyResources(this.vc_n64_patch_expandedram, "vc_n64_patch_expandedram"); @@ -190,22 +205,6 @@ private void InitializeComponent() this.vc_n64_patch_fixbrightness.Tag = "patch_fixbrightness"; this.vc_n64_patch_fixbrightness.UseVisualStyleBackColor = true; // - // vc_n64_romc_type - // - this.vc_n64_romc_type.Controls.Add(this.vc_n64_romc_type_list); - resources.ApplyResources(this.vc_n64_romc_type, "vc_n64_romc_type"); - this.vc_n64_romc_type.Name = "vc_n64_romc_type"; - this.vc_n64_romc_type.TabStop = false; - this.vc_n64_romc_type.Tag = "romc_type"; - // - // vc_n64_romc_type_list - // - this.vc_n64_romc_type_list.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.vc_n64_romc_type_list.FormattingEnabled = true; - resources.ApplyResources(this.vc_n64_romc_type_list, "vc_n64_romc_type_list"); - this.vc_n64_romc_type_list.Name = "vc_n64_romc_type_list"; - this.vc_n64_romc_type_list.Tag = "romc_type"; - // // DownloadBanners // resources.ApplyResources(this.DownloadBanners, "DownloadBanners"); @@ -249,9 +248,9 @@ private void InitializeComponent() // TreeView // this.TreeView.BorderStyle = System.Windows.Forms.BorderStyle.None; + resources.ApplyResources(this.TreeView, "TreeView"); this.TreeView.FullRowSelect = true; this.TreeView.ItemHeight = 19; - resources.ApplyResources(this.TreeView, "TreeView"); this.TreeView.Name = "TreeView"; this.TreeView.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { ((System.Windows.Forms.TreeNode)(resources.GetObject("TreeView.Nodes"))), @@ -341,7 +340,6 @@ private void InitializeComponent() // vc_n64 // this.vc_n64.Controls.Add(this.vc_n64_options); - this.vc_n64.Controls.Add(this.vc_n64_romc_type); resources.ApplyResources(this.vc_n64, "vc_n64"); this.vc_n64.Name = "vc_n64"; this.vc_n64.Tag = "vc_n64"; @@ -537,61 +535,12 @@ private void InitializeComponent() // // vc_pce // - this.vc_pce.Controls.Add(this.vc_pce_display); this.vc_pce.Controls.Add(this.vc_pce_system); + this.vc_pce.Controls.Add(this.vc_pce_display); resources.ApplyResources(this.vc_pce, "vc_pce"); this.vc_pce.Name = "vc_pce"; this.vc_pce.Tag = "vc_pce"; // - // vc_pce_display - // - this.vc_pce_display.Controls.Add(this.vc_pce_y_offset_l); - this.vc_pce_display.Controls.Add(this.vc_pce_y_offset); - this.vc_pce_display.Controls.Add(this.vc_pce_sprline); - this.vc_pce_display.Controls.Add(this.vc_pce_raster); - this.vc_pce_display.Controls.Add(this.vc_pce_hide_overscan); - resources.ApplyResources(this.vc_pce_display, "vc_pce_display"); - this.vc_pce_display.Name = "vc_pce_display"; - this.vc_pce_display.TabStop = false; - this.vc_pce_display.Tag = "display"; - // - // vc_pce_y_offset_l - // - resources.ApplyResources(this.vc_pce_y_offset_l, "vc_pce_y_offset_l"); - this.vc_pce_y_offset_l.Name = "vc_pce_y_offset_l"; - this.vc_pce_y_offset_l.Tag = "y_offset"; - // - // vc_pce_y_offset - // - resources.ApplyResources(this.vc_pce_y_offset, "vc_pce_y_offset"); - this.vc_pce_y_offset.Maximum = new decimal(new int[] { - 25, - 0, - 0, - 0}); - this.vc_pce_y_offset.Name = "vc_pce_y_offset"; - // - // vc_pce_sprline - // - resources.ApplyResources(this.vc_pce_sprline, "vc_pce_sprline"); - this.vc_pce_sprline.Name = "vc_pce_sprline"; - this.vc_pce_sprline.Tag = "sprline"; - this.vc_pce_sprline.UseVisualStyleBackColor = true; - // - // vc_pce_raster - // - resources.ApplyResources(this.vc_pce_raster, "vc_pce_raster"); - this.vc_pce_raster.Name = "vc_pce_raster"; - this.vc_pce_raster.Tag = "raster"; - this.vc_pce_raster.UseVisualStyleBackColor = true; - // - // vc_pce_hide_overscan - // - resources.ApplyResources(this.vc_pce_hide_overscan, "vc_pce_hide_overscan"); - this.vc_pce_hide_overscan.Name = "vc_pce_hide_overscan"; - this.vc_pce_hide_overscan.Tag = "hide_overscan"; - this.vc_pce_hide_overscan.UseVisualStyleBackColor = true; - // // vc_pce_system // this.vc_pce_system.Controls.Add(this.vc_pce_backupram); @@ -651,6 +600,55 @@ private void InitializeComponent() this.vc_pce_sgenable_switch.OnFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.vc_pce_sgenable_switch.CheckedChanged += new JCS.ToggleSwitch.CheckedChangedDelegate(this.ToggleSwitchChanged); // + // vc_pce_display + // + this.vc_pce_display.Controls.Add(this.vc_pce_y_offset_l); + this.vc_pce_display.Controls.Add(this.vc_pce_y_offset); + this.vc_pce_display.Controls.Add(this.vc_pce_sprline); + this.vc_pce_display.Controls.Add(this.vc_pce_raster); + this.vc_pce_display.Controls.Add(this.vc_pce_hide_overscan); + resources.ApplyResources(this.vc_pce_display, "vc_pce_display"); + this.vc_pce_display.Name = "vc_pce_display"; + this.vc_pce_display.TabStop = false; + this.vc_pce_display.Tag = "display"; + // + // vc_pce_y_offset_l + // + resources.ApplyResources(this.vc_pce_y_offset_l, "vc_pce_y_offset_l"); + this.vc_pce_y_offset_l.Name = "vc_pce_y_offset_l"; + this.vc_pce_y_offset_l.Tag = "y_offset"; + // + // vc_pce_y_offset + // + resources.ApplyResources(this.vc_pce_y_offset, "vc_pce_y_offset"); + this.vc_pce_y_offset.Maximum = new decimal(new int[] { + 25, + 0, + 0, + 0}); + this.vc_pce_y_offset.Name = "vc_pce_y_offset"; + // + // vc_pce_sprline + // + resources.ApplyResources(this.vc_pce_sprline, "vc_pce_sprline"); + this.vc_pce_sprline.Name = "vc_pce_sprline"; + this.vc_pce_sprline.Tag = "sprline"; + this.vc_pce_sprline.UseVisualStyleBackColor = true; + // + // vc_pce_raster + // + resources.ApplyResources(this.vc_pce_raster, "vc_pce_raster"); + this.vc_pce_raster.Name = "vc_pce_raster"; + this.vc_pce_raster.Tag = "raster"; + this.vc_pce_raster.UseVisualStyleBackColor = true; + // + // vc_pce_hide_overscan + // + resources.ApplyResources(this.vc_pce_hide_overscan, "vc_pce_hide_overscan"); + this.vc_pce_hide_overscan.Name = "vc_pce_hide_overscan"; + this.vc_pce_hide_overscan.Tag = "hide_overscan"; + this.vc_pce_hide_overscan.UseVisualStyleBackColor = true; + // // adobe_flash // this.adobe_flash.Controls.Add(this.flash_strap_reminder); @@ -661,6 +659,24 @@ private void InitializeComponent() this.adobe_flash.Name = "adobe_flash"; this.adobe_flash.Tag = "adobe_flash"; // + // flash_strap_reminder + // + this.flash_strap_reminder.Controls.Add(this.flash_strap_reminder_list); + resources.ApplyResources(this.flash_strap_reminder, "flash_strap_reminder"); + this.flash_strap_reminder.Name = "flash_strap_reminder"; + this.flash_strap_reminder.TabStop = false; + this.flash_strap_reminder.Tag = "strap_reminder"; + // + // flash_strap_reminder_list + // + this.flash_strap_reminder_list.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.flash_strap_reminder_list.FormattingEnabled = true; + this.flash_strap_reminder_list.Items.AddRange(new object[] { + resources.GetString("flash_strap_reminder_list.Items")}); + resources.ApplyResources(this.flash_strap_reminder_list, "flash_strap_reminder_list"); + this.flash_strap_reminder_list.Name = "flash_strap_reminder_list"; + this.flash_strap_reminder_list.Tag = "strap_reminder"; + // // flash_controls // this.flash_controls.Controls.Add(this.flash_qwerty_keyboard); @@ -674,13 +690,14 @@ private void InitializeComponent() // resources.ApplyResources(this.flash_qwerty_keyboard, "flash_qwerty_keyboard"); this.flash_qwerty_keyboard.Name = "flash_qwerty_keyboard"; + this.flash_qwerty_keyboard.Tag = "qwerty_keyboard"; this.flash_qwerty_keyboard.UseVisualStyleBackColor = true; // // flash_mouse // resources.ApplyResources(this.flash_mouse, "flash_mouse"); this.flash_mouse.Name = "flash_mouse"; - this.flash_mouse.Tag = ""; + this.flash_mouse.Tag = "mouse"; this.flash_mouse.UseVisualStyleBackColor = true; // // flash_quality @@ -689,6 +706,7 @@ private void InitializeComponent() resources.ApplyResources(this.flash_quality, "flash_quality"); this.flash_quality.Name = "flash_quality"; this.flash_quality.TabStop = false; + this.flash_quality.Tag = "quality"; // // flash_quality_list // @@ -698,6 +716,7 @@ private void InitializeComponent() resources.GetString("flash_quality_list.Items")}); resources.ApplyResources(this.flash_quality_list, "flash_quality_list"); this.flash_quality_list.Name = "flash_quality_list"; + this.flash_quality_list.Tag = "quality"; // // flash_save_data // @@ -708,17 +727,20 @@ private void InitializeComponent() resources.ApplyResources(this.flash_save_data, "flash_save_data"); this.flash_save_data.Name = "flash_save_data"; this.flash_save_data.TabStop = false; + this.flash_save_data.Tag = "save_data"; // // flash_vff_sync_on_write // resources.ApplyResources(this.flash_vff_sync_on_write, "flash_vff_sync_on_write"); this.flash_vff_sync_on_write.Name = "flash_vff_sync_on_write"; + this.flash_vff_sync_on_write.Tag = "vff_sync_on_write"; this.flash_vff_sync_on_write.UseVisualStyleBackColor = true; // // flash_save_data_enable // resources.ApplyResources(this.flash_save_data_enable, "flash_save_data_enable"); this.flash_save_data_enable.Name = "flash_save_data_enable"; + this.flash_save_data_enable.Tag = "save_data_enable"; this.flash_save_data_enable.UseVisualStyleBackColor = true; this.flash_save_data_enable.CheckedChanged += new System.EventHandler(this.ToggleSwitchChanged); // @@ -726,6 +748,7 @@ private void InitializeComponent() // resources.ApplyResources(this.flash_vff_cache_size, "flash_vff_cache_size"); this.flash_vff_cache_size.Name = "flash_vff_cache_size"; + this.flash_vff_cache_size.Tag = "vff_cache_size"; // // flash_vff_cache_size_list // @@ -766,24 +789,6 @@ private void InitializeComponent() resources.ApplyResources(this.panel2, "panel2"); this.panel2.Name = "panel2"; // - // flash_strap_reminder - // - this.flash_strap_reminder.Controls.Add(this.flash_strap_reminder_list); - resources.ApplyResources(this.flash_strap_reminder, "flash_strap_reminder"); - this.flash_strap_reminder.Name = "flash_strap_reminder"; - this.flash_strap_reminder.TabStop = false; - this.flash_strap_reminder.Tag = "strap_reminder"; - // - // flash_strap_reminder_list - // - this.flash_strap_reminder_list.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.flash_strap_reminder_list.FormattingEnabled = true; - this.flash_strap_reminder_list.Items.AddRange(new object[] { - resources.GetString("flash_strap_reminder_list.Items")}); - resources.ApplyResources(this.flash_strap_reminder_list, "flash_strap_reminder_list"); - this.flash_strap_reminder_list.Name = "flash_strap_reminder_list"; - this.flash_strap_reminder_list.Tag = "strap_reminder"; - // // SettingsForm // this.AcceptButton = this.b_ok; @@ -815,7 +820,6 @@ private void InitializeComponent() this.Shown += new System.EventHandler(this.Loading); this.vc_n64_options.ResumeLayout(false); this.vc_n64_options.PerformLayout(); - this.vc_n64_romc_type.ResumeLayout(false); this.bottomPanel1.ResumeLayout(false); this.bottomPanel2.ResumeLayout(false); this.panel1.ResumeLayout(false); @@ -841,12 +845,13 @@ private void InitializeComponent() this.vc_sega_display.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.SEGA_console_brightness)).EndInit(); this.vc_pce.ResumeLayout(false); + this.vc_pce_system.ResumeLayout(false); + this.vc_pce_system.PerformLayout(); this.vc_pce_display.ResumeLayout(false); this.vc_pce_display.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.vc_pce_y_offset)).EndInit(); - this.vc_pce_system.ResumeLayout(false); - this.vc_pce_system.PerformLayout(); this.adobe_flash.ResumeLayout(false); + this.flash_strap_reminder.ResumeLayout(false); this.flash_controls.ResumeLayout(false); this.flash_controls.PerformLayout(); this.flash_quality.ResumeLayout(false); @@ -854,7 +859,6 @@ private void InitializeComponent() this.flash_save_data.PerformLayout(); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); - this.flash_strap_reminder.ResumeLayout(false); this.ResumeLayout(false); } @@ -870,7 +874,6 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox vc_n64_patch_expandedram; private System.Windows.Forms.CheckBox vc_n64_patch_fixcrashes; private System.Windows.Forms.CheckBox vc_n64_patch_fixbrightness; - private System.Windows.Forms.GroupBox vc_n64_romc_type; private System.Windows.Forms.ComboBox vc_n64_romc_type_list; private System.Windows.Forms.Button DownloadBanners; private System.Windows.Forms.TreeView TreeView; @@ -940,5 +943,6 @@ private void InitializeComponent() private System.Windows.Forms.Panel panel2; private System.Windows.Forms.GroupBox flash_strap_reminder; private System.Windows.Forms.ComboBox flash_strap_reminder_list; + private System.Windows.Forms.Label vc_n64_romc_type; } } \ No newline at end of file diff --git a/FriishProduce/SettingsForm.cs b/FriishProduce/SettingsForm.cs index 6b41cd4..430103e 100644 --- a/FriishProduce/SettingsForm.cs +++ b/FriishProduce/SettingsForm.cs @@ -95,66 +95,59 @@ public void RefreshForm() // ----------------------------- - forwarder_root_device.Text = Program.Lang.String(forwarder_root_device.Name, "projectform"); - forwarder_console.Text = Program.Lang.String(forwarder_console.Name, "projectform"); + Program.Lang.String(forwarder_root_device, "projectform"); + Program.Lang.String(forwarder_console, "projectform"); // ----------------------------- - vc_nes_palette.Text = Program.Lang.String("palette", "vc_nes"); - vc_nes_palette_use_on_banner.Text = Program.Lang.String("palette_use_on_banner", "vc_nes"); - - vc_nes_palettelist.Items.Clear(); - vc_nes_palettelist.Items.AddRange(Program.Lang.StringArray("palette", "vc_nes")); + Program.Lang.String(vc_nes_palette, "vc_nes"); + Program.Lang.String(vc_nes_palette_use_on_banner, "vc_nes"); + Program.Lang.String(vc_nes_palettelist, "vc_nes"); // ----------------------------- - vc_n64_patch_fixbrightness.Text = Program.Lang.String("patch_fixbrightness", "vc_n64"); - vc_n64_patch_fixcrashes.Text = Program.Lang.String("patch_fixcrashes", "vc_n64"); - vc_n64_patch_expandedram.Text = Program.Lang.String("patch_expandedram", "vc_n64"); - vc_n64_patch_autosizerom.Text = Program.Lang.String("patch_autosizerom", "vc_n64"); - vc_n64_romc_type.Text = Program.Lang.String("romc_type", "vc_n64"); - - vc_n64_romc_type_list.Items.Clear(); - vc_n64_romc_type_list.Items.AddRange(Program.Lang.StringArray("romc_type", "vc_n64")); + Program.Lang.String(vc_n64_patch_fixbrightness, "vc_n64"); + Program.Lang.String(vc_n64_patch_fixcrashes, "vc_n64"); + Program.Lang.String(vc_n64_patch_expandedram, "vc_n64"); + Program.Lang.String(vc_n64_patch_autosizerom, "vc_n64"); + Program.Lang.String(vc_n64_romc_type, "vc_n64"); + Program.Lang.String(vc_n64_romc_type_list, "vc_n64"); + Program.AutoSizeControl(vc_n64_romc_type_list, vc_n64_romc_type); // ----------------------------- - vc_sega_country_l.Text = Program.Lang.String("region"); + Program.Lang.String(vc_sega_country_l); vc_sega_dev_mdpad_enable_6b.Text = string.Format(Program.Lang.String("dev_mdpad_enable_6b", "vc_sega"), Program.Lang.Console(Console.SMD)); - vc_sega_console_disableresetbutton.Text = Program.Lang.String("console_disableresetbutton", "vc_sega"); + Program.Lang.String(vc_sega_console_disableresetbutton, "vc_sega"); vc_sega_country.Items.Clear(); vc_sega_country.Items.AddRange(new string[] { Program.Lang.String("region_j"), Program.Lang.String("region_u"), Program.Lang.String("region_e") }); // ----------------------------- - vc_pce_y_offset_l.Text = Program.Lang.String("y_offset", "vc_pce"); - vc_pce_hide_overscan.Text = Program.Lang.String("hide_overscan", "vc_pce"); - vc_pce_raster.Text = Program.Lang.String("raster", "vc_pce"); - vc_pce_sprline.Text = Program.Lang.String("sprline", "vc_pce"); + Program.Lang.String(vc_pce_y_offset_l, "vc_pce"); + Program.Lang.String(vc_pce_hide_overscan, "vc_pce"); + Program.Lang.String(vc_pce_raster, "vc_pce"); + Program.Lang.String(vc_pce_sprline, "vc_pce"); // ----------------------------- - vc_neo_bios_list.Items.Clear(); - vc_neo_bios_list.Items.AddRange(Program.Lang.StringArray("bios", "vc_neo")); + Program.Lang.String(vc_neo_bios_list, "vc_neo"); vc_neo_bios_list.Items.RemoveAt(0); // ----------------------------- - flash_save_data.Text = Program.Lang.String("save_data", "projectform"); - flash_save_data_enable.Text = Program.Lang.String("save_data_enable", "projectform"); - flash_vff_sync_on_write.Text = Program.Lang.String("vff_sync_on_write", "adobe_flash"); - flash_vff_cache_size.Text = Program.Lang.String("vff_cache_size", "adobe_flash"); - flash_controls.Text = Program.Lang.String("controls", "adobe_flash"); - flash_mouse.Text = Program.Lang.String("mouse", "adobe_flash"); - flash_qwerty_keyboard.Text = Program.Lang.String("qwerty_keyboard", "adobe_flash"); - flash_quality.Text = Program.Lang.String("quality", "adobe_flash"); - flash_strap_reminder.Text = Program.Lang.String("strap_reminder", "adobe_flash"); - - flash_quality_list.Items.Clear(); - flash_quality_list.Items.AddRange(Program.Lang.StringArray("quality", "adobe_flash")); - flash_strap_reminder_list.Items.Clear(); - flash_strap_reminder_list.Items.AddRange(Program.Lang.StringArray("strap_reminder", "adobe_flash")); + Program.Lang.String(flash_save_data, "projectform"); + Program.Lang.String(flash_save_data_enable, "projectform"); + Program.Lang.String(flash_vff_sync_on_write, "adobe_flash"); + Program.Lang.String(flash_vff_cache_size, "adobe_flash"); + Program.Lang.String(flash_controls, "adobe_flash"); + Program.Lang.String(flash_mouse, "adobe_flash"); + Program.Lang.String(flash_qwerty_keyboard, "adobe_flash"); + Program.Lang.String(flash_quality, "adobe_flash"); + Program.Lang.String(flash_quality_list, "adobe_flash"); + Program.Lang.String(flash_strap_reminder, "adobe_flash"); + Program.Lang.String(flash_strap_reminder_list, "adobe_flash"); #endregion // ----------------------------- diff --git a/FriishProduce/SettingsForm.resx b/FriishProduce/SettingsForm.resx index f1398b2..94e6570 100644 --- a/FriishProduce/SettingsForm.resx +++ b/FriishProduce/SettingsForm.resx @@ -143,6 +143,129 @@ 0 + + vc_n64_romc_type + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_n64_options + + + 0 + + + vc_n64_patch_autosizerom + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_n64_options + + + 1 + + + vc_n64_romc_type_list + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_n64_options + + + 2 + + + vc_n64_patch_expandedram + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_n64_options + + + 3 + + + vc_n64_patch_fixcrashes + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_n64_options + + + 4 + + + vc_n64_patch_fixbrightness + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_n64_options + + + 5 + + + 12, 10 + + + 525, 140 + + + 18 + + + vc_options + + + vc_n64_options + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_n64 + + + 0 + + + True + + + 8, 111 + + + 56, 13 + + + 17 + + + romc_type + + + vc_n64_romc_type + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_n64_options + + + 0 + True @@ -178,8 +301,29 @@ vc_n64_options + 1 + + + 10, 108 + + + 505, 21 + + 0 + + vc_n64_romc_type_list + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_n64_options + + + 2 + True @@ -214,7 +358,7 @@ vc_n64_options - 1 + 3 True @@ -250,7 +394,7 @@ vc_n64_options - 2 + 4 True @@ -286,76 +430,7 @@ vc_n64_options - 3 - - - 12, 10 - - - 525, 110 - - - 18 - - - vc_options - - - vc_n64_options - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - vc_n64 - - - 0 - - - 10, 18 - - - 505, 21 - - - 0 - - - vc_n64_romc_type_list - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - vc_n64_romc_type - - - 0 - - - 12, 126 - - - 525, 50 - - - 19 - - - romc_type - - - vc_n64_romc_type - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - vc_n64 - - - 1 + 5 12, 12 @@ -439,7 +514,7 @@ 0, 1 - 729, 47 + 734, 47 3 @@ -460,10 +535,10 @@ Bottom - 0, 364 + 0, 374 - 729, 48 + 734, 48 3 @@ -480,6 +555,9 @@ 0 + + Tahoma, 8.25pt + 0, 0 @@ -535,7 +613,7 @@ - 180, 600 + 185, 600 12 @@ -604,7 +682,7 @@ 1 - 180, 0 + 185, 1 549, 350 @@ -654,18 +732,6 @@ 0 - - null - - - 10, 19 - - - 505, 21 - - - 5 - image_interpolation_mode_list @@ -702,23 +768,107 @@ 1 - - True + + null - - NoControl + + 10, 19 - - 8, 44 + + 505, 21 - - 126, 13 + + 5 - - 15 + + image_interpolation_mode_list - - gamedata_source_image + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + image_interpolation_mode + + + 0 + + + gamedata_source_image + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + retrieve_gamedata_online + + + 0 + + + gamedata_source_image_list + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + retrieve_gamedata_online + + + 1 + + + auto_retrieve_gamedata_online + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + retrieve_gamedata_online + + + 2 + + + 12, 89 + + + 525, 75 + + + 41 + + + retrieve_gamedata_online + + + retrieve_gamedata_online + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 2 + + + True + + + NoControl + + + 8, 44 + + + 126, 13 + + + 15 + + + gamedata_source_image gamedata_source_image @@ -789,32 +939,8 @@ 2 - - 12, 89 - - - 525, 75 - - - 41 - - - retrieve_gamedata_online - - - retrieve_gamedata_online - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 2 - - 180, 0 + 185, 1 549, 350 @@ -835,7 +961,7 @@ 5 - 179, 0 + 184, 0 1, 435 @@ -855,24 +981,6 @@ 1 - - True - - - NoControl - - - 50, 20 - - - 22, 13 - - - 24 - - - Wii - toggleSwitchL1 @@ -885,15 +993,6 @@ 0 - - 10, 19 - - - 35, 15 - - - 23 - toggleSwitch1 @@ -930,24 +1029,6 @@ 0 - - True - - - NoControl - - - 10, 18 - - - 40, 17 - - - 19 - - - SD - FStorage_SD @@ -960,24 +1041,6 @@ 0 - - True - - - NoControl - - - 60, 18 - - - 47, 17 - - - 20 - - - USB - FStorage_USB @@ -1015,7 +1078,7 @@ 1 - 180, 0 + 185, 1 549, 350 @@ -1035,83 +1098,167 @@ 4 - + True - + NoControl - - 10, 45 + + 50, 20 - - 138, 17 + + 22, 13 - - 12 + + 24 - - palette_use_on_banner + + Wii - - vc_nes_palette_use_on_banner + + toggleSwitchL1 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - vc_nes_palette + + forwarder_console - + 0 - + 10, 19 - - 505, 21 + + 35, 15 - - 9 + + 23 - - vc_nes_palettelist + + toggleSwitch1 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + JCS.ToggleSwitch, ToggleSwitch, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - vc_nes_palette + + forwarder_console - + 1 - - 12, 10 + + True - - 525, 70 + + NoControl - - 14 + + 10, 18 - - palette + + 40, 17 - - vc_nes_palette + + 19 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + SD - - vc_nes + + FStorage_SD - - 0 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 180, 0 + + forwarder_root_device + + + 0 + + + True + + + NoControl + + + 60, 18 + + + 47, 17 + + + 20 + + + USB + + + FStorage_USB + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + forwarder_root_device + + + 1 + + + vc_nes_palette_use_on_banner + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_nes_palette + + + 0 + + + vc_nes_palettelist + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_nes_palette + + + 1 + + + 12, 10 + + + 525, 70 + + + 14 + + + palette + + + vc_nes_palette + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_nes + + + 0 + + + 185, 1 549, 350 @@ -1131,15 +1278,57 @@ 11 - + + True + + + NoControl + + + 10, 45 + + + 138, 17 + + + 12 + + + palette_use_on_banner + + + vc_nes_palette_use_on_banner + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_nes_palette + + + 0 + + 10, 19 - + 505, 21 - + 9 + + vc_nes_palettelist + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_nes_palette + + + 1 + vc_neo_bios_list @@ -1177,7 +1366,7 @@ 0 - 180, 0 + 185, 1 549, 350 @@ -1197,23 +1386,26 @@ 10 - - True + + 10, 19 - - NoControl + + 505, 21 - - 10, 68 + + 9 - - 155, 17 + + vc_neo_bios_list - - 20 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - console_disableresetbutton + + vc_neo_bios + + + 0 vc_sega_console_disableresetbutton @@ -1227,21 +1419,6 @@ 0 - - True - - - 8, 22 - - - 36, 13 - - - 19 - - - region - vc_sega_country_l @@ -1254,24 +1431,6 @@ 1 - - True - - - NoControl - - - 10, 89 - - - 114, 17 - - - 13 - - - save_data_enable - vc_sega_save_sram @@ -1284,24 +1443,6 @@ 2 - - True - - - NoControl - - - 10, 47 - - - 138, 17 - - - 14 - - - dev_mdpad_enable_6b - vc_sega_dev_mdpad_enable_6b @@ -1314,18 +1455,6 @@ 3 - - 10, 19 - - - 505, 0 - - - 505, 21 - - - 18 - vc_sega_country @@ -1362,21 +1491,6 @@ 0 - - 486, 21 - - - 30, 15 - - - 16 - - - 100 - - - TopRight - label1 @@ -1389,18 +1503,6 @@ 0 - - False - - - 6, 18 - - - 481, 20 - - - 15 - SEGA_console_brightness @@ -1438,7 +1540,7 @@ 1 - 180, 0 + 185, 1 549, 350 @@ -1458,14 +1560,590 @@ 7 - + True - + NoControl - - 62, 21 + + 10, 68 + + + 155, 17 + + + 20 + + + console_disableresetbutton + + + vc_sega_console_disableresetbutton + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_sega_system + + + 0 + + + True + + + 8, 22 + + + 36, 13 + + + 19 + + + region + + + vc_sega_country_l + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_sega_system + + + 1 + + + True + + + NoControl + + + 10, 89 + + + 114, 17 + + + 13 + + + save_data_enable + + + vc_sega_save_sram + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_sega_system + + + 2 + + + True + + + NoControl + + + 10, 47 + + + 138, 17 + + + 14 + + + dev_mdpad_enable_6b + + + vc_sega_dev_mdpad_enable_6b + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_sega_system + + + 3 + + + 10, 19 + + + 505, 0 + + + 505, 21 + + + 18 + + + vc_sega_country + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_sega_system + + + 4 + + + 486, 21 + + + 30, 15 + + + 16 + + + 100 + + + TopRight + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_sega_display + + + 0 + + + False + + + 6, 18 + + + 481, 20 + + + 15 + + + SEGA_console_brightness + + + System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_sega_display + + + 1 + + + vc_pce_backupram + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_pce_system + + + 0 + + + vc_pce_europe_switch + + + JCS.ToggleSwitch, ToggleSwitch, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + vc_pce_system + + + 1 + + + vc_pce_europe + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_pce_system + + + 2 + + + vc_pce_padbutton_switch + + + JCS.ToggleSwitch, ToggleSwitch, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + vc_pce_system + + + 3 + + + vc_pce_sgenable + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_pce_system + + + 4 + + + vc_pce_padbutton + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_pce_system + + + 5 + + + vc_pce_sgenable_switch + + + JCS.ToggleSwitch, ToggleSwitch, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + vc_pce_system + + + 6 + + + 12, 10 + + + 525, 110 + + + 27 + + + vc_options + + + vc_pce_system + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_pce + + + 0 + + + vc_pce_y_offset_l + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_pce_display + + + 0 + + + vc_pce_y_offset + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_pce_display + + + 1 + + + vc_pce_sprline + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_pce_display + + + 2 + + + vc_pce_raster + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_pce_display + + + 3 + + + vc_pce_hide_overscan + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_pce_display + + + 4 + + + 12, 126 + + + 525, 115 + + + 28 + + + display + + + vc_pce_display + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_pce + + + 1 + + + 185, 1 + + + 549, 350 + + + 26 + + + vc_pce + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + True + + + 10, 84 + + + 114, 17 + + + 26 + + + save_data_enable + + + vc_pce_backupram + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_pce_system + + + 0 + + + 10, 20 + + + 30, 15 + + + 19 + + + vc_pce_europe_switch + + + JCS.ToggleSwitch, ToggleSwitch, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + vc_pce_system + + + 1 + + + True + + + 46, 20 + + + 40, 13 + + + 15 + + + europe + + + vc_pce_europe + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_pce_system + + + 2 + + + 10, 62 + + + 30, 15 + + + 23 + + + vc_pce_padbutton_switch + + + JCS.ToggleSwitch, ToggleSwitch, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + vc_pce_system + + + 3 + + + True + + + 46, 41 + + + 50, 13 + + + 20 + + + sgenable + + + vc_pce_sgenable + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_pce_system + + + 4 + + + True + + + 46, 62 + + + 55, 13 + + + 22 + + + padbutton + + + vc_pce_padbutton + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + vc_pce_system + + + 5 + + + 10, 41 + + + 30, 15 + + + 21 + + + vc_pce_sgenable_switch + + + JCS.ToggleSwitch, ToggleSwitch, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + vc_pce_system + + + 6 + + + True + + + NoControl + + + 62, 21 44, 13 @@ -1599,245 +2277,218 @@ 4 - - 12, 126 - - - 525, 115 + + flash_strap_reminder_list - - 28 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - display + + flash_strap_reminder - - vc_pce_display + + 0 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 12, 110 - - vc_pce + + 254, 50 - - 0 + + 22 - - True + + strap_reminder - - 10, 84 + + flash_strap_reminder - - 114, 17 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 26 + + adobe_flash - - save_data_enable + + 0 - - vc_pce_backupram + + flash_qwerty_keyboard - + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - vc_pce_system + + flash_controls - + 0 - - 10, 20 - - - 30, 15 - - - 19 - - - vc_pce_europe_switch + + flash_mouse - - JCS.ToggleSwitch, ToggleSwitch, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - vc_pce_system + + flash_controls - + 1 - - True - - - 46, 20 - - - 40, 13 - - - 15 - - - europe - - - vc_pce_europe + + 272, 12 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 265, 65 - - vc_pce_system + + 21 - - 2 + + controls - - 10, 62 + + flash_controls - - 30, 15 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 23 + + adobe_flash - - vc_pce_padbutton_switch + + 1 - - JCS.ToggleSwitch, ToggleSwitch, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + flash_quality_list - - vc_pce_system + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 3 + + flash_quality - - True + + 0 - - 46, 41 + + 272, 83 - - 50, 13 + + 265, 50 - + 20 - - sgenable + + quality - - vc_pce_sgenable + + flash_quality - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - vc_pce_system + + adobe_flash - - 4 + + 2 - - True + + flash_vff_sync_on_write - - 46, 62 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 55, 13 + + flash_save_data - - 22 + + 0 - - padbutton + + flash_save_data_enable - - vc_pce_padbutton + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + flash_save_data - - vc_pce_system + + 1 - - 5 + + flash_vff_cache_size - - 10, 41 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 30, 15 + + flash_save_data - - 21 + + 2 - - vc_pce_sgenable_switch + + flash_vff_cache_size_list - - JCS.ToggleSwitch, ToggleSwitch, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - vc_pce_system + + flash_save_data - - 6 + + 3 - + 12, 10 - - 525, 110 + + 254, 94 - - 27 + + 19 - - vc_options + + save_data - - vc_pce_system + + flash_save_data - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - vc_pce + + adobe_flash - - 1 + + 3 - - 180, 0 + + 185, 1 - + 549, 350 - - 26 + + 0 - - vc_pce + + adobe_flash - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 6 + + 3 auto @@ -1863,30 +2514,6 @@ 0 - - 12, 110 - - - 254, 50 - - - 22 - - - strap_reminder - - - flash_strap_reminder - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - adobe_flash - - - 0 - True @@ -1947,30 +2574,6 @@ 1 - - 272, 12 - - - 265, 65 - - - 21 - - - controls - - - flash_controls - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - adobe_flash - - - 1 - auto @@ -1995,30 +2598,6 @@ 0 - - 272, 83 - - - 265, 50 - - - 20 - - - quality - - - flash_quality - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - adobe_flash - - - 2 - True @@ -2172,51 +2751,6 @@ 3 - - 12, 10 - - - 254, 94 - - - 19 - - - save_data - - - flash_save_data - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - adobe_flash - - - 3 - - - 180, 0 - - - 549, 350 - - - 0 - - - adobe_flash - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - System default @@ -2236,7 +2770,7 @@ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 180, 0 + 185, 1 549, 350 @@ -2260,7 +2794,7 @@ True - 729, 412 + 734, 422 CenterParent diff --git a/FriishProduce/Strings/en.json b/FriishProduce/Strings/en.json index b770b1f..fce304f 100644 --- a/FriishProduce/Strings/en.json +++ b/FriishProduce/Strings/en.json @@ -27,7 +27,9 @@ "region_e": "Europe/Australia", "region_k": "Republic of Korea", "region_rf": "Region Free", - "region_orig": "Keep original", + "disabled": "Disabled", + "enabled": "Enabled", + "keep_original": "Keep original", "settings": "Settings", "system": "System", "display": "Display", @@ -153,7 +155,10 @@ "forwarder_console": "Console type", "use_online_wad": "Use an online base", "import_wad_from_file": "Use an offline WAD file", - "import_manual": "Import custom manual", + "manual_type": "Operations manual:", + "manual_type0": "{disabled}", + "manual_type1": "{keep_original}", + "manual_type2": "Import custom manual", "base_name": "Base name:", "title_id": "Title ID:", "short_channel_name": "Short name:", @@ -221,8 +226,8 @@ "quality1": "Medium", "quality2": "Low", "strap_reminder": "Strap reminder screen", - "strap_reminder0": "Disabled", - "strap_reminder1": "Normal", + "strap_reminder0": "{disabled}", + "strap_reminder1": "{enabled}", "strap_reminder2": "No extension controller" } } diff --git a/FriishProduce/Strings/es.json b/FriishProduce/Strings/es.json index d21abcb..c19c648 100644 --- a/FriishProduce/Strings/es.json +++ b/FriishProduce/Strings/es.json @@ -27,7 +27,9 @@ "region_e": "Europa/Australia", "region_k": "Corea del Sur", "region_rf": "Sin bloqueo", - "region_orig": "Original", + "disabled": "Deshabilitado(a)", + "enabled": "Habilitado(a)", + "keep_original": "Original", "settings": "Opciones", "system": "Sistema", "display": "Pantalla", @@ -139,7 +141,8 @@ "forwarder_console": "Tipo de consola Wii", "use_online_wad": "Utilizar canal en línea", "import_wad_from_file": "Utilizar un archivo WAD", - "import_manual": "Importar manual electrónico personalizado", + "manual_type": "Manual electrónico:", + "manual_type2": "Importar un personalizado", "base_name": "Nombre del juego:", "title_id": "Title ID:", "short_channel_name": "Título corto:", diff --git a/FriishProduce/Strings/fr.json b/FriishProduce/Strings/fr.json index 64a91f0..ae68b41 100644 --- a/FriishProduce/Strings/fr.json +++ b/FriishProduce/Strings/fr.json @@ -27,7 +27,9 @@ "region_e": "Europe", "region_k": "Corée du Sud", "region_rf": "Déverrouillée", - "region_orig": "Région originale", + "disabled": "Désactivé(e)", + "enabled": "Activé(e)", + "keep_original": "Retenir l'original(e)", "settings": "Paramètres", "system": "Système", "display": "Affichage", @@ -147,7 +149,8 @@ "forwarder_console": "Système Wii cible", "use_online_wad": "Utiliser une chaîne en ligne", "import_wad_from_file": "Utiliser un fichier WAD", - "import_manual": "Importer un mode d'emploi personnalisé", + "manual_type": "Mode d'emploi :", + "manual_type2": "Importer un mode d'emploi personnalisé", "base_name": "Titre du jeu :", "title_id": "Identifiant :", "short_channel_name": "Titre abrégé :", diff --git a/FriishProduce/Subforms/Options_Flash.Designer.cs b/FriishProduce/Subforms/Options_Flash.Designer.cs index 1709709..41c374e 100644 --- a/FriishProduce/Subforms/Options_Flash.Designer.cs +++ b/FriishProduce/Subforms/Options_Flash.Designer.cs @@ -213,7 +213,7 @@ private void InitializeComponent() // // Options_Flash // - this.ClientSize = new System.Drawing.Size(594, 262); + this.ClientSize = new System.Drawing.Size(594, 282); this.Controls.Add(this.strap_reminder); this.Controls.Add(this.controls); this.Controls.Add(this.quality); diff --git a/FriishProduce/Subforms/Options_VC_N64.Designer.cs b/FriishProduce/Subforms/Options_VC_N64.Designer.cs index 94960d6..6257777 100644 --- a/FriishProduce/Subforms/Options_VC_N64.Designer.cs +++ b/FriishProduce/Subforms/Options_VC_N64.Designer.cs @@ -42,15 +42,15 @@ private void InitializeComponent() // // b_ok // - this.b_ok.Location = new System.Drawing.Point(261, 12); + this.b_ok.Location = new System.Drawing.Point(286, 12); // // bottomPanel1 // - this.bottomPanel1.Size = new System.Drawing.Size(459, 47); + this.bottomPanel1.Size = new System.Drawing.Size(484, 47); // // b_cancel // - this.b_cancel.Location = new System.Drawing.Point(357, 12); + this.b_cancel.Location = new System.Drawing.Point(382, 12); // // g1 // @@ -62,7 +62,7 @@ private void InitializeComponent() this.g1.Controls.Add(this.patch_fixbrightness); this.g1.Location = new System.Drawing.Point(12, 10); this.g1.Name = "g1"; - this.g1.Size = new System.Drawing.Size(435, 140); + this.g1.Size = new System.Drawing.Size(460, 140); this.g1.TabIndex = 16; this.g1.TabStop = false; this.g1.Tag = "vc_options"; @@ -73,7 +73,7 @@ private void InitializeComponent() this.romc_type.AutoSize = true; this.romc_type.Location = new System.Drawing.Point(7, 111); this.romc_type.Name = "romc_type"; - this.romc_type.Size = new System.Drawing.Size(58, 13); + this.romc_type.Size = new System.Drawing.Size(56, 13); this.romc_type.TabIndex = 18; this.romc_type.Tag = "romc_type"; this.romc_type.Text = "romc_type"; @@ -87,7 +87,7 @@ private void InitializeComponent() "ROMC Type 1"}); this.romc_type_list.Location = new System.Drawing.Point(10, 108); this.romc_type_list.Name = "romc_type_list"; - this.romc_type_list.Size = new System.Drawing.Size(415, 21); + this.romc_type_list.Size = new System.Drawing.Size(440, 21); this.romc_type_list.TabIndex = 0; this.romc_type_list.Tag = "romc_type"; // @@ -98,7 +98,7 @@ private void InitializeComponent() this.patch_autosizerom.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.patch_autosizerom.Location = new System.Drawing.Point(10, 63); this.patch_autosizerom.Name = "patch_autosizerom"; - this.patch_autosizerom.Size = new System.Drawing.Size(117, 17); + this.patch_autosizerom.Size = new System.Drawing.Size(115, 17); this.patch_autosizerom.TabIndex = 16; this.patch_autosizerom.Tag = "patch_autosizerom"; this.patch_autosizerom.Text = "patch_autosizerom"; @@ -112,7 +112,7 @@ private void InitializeComponent() this.patch_expandedram.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.patch_expandedram.Location = new System.Drawing.Point(10, 41); this.patch_expandedram.Name = "patch_expandedram"; - this.patch_expandedram.Size = new System.Drawing.Size(125, 17); + this.patch_expandedram.Size = new System.Drawing.Size(123, 17); this.patch_expandedram.TabIndex = 15; this.patch_expandedram.Tag = "patch_expandedram"; this.patch_expandedram.Text = "patch_expandedram"; @@ -126,7 +126,7 @@ private void InitializeComponent() this.patch_fixcrashes.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.patch_fixcrashes.Location = new System.Drawing.Point(10, 85); this.patch_fixcrashes.Name = "patch_fixcrashes"; - this.patch_fixcrashes.Size = new System.Drawing.Size(108, 17); + this.patch_fixcrashes.Size = new System.Drawing.Size(106, 17); this.patch_fixcrashes.TabIndex = 14; this.patch_fixcrashes.Tag = "patch_fixcrashes"; this.patch_fixcrashes.Text = "patch_fixcrashes"; @@ -140,7 +140,7 @@ private void InitializeComponent() this.patch_fixbrightness.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.patch_fixbrightness.Location = new System.Drawing.Point(10, 19); this.patch_fixbrightness.Name = "patch_fixbrightness"; - this.patch_fixbrightness.Size = new System.Drawing.Size(121, 17); + this.patch_fixbrightness.Size = new System.Drawing.Size(117, 17); this.patch_fixbrightness.TabIndex = 13; this.patch_fixbrightness.Tag = "patch_fixbrightness"; this.patch_fixbrightness.Text = "patch_fixbrightness"; @@ -149,7 +149,7 @@ private void InitializeComponent() // // Options_VC_N64 // - this.ClientSize = new System.Drawing.Size(459, 212); + this.ClientSize = new System.Drawing.Size(484, 212); this.Controls.Add(this.g1); this.Name = "Options_VC_N64"; this.Tag = "vc_n64"; diff --git a/FriishProduce/_classes/Creators/WiiVC.cs b/FriishProduce/_classes/Creators/WiiVC.cs index 76020b0..aefc20a 100644 --- a/FriishProduce/_classes/Creators/WiiVC.cs +++ b/FriishProduce/_classes/Creators/WiiVC.cs @@ -18,6 +18,7 @@ public abstract class InjectorWiiVC protected ROM ROM { get; set; } public ZipFile Manual { get; set; } + public bool KeepOrigManual { get; set; } protected string OrigManual { get; set; } protected bool NeedsManualLoaded { get; set; } @@ -219,7 +220,7 @@ protected void ReplaceManual(U8 target) { if (Manual == null || Manual?.Count == 0) { - CleanManual(); + if (!KeepOrigManual) CleanManual(); } else diff --git a/FriishProduce/_classes/Program/Language.cs b/FriishProduce/_classes/Program/Language.cs index bd2afed..c8ea2ba 100644 --- a/FriishProduce/_classes/Program/Language.cs +++ b/FriishProduce/_classes/Program/Language.cs @@ -228,6 +228,16 @@ public string[] StringArray(string name, string sectionName = "") /// public bool StringCheck(string name, string sectionName = "") => String(name, sectionName) != "undefined"; + /// + /// Returns a localized string using the identification name, and the name of the section containing said string within the file. + /// + public void String(Control control, string sectionName = "") + { + string target = String(control.Text, sectionName) != "undefined" ? control.Text : control.Tag != null ? control.Tag.ToString() : control.Name; + if (control.GetType() == typeof(ComboBox)) { (control as ComboBox).Items.Clear(); (control as ComboBox).Items.AddRange(StringArray(target, sectionName)); } + else control.Text = String(target, sectionName); + } + /// /// Returns a localized string using the identification name, and the name of the section containing said string within the file. /// diff --git a/FriishProduce/_classes/Program/Project.cs b/FriishProduce/_classes/Program/Project.cs index 51fdef4..4b58172 100644 --- a/FriishProduce/_classes/Program/Project.cs +++ b/FriishProduce/_classes/Program/Project.cs @@ -14,7 +14,8 @@ public class Project public string ROM { get; set; } public string PatchFile { get; set; } - public string Manual { get; set; } + public int ManualIndex { get; set; } + public string ManualFile { get; set; } public Bitmap Img { get; set; } public Creator Creator { get; set; } public (bool, bool) ForwarderOptions { get; set; } diff --git a/README.md b/README.md index 1db22fd..762b132 100644 --- a/README.md +++ b/README.md @@ -44,10 +44,8 @@ See **[here](https://github.com/CatmanFan/FriishProduce/wiki/Translation)** for --- ## To-Do -* ***Before v1.1 release:*** - - [ ] Restructure and clean code - - [X] Complete custom manual building algorithm (NES/SNES/N64/SEGA only) * ***Planned later:*** + - [ ] Restructure and clean code - [ ] Probably reorganize consoles into their own folders? * Other VC injection support: * Commodore 64 (needs [Custom Frodo](https://gbatemp.net/threads/custom-frodo-for-c64-vc-injection.102356/))