Rename to Cauldron

This commit is contained in:
Neil Brommer 2023-07-21 13:11:56 -07:00
parent aff9c5264d
commit 93e828beb0
28 changed files with 61 additions and 35 deletions

View File

@ -6,6 +6,9 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.6.0" />
</ItemGroup>

View File

@ -1,12 +1,12 @@
using System;
namespace Papercut.Core;
namespace Cauldron.Core;
public class PapercutWriter
public class CauldronWriter
{
private Func<object, Task> OutputFunc { get; set; }
public PapercutWriter(Func<object, Task> outputFunc)
public CauldronWriter(Func<object, Task> outputFunc)
{
this.OutputFunc = outputFunc;
}

View File

@ -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;
}
}

View File

@ -1,7 +1,7 @@
using AppKit;
using Foundation;
namespace Papercut.Macos;
namespace Cauldron.Macos;
[Register("AppDelegate")]
public partial class AppDelegate : NSApplicationDelegate

View File

@ -7,7 +7,7 @@
using Foundation;
using System.CodeDom.Compiler;
namespace Papercut.Macos
namespace Cauldron.Macos
{
partial class AppDelegate
{

View File

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

View File

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

View File

Before

Width:  |  Height:  |  Size: 711 B

After

Width:  |  Height:  |  Size: 711 B

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

View File

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 58 KiB

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 58 KiB

View File

Before

Width:  |  Height:  |  Size: 174 KiB

After

Width:  |  Height:  |  Size: 174 KiB

View File

@ -2,8 +2,8 @@
<PropertyGroup>
<TargetFramework>net7.0-macos</TargetFramework>
<OutputType>Exe</OutputType>
<ApplicationTitle>Papercut</ApplicationTitle>
<ApplcationId>com.neilbrommer.papercut</ApplcationId>
<ApplicationTitle>Cauldron</ApplicationTitle>
<ApplcationId>com.neilbrommer.cauldron</ApplcationId>
<ApplicationVersion>1</ApplicationVersion>
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
<AccentColor>AccentColor</AccentColor>
@ -13,7 +13,7 @@
<UseSGen>false</UseSGen>
<WarningLevel>4</WarningLevel>
<LinkMode>None</LinkMode>
<AssemblyName>Papercut</AssemblyName>
<AssemblyName>Cauldron</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<CreatePackage>false</CreatePackage>
@ -46,6 +46,6 @@
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Papercut.Core\Papercut.Core.csproj" />
<ProjectReference Include="..\Cauldron.Core\Cauldron.Core.csproj" />
</ItemGroup>
</Project>

View File

@ -3,9 +3,9 @@
<plist version="1.0">
<dict>
<key>CFBundleName</key>
<string>Papercut</string>
<string>Cauldron</string>
<key>CFBundleIdentifier</key>
<string>com.neilbrommer.papercut</string>
<string>com.neilbrommer.cauldron</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>

View File

@ -1,6 +1,6 @@
using AppKit;
namespace Papercut.Macos;
namespace Cauldron.Macos;
static class MainClass
{

View File

@ -6,17 +6,17 @@
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--Papercut Application-->
<!--Cauldron Application-->
<scene sceneID="JPo-4y-FX3">
<objects>
<application id="hnw-xV-0zn" customClass="PapercutApplication" sceneMemberID="viewController">
<application id="hnw-xV-0zn" customClass="CauldronApplication" sceneMemberID="viewController">
<menu key="mainMenu" title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
<items>
<menuItem title="Papercut" id="1Xt-HY-uBw">
<menuItem title="Cauldron" id="1Xt-HY-uBw">
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="Papercut" systemMenu="apple" id="uQy-DD-JDr">
<menu key="submenu" title="Cauldron" systemMenu="apple" id="uQy-DD-JDr">
<items>
<menuItem title="About Papercut" id="5kV-Vb-QxS">
<menuItem title="About Cauldron" id="5kV-Vb-QxS">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>
@ -30,7 +30,7 @@
<menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
</menuItem>
<menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
<menuItem title="Hide Papercut" keyEquivalent="h" id="Olw-nP-bQN">
<menuItem title="Hide Cauldron" keyEquivalent="h" id="Olw-nP-bQN">
<connections>
<action selector="hide:" target="Ady-hI-5gd" id="PnN-Uc-m68"/>
</connections>
@ -48,7 +48,7 @@
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
<menuItem title="Quit Papercut" keyEquivalent="q" id="4sb-4s-VLi">
<menuItem title="Quit Cauldron" keyEquivalent="q" id="4sb-4s-VLi">
<connections>
<action selector="terminate:" target="Ady-hI-5gd" id="Te7-pn-YzF"/>
</connections>
@ -413,7 +413,7 @@
<scene sceneID="ktg-sd-7li">
<objects>
<windowController id="JKR-xj-8kh" customClass="MainWindow" sceneMemberID="viewController">
<window key="window" title="Papercut" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" frameAutosaveName="" animationBehavior="default" tabbingMode="preferred" id="d7K-Gm-g9N">
<window key="window" title="Cauldron" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" frameAutosaveName="" animationBehavior="default" tabbingMode="preferred" id="d7K-Gm-g9N">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" fullSizeContentView="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="211" y="264" width="620" height="406"/>
@ -519,7 +519,14 @@
<size key="minSize" width="700" height="300"/>
<size key="maxSize" width="700" height="10000000"/>
<attributedString key="textStorage">
<fragment content="Papercut.Dump(&quot;From Script&quot;);">
<fragment content="Cauldron">
<attributes>
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" size="14" name="Menlo-Regular"/>
<paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
<fragment content=".Dump(&quot;From Script&quot;);">
<attributes>
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
<font key="NSFont" size="14" name="Menlo-Regular"/>
@ -587,15 +594,25 @@
<objects>
<viewController id="fla-BV-I1i" sceneMemberID="viewController">
<view key="view" id="I9t-hb-gof">
<rect key="frame" x="0.0" y="0.0" width="200" height="300"/>
<rect key="frame" x="0.0" y="0.0" width="200" height="363"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZbN-j2-IXm">
<rect key="frame" x="18" y="202" width="65" height="18"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="check" title="Check" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="wZq-of-aVB">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
</subviews>
<viewLayoutGuide key="safeArea" id="MRU-Un-NFk"/>
<viewLayoutGuide key="layoutMargins" id="m0i-b2-MSN"/>
</view>
</viewController>
<customObject id="PWt-9c-6po" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-392.5" y="640"/>
<point key="canvasLocation" x="-393" y="639.5"/>
</scene>
</scenes>
<resources>

View File

@ -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

View File

@ -7,7 +7,7 @@
using Foundation;
using System.CodeDom.Compiler;
namespace Papercut.Macos
namespace Cauldron.Macos
{
[Register ("MainWindow")]
partial class MainWindow

View File

@ -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)
{

View File

@ -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