From 23a51133ec38c8bce1543e85dfac3fe36d5b431a Mon Sep 17 00:00:00 2001 From: Cj <161484149+CJ-SPT@users.noreply.github.com> Date: Mon, 17 Jun 2024 15:53:13 -0400 Subject: [PATCH] Minor UI fixes --- Obsidian Notes/ReCodeIt/.obsidian/app.json | 1 + .../ReCodeIt/.obsidian/appearance.json | 3 + .../.obsidian/core-plugins-migration.json | 30 ++++ .../ReCodeIt/.obsidian/core-plugins.json | 20 +++ Obsidian Notes/ReCodeIt/.obsidian/graph.json | 22 +++ .../ReCodeIt/.obsidian/workspace.json | 158 ++++++++++++++++++ Obsidian Notes/ReCodeIt/Untitled.canvas | 9 + Obsidian Notes/ReCodeIt/Untitled.md | 0 ReCodeItGUI_WPF/App.xaml | 17 -- ReCodeItGUI_WPF/App.xaml.cs | 94 ----------- ReCodeItGUI_WPF/AssemblyInfo.cs | 10 -- ReCodeItGUI_WPF/Assets/wpfui-icon-1024.png | Bin 10779 -> 0 bytes ReCodeItGUI_WPF/Assets/wpfui-icon-256.png | Bin 4391 -> 0 bytes .../Helpers/EnumToBooleanConverter.cs | 36 ---- ReCodeItGUI_WPF/Models/AppConfig.cs | 9 - ReCodeItGUI_WPF/Models/DataColor.cs | 9 - ReCodeItGUI_WPF/ReCodeItGUI_WPF.csproj | 33 ---- ReCodeItGUI_WPF/Resources/Translations.cs | 6 - .../Services/ApplicationHostService.cs | 59 ------- ReCodeItGUI_WPF/Services/PageService.cs | 42 ----- ReCodeItGUI_WPF/Usings.cs | 4 - .../ViewModels/Pages/DashboardViewModel.cs | 14 -- .../ViewModels/Pages/DataViewModel.cs | 47 ------ .../ViewModels/Pages/SettingsViewModel.cs | 63 ------- .../ViewModels/Windows/MainWindowViewModel.cs | 45 ----- .../Views/Pages/DashboardPage.xaml | 36 ---- .../Views/Pages/DashboardPage.xaml.cs | 18 -- ReCodeItGUI_WPF/Views/Pages/DataPage.xaml | 43 ----- ReCodeItGUI_WPF/Views/Pages/DataPage.xaml.cs | 18 -- ReCodeItGUI_WPF/Views/Pages/SettingsPage.xaml | 51 ------ .../Views/Pages/SettingsPage.xaml.cs | 18 -- ReCodeItGUI_WPF/Views/Windows/MainWindow.xaml | 65 ------- .../Views/Windows/MainWindow.xaml.cs | 64 ------- ReCodeItGUI_WPF/app.manifest | 75 --------- ReCodeItGUI_WPF/wpfui-icon.ico | Bin 19438 -> 0 bytes RecodeIt.sln | 40 +++++ RecodeItGUI/GUI/Main.Designer.cs | 118 ++++++------- 37 files changed, 342 insertions(+), 935 deletions(-) create mode 100644 Obsidian Notes/ReCodeIt/.obsidian/app.json create mode 100644 Obsidian Notes/ReCodeIt/.obsidian/appearance.json create mode 100644 Obsidian Notes/ReCodeIt/.obsidian/core-plugins-migration.json create mode 100644 Obsidian Notes/ReCodeIt/.obsidian/core-plugins.json create mode 100644 Obsidian Notes/ReCodeIt/.obsidian/graph.json create mode 100644 Obsidian Notes/ReCodeIt/.obsidian/workspace.json create mode 100644 Obsidian Notes/ReCodeIt/Untitled.canvas create mode 100644 Obsidian Notes/ReCodeIt/Untitled.md delete mode 100644 ReCodeItGUI_WPF/App.xaml delete mode 100644 ReCodeItGUI_WPF/App.xaml.cs delete mode 100644 ReCodeItGUI_WPF/AssemblyInfo.cs delete mode 100644 ReCodeItGUI_WPF/Assets/wpfui-icon-1024.png delete mode 100644 ReCodeItGUI_WPF/Assets/wpfui-icon-256.png delete mode 100644 ReCodeItGUI_WPF/Helpers/EnumToBooleanConverter.cs delete mode 100644 ReCodeItGUI_WPF/Models/AppConfig.cs delete mode 100644 ReCodeItGUI_WPF/Models/DataColor.cs delete mode 100644 ReCodeItGUI_WPF/ReCodeItGUI_WPF.csproj delete mode 100644 ReCodeItGUI_WPF/Resources/Translations.cs delete mode 100644 ReCodeItGUI_WPF/Services/ApplicationHostService.cs delete mode 100644 ReCodeItGUI_WPF/Services/PageService.cs delete mode 100644 ReCodeItGUI_WPF/Usings.cs delete mode 100644 ReCodeItGUI_WPF/ViewModels/Pages/DashboardViewModel.cs delete mode 100644 ReCodeItGUI_WPF/ViewModels/Pages/DataViewModel.cs delete mode 100644 ReCodeItGUI_WPF/ViewModels/Pages/SettingsViewModel.cs delete mode 100644 ReCodeItGUI_WPF/ViewModels/Windows/MainWindowViewModel.cs delete mode 100644 ReCodeItGUI_WPF/Views/Pages/DashboardPage.xaml delete mode 100644 ReCodeItGUI_WPF/Views/Pages/DashboardPage.xaml.cs delete mode 100644 ReCodeItGUI_WPF/Views/Pages/DataPage.xaml delete mode 100644 ReCodeItGUI_WPF/Views/Pages/DataPage.xaml.cs delete mode 100644 ReCodeItGUI_WPF/Views/Pages/SettingsPage.xaml delete mode 100644 ReCodeItGUI_WPF/Views/Pages/SettingsPage.xaml.cs delete mode 100644 ReCodeItGUI_WPF/Views/Windows/MainWindow.xaml delete mode 100644 ReCodeItGUI_WPF/Views/Windows/MainWindow.xaml.cs delete mode 100644 ReCodeItGUI_WPF/app.manifest delete mode 100644 ReCodeItGUI_WPF/wpfui-icon.ico diff --git a/Obsidian Notes/ReCodeIt/.obsidian/app.json b/Obsidian Notes/ReCodeIt/.obsidian/app.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/Obsidian Notes/ReCodeIt/.obsidian/app.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/Obsidian Notes/ReCodeIt/.obsidian/appearance.json b/Obsidian Notes/ReCodeIt/.obsidian/appearance.json new file mode 100644 index 0000000..c8c365d --- /dev/null +++ b/Obsidian Notes/ReCodeIt/.obsidian/appearance.json @@ -0,0 +1,3 @@ +{ + "accentColor": "" +} \ No newline at end of file diff --git a/Obsidian Notes/ReCodeIt/.obsidian/core-plugins-migration.json b/Obsidian Notes/ReCodeIt/.obsidian/core-plugins-migration.json new file mode 100644 index 0000000..436f43c --- /dev/null +++ b/Obsidian Notes/ReCodeIt/.obsidian/core-plugins-migration.json @@ -0,0 +1,30 @@ +{ + "file-explorer": true, + "global-search": true, + "switcher": true, + "graph": true, + "backlink": true, + "canvas": true, + "outgoing-link": true, + "tag-pane": true, + "properties": false, + "page-preview": true, + "daily-notes": true, + "templates": true, + "note-composer": true, + "command-palette": true, + "slash-command": false, + "editor-status": true, + "bookmarks": true, + "markdown-importer": false, + "zk-prefixer": false, + "random-note": false, + "outline": true, + "word-count": true, + "slides": false, + "audio-recorder": false, + "workspaces": false, + "file-recovery": true, + "publish": false, + "sync": false +} \ No newline at end of file diff --git a/Obsidian Notes/ReCodeIt/.obsidian/core-plugins.json b/Obsidian Notes/ReCodeIt/.obsidian/core-plugins.json new file mode 100644 index 0000000..9405bfd --- /dev/null +++ b/Obsidian Notes/ReCodeIt/.obsidian/core-plugins.json @@ -0,0 +1,20 @@ +[ + "file-explorer", + "global-search", + "switcher", + "graph", + "backlink", + "canvas", + "outgoing-link", + "tag-pane", + "page-preview", + "daily-notes", + "templates", + "note-composer", + "command-palette", + "editor-status", + "bookmarks", + "outline", + "word-count", + "file-recovery" +] \ No newline at end of file diff --git a/Obsidian Notes/ReCodeIt/.obsidian/graph.json b/Obsidian Notes/ReCodeIt/.obsidian/graph.json new file mode 100644 index 0000000..42a46ec --- /dev/null +++ b/Obsidian Notes/ReCodeIt/.obsidian/graph.json @@ -0,0 +1,22 @@ +{ + "collapse-filter": true, + "search": "", + "showTags": false, + "showAttachments": false, + "hideUnresolved": false, + "showOrphans": true, + "collapse-color-groups": true, + "colorGroups": [], + "collapse-display": true, + "showArrow": false, + "textFadeMultiplier": 0, + "nodeSizeMultiplier": 1, + "lineSizeMultiplier": 1, + "collapse-forces": true, + "centerStrength": 0.518713248970312, + "repelStrength": 10, + "linkStrength": 1, + "linkDistance": 250, + "scale": 1, + "close": true +} \ No newline at end of file diff --git a/Obsidian Notes/ReCodeIt/.obsidian/workspace.json b/Obsidian Notes/ReCodeIt/.obsidian/workspace.json new file mode 100644 index 0000000..4ffc265 --- /dev/null +++ b/Obsidian Notes/ReCodeIt/.obsidian/workspace.json @@ -0,0 +1,158 @@ +{ + "main": { + "id": "379217465f549fca", + "type": "split", + "children": [ + { + "id": "54c1949a2997d742", + "type": "tabs", + "children": [ + { + "id": "3ba51241806af7df", + "type": "leaf", + "state": { + "type": "canvas", + "state": { + "file": "Untitled.canvas", + "viewState": { + "x": -860.3333740234375, + "y": -352.333251953125, + "zoom": 0 + } + } + } + } + ] + } + ], + "direction": "vertical" + }, + "left": { + "id": "5b6afcf2ac9987d1", + "type": "split", + "children": [ + { + "id": "633de3e685c77487", + "type": "tabs", + "children": [ + { + "id": "8890b3cf74fd4a96", + "type": "leaf", + "state": { + "type": "file-explorer", + "state": { + "sortOrder": "alphabetical" + } + } + }, + { + "id": "7f4412dd886a7682", + "type": "leaf", + "state": { + "type": "search", + "state": { + "query": "", + "matchingCase": false, + "explainSearch": false, + "collapseAll": false, + "extraContext": false, + "sortOrder": "alphabetical" + } + } + }, + { + "id": "5bda2ad3b0974edd", + "type": "leaf", + "state": { + "type": "bookmarks", + "state": {} + } + } + ] + } + ], + "direction": "horizontal", + "width": 300 + }, + "right": { + "id": "823dd02d5532773c", + "type": "split", + "children": [ + { + "id": "52bb8c1a37662004", + "type": "tabs", + "children": [ + { + "id": "16f0b64c50ad965f", + "type": "leaf", + "state": { + "type": "backlink", + "state": { + "file": "Untitled.canvas", + "collapseAll": false, + "extraContext": false, + "sortOrder": "alphabetical", + "showSearch": false, + "searchQuery": "", + "backlinkCollapsed": false, + "unlinkedCollapsed": true + } + } + }, + { + "id": "4cae092c09f416a0", + "type": "leaf", + "state": { + "type": "outgoing-link", + "state": { + "file": "Untitled.canvas", + "linksCollapsed": false, + "unlinkedCollapsed": true + } + } + }, + { + "id": "9ac3d05213c572e2", + "type": "leaf", + "state": { + "type": "tag", + "state": { + "sortOrder": "frequency", + "useHierarchy": true + } + } + }, + { + "id": "b92d0982927abb20", + "type": "leaf", + "state": { + "type": "outline", + "state": { + "file": "Untitled.canvas" + } + } + } + ] + } + ], + "direction": "horizontal", + "width": 300, + "collapsed": true + }, + "left-ribbon": { + "hiddenItems": { + "switcher:Open quick switcher": false, + "graph:Open graph view": false, + "canvas:Create new canvas": false, + "daily-notes:Open today's daily note": false, + "templates:Insert template": false, + "command-palette:Open command palette": false + } + }, + "active": "3ba51241806af7df", + "lastOpenFiles": [ + "Untitled.canvas", + "Untitled.md", + "Welcome.md" + ] +} \ No newline at end of file diff --git a/Obsidian Notes/ReCodeIt/Untitled.canvas b/Obsidian Notes/ReCodeIt/Untitled.canvas new file mode 100644 index 0000000..91024d8 --- /dev/null +++ b/Obsidian Notes/ReCodeIt/Untitled.canvas @@ -0,0 +1,9 @@ +{ + "nodes":[ + {"id":"ffede66903965668","x":-1260,"y":-740,"width":660,"height":300,"color":"4","type":"text","text":"Targeted ReMap Assembly Patching (TRAP)\n\n- The ability to remap types on your own, get a remapped DLL to reference for your project, use it. Then patch your assembly back to original types, for testing/production.\n- This will allow for ultimate flexibility in being version agnostic as the manual re-mapper is able to find things between versions by creating patterns for it to match. It works in the same fashion as using LINQ at runtime, because that's essentially what it is.\n- Below is how your build process would be effected."}, + {"id":"af0d96082e896559","x":-1260,"y":-360,"width":660,"height":300,"color":"3","type":"text","text":"1. Provide the target DLL we wish to modify\n3. Build your desired remaps for it in the GUI editor.\n4. Remap it\n5. Use the re-mapped DLL as a reference in your project (Im using stash search for testing as it has a ton of GClass references)\n6. Once you are ready to compile, you will compile the dll as normal and place ReCodeIt on your sys path somewhere, then run a post build command to have ReCodeit patch your assembly back to original Type data."} + ], + "edges":[ + {"id":"01d35c343c0509f1","fromNode":"ffede66903965668","fromSide":"bottom","toNode":"af0d96082e896559","toSide":"top"} + ] +} \ No newline at end of file diff --git a/Obsidian Notes/ReCodeIt/Untitled.md b/Obsidian Notes/ReCodeIt/Untitled.md new file mode 100644 index 0000000..e69de29 diff --git a/ReCodeItGUI_WPF/App.xaml b/ReCodeItGUI_WPF/App.xaml deleted file mode 100644 index 2493fa6..0000000 --- a/ReCodeItGUI_WPF/App.xaml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - diff --git a/ReCodeItGUI_WPF/App.xaml.cs b/ReCodeItGUI_WPF/App.xaml.cs deleted file mode 100644 index 52db7ad..0000000 --- a/ReCodeItGUI_WPF/App.xaml.cs +++ /dev/null @@ -1,94 +0,0 @@ -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using ReCodeItGUI_WPF.Services; -using ReCodeItGUI_WPF.ViewModels.Pages; -using ReCodeItGUI_WPF.ViewModels.Windows; -using ReCodeItGUI_WPF.Views.Pages; -using ReCodeItGUI_WPF.Views.Windows; -using System.IO; -using System.Reflection; -using System.Windows.Threading; -using Wpf.Ui; - -namespace ReCodeItGUI_WPF -{ - /// - /// Interaction logic for App.xaml - /// - public partial class App - { - // The.NET Generic Host provides dependency injection, configuration, logging, and other services. - // https://docs.microsoft.com/dotnet/core/extensions/generic-host - // https://docs.microsoft.com/dotnet/core/extensions/dependency-injection - // https://docs.microsoft.com/dotnet/core/extensions/configuration - // https://docs.microsoft.com/dotnet/core/extensions/logging - private static readonly IHost _host = Host - .CreateDefaultBuilder() - .ConfigureAppConfiguration(c => { c.SetBasePath(Path.GetDirectoryName(Assembly.GetEntryAssembly()!.Location)); }) - .ConfigureServices((context, services) => - { - services.AddHostedService(); - - // Page resolver service - services.AddSingleton(); - - // Theme manipulation - services.AddSingleton(); - - // TaskBar manipulation - services.AddSingleton(); - - // Service containing navigation, same as INavigationWindow... but without window - services.AddSingleton(); - - // Main window with navigation - services.AddSingleton(); - services.AddSingleton(); - - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - }).Build(); - - /// - /// Gets registered service. - /// - /// Type of the service to get. - /// Instance of the service or . - public static T GetService() - where T : class - { - return _host.Services.GetService(typeof(T)) as T; - } - - /// - /// Occurs when the application is loading. - /// - private void OnStartup(object sender, StartupEventArgs e) - { - _host.Start(); - } - - /// - /// Occurs when the application is closing. - /// - private async void OnExit(object sender, ExitEventArgs e) - { - await _host.StopAsync(); - - _host.Dispose(); - } - - /// - /// Occurs when an exception is thrown by an application but not handled. - /// - private void OnDispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e) - { - // For more info see https://docs.microsoft.com/en-us/dotnet/api/system.windows.application.dispatcherunhandledexception?view=windowsdesktop-6.0 - } - } -} diff --git a/ReCodeItGUI_WPF/AssemblyInfo.cs b/ReCodeItGUI_WPF/AssemblyInfo.cs deleted file mode 100644 index 7ad982e..0000000 --- a/ReCodeItGUI_WPF/AssemblyInfo.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Windows; - -[assembly: ThemeInfo( - ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located - //(used if a resource is not found in the page, - // or application resource dictionaries) - ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located -//(used if a resource is not found in the page, -// app, or any theme specific resource dictionaries) -)] diff --git a/ReCodeItGUI_WPF/Assets/wpfui-icon-1024.png b/ReCodeItGUI_WPF/Assets/wpfui-icon-1024.png deleted file mode 100644 index b70c4ed5957e11550ef2c58265430f28a01e2bd4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10779 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 U_2T2`0T0>Rth3Ho?YZ;60kX|o`~Uy| diff --git a/ReCodeItGUI_WPF/Assets/wpfui-icon-256.png b/ReCodeItGUI_WPF/Assets/wpfui-icon-256.png deleted file mode 100644 index 6b5cf5d5aea2c545e8c5ca44f61ff7cb4669a2dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4391 zcmd5=3s4hh9$zS}6|^{~H$JG4i>cbfO?Eer%?2WP0+Px@5taHVZ1w>W$i^fPWK_^j z%d`%1h=@uNYmtf$iemK?74>|a7EO7nD35Yd9YF@c0tyKCg-1#|TJY-JTxK%+eVgC+ zfByde|2O$!QNV)n_S5Vk2pX^Q^$LO@8?dy2-hBr=R_PD0;4xO``>_Fn941=6Hqh>` zra+MWPEBx#F~r|bL2=PSlIGNmFfLjL&=BPA5vL=mNXE!hGvOMolHXEP%;#xnC4afp zAMw}CXCgGd@p@)Sd_XW2A4w53-(xP%Jx&1xL^DQ`7Z)9+H7Meg{C>F#u(rGw@p=6a zW2BNl&!UhQ;=hPDpVKouT!_LHf*?Gc5ULSYu4afiJPg555sHZrIgAnt6jfjtZ}7th z>hv_L2=ek7R0eiReuUAeQ;0++lSyb23pstb2qg$YgkT~Jg8>3ItkW9FI9O|#F(ko@ zF;IGq&ZyzEJc~q9&BYj%d|>K;579cSSgm0&P9S2UI8rABQh9~1|w1hB2!4@t_Y?;kO8PaM{C%1Rw!nHqIfVu zD8v$l6#o?z5RN8|RP@ zkd&oRlzhsPWQOJszSg`X9;4Dcc-|Dj0HME=`~mF-jy0M{Ju@#H#BM}#iC$?ur;TOw z!_3!_dJ;4!MsHB^Sv?ocvl4-4H2?7%|=u|S6p=3CQNO4p)6yo6_0$5ovid$NuST;oZ|0YC(;in= zf&!yg0mjD&1BH-Lw2WrKbj4ASc~l~UNg0j8ayfyrBq0~e7%*f9tl|FXK(VyM{xA%? zT@AegS2oMidRYV;>vfaSf+nN~m&t(M*)2yn{ zw3?_B!Q~Ia{4RuK{*~W8X8V*0XRh)$@41v2=DMe6vipIz0~=NIE={rvh}7dQ*$nl61%6#!BV0yzHLV;=T&impP3kxe>CU&hAI6n{&^~vpc@N*{VOd z;aKS!<=x%cZp+}3{k}oByAvSq)a}U)ZN;|=PaI2Un`$G}g*AR$env*Z(>0$*p3SK_ zgV(lJ8duaTJk?URaO#fA4yQ2voLNLh!(~B&?=gMRtW`bjrn(JKZ{Ow*vFgXn@hWpk z{r>VX&hbw&^DjS7OU}a>@l@>x-{d!c0-0{K3&OX#XEmf3>EC%$e8}TbT}YsT?V7PA zWqNn%xaoVzTlhYmR5Ux2N~~!@x5# zld-j;AmisEm9hX2b5y1`{3LL!&Vnjpx+0x+b^nlhq_*$b0<$DH^QT)M1v#EH+b1eb z{A+cwPMg|d7xeC%Q{Hlz>FS-IGQIcW3=h|18!AL|*5BcFY&-M!oV5#V7j5_US@}Ye zd-q27+^7HIw)m8V2HJ-@U)pZUP6U9I75U~x{E}YK0Xtyr@F%&%JK^f6?9$(?WeC{;UequwKYHNy9V$!{&2Z6Wo z7F)ZS*E6o#dm2u^h^yT7;?e0YwD6IS%T8YxXIH4)WmRL&?4T6C zKh6B%-yt>;eoOD2?CfS7{q{Wwu{p3{$6UXH(hwV{w$AR2ao_d9#`zohn?+QUtH7?^zkl%-(HX8KPUD!Cf|<#{*ZZ+DkyWN-_FpjPKicy@$>un zm5Zm9=Z>9dDF7E&$h&Y?ZF=PLqKCqs0)pCy%scm8TC#R(;+0_6rQtHyBiVg7yDrzZ zH+lwj&xX2dj>NV-?>hk!6?1)AdOgcM>Bu&3JnB5N(hsC`N=F`^wx0RcsjkbZ_jG`A z+Wy88_I_KNLtk%A)safo!L4GOJ4uHH&yCyav&NoxoBY<7!G-0gTFnj~#XUVuq0_YE zeDXhws^bal3S7SOZ)+8B%@0&=4xX!Ld8gjG5D@?U?LDV{e(dU4Cr@avx>C_mmFV - - - WinExe - net8.0-windows - app.manifest - wpfui-icon.ico - true - enable - enable - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ReCodeItGUI_WPF/Resources/Translations.cs b/ReCodeItGUI_WPF/Resources/Translations.cs deleted file mode 100644 index 61b0ddc..0000000 --- a/ReCodeItGUI_WPF/Resources/Translations.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace ReCodeItGUI_WPF.Resources -{ - public partial class Translations - { - } -} diff --git a/ReCodeItGUI_WPF/Services/ApplicationHostService.cs b/ReCodeItGUI_WPF/Services/ApplicationHostService.cs deleted file mode 100644 index 40002d6..0000000 --- a/ReCodeItGUI_WPF/Services/ApplicationHostService.cs +++ /dev/null @@ -1,59 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using ReCodeItGUI_WPF.Views.Pages; -using ReCodeItGUI_WPF.Views.Windows; -using Wpf.Ui; - -namespace ReCodeItGUI_WPF.Services -{ - /// - /// Managed host of the application. - /// - public class ApplicationHostService : IHostedService - { - private readonly IServiceProvider _serviceProvider; - - private INavigationWindow _navigationWindow; - - public ApplicationHostService(IServiceProvider serviceProvider) - { - _serviceProvider = serviceProvider; - } - - /// - /// Triggered when the application host is ready to start the service. - /// - /// Indicates that the start process has been aborted. - public async Task StartAsync(CancellationToken cancellationToken) - { - await HandleActivationAsync(); - } - - /// - /// Triggered when the application host is performing a graceful shutdown. - /// - /// Indicates that the shutdown process should no longer be graceful. - public async Task StopAsync(CancellationToken cancellationToken) - { - await Task.CompletedTask; - } - - /// - /// Creates main window during activation. - /// - private async Task HandleActivationAsync() - { - if (!Application.Current.Windows.OfType().Any()) - { - _navigationWindow = ( - _serviceProvider.GetService(typeof(INavigationWindow)) as INavigationWindow - )!; - _navigationWindow!.ShowWindow(); - - _navigationWindow.Navigate(typeof(Views.Pages.DashboardPage)); - } - - await Task.CompletedTask; - } - } -} diff --git a/ReCodeItGUI_WPF/Services/PageService.cs b/ReCodeItGUI_WPF/Services/PageService.cs deleted file mode 100644 index 94b250a..0000000 --- a/ReCodeItGUI_WPF/Services/PageService.cs +++ /dev/null @@ -1,42 +0,0 @@ -using Wpf.Ui; - -namespace ReCodeItGUI_WPF.Services -{ - /// - /// Service that provides pages for navigation. - /// - public class PageService : IPageService - { - /// - /// Service which provides the instances of pages. - /// - private readonly IServiceProvider _serviceProvider; - - /// - /// Creates new instance and attaches the . - /// - public PageService(IServiceProvider serviceProvider) - { - _serviceProvider = serviceProvider; - } - - /// - public T? GetPage() - where T : class - { - if (!typeof(FrameworkElement).IsAssignableFrom(typeof(T))) - throw new InvalidOperationException("The page should be a WPF control."); - - return (T?)_serviceProvider.GetService(typeof(T)); - } - - /// - public FrameworkElement? GetPage(Type pageType) - { - if (!typeof(FrameworkElement).IsAssignableFrom(pageType)) - throw new InvalidOperationException("The page should be a WPF control."); - - return _serviceProvider.GetService(pageType) as FrameworkElement; - } - } -} diff --git a/ReCodeItGUI_WPF/Usings.cs b/ReCodeItGUI_WPF/Usings.cs deleted file mode 100644 index 5efad98..0000000 --- a/ReCodeItGUI_WPF/Usings.cs +++ /dev/null @@ -1,4 +0,0 @@ -global using CommunityToolkit.Mvvm.ComponentModel; -global using CommunityToolkit.Mvvm.Input; -global using System; -global using System.Windows; diff --git a/ReCodeItGUI_WPF/ViewModels/Pages/DashboardViewModel.cs b/ReCodeItGUI_WPF/ViewModels/Pages/DashboardViewModel.cs deleted file mode 100644 index b25aa1e..0000000 --- a/ReCodeItGUI_WPF/ViewModels/Pages/DashboardViewModel.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace ReCodeItGUI_WPF.ViewModels.Pages -{ - public partial class DashboardViewModel : ObservableObject - { - [ObservableProperty] - private int _counter = 0; - - [RelayCommand] - private void OnCounterIncrement() - { - Counter++; - } - } -} diff --git a/ReCodeItGUI_WPF/ViewModels/Pages/DataViewModel.cs b/ReCodeItGUI_WPF/ViewModels/Pages/DataViewModel.cs deleted file mode 100644 index 40c5f18..0000000 --- a/ReCodeItGUI_WPF/ViewModels/Pages/DataViewModel.cs +++ /dev/null @@ -1,47 +0,0 @@ -using ReCodeItGUI_WPF.Models; -using System.Windows.Media; -using Wpf.Ui.Controls; - -namespace ReCodeItGUI_WPF.ViewModels.Pages -{ - public partial class DataViewModel : ObservableObject, INavigationAware - { - private bool _isInitialized = false; - - [ObservableProperty] - private IEnumerable _colors; - - public void OnNavigatedTo() - { - if (!_isInitialized) - InitializeViewModel(); - } - - public void OnNavigatedFrom() { } - - private void InitializeViewModel() - { - var random = new Random(); - var colorCollection = new List(); - - for (int i = 0; i < 8192; i++) - colorCollection.Add( - new DataColor - { - Color = new SolidColorBrush( - Color.FromArgb( - (byte)200, - (byte)random.Next(0, 250), - (byte)random.Next(0, 250), - (byte)random.Next(0, 250) - ) - ) - } - ); - - Colors = colorCollection; - - _isInitialized = true; - } - } -} diff --git a/ReCodeItGUI_WPF/ViewModels/Pages/SettingsViewModel.cs b/ReCodeItGUI_WPF/ViewModels/Pages/SettingsViewModel.cs deleted file mode 100644 index edb7ce4..0000000 --- a/ReCodeItGUI_WPF/ViewModels/Pages/SettingsViewModel.cs +++ /dev/null @@ -1,63 +0,0 @@ -using Wpf.Ui.Appearance; -using Wpf.Ui.Controls; - -namespace ReCodeItGUI_WPF.ViewModels.Pages -{ - public partial class SettingsViewModel : ObservableObject, INavigationAware - { - private bool _isInitialized = false; - - [ObservableProperty] - private string _appVersion = String.Empty; - - [ObservableProperty] - private ApplicationTheme _currentTheme = ApplicationTheme.Unknown; - - public void OnNavigatedTo() - { - if (!_isInitialized) - InitializeViewModel(); - } - - public void OnNavigatedFrom() { } - - private void InitializeViewModel() - { - CurrentTheme = ApplicationThemeManager.GetAppTheme(); - AppVersion = $"UiDesktopApp1 - {GetAssemblyVersion()}"; - - _isInitialized = true; - } - - private string GetAssemblyVersion() - { - return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version?.ToString() - ?? String.Empty; - } - - [RelayCommand] - private void OnChangeTheme(string parameter) - { - switch (parameter) - { - case "theme_light": - if (CurrentTheme == ApplicationTheme.Light) - break; - - ApplicationThemeManager.Apply(ApplicationTheme.Light); - CurrentTheme = ApplicationTheme.Light; - - break; - - default: - if (CurrentTheme == ApplicationTheme.Dark) - break; - - ApplicationThemeManager.Apply(ApplicationTheme.Dark); - CurrentTheme = ApplicationTheme.Dark; - - break; - } - } - } -} diff --git a/ReCodeItGUI_WPF/ViewModels/Windows/MainWindowViewModel.cs b/ReCodeItGUI_WPF/ViewModels/Windows/MainWindowViewModel.cs deleted file mode 100644 index 3111ace..0000000 --- a/ReCodeItGUI_WPF/ViewModels/Windows/MainWindowViewModel.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System.Collections.ObjectModel; -using Wpf.Ui.Controls; - -namespace ReCodeItGUI_WPF.ViewModels.Windows -{ - public partial class MainWindowViewModel : ObservableObject - { - [ObservableProperty] - private string _applicationTitle = "WPF UI - ReCodeItGUI_WPF"; - - [ObservableProperty] - private ObservableCollection _menuItems = new() - { - new NavigationViewItem() - { - Content = "Home", - Icon = new SymbolIcon { Symbol = SymbolRegular.Home24 }, - TargetPageType = typeof(Views.Pages.DashboardPage) - }, - new NavigationViewItem() - { - Content = "Data", - Icon = new SymbolIcon { Symbol = SymbolRegular.DataHistogram24 }, - TargetPageType = typeof(Views.Pages.DataPage) - } - }; - - [ObservableProperty] - private ObservableCollection _footerMenuItems = new() - { - new NavigationViewItem() - { - Content = "Settings", - Icon = new SymbolIcon { Symbol = SymbolRegular.Settings24 }, - TargetPageType = typeof(Views.Pages.SettingsPage) - } - }; - - [ObservableProperty] - private ObservableCollection _trayMenuItems = new() - { - new MenuItem { Header = "Home", Tag = "tray_home" } - }; - } -} diff --git a/ReCodeItGUI_WPF/Views/Pages/DashboardPage.xaml b/ReCodeItGUI_WPF/Views/Pages/DashboardPage.xaml deleted file mode 100644 index 40916a8..0000000 --- a/ReCodeItGUI_WPF/Views/Pages/DashboardPage.xaml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - diff --git a/ReCodeItGUI_WPF/Views/Pages/DashboardPage.xaml.cs b/ReCodeItGUI_WPF/Views/Pages/DashboardPage.xaml.cs deleted file mode 100644 index b39af86..0000000 --- a/ReCodeItGUI_WPF/Views/Pages/DashboardPage.xaml.cs +++ /dev/null @@ -1,18 +0,0 @@ -using ReCodeItGUI_WPF.ViewModels.Pages; -using Wpf.Ui.Controls; - -namespace ReCodeItGUI_WPF.Views.Pages -{ - public partial class DashboardPage : INavigableView - { - public DashboardViewModel ViewModel { get; } - - public DashboardPage(DashboardViewModel viewModel) - { - ViewModel = viewModel; - DataContext = this; - - InitializeComponent(); - } - } -} diff --git a/ReCodeItGUI_WPF/Views/Pages/DataPage.xaml b/ReCodeItGUI_WPF/Views/Pages/DataPage.xaml deleted file mode 100644 index e05050d..0000000 --- a/ReCodeItGUI_WPF/Views/Pages/DataPage.xaml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - diff --git a/ReCodeItGUI_WPF/Views/Pages/DataPage.xaml.cs b/ReCodeItGUI_WPF/Views/Pages/DataPage.xaml.cs deleted file mode 100644 index 318a3f3..0000000 --- a/ReCodeItGUI_WPF/Views/Pages/DataPage.xaml.cs +++ /dev/null @@ -1,18 +0,0 @@ -using ReCodeItGUI_WPF.ViewModels.Pages; -using Wpf.Ui.Controls; - -namespace ReCodeItGUI_WPF.Views.Pages -{ - public partial class DataPage : INavigableView - { - public DataViewModel ViewModel { get; } - - public DataPage(DataViewModel viewModel) - { - ViewModel = viewModel; - DataContext = this; - - InitializeComponent(); - } - } -} diff --git a/ReCodeItGUI_WPF/Views/Pages/SettingsPage.xaml b/ReCodeItGUI_WPF/Views/Pages/SettingsPage.xaml deleted file mode 100644 index f434553..0000000 --- a/ReCodeItGUI_WPF/Views/Pages/SettingsPage.xaml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/ReCodeItGUI_WPF/Views/Pages/SettingsPage.xaml.cs b/ReCodeItGUI_WPF/Views/Pages/SettingsPage.xaml.cs deleted file mode 100644 index 6fd3dfe..0000000 --- a/ReCodeItGUI_WPF/Views/Pages/SettingsPage.xaml.cs +++ /dev/null @@ -1,18 +0,0 @@ -using ReCodeItGUI_WPF.ViewModels.Pages; -using Wpf.Ui.Controls; - -namespace ReCodeItGUI_WPF.Views.Pages -{ - public partial class SettingsPage : INavigableView - { - public SettingsViewModel ViewModel { get; } - - public SettingsPage(SettingsViewModel viewModel) - { - ViewModel = viewModel; - DataContext = this; - - InitializeComponent(); - } - } -} diff --git a/ReCodeItGUI_WPF/Views/Windows/MainWindow.xaml b/ReCodeItGUI_WPF/Views/Windows/MainWindow.xaml deleted file mode 100644 index 73d1583..0000000 --- a/ReCodeItGUI_WPF/Views/Windows/MainWindow.xaml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ReCodeItGUI_WPF/Views/Windows/MainWindow.xaml.cs b/ReCodeItGUI_WPF/Views/Windows/MainWindow.xaml.cs deleted file mode 100644 index 08ccdd4..0000000 --- a/ReCodeItGUI_WPF/Views/Windows/MainWindow.xaml.cs +++ /dev/null @@ -1,64 +0,0 @@ -using ReCodeItGUI_WPF.ViewModels.Windows; -using Wpf.Ui; -using Wpf.Ui.Appearance; -using Wpf.Ui.Controls; - -namespace ReCodeItGUI_WPF.Views.Windows -{ - public partial class MainWindow : INavigationWindow - { - public MainWindowViewModel ViewModel { get; } - - public MainWindow( - MainWindowViewModel viewModel, - IPageService pageService, - INavigationService navigationService - ) - { - ViewModel = viewModel; - DataContext = this; - - SystemThemeWatcher.Watch(this); - - InitializeComponent(); - SetPageService(pageService); - - navigationService.SetNavigationControl(RootNavigation); - } - - #region INavigationWindow methods - - public INavigationView GetNavigation() => RootNavigation; - - public bool Navigate(Type pageType) => RootNavigation.Navigate(pageType); - - public void SetPageService(IPageService pageService) => RootNavigation.SetPageService(pageService); - - public void ShowWindow() => Show(); - - public void CloseWindow() => Close(); - - #endregion INavigationWindow methods - - /// - /// Raises the closed event. - /// - protected override void OnClosed(EventArgs e) - { - base.OnClosed(e); - - // Make sure that closing this window will begin the process of closing the application. - Application.Current.Shutdown(); - } - - INavigationView INavigationWindow.GetNavigation() - { - throw new NotImplementedException(); - } - - public void SetServiceProvider(IServiceProvider serviceProvider) - { - throw new NotImplementedException(); - } - } -} diff --git a/ReCodeItGUI_WPF/app.manifest b/ReCodeItGUI_WPF/app.manifest deleted file mode 100644 index b859352..0000000 --- a/ReCodeItGUI_WPF/app.manifest +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PerMonitor - true/PM - true - - - - - - - - - - diff --git a/ReCodeItGUI_WPF/wpfui-icon.ico b/ReCodeItGUI_WPF/wpfui-icon.ico deleted file mode 100644 index cc128fda396328cd04b533b9b08b1c6db4988146..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19438 zcmeHO3piBk8vZeItMnXpE<01_G})cBUCLyuq>Ek638Q`N$Yq-zluEkFCAnnB=ybH3 zc_`ALbW@Bj2w_OuQFKvC7?+|9Vk0J(W}R=1Gv{m$_I~O(mDYNmcmDbRS>I*7>;J#? ztC>?nR(1e}sNRzCx@ZxjJ&($0&!;k) z)Abm)_D*2rZbb~9J7QejD9d23Rbw2atK+Z(Xn`CPAOc_@kAXY}@)*ctAdi7O2J#rl zV<3-#JO*+&M1WwBi^OH$K_1s}6yzd4bNTn>@4fEd`_7+FeFssKMNxwl17cYi0AG_#tbxw#y0e(s&Z9CRrVb#V z%7nPegt*FtxXR3R9{|KxW{T?sW~h}K6XK!-Ves7%pa8m8gU(+7;#ezg8|WD5$3Xu; z%pN9ggMJJL9=}092KpuOThg|I{^g)=J)ma{^b0}1^%(2_E1`eH`-}5W@H6uK9}oOk zk9B+)>-aWeU?qMS7YtyKEDgoGUf57QcpuNhW&oA~@b^IR0WW|=9yUM)@kua%GfGLSQo2BE=<)Ky|af_#z$`RZWgQ%R7wk|1v-LEcJ&oN^E#za%9&%acOr z>LkcFhC&*~5DpA;MsMrsE8%%{25fT&p}~p^_PJo63-$*ipUMUMT(Hjt`&_U;2wk37?e{;YYk=(%u=}4pTJpWY3IqFt^JzS%9wo2-b$$)@F|aSmtB1CQ zVE+rS`)9!O4`9C}1b_R&_gLwS2H}HcI#9RNfm-3{$fxQwr|at6+AF66bxa+oAC3yB zYwDb3DCt1$?zf-?=g0uW-1XL4qMm9CC8)IqLA|pYd>4!c@LvG_3&8);kxvzX{{rw| z0R9WW|4{+{3&4K?`1M<;gmZiV^7u7?uXwF?9kfEgf7fb=!C2avCo!55FF`uKyKJ5MSJZLnhPFiL4Vnb%=(%Gj- zd2w}&z^Pkp^<^_7OItmTJ>_fYDSAJQI_anx($M3_%Ba|+-4|fg<`o;|Q$xb9`dyCR zxP{;8?ddJaEeg`gN}Lp%d(9xn$GJ>hqgCi`vNfHZowaG+B5DBX$Um|iA`H)+@bT>n zho+(UO_6Fr+wOzXxEUqA8tQWYW10; zXL>z5I+kPXRn~U|yH(rtAl4`(bjkNr&BAYb>a^w`uMei>M7r3s+O*f_g4IivS3GHY zk9H$n(ZkNDSdRsFMR^uB%E^xVZJb>iI}(#^?tZ!7d;3D&A|qDS(fZT0NYx;Y^e;ty zoI5%J{t0B$-49cPSN&ado$Th`D15}TPo$`6XM9~$$gZB5(zpq|tm)bjZX&F|)XP&i zrhGUl^UM~*@K)h9-iB?K9j7TaUp+0mqcW8*b;-Ev(X?{op7@{#M^9V~`nmlrXG&w! z4T=#(L*S}*pNiD@LT*d{Q*Lu!nX?mDPHstQTTvj#A*%k0OMAMsqfE*c{^h4{8tAch z%F2!!(>redWv4ZZtF2-0zM&AsU>Cod=igglxN=qU`7gV|-g4w^S)J^d)bdl|QtAtR zJw=^`Cr@|P@@|RxZXVjbhxIpB>voxi{!03O#T5yBe9= zlj9OECfp9Yu*)I$9Ex;Z!7AfV-BTqsaT+x`!6Z79+$2=xUAbg&C9(2AxRl%BiL+$+ z6veh>!8A?&)VYF)xlxSWmtapDv~4IdSRk8tcbSX`9bdjRFEH zUim9a&n?NJC{v2oRC=^rKktmly)98bU9o*v_2>6hK3?8@(4Q_dw`c`Tbh-RgvXczi zZ}Yr+e1GA?q$el5Dr9+w3?k~!(ax&bms63l!>(Nm_BYH=%8;3Fy1Aspw7Ts=Ag3y- zUYRC*6;OKf;L<*h@4T&+#(SUi7q_HWb}H@bHPN_V=ESaIx$M2nHWmC4DF+BtqWs=u znD=)Gg~jygH{!EXQn)oL(xF{utY&sgQqu&&nolHu3@jJ z(`Hvi*C$c}=)R^sY+a%Bw7bE_Vvm;8V2=A3?qxIOyxKChG#*d2FU-fvqu6wbe!Ggs(FRuA|H^wBcja^&T)$8lM zgE1>Lj&IrB$|-7j)L;3{pLEQJjo0Su%55r@jQ8xk*GVJai@(^feWh3h!&W_)H{Rcz zW^U5g)>LrMu~gl3xA-a0R%a(IH6`$ixRVK8KReSZ{odsvgUfh7>6!jg+N&VQ-Xk6F N)4sJdOJ2@6@J}ZcNv8k+ diff --git a/RecodeIt.sln b/RecodeIt.sln index 1753da4..958e4f3 100644 --- a/RecodeIt.sln +++ b/RecodeIt.sln @@ -10,17 +10,57 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|ARM = Debug|ARM + Debug|ARM64 = Debug|ARM64 + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|ARM = Release|ARM + Release|ARM64 = Release|ARM64 + Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Debug|ARM.ActiveCfg = Debug|Any CPU + {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Debug|ARM.Build.0 = Debug|Any CPU + {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Debug|ARM64.Build.0 = Debug|Any CPU + {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Debug|x64.ActiveCfg = Debug|Any CPU + {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Debug|x64.Build.0 = Debug|Any CPU + {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Debug|x86.ActiveCfg = Debug|Any CPU + {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Debug|x86.Build.0 = Debug|Any CPU {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Release|Any CPU.ActiveCfg = Release|Any CPU {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Release|Any CPU.Build.0 = Release|Any CPU + {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Release|ARM.ActiveCfg = Release|Any CPU + {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Release|ARM.Build.0 = Release|Any CPU + {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Release|ARM64.ActiveCfg = Release|Any CPU + {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Release|ARM64.Build.0 = Release|Any CPU + {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Release|x64.ActiveCfg = Release|Any CPU + {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Release|x64.Build.0 = Release|Any CPU + {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Release|x86.ActiveCfg = Release|Any CPU + {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Release|x86.Build.0 = Release|Any CPU {FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}.Debug|ARM.ActiveCfg = Debug|Any CPU + {FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}.Debug|ARM.Build.0 = Debug|Any CPU + {FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}.Debug|ARM64.Build.0 = Debug|Any CPU + {FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}.Debug|x64.ActiveCfg = Debug|Any CPU + {FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}.Debug|x64.Build.0 = Debug|Any CPU + {FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}.Debug|x86.ActiveCfg = Debug|Any CPU + {FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}.Debug|x86.Build.0 = Debug|Any CPU {FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}.Release|Any CPU.ActiveCfg = Release|Any CPU {FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}.Release|Any CPU.Build.0 = Release|Any CPU + {FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}.Release|ARM.ActiveCfg = Release|Any CPU + {FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}.Release|ARM.Build.0 = Release|Any CPU + {FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}.Release|ARM64.ActiveCfg = Release|Any CPU + {FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}.Release|ARM64.Build.0 = Release|Any CPU + {FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}.Release|x64.ActiveCfg = Release|Any CPU + {FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}.Release|x64.Build.0 = Release|Any CPU + {FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}.Release|x86.ActiveCfg = Release|Any CPU + {FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/RecodeItGUI/GUI/Main.Designer.cs b/RecodeItGUI/GUI/Main.Designer.cs index ee493ab..39fdff0 100644 --- a/RecodeItGUI/GUI/Main.Designer.cs +++ b/RecodeItGUI/GUI/Main.Designer.cs @@ -31,6 +31,8 @@ partial class ReCodeItForm TabPageRemapper = new TabPage(); RemapTreeView = new TreeView(); groupBox1 = new GroupBox(); + label1 = new Label(); + MaxMatchCountUpDown = new NumericUpDown(); EditRemapButton = new Button(); ConstuctorCountUpDown = new NumericUpDown(); ConstructorCountEnabled = new CheckBox(); @@ -123,8 +125,11 @@ partial class ReCodeItForm AutoMapperExcludeTypesRemoveButton = new Button(); AutoMapperExcludeTypesAddButton = new Button(); AutoMapperTypesExcludeBox = new ListBox(); + tabPage5 = new TabPage(); SettingsTab = new TabPage(); groupBox2 = new GroupBox(); + PickNameMangledPathButton = new Button(); + NameMangledAssemblyTextBox = new TextBox(); MappingChooseButton = new Button(); UnsealCheckbox = new CheckBox(); RenamePropertiesCheckbox = new CheckBox(); @@ -137,13 +142,9 @@ partial class ReCodeItForm AssemblyPathTextBox = new TextBox(); SilentModeCheckbox = new CheckBox(); DebugLoggingCheckbox = new CheckBox(); - tabPage5 = new TabPage(); - PickNameMangledPathButton = new Button(); - NameMangledAssemblyTextBox = new TextBox(); - label1 = new Label(); - MaxMatchCountUpDown = new NumericUpDown(); TabPageRemapper.SuspendLayout(); groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)MaxMatchCountUpDown).BeginInit(); ((System.ComponentModel.ISupportInitialize)ConstuctorCountUpDown).BeginInit(); Inclusions.SuspendLayout(); tabPage1.SuspendLayout(); @@ -160,7 +161,6 @@ partial class ReCodeItForm ((System.ComponentModel.ISupportInitialize)AutoMapperRequiredMatchesUpDown).BeginInit(); SettingsTab.SuspendLayout(); groupBox2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)MaxMatchCountUpDown).BeginInit(); SuspendLayout(); // // TabPageRemapper @@ -226,6 +226,24 @@ partial class ReCodeItForm groupBox1.TabStop = false; groupBox1.Text = "Remap Editor"; // + // label1 + // + label1.AutoSize = true; + label1.Location = new Point(287, 368); + label1.Name = "label1"; + label1.Size = new Size(152, 25); + label1.TabIndex = 23; + label1.Text = "Max Match Count"; + // + // MaxMatchCountUpDown + // + MaxMatchCountUpDown.Location = new Point(224, 366); + MaxMatchCountUpDown.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); + MaxMatchCountUpDown.Name = "MaxMatchCountUpDown"; + MaxMatchCountUpDown.Size = new Size(57, 31); + MaxMatchCountUpDown.TabIndex = 22; + MaxMatchCountUpDown.Value = new decimal(new int[] { 1, 0, 0, 0 }); + // // EditRemapButton // EditRemapButton.BackColor = SystemColors.ButtonShadow; @@ -702,7 +720,7 @@ partial class ReCodeItForm NewTypeName.BackColor = SystemColors.ScrollBar; NewTypeName.Location = new Point(10, 30); NewTypeName.Name = "NewTypeName"; - NewTypeName.PlaceholderText = "New OriginalTypeRef Name"; + NewTypeName.PlaceholderText = "New Name"; NewTypeName.Size = new Size(208, 31); NewTypeName.TabIndex = 0; // @@ -796,9 +814,9 @@ partial class ReCodeItForm // NestedTypeParentName // NestedTypeParentName.BackColor = SystemColors.ScrollBar; - NestedTypeParentName.Location = new Point(224, 106); + NestedTypeParentName.Location = new Point(224, 145); NestedTypeParentName.Name = "NestedTypeParentName"; - NestedTypeParentName.PlaceholderText = "Nested OriginalTypeRef Parent Name"; + NestedTypeParentName.PlaceholderText = "Nested Type Parent Name"; NestedTypeParentName.Size = new Size(208, 31); NestedTypeParentName.TabIndex = 0; // @@ -834,7 +852,7 @@ partial class ReCodeItForm OriginalTypeName.BackColor = SystemColors.ScrollBar; OriginalTypeName.Location = new Point(224, 30); OriginalTypeName.Name = "OriginalTypeName"; - OriginalTypeName.PlaceholderText = "Original OriginalTypeRef Name"; + OriginalTypeName.PlaceholderText = "Original Name"; OriginalTypeName.Size = new Size(208, 31); OriginalTypeName.TabIndex = 1; // @@ -910,7 +928,7 @@ partial class ReCodeItForm // BaseClassExcludeTextField // BaseClassExcludeTextField.BackColor = SystemColors.ScrollBar; - BaseClassExcludeTextField.Location = new Point(224, 145); + BaseClassExcludeTextField.Location = new Point(224, 107); BaseClassExcludeTextField.Name = "BaseClassExcludeTextField"; BaseClassExcludeTextField.PlaceholderText = "Exclude Base Class"; BaseClassExcludeTextField.Size = new Size(208, 31); @@ -1191,6 +1209,16 @@ partial class ReCodeItForm AutoMapperTypesExcludeBox.Size = new Size(353, 229); AutoMapperTypesExcludeBox.TabIndex = 21; // + // tabPage5 + // + tabPage5.BackColor = SystemColors.ControlDarkDark; + tabPage5.Location = new Point(4, 34); + tabPage5.Name = "tabPage5"; + tabPage5.Padding = new Padding(3); + tabPage5.Size = new Size(1336, 953); + tabPage5.TabIndex = 4; + tabPage5.Text = "Name DeMangler"; + // // SettingsTab // SettingsTab.BackColor = SystemColors.ControlDarkDark; @@ -1225,6 +1253,25 @@ partial class ReCodeItForm groupBox2.TabStop = false; groupBox2.Text = "App Settings"; // + // PickNameMangledPathButton + // + PickNameMangledPathButton.Location = new Point(308, 134); + PickNameMangledPathButton.Name = "PickNameMangledPathButton"; + PickNameMangledPathButton.Size = new Size(112, 34); + PickNameMangledPathButton.TabIndex = 10; + PickNameMangledPathButton.Text = "Choose"; + PickNameMangledPathButton.UseVisualStyleBackColor = true; + PickNameMangledPathButton.Click += PickNameMangledPathButton_Click; + // + // NameMangledAssemblyTextBox + // + NameMangledAssemblyTextBox.Location = new Point(6, 137); + NameMangledAssemblyTextBox.Name = "NameMangledAssemblyTextBox"; + NameMangledAssemblyTextBox.PlaceholderText = "Name Mangled Assembly path (including file name)"; + NameMangledAssemblyTextBox.ReadOnly = true; + NameMangledAssemblyTextBox.Size = new Size(296, 31); + NameMangledAssemblyTextBox.TabIndex = 9; + // // MappingChooseButton // MappingChooseButton.Location = new Point(308, 208); @@ -1356,53 +1403,6 @@ partial class ReCodeItForm DebugLoggingCheckbox.UseVisualStyleBackColor = true; DebugLoggingCheckbox.CheckedChanged += DebugLoggingCheckbox_CheckedChanged; // - // tabPage5 - // - tabPage5.BackColor = SystemColors.ControlDarkDark; - tabPage5.Location = new Point(4, 34); - tabPage5.Name = "tabPage5"; - tabPage5.Padding = new Padding(3); - tabPage5.Size = new Size(1336, 953); - tabPage5.TabIndex = 4; - tabPage5.Text = "Name DeMangler"; - // - // PickNameMangledPathButton - // - PickNameMangledPathButton.Location = new Point(308, 134); - PickNameMangledPathButton.Name = "PickNameMangledPathButton"; - PickNameMangledPathButton.Size = new Size(112, 34); - PickNameMangledPathButton.TabIndex = 10; - PickNameMangledPathButton.Text = "Choose"; - PickNameMangledPathButton.UseVisualStyleBackColor = true; - PickNameMangledPathButton.Click += PickNameMangledPathButton_Click; - // - // NameMangledAssemblyTextBox - // - NameMangledAssemblyTextBox.Location = new Point(6, 137); - NameMangledAssemblyTextBox.Name = "NameMangledAssemblyTextBox"; - NameMangledAssemblyTextBox.PlaceholderText = "Name Mangled Assembly path (including file name)"; - NameMangledAssemblyTextBox.ReadOnly = true; - NameMangledAssemblyTextBox.Size = new Size(296, 31); - NameMangledAssemblyTextBox.TabIndex = 9; - // - // label1 - // - label1.AutoSize = true; - label1.Location = new Point(287, 368); - label1.Name = "label1"; - label1.Size = new Size(152, 25); - label1.TabIndex = 23; - label1.Text = "Max Match Count"; - // - // MaxMatchCountUpDown - // - MaxMatchCountUpDown.Location = new Point(224, 366); - MaxMatchCountUpDown.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); - MaxMatchCountUpDown.Name = "MaxMatchCountUpDown"; - MaxMatchCountUpDown.Size = new Size(57, 31); - MaxMatchCountUpDown.TabIndex = 22; - MaxMatchCountUpDown.Value = new decimal(new int[] { 1, 0, 0, 0 }); - // // ReCodeItForm // AutoScaleDimensions = new SizeF(10F, 25F); @@ -1416,6 +1416,7 @@ partial class ReCodeItForm TabPageRemapper.ResumeLayout(false); groupBox1.ResumeLayout(false); groupBox1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)MaxMatchCountUpDown).EndInit(); ((System.ComponentModel.ISupportInitialize)ConstuctorCountUpDown).EndInit(); Inclusions.ResumeLayout(false); tabPage1.ResumeLayout(false); @@ -1438,7 +1439,6 @@ partial class ReCodeItForm SettingsTab.ResumeLayout(false); groupBox2.ResumeLayout(false); groupBox2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)MaxMatchCountUpDown).EndInit(); ResumeLayout(false); }