diff --git a/FriishProduce/App.config b/FriishProduce/App.config
index 83448ef..35be944 100644
--- a/FriishProduce/App.config
+++ b/FriishProduce/App.config
@@ -16,7 +16,7 @@
-
+
@@ -245,4 +245,4 @@
-
\ No newline at end of file
+
diff --git a/FriishProduce/FriishProduce.csproj b/FriishProduce/FriishProduce.csproj
index 15a5b94..48b8e46 100644
--- a/FriishProduce/FriishProduce.csproj
+++ b/FriishProduce/FriishProduce.csproj
@@ -8,7 +8,7 @@
WinExe
FriishProduce
FriishProduce
- v4.7.2
+ v4.8
512
true
@@ -72,9 +72,6 @@
..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll
-
- ..\packages\Microsoft-WindowsAPICodePack-Core.1.1.5\lib\net472\Microsoft.WindowsAPICodePack.dll
-
..\packages\Octokit.11.0.1\lib\netstandard2.0\Octokit.dll
@@ -146,13 +143,41 @@
MainForm.cs
-
-
-
-
-
-
-
+
+ True
+ True
+ ADOBEFLASH.settings
+
+
+ FORWARDER.settings
+ True
+ True
+
+
+ VC_N64.settings
+ True
+ True
+
+
+ VC_NEO.settings
+ True
+ True
+
+
+ VC_NES.settings
+ True
+ True
+
+
+ VC_PCE.settings
+ True
+ True
+
+
+ VC_SEGA.settings
+ True
+ True
+
True
True
@@ -340,13 +365,34 @@
-
-
-
-
-
-
-
+
+ SettingsSingleFileGenerator
+ ADOBEFLASH.Designer.cs
+
+
+ SettingsSingleFileGenerator
+ FORWARDER.Designer.cs
+
+
+ SettingsSingleFileGenerator
+ VC_N64.Designer.cs
+
+
+ SettingsSingleFileGenerator
+ VC_NEO.Designer.cs
+
+
+ SettingsSingleFileGenerator
+ VC_NES.Designer.cs
+
+
+ SettingsSingleFileGenerator
+ VC_PCE.Designer.cs
+
+
+ SettingsSingleFileGenerator
+ VC_SEGA.Designer.cs
+
@@ -548,4 +594,7 @@ exit /b
:eof
+
+ 9.0
+
\ No newline at end of file
diff --git a/FriishProduce/MainForm.Designer.cs b/FriishProduce/MainForm.Designer.cs
index 7d8d270..605ecae 100644
--- a/FriishProduce/MainForm.Designer.cs
+++ b/FriishProduce/MainForm.Designer.cs
@@ -55,7 +55,7 @@ private void InitializeComponent()
this.menu_help = new System.Windows.Forms.ToolStripMenuItem();
this.menu_tutorial = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
- this.menu_about = new System.Windows.Forms.ToolStripMenuItem();
+ this.menu_about_app = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.MainPanel = new System.Windows.Forms.Panel();
this.welcome_do_not_show = new System.Windows.Forms.Button();
@@ -273,7 +273,7 @@ private void InitializeComponent()
this.menu_help.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.menu_tutorial,
this.toolStripSeparator5,
- this.menu_about});
+ this.menu_about_app});
this.menu_help.Name = "menu_help";
resources.ApplyResources(this.menu_help, "menu_help");
this.menu_help.Tag = "help";
@@ -290,13 +290,13 @@ private void InitializeComponent()
this.toolStripSeparator5.Name = "toolStripSeparator5";
resources.ApplyResources(this.toolStripSeparator5, "toolStripSeparator5");
//
- // menu_about
+ // menu_about_app
//
- this.menu_about.Image = global::FriishProduce.Properties.Resources.mr_saturn;
- this.menu_about.Name = "menu_about";
- resources.ApplyResources(this.menu_about, "menu_about");
- this.menu_about.Tag = "about";
- this.menu_about.Click += new System.EventHandler(this.About_Click);
+ this.menu_about_app.Image = global::FriishProduce.Properties.Resources.mr_saturn;
+ this.menu_about_app.Name = "menu_about_app";
+ resources.ApplyResources(this.menu_about_app, "menu_about_app");
+ this.menu_about_app.Tag = "about_app";
+ this.menu_about_app.Click += new System.EventHandler(this.About_Click);
//
// toolStripSeparator3
//
@@ -517,7 +517,7 @@ private void InitializeComponent()
private System.Windows.Forms.ToolStripMenuItem menu_close_project;
private System.Windows.Forms.ToolStripMenuItem menu_help;
private System.Windows.Forms.ToolStripMenuItem menu_tutorial;
- private System.Windows.Forms.ToolStripMenuItem menu_about;
+ 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;
diff --git a/FriishProduce/MainForm.cs b/FriishProduce/MainForm.cs
index e35f2dd..88fdb48 100644
--- a/FriishProduce/MainForm.cs
+++ b/FriishProduce/MainForm.cs
@@ -99,6 +99,7 @@ private void RefreshForm()
menu_file.Text = Program.Lang.String("file", Name);
menu_project.Text = Program.Lang.String("project", Name);
menu_help.Text = Program.Lang.String("help", Name);
+ menu_about_app.Text = string.Format(Program.Lang.String("about_app"), Program.Lang.ApplicationTitle);
Text = Program.Lang.ApplicationTitle;
ToolStrip_NewProject.Text = menu_new_project.Text;
@@ -173,6 +174,7 @@ private void Settings_Click(object sender, EventArgs e)
{
string lang = Properties.Settings.Default.language;
+ s.Font = Font;
s.ShowDialog(this);
if (lang != Properties.Settings.Default.language) RefreshForm();
@@ -269,6 +271,7 @@ private void AddProject(object sender, EventArgs e)
private ProjectForm AddTab(Console console, Project x = null)
{
ProjectForm Tab = x == null ? new ProjectForm(console) : new ProjectForm(x);
+ Tab.Font = Font;
Tab.Parent = this;
Tab.FormClosed += TabChanged;
Tab.ExportCheck += ExportCheck;
@@ -340,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 };
+ var tut = new Tutorial() { Text = menu_tutorial.Text, Font = Font };
tut.ShowDialog();
tut.Dispose();
}
@@ -373,7 +376,7 @@ private void TabContextMenu_Opening(object sender, CancelEventArgs e)
private void CloseTab_Click(object sender, EventArgs e) => (tabControl.SelectedForm as Form).Close();
- private void About_Click(object sender, EventArgs e) => new About().ShowDialog();
+ private void About_Click(object sender, EventArgs e) { using (var about = new About() { Font = Font }) about.ShowDialog(); }
private void MenuItem_Exit_Click(object sender, EventArgs e) => Application.Exit();
diff --git a/FriishProduce/MainForm.resx b/FriishProduce/MainForm.resx
index c5f40d0..8db0a58 100644
--- a/FriishProduce/MainForm.resx
+++ b/FriishProduce/MainForm.resx
@@ -161,37 +161,6 @@
False
-
- 0, 0
-
-
-
- 1, 0, 1, 0
-
-
- 684, 20
-
-
- 5
-
-
- MenuStrip
-
-
- System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 2
-
-
- 35, 20
-
-
- file
-
155, 22
@@ -240,11 +209,11 @@
exit
-
- 56, 20
+
+ 35, 20
-
- project
+
+ file
False
@@ -288,11 +257,11 @@
close_project
-
- 42, 20
+
+ 56, 20
-
- help
+
+ project
@@ -310,19 +279,50 @@
- 112, 22
+ 130, 22
tutorial
- 109, 6
+ 127, 6
+
+
+ 130, 22
+
+
+ about_app
+
+
+ 42, 20
+
+
+ help
+
+
+ 0, 0
+
+
+
+ 1, 0, 1, 0
+
+
+ 684, 20
+
+
+ 5
+
+
+ MenuStrip
-
- 112, 22
+
+ System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
-
- about
+
+ 2
6, 6
@@ -459,30 +459,6 @@
Tahoma, 8.25pt
-
- 0, 20
-
-
- 0, 0, 0, 0
-
-
- 684, 25
-
-
- 7
-
-
- ToolStrip
-
-
- System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 1
-
Magenta
@@ -591,6 +567,30 @@
23, 22
+
+ 0, 20
+
+
+ 0, 0, 0, 0
+
+
+ 684, 25
+
+
+ 7
+
+
+ ToolStrip
+
+
+ System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 1
+
342, 17
@@ -3146,10 +3146,10 @@
System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- menu_about
+
+ menu_about_app
-
+
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
diff --git a/FriishProduce/Options/VC_PCE.Designer.cs b/FriishProduce/Options/VC_PCE.Designer.cs
index f6a5ec1..8666459 100644
--- a/FriishProduce/Options/VC_PCE.Designer.cs
+++ b/FriishProduce/Options/VC_PCE.Designer.cs
@@ -13,7 +13,7 @@ namespace FriishProduce.Options {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
- public sealed partial class VC_PCE : global::System.Configuration.ApplicationSettingsBase {
+ internal sealed partial class VC_PCE : global::System.Configuration.ApplicationSettingsBase {
private static VC_PCE defaultInstance = ((VC_PCE)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new VC_PCE())));
diff --git a/FriishProduce/ProjectForm.cs b/FriishProduce/ProjectForm.cs
index dcd20f0..6ff18dc 100644
--- a/FriishProduce/ProjectForm.cs
+++ b/FriishProduce/ProjectForm.cs
@@ -1026,11 +1026,12 @@ public bool SaveToWAD()
// *******
if (TargetRegion.SelectedIndex > 0)
{
- OutWAD.Region = TargetRegion.SelectedItem.ToString() == Program.Lang.String("region_j") ? libWiiSharp.Region.Japan
- : TargetRegion.SelectedItem.ToString() == Program.Lang.String("region_u") ? libWiiSharp.Region.USA
- : TargetRegion.SelectedItem.ToString() == Program.Lang.String("region_e") ? libWiiSharp.Region.Europe
- : TargetRegion.SelectedItem.ToString() == Program.Lang.String("region_k") ? libWiiSharp.Region.Korea
- : libWiiSharp.Region.Free;
+ OutWAD.Region
+ = TargetRegion.SelectedItem.ToString() == Program.Lang.String("region_j") ? libWiiSharp.Region.Japan
+ : TargetRegion.SelectedItem.ToString() == Program.Lang.String("region_u") ? libWiiSharp.Region.USA
+ : TargetRegion.SelectedItem.ToString() == Program.Lang.String("region_e") ? libWiiSharp.Region.Europe
+ : TargetRegion.SelectedItem.ToString() == Program.Lang.String("region_k") ? libWiiSharp.Region.Korea
+ : libWiiSharp.Region.Free;
}
// Remaining ones done by WAD creator helper, which will save to a new file
@@ -1552,6 +1553,7 @@ private void ResetContentOptions()
if (CO != null)
{
+ CO.Font = Font;
CO.Text = Program.Lang.String("injection_method_options", "projectform");
CO.Icon = Icon.FromHandle(Properties.Resources.wrench.GetHicon());
}
@@ -1574,11 +1576,11 @@ private void ChannelTitle_Locale_CheckedChanged(object sender, EventArgs e)
{
if (ChannelTitle_Locale.Checked)
{
- ChannelTitles titles = new ChannelTitles(ChannelTitle.Text);
+ ChannelTitles titles = new ChannelTitles(ChannelTitle.Text) { Font = Font };
if (titles.ShowDialog() == DialogResult.OK)
{
Creator.ChannelTitles = new string[8]
- {
+ {
titles.Japanese.Text,
titles.English.Text,
titles.German.Text,
@@ -1587,15 +1589,19 @@ private void ChannelTitle_Locale_CheckedChanged(object sender, EventArgs e)
titles.Italian.Text,
titles.Dutch.Text,
titles.Korean.Text,
- };
- ChannelTitle.Text = Program.Lang.Current == "ja" ? titles.Japanese.Text
- : Program.Lang.Current == "ko" ? titles.Korean.Text
- : Program.Lang.Current == "nl" ? titles.Dutch.Text
- : Program.Lang.Current == "es" ? titles.Spanish.Text
- : Program.Lang.Current == "it" ? titles.Italian.Text
- : Program.Lang.Current == "fr" ? titles.French.Text
- : Program.Lang.Current == "de" ? titles.English.Text
- : titles.English.Text;
+ };
+
+ ChannelTitle.Text = Program.Lang.Current switch
+ {
+ "ja" => titles.Japanese.Text,
+ "ko" => titles.Korean.Text,
+ "nl" => titles.Dutch.Text,
+ "es" => titles.Spanish.Text,
+ "it" => titles.Italian.Text,
+ "fr" => titles.French.Text,
+ "de" => titles.German.Text,
+ _ => titles.English.Text
+ };
}
}
diff --git a/FriishProduce/SettingsForm.Designer.cs b/FriishProduce/SettingsForm.Designer.cs
index b5bf633..0e3e062 100644
--- a/FriishProduce/SettingsForm.Designer.cs
+++ b/FriishProduce/SettingsForm.Designer.cs
@@ -81,7 +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_backupram = new System.Windows.Forms.CheckBox();
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();
@@ -89,6 +88,7 @@ private void InitializeComponent()
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();
this.vc_pce_europe = new System.Windows.Forms.Label();
this.vc_pce_padbutton_switch = new JCS.ToggleSwitch();
@@ -108,6 +108,8 @@ 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();
@@ -137,6 +139,7 @@ private void InitializeComponent()
this.flash_quality.SuspendLayout();
this.flash_save_data.SuspendLayout();
this.panel2.SuspendLayout();
+ this.flash_strap_reminder.SuspendLayout();
this.SuspendLayout();
//
// lngList
@@ -540,12 +543,6 @@ private void InitializeComponent()
this.vc_pce.Name = "vc_pce";
this.vc_pce.Tag = "vc_pce";
//
- // vc_pce_backupram
- //
- resources.ApplyResources(this.vc_pce_backupram, "vc_pce_backupram");
- this.vc_pce_backupram.Name = "vc_pce_backupram";
- this.vc_pce_backupram.UseVisualStyleBackColor = true;
- //
// vc_pce_display
//
this.vc_pce_display.Controls.Add(this.vc_pce_y_offset_l);
@@ -609,6 +606,12 @@ private void InitializeComponent()
this.vc_pce_system.TabStop = false;
this.vc_pce_system.Tag = "vc_options";
//
+ // vc_pce_backupram
+ //
+ resources.ApplyResources(this.vc_pce_backupram, "vc_pce_backupram");
+ this.vc_pce_backupram.Name = "vc_pce_backupram";
+ this.vc_pce_backupram.UseVisualStyleBackColor = true;
+ //
// vc_pce_europe_switch
//
resources.ApplyResources(this.vc_pce_europe_switch, "vc_pce_europe_switch");
@@ -650,6 +653,7 @@ private void InitializeComponent()
//
// adobe_flash
//
+ this.adobe_flash.Controls.Add(this.flash_strap_reminder);
this.adobe_flash.Controls.Add(this.flash_controls);
this.adobe_flash.Controls.Add(this.flash_quality);
this.adobe_flash.Controls.Add(this.flash_save_data);
@@ -762,6 +766,24 @@ 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;
@@ -832,6 +854,7 @@ private void InitializeComponent()
this.flash_save_data.PerformLayout();
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
+ this.flash_strap_reminder.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -915,5 +938,7 @@ private void InitializeComponent()
private System.Windows.Forms.ComboBox gamedata_source_image_list;
private System.Windows.Forms.Label gamedata_source_image;
private System.Windows.Forms.Panel panel2;
+ private System.Windows.Forms.GroupBox flash_strap_reminder;
+ private System.Windows.Forms.ComboBox flash_strap_reminder_list;
}
}
\ No newline at end of file
diff --git a/FriishProduce/SettingsForm.cs b/FriishProduce/SettingsForm.cs
index 044369f..6b41cd4 100644
--- a/FriishProduce/SettingsForm.cs
+++ b/FriishProduce/SettingsForm.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using System.Drawing;
using System.Data;
using System.Linq;
using System.Windows.Forms;
@@ -80,6 +79,7 @@ public void RefreshForm()
if (Default.language == "sys") lngList.SelectedIndex = 0;
else lngList.SelectedIndex = Program.Lang.List.Keys.ToList().IndexOf(Default.language) + 1;
+ #region Localization
image_interpolation_mode.Text = Program.Lang.String(image_interpolation_mode.Name, "projectform");
image_interpolation_mode_list.Items.Clear();
image_interpolation_mode_list.Items.AddRange(Program.Lang.StringArray("image_interpolation_mode", "projectform"));
@@ -90,8 +90,6 @@ public void RefreshForm()
gamedata_source_image_list.SelectedIndex = Default.gamedata_source_image;
retrieve_gamedata_online.Text = Program.Lang.String(retrieve_gamedata_online.Name, "mainform") != "undefined" ? Program.Lang.String(retrieve_gamedata_online.Name, "mainform") : Program.Lang.String(retrieve_gamedata_online.Name, Name);
- auto_retrieve_gamedata_online.Checked = Default.auto_retrieve_game_data;
- reset_all_dialogs.Checked = false;
flash_save_data_enable.Text = vc_pce_backupram.Text = vc_sega_save_sram.Text = Program.Lang.String("save_data_enable", "projectform");
@@ -151,64 +149,65 @@ public void RefreshForm()
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"));
+ #endregion
// -----------------------------
- FStorage_SD.Checked = FORWARDER.Default.root_storage_device.ToLower() == "sd";
- toggleSwitch1.Checked = FORWARDER.Default.nand_loader.ToLower() == "vwii";
- FStorage_USB.Checked = !FStorage_SD.Checked;
- autolink_save_data.Checked = Default.link_save_data;
-
- vc_nes_palettelist.SelectedIndex = int.Parse(VC_NES.Default.palette);
- vc_nes_palette_use_on_banner.Checked = bool.Parse(VC_NES.Default.palette_use_on_banner);
-
- vc_n64_patch_fixbrightness.Checked = bool.Parse(VC_N64.Default.patch_fixbrightness);
- vc_n64_patch_fixcrashes.Checked = bool.Parse(VC_N64.Default.patch_fixcrashes);
- vc_n64_patch_expandedram.Checked = bool.Parse(VC_N64.Default.patch_expandedram);
- vc_n64_patch_autosizerom.Checked = bool.Parse(VC_N64.Default.patch_autosizerom);
- vc_n64_romc_type_list.SelectedIndex = int.Parse(VC_N64.Default.romc_type);
-
- label1.Text = VC_SEGA.Default.console_brightness;
- SEGA_console_brightness.Value = int.Parse(label1.Text);
- vc_sega_save_sram.Checked = VC_SEGA.Default.save_sram == "1";
- vc_sega_dev_mdpad_enable_6b.Checked = VC_SEGA.Default.dev_mdpad_enable_6b == "1";
- vc_sega_country.SelectedIndex = VC_SEGA.Default.country == "jp" ? 0 : VC_SEGA.Default.country == "us" ? 1 : 2;
- vc_sega_console_disableresetbutton.Checked = VC_SEGA.Default.console_disableresetbutton == "1";
-
- vc_pce_backupram.Checked = VC_PCE.Default.BACKUPRAM == "1";
- vc_pce_europe_switch.Checked = VC_PCE.Default.EUROPE == "1";
- vc_pce_sgenable_switch.Checked = VC_PCE.Default.SGENABLE == "1";
- vc_pce_padbutton_switch.Checked = VC_PCE.Default.PADBUTTON == "6";
- vc_pce_y_offset.Value = int.Parse(VC_PCE.Default.YOFFSET);
- vc_pce_hide_overscan.Checked = VC_PCE.Default.HIDEOVERSCAN == "1";
- vc_pce_raster.Checked = VC_PCE.Default.RASTER == "1";
- vc_pce_sprline.Checked = VC_PCE.Default.SPRLINE == "1";
-
- switch (VC_NEO.Default.bios.ToLower())
- {
- case "vc1":
- vc_neo_bios_list.SelectedIndex = 0;
- break;
-
- default:
- case "vc2":
- vc_neo_bios_list.SelectedIndex = 1;
- break;
+ // Defaults & forwarders
+ auto_retrieve_gamedata_online.Checked = Default.auto_retrieve_game_data;
+ autolink_save_data.Checked = Default.link_save_data;
+ reset_all_dialogs.Checked = false;
+ FStorage_SD.Checked = FORWARDER.Default.root_storage_device.ToLower() == "sd";
+ toggleSwitch1.Checked = FORWARDER.Default.nand_loader.ToLower() == "vwii";
+ FStorage_USB.Checked = !FStorage_SD.Checked;
+
+ // NES
+ vc_nes_palettelist.SelectedIndex = int.Parse(VC_NES.Default.palette);
+ vc_nes_palette_use_on_banner.Checked = bool.Parse(VC_NES.Default.palette_use_on_banner);
+
+ // N64
+ vc_n64_patch_fixbrightness.Checked = bool.Parse(VC_N64.Default.patch_fixbrightness);
+ vc_n64_patch_fixcrashes.Checked = bool.Parse(VC_N64.Default.patch_fixcrashes);
+ vc_n64_patch_expandedram.Checked = bool.Parse(VC_N64.Default.patch_expandedram);
+ vc_n64_patch_autosizerom.Checked = bool.Parse(VC_N64.Default.patch_autosizerom);
+ vc_n64_romc_type_list.SelectedIndex = int.Parse(VC_N64.Default.romc_type);
+
+ // SEGA
+ label1.Text = VC_SEGA.Default.console_brightness;
+ SEGA_console_brightness.Value = int.Parse(label1.Text);
+ vc_sega_save_sram.Checked = VC_SEGA.Default.save_sram == "1";
+ vc_sega_dev_mdpad_enable_6b.Checked = VC_SEGA.Default.dev_mdpad_enable_6b == "1";
+ vc_sega_country.SelectedIndex = VC_SEGA.Default.country switch { "jp" => 0, "us" => 1, _ => 2 };
+ vc_sega_console_disableresetbutton.Checked = VC_SEGA.Default.console_disableresetbutton == "1";
+
+ // PCE
+ vc_pce_backupram.Checked = VC_PCE.Default.BACKUPRAM == "1";
+ vc_pce_europe_switch.Checked = VC_PCE.Default.EUROPE == "1";
+ vc_pce_sgenable_switch.Checked = VC_PCE.Default.SGENABLE == "1";
+ vc_pce_padbutton_switch.Checked = VC_PCE.Default.PADBUTTON == "6";
+ vc_pce_y_offset.Value = int.Parse(VC_PCE.Default.YOFFSET);
+ vc_pce_hide_overscan.Checked = VC_PCE.Default.HIDEOVERSCAN == "1";
+ vc_pce_raster.Checked = VC_PCE.Default.RASTER == "1";
+ vc_pce_sprline.Checked = VC_PCE.Default.SPRLINE == "1";
+
+ // NEO-GEO
+ vc_neo_bios_list.SelectedIndex = VC_NEO.Default.bios.ToLower() switch { "vc1" => 0, "vc3" => 2, _ => 1 };
+
+ // FLASH
+ flash_save_data_enable.Checked = ADOBEFLASH.Default.shared_object_capability == "on";
+ flash_vff_sync_on_write.Checked = ADOBEFLASH.Default.vff_sync_on_write == "on";
+ flash_vff_cache_size_list.SelectedItem = flash_vff_cache_size_list.Items.Cast().FirstOrDefault(n => n.ToString() == ADOBEFLASH.Default.vff_cache_size);
+ flash_quality_list.SelectedIndex = ADOBEFLASH.Default.quality switch { "high" => 0, "medium" => 1, _ => 2 };
+ flash_mouse.Checked = ADOBEFLASH.Default.mouse == "on";
+ flash_qwerty_keyboard.Checked = ADOBEFLASH.Default.qwerty_keyboard == "on";
+ flash_strap_reminder_list.SelectedIndex = ADOBEFLASH.Default.strap_reminder switch { "none" => 0, "normal" => 1, _ => 2 };
- case "vc3":
- vc_neo_bios_list.SelectedIndex = 2;
- break;
- }
-
- flash_save_data_enable.Checked = ADOBEFLASH.Default.shared_object_capability == "on";
- flash_vff_sync_on_write.Checked = ADOBEFLASH.Default.vff_sync_on_write == "on";
- flash_vff_cache_size_list.SelectedItem = flash_vff_cache_size_list.Items.Cast().FirstOrDefault(n => n.ToString() == ADOBEFLASH.Default.vff_cache_size);
- flash_quality_list.SelectedIndex = ADOBEFLASH.Default.quality == "high" ? 0 : ADOBEFLASH.Default.quality == "medium" ? 1 : 2;
- flash_mouse.Checked = ADOBEFLASH.Default.mouse == "on";
- flash_qwerty_keyboard.Checked = ADOBEFLASH.Default.qwerty_keyboard == "on";
flash_vff_cache_size.Enabled = flash_vff_sync_on_write.Enabled = flash_vff_cache_size_list.Enabled = flash_save_data_enable.Checked;
ToggleSwitchText();
@@ -236,47 +235,48 @@ private void OK_Click(object sender, EventArgs e)
// -------------------------------------------
// Other settings
// -------------------------------------------
- Default.image_interpolation = image_interpolation_mode_list.SelectedIndex;
- Default.auto_retrieve_game_data = auto_retrieve_gamedata_online.Checked;
+
+ Default.link_save_data = autolink_save_data.Checked;
+ Default.gamedata_source_image = gamedata_source_image_list.SelectedIndex;
+ Default.image_interpolation = image_interpolation_mode_list.SelectedIndex;
+ Default.auto_retrieve_game_data = auto_retrieve_gamedata_online.Checked;
Default.Save();
+ FORWARDER.Default.root_storage_device = FStorage_SD.Checked ? "SD" : "USB";
+ FORWARDER.Default.nand_loader = toggleSwitch1.Checked ? "vWii" : "Wii";
Program.Lang = new Language(lng);
- FORWARDER.Default.root_storage_device = FStorage_SD.Checked ? "SD" : "USB";
- FORWARDER.Default.nand_loader = toggleSwitch1.Checked ? "vWii" : "Wii";
- Default.link_save_data = autolink_save_data.Checked;
- Default.gamedata_source_image = gamedata_source_image_list.SelectedIndex;
-
- VC_NES.Default.palette = vc_nes_palettelist.SelectedIndex.ToString();
- VC_NES.Default.palette_use_on_banner = vc_nes_palette_use_on_banner.Checked.ToString();
-
- VC_N64.Default.patch_fixbrightness = vc_n64_patch_fixbrightness.Checked.ToString();
- VC_N64.Default.patch_fixcrashes = vc_n64_patch_fixcrashes.Checked.ToString();
- VC_N64.Default.patch_expandedram = vc_n64_patch_expandedram.Checked.ToString();
- VC_N64.Default.patch_autosizerom = vc_n64_patch_autosizerom.Checked.ToString();
- VC_N64.Default.romc_type = vc_n64_romc_type_list.SelectedIndex.ToString();
-
- VC_SEGA.Default.console_brightness = label1.Text;
- VC_SEGA.Default.save_sram = vc_sega_save_sram.Checked ? "1" : "0";
- VC_SEGA.Default.dev_mdpad_enable_6b = vc_sega_dev_mdpad_enable_6b.Checked ? "1" : "0";
- VC_SEGA.Default.country = vc_sega_country.SelectedIndex == 0 ? "jp" : vc_sega_country.SelectedIndex == 2 ? "eu" : "us";
- VC_SEGA.Default.console_disableresetbutton = vc_sega_console_disableresetbutton.Checked ? "1" : null;
-
- VC_PCE.Default.BACKUPRAM = vc_pce_backupram.Checked ? "1" : "0";
- VC_PCE.Default.EUROPE = vc_pce_europe_switch.Checked ? "1" : "0";
- VC_PCE.Default.SGENABLE = vc_pce_sgenable_switch.Checked ? "1" : "0";
- VC_PCE.Default.PADBUTTON = vc_pce_padbutton_switch.Checked ? "6" : "2";
- VC_PCE.Default.YOFFSET = vc_pce_y_offset.Value.ToString();
- VC_PCE.Default.HIDEOVERSCAN = vc_pce_hide_overscan.Checked ? "1" : "0";
- VC_PCE.Default.RASTER = vc_pce_raster.Checked ? "1" : "0";
- VC_PCE.Default.SPRLINE = vc_pce_sprline.Checked ? "1" : "0";
+ VC_NES.Default.palette = vc_nes_palettelist.SelectedIndex.ToString();
+ VC_NES.Default.palette_use_on_banner = vc_nes_palette_use_on_banner.Checked.ToString();
+
+ VC_N64.Default.patch_fixbrightness = vc_n64_patch_fixbrightness.Checked.ToString();
+ VC_N64.Default.patch_fixcrashes = vc_n64_patch_fixcrashes.Checked.ToString();
+ VC_N64.Default.patch_expandedram = vc_n64_patch_expandedram.Checked.ToString();
+ VC_N64.Default.patch_autosizerom = vc_n64_patch_autosizerom.Checked.ToString();
+ VC_N64.Default.romc_type = vc_n64_romc_type_list.SelectedIndex.ToString();
+
+ VC_SEGA.Default.console_brightness = label1.Text;
+ VC_SEGA.Default.save_sram = vc_sega_save_sram.Checked ? "1" : "0";
+ VC_SEGA.Default.dev_mdpad_enable_6b = vc_sega_dev_mdpad_enable_6b.Checked ? "1" : "0";
+ VC_SEGA.Default.country = vc_sega_country.SelectedIndex switch { 0 => "jp", 1 => "us", _ => "eu" };
+ VC_SEGA.Default.console_disableresetbutton = vc_sega_console_disableresetbutton.Checked ? "1" : null;
+
+ VC_PCE.Default.BACKUPRAM = vc_pce_backupram.Checked ? "1" : "0";
+ VC_PCE.Default.EUROPE = vc_pce_europe_switch.Checked ? "1" : "0";
+ VC_PCE.Default.SGENABLE = vc_pce_sgenable_switch.Checked ? "1" : "0";
+ VC_PCE.Default.PADBUTTON = vc_pce_padbutton_switch.Checked ? "6" : "2";
+ VC_PCE.Default.YOFFSET = vc_pce_y_offset.Value.ToString();
+ VC_PCE.Default.HIDEOVERSCAN = vc_pce_hide_overscan.Checked ? "1" : "0";
+ VC_PCE.Default.RASTER = vc_pce_raster.Checked ? "1" : "0";
+ VC_PCE.Default.SPRLINE = vc_pce_sprline.Checked ? "1" : "0";
ADOBEFLASH.Default.shared_object_capability = flash_save_data_enable.Checked ? "on" : "off";
- ADOBEFLASH.Default.vff_sync_on_write = flash_vff_sync_on_write.Checked ? "on" : "off";
- ADOBEFLASH.Default.vff_cache_size = flash_vff_cache_size_list.SelectedItem.ToString();
- ADOBEFLASH.Default.quality = flash_quality_list.SelectedIndex == 0 ? "high" : flash_quality_list.SelectedIndex == 1 ? "medium" : "low";
- ADOBEFLASH.Default.mouse = flash_mouse.Checked ? "on" : "off";
- ADOBEFLASH.Default.qwerty_keyboard = flash_qwerty_keyboard.Checked ? "on" : "off";
- ADOBEFLASH.Default.hbm_no_save = ADOBEFLASH.Default.shared_object_capability == "on" ? "no" : "yes";
+ ADOBEFLASH.Default.vff_sync_on_write = flash_vff_sync_on_write.Checked ? "on" : "off";
+ ADOBEFLASH.Default.vff_cache_size = flash_vff_cache_size_list.SelectedItem.ToString();
+ ADOBEFLASH.Default.quality = flash_quality_list.SelectedIndex switch { 0 => "high", 1 => "medium", _ => "low" };
+ ADOBEFLASH.Default.mouse = flash_mouse.Checked ? "on" : "off";
+ ADOBEFLASH.Default.qwerty_keyboard = flash_qwerty_keyboard.Checked ? "on" : "off";
+ ADOBEFLASH.Default.strap_reminder = flash_strap_reminder_list.SelectedIndex switch { 0 => "none", 1 => "normal", _ => "no_ex" };
+ ADOBEFLASH.Default.hbm_no_save = ADOBEFLASH.Default.shared_object_capability == "on" ? "no" : "yes";
switch (vc_neo_bios_list.SelectedIndex)
{
diff --git a/FriishProduce/SettingsForm.resx b/FriishProduce/SettingsForm.resx
index 8cc27c3..f1398b2 100644
--- a/FriishProduce/SettingsForm.resx
+++ b/FriishProduce/SettingsForm.resx
@@ -1839,6 +1839,54 @@
6
+
+ auto
+
+
+ 10, 19
+
+
+ 235, 21
+
+
+ 16
+
+
+ flash_strap_reminder_list
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ flash_strap_reminder
+
+
+ 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
@@ -1900,10 +1948,10 @@
1
- 12, 110
+ 272, 12
- 280, 65
+ 265, 65
21
@@ -1921,7 +1969,7 @@
adobe_flash
- 0
+ 1
auto
@@ -1930,7 +1978,7 @@
10, 19
- 260, 21
+ 245, 21
15
@@ -1948,10 +1996,10 @@
0
- 12, 181
+ 272, 83
- 280, 50
+ 265, 50
20
@@ -1969,7 +2017,7 @@
adobe_flash
- 1
+ 2
True
@@ -2128,7 +2176,7 @@
12, 10
- 280, 94
+ 254, 94
19
@@ -2146,7 +2194,7 @@
adobe_flash
- 2
+ 3
180, 0
diff --git a/FriishProduce/Strings/en.json b/FriishProduce/Strings/en.json
index 6096c56..b770b1f 100644
--- a/FriishProduce/Strings/en.json
+++ b/FriishProduce/Strings/en.json
@@ -112,8 +112,7 @@
"save_project_as": "&Save project as...",
"save_as_wad": "Save as &WAD...",
"close_project": "&Close project",
- "settings": "&Settings",
- "about": "&About..."
+ "settings": "&Settings"
},
"settingsform": {
"application": "Application",
@@ -220,7 +219,11 @@
"quality": "Quality",
"quality0": "High",
"quality1": "Medium",
- "quality2": "Low"
+ "quality2": "Low",
+ "strap_reminder": "Strap reminder screen",
+ "strap_reminder0": "Disabled",
+ "strap_reminder1": "Normal",
+ "strap_reminder2": "No extension controller"
}
}
}
\ No newline at end of file
diff --git a/FriishProduce/Strings/es.json b/FriishProduce/Strings/es.json
index d910fb2..d21abcb 100644
--- a/FriishProduce/Strings/es.json
+++ b/FriishProduce/Strings/es.json
@@ -99,7 +99,6 @@
"save_as_wad": "Guardar como &WAD...",
"close_project": "&Cerrar proyecto",
"settings": "&Configuración",
- "about": "&Acerca de...",
"note": "Recuerda que algunas opciones no pueden funcionar con el canal de origen elegido."
},
"settingsform": {
diff --git a/FriishProduce/Strings/fr.json b/FriishProduce/Strings/fr.json
index 42e281f..64a91f0 100644
--- a/FriishProduce/Strings/fr.json
+++ b/FriishProduce/Strings/fr.json
@@ -106,7 +106,6 @@
"save_as_wad": "Enregistrer au format &WAD ...",
"close_project": "&Fermer le projet",
"settings": "&Paramètres",
- "about": "&À propos...",
"note": "Veuillez noter que ces options ne peuvent pas fonctionner pour toutes les chaînes de Console virtuelle."
},
"settingsform": {
diff --git a/FriishProduce/Subforms/Options_Flash.Designer.cs b/FriishProduce/Subforms/Options_Flash.Designer.cs
index eb7528a..1709709 100644
--- a/FriishProduce/Subforms/Options_Flash.Designer.cs
+++ b/FriishProduce/Subforms/Options_Flash.Designer.cs
@@ -39,10 +39,13 @@ private void InitializeComponent()
this.controls = new System.Windows.Forms.GroupBox();
this.qwerty_keyboard = new System.Windows.Forms.CheckBox();
this.mouse = new System.Windows.Forms.CheckBox();
+ this.strap_reminder = new System.Windows.Forms.GroupBox();
+ this.strap_reminder_list = new System.Windows.Forms.ComboBox();
this.bottomPanel1.SuspendLayout();
this.groupBox1.SuspendLayout();
this.quality.SuspendLayout();
this.controls.SuspendLayout();
+ this.strap_reminder.SuspendLayout();
this.SuspendLayout();
//
// b_ok
@@ -185,9 +188,33 @@ private void InitializeComponent()
this.mouse.Text = "mouse";
this.mouse.UseVisualStyleBackColor = true;
//
+ // strap_reminder
+ //
+ this.strap_reminder.Controls.Add(this.strap_reminder_list);
+ this.strap_reminder.Location = new System.Drawing.Point(12, 109);
+ this.strap_reminder.Name = "strap_reminder";
+ this.strap_reminder.Size = new System.Drawing.Size(280, 50);
+ this.strap_reminder.TabIndex = 19;
+ this.strap_reminder.TabStop = false;
+ this.strap_reminder.Tag = "strap_reminder";
+ this.strap_reminder.Text = "strap_reminder";
+ //
+ // strap_reminder_list
+ //
+ this.strap_reminder_list.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.strap_reminder_list.FormattingEnabled = true;
+ this.strap_reminder_list.Items.AddRange(new object[] {
+ "auto"});
+ this.strap_reminder_list.Location = new System.Drawing.Point(10, 19);
+ this.strap_reminder_list.Name = "strap_reminder_list";
+ this.strap_reminder_list.Size = new System.Drawing.Size(260, 21);
+ this.strap_reminder_list.TabIndex = 16;
+ this.strap_reminder_list.Tag = "strap_reminder";
+ //
// Options_Flash
//
this.ClientSize = new System.Drawing.Size(594, 262);
+ this.Controls.Add(this.strap_reminder);
this.Controls.Add(this.controls);
this.Controls.Add(this.quality);
this.Controls.Add(this.groupBox1);
@@ -196,12 +223,14 @@ private void InitializeComponent()
this.Controls.SetChildIndex(this.groupBox1, 0);
this.Controls.SetChildIndex(this.quality, 0);
this.Controls.SetChildIndex(this.controls, 0);
+ this.Controls.SetChildIndex(this.strap_reminder, 0);
this.bottomPanel1.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.quality.ResumeLayout(false);
this.controls.ResumeLayout(false);
this.controls.PerformLayout();
+ this.strap_reminder.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -217,5 +246,7 @@ private void InitializeComponent()
private System.Windows.Forms.CheckBox qwerty_keyboard;
private System.Windows.Forms.CheckBox mouse;
private System.Windows.Forms.CheckBox vff_sync_on_write;
+ private System.Windows.Forms.GroupBox strap_reminder;
+ private System.Windows.Forms.ComboBox strap_reminder_list;
}
}
diff --git a/FriishProduce/Subforms/Options_Flash.cs b/FriishProduce/Subforms/Options_Flash.cs
index 69dc358..153e4f0 100644
--- a/FriishProduce/Subforms/Options_Flash.cs
+++ b/FriishProduce/Subforms/Options_Flash.cs
@@ -32,9 +32,6 @@ public Options_Flash() : base()
Program.Lang.Control(this);
groupBox1.Text = Program.Lang.String("save_data", "projectform");
save_data_enable.Text = Program.Lang.String("save_data_enable", "projectform");
-
- quality_list.Items.Clear();
- quality_list.Items.AddRange(Program.Lang.StringArray("quality", Tag.ToString()));
}
}
@@ -47,12 +44,13 @@ protected override void ResetOptions()
if (Options != null)
{
// Code logic in derived Form
- save_data_enable.Checked = Options["shared_object_capability"] == "on";
- vff_sync_on_write.Checked = Options["vff_sync_on_write"] == "on";
- mouse.Checked = Options["mouse"] == "on";
- qwerty_keyboard.Checked = Options["qwerty_keyboard"] == "on";
- quality_list.SelectedIndex = Options["quality"] == "high" ? 0 : Options["quality"] == "medium" ? 1 : 2;
- vff_cache_size_list.SelectedItem = vff_cache_size_list.Items.Cast().FirstOrDefault(n => n.ToString() == Options["vff_cache_size"]);
+ save_data_enable.Checked = Options["shared_object_capability"] == "on";
+ vff_sync_on_write.Checked = Options["vff_sync_on_write"] == "on";
+ vff_cache_size_list.SelectedItem = vff_cache_size_list.Items.Cast().FirstOrDefault(n => n.ToString() == Options["vff_cache_size"]);
+ mouse.Checked = Options["mouse"] == "on";
+ qwerty_keyboard.Checked = Options["qwerty_keyboard"] == "on";
+ quality_list.SelectedIndex = Options["quality"] switch { "high" => 0, "medium" => 1, _ => 2 };
+ strap_reminder_list.SelectedIndex = Options["strap_reminder"] switch { "none" => 0, "normal" => 1, _ => 2 };
}
vff_cache_size.Enabled = vff_cache_size_list.Enabled = vff_sync_on_write.Enabled = save_data_enable.Checked;
@@ -62,14 +60,14 @@ protected override void ResetOptions()
protected override void SaveOptions()
{
// Code logic in derived Form
- Options["shared_object_capability"] = save_data_enable.Checked ? "on" : "off";
- Options["vff_sync_on_write"] = vff_sync_on_write.Checked ? "on" : "off";
- Options["mouse"] = mouse.Checked ? "on" : "off";
- Options["qwerty_keyboard"] = qwerty_keyboard.Checked ? "on" : "off";
- Options["quality"] = quality_list.SelectedIndex == 0 ? "high" : quality_list.SelectedIndex == 1 ? "medium" : "low";
- Options["vff_cache_size"] = vff_cache_size_list.SelectedItem.ToString();
-
- Options["hbm_no_save"] = Options["shared_object_capability"] == "on" ? "no" : "yes";
+ Options["shared_object_capability"] = save_data_enable.Checked ? "on" : "off";
+ Options["vff_sync_on_write"] = vff_sync_on_write.Checked ? "on" : "off";
+ Options["vff_cache_size"] = vff_cache_size_list.SelectedItem.ToString();
+ Options["mouse"] = mouse.Checked ? "on" : "off";
+ Options["qwerty_keyboard"] = qwerty_keyboard.Checked ? "on" : "off";
+ Options["quality"] = quality_list.SelectedIndex switch { 0 => "high", 1 => "medium", _ => "low" };
+ Options["strap_reminder"] = strap_reminder_list.SelectedIndex switch { 0 => "none", 1 => "normal", _ => "no_ex" };
+ Options["hbm_no_save"] = Options["shared_object_capability"] == "on" ? "no" : "yes";
}
private void checkBoxChanged(object sender, EventArgs e)
diff --git a/FriishProduce/Subforms/Options_VC_N64.cs b/FriishProduce/Subforms/Options_VC_N64.cs
index 7103714..10a6ff8 100644
--- a/FriishProduce/Subforms/Options_VC_N64.cs
+++ b/FriishProduce/Subforms/Options_VC_N64.cs
@@ -37,23 +37,23 @@ protected override void ResetOptions()
// *******
if (Options != null)
{
- patch_autosizerom.Enabled = patch_fixcrashes.Enabled = EmuType <= 1;
- patch_fixbrightness.Checked = bool.Parse(Options["brightness"]);
- patch_fixcrashes.Checked = bool.Parse(Options["crash"]);
- patch_expandedram.Checked = bool.Parse(Options["expansion"]);
- patch_autosizerom.Checked = bool.Parse(Options["rom_autosize"]);
- romc_type_list.SelectedIndex = int.Parse(Options["romc"]);
+ patch_autosizerom.Enabled = patch_fixcrashes.Enabled = EmuType <= 1;
+ patch_fixbrightness.Checked = bool.Parse(Options["brightness"]);
+ patch_fixcrashes.Checked = bool.Parse(Options["crash"]);
+ patch_expandedram.Checked = bool.Parse(Options["expansion"]);
+ patch_autosizerom.Checked = bool.Parse(Options["rom_autosize"]);
+ romc_type_list.SelectedIndex = int.Parse(Options["romc"]);
}
// *******
}
protected override void SaveOptions()
{
- Options["brightness"] = patch_fixbrightness.Checked.ToString();
- Options["crash"] = patch_fixcrashes.Checked.ToString();
- Options["expansion"] = patch_expandedram.Checked.ToString();
- Options["rom_autosize"] = patch_autosizerom.Checked.ToString();
- Options["romc"] = romc_type_list.SelectedIndex.ToString();
+ Options["brightness"] = patch_fixbrightness.Checked.ToString();
+ Options["crash"] = patch_fixcrashes.Checked.ToString();
+ Options["expansion"] = patch_expandedram.Checked.ToString();
+ Options["rom_autosize"] = patch_autosizerom.Checked.ToString();
+ Options["romc"] = romc_type_list.SelectedIndex.ToString();
}
// ---------------------------------------------------------------------------------------------------------------
diff --git a/FriishProduce/Subforms/Options_VC_NEO.cs b/FriishProduce/Subforms/Options_VC_NEO.cs
index 3ae7c09..c362fbf 100644
--- a/FriishProduce/Subforms/Options_VC_NEO.cs
+++ b/FriishProduce/Subforms/Options_VC_NEO.cs
@@ -60,36 +60,26 @@ protected override void SaveOptions()
private string GetBIOSName(int i)
{
- switch (i)
+ return i switch
{
- default:
- return "";
- case 0:
- return "custom";
- case 1:
- return "VC1";
- case 2:
- return "VC2";
- case 3:
- return "VC3";
- }
+ 0 => "custom",
+ 1 => "VC1",
+ 2 => "VC2",
+ 3 => "VC3",
+ _ => "",
+ };
}
private int GetBIOSIndex(string name)
{
- switch (name.ToLower())
+ return name.ToLower() switch
{
- default:
- return -1;
- case "custom":
- return 0;
- case "vc1":
- return 1;
- case "vc2":
- return 2;
- case "vc3":
- return 3;
- }
+ "custom" => 0,
+ "vc1" => 1,
+ "vc2" => 2,
+ "vc3" => 3,
+ _ => -1,
+ };
}
private void BIOSChanged(object sender, EventArgs e)
diff --git a/FriishProduce/Subforms/Options_VC_NES.cs b/FriishProduce/Subforms/Options_VC_NES.cs
index 1f538b9..3024870 100644
--- a/FriishProduce/Subforms/Options_VC_NES.cs
+++ b/FriishProduce/Subforms/Options_VC_NES.cs
@@ -39,16 +39,16 @@ protected override void ResetOptions()
// *******
if (Options != null)
{
- PaletteList.SelectedIndex = int.Parse(Options["palette"]);
- palette_use_on_banner.Checked = bool.Parse(Options["use_tImg"]);
+ PaletteList.SelectedIndex = int.Parse(Options["palette"]);
+ palette_use_on_banner.Checked = bool.Parse(Options["use_tImg"]);
}
// *******
}
protected override void SaveOptions()
{
- Options["palette"] = PaletteList.SelectedIndex.ToString();
- Options["use_tImg"] = palette_use_on_banner.Checked.ToString();
+ Options["palette"] = PaletteList.SelectedIndex.ToString();
+ Options["use_tImg"] = palette_use_on_banner.Checked.ToString();
}
// ---------------------------------------------------------------------------------------------------------------
diff --git a/FriishProduce/Subforms/Options_VC_PCE.cs b/FriishProduce/Subforms/Options_VC_PCE.cs
index 7afc524..44bb5a0 100644
--- a/FriishProduce/Subforms/Options_VC_PCE.cs
+++ b/FriishProduce/Subforms/Options_VC_PCE.cs
@@ -48,28 +48,28 @@ protected override void ResetOptions()
// *******
if (Options != null)
{
- y_offset_toggle.Value = int.Parse(Options["YOFFSET"]);
- europe_switch.Checked = Options["EUROPE"] == "1";
- sgenable_switch.Checked = Options["SGENABLE"] == "1";
- padbutton_switch.Checked = Options["PADBUTTON"] == "6";
- hide_overscan.Checked = Options["HIDEOVERSCAN"] == "1";
- raster.Checked = Options["RASTER"] == "1";
- sprline.Checked = Options["SPRLINE"] == "1";
- checkBox4.Checked = Options["BACKUPRAM"] == "1";
+ y_offset_toggle.Value = int.Parse(Options["YOFFSET"]);
+ europe_switch.Checked = Options["EUROPE"] == "1";
+ sgenable_switch.Checked = Options["SGENABLE"] == "1";
+ padbutton_switch.Checked = Options["PADBUTTON"] == "6";
+ hide_overscan.Checked = Options["HIDEOVERSCAN"] == "1";
+ raster.Checked = Options["RASTER"] == "1";
+ sprline.Checked = Options["SPRLINE"] == "1";
+ checkBox4.Checked = Options["BACKUPRAM"] == "1";
}
// *******
}
protected override void SaveOptions()
{
- Options["YOFFSET"] = y_offset_toggle.Value.ToString();
- Options["EUROPE"] = europe_switch.Checked ? "1" : "0";
- Options["SGENABLE"] = sgenable_switch.Checked ? "1" : "0";
- Options["PADBUTTON"] = padbutton_switch.Checked ? "6" : "2";
- Options["HIDEOVERSCAN"] = hide_overscan.Checked ? "1" : "0";
- Options["RASTER"] = raster.Checked ? "1" : "0";
- Options["SPRLINE"] = sprline.Checked ? "1" : "0";
- Options["BACKUPRAM"] = checkBox4.Checked ? "1" : "0";
+ Options["YOFFSET"] = y_offset_toggle.Value.ToString();
+ Options["EUROPE"] = europe_switch.Checked ? "1" : "0";
+ Options["SGENABLE"] = sgenable_switch.Checked ? "1" : "0";
+ Options["PADBUTTON"] = padbutton_switch.Checked ? "6" : "2";
+ Options["HIDEOVERSCAN"] = hide_overscan.Checked ? "1" : "0";
+ Options["RASTER"] = raster.Checked ? "1" : "0";
+ Options["SPRLINE"] = sprline.Checked ? "1" : "0";
+ Options["BACKUPRAM"] = checkBox4.Checked ? "1" : "0";
}
// ---------------------------------------------------------------------------------------------------------------
diff --git a/FriishProduce/Subforms/Options_VC_SEGA.cs b/FriishProduce/Subforms/Options_VC_SEGA.cs
index 7f7f1fe..b21815d 100644
--- a/FriishProduce/Subforms/Options_VC_SEGA.cs
+++ b/FriishProduce/Subforms/Options_VC_SEGA.cs
@@ -61,22 +61,22 @@ protected override void ResetOptions()
if (Options["console.brightness"] == null || int.Parse(Options["console.brightness"]) < 0) Options["console.brightness"] = VC_SEGA.Default.console_brightness;
- console_brightness.Value = int.Parse(Options["console.brightness"]);
- country.SelectedIndex = Options["country"] == "jp" ? 0 : Options["country"] == "us" ? 1 : 2;
- dev_mdpad_enable_6b.Checked = Options["dev.mdpad.enable_6b"] == "1";
- save_sram.Checked = Options["save_sram"] == "1";
- console_disableresetbutton.Checked = Options["console.disable_resetbutton"] == "1";
+ console_brightness.Value = int.Parse(Options["console.brightness"]);
+ country.SelectedIndex = Options["country"] switch { "jp" => 0, "us" => 1, _ => 2 };
+ dev_mdpad_enable_6b.Checked = Options["dev.mdpad.enable_6b"] == "1";
+ save_sram.Checked = Options["save_sram"] == "1";
+ console_disableresetbutton.Checked = Options["console.disable_resetbutton"] == "1";
ChangeBrightness();
}
}
protected override void SaveOptions()
{
- Options["console.brightness"] = console_brightness.Enabled ? label1.Text : null;
- Options["save_sram"] = save_sram.Checked ? "1" : null;
- Options["country"] = country.SelectedIndex == 0 ? "jp" : country.SelectedIndex == 2 ? "eu" : "us";
- Options["dev.mdpad.enable_6b"] = dev_mdpad_enable_6b.Checked ? "1" : null;
- Options["console.disable_resetbutton"] = console_disableresetbutton.Checked ? "1" : null;
+ Options["console.brightness"] = console_brightness.Enabled ? label1.Text : null;
+ Options["save_sram"] = save_sram.Checked ? "1" : null;
+ Options["country"] = country.SelectedIndex switch { 0 => "jp", 1 => "us", _ => "eu" };
+ Options["dev.mdpad.enable_6b"] = dev_mdpad_enable_6b.Checked ? "1" : null;
+ Options["console.disable_resetbutton"] = console_disableresetbutton.Checked ? "1" : null;
}
// ---------------------------------------------------------------------------------------------------------------
diff --git a/FriishProduce/_classes/BannerHelper.cs b/FriishProduce/_classes/BannerHelper.cs
index cf2db90..431ead7 100644
--- a/FriishProduce/_classes/BannerHelper.cs
+++ b/FriishProduce/_classes/BannerHelper.cs
@@ -59,15 +59,15 @@ public static void Modify(WAD w, Console c, Region region, string title, int yea
switch (c)
{
case Console.NES:
- bannerPath += region == Region.Japan ? "jp_fc.bnr" : region == Region.Korea ? "kr_fc.bnr" : "nes.bnr";
+ bannerPath += region switch { Region.Japan => "jp_fc.bnr", Region.Korea => "kr_fc.bnr", _ => "nes.bnr" };
break;
case Console.SNES:
- bannerPath += region == Region.Japan ? "jp_sfc.bnr" : region == Region.Korea ? "kr_sfc.bnr" : "snes.bnr";
+ bannerPath += region switch { Region.Japan => "jp_sfc.bnr", Region.Korea => "kr_sfc.bnr", _ => "snes.bnr" };
break;
case Console.N64:
- bannerPath += region == Region.Japan ? "jp_n64.bnr" : region == Region.Korea ? "kr_n64.bnr" : "n64.bnr";
+ bannerPath += region switch { Region.Japan => "jp_n64.bnr", Region.Korea => "kr_n64.bnr", _ => "n64.bnr" };
break;
case Console.SMS:
@@ -75,7 +75,7 @@ public static void Modify(WAD w, Console c, Region region, string title, int yea
break;
case Console.SMD:
- bannerPath += region == Region.Japan ? "jp_smd.bnr" : region == Region.Europe ? "smd.bnr" : "gen.bnr";
+ bannerPath += region switch { Region.Japan => "jp_smd.bnr", Region.Europe => "smd.bnr", _ => "gen.bnr" };
break;
case Console.PCE:
diff --git a/FriishProduce/_classes/BannerPreview.cs b/FriishProduce/_classes/BannerPreview.cs
index 5687b6f..b8011e4 100644
--- a/FriishProduce/_classes/BannerPreview.cs
+++ b/FriishProduce/_classes/BannerPreview.cs
@@ -380,11 +380,11 @@ public static Bitmap Banner(Console console, string text, int year, int players,
switch (console)
{
case Console.NES:
- cName = lang == 1 ? "ファミリーコンピュータ" : lang == 2 ? "패밀리컴퓨터" : "NINTENDO ENTERTAINMENT SYSTEM";
+ cName = lang switch { 1 => "ファミリーコンピュータ", 2 => "패밀리컴퓨터", _ => "NINTENDO ENTERTAINMENT SYSTEM" };
break;
case Console.SNES:
- cName = lang == 1 ? "スーパーファミコン" : lang == 2 ? "슈퍼 패미컴" : "SUPER NINTENDO ENTERTAINMENT SYSTEM";
+ cName = lang switch { 1 => "スーパーファミコン", 2 => "슈퍼 패미컴", _ => "SUPER NINTENDO ENTERTAINMENT SYSTEM" };
break;
case Console.N64:
diff --git a/FriishProduce/_classes/Databases/GameData.cs b/FriishProduce/_classes/Databases/GameData.cs
index 0151396..56abdf0 100644
--- a/FriishProduce/_classes/Databases/GameData.cs
+++ b/FriishProduce/_classes/Databases/GameData.cs
@@ -41,6 +41,11 @@ private string setImgURL(string console, string title, bool useGitHub)
private string imgURL { get; set; }
public string ImgURL { get => imgURL; }
+ ///
+ /// Gets any game metadata that is available for the file based on its CRC32 reading hash, including the software title, year, players, and title image URL.
+ ///
+ ///
+ ///
public bool Get(Console platform)
{
title = null;
diff --git a/FriishProduce/packages.config b/FriishProduce/packages.config
index ca03a67..9479efe 100644
--- a/FriishProduce/packages.config
+++ b/FriishProduce/packages.config
@@ -4,7 +4,6 @@
-