Skip to content

Commit

Permalink
Rename TEdit.Desktop to TEdit5 linux compat
Browse files Browse the repository at this point in the history
  • Loading branch information
BinaryConstruct committed Oct 14, 2024
1 parent 4d815c5 commit 2cefb03
Show file tree
Hide file tree
Showing 49 changed files with 111 additions and 85 deletions.
2 changes: 1 addition & 1 deletion build-avalonia.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ $platforms | ForEach-Object {
"/p:VersionPrefix=""$VersionPrefix"""
"--version-suffix"
"$VersionSuffix"
".\src\TEdit.Desktop\TEdit.Desktop.csproj"
".\src\TEdit5\TEdit5.csproj"
)

& dotnet $buildArgs
Expand Down
2 changes: 1 addition & 1 deletion src/TEdit.sln
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TEdit.Terraria", "TEdit.Ter
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TEdit.Common", "TEdit.Common\TEdit.Common.csproj", "{4F7D8CE2-ABF8-4A15-ABA0-5A7B2E77FE1A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TEdit.Desktop", "TEdit.Desktop\TEdit.Desktop.csproj", "{9C942195-8286-42C6-A682-ED297010193E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TEdit5", "TEdit5\TEdit5.csproj", "{9C942195-8286-42C6-A682-ED297010193E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TEdit.Editor", "TEdit.Editor\TEdit.Editor.csproj", "{10D77A71-3445-4645-995F-A4032B407575}"
EndProject
Expand Down
25 changes: 25 additions & 0 deletions src/TEdit/TEdit.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.5.002.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TEdit", "TEdit.csproj", "{3BE5338A-D351-42FE-AD29-2DB22448B261}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{3BE5338A-D351-42FE-AD29-2DB22448B261}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3BE5338A-D351-42FE-AD29-2DB22448B261}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3BE5338A-D351-42FE-AD29-2DB22448B261}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3BE5338A-D351-42FE-AD29-2DB22448B261}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0FC1E4EC-C21F-4C8B-9AC8-57749308FD9A}
EndGlobalSection
EndGlobal
8 changes: 4 additions & 4 deletions src/TEdit.Desktop/App.axaml → src/TEdit5/App.axaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Application xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="TEdit.Desktop.App"
xmlns:local="using:TEdit.Desktop"
x:Class="TEdit5.App"
xmlns:local="using:TEdit5"
RequestedThemeVariant="Dark">
<!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->

<Application.DataTemplates>
<local:ViewLocator/>
</Application.DataTemplates>

<Application.Styles>
<StyleInclude Source="avares://TEdit.Desktop/Controls/Controls.axaml"/>
<StyleInclude Source="avares://TEdit5/Controls/Controls.axaml"/>
<FluentTheme />
</Application.Styles>

Expand Down
12 changes: 6 additions & 6 deletions src/TEdit.Desktop/App.axaml.cs → src/TEdit5/App.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
using Avalonia.Markup.Xaml;
using Microsoft.Extensions.DependencyInjection;
using System;
using TEdit.Desktop.Controls.WorldRenderEngine;
using TEdit.Desktop.Editor;
using TEdit.Desktop.Services;
using TEdit.Desktop.ViewModels;
using TEdit.Desktop.Views;
using TEdit5.Controls.WorldRenderEngine;
using TEdit5.Editor;
using TEdit5.Services;
using TEdit5.ViewModels;
using TEdit5.Views;
using TEdit.Editor;

namespace TEdit.Desktop;
namespace TEdit5;

