universaleditor/editor-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pre-commit'

Browse Source
This commit is contained in:
Michael Becker 2021-06-02 01:52:36 -04:00
commit 5730050d8d
No known key found for this signature in database
GPG Key ID: 98C333A81F18C22C
9 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Applications/UniversalEditor.Bootstrapper/UniversalEditor.Bootstrapper.csproj
View File

@ -69,6 +69,9 @@
<Name>MBS.Framework.UserInterface</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="application.xml" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

6
Applications/UniversalEditor.Bootstrapper/application.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<application>
<runtime typeName="UniversalEditor.UserInterface.EditorApplication">
</runtime>
</application>

2
Libraries/UniversalEditor.Essential/DataFormats/JSON/JSONDataFormat.cs
View File

@ -41,7 +41,7 @@ namespace UniversalEditor.DataFormats.JSON
{
if (_dfr == null)
{
_dfr = base.MakeReferenceInternal();
_dfr = new DataFormatReference(GetType());
_dfr.Capabilities.Add(typeof(JSONObjectModel), DataFormatCapabilities.All);
}
return _dfr;

6
Libraries/UniversalEditor.Essential/DataFormats/Text/Plain/PlainTextDataFormat.cs
View File

@ -104,9 +104,11 @@ namespace UniversalEditor.DataFormats.Text.Plain
throw new ObjectModelNotSupportedException();
Writer writer = Accessor.Writer;
foreach (string line in ptom.Lines)
for (int i = 0; i < ptom.Lines.Count; i++)
{
writer.WriteLine(line);
writer.Write(ptom.Lines[i]);
if (i < ptom.Lines.Count)
writer.WriteLine();
}
}
}

4
Libraries/UniversalEditor.Essential/DataFormats/UEPackage/UEPackageXMLDataFormat.cs
View File

@ -925,11 +925,11 @@ namespace UniversalEditor.DataFormats.UEPackage
{
if (attTypeName != null)
{
// Console.WriteLine("DataFormat could not be associated: " + attTypeName.Value);
Console.Error.WriteLine("DataFormat could not be associated: " + attTypeName.Value);
}
else if (attID != null)
{
// Console.WriteLine("DataFormat could not be associated: " + attID.Value);
Console.Error.WriteLine("DataFormat could not be associated: " + attID.Value);
}
}
}

2
Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/SettingsProviders/Default.xml
View File

@ -59,14 +59,12 @@
<Part>Singing Style Defaults</Part>
</Path>
<Settings>
<!--
<GroupSetting ID="{4C560594-7398-4DC1-98D7-95B52A0867F2}" Title="VOCALOID2 Import/Export">
<Settings>
<CommandSetting ID="{7F27CF86-A8A4-4509-B03F-055FA435093E}" Name="LoadVOCALOID2" Title="_Load settings from VOCALOID2" CommandID="SynthesizedAudioEditor_LoadVOCALOID2" />
<CommandSetting ID="{1D010F84-1BA6-4508-89A8-72C5C88B8CA7}" Name="SaveVOCALOID2" Title="_Save settings to VOCALOID2" CommandID="SynthesizedAudioEditor_SaveToVOCALOID2" />
</Settings>
</GroupSetting>
-->
<ChoiceSetting ID="{D4554BD6-AAB1-498A-A8DC-0CE6B6E8AC41}" Name="Template" Title="_Template">
<Choices>
<Choice ID="{825DBD39-CAA4-480A-AF59-CEE32AAE00B7}" Name="custom" Title="(Custom)" Value="custom" />

2
Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Palette/Adobe/ACO/ACODataFormat.cs
View File

@ -25,7 +25,7 @@ using MBS.Framework.Drawing;
using MBS.Framework.Settings;
using UniversalEditor.ObjectModels.Multimedia.Palette;
namespace UniversalEditor.DataFormats.Multimedia.Palette.Adobe
namespace UniversalEditor.DataFormats.Multimedia.Palette.Adobe.ACO
{
/// <summary>
/// Provides a <see cref="DataFormat" /> for manipulating color palettes in Adobe ACO format.

2
Plugins/UniversalEditor.Plugins.Multimedia3D/DataFormats/Multimedia3D/Model/Wavefront/OBJDataFormat.cs
View File

@ -38,7 +38,7 @@ namespace UniversalEditor.DataFormats.Multimedia3D.Model.Wavefront
{
if (_dfr == null)
{
_dfr = base.MakeReferenceInternal();
_dfr = new DataFormatReference(GetType());
_dfr.Capabilities.Add(typeof(ModelObjectModel), DataFormatCapabilities.All);
}
return _dfr;

10
Plugins/UniversalEditor.Plugins.SoftwareDevelopment/DataFormats/SourceCode/CodeDataFormat.cs
View File

@ -39,11 +39,15 @@ namespace UniversalEditor.DataFormats.SourceCode
/// </summary>
public abstract class CodeDataFormat : PlainTextDataFormat
{
private static DataFormatReference _dfr = null;
protected override DataFormatReference MakeReferenceInternal()
{
DataFormatReference dfr = base.MakeReferenceInternal();
dfr.Capabilities.Add(typeof(CodeObjectModel), DataFormatCapabilities.All);
return dfr;
if (_dfr == null)
{
_dfr = new DataFormatReference(GetType());
_dfr.Capabilities.Add(typeof(CodeObjectModel), DataFormatCapabilities.All);
}
return _dfr;
}
protected override void BeforeLoadInternal(Stack<ObjectModel> objectModels)