Skip to content

Commit

Permalink
Bug fix + better match merge plugin
Browse files Browse the repository at this point in the history
- Fix a bug where merging files would not be possible unless a project
  was open
- Improve the batch merge plugin
  • Loading branch information
philipbutkiewicz committed Dec 3, 2024
1 parent 4a16c0b commit ba1992e
Show file tree
Hide file tree
Showing 19 changed files with 460 additions and 127 deletions.
9 changes: 9 additions & 0 deletions BatchMerge.plugin/BatchMerge.plugin.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@
<DependentUpon>PluginForm.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="SharpCutPlugin.cs" />
<Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
</ItemGroup>
Expand All @@ -69,6 +74,10 @@
<EmbeddedResource Include="PluginForm.resx">
<DependentUpon>PluginForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SharpCutCommon\SharpCutCommon.csproj">
Expand Down
57 changes: 29 additions & 28 deletions BatchMerge.plugin/BatchMergeItemForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions BatchMerge.plugin/BatchMergeJobItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ public class BatchMergeJobItem
{
public enum JobStatus
{
Success, Error, Queued
Success, Error, Queued, Started
}

public string OutputName { get; set; }
Expand All @@ -19,7 +19,7 @@ public string DisplayName
{
get
{
string displayName = $"({Status}) Merge {Items.Count} items: ";
string displayName = $"Merge {Items.Count} items: ";
foreach (BatchMergeFileItem item in Items)
{
displayName += $"{item.DisplayName} ,";
Expand Down
Loading

0 comments on commit ba1992e

Please sign in to comment.