public partial class App : Application
{
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
using System;
using TEdit.Common;
using TEdit.Configuration;
using TEdit.Desktop.Controls.WorldRenderEngine.Layers;
using TEdit5.Controls.WorldRenderEngine.Layers;
using TEdit.Terraria;

namespace TEdit.Desktop.Controls;
namespace TEdit5.Controls;


public static class PixelMap
Expand Down Expand Up @@ -192,7 +192,7 @@ public static TEditColor GetTileColor(Tile tile, TEditColor background, RenderLa
byte brightness = 255;
if (layers?.Coatings ?? true)
{
// echo: 169
// echo: 169
// normal: 211
// illuminant: 255

Expand Down Expand Up @@ -244,7 +244,7 @@ public static TEditColor GetTileColor(Tile tile, TEditColor background, RenderLa
byte brightness = 255;
if ((layers?.Coatings ?? true))
{
// echo: 169
// echo: 169
// normal: 211
// illuminant: 255

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
using Avalonia.Threading;
using System;
using System.Linq;
using TEdit.Desktop.Controls.WorldRenderEngine.Layers;
using TEdit5.Controls.WorldRenderEngine.Layers;
using TEdit.Terraria;

namespace TEdit.Desktop.Controls;
namespace TEdit5.Controls;

public class SkiaMinimapRenderBox : Control
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
using System.Threading;
using System.Threading.Channels;
using System.Threading.Tasks;
using TEdit.Desktop.Controls.WorldRenderEngine;
using TEdit.Desktop.Controls.WorldRenderEngine.Layers;
using TEdit.Desktop.Editor;
using TEdit5.Controls.WorldRenderEngine;
using TEdit5.Controls.WorldRenderEngine.Layers;
using TEdit5.Editor;
using TEdit.Editor;
using TEdit.Geometry;
using TEdit.Terraria;
using static SkiaSharp.SKImageFilter;

namespace TEdit.Desktop.Controls;
namespace TEdit5.Controls;

[TemplatePart("PART_ContentPresenter", typeof(ScrollContentPresenter))]
[TemplatePart("PART_HorizontalScrollBar", typeof(ScrollBar))]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:c="clr-namespace:TEdit.Desktop.Controls">
xmlns:c="clr-namespace:TEdit5.Controls">
<Design.PreviewWith>
<Border Padding="20" Height="400" Width="400">
<c:SkiaWorldRenderBox GridCellSize="16"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System;
using System.Collections.Generic;

namespace TEdit.Desktop.Controls.WorldRenderEngine;
namespace TEdit5.Controls.WorldRenderEngine;

public interface IRasterTileCache : IDisposable
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using SkiaSharp;
using System;

namespace TEdit.Desktop.Controls.WorldRenderEngine.Layers;
namespace TEdit5.Controls.WorldRenderEngine.Layers;

public class BackgroundGridCustomDrawOp : ICustomDrawOperation
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using TEdit.Configuration;
using TEdit.Terraria;

namespace TEdit.Desktop.Controls.WorldRenderEngine.Layers;
namespace TEdit5.Controls.WorldRenderEngine.Layers;

public class MinimapPixelsCustomDrawOp : ICustomDrawOperation
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Avalonia.Rendering.SceneGraph;
using Avalonia.Skia;

namespace TEdit.Desktop.Controls.WorldRenderEngine.Layers;
namespace TEdit5.Controls.WorldRenderEngine.Layers;

public class NoSkiaCustomDrawOp : ICustomDrawOperation
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using ReactiveUI;
using System;

namespace TEdit.Desktop.Controls.WorldRenderEngine.Layers;
namespace TEdit5.Controls.WorldRenderEngine.Layers;


public class RenderLayerVisibility : ReactiveObject
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using System;
using System.Diagnostics;

namespace TEdit.Desktop.Controls.WorldRenderEngine.Layers;
namespace TEdit5.Controls.WorldRenderEngine.Layers;

public class ShaderCustomDrawOp : ICustomDrawOperation
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using TEdit.Configuration;
using TEdit.Terraria;

namespace TEdit.Desktop.Controls.WorldRenderEngine.Layers;
namespace TEdit5.Controls.WorldRenderEngine.Layers;


public class RasterTileRenderer
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using SkiaSharp;
using System;

namespace TEdit.Desktop.Controls.WorldRenderEngine;
namespace TEdit5.Controls.WorldRenderEngine;

public class RasterTile : IDisposable
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Linq;
using TEdit.Common;

namespace TEdit.Desktop.Controls.WorldRenderEngine;
namespace TEdit5.Controls.WorldRenderEngine;

public class RasterTileCache : IRasterTileCache
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using SkiaSharp;
using TEdit.Common;

namespace TEdit.Desktop.Controls.WorldRenderEngine;
namespace TEdit5.Controls.WorldRenderEngine;

public static class SkiaTEditExtensions
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using TEdit.Desktop.Services;
using TEdit.Desktop.ViewModels;
using TEdit5.Services;
using TEdit5.ViewModels;
using TEdit.Editor;
using TEdit.Geometry;
using static TEdit.Desktop.Controls.SkiaWorldRenderBox;
using static TEdit5.Controls.SkiaWorldRenderBox;

namespace TEdit.Desktop.Editor;
namespace TEdit5.Editor;

public interface IMouseTool
{
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using System.Threading.Tasks;
using TEdit.Terraria;

namespace TEdit.Desktop.Models
namespace TEdit5.Models
{
public class WorldFile : ReactiveObject
{
Expand Down
2 changes: 1 addition & 1 deletion src/TEdit.Desktop/Program.cs → src/TEdit5/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Projektanker.Icons.Avalonia.MaterialDesign;
using System;

namespace TEdit.Desktop;
namespace TEdit5;

class Program
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using TEdit.Desktop.ViewModels;
using TEdit5.ViewModels;
using TEdit.Editor;
using TEdit.Terraria;

namespace TEdit.Desktop.Services;
namespace TEdit5.Services;

public interface IDialogService
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AssemblyName>TEdit.Avalonia</AssemblyName>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>latest</LangVersion>
Expand Down Expand Up @@ -41,21 +42,21 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Avalonia" Version="11.1.4" />
<PackageReference Include="Avalonia.Desktop" Version="11.1.4" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.1.4" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.4" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.4" />
<PackageReference Include="Avalonia" Version="11.1.3" />
<PackageReference Include="Avalonia.Desktop" Version="11.1.3" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.1.3" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.3" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.3" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.4" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.3" />
<PackageReference Include="bodong.Avalonia.PropertyGrid" Version="11.1.1.1" />
<PackageReference Include="bodong.PropertyModels" Version="11.1.1.1" />
<PackageReference Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.4.1" />
<PackageReference Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.4.0" />

<PackageReference Include="ReactiveUI" Version="20.1.63" />
<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />

<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />

<PackageReference Include="SkiaSharp" Version="2.88.8" />
</ItemGroup>
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
using Avalonia.Controls.Templates;
using Microsoft.Extensions.DependencyInjection;
using System;
using TEdit.Desktop.ViewModels;
using TEdit5.ViewModels;

namespace TEdit.Desktop;
namespace TEdit5;

public static class DependencyInjectionExtensions
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using Avalonia;
using Avalonia.Controls;
using TEdit.Desktop.Controls;
using TEdit5.Controls;
using TEdit.Editor;
using TEdit.Editor.Undo;
using TEdit.Terraria;

namespace TEdit.Desktop.ViewModels;
namespace TEdit5.ViewModels;

public partial class DocumentViewModel : ReactiveObject
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace TEdit.Desktop.ViewModels;
namespace TEdit5.ViewModels;

public partial class FileManagerViewModel : ReactiveObject
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
using System;
using System.Reactive.Linq;
using System.Threading.Tasks;
using TEdit.Desktop.Controls.WorldRenderEngine;
using TEdit.Desktop.Controls.WorldRenderEngine.Layers;
using TEdit.Desktop.Services;
using TEdit5.Controls.WorldRenderEngine;
using TEdit5.Controls.WorldRenderEngine.Layers;
using TEdit5.Services;

namespace TEdit.Desktop.ViewModels;
namespace TEdit5.ViewModels;

public class MainWindowViewModel : ReactiveObject
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System.Collections.Generic;
using System.Linq;
using System.Reactive;
using TEdit.Desktop.Editor;
using TEdit5.Editor;

namespace TEdit.Desktop.ViewModels;
namespace TEdit5.ViewModels;

public partial class ToolSelectionViewModel : ReactiveObject
{
Expand Down
Loading

0 comments on commit 2cefb03

Please sign in to comment.