From 857e51f36e2c40de53b177b1768c4bce6958fb86 Mon Sep 17 00:00:00 2001 From: CreepyCrafter24 <33260128+CreepyCrafter24@users.noreply.github.com> Date: Tue, 10 Sep 2019 11:20:36 +0200 Subject: [PATCH] Minor fix --- .gitignore | 289 ++++++++++++++++++++++++++++++++++++--- FodyWeavers.xml | 4 - cashew.sln | 14 +- cashew/App.config | 2 +- cashew/Form1.Designer.cs | 54 ++++---- cashew/Form1.cs | 94 ++++++++----- cashew/cashew.csproj | 45 +++--- cashew/packages.config | 9 +- 8 files changed, 394 insertions(+), 117 deletions(-) delete mode 100644 FodyWeavers.xml diff --git a/.gitignore b/.gitignore index 3c4efe2..4a4d13c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,15 @@ + +# Created by https://www.gitignore.io/api/csharp,visualstudio +# Edit at https://www.gitignore.io/?templates=csharp,visualstudio + +### Csharp ### ## 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 @@ -10,6 +18,9 @@ # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs +# Mono auto generated files +mono_crash.* + # Build results [Dd]ebug/ [Dd]ebugPublic/ @@ -17,42 +28,57 @@ [Rr]eleases/ x64/ x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ bld/ [Bb]in/ [Oo]bj/ [Ll]og/ -# Visual Studio 2015 cache/options directory +# 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 +# NUnit *.VisualState.xml TestResult.xml +nunit-*.xml # Build Results of an ATL Project [Dd]ebugPS/ [Rr]eleasePS/ dlldata.c -# DNX +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core project.lock.json project.fragment.lock.json artifacts/ +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio *_i.c *_p.c -*_i.h +*_h.h *.ilk *.meta *.obj +*.iobj *.pch *.pdb +*.ipdb *.pgc *.pgd *.rsp @@ -62,6 +88,7 @@ artifacts/ *.tlh *.tmp *.tmp_proj +*_wpftmp.csproj *.log *.vspscc *.vssscc @@ -90,6 +117,9 @@ ipch/ *.vspx *.sap +# Visual Studio Trace Files +*.e2e + # TFS 2012 Local Workspace $tf/ @@ -110,6 +140,14 @@ _TeamCity* # DotCover is a Code Coverage Tool *.dotCover +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + # NCrunch _NCrunch_* .*crunch*.local.xml @@ -141,9 +179,9 @@ publish/ # Publish Web Output *.[Pp]ublish.xml *.azurePubxml -# TODO: Comment the next line if you want to checkin your web deploy settings +# 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 +*.pubxml *.publishproj # Microsoft Azure Web App publish settings. Comment the next line if you want to @@ -153,13 +191,15 @@ PublishScripts/ # NuGet Packages *.nupkg +# NuGet Symbol Packages +*.snupkg # The packages folder can be ignored because of Package Restore -**/packages/* +**/[Pp]ackages/* # except build/, which is used as an MSBuild target. -!**/packages/build/ +!**/[Pp]ackages/build/ # Uncomment if necessary however generally it will be regenerated when needed -#!**/packages/repositories.config -# NuGet v3's project.json files produces more ignoreable files +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files *.nuget.props *.nuget.targets @@ -176,12 +216,15 @@ 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/ +!?*.[Cc]ache/ # Others ClientBin/ @@ -192,9 +235,12 @@ ClientBin/ *.jfm *.pfx *.publishsettings -node_modules/ 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/ @@ -209,15 +255,22 @@ _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/ @@ -227,6 +280,7 @@ FakesAssemblies/ # Node.js Tools for Visual Studio .ntvs_analysis.dat +node_modules/ # Visual Studio 6 build log *.plg @@ -234,6 +288,9 @@ FakesAssemblies/ # 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 @@ -249,13 +306,207 @@ paket-files/ # FAKE - F# Make .fake/ -# JetBrains Rider -.idea/ -*.sln.iml - -# CodeRush -.cr/ +# CodeRush personal settings +.cr/personal # Python Tools for Visual Studio (PTVS) __pycache__/ -*.pyc \ No newline at end of file +*.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/ + +### VisualStudio ### + +# User-specific files + +# User-specific files (MonoDevelop/Xamarin Studio) + +# Mono auto generated files + +# Build results + +# Visual Studio 2015/2017 cache/options directory +# Uncomment if you have tasks that create the project's static files in wwwroot + +# Visual Studio 2017 auto generated files + +# MSTest test Results + +# NUnit + +# Build Results of an ATL Project + +# Benchmark Results + +# .NET Core + +# StyleCop + +# Files built by Visual Studio + +# Chutzpah Test files + +# Visual C++ cache files + +# Visual Studio profiler + +# Visual Studio Trace Files + +# TFS 2012 Local Workspace + +# Guidance Automation Toolkit + +# ReSharper is a .NET coding add-in + +# JustCode is a .NET coding add-in + +# TeamCity is a build add-in + +# DotCover is a Code Coverage Tool + +# AxoCover is a Code Coverage Tool + +# Visual Studio code coverage results + +# NCrunch + +# MightyMoose + +# Web workbench (sass) + +# Installshield output folder + +# DocProject is a documentation generator add-in + +# Click-Once directory + +# Publish Web Output +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted + +# 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 + +# NuGet Packages +# NuGet Symbol Packages +# The packages folder can be ignored because of Package Restore +# except build/, which is used as an MSBuild target. +# Uncomment if necessary however generally it will be regenerated when needed +# NuGet v3's project.json files produces more ignorable files + +# Microsoft Azure Build Output + +# Microsoft Azure Emulator + +# Windows Store app package directories and files + +# Visual Studio cache files +# files ending in .cache can be ignored +# but keep track of directories ending in .cache + +# Others + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) + +# RIA/Silverlight projects + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) + +# SQL Server files + +# Business Intelligence projects + +# Microsoft Fakes + +# GhostDoc plugin setting file + +# Node.js Tools for Visual Studio + +# Visual Studio 6 build log + +# Visual Studio 6 workspace options file + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) + +# Visual Studio LightSwitch build output + +# Paket dependency manager + +# FAKE - F# Make + +# CodeRush personal settings + +# Python Tools for Visual Studio (PTVS) + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio + +# Telerik's JustMock configuration file + +# BizTalk build output + +# OpenCover UI analysis results + +# Azure Stream Analytics local run output + +# MSBuild Binary and Structured Log + +# NVidia Nsight GPU debugger configuration file + +# MFractors (Xamarin productivity tool) working folder + +# Local History for Visual Studio + +# BeatPulse healthcheck temp database + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 + +# End of https://www.gitignore.io/api/csharp,visualstudio diff --git a/FodyWeavers.xml b/FodyWeavers.xml deleted file mode 100644 index 0017ab0..0000000 --- a/FodyWeavers.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cashew.sln b/cashew.sln index d79da9e..fbd01a0 100644 --- a/cashew.sln +++ b/cashew.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28010.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29230.47 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cashew", "cashew\cashew.csproj", "{1AC90E29-B37E-401C-9960-66BC66D4EFBF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CCFunctions", "..\T.O.F.U\Net_TOFU\CCFunctions.csproj", "{4E768A51-1B01-4DE0-A1C0-303F2E6F2AB9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Misc", "..\CC-Functions\Misc\Misc.csproj", "{B80D5E09-B935-4602-A173-BAF7C1974999}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -17,10 +17,10 @@ Global {1AC90E29-B37E-401C-9960-66BC66D4EFBF}.Debug|Any CPU.Build.0 = Debug|Any CPU {1AC90E29-B37E-401C-9960-66BC66D4EFBF}.Release|Any CPU.ActiveCfg = Release|Any CPU {1AC90E29-B37E-401C-9960-66BC66D4EFBF}.Release|Any CPU.Build.0 = Release|Any CPU - {4E768A51-1B01-4DE0-A1C0-303F2E6F2AB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4E768A51-1B01-4DE0-A1C0-303F2E6F2AB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4E768A51-1B01-4DE0-A1C0-303F2E6F2AB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4E768A51-1B01-4DE0-A1C0-303F2E6F2AB9}.Release|Any CPU.Build.0 = Release|Any CPU + {B80D5E09-B935-4602-A173-BAF7C1974999}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B80D5E09-B935-4602-A173-BAF7C1974999}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B80D5E09-B935-4602-A173-BAF7C1974999}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B80D5E09-B935-4602-A173-BAF7C1974999}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/cashew/App.config b/cashew/App.config index fa9af9c..f034a35 100644 --- a/cashew/App.config +++ b/cashew/App.config @@ -7,7 +7,7 @@ - + diff --git a/cashew/Form1.Designer.cs b/cashew/Form1.Designer.cs index d74b591..a77016a 100644 --- a/cashew/Form1.Designer.cs +++ b/cashew/Form1.Designer.cs @@ -157,7 +157,7 @@ this.languageTabControl.Controls.Add(this.infotab); this.languageTabControl.Location = new System.Drawing.Point(23, 63); this.languageTabControl.Name = "languageTabControl"; - this.languageTabControl.SelectedIndex = 2; + this.languageTabControl.SelectedIndex = 1; this.languageTabControl.Size = new System.Drawing.Size(797, 433); this.languageTabControl.TabIndex = 0; this.languageTabControl.UseSelectable = true; @@ -426,6 +426,7 @@ this.htmlText.TabIndex = 8; this.htmlText.Text = "\r\n\r\nTitle\r\n\r\n\r\nExample Text\r\n\r\n"; + this.htmlText.TextChanged += new System.EventHandler(this.HtmlText_TextChanged_1); // // htmlLoadIndicator // @@ -620,28 +621,28 @@ // hTMLStructureSetupToolStripMenuItem // this.hTMLStructureSetupToolStripMenuItem.Name = "hTMLStructureSetupToolStripMenuItem"; - this.hTMLStructureSetupToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.hTMLStructureSetupToolStripMenuItem.Size = new System.Drawing.Size(190, 22); this.hTMLStructureSetupToolStripMenuItem.Text = "HTML Structure Setup"; this.hTMLStructureSetupToolStripMenuItem.Click += new System.EventHandler(this.hTMLStructureSetupToolStripMenuItem_Click); // // linkToolStripMenuItem // this.linkToolStripMenuItem.Name = "linkToolStripMenuItem"; - this.linkToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.linkToolStripMenuItem.Size = new System.Drawing.Size(190, 22); this.linkToolStripMenuItem.Text = "Link"; this.linkToolStripMenuItem.Click += new System.EventHandler(this.linkToolStripMenuItem_Click); // // imageToolStripMenuItem // this.imageToolStripMenuItem.Name = "imageToolStripMenuItem"; - this.imageToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.imageToolStripMenuItem.Size = new System.Drawing.Size(190, 22); this.imageToolStripMenuItem.Text = "Image"; this.imageToolStripMenuItem.Click += new System.EventHandler(this.imageToolStripMenuItem_Click); // // centercenterToolStripMenuItem // this.centercenterToolStripMenuItem.Name = "centercenterToolStripMenuItem"; - this.centercenterToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.centercenterToolStripMenuItem.Size = new System.Drawing.Size(190, 22); this.centercenterToolStripMenuItem.Text = "Center
"; this.centercenterToolStripMenuItem.Click += new System.EventHandler(this.centercenterToolStripMenuItem_Click); // @@ -657,7 +658,7 @@ this.subscriptedSubToolStripMenuItem, this.superscriptedsupToolStripMenuItem}); this.textToolStripMenuItem.Name = "textToolStripMenuItem"; - this.textToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.textToolStripMenuItem.Size = new System.Drawing.Size(190, 22); this.textToolStripMenuItem.Text = "Text"; // // headingsToolStripMenuItem @@ -772,7 +773,7 @@ this.newRowtrToolStripMenuItem, this.newHorizontalItemtdToolStripMenuItem}); this.tableToolStripMenuItem.Name = "tableToolStripMenuItem"; - this.tableToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.tableToolStripMenuItem.Size = new System.Drawing.Size(190, 22); this.tableToolStripMenuItem.Text = "Table"; // // tableFormatSetupToolStripMenuItem @@ -810,7 +811,7 @@ this.unorderedListSetupulToolStripMenuItem, this.listItemliToolStripMenuItem}); this.listsToolStripMenuItem.Name = "listsToolStripMenuItem"; - this.listsToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.listsToolStripMenuItem.Size = new System.Drawing.Size(190, 22); this.listsToolStripMenuItem.Text = "Lists"; // // orderedListSetupolToolStripMenuItem @@ -937,35 +938,35 @@ // backgroundAttachmentToolStripMenuItem // this.backgroundAttachmentToolStripMenuItem.Name = "backgroundAttachmentToolStripMenuItem"; - this.backgroundAttachmentToolStripMenuItem.Size = new System.Drawing.Size(288, 22); + this.backgroundAttachmentToolStripMenuItem.Size = new System.Drawing.Size(289, 22); this.backgroundAttachmentToolStripMenuItem.Text = "Background Attachment (Fixed or Scroll)"; this.backgroundAttachmentToolStripMenuItem.Click += new System.EventHandler(this.backgroundAttachmentToolStripMenuItem_Click); // // backgroundColorToolStripMenuItem // this.backgroundColorToolStripMenuItem.Name = "backgroundColorToolStripMenuItem"; - this.backgroundColorToolStripMenuItem.Size = new System.Drawing.Size(288, 22); + this.backgroundColorToolStripMenuItem.Size = new System.Drawing.Size(289, 22); this.backgroundColorToolStripMenuItem.Text = "Background Color"; this.backgroundColorToolStripMenuItem.Click += new System.EventHandler(this.backgroundColorToolStripMenuItem_Click); // // backgroundImageToolStripMenuItem // this.backgroundImageToolStripMenuItem.Name = "backgroundImageToolStripMenuItem"; - this.backgroundImageToolStripMenuItem.Size = new System.Drawing.Size(288, 22); + this.backgroundImageToolStripMenuItem.Size = new System.Drawing.Size(289, 22); this.backgroundImageToolStripMenuItem.Text = "Background Image"; this.backgroundImageToolStripMenuItem.Click += new System.EventHandler(this.backgroundImageToolStripMenuItem_Click); // // backgroundPositionToolStripMenuItem // this.backgroundPositionToolStripMenuItem.Name = "backgroundPositionToolStripMenuItem"; - this.backgroundPositionToolStripMenuItem.Size = new System.Drawing.Size(288, 22); + this.backgroundPositionToolStripMenuItem.Size = new System.Drawing.Size(289, 22); this.backgroundPositionToolStripMenuItem.Text = "Background Position"; this.backgroundPositionToolStripMenuItem.Click += new System.EventHandler(this.backgroundPositionToolStripMenuItem_Click); // // backgroundRepeatToolStripMenuItem // this.backgroundRepeatToolStripMenuItem.Name = "backgroundRepeatToolStripMenuItem"; - this.backgroundRepeatToolStripMenuItem.Size = new System.Drawing.Size(288, 22); + this.backgroundRepeatToolStripMenuItem.Size = new System.Drawing.Size(289, 22); this.backgroundRepeatToolStripMenuItem.Text = "Background Repeat ((no-)repeat)"; this.backgroundRepeatToolStripMenuItem.Click += new System.EventHandler(this.backgroundRepeatToolStripMenuItem_Click); // @@ -992,91 +993,91 @@ // fontToolStripMenuItem // this.fontToolStripMenuItem.Name = "fontToolStripMenuItem"; - this.fontToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.fontToolStripMenuItem.Size = new System.Drawing.Size(207, 22); this.fontToolStripMenuItem.Text = "Font"; this.fontToolStripMenuItem.Click += new System.EventHandler(this.fontToolStripMenuItem_Click); // // sizeToolStripMenuItem // this.sizeToolStripMenuItem.Name = "sizeToolStripMenuItem"; - this.sizeToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.sizeToolStripMenuItem.Size = new System.Drawing.Size(207, 22); this.sizeToolStripMenuItem.Text = "Size"; this.sizeToolStripMenuItem.Click += new System.EventHandler(this.sizeToolStripMenuItem_Click); // // weightToolStripMenuItem // this.weightToolStripMenuItem.Name = "weightToolStripMenuItem"; - this.weightToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.weightToolStripMenuItem.Size = new System.Drawing.Size(207, 22); this.weightToolStripMenuItem.Text = "Weight"; this.weightToolStripMenuItem.Click += new System.EventHandler(this.weightToolStripMenuItem_Click); // // colorToolStripMenuItem // this.colorToolStripMenuItem.Name = "colorToolStripMenuItem"; - this.colorToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.colorToolStripMenuItem.Size = new System.Drawing.Size(207, 22); this.colorToolStripMenuItem.Text = "Color"; this.colorToolStripMenuItem.Click += new System.EventHandler(this.colorToolStripMenuItem_Click); // // directionToolStripMenuItem // this.directionToolStripMenuItem.Name = "directionToolStripMenuItem"; - this.directionToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.directionToolStripMenuItem.Size = new System.Drawing.Size(207, 22); this.directionToolStripMenuItem.Text = " Direction (ltr/rtl)"; this.directionToolStripMenuItem.Click += new System.EventHandler(this.directionToolStripMenuItem_Click); // // lineHeightToolStripMenuItem // this.lineHeightToolStripMenuItem.Name = "lineHeightToolStripMenuItem"; - this.lineHeightToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.lineHeightToolStripMenuItem.Size = new System.Drawing.Size(207, 22); this.lineHeightToolStripMenuItem.Text = "Line Height"; this.lineHeightToolStripMenuItem.Click += new System.EventHandler(this.lineHeightToolStripMenuItem_Click); // // letterSpacingToolStripMenuItem // this.letterSpacingToolStripMenuItem.Name = "letterSpacingToolStripMenuItem"; - this.letterSpacingToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.letterSpacingToolStripMenuItem.Size = new System.Drawing.Size(207, 22); this.letterSpacingToolStripMenuItem.Text = "Letter Spacing (eg.: 50px)"; this.letterSpacingToolStripMenuItem.Click += new System.EventHandler(this.letterSpacingToolStripMenuItem_Click); // // alignToolStripMenuItem // this.alignToolStripMenuItem.Name = "alignToolStripMenuItem"; - this.alignToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.alignToolStripMenuItem.Size = new System.Drawing.Size(207, 22); this.alignToolStripMenuItem.Text = "Align"; this.alignToolStripMenuItem.Click += new System.EventHandler(this.alignToolStripMenuItem_Click); // // decorationToolStripMenuItem // this.decorationToolStripMenuItem.Name = "decorationToolStripMenuItem"; - this.decorationToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.decorationToolStripMenuItem.Size = new System.Drawing.Size(207, 22); this.decorationToolStripMenuItem.Text = "Decoration"; this.decorationToolStripMenuItem.Click += new System.EventHandler(this.decorationToolStripMenuItem_Click); // // indentToolStripMenuItem // this.indentToolStripMenuItem.Name = "indentToolStripMenuItem"; - this.indentToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.indentToolStripMenuItem.Size = new System.Drawing.Size(207, 22); this.indentToolStripMenuItem.Text = "Indent (eg.: 15px)"; this.indentToolStripMenuItem.Click += new System.EventHandler(this.indentToolStripMenuItem_Click); // // shadowToolStripMenuItem // this.shadowToolStripMenuItem.Name = "shadowToolStripMenuItem"; - this.shadowToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.shadowToolStripMenuItem.Size = new System.Drawing.Size(207, 22); this.shadowToolStripMenuItem.Text = "Shadow"; this.shadowToolStripMenuItem.Click += new System.EventHandler(this.shadowToolStripMenuItem_Click); // // transformToolStripMenuItem // this.transformToolStripMenuItem.Name = "transformToolStripMenuItem"; - this.transformToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.transformToolStripMenuItem.Size = new System.Drawing.Size(207, 22); this.transformToolStripMenuItem.Text = "Transform"; this.transformToolStripMenuItem.Click += new System.EventHandler(this.transformToolStripMenuItem_Click); // // wordspacingToolStripMenuItem // this.wordspacingToolStripMenuItem.Name = "wordspacingToolStripMenuItem"; - this.wordspacingToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.wordspacingToolStripMenuItem.Size = new System.Drawing.Size(207, 22); this.wordspacingToolStripMenuItem.Text = "Wordspacing (eg: 2px)"; this.wordspacingToolStripMenuItem.Click += new System.EventHandler(this.wordspacingToolStripMenuItem_Click); // @@ -1148,6 +1149,7 @@ this.MinimumSize = new System.Drawing.Size(843, 518); this.Name = "MAIN"; this.Text = "The Cashew Project"; + this.Load += new System.EventHandler(this.MAIN_Load); this.languageTabControl.ResumeLayout(false); this.cstab.ResumeLayout(false); this.csediterrorpanel.ResumeLayout(false); diff --git a/cashew/Form1.cs b/cashew/Form1.cs index c845fcb..bcd5b0b 100644 --- a/cashew/Form1.cs +++ b/cashew/Form1.cs @@ -3,7 +3,6 @@ using System.Windows.Forms; using MetroFramework; using MetroFramework.Forms; using System.IO; -using CCFunctions; using System.Drawing; using System.Diagnostics; using ICSharpCode.TextEditor.Document; @@ -16,6 +15,11 @@ using ICSharpCode.Decompiler.TypeSystem; using System.Reflection; using System.IO.Compression; using MetroFramework.Interfaces; +using CC_Functions.Misc; +using System.CodeDom.Compiler; +using Microsoft.CSharp; +using System.Text; +using System.Runtime.Serialization.Formatters.Binary; #pragma warning disable IDE1006 namespace cashew { @@ -27,10 +31,9 @@ namespace cashew { string[] cseditcodel; string[] cseditrefl; string TempPath = Path.GetTempPath() + "cashew"; - static void Splash() => Application.Run(new Splash()); public MAIN() { - Thread splash = new Thread(new ThreadStart(Splash)); - splash.Start(); + Splash splash = new Splash(); + splash.Show(); InitializeComponent(); metroControls = new IMetroControl[] { nmtext, languageTabControl, cstab, infotab, nightmodeToggle, cseditopen, cseditrun, cseditsave, csediterrorpanel, csediterrors, cseditref, infoPanel, htmltab, htmltitle, htmlOptionsTile, htmlOptionsMenu, htmlRefreshTile, htmlLoad, htmlSave, htmlLoadIndicator, htmlUpdateToggle, htmlLiveLabel, livehider, nightmodehide, pythontab, pythonSave, pythonRun, pythonOpen}; @@ -59,9 +62,11 @@ namespace cashew { File.WriteAllBytes(TempPath + @"\Python.zip", Resources.Python); ZipFile.ExtractToDirectory(TempPath + @"\Python.zip", TempPath + @"\Python"); } catch (Exception e) { MessageBox.Show(e.ToString()); } - splash.Abort(); + splash.Hide(); } + private void MAIN_Load(object sender, EventArgs e) => BringToFront(); + private void metroToggle1_CheckedChanged(object sender, EventArgs e) { if (nightmodeToggle.Checked) { Theme = MetroThemeStyle.Dark; @@ -98,18 +103,20 @@ namespace cashew { #endregion #region CS - System.Reflection.MethodInfo script; + MethodInfo script; private void metroLabel2_Click(object sender, EventArgs e) => MessageBox.Show(csediterrors.Text, "Errors"); private void metroPanel1_Click(object sender, EventArgs e) => MessageBox.Show(csediterrors.Text, "Errors"); private void cseditsave_Click(object sender, EventArgs e) { if (csSaveFileDialog.ShowDialog() == DialogResult.OK) { try { if (cseditref.Text == "Code") { - cseditrefl = Misc.StringToArray(cseditcode.Text); + cseditrefl = cseditcode.Text.Split(new string[] { "\r\n" }, StringSplitOptions.None); } else { - cseditcodel = Misc.StringToArray(cseditcode.Text); + cseditcodel = cseditcode.Text.Split(new string[] { "\r\n" }, StringSplitOptions.None); } - Misc.SaveObjectToFile(new string[][] { cseditcodel, cseditrefl }, csSaveFileDialog.FileName); + Stream s = File.OpenWrite(csSaveFileDialog.FileName); + new BinaryFormatter().Serialize(s, new string[][] { cseditcodel, cseditrefl }); + s.Dispose(); } catch (Exception e1) { MessageBox.Show(e1.Message, "Failed to Save"); } @@ -121,11 +128,31 @@ namespace cashew { try { csediterrors.Text = ""; if (cseditref.Text == "Code") { - cseditrefl = Misc.StringToArray(cseditcode.Text); + cseditrefl = cseditcode.Text.Split(new string[] { "\r\n" }, StringSplitOptions.None); } else { - cseditcodel = Misc.StringToArray(cseditcode.Text); + cseditcodel = cseditcode.Text.Split(new string[] { "\r\n" }, StringSplitOptions.None); } - script = Compiling.CScriptToMethod(Misc.ArrayToString(cseditcodel, true), "Project", "Program", "Main", cseditrefl, new Microsoft.CSharp.CSharpCodeProvider(), new System.CodeDom.Compiler.CompilerParameters(), true, true); + CSharpCodeProvider provider = new CSharpCodeProvider(); + CompilerParameters parameters = new CompilerParameters + { + GenerateInMemory = true, + GenerateExecutable = true + }; + for (int i = 0; i < cseditrefl.Length; i++) + parameters.ReferencedAssemblies.Add(cseditrefl[i]); + CompilerResults results = provider.CompileAssemblyFromSource(parameters, ArrayFormatter.ArrayToString(cseditcodel)); + if (results.Errors.HasErrors) + { + StringBuilder sb = new StringBuilder(); + foreach (CompilerError error in results.Errors) + { + sb.AppendLine(string.Format("Error ({0}): {1}", error.ErrorNumber, error.ErrorText)); + } + throw new InvalidOperationException(sb.ToString()); + } + Assembly assembly = results.CompiledAssembly; + Type program = assembly.GetType("Project.Program"); + script = program.GetMethod("Main"); cseditrun.Text = "Stop"; cseditexecutor.RunWorkerAsync(); csediterrors.Text = "Ready"; @@ -141,21 +168,23 @@ namespace cashew { if (csOpenFileDialog.ShowDialog() == DialogResult.OK) { try { if (csOpenFileDialog.FilterIndex == 1) { - string[][] tmp = (string[][])Misc.LoadObjectFromFile(csOpenFileDialog.FileName); + Stream s = File.OpenRead(csOpenFileDialog.FileName); + string[][] tmp = (string[][])new BinaryFormatter().Deserialize(s); + s.Dispose(); cseditcodel = tmp[0]; cseditrefl = tmp[1]; if (cseditref.Text == "References") - cseditcode.Text = Misc.ArrayToString(cseditcodel, true); + cseditcode.Text = ArrayFormatter.ArrayToString(cseditcodel); else - cseditcode.Text = Misc.ArrayToString(cseditrefl, true); + cseditcode.Text = ArrayFormatter.ArrayToString(cseditrefl); } else { CSharpDecompiler decompiler = new CSharpDecompiler(csOpenFileDialog.FileName, new DecompilerSettings()); - cseditcodel = Misc.StringToArray(decompiler.DecompileWholeModuleAsString().Replace("\r", "")); + cseditcodel = decompiler.DecompileWholeModuleAsString().Split(new string[] { "\r\n" }, StringSplitOptions.None); cseditrefl = new string[]{}; if (cseditref.Text == "References") - cseditcode.Text = Misc.ArrayToString(cseditcodel, true); + cseditcode.Text = ArrayFormatter.ArrayToString(cseditcodel); else - cseditcode.Text = Misc.ArrayToString(cseditrefl, true); + cseditcode.Text = ArrayFormatter.ArrayToString(cseditrefl); } } catch (Exception e1) { MessageBox.Show(e1.ToString(), "Failed to Load"); @@ -165,13 +194,13 @@ namespace cashew { private void cseditref_Click(object sender, EventArgs e) { if (cseditref.Text == "References") { - cseditcodel = Misc.StringToArray(cseditcode.Text.Replace("\r", "")); - cseditcode.Text = Misc.ArrayToString(cseditrefl, true); + cseditcodel = cseditcode.Text.Split(new string[] { "\r\n" }, StringSplitOptions.None); + cseditcode.Text = ArrayFormatter.ArrayToString(cseditrefl); cseditcode.Refresh(); cseditref.Text = "Code"; } else { - cseditrefl = Misc.StringToArray(cseditcode.Text.Replace("\r", "")); - cseditcode.Text = Misc.ArrayToString(cseditcodel, true); + cseditrefl = cseditcode.Text.Split(new string[] { "\r\n" }, StringSplitOptions.None); + cseditcode.Text = ArrayFormatter.ArrayToString(cseditcodel); cseditcode.Refresh(); cseditref.Text = "References"; } @@ -199,8 +228,11 @@ namespace cashew { private void metroToggle2_CheckedChanged(object sender, EventArgs e) => UpdateHTML = htmlUpdateToggle.Checked; private void htmldisplay_Navigating(object sender, WebBrowserNavigatingEventArgs e) => htmlLoadIndicator.Visible = true; - private void htmltext_TextChanged(object sender, EventArgs e) { - if (UpdateHTML) { + + private void HtmlText_TextChanged_1(object sender, EventArgs e) + { + if (UpdateHTML) + { htmldisplay.DocumentText = htmlText.Text; htmltitle.Text = htmldisplay.DocumentTitle; } @@ -215,10 +247,10 @@ namespace cashew { private void htmlOptionsTile_MouseEnter(object sender, EventArgs e) { if (htmlText.ActiveTextAreaControl.TextArea.SelectionManager.HasSomethingSelected) { ISelection sel = htmlText.ActiveTextAreaControl.SelectionManager.SelectionCollection[0]; - List tmp = Misc.StringToArray(htmlText.Text).OfType().ToList(); + List tmp = htmlText.Text.Split(new string[] { "\r\n" }, StringSplitOptions.None).ToList(); //Not working: sele not working tmp.RemoveRange(sel.EndPosition.Line - 1, tmp.Count - sel.EndPosition.Line); //Determins line - sels = Misc.ArrayToString(tmp.ToArray(), true).ToCharArray().Length + sel.StartPosition.Column; //Line + Column + sels = ArrayFormatter.ArrayToString(tmp.ToArray()).ToCharArray().Length + sel.StartPosition.Column; //Line + Column sele = sels + sel.Length; } else { sels = 0; sele = htmlText.Text.Length; } } @@ -231,7 +263,7 @@ namespace cashew { private void htmlSave_Click(object sender, EventArgs e) { if (htmlSaveFileDialog.ShowDialog() == DialogResult.OK) { try { - File.WriteAllLines(htmlSaveFileDialog.FileName, Misc.StringToArray(htmlText.Text)); + File.WriteAllText(htmlSaveFileDialog.FileName, htmlText.Text); } catch (Exception e1) { MessageBox.Show(e1.Message, "Saving Failed"); } @@ -241,7 +273,7 @@ namespace cashew { private void htmlLoad_Click(object sender, EventArgs e) { if (htmlOpenFileDialog.ShowDialog() == DialogResult.OK) { try { - htmlText.Text = Misc.ArrayToString(File.ReadAllLines(htmlOpenFileDialog.FileName), true); + htmlText.Text = File.ReadAllText(htmlOpenFileDialog.FileName); } catch (Exception e1) { MessageBox.Show(e1.Message, "Loading Failed"); } @@ -314,7 +346,7 @@ namespace cashew { private void pythonOpen_Click(object sender, EventArgs e) { if (pythonOpenFileDialog.ShowDialog() == DialogResult.OK) { try { - pythonCode.Text = Misc.ArrayToString(File.ReadAllLines(pythonOpenFileDialog.FileName), true); + pythonCode.Text = File.ReadAllText(pythonOpenFileDialog.FileName); } catch (Exception e1) { MessageBox.Show(e1.Message, "Loading Failed"); } @@ -324,7 +356,7 @@ namespace cashew { private void pythonSave_Click(object sender, EventArgs e) { if (pythonSaveFileDialog.ShowDialog() == DialogResult.OK) { try { - File.WriteAllLines(pythonSaveFileDialog.FileName, Misc.StringToArray(pythonCode.Text)); + File.WriteAllText(pythonSaveFileDialog.FileName, pythonCode.Text); } catch (Exception e1) { MessageBox.Show(e1.Message, "Saving Failed"); @@ -333,7 +365,7 @@ namespace cashew { } private void pythonRun_Click(object sender, EventArgs e) { - File.WriteAllLines(TempPath + @"\Python\tmp.py", Misc.StringToArray(pythonCode.Text)); + File.WriteAllText(TempPath + @"\Python\tmp.py", pythonCode.Text); Process process = Process.Start(new ProcessStartInfo { FileName = TempPath + @"\Python\python.exe", Arguments = TempPath + @"\Python\tmp.py", UseShellExecute = true }); } #endregion diff --git a/cashew/cashew.csproj b/cashew/cashew.csproj index 33ccc78..a58afad 100644 --- a/cashew/cashew.csproj +++ b/cashew/cashew.csproj @@ -1,6 +1,5 @@  - Debug @@ -48,14 +47,11 @@ ..\..\T.O.F.U\Net_TOFU\bin\Release\CCFunctions.dll - - ..\packages\Costura.Fody.3.2.0\lib\net46\Costura.dll + + ..\packages\Humanizer.Core.2.7.2\lib\netstandard2.0\Humanizer.dll - - ..\packages\Humanizer.Core.2.5.16\lib\netstandard2.0\Humanizer.dll - - - ..\packages\ICSharpCode.Decompiler.3.2.0.3856\lib\net46\ICSharpCode.Decompiler.dll + + ..\packages\ICSharpCode.Decompiler.4.0.0.4521\lib\net46\ICSharpCode.Decompiler.dll ..\packages\ICSharpCode.NRefactory.5.5.1\lib\Net40\ICSharpCode.NRefactory.dll @@ -81,17 +77,17 @@ ..\packages\MetroModernUI.1.4.0.0\lib\net\MetroFramework.Fonts.dll - - ..\packages\Mono.Cecil.0.10.1\lib\net40\Mono.Cecil.dll + + ..\packages\Mono.Cecil.0.11.0\lib\net40\Mono.Cecil.dll - - ..\packages\Mono.Cecil.0.10.1\lib\net40\Mono.Cecil.Mdb.dll + + ..\packages\Mono.Cecil.0.11.0\lib\net40\Mono.Cecil.Mdb.dll - - ..\packages\Mono.Cecil.0.10.1\lib\net40\Mono.Cecil.Pdb.dll + + ..\packages\Mono.Cecil.0.11.0\lib\net40\Mono.Cecil.Pdb.dll - - ..\packages\Mono.Cecil.0.10.1\lib\net40\Mono.Cecil.Rocks.dll + + ..\packages\Mono.Cecil.0.11.0\lib\net40\Mono.Cecil.Rocks.dll ..\..\..\ICSharpCode.TextEditor\nunit.framework.dll @@ -107,6 +103,9 @@ ..\..\T.O.F.U\Net_TOFU\bin\Release\System.IO.Compression.dll + + ..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard2.0\System.Reflection.Metadata.dll + ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll @@ -212,13 +211,11 @@ True + + + {b80d5e09-b935-4602-a173-baf7c1974999} + Misc + + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/cashew/packages.config b/cashew/packages.config index f7512aa..4effd81 100644 --- a/cashew/packages.config +++ b/cashew/packages.config @@ -1,13 +1,12 @@  - - - - + + - + + \ No newline at end of file