mirror of
https://github.com/ShareX/ShareX.git
synced 2024-09-30 01:07:21 +13:00
Image combiner moved to MediaLib
This commit is contained in:
Jaex
parent
b73d47aa54
commit
501fedd8f5
15 changed files with 40 additions and 41 deletions
|
|
@ -1,4 +1,4 @@
|
|||
namespace ShareX
|
||||
namespace ShareX.MediaLib
|
||||
{
|
||||
partial class ImageCombinerForm
|
||||
{
|
||||
|
|
@ -24,14 +24,13 @@ You should have received a copy of the GNU General Public License
|
|||
#endregion License Information (GPL v3)
|
||||
|
||||
using ShareX.HelpersLib;
|
||||
using ShareX.Properties;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Drawing;
|
||||
using System.IO;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace ShareX
|
||||
namespace ShareX.MediaLib
|
||||
{
|
||||
public partial class ImageCombinerForm : Form
|
||||
{
|
||||
|
|
@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License
|
|||
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace ShareX
|
||||
namespace ShareX.MediaLib
|
||||
{
|
||||
public class ImageCombinerOptions
|
||||
{
|
||||
|
|
@ -79,12 +79,19 @@
|
|||
<Compile Include="Enums.cs" />
|
||||
<Compile Include="FFmpegCLIManager.cs" />
|
||||
<Compile Include="FFmpegDownloader.cs" />
|
||||
<Compile Include="Forms\ImageCombinerForm.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Forms\ImageCombinerForm.Designer.cs">
|
||||
<DependentUpon>ImageCombinerForm.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Forms\VideoThumbnailerForm.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Forms\VideoThumbnailerForm.Designer.cs">
|
||||
<DependentUpon>VideoThumbnailerForm.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ImageCombinerOptions.cs" />
|
||||
<Compile Include="Properties\Resources.Designer.cs">
|
||||
<AutoGen>True</AutoGen>
|
||||
<DesignTime>True</DesignTime>
|
||||
|
|
@ -103,6 +110,36 @@
|
|||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="Forms\ImageCombinerForm.de.resx">
|
||||
<DependentUpon>ImageCombinerForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\ImageCombinerForm.fr.resx">
|
||||
<DependentUpon>ImageCombinerForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\ImageCombinerForm.nl-NL.resx">
|
||||
<DependentUpon>ImageCombinerForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\ImageCombinerForm.pt-BR.resx">
|
||||
<DependentUpon>ImageCombinerForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\ImageCombinerForm.resx">
|
||||
<DependentUpon>ImageCombinerForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\ImageCombinerForm.ru.resx">
|
||||
<DependentUpon>ImageCombinerForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\ImageCombinerForm.tr.resx">
|
||||
<DependentUpon>ImageCombinerForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\ImageCombinerForm.vi-VN.resx">
|
||||
<DependentUpon>ImageCombinerForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\ImageCombinerForm.zh-CN.resx">
|
||||
<DependentUpon>ImageCombinerForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\ImageCombinerForm.zh-TW.resx">
|
||||
<DependentUpon>ImageCombinerForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\VideoThumbnailerForm.de.resx">
|
||||
<DependentUpon>VideoThumbnailerForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
|
|
|
|||
|
|
@ -196,12 +196,6 @@
|
|||
<DependentUpon>AboutForm.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Enums.cs" />
|
||||
<Compile Include="Forms\ImageCombinerForm.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Forms\ImageCombinerForm.Designer.cs">
|
||||
<DependentUpon>ImageCombinerForm.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Forms\QRCodeForm.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
|
|
@ -242,7 +236,6 @@
|
|||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="HotkeyTypeEnumConverter.cs" />
|
||||
<Compile Include="ImageCombinerOptions.cs" />
|
||||
<Compile Include="IntegrationHelpers.cs" />
|
||||
<Compile Include="QuickTaskInfo.cs" />
|
||||
<Compile Include="QuickTaskMenu.cs" />
|
||||
|
|
@ -827,36 +820,6 @@
|
|||
<EmbeddedResource Include="Forms\HotkeySettingsForm.zh-TW.resx">
|
||||
<DependentUpon>HotkeySettingsForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\ImageCombinerForm.de.resx">
|
||||
<DependentUpon>ImageCombinerForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\ImageCombinerForm.fr.resx">
|
||||
<DependentUpon>ImageCombinerForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\ImageCombinerForm.nl-NL.resx">
|
||||
<DependentUpon>ImageCombinerForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\ImageCombinerForm.pt-BR.resx">
|
||||
<DependentUpon>ImageCombinerForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\ImageCombinerForm.resx">
|
||||
<DependentUpon>ImageCombinerForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\ImageCombinerForm.ru.resx">
|
||||
<DependentUpon>ImageCombinerForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\ImageCombinerForm.tr.resx">
|
||||
<DependentUpon>ImageCombinerForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\ImageCombinerForm.vi-VN.resx">
|
||||
<DependentUpon>ImageCombinerForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\ImageCombinerForm.zh-CN.resx">
|
||||
<DependentUpon>ImageCombinerForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\ImageCombinerForm.zh-TW.resx">
|
||||
<DependentUpon>ImageCombinerForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\MainForm.de.resx">
|
||||
<DependentUpon>MainForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
|
|
|
|||
Loading…
Reference in a new issue