From 2fbbd6a5ce0dd807a4afd5c98518e244a405b814 Mon Sep 17 00:00:00 2001 From: CatmanFan Date: Tue, 18 Feb 2025 00:57:07 +0100 Subject: [PATCH] - Removed interface console icons - Trimmed wiki files - Interface bugfixes --- FriishProduce/FileDatas/Icons.Designer.cs | 110 ++++- FriishProduce/FileDatas/Icons.resx | 52 ++- FriishProduce/FriishProduce.csproj | 20 + FriishProduce/MainForm.Designer.cs | 7 +- FriishProduce/MainForm.cs | 19 +- FriishProduce/MainForm.resx | 301 +++++++------ .../Resources/icons/consoles/sfc.png | Bin 479 -> 511 bytes .../icons/consoles/yspixel/Diskun_2.ico | Bin 0 -> 2238 bytes .../icons/consoles/yspixel/GBPocket_Gray.ico | Bin 3310 -> 0 bytes .../icons/consoles/yspixel/GameGear01.ico | Bin 0 -> 2238 bytes .../icons/consoles/yspixel/Gameboy01.ico | Bin 0 -> 3310 bytes .../icons/consoles/yspixel/Gba05b.ico | Bin 0 -> 2238 bytes .../icons/consoles/yspixel/Logo_NDS.ico | Bin 2550 -> 0 bytes .../icons/consoles/yspixel/Logo_NeoGeo.ico | Bin 2238 -> 0 bytes .../icons/consoles/yspixel/Logo_NeoGeoCD.ico | Bin 766 -> 0 bytes .../consoles/yspixel/{Gba02.ico => Lynx.ico} | Bin 2238 -> 2238 bytes .../icons/consoles/yspixel/MegaDrive2_Pad.ico | Bin 0 -> 2238 bytes .../icons/consoles/yspixel/NeoGeo01.ico | Bin 0 -> 2238 bytes .../yspixel/{Ps_pad03.ico => Ps_pad04.ico} | Bin 2238 -> 2238 bytes .../icons/consoles/yspixel/Wii_con.ico | Bin 0 -> 2238 bytes FriishProduce/SettingsForm.Designer.cs | 154 +++---- FriishProduce/SettingsForm.resx | 44 +- FriishProduce/Subforms/BannerOptions.resx | 6 + FriishProduce/Subforms/ChannelTitles.resx | 3 + .../Subforms/ContentOptions.Designer.cs | 16 +- FriishProduce/Subforms/ContentOptions.resx | 6 + FriishProduce/Subforms/ControllerMapping.resx | 6 + .../Subforms/LanguageEditor.Designer.cs | 2 + FriishProduce/Subforms/MessageBox.Designer.cs | 111 +---- FriishProduce/Subforms/MessageBox.cs | 2 +- FriishProduce/Subforms/MessageBox.resx | 408 ++++++++++++++++++ FriishProduce/Subforms/Savedata.Designer.cs | 1 + FriishProduce/Subforms/Savedata.resx | 134 +++--- .../Subforms/UpdaterForm.Designer.cs | 10 +- FriishProduce/_classes/Platform.cs | 42 +- FriishProduce/_classes/Program/Theme.cs | 82 ++-- README.md | 31 +- docs/{docs => }/assets/extra.css | 0 .../images/F6J201_2025-01-09_23-35-01.png | Bin docs/{docs => }/assets/images/favicon.ico | Bin docs/{docs => }/assets/images/logo.png | Bin docs/{docs => }/assets/images/tutorial_0.png | Bin docs/{docs => }/assets/images/tutorial_1.png | Bin docs/{docs => }/assets/images/tutorial_2.png | Bin docs/{docs => }/assets/images/tutorial_3.png | Bin docs/{docs => }/assets/images/tutorial_4.png | Bin docs/{docs => }/assets/images/tutorial_5.png | Bin docs/mkdocs.yml | 104 ++--- 48 files changed, 1083 insertions(+), 588 deletions(-) create mode 100644 FriishProduce/Resources/icons/consoles/yspixel/Diskun_2.ico delete mode 100644 FriishProduce/Resources/icons/consoles/yspixel/GBPocket_Gray.ico create mode 100644 FriishProduce/Resources/icons/consoles/yspixel/GameGear01.ico create mode 100644 FriishProduce/Resources/icons/consoles/yspixel/Gameboy01.ico create mode 100644 FriishProduce/Resources/icons/consoles/yspixel/Gba05b.ico delete mode 100644 FriishProduce/Resources/icons/consoles/yspixel/Logo_NDS.ico delete mode 100644 FriishProduce/Resources/icons/consoles/yspixel/Logo_NeoGeo.ico delete mode 100644 FriishProduce/Resources/icons/consoles/yspixel/Logo_NeoGeoCD.ico rename FriishProduce/Resources/icons/consoles/yspixel/{Gba02.ico => Lynx.ico} (54%) create mode 100644 FriishProduce/Resources/icons/consoles/yspixel/MegaDrive2_Pad.ico create mode 100644 FriishProduce/Resources/icons/consoles/yspixel/NeoGeo01.ico rename FriishProduce/Resources/icons/consoles/yspixel/{Ps_pad03.ico => Ps_pad04.ico} (79%) create mode 100644 FriishProduce/Resources/icons/consoles/yspixel/Wii_con.ico rename docs/{docs => }/assets/extra.css (100%) rename docs/{docs => }/assets/images/F6J201_2025-01-09_23-35-01.png (100%) rename docs/{docs => }/assets/images/favicon.ico (100%) rename docs/{docs => }/assets/images/logo.png (100%) rename docs/{docs => }/assets/images/tutorial_0.png (100%) rename docs/{docs => }/assets/images/tutorial_1.png (100%) rename docs/{docs => }/assets/images/tutorial_2.png (100%) rename docs/{docs => }/assets/images/tutorial_3.png (100%) rename docs/{docs => }/assets/images/tutorial_4.png (100%) rename docs/{docs => }/assets/images/tutorial_5.png (100%) diff --git a/FriishProduce/FileDatas/Icons.Designer.cs b/FriishProduce/FileDatas/Icons.Designer.cs index ed51fb8e..9b8a9021 100644 --- a/FriishProduce/FileDatas/Icons.Designer.cs +++ b/FriishProduce/FileDatas/Icons.Designer.cs @@ -70,6 +70,26 @@ internal static System.Drawing.Bitmap c64 { } } + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// + internal static System.Drawing.Icon fc { + get { + object obj = ResourceManager.GetObject("fc", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// + internal static System.Drawing.Icon fds { + get { + object obj = ResourceManager.GetObject("fds", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -83,9 +103,49 @@ internal static System.Drawing.Bitmap flash { /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// - internal static System.Drawing.Icon gen { + internal static System.Drawing.Icon gb { + get { + object obj = ResourceManager.GetObject("gb", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// + internal static System.Drawing.Icon gba { + get { + object obj = ResourceManager.GetObject("gba", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// + internal static System.Drawing.Icon gbc { + get { + object obj = ResourceManager.GetObject("gbc", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// + internal static System.Drawing.Icon gg { + get { + object obj = ResourceManager.GetObject("gg", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// + internal static System.Drawing.Icon lynx { get { - object obj = ResourceManager.GetObject("gen", resourceCulture); + object obj = ResourceManager.GetObject("lynx", resourceCulture); return ((System.Drawing.Icon)(obj)); } } @@ -130,6 +190,26 @@ internal static System.Drawing.Icon nes { } } + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// + internal static System.Drawing.Icon pce { + get { + object obj = ResourceManager.GetObject("pce", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// + internal static System.Drawing.Icon pcecd { + get { + object obj = ResourceManager.GetObject("pcecd", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// @@ -161,12 +241,12 @@ internal static System.Drawing.Icon rpg2003 { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// - internal static System.Drawing.Bitmap sfc { + internal static System.Drawing.Icon sfc { get { object obj = ResourceManager.GetObject("sfc", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ((System.Drawing.Icon)(obj)); } } @@ -209,5 +289,25 @@ internal static System.Drawing.Icon tg16 { return ((System.Drawing.Icon)(obj)); } } + + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// + internal static System.Drawing.Icon vb { + get { + object obj = ResourceManager.GetObject("vb", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// + internal static System.Drawing.Icon wii { + get { + object obj = ResourceManager.GetObject("wii", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } } } diff --git a/FriishProduce/FileDatas/Icons.resx b/FriishProduce/FileDatas/Icons.resx index f6d5204b..a11ff9d0 100644 --- a/FriishProduce/FileDatas/Icons.resx +++ b/FriishProduce/FileDatas/Icons.resx @@ -121,26 +121,50 @@ ..\Resources\icons\consoles\c64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons\consoles\yspixel\Fc_Pad1.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons\consoles\yspixel\Diskun_2.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\icons\consoles\flash.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\icons\consoles\sega genesis (model 2).ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\icons\consoles\yspixel\Gameboy01.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons\consoles\yspixel\Gba05b.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons\consoles\yspixel\GBC_Purple.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons\consoles\yspixel\GameGear01.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons\consoles\yspixel\Lynx.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\icons\consoles\msx.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\icons\consoles\nintendo nintendo64.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\icons\consoles\yspixel\N64_Pad.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\icons\consoles\snk neo geo aes.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\icons\consoles\yspixel\NeoGeo01.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\icons\consoles\nintendo nes.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\icons\consoles\yspixel\Nes_pad.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons\consoles\yspixel\Pce_02_pad.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons\consoles\yspixel\Pce_Duo-RxPad.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\icons\consoles\sony playstation.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\icons\consoles\yspixel\Ps_pad04.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\icons\consoles\RPG2000.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -149,18 +173,24 @@ ..\Resources\icons\consoles\RPG2003.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\icons\consoles\sfc.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\icons\consoles\yspixel\Sfc_pad02.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\icons\consoles\sega genesis.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\icons\consoles\yspixel\MD_Pad.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\icons\consoles\sega master system.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\icons\consoles\yspixel\Sms_pad.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\icons\consoles\nintendo super nes.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\icons\consoles\yspixel\Snes_pad.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\icons\consoles\nec turbografx-16.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\icons\consoles\yspixel\TurboGrafx_pad.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons\consoles\yspixel\VirtualBoy_pad.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\icons\consoles\yspixel\Wii_con.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/FriishProduce/FriishProduce.csproj b/FriishProduce/FriishProduce.csproj index 99488913..7c313f05 100644 --- a/FriishProduce/FriishProduce.csproj +++ b/FriishProduce/FriishProduce.csproj @@ -613,6 +613,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/FriishProduce/MainForm.Designer.cs b/FriishProduce/MainForm.Designer.cs index 38684fad..baa8e994 100644 --- a/FriishProduce/MainForm.Designer.cs +++ b/FriishProduce/MainForm.Designer.cs @@ -36,7 +36,7 @@ private void InitializeComponent() this.mainPanel = new System.Windows.Forms.Panel(); this.Logo = new System.Windows.Forms.PictureBox(); this.toolStrip = new System.Windows.Forms.ToolStrip(); - this.toolbarNewProject = new System.Windows.Forms.ToolStripDropDownButton(); + this.toolbarNewProject = new System.Windows.Forms.ToolStripButton(); this.toolbarOpenProject = new System.Windows.Forms.ToolStripButton(); this.toolbarSave = new System.Windows.Forms.ToolStripButton(); this.toolbarSaveAs = new System.Windows.Forms.ToolStripButton(); @@ -92,6 +92,7 @@ private void InitializeComponent() this.about = new System.Windows.Forms.MenuItem(); this.tabControl = new JacksiroKe.MdiTabCtrl.TabControl(); this.vistaMenu = new wyDay.Controls.VistaMenu(this.components); + this.new_project_menu = new System.Windows.Forms.ContextMenu(); this.mainPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.Logo)).BeginInit(); this.toolStrip.SuspendLayout(); @@ -142,6 +143,7 @@ private void InitializeComponent() resources.ApplyResources(this.toolbarNewProject, "toolbarNewProject"); this.toolbarNewProject.Name = "toolbarNewProject"; this.toolbarNewProject.Tag = "new_project"; + this.toolbarNewProject.Click += new System.EventHandler(this.OpenNewProjectTypes); // // toolbarOpenProject // @@ -635,7 +637,7 @@ private void InitializeComponent() private System.Windows.Forms.MenuItem about; internal System.Windows.Forms.MenuItem game_scan; internal System.Windows.Forms.MenuItem export; - private System.Windows.Forms.ToolStripDropDownButton toolbarNewProject; + private System.Windows.Forms.ToolStripButton toolbarNewProject; internal System.Windows.Forms.ToolStripButton toolbarSave; internal System.Windows.Forms.MenuItem save_project_as; internal System.Windows.Forms.MenuItem save_project; @@ -667,6 +669,7 @@ private void InitializeComponent() private System.Windows.Forms.MenuItem menuItem12; private System.Windows.Forms.MenuItem clear_update; private System.Windows.Forms.MenuItem menuItem11; + private System.Windows.Forms.ContextMenu new_project_menu; } } diff --git a/FriishProduce/MainForm.cs b/FriishProduce/MainForm.cs index a6658657..f2ef9684 100644 --- a/FriishProduce/MainForm.cs +++ b/FriishProduce/MainForm.cs @@ -112,8 +112,8 @@ private void RefreshForm() new_project.MenuItems.Clear(); new_project.MenuItems.AddRange(platformsMenuItemList()); - toolbarNewProject.DropDownItems.Clear(); - toolbarNewProject.DropDownItems.AddRange(platformsStripItemList()); + new_project_menu.MenuItems.Clear(); + new_project_menu.MenuItems.AddRange(platformsMenuItemList()); #region -- Localization -- @@ -154,9 +154,9 @@ private void RefreshForm() vistaMenu.SetImage(import_game_file, toolbarImportGameFile.Image); vistaMenu.SetImage(game_scan, toolbarGameScan.Image); vistaMenu.SetImage(preferences, toolbarPreferences.Image); - foreach (MenuItem item in new_project.MenuItems.OfType()) - if (Enum.TryParse(item.Name, out Platform converted)) - vistaMenu.SetImage(item, Platforms.Icons[converted]); + // foreach (MenuItem item in new_project.MenuItems.OfType()) + // if (Enum.TryParse(item.Name, out Platform converted)) + // vistaMenu.SetImage(item, Platforms.Icons[converted]); BrowseProject.Title = new Regex(@"\(.*\)").Replace(open_project.Text, "").Replace("&", ""); SaveProject.Title = new Regex(@"\(.*\)").Replace(save_project_as.Text, "").Replace("&", ""); @@ -245,6 +245,11 @@ private void MainForm_Closing(object sender, FormClosingEventArgs e) e.Cancel = tabControl.TabPages.Count > 0; } + private void OpenNewProjectTypes(object sender, EventArgs e) + { + new_project_menu.Show(toolStrip, new(Cursor.Position.X - Left - (Width - ClientSize.Width) + 8, Cursor.Position.Y - Top - (Height - ClientSize.Height) + 8), LeftRightAlignment.Right); + } + /// /// Displays wait dialog. /// @@ -1065,10 +1070,10 @@ private void TabControl_Paint(object sender, JacksiroKe.MdiTabCtrl.TabControl.Ta private void Website_Click(object sender, EventArgs e) { - string lang = Program.Lang.Current.StartsWith("fr") ? "fr/" + string lang = /* Program.Lang.Current.StartsWith("fr") ? "fr/" : Program.Lang.Current.StartsWith("es") ? "es/" : Program.Lang.Current.StartsWith("ja") ? "ja/" - : null; + : */ null; System.Diagnostics.Process.Start("https://catmanfan.github.io/FriishProduce/" + lang); } diff --git a/FriishProduce/MainForm.resx b/FriishProduce/MainForm.resx index 6e44240b..173eff4a 100644 --- a/FriishProduce/MainForm.resx +++ b/FriishProduce/MainForm.resx @@ -120,6 +120,24 @@ 469, 17 + + + NoControl + + + + 0, 0 + + + 175, 175 + + + AutoSize + + + + 0 + Logo @@ -132,18 +150,15 @@ 0 - Fill - 0, 25 1008, 479 - 6 @@ -159,33 +174,6 @@ 0 - - NoControl - - - 0, 0 - - - 175, 175 - - - AutoSize - - - 0 - - - Logo - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainPanel - - - 0 - 17, 17 @@ -211,7 +199,7 @@ Magenta - 29, 22 + 23, 22 new_project @@ -453,9 +441,105 @@ 115, 17 + + CtrlN + + + new_project + + + - + + + CtrlO + + + open_project + + + open_recent + + + False + + + CtrlS + + + save_project + + + False + + + CtrlShiftS + + + save_project_as + + + - + + + False + + + CtrlF4 + + + close_project + + + False + + + CtrlShiftF4 + + + close_all + + + - + + + AltF4 + + + exit + file + + False + + + Ctrl0 + + + import_game_file + + + - + + + False + + + CtrlG + + + game_scan + + + False + + + CtrlE + + + export + project @@ -2733,7 +2817,7 @@ toolbarNewProject - System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 toolbarOpenProject @@ -3059,6 +3143,12 @@ wyDay.Controls.VistaMenu, VistaMenu, Version=1.9.0.0, Culture=neutral, PublicKeyToken=null + + new_project_menu + + + System.Windows.Forms.ContextMenu, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + MainForm @@ -3093,12 +3183,36 @@ - + + extract_wad_banner + + + extract_wad_icon + + + extract_wad_sound + + + extract_wad_manual + extract_from_wad tools + + check_for_updates + + + auto_update + + + - + + + clear_update + updater @@ -3153,124 +3267,7 @@ help - - CtrlN - - - new_project - - - - - - - CtrlO - - - open_project - - - open_recent - - - False - - - CtrlS - - - save_project - - - False - - - CtrlShiftS - - - save_project_as - - - - - - - False - - - CtrlF4 - - - close_project - - - False - - - CtrlShiftF4 - - - close_all - - - - - - - AltF4 - - - exit - - - False - - - Ctrl0 - - - import_game_file - - - - - - - False - - - CtrlG - - - game_scan - - - False - - - CtrlE - - - export - - - extract_wad_banner - - - extract_wad_icon - - - extract_wad_sound - - - extract_wad_manual - - - check_for_updates - - - auto_update - - - - - - - clear_update - + + 1373, 16 + \ No newline at end of file diff --git a/FriishProduce/Resources/icons/consoles/sfc.png b/FriishProduce/Resources/icons/consoles/sfc.png index 4302105f640f0d803393bfdf6670ad6bd15e2b75..0d3ea474d5e3cb5185bf987bb6b2e608d3a23267 100644 GIT binary patch delta 468 zcmV;_0W1FB1OEe%83+ad001BJ|6!3KAb$yPNLh0L01mWdERzf1!Q5=!ZnR_Wgm7%!Lqw5wx-vwP}|m zEpl|`jX5*uXzyK}91&vhz~!F%-o5ADdwCv=&>woYpjum?&w;ky#>?{?VzDS4nt!HA zUe^us)oKmFg?V`4<2gIx$TKEzlPkdLcG2l{VOiXIgQohu9*->^bKkXam`)&(*b`SC zFJ-vEd%cE}j78izt80Pn@EWe4e1pKDFd-n<8&H}GRE2>lDw*IK)6ilq%IP~4CIl3@ z4z(fk!Uiu;$l5KH8-xDChFK#_wSUA^>Hw+azPOrPVj-W$-EEGzX&7koaReS8$|#ra ziT}HUZ}|&NRVLojG%%(Tcb+>HrWzrcj3b?ji>vVwcB5M``0oo#OITTz5RpP;q2)zL zkr3u)XRxukjvg1XG1dXo7%G+5!8hfxVVKmc-qz{$>c=Mn!2tX|KaMg-L%`9(vKb9cQ!0!u<&d*fnm!Yk^-OKn2x11*-x80000< KMNUMnLSTY}q1v(l delta 436 zcmey*e4lxOBnLAC1A~SxfAB;_h59)GJ|V6^{{R2~PhUPgXUUvdi)OX z)|4_Vf1R11dH>P2`5OBT7a`ecNi4R%? z+yq6A|M|cFX5+M`-LHeciuv{^Ha{?Gu@WiPn8Pr6rFC-8=baNcxTiawzFK9>v`nzbfw(JTIA?{8&@e^n%1Q_yE7*0r>=f=mU5_FZ_XH4sh=gadCHJuf4GXawt+^ zBYVd)V|%lasse_d-3~Nwu-^dJ0PbiIg?k#za}3>-;$&h9p8>DOfamvs+m`_M^al6v zsEn6~VPy$F@$;V6eXTwzyVWl>=qzW{S)ch8)_Yn!+Rs?(sQGi&x{j7}{)7L!8f&dy zFZF;uGM4n;;z9`Umya$-tR*kIxHdLLHxYShYdsRHb+2~N-Ex~8Pel|%773Kjou}(F zHIA?AH8sc4Fz05gsX>u(91|=^^(#qaD9EM`7?VgAqnvEg0pqUHEw-Tab=V`i_s*yH zajLz|I^Umf(&rP+!Np}X(`|WcL32IUuje(oSqQaX`t%1g{RZS1`>{V*ddv_9U`L=o b0$U!855x`hmqHKbM&%QKoj-t^d|3h~iRE=n literal 0 HcmV?d00001 diff --git a/FriishProduce/Resources/icons/consoles/yspixel/GBPocket_Gray.ico b/FriishProduce/Resources/icons/consoles/yspixel/GBPocket_Gray.ico deleted file mode 100644 index 02424c43c6e40cbd228288dfd2e9c5ba1a74ac2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3310 zcmeH}K}cg)6hNSnTu%+@Tr(-s#+LlqCyL4+(Kp^(3+l@<(S;nL2c z3?Oj1`+?h^}IJ<+l1^&vKM#FaMgeMdD{7W9^1>)>U1yzv5ER| zC;Qs$X*Qep`Hp=!V|ww%ft6Qx@vW84UHq~0=4fqgecN9@e7~XCf7bWU8;ZrB%~;3m z4?E;oXU$uYd{^W%^eGzoSjxIj^@s2|=VTzxW9xjwH{`uIB#AiO)?sPdb6z{CN&B~# z;t9b@(cL3BCkhgwMgJ;S=z2c!gJZg;#imSNL~aCtUknJ6svAMa%PcRXlhXz7Ai7 zH?xiG}Vkz%?bE6ya(^X*Ws)1CHNA25k3c>hEKr9 z&4&eE;T2xt6<)a?w(ErL+Go3V*scuQwYVtKhWFrI_&R(Qz63wy_(&7J0bhnMz-Qo7 z@I#Id^SV-j--cg>pNEgZ4=a$XP51_U8NL8dr8UKaJzOA{zd;rCCFd6ih-I;^=B zK4^3rxxO!c!ndu{`*J-1wA2fVUg+rnVDc-(T=PsL`7Z@+35kEgSH`i=7LwWl+e*Vk3OQs0qJ@0O`WtbwA zzv{1U^Gp%S+wL>v@)rr-pWmk@Z3{&F(0KbN=%Mi|%ggDs`Q1ryJo&H$=3iO9d_5?@ z|L5(IFs7x{Cm{Fh6E1J4ek=DRP~YC34!S_zZhX)To#=*(Kp=k_EB*x%I zObST{r<)8DB+eJ7yW{TOe%}NCps;jopEobuz0c=;czM7-(h_5JRXi^1Vp;kq=?jx3 zePh~n8;9@Hr^&<8^Yx+ZAfG-wUv#@&bq8H}zkiZDlu3tV3?`kE3&VmpHu`aXF4r?^ z4~^=sQKe^;?-)5voSi2Fsdg>xoJxhNv{95h!uRnld;?#_m$4=07Cwj1;vIYjPu+GK zU&mMQdAx&74}=$9c;Qvl2;axI@C|$wU&fd4TN)^b&*B|?2JhjAco*NpckoSo6MurQ z;dk%_{083O4c_1l-rx=1jsfGEamuJNimCVTL%fUc;X8O+y@@_S*U&rY0(yh`BYYp< z!Z+|$d>LQDZ{c(JEZ)Iq@YHR$@pXI!pT|3R;a_)$u8r`0d<);eSMg!ckl)L2HxNe-rx=1;0>Mw4LHy>AJ-`#SCx;eSd={c z5bxr9_zu2_U-0$O2;axI@C|$wU&b%^`cT(Z8(+s)@Oiw0U(_JijPQMY3*W%gX;a3} zZ;)#|{1ETrd-x8X<}7HCOC#FMIGm*cXxNXy}i}V&5f?Eu5@{M zsf&vXot>TO`1n{yM@QP<-`C#Wo_2S4wY|N~&q`jKo10o+U)S2&npRd;_(uE(k<5+h z8&8sWK_m&}F&E9obea6@`s`gS`O}p+4xb~Q?n?7v2qF7oYZ%6nU9kCa6osVi^;57U z*=3s#07*P@NoWtoqWnM#sK-g4UZ0!9uB3TebUZg7r}b?MTd?&bdlD{Y z>njN!^E`)4tqNe>~;?5 zhvPBzUIlBDm$kz8?d{75h?hIU(5lA>Y5%_w{Oz6_zVxXpy*sr3KKw=4eRg)K;YlCT J-)M7Q=?@N?xRs1+E4IAj!pwuvnWNT9;$ z%oQO7sfi%??8?H04B>F4q%f*hlA|CHiW>=h+~oIWSJuiOxm@6q{8w*2_WkC~%-hjQ zB2)4}W@l$b^}&?LN7SK^*YCV1@&)%oA@z#<@L1&2hj6r&2w_vg4OF$IS9qgGHyjZ@ z;y7MKNmHuTDz!R{{fIHz!npL77V1_N=bpy9Q@AAV53i8vgTRb;|BDV zH+nyfwy3km$1k-0^6F}ESKsGG<8oF~ePm4a!9O?6QwaM68|BF%rz6dd8n$-4{gM+} z7#EGdl_&T~*^TR_(rN3k8zU!!p>E$#kS3{6uz>Y%4Q9-6IPm=2k{!%!0qolTU|Z74 z8{a>4oE*Kc3&tDY=V%aqb;Ee$`;4OhOYU>8&$K!|{cLpVg|K+P! zFTFe7dTiSg-g>;vrPDq?81>WseCfimDt+Dm=1Mj0zoq}%w;k`Dq49j91&-D?*}vYN zm%qUCOMCkr0Rub!@vav>m)p&W3`IUB;qPNJ*rR{bn0sdOoO2S8^Uzja!8>Fu2PZua zx2-5?+H+oQRHgs(_fqd0sklb+btB1|k?5h3aEbSUTCpLLITA_iiNsPOk+{^G@Tc%) z_yT+iejRoddjh`%zX%_OpMxiEr2?OaPr^sx!?5xigBNkG(F6aEyw46jPTt5$he zJ%L|>UxW|C&%yWMUHCeDjrgh(@k{VU_zZjkJ_a9wH}D4Dz#E@8@UOWVTt{4cTq&-& z<@@k1d>y`K2f zm^yKP`Vl@4pM;OXhi!J0oy-nj^d|giMNApK0H1RnFhp+hYlRj?)XraePH9kJ@O?xYE%91n%+YTEq z|29FEA1A2JZ&$^*l4qWzsY%ovN?4O~PlD?FR#vb)mc*i17`rb)mzS4vad9E%=jU>E zb|xn$CvtFbAf-}C_V@RtSS-rU&W>a<8QI+2ltdySYinx~i^XJld08Tnh%78D$o%}g zOixcs|H{aB&!6)>cGwB?>XB!DTT$v#cz@|G-z*k(TY+K5om8vUX|tDW-SoS^PXg*^ zF|PaDANoNS2##;{L|U#10^1%WZS{IR-wmW8CdPXM$7QEIIlr4oxLlOi z`pfZ96aJ?gH}xj}#?A5FU&qp5|1bZC8}EF5-LdZ4|IGwX=I7}x1^uIc62Us)@7yi_ ZQ0f=?A~@2vFU literal 0 HcmV?d00001 diff --git a/FriishProduce/Resources/icons/consoles/yspixel/Gba05b.ico b/FriishProduce/Resources/icons/consoles/yspixel/Gba05b.ico new file mode 100644 index 0000000000000000000000000000000000000000..a68733e5cc06bbbb5b863c0354ffad8a3a600a0c GIT binary patch literal 2238 zcmdtkF=!%L7{Kvwxr5m%Ff1%2)i#E0W1q04v9d|*ZG|+#7B-tIa3Bg6X%4~`=dp~H zO)y*|DHIMa)l|V^QAjm2dGjyO^S7x72_LP_;3BfN$d) z_zJ#=Kf)j4_o?O{)yz=MZIM5I`y^(B_wjvv7w_Rcd=p>Am+*Of*1jv`H+X|Lc!M{1 zHZ){IS3ItB9#@6ORVauk{LeqV7a!lpckv#6!|Nks{DAyzd;?#>7x5cjAM*Or!PoI+ zd=8(%Zz_;)#`pogjc?$ov?=1hUm)Ko{0Q&k`}i)N;%q38Pa!&tI-|_UF*1xz1=3o} z-QAts-rma1&5c}NU(4m?rFfnv7Z(@OY&PZW>`bcFs+^phNU2nko$1u(ccUnXbwWvI%Px{o(dl#%j{+NCZ!^{B3-X{`5=6nPr}c0$ zWxeaNzSU~EAsHT?R@#i>yDlN>SF0hYVh}rQ^_9|&R!Z4utyZ)3<)hWIAW(r)_v+qJ zj!L6JVDIWc9z%Dng^#sh5q;j*V;GY4YYQLOxBLIS;&1nQ>-}K<6#4L(x}Dm89sWhL Q>pznx{cW~>m%p$60!6qt?*IS* literal 0 HcmV?d00001 diff --git a/FriishProduce/Resources/icons/consoles/yspixel/Logo_NDS.ico b/FriishProduce/Resources/icons/consoles/yspixel/Logo_NDS.ico deleted file mode 100644 index 2dbf4e4c9a888cced27e1be5284ad006609e804d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2550 zcmeIyF-+S)7>41Gih&8ShNUcySmQmYW8$I860&=Z#Ny2ho)A+ad0<2gRaH4t78JIK zA(1*Tc|w^IiM3Xi78UjSp3|sca4WSdclpou-Q&ag93gG!jdpf+WZV9RROPt0C+4^G zX-j&~+&*(wFwOiXqcqOPmxf5PM(co%Q*25;~NZ}0|h`;2}?KcffqR_-(W z9G~JR_z~Xjo}goNi1yJQ+GYO*eu^L9`}hFg!ME{Ed>voIJNOEoeTPGQ58uT%@D5)1 zVmhR@z)$f5d>q@CI-2 z25;~@(2NJV;&q+zx&mHTt0iUlIX=Zt@FRSJFZuasfuG_B_&z?sckm@YANEZ(#P{%B zd;{;`%K}Qx0zbtM@O?ZjT4B+>c#x#Bq1$;pYrFx1h}k$m6R;o+e?&(p!dfn3*BwOZBg z?yk1CxA{fn?Y`L73nk0<_fJ6aZmx^#uh)+fcp;x+gpagTTrA%I96Y)G_2M;wk_3M6 WpXNb2&g=N$@BNpx_pRIi?C}%6h`h`I diff --git a/FriishProduce/Resources/icons/consoles/yspixel/Logo_NeoGeo.ico b/FriishProduce/Resources/icons/consoles/yspixel/Logo_NeoGeo.ico deleted file mode 100644 index dda6e6d6119b4d0281d2ae1f3c800a2707d618d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2238 zcmajhF=!)46vpw-eNJ)Sy^C#3YX?MLI|r$ zjggCha3MhoS6dkshXgKC30Hy0p8Vg;N_%&S$S$)x``&Nf%#I|Gw88n|gSfudZ?C1d zl765O(oZyt+tGaGZ{f0$_nWelyuaj~;c%$oWT^QczmjXp`BQQZ<6G!B0`tF}e);%O z>D;M5b-GNQY9pt^fm8H5E}?ZNQsY*tUPLQDJG{d?yu&-Z!`nIGyyd*&taBcFKgUn;DSm_>;H`Rs?xGv$D!Pm= zQGbRX<9qlHzK*ZpPw+?hef%E2h>!5p?f3DQ_!|BYU&IUl?e4H^GyE9e!*}p?d>`n|thLk==~&bNm#a;z#%aKEWsWF1~@U;>-9F-r*hI;T_)L9i9bESkNsW*A*XE zosaAISeoOf_!K|F5AX?o&DTdW{21TEckp$51;6I&L)}z;{3X7IKg1XD>ozELGyE9e z!*}rPw5#C%dxKIp$4~JoeuN+3*_<^Sl(G?h+9j<o(}==}C`|k9v4`(Ea_r z?(Xh%b9194NpyXEt!}rg^Ye2x8V#MDovB)_>h$zf<#JgE2L~#ZO4{As)z;RQHa9o< zM&!pLbhBF?_q{yI;_`<~{ZC*a7stzjaU5TKU1CAj=i`>tqSyN5zL;YnOEbQ0H7;WN zE`Q1^__T}Leq=zd6|XAzx!WQimOzmgE05MCyMwnuMR5EkKSc7`1A?{_#7!86YXpl3QG|3Jduz5v{pURwk3E0 zE9)#^Q5)pbQS_d!z27op9rp|l&Qn|A^3n4Ch_V8Hu0_Z*fpu2iKR7Gz^Uqm6dLN$u zB%1Be;$2km%0t4oRu0mBcy{&m`Bn1U4Ebd`yNCHH?`!Sw;e^rlY`yL5MY37HOt1Q3 z-)zJx6dqQ!3Olx&|4M%w$fx!=yJXR?l5YOSx#os@k$xue<6lx?F1`6IeLs}Gv)1G< egf)f6ZT->Atlfv%_|Md`npWH9u(@nboBJR5zGgoF diff --git a/FriishProduce/Resources/icons/consoles/yspixel/Logo_NeoGeoCD.ico b/FriishProduce/Resources/icons/consoles/yspixel/Logo_NeoGeoCD.ico deleted file mode 100644 index aa46a4fddba0f7029204c5160223e2e03fd927a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmcgqp$@_@6uhw}2ne9COd^pa2=)Pd5()hSeq{*~Q-SP1fJA~Lfl%(cbs!KZu6ytG zde`+eDUfj##R$T=1B_XxjDk@zG8ksSQcI}aiCK!ATU!@qPT`zml@Q{G5Hw?OXi4e+ z*bDDtdy!Y|g0v5VPa_@)d#0nh<^3faCH_hC%>?0Tj%Kn4Y6`ZT^H$Q&2rw<{}jG~uXylv+^{)bu-u+7 f={gK@3zPlS)d;Y2WNwZ8^hEa>FuVsl`F79?ouH^o diff --git a/FriishProduce/Resources/icons/consoles/yspixel/Gba02.ico b/FriishProduce/Resources/icons/consoles/yspixel/Lynx.ico similarity index 54% rename from FriishProduce/Resources/icons/consoles/yspixel/Gba02.ico rename to FriishProduce/Resources/icons/consoles/yspixel/Lynx.ico index 52797e19d7794f714fcdeedd00163bbfe3128fa8..22f9b4d86c6811fbe783875592db45f48e18364c 100644 GIT binary patch delta 583 zcmaJ;K}y6x5bPui>otNWeTX0m9{1+e<9hHL@ec!nUl0})@5?^ItFU+uICgS2R@G!; zM6idMp{uH^dy;Lvt)Cu?>fUa`rg*4^_!?H_x_Td;UpD1g8Lk%BO&1aFHVb!RoeXEw*p;#vG~A4E4h=PD1bqnD>Ubr_yS`s(5_4|l^X zfi?*n#)HoC6vs|_v66L~=Au7w0i2_Q2ALngScXD1ufFiAtP2S#PM|yc_JUtIPjGfO zfTdoLcl~*3`yNh-L(?yfDS`Hjw7W#tJF5&YCII zYQnkJQc4uiK*g>3r*Ld(QP9#gRBAp*Eel7RV-1A5cUpBcdR6=5c=I`0{o>!@4ToMb T7N~>K-a37t2P?+Z?Re`CUWe!X diff --git a/FriishProduce/Resources/icons/consoles/yspixel/MegaDrive2_Pad.ico b/FriishProduce/Resources/icons/consoles/yspixel/MegaDrive2_Pad.ico new file mode 100644 index 0000000000000000000000000000000000000000..01d34767733e08614379cd289f3dc8ace90217ec GIT binary patch literal 2238 zcmeHJziSjh6#jN*cXGEo`=hwA*j-7$Mgvy}Cm2Yf5Ja0p0!AVJK!RW)C>XE_xx+#W z3mYMY{sAiZHyE_AjGd6ifC_?5KoJ{nd~Y_JL@xyU+_$`$-S>U(&3kW(JHVr7Vgj@_ z@Vo&W0&tX!TsTF>en#JS+t6~XGmVp-Nt`<~h1u>59xdO)!^Jyz`|1T2E?vOQ?i4;h zy^opG9W32iz>O;x(QY4x=LuZCI*T70>-he09bZ4Z$IE9cIC1<42H(EG{

