diff --git a/Papercut.Core/Papercut.Core.csproj b/Cauldron.Core/Cauldron.Core.csproj similarity index 68% rename from Papercut.Core/Papercut.Core.csproj rename to Cauldron.Core/Cauldron.Core.csproj index 0e29ee0..58c2d37 100644 --- a/Papercut.Core/Papercut.Core.csproj +++ b/Cauldron.Core/Cauldron.Core.csproj @@ -6,6 +6,9 @@ enable + + 4 + diff --git a/Papercut.Core/PapercutWriter.cs b/Cauldron.Core/CauldronWriter.cs similarity index 63% rename from Papercut.Core/PapercutWriter.cs rename to Cauldron.Core/CauldronWriter.cs index 5dd079a..a74edfa 100644 --- a/Papercut.Core/PapercutWriter.cs +++ b/Cauldron.Core/CauldronWriter.cs @@ -1,12 +1,12 @@ using System; -namespace Papercut.Core; +namespace Cauldron.Core; -public class PapercutWriter +public class CauldronWriter { private Func OutputFunc { get; set; } - public PapercutWriter(Func outputFunc) + public CauldronWriter(Func outputFunc) { this.OutputFunc = outputFunc; } diff --git a/Papercut.Core/RoslynHost.cs b/Cauldron.Core/RoslynHost.cs similarity index 84% rename from Papercut.Core/RoslynHost.cs rename to Cauldron.Core/RoslynHost.cs index abbb3a1..c840291 100644 --- a/Papercut.Core/RoslynHost.cs +++ b/Cauldron.Core/RoslynHost.cs @@ -1,7 +1,7 @@ using Microsoft.CodeAnalysis.CSharp.Scripting; using Microsoft.CodeAnalysis.Scripting; -namespace Papercut.Core; +namespace Cauldron.Core; public class RoslynHost { @@ -26,10 +26,10 @@ public class RoslynHost public class RoslynHostGlobals { - public PapercutWriter Papercut { get; set; } + public CauldronWriter Cauldron { get; set; } - public RoslynHostGlobals(PapercutWriter writer) + public RoslynHostGlobals(CauldronWriter writer) { - this.Papercut = writer; + this.Cauldron = writer; } } diff --git a/Papercut.Macos/.DS_Store b/Cauldron.Macos/.DS_Store similarity index 100% rename from Papercut.Macos/.DS_Store rename to Cauldron.Macos/.DS_Store diff --git a/Papercut.Macos/AppDelegate.cs b/Cauldron.Macos/AppDelegate.cs similarity index 96% rename from Papercut.Macos/AppDelegate.cs rename to Cauldron.Macos/AppDelegate.cs index 0373dbf..42fb347 100644 --- a/Papercut.Macos/AppDelegate.cs +++ b/Cauldron.Macos/AppDelegate.cs @@ -1,7 +1,7 @@ using AppKit; using Foundation; -namespace Papercut.Macos; +namespace Cauldron.Macos; [Register("AppDelegate")] public partial class AppDelegate : NSApplicationDelegate diff --git a/Papercut.Macos/AppDelegate.designer.cs b/Cauldron.Macos/AppDelegate.designer.cs similarity index 95% rename from Papercut.Macos/AppDelegate.designer.cs rename to Cauldron.Macos/AppDelegate.designer.cs index 61298c4..c7f493b 100644 --- a/Papercut.Macos/AppDelegate.designer.cs +++ b/Cauldron.Macos/AppDelegate.designer.cs @@ -7,7 +7,7 @@ using Foundation; using System.CodeDom.Compiler; -namespace Papercut.Macos +namespace Cauldron.Macos { partial class AppDelegate { diff --git a/Papercut.Macos/Assets.xcassets/AccentColor.colorset/Contents.json b/Cauldron.Macos/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from Papercut.Macos/Assets.xcassets/AccentColor.colorset/Contents.json rename to Cauldron.Macos/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/Papercut.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png b/Cauldron.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png similarity index 100% rename from Papercut.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png rename to Cauldron.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png diff --git a/Papercut.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png b/Cauldron.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png similarity index 100% rename from Papercut.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png rename to Cauldron.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png diff --git a/Papercut.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png b/Cauldron.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png similarity index 100% rename from Papercut.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png rename to Cauldron.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png diff --git a/Papercut.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png b/Cauldron.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png similarity index 100% rename from Papercut.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png rename to Cauldron.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png diff --git a/Papercut.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png b/Cauldron.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png similarity index 100% rename from Papercut.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png rename to Cauldron.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png diff --git a/Papercut.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png b/Cauldron.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png similarity index 100% rename from Papercut.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png rename to Cauldron.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png diff --git a/Papercut.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png b/Cauldron.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png similarity index 100% rename from Papercut.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png rename to Cauldron.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png diff --git a/Papercut.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png b/Cauldron.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png similarity index 100% rename from Papercut.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png rename to Cauldron.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png diff --git a/Papercut.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png b/Cauldron.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png similarity index 100% rename from Papercut.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png rename to Cauldron.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png diff --git a/Papercut.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png b/Cauldron.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png similarity index 100% rename from Papercut.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png rename to Cauldron.Macos/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png diff --git a/Papercut.Macos/Assets.xcassets/AppIcon.appiconset/Contents.json b/Cauldron.Macos/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Papercut.Macos/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Cauldron.Macos/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/Papercut.Macos/Assets.xcassets/Contents.json b/Cauldron.Macos/Assets.xcassets/Contents.json similarity index 100% rename from Papercut.Macos/Assets.xcassets/Contents.json rename to Cauldron.Macos/Assets.xcassets/Contents.json diff --git a/Papercut.Macos/Papercut.Macos.csproj b/Cauldron.Macos/Cauldron.Macos.csproj similarity index 88% rename from Papercut.Macos/Papercut.Macos.csproj rename to Cauldron.Macos/Cauldron.Macos.csproj index 92282b4..a57a7a5 100644 --- a/Papercut.Macos/Papercut.Macos.csproj +++ b/Cauldron.Macos/Cauldron.Macos.csproj @@ -2,8 +2,8 @@ net7.0-macos Exe - Papercut - com.neilbrommer.papercut + Cauldron + com.neilbrommer.cauldron 1 1.0 AccentColor @@ -13,7 +13,7 @@ false 4 None - Papercut + Cauldron false @@ -46,6 +46,6 @@ - + diff --git a/Papercut.Macos/Entitlements.plist b/Cauldron.Macos/Entitlements.plist similarity index 100% rename from Papercut.Macos/Entitlements.plist rename to Cauldron.Macos/Entitlements.plist diff --git a/Papercut.Macos/Info.plist b/Cauldron.Macos/Info.plist similarity index 92% rename from Papercut.Macos/Info.plist rename to Cauldron.Macos/Info.plist index 5d31a73..a42dc71 100644 --- a/Papercut.Macos/Info.plist +++ b/Cauldron.Macos/Info.plist @@ -3,9 +3,9 @@ CFBundleName - Papercut + Cauldron CFBundleIdentifier - com.neilbrommer.papercut + com.neilbrommer.cauldron CFBundleShortVersionString 1.0 CFBundleVersion diff --git a/Papercut.Macos/Main.cs b/Cauldron.Macos/Main.cs similarity index 84% rename from Papercut.Macos/Main.cs rename to Cauldron.Macos/Main.cs index 4ae1a5f..1c921d1 100644 --- a/Papercut.Macos/Main.cs +++ b/Cauldron.Macos/Main.cs @@ -1,6 +1,6 @@ using AppKit; -namespace Papercut.Macos; +namespace Cauldron.Macos; static class MainClass { diff --git a/Papercut.Macos/Main.storyboard b/Cauldron.Macos/Main.storyboard similarity index 95% rename from Papercut.Macos/Main.storyboard rename to Cauldron.Macos/Main.storyboard index 0cc9b9c..c11b99e 100644 --- a/Papercut.Macos/Main.storyboard +++ b/Cauldron.Macos/Main.storyboard @@ -6,17 +6,17 @@ - + - + - + - + - + @@ -30,7 +30,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -413,7 +413,7 @@ - + @@ -519,7 +519,14 @@ - + + + + + + + + @@ -587,15 +594,25 @@ - + + + + - + diff --git a/Papercut.Macos/MainWindow.cs b/Cauldron.Macos/MainWindow.cs similarity index 92% rename from Papercut.Macos/MainWindow.cs rename to Cauldron.Macos/MainWindow.cs index 4d19979..834fe20 100644 --- a/Papercut.Macos/MainWindow.cs +++ b/Cauldron.Macos/MainWindow.cs @@ -2,7 +2,7 @@ using System; using System.Threading; using AppKit; -namespace Papercut.Macos; +namespace Cauldron.Macos; public partial class MainWindow : NSWindowController { @@ -20,6 +20,12 @@ public partial class MainWindow : NSWindowController .SplitViewItems[0].ViewController; } + private NSOutlineView SidebarList + { + get => (this.SidebarController.View.Subviews[0] as NSScrollView) + .ContentView.DocumentView as NSOutlineView; + } + private NSTextView ScriptEditorTextBox { get => (this.MainContentController diff --git a/Papercut.Macos/MainWindow.designer.cs b/Cauldron.Macos/MainWindow.designer.cs similarity index 96% rename from Papercut.Macos/MainWindow.designer.cs rename to Cauldron.Macos/MainWindow.designer.cs index 330b519..2947543 100644 --- a/Papercut.Macos/MainWindow.designer.cs +++ b/Cauldron.Macos/MainWindow.designer.cs @@ -7,7 +7,7 @@ using Foundation; using System.CodeDom.Compiler; -namespace Papercut.Macos +namespace Cauldron.Macos { [Register ("MainWindow")] partial class MainWindow diff --git a/Papercut.Macos/ScriptRunner.cs b/Cauldron.Macos/ScriptRunner.cs similarity index 91% rename from Papercut.Macos/ScriptRunner.cs rename to Cauldron.Macos/ScriptRunner.cs index a2aed13..5be971a 100644 --- a/Papercut.Macos/ScriptRunner.cs +++ b/Cauldron.Macos/ScriptRunner.cs @@ -1,10 +1,9 @@ using System; -using Papercut.Core; using System.Threading; using System.Threading.Tasks; -using AppKit; +using Cauldron.Core; -namespace Papercut.Macos; +namespace Cauldron.Macos; public static class ScriptRunner { @@ -14,7 +13,7 @@ public static class ScriptRunner window.ScriptOutputTextBox.Value = ""; TaskScheduler uiThread = TaskScheduler.FromCurrentSynchronizationContext(); - PapercutWriter writer = new(obj => + CauldronWriter writer = new(obj => { if (obj is string str) { diff --git a/Papercut.sln b/Cauldron.sln similarity index 90% rename from Papercut.sln rename to Cauldron.sln index ad56043..35a8441 100644 --- a/Papercut.sln +++ b/Cauldron.sln @@ -3,13 +3,14 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 25.0.1705.2 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Papercut.Macos", "Papercut.Macos\Papercut.Macos.csproj", "{5596E3FE-A9CD-4B68-AD24-04D93FB70FD1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cauldron.Macos", "Cauldron.Macos\Cauldron.Macos.csproj", "{5596E3FE-A9CD-4B68-AD24-04D93FB70FD1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Papercut.Core", "Papercut.Core\Papercut.Core.csproj", "{BB41450F-03F2-45E7-8859-20ED74BD006C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cauldron.Core", "Cauldron.Core\Cauldron.Core.csproj", "{BB41450F-03F2-45E7-8859-20ED74BD006C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7D25BD06-3AC2-44BC-8DF7-ECBEB8CB17FB}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig + .gitignore = .gitignore EndProjectSection EndProject Global