Skip to content

Commit

Permalink
Merge branch 'release/2.8.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@paralleltree
paralleltree committed Dec 25, 2020
2 parents 907cfcc + 9bfa317 commit 8639985
Show file tree
Hide file tree
Showing 41 changed files with 1,531 additions and 2,978 deletions.
84 changes: 44 additions & 40 deletions Ched/Ched.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,15 @@
<HintPath>..\packages\PriorityQueue.0.1.0\lib\net45\ConcurrentPriorityQueue.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Xaml.Behaviors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.19\lib\net45\Microsoft.Xaml.Behaviors.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.ComponentModel.Composition.registration" />
Expand Down Expand Up @@ -112,6 +117,7 @@
<Private>True</Private>
</Reference>
<Reference Include="System.Windows" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
Expand All @@ -122,6 +128,7 @@
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
<Reference Include="WindowsFormsIntegration" />
</ItemGroup>
<ItemGroup>
<Compile Include="Components\Exporter\IExporter.cs" />
Expand Down Expand Up @@ -167,11 +174,15 @@
<Compile Include="Plugins\SlideMerger.cs" />
<Compile Include="Plugins\SlideReverser.cs" />
<Compile Include="Plugins\SlideSplitter.cs" />
<Compile Include="UI\BookPropertiesForm.cs">
<SubType>Form</SubType>
<Compile Include="UI\Helpers.cs" />
<Compile Include="UI\Windows\Behaviors\InitialFocusBehavior.cs" />
<Compile Include="UI\Windows\Behaviors\OpenFileBehavior.cs" />
<Compile Include="UI\Windows\Behaviors\StyleBehaviorCollection.cs" />
<Compile Include="UI\Windows\BindableNumericUpDown.xaml.cs">
<DependentUpon>BindableNumericUpDown.xaml</DependentUpon>
</Compile>
<Compile Include="UI\BookPropertiesForm.Designer.cs">
<DependentUpon>BookPropertiesForm.cs</DependentUpon>
<Compile Include="UI\Windows\BookPropertiesWindow.xaml.cs">
<DependentUpon>BookPropertiesWindow.xaml</DependentUpon>
</Compile>
<Compile Include="UI\BPMSelectionForm.cs">
<SubType>Form</SubType>
Expand All @@ -189,12 +200,6 @@
<Compile Include="UI\CustomQuantizeSelectionForm.Designer.cs">
<DependentUpon>CustomQuantizeSelectionForm.cs</DependentUpon>
</Compile>
<Compile Include="UI\ExportForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UI\ExportForm.Designer.cs">
<DependentUpon>ExportForm.cs</DependentUpon>
</Compile>
<Compile Include="UI\FormExtensions.cs" />
<Compile Include="UI\GraphicsExtensions.cs" />
<Compile Include="UI\HighSpeedSelectionForm.cs">
Expand Down Expand Up @@ -233,12 +238,6 @@
</Compile>
<Compile Include="UI\SoundManager.cs" />
<Compile Include="UI\SoundPreviewManager.cs" />
<Compile Include="UI\SoundSourceSelector.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="UI\SoundSourceSelector.Designer.cs">
<DependentUpon>SoundSourceSelector.cs</DependentUpon>
</Compile>
<Compile Include="UI\TimeSignatureSelectionForm.cs">
<SubType>Form</SubType>
</Compile>
Expand All @@ -251,34 +250,39 @@
<Compile Include="UI\VersionInfoForm.Designer.cs">
<DependentUpon>VersionInfoForm.cs</DependentUpon>
</Compile>
<Compile Include="UI\Windows\EnumSourceProvider.cs" />
<Compile Include="UI\Windows\SusExportWindow.xaml.cs">
<DependentUpon>SusExportWindow.xaml</DependentUpon>
</Compile>
<Compile Include="UI\Windows\WpfExtensions.cs" />
<EmbeddedResource Include="Localization\ErrorStrings.en.resx" />
<EmbeddedResource Include="Localization\ErrorStrings.resx">
<Generator>ResXFileCodeGenerator</Generator>
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>ErrorStrings.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Localization\FileFilterStrings.en.resx" />
<EmbeddedResource Include="Localization\FileFilterStrings.resx">
<Generator>ResXFileCodeGenerator</Generator>
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>FileFilterStrings.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Localization\MainFormStrings.en.resx">
<Generator>ResXFileCodeGenerator</Generator>
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>MainFormStrings.en.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Localization\MainFormStrings.resx">
<Generator>ResXFileCodeGenerator</Generator>
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>MainFormStrings.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Localization\PluginStrings.en.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>PluginStrings.en.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Localization\PluginStrings.resx">
<Generator>ResXFileCodeGenerator</Generator>
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>PluginStrings.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
Expand All @@ -287,12 +291,6 @@
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<EmbeddedResource Include="UI\BookPropertiesForm.en.resx">
<DependentUpon>BookPropertiesForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\BookPropertiesForm.resx">
<DependentUpon>BookPropertiesForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\BPMSelectionForm.en.resx">
<DependentUpon>BPMSelectionForm.cs</DependentUpon>
</EmbeddedResource>
Expand All @@ -305,12 +303,6 @@
<EmbeddedResource Include="UI\CustomQuantizeSelectionForm.resx">
<DependentUpon>CustomQuantizeSelectionForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\ExportForm.en.resx">
<DependentUpon>ExportForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\ExportForm.resx">
<DependentUpon>ExportForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\HighSpeedSelectionForm.en.resx">
<DependentUpon>HighSpeedSelectionForm.cs</DependentUpon>
</EmbeddedResource>
Expand All @@ -323,12 +315,6 @@
<EmbeddedResource Include="UI\ShiftTimeSelectionForm.resx">
<DependentUpon>ShiftTimeSelectionForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\SoundSourceSelector.en.resx">
<DependentUpon>SoundSourceSelector.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\SoundSourceSelector.resx">
<DependentUpon>SoundSourceSelector.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\TimeSignatureSelectionForm.en.resx">
<DependentUpon>TimeSignatureSelectionForm.cs</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -453,6 +439,24 @@
<Name>Ched.Plugins</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Page Include="UI\Windows\BindableNumericUpDown.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UI\Windows\BookPropertiesWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UI\Windows\CommonStyles.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UI\Windows\SusExportWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\BASS.Native.2.4.12.2\build\BASS.Native.targets" Condition="Exists('..\packages\BASS.Native.2.4.12.2\build\BASS.Native.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Expand Down
18 changes: 18 additions & 0 deletions Ched/Components/Exporter/SusExporter.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.IO;
using System.Text;
Expand Down Expand Up @@ -41,6 +42,10 @@ public void Export(string path, ScoreBook book)

writer.WriteLine();

writer.WriteLine(args.AdditionalData);

writer.WriteLine();

writer.WriteLine("#REQUEST \"ticks_per_beat {0}\"", book.Score.TicksPerBeat);

writer.WriteLine();
Expand Down Expand Up @@ -440,6 +445,8 @@ public class SusArgs
private string jacketFilePath;
[Newtonsoft.Json.JsonProperty]
private bool hasPaddingBar;
[Newtonsoft.Json.JsonProperty]
private string additionalData;

public string PlayLevel
{
Expand Down Expand Up @@ -483,12 +490,23 @@ public string JacketFilePath
set { jacketFilePath = value; }
}

public string AdditionalData
{
get => additionalData;
set => additionalData = value;
}

public enum Difficulty
{
[Description("BASIC")]
Basic,
[Description("ADVANCED")]
Advanced,
[Description("EXPERT")]
Expert,
[Description("MASTER")]
Master,
[Description("WORLD'S END")]
WorldsEnd
}
}
Expand Down

0 comments on commit 8639985

Please sign in to comment.