mc!S$d z)^L6PJm%-l;@VsnlkF1L+Mzl|j?n~06F6`a5JK$LbL|#V%3+0YZi=J5EX&CJokB$9 zEF~otGS7n`D9kQ}D74mjo|lq%qFeN-NwEc{16EXg(8`lEO>|L17qVbpZ}EAOsVqr+ zb}+-y3)s|FvgqpZ-qNwhBnL4Pa~&NGW1`0Q79%vv$y{%+l`c RHSKI`kFDLjOE164>>seFf|&pS literal 0 HcmV?d00001 diff --git a/FriishProduce/Resources/icons/consoles/yspixel/NeoGeo01.ico b/FriishProduce/Resources/icons/consoles/yspixel/NeoGeo01.ico new file mode 100644 index 0000000000000000000000000000000000000000..4d84a7aaa6c842fca2144fcf52292dd85c377050 GIT binary patch literal 2238 zcmb`{J!m397{>7@aBv65<+=k?rP*+;_J%9f%Es8+3Tf=DtWqjiqzoyJ<5(-3U^+>m za7C)Ef>qW770O#4DR z5QCK3oA9#wIoRl{Mv(hjZFS+7uDac>x`VFfKfcME8?{G9b` z@A-U~*Har`$CvRLyo2ADAkU2PeS8bwz>{fH#P3d!XXf}3-oy9s9X!d|lOT^ov}tu( znUFn%G zxm-@Cr>9D#QaU*~(b3V74i67C|7rB~`kKGv8efQA*Iw+`YrE8NEB5YxmBp^IF}c61 z#N(6cbUJyW@%V5!^oOs+!;lt>6^TD@#}x#-f#g3; zV9CBX^77`ANa6ab7ffWVOPJ`Pops zAfx$b_G_|fj*9&V6rG(vn??KHygtXLzlr;N@bR*-{^qos{rIN;VZ_){OSEmrBor4aCT96k9_|XX1Qthtxn8-DJgFm fk@*zwkIgPve`@x@9@pj*Hm|oxc%u8(U)JXzC+FfZ delta 299 zcmZ8bu?@m75d0L0BDx5AT2^2QHlSbuR>%-u1c^TTASL#{(7Q-MxU&=_a`OA_yZf_; zZs;DTI<)n^PbQ*MjLBR!aEs)j!;oxia7%zfcbyV+^FM%~&RA7L77Y3WjxnnBrhJtb zB4e@OMk5UQBK*lbW6Pz@UgW|QeO&c*ER!)#M9z;GduRF)>yAbSnc>_VDi4?DSjFeP Pc~!e*5n=V8aBHt$%oNN` diff --git a/FriishProduce/Resources/icons/consoles/yspixel/Wii_con.ico b/FriishProduce/Resources/icons/consoles/yspixel/Wii_con.ico new file mode 100644 index 0000000000000000000000000000000000000000..2eb72727c07ccd2b9a06b69136738ed723849990 GIT binary patch literal 2238 zcmc)JL5Lew9LMqBf?yA_G9HB8gS23RH`!bSVYh--(qL&WyFo>|24N4Wix3bR5pr6j zO48;K%C;^&)G8B1VlUZKBS->^tf+HZ0@6hG;>1iR5D%iy@63V)**6wMe2@R^F#pec z^Phj-N^{JUC&l%IK06^jDd`!4M|y#Xo=2nlNc`vMGWX!Vs%VmrFAr|I-LATWu7bVW z*h^)fl+&CRP&5VJ)>;LDCOd!Xbhyvu2gL53B4|5^72Ob zKE8#o|bX80)AE7{ifdj{57q=A)R?q zdg?Ski|0{Kn|f;a5B3;0$1S^P4737^6*-~;>+ z@8Ns+4&KGnjsc&!TfrCcIeZ3h@CI-225;~NPeB6;+NGc-1(hi%PeB2Gi1+Y4dvoL7w{Y(on`-J_FrQE6n+8k;oJBczJ$->Q+Qj0JTt=g@hv?4 zAMNSW=7+j=b?ev$c_zRQ@gBa%{vGzGIhF=_G@?z^h!T+{QiQERVHoQ0@K6T_2io7? zSMTm!efz}?xvs07ogFnA4Q*|0sZyzEb8}P0Vo_^rYs%$vT3K09CX-P*oz~*wqUPu4 zIROtlg1^S`E1anH28s1e|J8aYY7WEJ zA7}bYG_Co-nSL{+Mb`C!6Zm|9HSah+Gbta20Q>sTaRBzbANUY^-noCDBbJbl4`4!m zHcMFVJI-X1ln-Z<$t<+K-=D<8p8tpadACmu*7eVZemoMsFZzC4e~S6jzp?b literal 0 HcmV?d00001 diff --git a/FriishProduce/SettingsForm.Designer.cs b/FriishProduce/SettingsForm.Designer.cs index fdf7832d..22945dcd 100644 --- a/FriishProduce/SettingsForm.Designer.cs +++ b/FriishProduce/SettingsForm.Designer.cs @@ -78,7 +78,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_note = new FriishProduce.ImageLabel(); this.vc_pce_region_l = new System.Windows.Forms.GroupBox(); this.vc_pce_region = new System.Windows.Forms.ComboBox(); this.vc_pce_system = new System.Windows.Forms.GroupBox(); @@ -123,16 +122,14 @@ private void InitializeComponent() this.browse_bios_psx = new System.Windows.Forms.Button(); this.bios_filename_psx = new System.Windows.Forms.TextBox(); this.adobe_flash = new System.Windows.Forms.Panel(); - this.flash_zoom_vl = new System.Windows.Forms.Label(); - this.flash_zoom_hl = new System.Windows.Forms.Label(); - this.flash_zoom = new System.Windows.Forms.Label(); - this.flash_zoom_v = new NumericUpDownEx(); - this.flash_zoom_h = new NumericUpDownEx(); - this.flash_anti_aliasing = new System.Windows.Forms.CheckBox(); this.display = new System.Windows.Forms.GroupBox(); + this.flash_anti_aliasing = new System.Windows.Forms.CheckBox(); + this.flash_zoom_vl = new System.Windows.Forms.Label(); this.flash_fullscreen = new System.Windows.Forms.CheckBox(); + this.flash_zoom_hl = new System.Windows.Forms.Label(); this.flash_quality_l = new System.Windows.Forms.Label(); this.flash_quality_list = new System.Windows.Forms.ComboBox(); + this.flash_zoom = new System.Windows.Forms.Label(); 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(); @@ -159,6 +156,9 @@ private void InitializeComponent() this.vc_snes_patch_nosuspend = new System.Windows.Forms.CheckBox(); this.vc_snes_patch_volume = new System.Windows.Forms.CheckBox(); this.border = new System.Windows.Forms.Panel(); + this.flash_zoom_v = new FriishProduce.NumericUpDownEx(); + this.vc_pce_note = new FriishProduce.ImageLabel(); + this.flash_zoom_h = new FriishProduce.NumericUpDownEx(); this.vc_n64_options.SuspendLayout(); this.bottomPanel2.SuspendLayout(); this.bottomPanel1.SuspendLayout(); @@ -197,14 +197,14 @@ private void InitializeComponent() this.bios_neo.SuspendLayout(); this.bios_psx.SuspendLayout(); this.adobe_flash.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.flash_zoom_v)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.flash_zoom_h)).BeginInit(); this.display.SuspendLayout(); this.flash_strap_reminder.SuspendLayout(); this.flash_controls.SuspendLayout(); this.flash_save_data.SuspendLayout(); this.vc_snes.SuspendLayout(); this.vc_snes_options.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.flash_zoom_v)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.flash_zoom_h)).BeginInit(); this.SuspendLayout(); // // languages @@ -597,15 +597,6 @@ private void InitializeComponent() this.vc_pce.Name = "vc_pce"; this.vc_pce.Tag = "vc_pce"; // - // vc_pce_note - // - resources.ApplyResources(this.vc_pce_note, "vc_pce_note"); - this.vc_pce_note.BackColor = System.Drawing.Color.WhiteSmoke; - this.vc_pce_note.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.vc_pce_note.Image = global::FriishProduce.Properties.Resources.information; - this.vc_pce_note.Name = "vc_pce_note"; - this.vc_pce_note.Tag = ""; - // // vc_pce_region_l // this.vc_pce_region_l.Controls.Add(this.vc_pce_region); @@ -947,59 +938,6 @@ private void InitializeComponent() this.adobe_flash.Name = "adobe_flash"; this.adobe_flash.Tag = "adobe_flash"; // - // flash_zoom_vl - // - resources.ApplyResources(this.flash_zoom_vl, "flash_zoom_vl"); - this.flash_zoom_vl.Name = "flash_zoom_vl"; - // - // flash_zoom_hl - // - resources.ApplyResources(this.flash_zoom_hl, "flash_zoom_hl"); - this.flash_zoom_hl.Name = "flash_zoom_hl"; - // - // flash_zoom_v - // - resources.ApplyResources(this.flash_zoom_v, "flash_zoom_v"); - this.flash_zoom_v.Maximum = new decimal(new int[] { - 750, - 0, - 0, - 0}); - this.flash_zoom_v.Minimum = new decimal(new int[] { - 100, - 0, - 0, - -2147483648}); - this.flash_zoom_v.Name = "flash_zoom_v"; - // - // flash_zoom - // - resources.ApplyResources(this.flash_zoom, "flash_zoom"); - this.flash_zoom.Name = "flash_zoom"; - this.flash_zoom.Tag = "zoom"; - // - // flash_zoom_h - // - resources.ApplyResources(this.flash_zoom_h, "flash_zoom_h"); - this.flash_zoom_h.Maximum = new decimal(new int[] { - 750, - 0, - 0, - 0}); - this.flash_zoom_h.Minimum = new decimal(new int[] { - 100, - 0, - 0, - -2147483648}); - this.flash_zoom_h.Name = "flash_zoom_h"; - // - // flash_anti_aliasing - // - resources.ApplyResources(this.flash_anti_aliasing, "flash_anti_aliasing"); - this.flash_anti_aliasing.Name = "flash_anti_aliasing"; - this.flash_anti_aliasing.Tag = "anti_aliasing"; - this.flash_anti_aliasing.UseVisualStyleBackColor = true; - // // display // this.display.Controls.Add(this.flash_anti_aliasing); @@ -1016,6 +954,18 @@ private void InitializeComponent() this.display.TabStop = false; this.display.Tag = "display"; // + // flash_anti_aliasing + // + resources.ApplyResources(this.flash_anti_aliasing, "flash_anti_aliasing"); + this.flash_anti_aliasing.Name = "flash_anti_aliasing"; + this.flash_anti_aliasing.Tag = "anti_aliasing"; + this.flash_anti_aliasing.UseVisualStyleBackColor = true; + // + // flash_zoom_vl + // + resources.ApplyResources(this.flash_zoom_vl, "flash_zoom_vl"); + this.flash_zoom_vl.Name = "flash_zoom_vl"; + // // flash_fullscreen // resources.ApplyResources(this.flash_fullscreen, "flash_fullscreen"); @@ -1023,6 +973,11 @@ private void InitializeComponent() this.flash_fullscreen.Tag = "fullscreen"; this.flash_fullscreen.UseVisualStyleBackColor = true; // + // flash_zoom_hl + // + resources.ApplyResources(this.flash_zoom_hl, "flash_zoom_hl"); + this.flash_zoom_hl.Name = "flash_zoom_hl"; + // // flash_quality_l // resources.ApplyResources(this.flash_quality_l, "flash_quality_l"); @@ -1039,6 +994,12 @@ private void InitializeComponent() this.flash_quality_list.Name = "flash_quality_list"; this.flash_quality_list.Tag = "quality"; // + // flash_zoom + // + resources.ApplyResources(this.flash_zoom, "flash_zoom"); + this.flash_zoom.Name = "flash_zoom"; + this.flash_zoom.Tag = "zoom"; + // // flash_strap_reminder // this.flash_strap_reminder.Controls.Add(this.flash_strap_reminder_list); @@ -1241,6 +1202,45 @@ private void InitializeComponent() resources.ApplyResources(this.border, "border"); this.border.Name = "border"; // + // flash_zoom_v + // + resources.ApplyResources(this.flash_zoom_v, "flash_zoom_v"); + this.flash_zoom_v.Maximum = new decimal(new int[] { + 750, + 0, + 0, + 0}); + this.flash_zoom_v.Minimum = new decimal(new int[] { + 100, + 0, + 0, + -2147483648}); + this.flash_zoom_v.Name = "flash_zoom_v"; + // + // vc_pce_note + // + resources.ApplyResources(this.vc_pce_note, "vc_pce_note"); + this.vc_pce_note.BackColor = System.Drawing.Color.WhiteSmoke; + this.vc_pce_note.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.vc_pce_note.Image = global::FriishProduce.Properties.Resources.information; + this.vc_pce_note.Name = "vc_pce_note"; + this.vc_pce_note.Tag = ""; + // + // flash_zoom_h + // + resources.ApplyResources(this.flash_zoom_h, "flash_zoom_h"); + this.flash_zoom_h.Maximum = new decimal(new int[] { + 750, + 0, + 0, + 0}); + this.flash_zoom_h.Minimum = new decimal(new int[] { + 100, + 0, + 0, + -2147483648}); + this.flash_zoom_h.Name = "flash_zoom_h"; + // // SettingsForm // this.AcceptButton = this.b_ok; @@ -1249,20 +1249,20 @@ private void InitializeComponent() resources.ApplyResources(this, "$this"); this.ControlBox = false; this.Controls.Add(this.bottomPanel2); + this.Controls.Add(this.border); + this.Controls.Add(this.TreeView); + this.Controls.Add(this.panel2); + this.Controls.Add(this.panel1); this.Controls.Add(this.adobe_flash); this.Controls.Add(this.forwarder); this.Controls.Add(this.vc_nes); this.Controls.Add(this.vc_snes); this.Controls.Add(this.vc_n64); this.Controls.Add(this.vc_sega); - this.Controls.Add(this.border); - this.Controls.Add(this.TreeView); this.Controls.Add(this.vc_pce); this.Controls.Add(this.vc_neo); this.Controls.Add(this.default_injection_methods); this.Controls.Add(this.bios_files); - this.Controls.Add(this.panel2); - this.Controls.Add(this.panel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.KeyPreview = true; this.MaximizeBox = false; @@ -1323,8 +1323,6 @@ private void InitializeComponent() this.bios_psx.ResumeLayout(false); this.bios_psx.PerformLayout(); this.adobe_flash.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.flash_zoom_v)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.flash_zoom_h)).EndInit(); this.display.ResumeLayout(false); this.display.PerformLayout(); this.flash_strap_reminder.ResumeLayout(false); @@ -1335,6 +1333,8 @@ private void InitializeComponent() this.vc_snes.ResumeLayout(false); this.vc_snes_options.ResumeLayout(false); this.vc_snes_options.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.flash_zoom_v)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.flash_zoom_h)).EndInit(); this.ResumeLayout(false); } diff --git a/FriishProduce/SettingsForm.resx b/FriishProduce/SettingsForm.resx index 6119d6c0..26f6a440 100644 --- a/FriishProduce/SettingsForm.resx +++ b/FriishProduce/SettingsForm.resx @@ -584,7 +584,7 @@ $this - 8 + 2 Default @@ -803,7 +803,7 @@ $this - 14 + 4 12, 150 @@ -848,7 +848,7 @@ $this - 5 + 9 SD @@ -995,7 +995,7 @@ $this - 2 + 6 True @@ -1091,7 +1091,7 @@ $this - 3 + 7 10, 18 @@ -1157,7 +1157,7 @@ $this - 10 + 12 10, 18 @@ -1418,7 +1418,7 @@ $this - 6 + 10 True @@ -1823,7 +1823,7 @@ $this - 9 + 11 True @@ -2183,7 +2183,7 @@ $this - 13 + 3 10, 18 @@ -2384,7 +2384,7 @@ $this - 11 + 13 NoControl @@ -2549,11 +2549,14 @@ $this - 12 + 14 True + + NoControl + 308, 64 @@ -2581,6 +2584,9 @@ True + + NoControl + 373, 38 @@ -2638,6 +2644,9 @@ True + + NoControl + 293, 38 @@ -2705,7 +2714,7 @@ flash_zoom_v - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + FriishProduce.NumericUpDownEx, FriishProduce, Version=1.6.0.0, Culture=neutral, PublicKeyToken=null display @@ -2740,6 +2749,9 @@ True + + NoControl + 305, 19 @@ -2777,7 +2789,7 @@ flash_zoom_h - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + FriishProduce.NumericUpDownEx, FriishProduce, Version=1.6.0.0, Culture=neutral, PublicKeyToken=null display @@ -3197,7 +3209,7 @@ $this - 1 + 5 True @@ -3548,7 +3560,7 @@ $this - 4 + 8 193, 0 @@ -3569,7 +3581,7 @@ $this - 7 + 1 True diff --git a/FriishProduce/Subforms/BannerOptions.resx b/FriishProduce/Subforms/BannerOptions.resx index 0dfb3e08..9dcd4e3f 100644 --- a/FriishProduce/Subforms/BannerOptions.resx +++ b/FriishProduce/Subforms/BannerOptions.resx @@ -285,6 +285,9 @@ Bottom, Right + + System + NoControl @@ -315,6 +318,9 @@ Bottom, Right + + System + NoControl diff --git a/FriishProduce/Subforms/ChannelTitles.resx b/FriishProduce/Subforms/ChannelTitles.resx index e6655d77..034fd7fc 100644 --- a/FriishProduce/Subforms/ChannelTitles.resx +++ b/FriishProduce/Subforms/ChannelTitles.resx @@ -121,6 +121,9 @@ Bottom, Right + + System + NoControl diff --git a/FriishProduce/Subforms/ContentOptions.Designer.cs b/FriishProduce/Subforms/ContentOptions.Designer.cs index 93c7d317..d31ff0cb 100644 --- a/FriishProduce/Subforms/ContentOptions.Designer.cs +++ b/FriishProduce/Subforms/ContentOptions.Designer.cs @@ -31,8 +31,8 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ContentOptions)); this.bottomPanel1 = new System.Windows.Forms.Panel(); - this.b_cancel = new System.Windows.Forms.Button(); this.b_ok = new System.Windows.Forms.Button(); + this.b_cancel = new System.Windows.Forms.Button(); this.b_controller = new System.Windows.Forms.Button(); this.bottomPanel2 = new System.Windows.Forms.Panel(); this.controller_box = new System.Windows.Forms.GroupBox(); @@ -50,6 +50,13 @@ private void InitializeComponent() resources.ApplyResources(this.bottomPanel1, "bottomPanel1"); this.bottomPanel1.Name = "bottomPanel1"; // + // b_ok + // + resources.ApplyResources(this.b_ok, "b_ok"); + this.b_ok.Name = "b_ok"; + this.b_ok.Tag = "b_ok"; + this.b_ok.UseVisualStyleBackColor = true; + // // b_cancel // resources.ApplyResources(this.b_cancel, "b_cancel"); @@ -58,13 +65,6 @@ private void InitializeComponent() this.b_cancel.Tag = "b_cancel"; this.b_cancel.UseVisualStyleBackColor = true; // - // b_ok - // - resources.ApplyResources(this.b_ok, "b_ok"); - this.b_ok.Name = "b_ok"; - this.b_ok.Tag = "b_ok"; - this.b_ok.UseVisualStyleBackColor = true; - // // b_controller // resources.ApplyResources(this.b_controller, "b_controller"); diff --git a/FriishProduce/Subforms/ContentOptions.resx b/FriishProduce/Subforms/ContentOptions.resx index 5cbd76fa..ca2acabc 100644 --- a/FriishProduce/Subforms/ContentOptions.resx +++ b/FriishProduce/Subforms/ContentOptions.resx @@ -121,6 +121,9 @@ Bottom, Right + + System + NoControl @@ -153,6 +156,9 @@ Bottom, Right + + System + NoControl diff --git a/FriishProduce/Subforms/ControllerMapping.resx b/FriishProduce/Subforms/ControllerMapping.resx index 930d3eac..97e73fac 100644 --- a/FriishProduce/Subforms/ControllerMapping.resx +++ b/FriishProduce/Subforms/ControllerMapping.resx @@ -121,6 +121,9 @@ Bottom, Right + + System + NoControl @@ -153,6 +156,9 @@ Bottom, Right + + System + NoControl diff --git a/FriishProduce/Subforms/LanguageEditor.Designer.cs b/FriishProduce/Subforms/LanguageEditor.Designer.cs index 27105a71..fdab0b86 100644 --- a/FriishProduce/Subforms/LanguageEditor.Designer.cs +++ b/FriishProduce/Subforms/LanguageEditor.Designer.cs @@ -385,6 +385,7 @@ private void InitializeComponent() // this.find_original.AcceptsReturn = true; this.find_original.AutoSize = false; + this.find_original.Font = new System.Drawing.Font("Segoe UI", 9F); this.find_original.Name = "find_original"; this.find_original.Size = new System.Drawing.Size(200, 23); this.find_original.TextChanged += new System.EventHandler(this.Find); @@ -401,6 +402,7 @@ private void InitializeComponent() // this.find_translated.AcceptsReturn = true; this.find_translated.AutoSize = false; + this.find_translated.Font = new System.Drawing.Font("Segoe UI", 9F); this.find_translated.Name = "find_translated"; this.find_translated.Size = new System.Drawing.Size(200, 23); this.find_translated.TextChanged += new System.EventHandler(this.Find); diff --git a/FriishProduce/Subforms/MessageBox.Designer.cs b/FriishProduce/Subforms/MessageBox.Designer.cs index 1b467f84..a22ab132 100644 --- a/FriishProduce/Subforms/MessageBox.Designer.cs +++ b/FriishProduce/Subforms/MessageBox.Designer.cs @@ -29,6 +29,7 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Msg)); this.bottomPanel2 = new System.Windows.Forms.Panel(); this.bottomPanel1 = new System.Windows.Forms.Panel(); this.button1 = new System.Windows.Forms.Button(); @@ -49,12 +50,8 @@ private void InitializeComponent() // this.bottomPanel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(223)))), ((int)(((byte)(223))))); this.bottomPanel2.Controls.Add(this.bottomPanel1); - this.bottomPanel2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.bottomPanel2.Location = new System.Drawing.Point(0, 121); - this.bottomPanel2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + resources.ApplyResources(this.bottomPanel2, "bottomPanel2"); this.bottomPanel2.Name = "bottomPanel2"; - this.bottomPanel2.Size = new System.Drawing.Size(484, 41); - this.bottomPanel2.TabIndex = 26; // // bottomPanel1 // @@ -63,165 +60,83 @@ private void InitializeComponent() this.bottomPanel1.Controls.Add(this.button2); this.bottomPanel1.Controls.Add(this.do_not_show); this.bottomPanel1.Controls.Add(this.button3); - this.bottomPanel1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.bottomPanel1.Location = new System.Drawing.Point(0, 1); - this.bottomPanel1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + resources.ApplyResources(this.bottomPanel1, "bottomPanel1"); this.bottomPanel1.Name = "bottomPanel1"; - this.bottomPanel1.Size = new System.Drawing.Size(484, 40); - this.bottomPanel1.TabIndex = 3; // // button1 // - this.button1.AutoSize = true; - this.button1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + resources.ApplyResources(this.button1, "button1"); this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.button1.FlatStyle = System.Windows.Forms.FlatStyle.System; - this.button1.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.button1.Location = new System.Drawing.Point(380, 8); - this.button1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); - this.button1.MaximumSize = new System.Drawing.Size(0, 24); - this.button1.MinimumSize = new System.Drawing.Size(0, 24); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(27, 24); - this.button1.TabIndex = 27; this.button1.Tag = ""; - this.button1.Text = "1"; - this.button1.Visible = false; this.button1.Click += new System.EventHandler(this.Button_Click); // // button2 // - this.button2.AutoSize = true; - this.button2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + resources.ApplyResources(this.button2, "button2"); this.button2.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.button2.FlatStyle = System.Windows.Forms.FlatStyle.System; - this.button2.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.button2.Location = new System.Drawing.Point(413, 8); - this.button2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); - this.button2.MaximumSize = new System.Drawing.Size(0, 24); - this.button2.MinimumSize = new System.Drawing.Size(0, 24); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(27, 24); - this.button2.TabIndex = 26; this.button2.Tag = ""; - this.button2.Text = "2"; - this.button2.Visible = false; this.button2.Click += new System.EventHandler(this.Button_Click); // // do_not_show // - this.do_not_show.AutoSize = true; - this.do_not_show.FlatStyle = System.Windows.Forms.FlatStyle.System; - this.do_not_show.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.do_not_show.Location = new System.Drawing.Point(14, 10); - this.do_not_show.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + resources.ApplyResources(this.do_not_show, "do_not_show"); this.do_not_show.Name = "do_not_show"; - this.do_not_show.Size = new System.Drawing.Size(102, 20); - this.do_not_show.TabIndex = 25; this.do_not_show.Tag = "do_not_show"; - this.do_not_show.Text = "do_not_show"; this.do_not_show.UseVisualStyleBackColor = true; - this.do_not_show.Visible = false; // // button3 // - this.button3.AutoSize = true; - this.button3.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + resources.ApplyResources(this.button3, "button3"); this.button3.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.button3.FlatStyle = System.Windows.Forms.FlatStyle.System; - this.button3.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.button3.Location = new System.Drawing.Point(446, 8); - this.button3.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); - this.button3.MaximumSize = new System.Drawing.Size(0, 24); - this.button3.MinimumSize = new System.Drawing.Size(0, 24); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(27, 24); - this.button3.TabIndex = 24; this.button3.Tag = ""; - this.button3.Text = "3"; - this.button3.Visible = false; this.button3.Click += new System.EventHandler(this.Button_Click); // // textLabel // - this.textLabel.AutoSize = true; - this.textLabel.Font = new System.Drawing.Font("Segoe UI", 15.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel); + resources.ApplyResources(this.textLabel, "textLabel"); this.textLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(51)))), ((int)(((byte)(153))))); - this.textLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.textLabel.Location = new System.Drawing.Point(48, 7); - this.textLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.textLabel.MaximumSize = new System.Drawing.Size(426, 0); this.textLabel.Name = "textLabel"; - this.textLabel.Padding = new System.Windows.Forms.Padding(0, 3, 0, 0); - this.textLabel.Size = new System.Drawing.Size(404, 45); - this.textLabel.TabIndex = 27; - this.textLabel.Text = "Can\'t rename \"Pictures\" because a file or folder with that name already exists"; this.textLabel.UseMnemonic = false; // // descriptionLabel // - this.descriptionLabel.AutoSize = true; - this.descriptionLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.descriptionLabel.Location = new System.Drawing.Point(49, 52); - this.descriptionLabel.Margin = new System.Windows.Forms.Padding(3, 0, 2, 0); + resources.ApplyResources(this.descriptionLabel, "descriptionLabel"); this.descriptionLabel.Name = "descriptionLabel"; - this.descriptionLabel.Padding = new System.Windows.Forms.Padding(0, 10, 0, 0); - this.descriptionLabel.Size = new System.Drawing.Size(138, 25); - this.descriptionLabel.TabIndex = 28; - this.descriptionLabel.Text = "Specify a different name."; this.descriptionLabel.UseMnemonic = false; // // image // - this.image.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.image.Location = new System.Drawing.Point(10, 10); + resources.ApplyResources(this.image, "image"); this.image.Name = "image"; this.tableLayoutPanel1.SetRowSpan(this.image, 2); - this.image.Size = new System.Drawing.Size(32, 32); - this.image.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.image.TabIndex = 29; this.image.TabStop = false; // // tableLayoutPanel1 // - this.tableLayoutPanel1.ColumnCount = 2; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 39F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1"); this.tableLayoutPanel1.Controls.Add(this.textLabel, 1, 0); this.tableLayoutPanel1.Controls.Add(this.descriptionLabel, 1, 1); this.tableLayoutPanel1.Controls.Add(this.image, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(7); - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.Size = new System.Drawing.Size(484, 162); - this.tableLayoutPanel1.TabIndex = 30; // // Msg // - this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.BackColor = System.Drawing.SystemColors.Window; - this.ClientSize = new System.Drawing.Size(484, 162); + resources.ApplyResources(this, "$this"); this.ControlBox = false; this.Controls.Add(this.bottomPanel2); this.Controls.Add(this.tableLayoutPanel1); - this.Font = new System.Drawing.Font("Segoe UI", 9F); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "Msg"; - this.RightToLeftLayout = true; this.ShowIcon = false; this.ShowInTaskbar = false; this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "title"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Msg_Close); this.Load += new System.EventHandler(this.Msg_Load); this.bottomPanel2.ResumeLayout(false); diff --git a/FriishProduce/Subforms/MessageBox.cs b/FriishProduce/Subforms/MessageBox.cs index 8c9e3ae2..1033c944 100644 --- a/FriishProduce/Subforms/MessageBox.cs +++ b/FriishProduce/Subforms/MessageBox.cs @@ -166,7 +166,7 @@ private void Msg_Load(object sender, EventArgs e) if (no_text || no_desc) { - descriptionLabel.Padding = new Padding(0, 8, 0, 0); + descriptionLabel.Margin = new(descriptionLabel.Margin.Left + 1, 8, descriptionLabel.Margin.Right, descriptionLabel.Margin.Bottom); tableLayoutPanel1.RowCount = 1; } diff --git a/FriishProduce/Subforms/MessageBox.resx b/FriishProduce/Subforms/MessageBox.resx index 1af7de15..c0ae6491 100644 --- a/FriishProduce/Subforms/MessageBox.resx +++ b/FriishProduce/Subforms/MessageBox.resx @@ -117,4 +117,412 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + + GrowAndShrink + + + System + + + NoControl + + + + 380, 8 + + + 2, 3, 2, 3 + + + 0, 24 + + + 0, 24 + + + 27, 24 + + + 27 + + + 1 + + + False + + + button1 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + bottomPanel1 + + + 0 + + + True + + + GrowAndShrink + + + System + + + NoControl + + + 413, 8 + + + 2, 3, 2, 3 + + + 0, 24 + + + 0, 24 + + + 27, 24 + + + 26 + + + 2 + + + False + + + button2 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + bottomPanel1 + + + 1 + + + True + + + System + + + NoControl + + + 14, 10 + + + 2, 3, 2, 3 + + + 102, 20 + + + 25 + + + do_not_show + + + False + + + do_not_show + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + bottomPanel1 + + + 2 + + + True + + + GrowAndShrink + + + System + + + NoControl + + + 446, 8 + + + 2, 3, 2, 3 + + + 0, 24 + + + 0, 24 + + + 27, 24 + + + 24 + + + 3 + + + False + + + button3 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + bottomPanel1 + + + 3 + + + Bottom + + + 0, 1 + + + 2, 3, 2, 3 + + + 484, 40 + + + 3 + + + bottomPanel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + bottomPanel2 + + + 0 + + + Bottom + + + 0, 121 + + + 2, 3, 2, 3 + + + 484, 41 + + + 26 + + + bottomPanel2 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + Segoe UI, 15.5px + + + NoControl + + + 48, 7 + + + 2, 0, 2, 0 + + + 426, 0 + + + 0, 3, 0, 0 + + + 404, 45 + + + 27 + + + Can't rename "Pictures" because a file or folder with that name already exists + + + textLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 0 + + + True + + + NoControl + + + 49, 58 + + + 3, 6, 2, 0 + + + 138, 15 + + + 28 + + + Specify a different name. + + + descriptionLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 1 + + + NoControl + + + 10, 10 + + + 2 + + + Fill + + + 0, 0 + + + 0, 0, 0, 0 + + + 7, 7, 7, 7 + + + 2 + + + 484, 162 + + + 30 + + + tableLayoutPanel1 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="textLabel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="descriptionLabel" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="image" Row="0" RowSpan="2" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Absolute,39,Percent,100" /><Rows Styles="AutoSize,0,Percent,100" /></TableLayoutSettings> + + + 32, 32 + + + StretchImage + + + 29 + + + image + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 2 + + + True + + + 484, 162 + + + Segoe UI, 9pt + + + 2, 3, 2, 3 + + + True + + + CenterParent + + + title + + + Msg + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/FriishProduce/Subforms/Savedata.Designer.cs b/FriishProduce/Subforms/Savedata.Designer.cs index 5e293dbd..0f38f8a0 100644 --- a/FriishProduce/Subforms/Savedata.Designer.cs +++ b/FriishProduce/Subforms/Savedata.Designer.cs @@ -116,6 +116,7 @@ private void InitializeComponent() // // notice // + this.notice.BackColor = System.Drawing.SystemColors.Window; this.notice.BaseStylesheet = "div { color: #555; font-family: \"REPLACEME\"; font-size: 11px !important; }"; resources.ApplyResources(this.notice, "notice"); this.notice.IsContextMenuEnabled = false; diff --git a/FriishProduce/Subforms/Savedata.resx b/FriishProduce/Subforms/Savedata.resx index 3179ecbf..234689e9 100644 --- a/FriishProduce/Subforms/Savedata.resx +++ b/FriishProduce/Subforms/Savedata.resx @@ -117,44 +117,29 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - bottomPanel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - bottomPanel2 + + + Bottom, Right - - 0 + + System - - - Bottom + + NoControl - - 0, 133 + + 186, 7 - - 298, 40 + + 100, 24 - - 36 - - - bottomPanel2 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this + + 4 - - 7 + + &Cancel b_cancel @@ -168,6 +153,27 @@ 0 + + Bottom, Right + + + System + + + NoControl + + + 80, 7 + + + 100, 24 + + + 3 + + + &OK + b_ok @@ -204,65 +210,29 @@ 0 - - Bottom, Right - - - NoControl - - - 186, 7 - - - 100, 24 - - - 4 - - - &Cancel - - - b_cancel - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - bottomPanel1 - - - 0 - - - Bottom, Right - - - NoControl - - - 80, 7 + + Bottom - - 100, 24 + + 0, 133 - - 3 + + 298, 40 - - &OK + + 36 - - b_ok + + bottomPanel2 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - bottomPanel1 + + $this - - 1 + + 7 True diff --git a/FriishProduce/Subforms/UpdaterForm.Designer.cs b/FriishProduce/Subforms/UpdaterForm.Designer.cs index 118eb210..85448732 100644 --- a/FriishProduce/Subforms/UpdaterForm.Designer.cs +++ b/FriishProduce/Subforms/UpdaterForm.Designer.cs @@ -72,12 +72,13 @@ private void InitializeComponent() this.b_no.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.b_no.AutoSize = true; this.b_no.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.b_no.FlatStyle = System.Windows.Forms.FlatStyle.System; this.b_no.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.b_no.Location = new System.Drawing.Point(423, 8); + this.b_no.Location = new System.Drawing.Point(419, 8); this.b_no.MaximumSize = new System.Drawing.Size(0, 24); this.b_no.MinimumSize = new System.Drawing.Size(0, 24); this.b_no.Name = "b_no"; - this.b_no.Size = new System.Drawing.Size(33, 24); + this.b_no.Size = new System.Drawing.Size(37, 24); this.b_no.TabIndex = 4; this.b_no.Tag = "b_no"; this.b_no.Text = "&No"; @@ -87,12 +88,13 @@ private void InitializeComponent() // this.b_yes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.b_yes.AutoSize = true; + this.b_yes.FlatStyle = System.Windows.Forms.FlatStyle.System; this.b_yes.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.b_yes.Location = new System.Drawing.Point(382, 8); + this.b_yes.Location = new System.Drawing.Point(378, 8); this.b_yes.MaximumSize = new System.Drawing.Size(0, 24); this.b_yes.MinimumSize = new System.Drawing.Size(0, 24); this.b_yes.Name = "b_yes"; - this.b_yes.Size = new System.Drawing.Size(35, 24); + this.b_yes.Size = new System.Drawing.Size(39, 24); this.b_yes.TabIndex = 3; this.b_yes.Tag = "b_yes"; this.b_yes.Text = "&Yes"; diff --git a/FriishProduce/_classes/Platform.cs b/FriishProduce/_classes/Platform.cs index 3ed8c971..e514b52b 100644 --- a/FriishProduce/_classes/Platform.cs +++ b/FriishProduce/_classes/Platform.cs @@ -32,15 +32,15 @@ public static class Platforms System.Collections.Generic.Dictionary orig = new() { { - Platform.NES, FileDatas.Icons.nes - // Program.Lang.GetRegion() is Language.Region.Japan or Language.Region.Korea - // ? FileDatas.Icons.fc : FileDatas.Icons.nes + Platform.NES, + Program.Lang.GetRegion() is Language.Region.Japan or Language.Region.Korea + ? FileDatas.Icons.fc : FileDatas.Icons.nes }, { Platform.SNES, Program.Lang.GetRegion() is Language.Region.Americas or Language.Region.International - ? FileDatas.Icons.snes : null + ? FileDatas.Icons.snes : FileDatas.Icons.sfc }, { @@ -55,20 +55,18 @@ public static class Platforms { Platform.SMD, - Program.Lang.GetRegion() is Language.Region.Americas or Language.Region.International - ? FileDatas.Icons.gen : FileDatas.Icons.smd + FileDatas.Icons.smd }, { - Platform.PCE, FileDatas.Icons.tg16 - // Program.Lang.GetRegion() is Language.Region.Japan - // ? FileDatas.Icons.pce : FileDatas.Icons.tg16 + Platform.PCE, + Program.Lang.GetRegion() is Language.Region.Japan + ? FileDatas.Icons.pce : FileDatas.Icons.tg16 }, { - Platform.PCECD, FileDatas.Icons.tg16 - // Program.Lang.GetRegion() is Language.Region.Japan - // ? FileDatas.Icons.pcecd : FileDatas.Icons.tg16 + Platform.PCECD, + FileDatas.Icons.pcecd }, { @@ -91,17 +89,21 @@ public static class Platforms foreach (var item in orig) if (item.Value != null) - resized.Add(item.Key, new System.Drawing.Icon(item.Value, 16, 16).ToBitmap()); + { + System.Drawing.Bitmap bmp = new(16, 16); + using System.Drawing.Graphics g = System.Drawing.Graphics.FromImage(bmp); + using System.Drawing.Bitmap origBmp = item.Value.ToBitmap(); + + g.PixelOffsetMode = System.Drawing.Drawing2D.PixelOffsetMode.HighQuality; + g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality; + g.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.High; + g.DrawImage(origBmp, 0, 0, bmp.Width, bmp.Height); + + resized.Add(item.Key, bmp); + } foreach (var missing in new System.Collections.Generic.Dictionary() { - // Language-specific icons - { Platform.NES, Properties.Resources.retroarch }, - { Platform.SNES, FileDatas.Icons.sfc }, - { Platform.PCE, Properties.Resources.retroarch }, - { Platform.PCECD, Properties.Resources.retroarch }, - - // Other PNG-based icons { Platform.C64, FileDatas.Icons.c64 }, { Platform.MSX, FileDatas.Icons.msx }, { Platform.Flash, FileDatas.Icons.flash }, diff --git a/FriishProduce/_classes/Program/Theme.cs b/FriishProduce/_classes/Program/Theme.cs index aa01f5c8..8c7f81d1 100644 --- a/FriishProduce/_classes/Program/Theme.cs +++ b/FriishProduce/_classes/Program/Theme.cs @@ -173,25 +173,23 @@ public static Bitmap GenerateBG(Rectangle r) public static bool ChangeColors(Form frm, bool isDialog) { if (!Active && !isDialog) return false; + bool flat = Active && Colors.Controls.HasValue; - if (Active && Colors.Controls.HasValue) + foreach (Control item1 in frm.Controls) { - foreach (Control item1 in frm.Controls) + colorize(item1, flat); + foreach (Control item2 in item1.Controls) { - colorize(item1); - foreach (Control item2 in item1.Controls) + colorize(item2, flat); + foreach (Control item3 in item2.Controls) { - colorize(item2); - foreach (Control item3 in item2.Controls) + colorize(item3, flat); + foreach (Control item4 in item3.Controls) { - colorize(item3); - foreach (Control item4 in item3.Controls) + colorize(item4, flat); + foreach (Control item5 in item4.Controls) { - colorize(item4); - foreach (Control item5 in item4.Controls) - { - colorize(item5); - } + colorize(item5, flat); } } } @@ -215,7 +213,7 @@ public static bool ChangeColors(Form frm, bool isDialog) ///

/// Function for subcontrols /// - private static void colorize(Control c) + private static void colorize(Control c, bool flat) { bool isEligible = false; bool useFormBG = false; @@ -223,58 +221,80 @@ private static void colorize(Control c) if (c.GetType() == typeof(Button)) { - isEligible = true; - (c as Button).FlatStyle = FlatStyle.Flat; - (c as Button).FlatAppearance.BorderColor = Colors.Controls.Value.Border; + (c as Button).FlatStyle = flat ? FlatStyle.Flat : FlatStyle.System; + if (!flat) + (c as Button).UseVisualStyleBackColor = true; + + isEligible = flat; + if (isEligible) + (c as Button).FlatAppearance.BorderColor = Colors.Controls.Value.Border; } if (c.GetType() == typeof(ComboBox)) { - isEligible = true; - (c as ComboBox).FlatStyle = FlatStyle.Flat; + (c as ComboBox).FlatStyle = flat ? FlatStyle.Flat : FlatStyle.System; + + isEligible = flat; } if (c.GetType() == typeof(RadioButton)) { + (c as RadioButton).FlatStyle = flat ? FlatStyle.Flat : FlatStyle.System; + + isEligible = flat; useFormBG = true; - isEligible = true; - (c as RadioButton).FlatStyle = FlatStyle.Flat; + if (isEligible) + (c as RadioButton).FlatAppearance.BorderColor = Colors.Controls.Value.Border; } if (c.GetType() == typeof(CheckBox)) { + (c as CheckBox).FlatStyle = flat ? FlatStyle.Flat : FlatStyle.System; + + isEligible = flat; useFormBG = true; - isEligible = true; - (c as CheckBox).FlatStyle = FlatStyle.Flat; + if (isEligible) + (c as CheckBox).FlatAppearance.BorderColor = Colors.Controls.Value.Border; } if (c.GetType() == typeof(GroupBox)) { + (c as GroupBox).FlatStyle = flat ? FlatStyle.Flat : FlatStyle.System; + + isEligible = flat; useFormBG = true; - isEligible = true; - (c as GroupBox).FlatStyle = FlatStyle.Flat; } if (c.GetType() == typeof(TabPage)) { + isEligible = flat; useFormBG = true; - isEligible = true; } - if (c.GetType() == typeof(TextBox)) + if (c.GetType() == typeof(TextBox) || c.GetType() == typeof(PlaceholderTextBox) || c.GetType() == typeof(NumericUpDown) || c.GetType() == typeof(NumericUpDownEx)) { + isEligible = flat; + useTextBox = true; + } + + if (c.GetType() == typeof(Label) || c.GetType() == typeof(ImageLabel)) + { + bool hasBorder = (c as Label).BorderStyle != BorderStyle.None; + (c as Label).FlatStyle = flat && hasBorder ? FlatStyle.Flat : FlatStyle.System; + + isEligible = flat && hasBorder; useTextBox = true; - isEligible = true; } if (c.GetType() == typeof(TheArtOfDev.HtmlRenderer.WinForms.HtmlPanel)) { + isEligible = flat; useFormBG = true; - isEligible = true; - (c as TheArtOfDev.HtmlRenderer.WinForms.HtmlPanel).BorderStyle = BorderStyle.Fixed3D; + if (isEligible) + (c as TheArtOfDev.HtmlRenderer.WinForms.HtmlPanel).BorderStyle = BorderStyle.Fixed3D; } - if (isEligible) + if (flat && isEligible) { c.BackColor = useTextBox ? Colors.TextBox : useFormBG ? Colors.Form.BG : Colors.Controls.Value.BG; c.ForeColor = Colors.Text; diff --git a/README.md b/README.md index a1cae736..a3445be1 100644 --- a/README.md +++ b/README.md @@ -20,21 +20,22 @@ This injector bypasses other third-party assets (such as Common-Key.bin, HowardC * Replace WAD contents with forwarder to auto-load specific emulator core and ROM ### Platforms -**Currently supported:** - * *Virtual Console*: - * Nintendo Entertainment System (NES) / Famicom - * Super Nintendo Entertainment System (SNES) / Super Famicom - * Nintendo 64 - * SEGA Master System - * SEGA Mega Drive / Genesis - * NEC TurboGrafx-16 / PC Engine (HuCARD & CD-ROM) - * SNK NEO-GEO - * Commodore 64 - * Microsoft MSX / MSX2 - * Others: - * Adobe Flash - * Sony PlayStation - * RPG Maker 2000 / 2003 +The following platforms are currently supported: + +* *Virtual Console*: + * Nintendo Entertainment System (NES) / Famicom + * Super Nintendo Entertainment System (SNES) / Super Famicom + * Nintendo 64 + * SEGA Master System + * SEGA Mega Drive / Genesis + * NEC TurboGrafx-16 / PC Engine (HuCARD & CD-ROM) + * SNK NEO-GEO + * Commodore 64 + * Microsoft MSX / MSX2 +* Others: + * Adobe Flash + * Sony PlayStation + * RPG Maker 2000 / 2003 ## Wiki Please check the **[wiki](https://catmanfan.github.io/FriishProduce/)** for a tutorial on how to use/translate the app, and other useful tips. diff --git a/docs/docs/assets/extra.css b/docs/assets/extra.css similarity index 100% rename from docs/docs/assets/extra.css rename to docs/assets/extra.css diff --git a/docs/docs/assets/images/F6J201_2025-01-09_23-35-01.png b/docs/assets/images/F6J201_2025-01-09_23-35-01.png similarity index 100% rename from docs/docs/assets/images/F6J201_2025-01-09_23-35-01.png rename to docs/assets/images/F6J201_2025-01-09_23-35-01.png diff --git a/docs/docs/assets/images/favicon.ico b/docs/assets/images/favicon.ico similarity index 100% rename from docs/docs/assets/images/favicon.ico rename to docs/assets/images/favicon.ico diff --git a/docs/docs/assets/images/logo.png b/docs/assets/images/logo.png similarity index 100% rename from docs/docs/assets/images/logo.png rename to docs/assets/images/logo.png diff --git a/docs/docs/assets/images/tutorial_0.png b/docs/assets/images/tutorial_0.png similarity index 100% rename from docs/docs/assets/images/tutorial_0.png rename to docs/assets/images/tutorial_0.png diff --git a/docs/docs/assets/images/tutorial_1.png b/docs/assets/images/tutorial_1.png similarity index 100% rename from docs/docs/assets/images/tutorial_1.png rename to docs/assets/images/tutorial_1.png diff --git a/docs/docs/assets/images/tutorial_2.png b/docs/assets/images/tutorial_2.png similarity index 100% rename from docs/docs/assets/images/tutorial_2.png rename to docs/assets/images/tutorial_2.png diff --git a/docs/docs/assets/images/tutorial_3.png b/docs/assets/images/tutorial_3.png similarity index 100% rename from docs/docs/assets/images/tutorial_3.png rename to docs/assets/images/tutorial_3.png diff --git a/docs/docs/assets/images/tutorial_4.png b/docs/assets/images/tutorial_4.png similarity index 100% rename from docs/docs/assets/images/tutorial_4.png rename to docs/assets/images/tutorial_4.png diff --git a/docs/docs/assets/images/tutorial_5.png b/docs/assets/images/tutorial_5.png similarity index 100% rename from docs/docs/assets/images/tutorial_5.png rename to docs/assets/images/tutorial_5.png diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index b33302c2..bae55446 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -10,17 +10,11 @@ nav: - Translate: translate.md theme: -# Bootstrap theme settings -# --------------------------------------------- - # name: bootstrap - # logo: img/logo.png - -# Material theme settings -# --------------------------------------------- name: material - custom_dir: docs/ - logo: assets/images/logo.png - favicon: assets/images/favicon.ico + language: en + custom_dir: assets\ + logo: assets\images\logo.png + favicon: assets\images\favicon.ico features: - navigation.tabs - toc.integrate @@ -42,7 +36,15 @@ theme: # name: Switch to light mode extra_css: - - assets/extra.css + - assets\extra.css + +extra: + # The language switcher values are stored here. + # --------------------------------------------- + alternate: + - name: English + lang: en + link: / plugins: - glightbox: @@ -51,57 +53,41 @@ plugins: effect: zoom slide_effect: slide - - i18n: - docs_structure: folder - fallback_to_default: true - languages: - - locale: en - name: English - build: true - default: true - - - locale: fr - name: Français - build: true - site_description: "Premier injecteur GUI pour la Console virtuelle de Wii" - nav_translations: - Home: Accueil - Tutorial: Tutoriel - Translate: Traduire + # - i18n: + # docs_structure: folder + # fallback_to_default: true + # languages: + # - locale: en + # name: English + # build: true + # default: true - - locale: es - name: Español - build: true - nav_translations: - Home: Pagina principal - Tutorial: Tutorial - FAQ: Preguntas frecuentes - Translate: Traducir - - - locale: ja - name: 日本語 - build: false - nav_translations: - Home: ホームページ - Tutorial: 使い方 - Translate: 翻訳 - FAQ: よくある質問 - -extra: - # The language switcher values are stored here. - # --------------------------------------------- - alternate: - - name: English - link: "" - lang: en + # - locale: fr + # name: Français + # build: true + # site_description: "Premier injecteur GUI pour la Console virtuelle de Wii" + # nav_translations: + # Home: Accueil + # Tutorial: Tutoriel + # Translate: Traduire - - name: Français - link: fr - lang: fr + # - locale: es + # name: Español + # build: true + # nav_translations: + # Home: Pagina principal + # Tutorial: Tutorial + # FAQ: Preguntas frecuentes + # Translate: Traducir - - name: Español - link: es - lang: es + # - locale: ja + # name: 日本語 + # build: false + # nav_translations: + # Home: ホーム + # Tutorial: 使い方 + # Translate: 翻訳 + # FAQ: よくある質問 markdown_extensions: - admonition