diff --git a/Patcher/PatchClient/.gitignore b/Patcher/PatchClient/.gitignore new file mode 100644 index 0000000..8afdcb6 --- /dev/null +++ b/Patcher/PatchClient/.gitignore @@ -0,0 +1,454 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# Tye +.tye/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +## +## Visual studio for Mac +## + + +# globs +Makefile.in +*.userprefs +*.usertasks +config.make +config.status +aclocal.m4 +install-sh +autom4te.cache/ +*.tar.gz +tarballs/ +test-results/ + +# Mac bundle stuff +*.dmg +*.app + +# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# JetBrains Rider +.idea/ +*.sln.iml + +## +## Visual Studio Code +## +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json diff --git a/Patcher/PatchClient/App.axaml b/Patcher/PatchClient/App.axaml new file mode 100644 index 0000000..30a308b --- /dev/null +++ b/Patcher/PatchClient/App.axaml @@ -0,0 +1,28 @@ + + + + + + + + + + + + #121212 + #FFC107 + #FFFFFF + #282828 + #323947 + + + + + + + + + diff --git a/Patcher/PatchClient/App.axaml.cs b/Patcher/PatchClient/App.axaml.cs new file mode 100644 index 0000000..6b4a82a --- /dev/null +++ b/Patcher/PatchClient/App.axaml.cs @@ -0,0 +1,29 @@ +using Avalonia; +using Avalonia.Controls.ApplicationLifetimes; +using Avalonia.Markup.Xaml; +using PatchClient.ViewModels; +using PatchClient.Views; + +namespace PatchClient +{ + public class App : Application + { + public override void Initialize() + { + AvaloniaXamlLoader.Load(this); + } + + public override void OnFrameworkInitializationCompleted() + { + if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) + { + desktop.MainWindow = new MainWindow + { + DataContext = new MainWindowViewModel(), + }; + } + + base.OnFrameworkInitializationCompleted(); + } + } +} diff --git a/Patcher/PatchClient/App.xaml b/Patcher/PatchClient/App.xaml deleted file mode 100644 index 180f09e..0000000 --- a/Patcher/PatchClient/App.xaml +++ /dev/null @@ -1,156 +0,0 @@ - - - - #121212 - #FFC107 - #FFFFFF - #282828 - #323947 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Patcher/PatchClient/App.xaml.cs b/Patcher/PatchClient/App.xaml.cs deleted file mode 100644 index 2a36935..0000000 --- a/Patcher/PatchClient/App.xaml.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Data; -using System.Linq; -using System.Threading.Tasks; -using System.Windows; - -namespace PatchClient -{ - /// - /// Interaction logic for App.xaml - /// - public partial class App : Application - { - } -} diff --git a/Patcher/PatchClient/AssemblyInfo.cs b/Patcher/PatchClient/AssemblyInfo.cs deleted file mode 100644 index 8b5504e..0000000 --- a/Patcher/PatchClient/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/Patcher/PatchClient/Assets/Styles.axaml b/Patcher/PatchClient/Assets/Styles.axaml new file mode 100644 index 0000000..0fbcd7f --- /dev/null +++ b/Patcher/PatchClient/Assets/Styles.axaml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Patcher/PatchClient/Assets/avalonia-logo.ico b/Patcher/PatchClient/Assets/avalonia-logo.ico new file mode 100644 index 0000000..da8d49f Binary files /dev/null and b/Patcher/PatchClient/Assets/avalonia-logo.ico differ diff --git a/Patcher/PatchClient/CustomControls/TitleBar.axaml b/Patcher/PatchClient/CustomControls/TitleBar.axaml new file mode 100644 index 0000000..eb9d4eb --- /dev/null +++ b/Patcher/PatchClient/CustomControls/TitleBar.axaml @@ -0,0 +1,45 @@ + + + + + + + diff --git a/Patcher/PatchClient/CustomControls/TitleBar.axaml.cs b/Patcher/PatchClient/CustomControls/TitleBar.axaml.cs new file mode 100644 index 0000000..75f094a --- /dev/null +++ b/Patcher/PatchClient/CustomControls/TitleBar.axaml.cs @@ -0,0 +1,67 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Markup.Xaml; +using Avalonia.Media; +using System.Windows.Input; + +namespace PatchClient.CustomControls +{ + public partial class TitleBar : UserControl + { + public TitleBar() + { + InitializeComponent(); + } + + private void InitializeComponent() + { + AvaloniaXamlLoader.Load(this); + } + + public static readonly StyledProperty TitleProperty = + AvaloniaProperty.Register(nameof(Title)); + + public string Title + { + get => GetValue(TitleProperty); + set => SetValue(TitleProperty, value); + } + + public static readonly StyledProperty XButtonForegroundProperty = + AvaloniaProperty.Register(nameof(XButtonForeground)); + + public IBrush XButtonForeground + { + get => GetValue(XButtonForegroundProperty); + set => SetValue(XButtonForegroundProperty, value); + } + + public static new readonly StyledProperty ForegroundProperty = + AvaloniaProperty.Register(nameof(Foreground)); + + public new IBrush Foreground + { + get => GetValue(ForegroundProperty); + set => SetValue(ForegroundProperty, value); + } + + public static new readonly StyledProperty BackgroundProperty = + AvaloniaProperty.Register(nameof(Background)); + + public new IBrush Background + { + get => GetValue(BackgroundProperty); + set => SetValue(BackgroundProperty, value); + } + + //Close Button Command (X Button) Property + public static readonly StyledProperty XButtonCommandProperty = + AvaloniaProperty.Register(nameof(XButtonCommand)); + + public ICommand XButtonCommand + { + get => GetValue(XButtonCommandProperty); + set => SetValue(XButtonCommandProperty, value); + } + } +} diff --git a/Patcher/PatchClient/Extensions/ControlExtensions.cs b/Patcher/PatchClient/Extensions/ControlExtensions.cs deleted file mode 100644 index a635dde..0000000 --- a/Patcher/PatchClient/Extensions/ControlExtensions.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System.Windows; -using System.Windows.Controls; -using System.Windows.Shell; - -namespace PatchClient.Extensions -{ - public static class ControlExtensions - { - public static void DispatcherSetValue(this ProgressBar pb, int Value) - { - Application.Current.Dispatcher.Invoke(() => - { - pb.Value = Value; - }); - } - - public static void DispatcherSetIndetermination(this ProgressBar pb, bool Indeterminate) - { - Application.Current.Dispatcher.Invoke(() => - { - pb.IsIndeterminate = Indeterminate; - }); - } - - public static void DispaatcherSetContent(this ContentControl cc, object content) - { - Application.Current.Dispatcher.Invoke(() => - { - cc.Content = content; - }); - } - - public static void DispatcherSetText(this TextBlock tb, string Text) - { - Application.Current.Dispatcher.Invoke(() => - { - tb.Text = Text; - }); - } - - public static void DispatcherSetEnabled(this UIElement uie, bool Enabled) - { - Application.Current.Dispatcher.Invoke(() => - { - uie.IsEnabled = Enabled; - }); - } - } -} diff --git a/Patcher/PatchClient/MainWindow.xaml b/Patcher/PatchClient/MainWindow.xaml deleted file mode 100644 index 5cb92b5..0000000 --- a/Patcher/PatchClient/MainWindow.xaml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - + + diff --git a/Patcher/PatchGenerator/CustomControls/TitleBar.axaml.cs b/Patcher/PatchGenerator/CustomControls/TitleBar.axaml.cs new file mode 100644 index 0000000..b8a3df0 --- /dev/null +++ b/Patcher/PatchGenerator/CustomControls/TitleBar.axaml.cs @@ -0,0 +1,67 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Markup.Xaml; +using Avalonia.Media; +using System.Windows.Input; + +namespace PatchGenerator.CustomControls +{ + public partial class TitleBar : UserControl + { + public TitleBar() + { + InitializeComponent(); + } + + private void InitializeComponent() + { + AvaloniaXamlLoader.Load(this); + } + + public static readonly StyledProperty TitleProperty = + AvaloniaProperty.Register(nameof(Title)); + + public string Title + { + get => GetValue(TitleProperty); + set => SetValue(TitleProperty, value); + } + + public static readonly StyledProperty XButtonForegroundProperty = + AvaloniaProperty.Register(nameof(XButtonForeground)); + + public IBrush XButtonForeground + { + get => GetValue(XButtonForegroundProperty); + set => SetValue(XButtonForegroundProperty, value); + } + + public static new readonly StyledProperty ForegroundProperty = + AvaloniaProperty.Register(nameof(Foreground)); + + public new IBrush Foreground + { + get => GetValue(ForegroundProperty); + set => SetValue(ForegroundProperty, value); + } + + public static new readonly StyledProperty BackgroundProperty = + AvaloniaProperty.Register(nameof(Background)); + + public new IBrush Background + { + get => GetValue(BackgroundProperty); + set => SetValue(BackgroundProperty, value); + } + + //Close Button Command (X Button) Property + public static readonly StyledProperty XButtonCommandProperty = + AvaloniaProperty.Register(nameof(XButtonCommand)); + + public ICommand XButtonCommand + { + get => GetValue(XButtonCommandProperty); + set => SetValue(XButtonCommandProperty, value); + } + } +} diff --git a/Patcher/PatchGenerator/Extensions/ControlExtensions.cs b/Patcher/PatchGenerator/Extensions/ControlExtensions.cs deleted file mode 100644 index e91824b..0000000 --- a/Patcher/PatchGenerator/Extensions/ControlExtensions.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Windows; -using System.Windows.Controls; - -namespace PatchGenerator.Extensions -{ - public static class ControlExtensions - { - public static void DispatcherSetValue(this ProgressBar pb, int Value) - { - Application.Current.Dispatcher.Invoke(() => - { - pb.Value = Value; - }); - } - - public static void DispatcherSetIndetermination(this ProgressBar pb, bool Indeterminate) - { - Application.Current.Dispatcher.Invoke(() => - { - pb.IsIndeterminate = Indeterminate; - }); - } - - public static void DispaatcherSetContent(this ContentControl cc, object content) - { - Application.Current.Dispatcher.Invoke(() => - { - cc.Content = content; - }); - } - - public static void DispatcherSetText(this TextBlock tb, string Text) - { - Application.Current.Dispatcher.Invoke(() => - { - tb.Text = Text; - }); - } - - public static void DispatcherSetEnabled(this UIElement uie, bool Enabled) - { - Application.Current.Dispatcher.Invoke(() => - { - uie.IsEnabled = Enabled; - }); - } - } -} diff --git a/Patcher/PatchGenerator/Helpers/PatchItemDefinitions.cs b/Patcher/PatchGenerator/Helpers/PatchItemDefinitions.cs new file mode 100644 index 0000000..0c5e800 --- /dev/null +++ b/Patcher/PatchGenerator/Helpers/PatchItemDefinitions.cs @@ -0,0 +1,16 @@ +using Avalonia.Media; +using System.Collections.Generic; + +namespace PatchGenerator.Helpers +{ + public static class PatchItemDefinitions + { + public static Dictionary Colors = new Dictionary() + { + {"delta", Brushes.MediumPurple }, + {"new", Brushes.Green }, + {"del", Brushes.IndianRed }, + {"exists", Brushes.DimGray } + }; + } +} diff --git a/Patcher/PatchGenerator/MainWindow.xaml b/Patcher/PatchGenerator/MainWindow.xaml deleted file mode 100644 index 1da4dcf..0000000 --- a/Patcher/PatchGenerator/MainWindow.xaml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - -