diff --git a/NotePadWF-CS.csproj b/NotePadWF-CS.csproj deleted file mode 100644 index 6b7543c..0000000 --- a/NotePadWF-CS.csproj +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - - - - Debug - AnyCPU - {51B89A06-401B-487A-9705-FB616005FCD8} - WinExe - NotePadWF_CS - .NETpad - v4.7.2 - 512 - true - true - - - false - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 2 - 1.0.0.%2a - false - true - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - app.manifest - - - BD128E461B8E77F231804FCF98CF395B91DADA19 - - - NotePadWF-CS_TemporaryKey.pfx - - - false - - - false - - - LocalIntranet - - - Hopstarter-Sleek-Xp-Software-Notepad.ico - - - NotePadWF_CS.Program - - - - - - - - - - - - - - - - - - Form - - - AboutBox1.cs - - - Form - - - Form1.cs - - - - - AboutBox1.cs - - - Form1.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - - - - - - - - - - - - - - - False - Microsoft .NET Framework 4.7.2 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 - false - - - - - - - - - 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/NotePadWF-CS.sln b/NotePadWF-CS.sln index 4ab9e9a..a94d376 100644 --- a/NotePadWF-CS.sln +++ b/NotePadWF-CS.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29519.87 +# Visual Studio Version 17 +VisualStudioVersion = 17.1.32120.378 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NotePadWF-CS", "NotePadWF-CS.csproj", "{51B89A06-401B-487A-9705-FB616005FCD8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NotePadWF-CS", "src\NotePadWF-CS.csproj", "{70BB7984-8689-4778-AC48-D0A6216DB3A4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,15 +11,15 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {51B89A06-401B-487A-9705-FB616005FCD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51B89A06-401B-487A-9705-FB616005FCD8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51B89A06-401B-487A-9705-FB616005FCD8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51B89A06-401B-487A-9705-FB616005FCD8}.Release|Any CPU.Build.0 = Release|Any CPU + {70BB7984-8689-4778-AC48-D0A6216DB3A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {70BB7984-8689-4778-AC48-D0A6216DB3A4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {70BB7984-8689-4778-AC48-D0A6216DB3A4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {70BB7984-8689-4778-AC48-D0A6216DB3A4}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {800F1578-5F25-499D-8DD8-68AC3BAA57AA} + SolutionGuid = {CCC553FE-FD59-4EB5-B233-4D1FDAED3D9B} EndGlobalSection EndGlobal diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs deleted file mode 100644 index b60bb9b..0000000 --- a/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle(".NETpad")] -[assembly: AssemblyDescription("A Notepad replacement written in C#, .NET Framework 4.7x, and Windows Forms")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Paul Thurrott")] -[assembly: AssemblyProduct(".NETpad")] -[assembly: AssemblyCopyright("Copyright © 2022 Paul Thurrott")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("51b89a06-401b-487a-9705-fb616005fcd8")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs deleted file mode 100644 index a4ad5ae..0000000 --- a/Properties/Resources.Designer.cs +++ /dev/null @@ -1,71 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace NotePadWF_CS.Properties -{ - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("NotePadWF_CS.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { - return resourceCulture; - } - set - { - resourceCulture = value; - } - } - } -} diff --git a/Properties/Resources.resx b/Properties/Resources.resx deleted file mode 100644 index af7dbeb..0000000 --- a/Properties/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/README.md b/README.md index 758917b..8d28c17 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ **(C#/.NET Framework 4.7x/Windows Forms version)** -![.NETpad hero image](/graphics/hero.jpg) +![.NETpad hero image](docs/screenshots/hero.jpg) .NETpad is a basic clone of Microsoft Notepad that was created by Paul Thurrott ([@thurrott](https://www.twitter.com/thurrott)) with the help of Rafael Rivera ([@withinrafael](https://www.twitter.com/withinrafael)), several outside contributors, and, thanks to his books, Charles Petzold. It is technologically unsophisticated and has many bugs. But .NETpad provides most Notepad features, albeit in U.S. English only, and adds a few additional features that Notepad lacks, including: diff --git a/app.manifest b/app.manifest deleted file mode 100644 index 9f5fc80..0000000 --- a/app.manifest +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - \ No newline at end of file diff --git a/graphics/hero.jpg b/docs/screenshots/hero.jpg similarity index 100% rename from graphics/hero.jpg rename to docs/screenshots/hero.jpg diff --git a/global.json b/global.json new file mode 100644 index 0000000..d6c2c37 --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "version": "6.0.100", + "rollForward": "latestFeature" + } +} \ No newline at end of file diff --git a/packages.config b/packages.config deleted file mode 100644 index 03b42e4..0000000 --- a/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/AboutBox1.Designer.cs b/src/AboutBox1.Designer.cs similarity index 100% rename from AboutBox1.Designer.cs rename to src/AboutBox1.Designer.cs diff --git a/AboutBox1.cs b/src/AboutBox1.cs similarity index 98% rename from AboutBox1.cs rename to src/AboutBox1.cs index fcbe7c6..4541977 100644 --- a/AboutBox1.cs +++ b/src/AboutBox1.cs @@ -37,7 +37,7 @@ public string AssemblyTitle return titleAttribute.Title; } } - return System.IO.Path.GetFileNameWithoutExtension(Assembly.GetExecutingAssembly().CodeBase); + return System.IO.Path.GetFileNameWithoutExtension(Assembly.GetExecutingAssembly().Location); } } @@ -100,6 +100,6 @@ public string AssemblyCompany return ((AssemblyCompanyAttribute)attributes[0]).Company; } } - #endregion +#endregion } } diff --git a/AboutBox1.resx b/src/AboutBox1.resx similarity index 93% rename from AboutBox1.resx rename to src/AboutBox1.resx index 76cc9af..119d188 100644 --- a/AboutBox1.resx +++ b/src/AboutBox1.resx @@ -1,64 +1,4 @@ - - - + diff --git a/App.config b/src/App.config similarity index 85% rename from App.config rename to src/App.config index 6334266..3608737 100644 --- a/App.config +++ b/src/App.config @@ -5,12 +5,6 @@
- - - - - - diff --git a/Form1.Designer.cs b/src/Form1.Designer.cs similarity index 100% rename from Form1.Designer.cs rename to src/Form1.Designer.cs diff --git a/Form1.cs b/src/Form1.cs similarity index 98% rename from Form1.cs rename to src/Form1.cs index 9781395..cc48a12 100644 --- a/Form1.cs +++ b/src/Form1.cs @@ -368,11 +368,11 @@ private void searchWithBingToolStripMenuItem_Click(object sender, EventArgs e) { if (richTextBox1.SelectedText.Length != 0) { - Process.Start("https://www.bing.com/search?q=" + richTextBox1.SelectedText); + LaunchBrowser("https://www.bing.com/search?q=" + richTextBox1.SelectedText); } else { - Process.Start("https://www.bing.com"); + LaunchBrowser("https://www.bing.com"); } } catch(Exception ex) @@ -381,6 +381,11 @@ private void searchWithBingToolStripMenuItem_Click(object sender, EventArgs e) } } + private static void LaunchBrowser(string url) + { + Process.Start(new ProcessStartInfo("cmd", $"/c start {url}")); + } + private void goToToolStripMenuItem_Click(object sender, EventArgs e) { try diff --git a/Form1.resx b/src/Form1.resx similarity index 100% rename from Form1.resx rename to src/Form1.resx diff --git a/Hopstarter-Sleek-Xp-Software-Notepad.ico b/src/Hopstarter-Sleek-Xp-Software-Notepad.ico similarity index 100% rename from Hopstarter-Sleek-Xp-Software-Notepad.ico rename to src/Hopstarter-Sleek-Xp-Software-Notepad.ico diff --git a/src/NotePadWF-CS.csproj b/src/NotePadWF-CS.csproj new file mode 100644 index 0000000..8a86e58 --- /dev/null +++ b/src/NotePadWF-CS.csproj @@ -0,0 +1,27 @@ + + + net6-windows + winexe + NotePadWF_CS + .NETpad + PerMonitorV2 + Hopstarter-Sleek-Xp-Software-Notepad.ico + A Notepad replacement written in C#, .NET Framework 4.7x, and Windows Forms + Paul Thurrott + Copyright © 2022 Paul Thurrott + true + true + true + + + + + + + Settings.settings + + + SettingsSingleFileGenerator + + + \ No newline at end of file diff --git a/Program.cs b/src/Program.cs similarity index 83% rename from Program.cs rename to src/Program.cs index 83c7d78..e69d127 100644 --- a/Program.cs +++ b/src/Program.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using System.Windows.Forms; namespace NotePadWF_CS diff --git a/Properties/Settings.Designer.cs b/src/Properties/Settings.Designer.cs similarity index 99% rename from Properties/Settings.Designer.cs rename to src/Properties/Settings.Designer.cs index cacc71e..6f595b9 100644 --- a/Properties/Settings.Designer.cs +++ b/src/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace NotePadWF_CS.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/Properties/Settings.settings b/src/Properties/Settings.settings similarity index 100% rename from Properties/Settings.settings rename to src/Properties/Settings.settings