mirror of
https://github.com/greenshot/greenshot
synced 2025-08-25 15:46:22 -07:00
Autofac changes
This commit is contained in:
Robin
parent
dfd713e17a
commit
a3bd73367f
68 changed files with 694 additions and 1278 deletions
|
|
@ -30,7 +30,7 @@ using Greenshot.Addons.Components;
|
||||||
namespace Greenshot.Addon.Box
|
namespace Greenshot.Addon.Box
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class BoxAutofacModule : AddonModule
|
public class BoxAddonModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -46,29 +46,29 @@
|
||||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||||
|
|
@ -160,7 +160,7 @@
|
||||||
<Reference Include="WindowsBase" />
|
<Reference Include="WindowsBase" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="BoxAutofacModule.cs" />
|
<Compile Include="BoxAddonModule.cs" />
|
||||||
<Compile Include="Entities\BoxEntity.cs" />
|
<Compile Include="Entities\BoxEntity.cs" />
|
||||||
<Compile Include="Entities\BoxFile.cs" />
|
<Compile Include="Entities\BoxFile.cs" />
|
||||||
<Compile Include="Entities\BoxItem.cs" />
|
<Compile Include="Entities\BoxItem.cs" />
|
||||||
|
|
|
||||||
|
|
@ -6,14 +6,14 @@
|
||||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ using Greenshot.Addons.Components;
|
||||||
namespace Greenshot.Addon.Confluence
|
namespace Greenshot.Addon.Confluence
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class ConfluenceAutofacModule : AddonModule
|
public class ConfluenceAddonModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -65,29 +65,29 @@
|
||||||
<Reference Include="Costura, Version=2.0.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
|
<Reference Include="Costura, Version=2.0.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll</HintPath>
|
<HintPath>..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Confluence, Version=0.7.19.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Confluence, Version=0.7.19.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Confluence.0.7.19\lib\net45\Dapplo.Confluence.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Confluence.0.7.19\lib\net45\Dapplo.Confluence.dll</HintPath>
|
||||||
|
|
@ -191,7 +191,7 @@
|
||||||
<Reference Include="WindowsBase" />
|
<Reference Include="WindowsBase" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="ConfluenceAutofacModule.cs" />
|
<Compile Include="ConfluenceAddonModule.cs" />
|
||||||
<Compile Include="IConfluenceLanguage.cs" />
|
<Compile Include="IConfluenceLanguage.cs" />
|
||||||
<Compile Include="IConfluenceConfiguration.cs" />
|
<Compile Include="IConfluenceConfiguration.cs" />
|
||||||
<Compile Include="ConfluenceDestination.cs" />
|
<Compile Include="ConfluenceDestination.cs" />
|
||||||
|
|
|
||||||
|
|
@ -7,14 +7,14 @@
|
||||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Costura.Fody" version="2.0.1" targetFramework="net452" />
|
<package id="Costura.Fody" version="2.0.1" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.Confluence" version="0.7.19" targetFramework="net452" />
|
<package id="Dapplo.Confluence" version="0.7.19" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.JsonSimple" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions.JsonSimple" version="0.8.35" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ using Greenshot.Addons.Components;
|
||||||
namespace Greenshot.Addon.Dropbox
|
namespace Greenshot.Addon.Dropbox
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class DropboxAutofacModule : AddonModule
|
public class DropboxAddonModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -58,29 +58,29 @@
|
||||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||||
|
|
@ -171,7 +171,7 @@
|
||||||
<Reference Include="WindowsBase" />
|
<Reference Include="WindowsBase" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="DropboxAutofacModule.cs" />
|
<Compile Include="DropboxAddonModule.cs" />
|
||||||
<Compile Include="Entities\CreateLinkReply.cs" />
|
<Compile Include="Entities\CreateLinkReply.cs" />
|
||||||
<Compile Include="Entities\CreateLinkRequest.cs" />
|
<Compile Include="Entities\CreateLinkRequest.cs" />
|
||||||
<Compile Include="Entities\Error.cs" />
|
<Compile Include="Entities\Error.cs" />
|
||||||
|
|
|
||||||
|
|
@ -6,14 +6,14 @@
|
||||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ using Greenshot.Addons.Components;
|
||||||
namespace Greenshot.Addon.ExternalCommand
|
namespace Greenshot.Addon.ExternalCommand
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class ExternalCommandAutofacModule : AddonModule
|
public class ExternalCommandAddonModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -58,29 +58,29 @@
|
||||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
|
|
@ -163,7 +163,7 @@
|
||||||
<Compile Include="ExternalCommandDestinationProvider.cs" />
|
<Compile Include="ExternalCommandDestinationProvider.cs" />
|
||||||
<Compile Include="IExternalCommandLanguage.cs" />
|
<Compile Include="IExternalCommandLanguage.cs" />
|
||||||
<Compile Include="IconCache.cs" />
|
<Compile Include="IconCache.cs" />
|
||||||
<Compile Include="ExternalCommandAutofacModule.cs" />
|
<Compile Include="ExternalCommandAddonModule.cs" />
|
||||||
<Compile Include="ListviewComparer.cs" />
|
<Compile Include="ListviewComparer.cs" />
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
<Compile Include="IExternalCommandConfiguration.cs" />
|
<Compile Include="IExternalCommandConfiguration.cs" />
|
||||||
|
|
|
||||||
|
|
@ -6,14 +6,14 @@
|
||||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||||
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ using Greenshot.Addons.Components;
|
||||||
namespace Greenshot.Addon.Flickr
|
namespace Greenshot.Addon.Flickr
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class FlickrAutofacModule : AddonModule
|
public class FlickrAddonModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -58,29 +58,29 @@
|
||||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||||
|
|
@ -165,7 +165,7 @@
|
||||||
<Reference Include="WindowsBase" />
|
<Reference Include="WindowsBase" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="FlickrAutofacModule.cs" />
|
<Compile Include="FlickrAddonModule.cs" />
|
||||||
<Compile Include="FlickrDestination.cs" />
|
<Compile Include="FlickrDestination.cs" />
|
||||||
<Compile Include="IFlickrConfiguration.cs" />
|
<Compile Include="IFlickrConfiguration.cs" />
|
||||||
<Compile Include="IFlickrLanguage.cs" />
|
<Compile Include="IFlickrLanguage.cs" />
|
||||||
|
|
|
||||||
|
|
@ -6,14 +6,14 @@
|
||||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ using Greenshot.Addons.Components;
|
||||||
namespace Greenshot.Addon.GooglePhotos
|
namespace Greenshot.Addon.GooglePhotos
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class GooglePhotosAutofacModule : AddonModule
|
public class GooglePhotosAddonModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -44,29 +44,29 @@
|
||||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||||
|
|
@ -152,7 +152,7 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="app.config" />
|
<None Include="app.config" />
|
||||||
<Compile Include="GooglePhotosAutofacModule.cs" />
|
<Compile Include="GooglePhotosAddonModule.cs" />
|
||||||
<Compile Include="IGooglePhotosLanguage.cs" />
|
<Compile Include="IGooglePhotosLanguage.cs" />
|
||||||
<Compile Include="IGooglePhotosConfiguration.cs" />
|
<Compile Include="IGooglePhotosConfiguration.cs" />
|
||||||
<Compile Include="GooglePhotosDestination.cs" />
|
<Compile Include="GooglePhotosDestination.cs" />
|
||||||
|
|
|
||||||
|
|
@ -6,14 +6,14 @@
|
||||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -63,29 +63,29 @@
|
||||||
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
|
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||||
|
|
@ -181,7 +181,7 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="Entities\ImgurData.cs" />
|
<Compile Include="Entities\ImgurData.cs" />
|
||||||
<Compile Include="Entities\ImgurImage.cs" />
|
<Compile Include="Entities\ImgurImage.cs" />
|
||||||
<Compile Include="ImgurAutofacModule.cs" />
|
<Compile Include="ImgurAddonModule.cs" />
|
||||||
<Compile Include="IImgurLanguage.cs" />
|
<Compile Include="IImgurLanguage.cs" />
|
||||||
<Compile Include="ImgurApi.cs" />
|
<Compile Include="ImgurApi.cs" />
|
||||||
<Compile Include="ImgurDestination.cs" />
|
<Compile Include="ImgurDestination.cs" />
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ using Greenshot.Addons.Components;
|
||||||
namespace Greenshot.Addon.Imgur
|
namespace Greenshot.Addon.Imgur
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class ImgurAutofacModule : AddonModule
|
public class ImgurAddonModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -7,14 +7,14 @@
|
||||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
|
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -63,29 +63,29 @@
|
||||||
<Reference Include="Costura, Version=2.0.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
|
<Reference Include="Costura, Version=2.0.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll</HintPath>
|
<HintPath>..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||||
|
|
@ -186,7 +186,7 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="IJiraLanguage.cs" />
|
<Compile Include="IJiraLanguage.cs" />
|
||||||
<Compile Include="JiraAutofacModule.cs" />
|
<Compile Include="JiraAddonModule.cs" />
|
||||||
<Compile Include="IssueTypeBitmapCache.cs" />
|
<Compile Include="IssueTypeBitmapCache.cs" />
|
||||||
<Compile Include="JiraConnector.cs" />
|
<Compile Include="JiraConnector.cs" />
|
||||||
<Compile Include="IJiraConfiguration.cs" />
|
<Compile Include="IJiraConfiguration.cs" />
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ using Greenshot.Addons.Components;
|
||||||
namespace Greenshot.Addon.Jira
|
namespace Greenshot.Addon.Jira
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class JiraAutofacModule : AddonModule
|
public class JiraAddonModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -7,14 +7,14 @@
|
||||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Costura.Fody" version="2.0.1" targetFramework="net452" developmentDependency="true" />
|
<package id="Costura.Fody" version="2.0.1" targetFramework="net452" developmentDependency="true" />
|
||||||
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ using Greenshot.Addons.Interfaces;
|
||||||
namespace Greenshot.Addon.LegacyEditor
|
namespace Greenshot.Addon.LegacyEditor
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class EditorAutofacModule : AddonModule
|
public class EditorAddonModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -36,29 +36,29 @@
|
||||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
|
|
@ -217,7 +217,7 @@
|
||||||
<Compile Include="EditorConfigurationExtensions.cs" />
|
<Compile Include="EditorConfigurationExtensions.cs" />
|
||||||
<Compile Include="EditorDestination.cs" />
|
<Compile Include="EditorDestination.cs" />
|
||||||
<Compile Include="EditorFactory.cs" />
|
<Compile Include="EditorFactory.cs" />
|
||||||
<Compile Include="EditorAutofacModule.cs" />
|
<Compile Include="EditorAddonModule.cs" />
|
||||||
<Compile Include="Forms\DropShadowSettingsForm.cs">
|
<Compile Include="Forms\DropShadowSettingsForm.cs">
|
||||||
<SubType>Form</SubType>
|
<SubType>Form</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
|
|
||||||
|
|
@ -6,14 +6,14 @@
|
||||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||||
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -61,29 +61,29 @@
|
||||||
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
|
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||||
|
|
@ -176,7 +176,7 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="Entities\AddResult.cs" />
|
<Compile Include="Entities\AddResult.cs" />
|
||||||
<Compile Include="Entities\LutimInfo.cs" />
|
<Compile Include="Entities\LutimInfo.cs" />
|
||||||
<Compile Include="LutimAutofacModule.cs" />
|
<Compile Include="LutimAddonModule.cs" />
|
||||||
<Compile Include="ILutimLanguage.cs" />
|
<Compile Include="ILutimLanguage.cs" />
|
||||||
<Compile Include="LutimDestination.cs" />
|
<Compile Include="LutimDestination.cs" />
|
||||||
<Compile Include="ILutimConfiguration.cs" />
|
<Compile Include="ILutimConfiguration.cs" />
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ using Greenshot.Addons.Components;
|
||||||
namespace Greenshot.Addon.Lutim
|
namespace Greenshot.Addon.Lutim
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class LutimAutofacModule : AddonModule
|
public class LutimAddonModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -7,14 +7,14 @@
|
||||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
|
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -58,29 +58,29 @@
|
||||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
|
|
@ -160,7 +160,7 @@
|
||||||
<Compile Include="OCRForm.cs">
|
<Compile Include="OCRForm.cs">
|
||||||
<SubType>Form</SubType>
|
<SubType>Form</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="OcrAutofacModule.cs" />
|
<Compile Include="OcrAddonModule.cs" />
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
<Compile Include="SettingsForm.cs">
|
<Compile Include="SettingsForm.cs">
|
||||||
<SubType>Form</SubType>
|
<SubType>Form</SubType>
|
||||||
|
|
|
||||||
|
|
@ -21,23 +21,50 @@
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
using System.Diagnostics;
|
||||||
|
using System.IO;
|
||||||
using Autofac;
|
using Autofac;
|
||||||
using Dapplo.Addons;
|
using Dapplo.Addons;
|
||||||
|
using Dapplo.Addons.Bootstrapper.Resolving;
|
||||||
using Greenshot.Addons.Components;
|
using Greenshot.Addons.Components;
|
||||||
|
|
||||||
namespace Greenshot.Addon.OCR
|
namespace Greenshot.Addon.OCR
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class PhotobucketAutofacModule : AddonModule
|
public class OcrAddonModule : AddonModule
|
||||||
{
|
{
|
||||||
|
private bool HasModi()
|
||||||
|
{
|
||||||
|
var ocrCommand = Path.Combine(FileTools.NormalizeDirectory("."), "greenshotocrcommand.exe");
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using (var process = Process.Start(ocrCommand, "-c"))
|
||||||
|
{
|
||||||
|
if (process != null)
|
||||||
|
{
|
||||||
|
process.WaitForExit();
|
||||||
|
return process.ExitCode == 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
// ignored
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
// TODO: Check for MODI
|
if (HasModi())
|
||||||
builder
|
{
|
||||||
.RegisterType<OcrDestination>()
|
builder
|
||||||
.As<IDestination>()
|
.RegisterType<OcrDestination>()
|
||||||
.SingleInstance();
|
.As<IDestination>()
|
||||||
|
.SingleInstance();
|
||||||
|
}
|
||||||
base.Load(builder);
|
base.Load(builder);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -6,14 +6,14 @@
|
||||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||||
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -65,7 +65,7 @@ namespace Greenshot.Addon.Office.Destinations
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public WordDestination(string wordCaption,
|
protected WordDestination(string wordCaption,
|
||||||
ICoreConfiguration coreConfiguration,
|
ICoreConfiguration coreConfiguration,
|
||||||
IGreenshotLanguage greenshotLanguage) : this(coreConfiguration, greenshotLanguage)
|
IGreenshotLanguage greenshotLanguage) : this(coreConfiguration, greenshotLanguage)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -44,29 +44,29 @@
|
||||||
<Reference Include="Costura, Version=2.0.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
|
<Reference Include="Costura, Version=2.0.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll</HintPath>
|
<HintPath>..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
|
|
@ -211,6 +211,7 @@
|
||||||
<Compile Include="OfficeInterop\SpecialLocation.cs" />
|
<Compile Include="OfficeInterop\SpecialLocation.cs" />
|
||||||
<Compile Include="OfficeInterop\WdUnits.cs" />
|
<Compile Include="OfficeInterop\WdUnits.cs" />
|
||||||
<Compile Include="OfficeInterop\XMLSchema.cs" />
|
<Compile Include="OfficeInterop\XMLSchema.cs" />
|
||||||
|
<Compile Include="OfficeAddonModule.cs" />
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
<Compile Include="OfficeExport\ExcelExporter.cs" />
|
<Compile Include="OfficeExport\ExcelExporter.cs" />
|
||||||
<Compile Include="OfficeExport\OneNoteExporter.cs" />
|
<Compile Include="OfficeExport\OneNoteExporter.cs" />
|
||||||
|
|
|
||||||
70
src/Greenshot.Addon.Office/OfficeAddonModule.cs
Normal file
70
src/Greenshot.Addon.Office/OfficeAddonModule.cs
Normal file
|
|
@ -0,0 +1,70 @@
|
||||||
|
#region Greenshot GNU General Public License
|
||||||
|
|
||||||
|
// Greenshot - a free and open source screenshot tool
|
||||||
|
// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom
|
||||||
|
//
|
||||||
|
// For more information see: http://getgreenshot.org/
|
||||||
|
// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 1 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
using Autofac;
|
||||||
|
using Dapplo.Addons;
|
||||||
|
using Dapplo.CaliburnMicro.Configuration;
|
||||||
|
using Greenshot.Addon.Office.Destinations;
|
||||||
|
using Greenshot.Addon.Office.ViewModels;
|
||||||
|
using Greenshot.Addons.Components;
|
||||||
|
|
||||||
|
namespace Greenshot.Addon.Office
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public class OfficeAddonModule : AddonModule
|
||||||
|
{
|
||||||
|
protected override void Load(ContainerBuilder builder)
|
||||||
|
{
|
||||||
|
builder
|
||||||
|
.RegisterType<ExcelDestination>()
|
||||||
|
.As<IDestination>()
|
||||||
|
.SingleInstance();
|
||||||
|
|
||||||
|
builder
|
||||||
|
.RegisterType<WordDestination>()
|
||||||
|
.As<IDestination>()
|
||||||
|
.SingleInstance();
|
||||||
|
|
||||||
|
builder
|
||||||
|
.RegisterType<PowerpointDestination>()
|
||||||
|
.As<IDestination>()
|
||||||
|
.SingleInstance();
|
||||||
|
|
||||||
|
builder
|
||||||
|
.RegisterType<OneNoteDestination>()
|
||||||
|
.As<IDestination>()
|
||||||
|
.SingleInstance();
|
||||||
|
|
||||||
|
builder
|
||||||
|
.RegisterType<OutlookDestination>()
|
||||||
|
.As<IDestination>()
|
||||||
|
.SingleInstance();
|
||||||
|
builder
|
||||||
|
.RegisterType<OfficeConfigViewModel>()
|
||||||
|
.As<IConfigScreen>()
|
||||||
|
.SingleInstance();
|
||||||
|
|
||||||
|
base.Load(builder);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -7,14 +7,14 @@
|
||||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Costura.Fody" version="2.0.1" targetFramework="net452" developmentDependency="true" />
|
<package id="Costura.Fody" version="2.0.1" targetFramework="net452" developmentDependency="true" />
|
||||||
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||||
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -57,29 +57,29 @@
|
||||||
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
|
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||||
|
|
@ -178,7 +178,7 @@
|
||||||
<Compile Include="Entities\OneDriveUploadResponse.cs" />
|
<Compile Include="Entities\OneDriveUploadResponse.cs" />
|
||||||
<Compile Include="IOneDriveConfiguration.cs" />
|
<Compile Include="IOneDriveConfiguration.cs" />
|
||||||
<Compile Include="IOneDriveLanguage.cs" />
|
<Compile Include="IOneDriveLanguage.cs" />
|
||||||
<Compile Include="OneDriveAutofacModule.cs" />
|
<Compile Include="OneDriveAddonModule.cs" />
|
||||||
<Compile Include="OneDriveDestination.cs" />
|
<Compile Include="OneDriveDestination.cs" />
|
||||||
<Compile Include="OneDriveLinkType.cs" />
|
<Compile Include="OneDriveLinkType.cs" />
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ using Greenshot.Addons.Components;
|
||||||
namespace Greenshot.Addon.OneDrive
|
namespace Greenshot.Addon.OneDrive
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class OneDriveAutofacModule : AddonModule
|
public class OneDriveAddonModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -7,14 +7,14 @@
|
||||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
|
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -58,29 +58,29 @@
|
||||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||||
|
|
@ -166,7 +166,7 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="IPhotobucketLanguage.cs" />
|
<Compile Include="IPhotobucketLanguage.cs" />
|
||||||
<Compile Include="PhotobucketAutofacModule.cs" />
|
<Compile Include="PhotobucketAddonModule.cs" />
|
||||||
<Compile Include="PhotobucketDestination.cs" />
|
<Compile Include="PhotobucketDestination.cs" />
|
||||||
<Compile Include="PhotobucketInfo.cs" />
|
<Compile Include="PhotobucketInfo.cs" />
|
||||||
<Compile Include="IPhotobucketConfiguration.cs" />
|
<Compile Include="IPhotobucketConfiguration.cs" />
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ using Greenshot.Addons.Components;
|
||||||
namespace Greenshot.Addon.Photobucket
|
namespace Greenshot.Addon.Photobucket
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class PhotobucketAutofacModule : AddonModule
|
public class PhotobucketAddonModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -6,14 +6,14 @@
|
||||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -57,29 +57,29 @@
|
||||||
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
|
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||||
|
|
@ -180,7 +180,7 @@
|
||||||
<Compile Include="Entities\WorkItem.cs" />
|
<Compile Include="Entities\WorkItem.cs" />
|
||||||
<Compile Include="ITfsConfiguration.cs" />
|
<Compile Include="ITfsConfiguration.cs" />
|
||||||
<Compile Include="ITfsLanguage.cs" />
|
<Compile Include="ITfsLanguage.cs" />
|
||||||
<Compile Include="TfsAutofacModule.cs" />
|
<Compile Include="TfsAddonModule.cs" />
|
||||||
<Compile Include="TfsClient.cs" />
|
<Compile Include="TfsClient.cs" />
|
||||||
<Compile Include="TfsDestination.cs" />
|
<Compile Include="TfsDestination.cs" />
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ using Greenshot.Addons.Components;
|
||||||
namespace Greenshot.Addon.Tfs
|
namespace Greenshot.Addon.Tfs
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class TfsAutofacModule : AddonModule
|
public class TfsAddonModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -7,14 +7,14 @@
|
||||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
|
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -54,17 +54,17 @@
|
||||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.38-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
|
|
@ -146,7 +146,7 @@
|
||||||
<Compile Include="MemoryRandomAccessStream.cs" />
|
<Compile Include="MemoryRandomAccessStream.cs" />
|
||||||
<Compile Include="Native\DataTransferManagerHelper.cs" />
|
<Compile Include="Native\DataTransferManagerHelper.cs" />
|
||||||
<Compile Include="Native\IDataTransferManagerInterOp.cs" />
|
<Compile Include="Native\IDataTransferManagerInterOp.cs" />
|
||||||
<Compile Include="Win10AutofacModule.cs" />
|
<Compile Include="Win10AddonModule.cs" />
|
||||||
<Compile Include="Win10ShareDestination.cs" />
|
<Compile Include="Win10ShareDestination.cs" />
|
||||||
<Compile Include="Win10OcrDestination.cs" />
|
<Compile Include="Win10OcrDestination.cs" />
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
|
|
|
||||||
|
|
@ -6,10 +6,10 @@
|
||||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||||
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ using Greenshot.Addons.ViewModels;
|
||||||
namespace Greenshot.Addons
|
namespace Greenshot.Addons
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public class AddonsAutofacModule : AddonModule
|
public class AddonsModule : AddonModule
|
||||||
{
|
{
|
||||||
protected override void Load(ContainerBuilder builder)
|
protected override void Load(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
|
|
@ -102,13 +102,12 @@ namespace Greenshot.Addons.Controls
|
||||||
|
|
||||||
foreach (Enum enumValue in availableValues)
|
foreach (Enum enumValue in availableValues)
|
||||||
{
|
{
|
||||||
var enumKey = enumTypeName + "." + enumValue;
|
if (!Language.HasKey(enumTypeName, enumValue))
|
||||||
if (!Language.HasKey(enumKey))
|
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
var translation = Language.GetString(enumTypeName + "." + enumValue);
|
var translation = Language.GetString(enumTypeName,enumValue);
|
||||||
if (translation.Equals(selectedValue))
|
if (translation.Equals(selectedValue))
|
||||||
{
|
{
|
||||||
returnValue = enumValue;
|
returnValue = enumValue;
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,6 @@ using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
using System.ComponentModel.Design;
|
using System.ComponentModel.Design;
|
||||||
using System.IO;
|
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
using Dapplo.Ini;
|
using Dapplo.Ini;
|
||||||
|
|
@ -122,41 +121,6 @@ namespace Greenshot.Addons.Controls
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Code to initialize the language etc during design time
|
/// Code to initialize the language etc during design time
|
||||||
/// </summary>
|
/// </summary>
|
||||||
protected void InitializeForDesigner()
|
|
||||||
{
|
|
||||||
if (DesignMode)
|
|
||||||
{
|
|
||||||
_designTimeControls = new Dictionary<string, Control>();
|
|
||||||
_designTimeToolStripItems = new Dictionary<string, ToolStripItem>();
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var typeResService = GetService(typeof(ITypeResolutionService)) as ITypeResolutionService;
|
|
||||||
|
|
||||||
// Add a hard-path if you are using SharpDevelop
|
|
||||||
// Language.AddLanguageFilePath(@"C:\Greenshot\Greenshot\Languages");
|
|
||||||
|
|
||||||
// this "type"
|
|
||||||
var currentAssembly = GetType().Assembly;
|
|
||||||
if (typeResService != null)
|
|
||||||
{
|
|
||||||
var assemblyPath = typeResService.GetPathOfAssembly(currentAssembly.GetName());
|
|
||||||
var assemblyDirectory = Path.GetDirectoryName(assemblyPath);
|
|
||||||
if (assemblyDirectory != null && !Language.AddLanguageFilePath(Path.Combine(assemblyDirectory, @"..\..\Greenshot\Languages\")))
|
|
||||||
{
|
|
||||||
Language.AddLanguageFilePath(Path.Combine(assemblyDirectory, @"..\..\..\Greenshot\Languages\"));
|
|
||||||
}
|
|
||||||
if (assemblyDirectory != null && !Language.AddLanguageFilePath(Path.Combine(assemblyDirectory, @"..\..\Languages\")))
|
|
||||||
{
|
|
||||||
Language.AddLanguageFilePath(Path.Combine(assemblyDirectory, @"..\..\..\Languages\"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
MessageBox.Show(ex.Message);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// This override is only for the design-time of the form
|
/// This override is only for the design-time of the form
|
||||||
|
|
@ -196,13 +160,6 @@ namespace Greenshot.Addons.Controls
|
||||||
FillFields();
|
FillFields();
|
||||||
base.OnLoad(e);
|
base.OnLoad(e);
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
Log.Info().WriteLine("OnLoad called from designer.");
|
|
||||||
InitializeForDesigner();
|
|
||||||
base.OnLoad(e);
|
|
||||||
ApplyLanguage();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
||||||
|
|
@ -194,7 +194,7 @@ EndSelection:<<<<<<<4
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
messageText = Language.GetString("clipboard_error");
|
messageText = Language.GetString("Core","clipboard_error");
|
||||||
}
|
}
|
||||||
Log.Error().WriteLine(clipboardSetException, messageText);
|
Log.Error().WriteLine(clipboardSetException, messageText);
|
||||||
}
|
}
|
||||||
|
|
@ -227,7 +227,7 @@ EndSelection:<<<<<<<4
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
messageText = Language.GetString("clipboard_error");
|
messageText = Language.GetString("Core", "clipboard_error");
|
||||||
}
|
}
|
||||||
Log.Error().WriteLine(ee, messageText);
|
Log.Error().WriteLine(ee, messageText);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -25,13 +25,8 @@
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.Linq;
|
||||||
using System.Reflection;
|
using Dapplo.Language;
|
||||||
using System.Text.RegularExpressions;
|
|
||||||
using System.Xml;
|
|
||||||
using Dapplo.Ini;
|
|
||||||
using Dapplo.Log;
|
|
||||||
using Microsoft.Win32;
|
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|
@ -45,545 +40,31 @@ namespace Greenshot.Addons.Core
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class Language
|
public class Language
|
||||||
{
|
{
|
||||||
private const string DefaultLanguage = "en-US";
|
private static LanguageLoader languageLoader = LanguageLoader.Current;
|
||||||
private const string HelpFilenamePattern = @"help-*.html";
|
|
||||||
private const string LanguageFilenamePattern = @"language*.xml";
|
|
||||||
private const string LanguageGroupsKey = @"SYSTEM\CurrentControlSet\Control\Nls\Language Groups";
|
|
||||||
private static readonly LogSource Log = new LogSource();
|
|
||||||
private static readonly IList<string> LanguagePaths = new List<string>();
|
|
||||||
private static readonly IDictionary<string, List<LanguageFile>> LanguageFiles = new Dictionary<string, List<LanguageFile>>();
|
|
||||||
private static readonly IDictionary<string, string> HelpFiles = new Dictionary<string, string>();
|
|
||||||
private static readonly Regex PrefixRegexp = new Regex(@"language_([a-zA-Z0-9]+).*");
|
|
||||||
private static readonly Regex IetfCleanRegexp = new Regex(@"[^a-zA-Z]+");
|
|
||||||
private static readonly Regex IetfRegexp = new Regex(@"^.*([a-zA-Z]{2,3}-[a-zA-Z]{1,2})\.xml$");
|
|
||||||
private static readonly IList<string> UnsupportedLanguageGroups = new List<string>();
|
|
||||||
private static readonly IDictionary<string, string> Resources = new Dictionary<string, string>();
|
|
||||||
private static string _currentLanguage;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Static initializer for the language code
|
|
||||||
/// </summary>
|
|
||||||
static Language()
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var location = string.IsNullOrEmpty(Assembly.GetExecutingAssembly().Location) ? new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath : Assembly.GetExecutingAssembly().Location;
|
|
||||||
|
|
||||||
var applicationFolder = Path.GetDirectoryName(location);
|
|
||||||
|
|
||||||
// PAF Path
|
|
||||||
if (applicationFolder != null)
|
|
||||||
{
|
|
||||||
AddPath(Path.Combine(applicationFolder, @"App\Greenshot\Languages"));
|
|
||||||
}
|
|
||||||
// Application data path
|
|
||||||
var applicationDataFolder = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
|
|
||||||
AddPath(Path.Combine(applicationDataFolder, @"Greenshot\Languages\"));
|
|
||||||
|
|
||||||
// Startup path
|
|
||||||
if (applicationFolder != null)
|
|
||||||
{
|
|
||||||
AddPath(Path.Combine(applicationFolder, @"Languages"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception pathException)
|
|
||||||
{
|
|
||||||
Log.Error().WriteLine(pathException);
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
using (var languageGroupsKey = Registry.LocalMachine.OpenSubKey(LanguageGroupsKey, false))
|
|
||||||
{
|
|
||||||
if (languageGroupsKey != null)
|
|
||||||
{
|
|
||||||
var groups = languageGroupsKey.GetValueNames();
|
|
||||||
foreach (var group in groups)
|
|
||||||
{
|
|
||||||
var groupValue = (string) languageGroupsKey.GetValue(group);
|
|
||||||
var isGroupNotInstalled = "0".Equals(groupValue);
|
|
||||||
if (isGroupNotInstalled)
|
|
||||||
{
|
|
||||||
UnsupportedLanguageGroups.Add(group.ToLower());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Log.Warn().WriteLine(e, "Couldn't read the installed language groups.");
|
|
||||||
}
|
|
||||||
|
|
||||||
var coreConfig = IniConfig.Current.Get<ICoreConfiguration>();
|
|
||||||
ScanFiles();
|
|
||||||
if (!string.IsNullOrEmpty(coreConfig.Language))
|
|
||||||
{
|
|
||||||
CurrentLanguage = coreConfig.Language;
|
|
||||||
if (CurrentLanguage != null && CurrentLanguage != coreConfig.Language)
|
|
||||||
{
|
|
||||||
coreConfig.Language = CurrentLanguage;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (CurrentLanguage == null)
|
|
||||||
{
|
|
||||||
Log.Warn().WriteLine("Couldn't set language from configuration, changing to default. Installation problem?");
|
|
||||||
CurrentLanguage = DefaultLanguage;
|
|
||||||
if (CurrentLanguage != null)
|
|
||||||
{
|
|
||||||
coreConfig.Language = CurrentLanguage;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (CurrentLanguage == null)
|
|
||||||
{
|
|
||||||
Log.Error().WriteLine(null, "Couldn't set language, installation problem?");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Get or set the current language
|
/// Get or set the current language
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static string CurrentLanguage
|
public static string CurrentLanguage
|
||||||
{
|
{
|
||||||
get { return _currentLanguage; }
|
get => languageLoader.CurrentLanguage;
|
||||||
set
|
set { languageLoader.ChangeLanguageAsync(value); }
|
||||||
{
|
|
||||||
var ietf = FindBestIETFMatch(value);
|
|
||||||
if (!LanguageFiles.ContainsKey(ietf))
|
|
||||||
{
|
|
||||||
Log.Warn().WriteLine("No match for language {0} found!", ietf);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (_currentLanguage == null || !_currentLanguage.Equals(ietf))
|
|
||||||
{
|
|
||||||
_currentLanguage = ietf;
|
|
||||||
Reload();
|
|
||||||
if (LanguageChanged == null)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
try
|
|
||||||
{
|
|
||||||
LanguageChanged(null, null);
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
// ignored
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Log.Debug().WriteLine("CurrentLanguage not changed!");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Return a list of all the supported languages
|
/// Return a list of all the supported languages
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static IList<LanguageFile> SupportedLanguages
|
public static IDictionary<string, string> SupportedLanguages => languageLoader.AvailableLanguages;
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
IList<LanguageFile> languages = new List<LanguageFile>();
|
|
||||||
// Loop over all languages with all the files in there
|
|
||||||
foreach (var langs in LanguageFiles.Values)
|
|
||||||
{
|
|
||||||
// Loop over all the files for a language
|
|
||||||
foreach (var langFile in langs)
|
|
||||||
{
|
|
||||||
// Only take the ones without prefix, these are the "base" language files
|
|
||||||
if (langFile.Prefix == null)
|
|
||||||
{
|
|
||||||
languages.Add(langFile);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return languages;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Return the path to the help-file
|
/// Check if a resource with prefix.key exists
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static string HelpFilePath
|
/// <param name="prefix"></param>
|
||||||
|
/// <param name="key"></param>
|
||||||
|
/// <returns>true if available</returns>
|
||||||
|
public static bool HasKey(string prefix, string key)
|
||||||
{
|
{
|
||||||
get
|
return languageLoader[prefix].Keys().Contains(key);
|
||||||
{
|
|
||||||
if (HelpFiles.ContainsKey(_currentLanguage))
|
|
||||||
{
|
|
||||||
return HelpFiles[_currentLanguage];
|
|
||||||
}
|
|
||||||
return HelpFiles[DefaultLanguage];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static event LanguageChangedHandler LanguageChanged;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Internal method to add a path to the paths that will be scanned for language files!
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="path"></param>
|
|
||||||
/// <returns>true if the path exists and is added</returns>
|
|
||||||
private static bool AddPath(string path)
|
|
||||||
{
|
|
||||||
if (!LanguagePaths.Contains(path))
|
|
||||||
{
|
|
||||||
if (Directory.Exists(path))
|
|
||||||
{
|
|
||||||
Log.Debug().WriteLine("Adding language path {0}", path);
|
|
||||||
LanguagePaths.Add(path);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
Log.Info().WriteLine("Not adding non existing language path {0}", path);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Add a new path to the paths that will be scanned for language files!
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="path"></param>
|
|
||||||
/// <returns>true if the path exists and is added</returns>
|
|
||||||
public static bool AddLanguageFilePath(string path)
|
|
||||||
{
|
|
||||||
if (!LanguagePaths.Contains(path))
|
|
||||||
{
|
|
||||||
Log.Debug().WriteLine("New language path {0}", path);
|
|
||||||
if (AddPath(path))
|
|
||||||
{
|
|
||||||
ScanFiles();
|
|
||||||
Reload();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Load the files for the specified ietf
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="ietf"></param>
|
|
||||||
private static void LoadFiles(string ietf)
|
|
||||||
{
|
|
||||||
ietf = ReformatIETF(ietf);
|
|
||||||
if (!LanguageFiles.ContainsKey(ietf))
|
|
||||||
{
|
|
||||||
Log.Error().WriteLine("No language {0} available.", ietf);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
var filesToLoad = LanguageFiles[ietf];
|
|
||||||
foreach (var fileToLoad in filesToLoad)
|
|
||||||
{
|
|
||||||
LoadResources(fileToLoad);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Load the language resources from the scanned files
|
|
||||||
/// </summary>
|
|
||||||
private static void Reload()
|
|
||||||
{
|
|
||||||
Resources.Clear();
|
|
||||||
LoadFiles(DefaultLanguage);
|
|
||||||
if (_currentLanguage != null && !_currentLanguage.Equals(DefaultLanguage))
|
|
||||||
{
|
|
||||||
LoadFiles(_currentLanguage);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Try to find the best match for the supplied IETF
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="inputIETF"></param>
|
|
||||||
/// <returns>IETF</returns>
|
|
||||||
private static string FindBestIETFMatch(string inputIETF)
|
|
||||||
{
|
|
||||||
var returnIETF = inputIETF;
|
|
||||||
if (string.IsNullOrEmpty(returnIETF))
|
|
||||||
{
|
|
||||||
returnIETF = DefaultLanguage;
|
|
||||||
}
|
|
||||||
returnIETF = ReformatIETF(returnIETF);
|
|
||||||
if (!LanguageFiles.ContainsKey(returnIETF))
|
|
||||||
{
|
|
||||||
Log.Warn().WriteLine("Unknown language {0}, trying best match!", returnIETF);
|
|
||||||
if (returnIETF.Length == 5)
|
|
||||||
{
|
|
||||||
returnIETF = returnIETF.Substring(0, 2);
|
|
||||||
}
|
|
||||||
foreach (var availableIETF in LanguageFiles.Keys)
|
|
||||||
{
|
|
||||||
if (availableIETF.StartsWith(returnIETF))
|
|
||||||
{
|
|
||||||
Log.Info().WriteLine("Found language {0}, best match for {1}!", availableIETF, returnIETF);
|
|
||||||
returnIETF = availableIETF;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return returnIETF;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// This helper method clears all non alpha characters from the IETF, and does a reformatting.
|
|
||||||
/// This prevents problems with multiple formats or typos.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="inputIETF">string</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
private static string ReformatIETF(string inputIETF)
|
|
||||||
{
|
|
||||||
if (string.IsNullOrEmpty(inputIETF))
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
string returnIETF = inputIETF.ToLower();
|
|
||||||
returnIETF = IetfCleanRegexp.Replace(returnIETF, "");
|
|
||||||
if (returnIETF.Length == 4)
|
|
||||||
{
|
|
||||||
returnIETF = returnIETF.Substring(0, 2) + "-" + returnIETF.Substring(2, 2).ToUpper();
|
|
||||||
}
|
|
||||||
return returnIETF;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Load the resources from the language file
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="languageFile">File to load from</param>
|
|
||||||
private static void LoadResources(LanguageFile languageFile)
|
|
||||||
{
|
|
||||||
Log.Info().WriteLine("Loading language file {0}", languageFile.Filepath);
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var xmlDocument = new XmlDocument();
|
|
||||||
xmlDocument.Load(languageFile.Filepath);
|
|
||||||
var resourceNodes = xmlDocument.GetElementsByTagName("resource");
|
|
||||||
foreach (XmlNode resourceNode in resourceNodes)
|
|
||||||
{
|
|
||||||
var key = resourceNode.Attributes["name"].Value;
|
|
||||||
if (!string.IsNullOrEmpty(languageFile.Prefix))
|
|
||||||
{
|
|
||||||
key = languageFile.Prefix + "." + key;
|
|
||||||
}
|
|
||||||
var text = resourceNode.InnerText;
|
|
||||||
if (!string.IsNullOrEmpty(text))
|
|
||||||
{
|
|
||||||
text = text.Trim();
|
|
||||||
}
|
|
||||||
if (!Resources.ContainsKey(key))
|
|
||||||
{
|
|
||||||
Resources.Add(key, text);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Resources[key] = text;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Log.Error().WriteLine(e, "Could not load language file " + languageFile.Filepath);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Load the language file information
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="languageFilePath"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
private static LanguageFile LoadFileInfo(string languageFilePath)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var xmlDocument = new XmlDocument();
|
|
||||||
xmlDocument.Load(languageFilePath);
|
|
||||||
var nodes = xmlDocument.GetElementsByTagName("language");
|
|
||||||
if (nodes.Count <= 0)
|
|
||||||
{
|
|
||||||
throw new XmlException("Root element <language> is missing");
|
|
||||||
}
|
|
||||||
|
|
||||||
var languageFile = new LanguageFile
|
|
||||||
{
|
|
||||||
Filepath = languageFilePath
|
|
||||||
};
|
|
||||||
var node = nodes.Item(0);
|
|
||||||
if (node?.Attributes == null)
|
|
||||||
{
|
|
||||||
return languageFile;
|
|
||||||
}
|
|
||||||
|
|
||||||
languageFile.Description = node.Attributes["description"]?.Value;
|
|
||||||
languageFile.Ietf = ReformatIETF(node.Attributes["ietf"]?.Value);
|
|
||||||
if (node.Attributes["version"]?.Value != null)
|
|
||||||
{
|
|
||||||
languageFile.Version = new Version(node.Attributes["version"].Value);
|
|
||||||
}
|
|
||||||
languageFile.Prefix = node.Attributes["prefix"]?.Value.ToLower();
|
|
||||||
languageFile.LanguageGroup = node.Attributes["languagegroup"]?.Value.ToLower();
|
|
||||||
return languageFile;
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Log.Error().WriteLine(e, "Could not load language file " + languageFilePath);
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Scan the files in all directories
|
|
||||||
/// </summary>
|
|
||||||
private static void ScanFiles()
|
|
||||||
{
|
|
||||||
LanguageFiles.Clear();
|
|
||||||
HelpFiles.Clear();
|
|
||||||
foreach (var languagePath in LanguagePaths)
|
|
||||||
{
|
|
||||||
if (!Directory.Exists(languagePath))
|
|
||||||
{
|
|
||||||
Log.Info().WriteLine("Skipping non existing language path {0}", languagePath);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
Log.Info().WriteLine("Searching language directory '{0}' for language files with pattern '{1}'", languagePath, LanguageFilenamePattern);
|
|
||||||
try
|
|
||||||
{
|
|
||||||
foreach (var languageFilepath in Directory.GetFiles(languagePath, LanguageFilenamePattern, SearchOption.AllDirectories))
|
|
||||||
{
|
|
||||||
//Log.Debug().WriteLine("Found language file: {0}", languageFilepath);
|
|
||||||
var languageFile = LoadFileInfo(languageFilepath);
|
|
||||||
if (languageFile == null)
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (string.IsNullOrEmpty(languageFile.Ietf))
|
|
||||||
{
|
|
||||||
Log.Warn().WriteLine("Fixing missing ietf in language-file {0}", languageFilepath);
|
|
||||||
var languageFilename = Path.GetFileName(languageFilepath);
|
|
||||||
if (IetfRegexp.IsMatch(languageFilename))
|
|
||||||
{
|
|
||||||
var replacementIETF = IetfRegexp.Replace(languageFilename, "$1");
|
|
||||||
languageFile.Ietf = ReformatIETF(replacementIETF);
|
|
||||||
Log.Info().WriteLine("Fixed IETF to {0}", languageFile.Ietf);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Log.Error().WriteLine("Missing ietf , no recover possible... skipping language-file {0}!", languageFilepath);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if we can display the file
|
|
||||||
if (!string.IsNullOrEmpty(languageFile.LanguageGroup) && UnsupportedLanguageGroups.Contains(languageFile.LanguageGroup))
|
|
||||||
{
|
|
||||||
Log.Info().WriteLine("Skipping unsuported (not able to display) language {0} from file {1}", languageFile.Description, languageFilepath);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// build prefix, based on the filename, but only if it's not set in the file itself.
|
|
||||||
if (string.IsNullOrEmpty(languageFile.Prefix))
|
|
||||||
{
|
|
||||||
var languageFilename = Path.GetFileNameWithoutExtension(languageFilepath);
|
|
||||||
if (PrefixRegexp.IsMatch(languageFilename))
|
|
||||||
{
|
|
||||||
languageFile.Prefix = PrefixRegexp.Replace(languageFilename, "$1");
|
|
||||||
if (!string.IsNullOrEmpty(languageFile.Prefix))
|
|
||||||
{
|
|
||||||
languageFile.Prefix = languageFile.Prefix.Replace("plugin", "").ToLower();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
List<LanguageFile> currentFiles = null;
|
|
||||||
if (LanguageFiles.ContainsKey(languageFile.Ietf))
|
|
||||||
{
|
|
||||||
currentFiles = LanguageFiles[languageFile.Ietf];
|
|
||||||
var needToAdd = true;
|
|
||||||
var deleteList = new List<LanguageFile>();
|
|
||||||
foreach (var compareWithLangfile in currentFiles)
|
|
||||||
{
|
|
||||||
if ((languageFile.Prefix != null || compareWithLangfile.Prefix != null) &&
|
|
||||||
(languageFile.Prefix == null ||
|
|
||||||
!languageFile.Prefix.Equals(compareWithLangfile.Prefix)))
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (compareWithLangfile.Version == null || languageFile.Version == null)
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (compareWithLangfile.Version > languageFile.Version)
|
|
||||||
{
|
|
||||||
Log.Warn().WriteLine("Skipping {0}:{1}:{2} as {3}:{4}:{5} is newer", languageFile.Filepath, languageFile.Prefix, languageFile.Version, compareWithLangfile.Filepath,
|
|
||||||
compareWithLangfile.Prefix, compareWithLangfile.Version);
|
|
||||||
needToAdd = false;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
Log.Warn().WriteLine("Found {0}:{1}:{2} and deleting {3}:{4}:{5}", languageFile.Filepath, languageFile.Prefix, languageFile.Version, compareWithLangfile.Filepath,
|
|
||||||
compareWithLangfile.Prefix, compareWithLangfile.Version);
|
|
||||||
deleteList.Add(compareWithLangfile);
|
|
||||||
}
|
|
||||||
if (needToAdd)
|
|
||||||
{
|
|
||||||
foreach (var deleteFile in deleteList)
|
|
||||||
{
|
|
||||||
currentFiles.Remove(deleteFile);
|
|
||||||
}
|
|
||||||
Log.Info().WriteLine("Added language definition {0} from: {1}", languageFile.Description, languageFile.Filepath);
|
|
||||||
currentFiles.Add(languageFile);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
currentFiles = new List<LanguageFile> {languageFile};
|
|
||||||
LanguageFiles.Add(languageFile.Ietf, currentFiles);
|
|
||||||
Log.Info().WriteLine("Added language definition {0} from: {1}", languageFile.Description, languageFile.Filepath);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (DirectoryNotFoundException)
|
|
||||||
{
|
|
||||||
Log.Info().WriteLine("Non existing language directory: {0}", languagePath);
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Log.Error().WriteLine(e, "Error trying for read directory " + languagePath);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Now find the help files
|
|
||||||
Log.Info().WriteLine("Searching language directory '{0}' for help files with pattern '{1}'", languagePath, HelpFilenamePattern);
|
|
||||||
try
|
|
||||||
{
|
|
||||||
foreach (var helpFilepath in Directory.GetFiles(languagePath, HelpFilenamePattern, SearchOption.AllDirectories))
|
|
||||||
{
|
|
||||||
Log.Debug().WriteLine("Found help file: {0}", helpFilepath);
|
|
||||||
var helpFilename = Path.GetFileName(helpFilepath);
|
|
||||||
var ietf = ReformatIETF(helpFilename.Replace(".html", "").Replace("help-", ""));
|
|
||||||
if (!HelpFiles.ContainsKey(ietf))
|
|
||||||
{
|
|
||||||
HelpFiles.Add(ietf, helpFilepath);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Log.Warn().WriteLine("skipping help file {0}, already a file with the same IETF {1} found!", helpFilepath, ietf);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (DirectoryNotFoundException)
|
|
||||||
{
|
|
||||||
Log.Info().WriteLine("Non existing language directory: {0}", languagePath);
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Log.Error().WriteLine(e, "Error trying for read directory " + languagePath);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
@ -594,61 +75,18 @@ namespace Greenshot.Addons.Core
|
||||||
/// <returns>true if available</returns>
|
/// <returns>true if available</returns>
|
||||||
public static bool HasKey(string prefix, Enum key)
|
public static bool HasKey(string prefix, Enum key)
|
||||||
{
|
{
|
||||||
if (key == null)
|
return languageLoader[prefix].Keys().Contains(key.ToString());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static string Translate(object key)
|
||||||
|
{
|
||||||
|
var typename = key.GetType().Name;
|
||||||
|
var enumKey = typename + "." + key;
|
||||||
|
if (HasKey("Core", enumKey))
|
||||||
{
|
{
|
||||||
return false;
|
return GetString("Core", enumKey);
|
||||||
}
|
}
|
||||||
return HasKey(prefix + "." + key);
|
return key.ToString();
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Check if a resource with key exists
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="key"></param>
|
|
||||||
/// <returns>true if available</returns>
|
|
||||||
public static bool HasKey(Enum key)
|
|
||||||
{
|
|
||||||
if (key == null)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return HasKey(key.ToString());
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Check if a resource with prefix.key exists
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="prefix"></param>
|
|
||||||
/// <param name="key"></param>
|
|
||||||
/// <returns>true if available</returns>
|
|
||||||
public static bool HasKey(string prefix, string key)
|
|
||||||
{
|
|
||||||
return HasKey(prefix + "." + key);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Check if a resource with key exists
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="key"></param>
|
|
||||||
/// <returns>true if available</returns>
|
|
||||||
public static bool HasKey(string key)
|
|
||||||
{
|
|
||||||
if (key == null)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return Resources.ContainsKey(key);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// TryGet method which combines HasKey & GetString
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="key"></param>
|
|
||||||
/// <param name="languageString">out string</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public static bool TryGetString(string key, out string languageString)
|
|
||||||
{
|
|
||||||
return Resources.TryGetValue(key, out languageString);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
@ -657,48 +95,71 @@ namespace Greenshot.Addons.Core
|
||||||
/// <param name="prefix">string with prefix</param>
|
/// <param name="prefix">string with prefix</param>
|
||||||
/// <param name="key">string with key</param>
|
/// <param name="key">string with key</param>
|
||||||
/// <param name="languageString">out string</param>
|
/// <param name="languageString">out string</param>
|
||||||
/// <returns></returns>
|
/// <returns>bool</returns>
|
||||||
public static bool TryGetString(string prefix, string key, out string languageString)
|
public static bool TryGetString(string prefix, string key, out string languageString)
|
||||||
{
|
{
|
||||||
return Resources.TryGetValue(prefix + "." + key, out languageString);
|
if (languageLoader.Any(l => l.PrefixName() == prefix) && languageLoader[prefix].Keys().Contains(key))
|
||||||
|
{
|
||||||
|
languageString = languageLoader[prefix][key];
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
languageString = null;
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// TryGet method which combines HasKey & GetString
|
/// TryGet method which combines HasKey & GetString
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="prefix">string with prefix</param>
|
/// <param name="key">string with key</param>
|
||||||
/// <param name="key">Enum with key</param>
|
|
||||||
/// <param name="languageString">out string</param>
|
/// <param name="languageString">out string</param>
|
||||||
/// <returns></returns>
|
/// <returns>bool</returns>
|
||||||
public static bool TryGetString(string prefix, Enum key, out string languageString)
|
public static bool TryGetString(string key, out string languageString)
|
||||||
{
|
{
|
||||||
return Resources.TryGetValue(prefix + "." + key, out languageString);
|
return TryGetString("Core", key, out languageString);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
public static string Translate(object key)
|
/// Get the resource for prefix.key
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="prefix"></param>
|
||||||
|
/// <param name="key"></param>
|
||||||
|
/// <returns>resource or a "string ###prefix.key### not found"</returns>
|
||||||
|
public static string GetString(string prefix, string key)
|
||||||
{
|
{
|
||||||
var typename = key.GetType().Name;
|
if (key == null)
|
||||||
var enumKey = typename + "." + key;
|
|
||||||
if (HasKey(enumKey))
|
|
||||||
{
|
{
|
||||||
return GetString(enumKey);
|
return null;
|
||||||
}
|
}
|
||||||
return key.ToString();
|
return languageLoader[prefix][key];
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Get the resource for key
|
/// Get the resource for key
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="key"></param>
|
/// <param name="key"></param>
|
||||||
/// <returns>resource or a "string ###key### not found"</returns>
|
/// <returns>resource or a "string ###prefix.key### not found"</returns>
|
||||||
|
public static string GetString(string key)
|
||||||
|
{
|
||||||
|
if (key == null)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return languageLoader["Core"][key];
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get the resource for key
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="key">Enum</param>
|
||||||
|
/// <returns>resource or a "string ###prefix.key### not found"</returns>
|
||||||
public static string GetString(Enum key)
|
public static string GetString(Enum key)
|
||||||
{
|
{
|
||||||
if (key == null)
|
if (key == null)
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
return GetString(key.ToString());
|
return languageLoader["Core"][key.ToString()];
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
@ -713,37 +174,7 @@ namespace Greenshot.Addons.Core
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
return GetString(prefix + "." + key);
|
return GetString(prefix, key.ToString());
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Get the resource for prefix.key
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="prefix"></param>
|
|
||||||
/// <param name="key"></param>
|
|
||||||
/// <returns>resource or a "string ###prefix.key### not found"</returns>
|
|
||||||
public static string GetString(string prefix, string key)
|
|
||||||
{
|
|
||||||
return GetString(prefix + "." + key);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Get the resource for key
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="key"></param>
|
|
||||||
/// <returns>resource or a "string ###key### not found"</returns>
|
|
||||||
public static string GetString(string key)
|
|
||||||
{
|
|
||||||
if (key == null)
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!Resources.TryGetValue(key, out var returnValue))
|
|
||||||
{
|
|
||||||
return "string ###" + key + "### not found";
|
|
||||||
}
|
|
||||||
return returnValue;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
@ -778,7 +209,12 @@ namespace Greenshot.Addons.Core
|
||||||
/// <returns>formatted resource or a "string ###prefix.key### not found"</returns>
|
/// <returns>formatted resource or a "string ###prefix.key### not found"</returns>
|
||||||
public static string GetFormattedString(string prefix, string key, object param)
|
public static string GetFormattedString(string prefix, string key, object param)
|
||||||
{
|
{
|
||||||
return GetFormattedString(prefix + "." + key, param);
|
if (TryGetString(prefix, key, out var value))
|
||||||
|
{
|
||||||
|
return string.Format(value, param);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $"string ###{prefix}.{key}### not found";
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
@ -789,83 +225,7 @@ namespace Greenshot.Addons.Core
|
||||||
/// <returns>formatted resource or a "string ###key### not found"</returns>
|
/// <returns>formatted resource or a "string ###key### not found"</returns>
|
||||||
public static string GetFormattedString(string key, object param)
|
public static string GetFormattedString(string key, object param)
|
||||||
{
|
{
|
||||||
if (!Resources.TryGetValue(key, out var returnValue))
|
return GetFormattedString("Core", key, param);
|
||||||
{
|
|
||||||
return "string ###" + key + "### not found";
|
|
||||||
}
|
|
||||||
return string.Format(returnValue, param);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// This class contains the information about a language file
|
|
||||||
/// </summary>
|
|
||||||
public class LanguageFile : IEquatable<LanguageFile>
|
|
||||||
{
|
|
||||||
public string Description { get; set; }
|
|
||||||
|
|
||||||
public string Ietf { get; set; }
|
|
||||||
|
|
||||||
public Version Version { get; set; }
|
|
||||||
|
|
||||||
public string LanguageGroup { get; set; }
|
|
||||||
|
|
||||||
public string Filepath { get; set; }
|
|
||||||
|
|
||||||
public string Prefix { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Overload equals so we can delete a entry from a collection
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="other"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public bool Equals(LanguageFile other)
|
|
||||||
{
|
|
||||||
if (Prefix != null)
|
|
||||||
{
|
|
||||||
if (other != null && !Prefix.Equals(other.Prefix))
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (other?.Prefix != null)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (Ietf != null)
|
|
||||||
{
|
|
||||||
if (other != null && !Ietf.Equals(other.Ietf))
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (other?.Ietf != null)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (Version != null)
|
|
||||||
{
|
|
||||||
if (other != null && !Version.Equals(other.Version))
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (other != null && other.Version != null)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (Filepath != null)
|
|
||||||
{
|
|
||||||
if (other != null && !Filepath.Equals(other.Filepath))
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (other?.Filepath != null)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -40,29 +40,29 @@
|
||||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="CustomMarshalers" />
|
<Reference Include="CustomMarshalers" />
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||||
|
|
@ -235,7 +235,7 @@
|
||||||
<Compile Include="Extensions\ProcessorExtensions.cs" />
|
<Compile Include="Extensions\ProcessorExtensions.cs" />
|
||||||
<Compile Include="Core\IFileConfiguration.cs" />
|
<Compile Include="Core\IFileConfiguration.cs" />
|
||||||
<Compile Include="Extensions\SurfaceExtensions.cs" />
|
<Compile Include="Extensions\SurfaceExtensions.cs" />
|
||||||
<Compile Include="AddonsAutofacModule.cs" />
|
<Compile Include="AddonsModule.cs" />
|
||||||
<Compile Include="IGreenshotLanguage.cs" />
|
<Compile Include="IGreenshotLanguage.cs" />
|
||||||
<Compile Include="Interfaces\CaptureMode.cs" />
|
<Compile Include="Interfaces\CaptureMode.cs" />
|
||||||
<Compile Include="Interfaces\DrawingModes.cs" />
|
<Compile Include="Interfaces\DrawingModes.cs" />
|
||||||
|
|
|
||||||
|
|
@ -6,14 +6,14 @@
|
||||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -36,17 +36,17 @@
|
||||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
|
|
|
||||||
|
|
@ -6,10 +6,10 @@
|
||||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
|
||||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net452" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net452" />
|
||||||
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net452" />
|
||||||
|
|
|
||||||
|
|
@ -47,11 +47,11 @@
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
<assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-2.7.0.0" newVersion="2.7.0.0" />
|
<bindingRedirect oldVersion="0.0.0.0-2.8.0.0" newVersion="2.8.0.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-2.7.0.0" newVersion="2.7.0.0" />
|
<bindingRedirect oldVersion="0.0.0.0-2.8.0.0" newVersion="2.8.0.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||||
|
|
|
||||||
|
|
@ -42,17 +42,17 @@
|
||||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
|
|
@ -99,11 +99,11 @@
|
||||||
<Reference Include="JeremyAnsel.ColorQuant, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a5c614433db515df, processorArchitecture=MSIL">
|
<Reference Include="JeremyAnsel.ColorQuant, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a5c614433db515df, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\JeremyAnsel.ColorQuant.1.0.55\lib\net40\JeremyAnsel.ColorQuant.dll</HintPath>
|
<HintPath>..\packages\JeremyAnsel.ColorQuant.1.0.55\lib\net40\JeremyAnsel.ColorQuant.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.CodeAnalysis, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.CodeAnalysis, Version=2.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.2.7.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
|
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.2.7.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
|
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.DotNet.InternalAbstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.DotNet.InternalAbstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Microsoft.DotNet.InternalAbstractions.1.0.0\lib\net451\Microsoft.DotNet.InternalAbstractions.dll</HintPath>
|
<HintPath>..\packages\Microsoft.DotNet.InternalAbstractions.1.0.0\lib\net451\Microsoft.DotNet.InternalAbstractions.dll</HintPath>
|
||||||
|
|
|
||||||
|
|
@ -9,10 +9,10 @@
|
||||||
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
|
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
|
||||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
|
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
|
||||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
|
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
|
||||||
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net46" />
|
<package id="Dapplo.Addons" version="1.0.44" targetFramework="net46" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net46" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.44" targetFramework="net46" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net46" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.42" targetFramework="net46" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net46" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.42" targetFramework="net46" />
|
||||||
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net46" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net46" />
|
||||||
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
|
||||||
|
|
@ -29,8 +29,8 @@
|
||||||
<package id="Dapplo.Windows.User32" version="0.5.56" targetFramework="net46" />
|
<package id="Dapplo.Windows.User32" version="0.5.56" targetFramework="net46" />
|
||||||
<package id="JeremyAnsel.ColorQuant" version="1.0.55" targetFramework="net46" />
|
<package id="JeremyAnsel.ColorQuant" version="1.0.55" targetFramework="net46" />
|
||||||
<package id="Microsoft.CodeAnalysis.Analyzers" version="2.6.0" targetFramework="net46" developmentDependency="true" />
|
<package id="Microsoft.CodeAnalysis.Analyzers" version="2.6.0" targetFramework="net46" developmentDependency="true" />
|
||||||
<package id="Microsoft.CodeAnalysis.Common" version="2.7.0" targetFramework="net46" />
|
<package id="Microsoft.CodeAnalysis.Common" version="2.8.2" targetFramework="net46" />
|
||||||
<package id="Microsoft.CodeAnalysis.CSharp" version="2.7.0" targetFramework="net46" />
|
<package id="Microsoft.CodeAnalysis.CSharp" version="2.8.2" targetFramework="net46" />
|
||||||
<package id="Microsoft.DotNet.InternalAbstractions" version="1.0.0" targetFramework="net46" />
|
<package id="Microsoft.DotNet.InternalAbstractions" version="1.0.0" targetFramework="net46" />
|
||||||
<package id="Microsoft.DotNet.PlatformAbstractions" version="2.0.4" targetFramework="net46" />
|
<package id="Microsoft.DotNet.PlatformAbstractions" version="2.0.4" targetFramework="net46" />
|
||||||
<package id="Microsoft.Win32.Registry" version="4.4.0" targetFramework="net46" />
|
<package id="Microsoft.Win32.Registry" version="4.4.0" targetFramework="net46" />
|
||||||
|
|
|
||||||
|
|
@ -71,17 +71,17 @@
|
||||||
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>
|
||||||
|
|
@ -125,11 +125,11 @@
|
||||||
<Reference Include="Dapplo.Windows.User32, Version=0.5.56.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Windows.User32, Version=0.5.56.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Windows.User32.0.5.56\lib\net45\Dapplo.Windows.User32.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Windows.User32.0.5.56\lib\net45\Dapplo.Windows.User32.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.CodeAnalysis, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.CodeAnalysis, Version=2.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.2.7.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
|
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.2.7.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
|
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.DotNet.InternalAbstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.DotNet.InternalAbstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Microsoft.DotNet.InternalAbstractions.1.0.0\lib\net451\Microsoft.DotNet.InternalAbstractions.dll</HintPath>
|
<HintPath>..\packages\Microsoft.DotNet.InternalAbstractions.1.0.0\lib\net451\Microsoft.DotNet.InternalAbstractions.dll</HintPath>
|
||||||
|
|
@ -308,6 +308,7 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.6.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
|
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.6.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
|
||||||
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.6.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
|
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.6.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
|
||||||
|
<Analyzer Include="..\packages\xunit.analyzers.0.9.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||||
|
|
|
||||||
|
|
@ -44,11 +44,11 @@
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
<assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-2.7.0.0" newVersion="2.7.0.0" />
|
<bindingRedirect oldVersion="0.0.0.0-2.8.0.0" newVersion="2.8.0.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||||
<bindingRedirect oldVersion="0.0.0.0-2.7.0.0" newVersion="2.7.0.0" />
|
<bindingRedirect oldVersion="0.0.0.0-2.8.0.0" newVersion="2.8.0.0" />
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="xunit.core" publicKeyToken="8d05b1bb7a6fdb6c" culture="neutral" />
|
<assemblyIdentity name="xunit.core" publicKeyToken="8d05b1bb7a6fdb6c" culture="neutral" />
|
||||||
|
|
|
||||||
|
|
@ -10,10 +10,10 @@
|
||||||
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
|
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
|
||||||
<package id="CommandLineParser" version="2.2.1" targetFramework="net46" />
|
<package id="CommandLineParser" version="2.2.1" targetFramework="net46" />
|
||||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
|
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
|
||||||
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net46" />
|
<package id="Dapplo.Addons" version="1.0.44" targetFramework="net46" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net46" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.44" targetFramework="net46" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net46" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.42" targetFramework="net46" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net46" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.42" targetFramework="net46" />
|
||||||
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" />
|
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" />
|
||||||
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net46" />
|
<package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net46" />
|
||||||
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
|
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
|
||||||
|
|
@ -29,8 +29,8 @@
|
||||||
<package id="Dapplo.Windows.Messages" version="0.5.56" targetFramework="net46" />
|
<package id="Dapplo.Windows.Messages" version="0.5.56" targetFramework="net46" />
|
||||||
<package id="Dapplo.Windows.User32" version="0.5.56" targetFramework="net46" />
|
<package id="Dapplo.Windows.User32" version="0.5.56" targetFramework="net46" />
|
||||||
<package id="Microsoft.CodeAnalysis.Analyzers" version="2.6.0" targetFramework="net46" developmentDependency="true" />
|
<package id="Microsoft.CodeAnalysis.Analyzers" version="2.6.0" targetFramework="net46" developmentDependency="true" />
|
||||||
<package id="Microsoft.CodeAnalysis.Common" version="2.7.0" targetFramework="net46" />
|
<package id="Microsoft.CodeAnalysis.Common" version="2.8.2" targetFramework="net46" />
|
||||||
<package id="Microsoft.CodeAnalysis.CSharp" version="2.7.0" targetFramework="net46" />
|
<package id="Microsoft.CodeAnalysis.CSharp" version="2.8.2" targetFramework="net46" />
|
||||||
<package id="Microsoft.DotNet.InternalAbstractions" version="1.0.0" targetFramework="net46" />
|
<package id="Microsoft.DotNet.InternalAbstractions" version="1.0.0" targetFramework="net46" />
|
||||||
<package id="Microsoft.DotNet.PlatformAbstractions" version="2.0.4" targetFramework="net46" />
|
<package id="Microsoft.DotNet.PlatformAbstractions" version="2.0.4" targetFramework="net46" />
|
||||||
<package id="Microsoft.Win32.Registry" version="4.4.0" targetFramework="net46" />
|
<package id="Microsoft.Win32.Registry" version="4.4.0" targetFramework="net46" />
|
||||||
|
|
@ -82,7 +82,7 @@
|
||||||
<package id="System.Xml.XPath.XDocument" version="4.3.0" targetFramework="net46" />
|
<package id="System.Xml.XPath.XDocument" version="4.3.0" targetFramework="net46" />
|
||||||
<package id="xunit" version="2.3.1" targetFramework="net46" />
|
<package id="xunit" version="2.3.1" targetFramework="net46" />
|
||||||
<package id="xunit.abstractions" version="2.0.1" targetFramework="net46" />
|
<package id="xunit.abstractions" version="2.0.1" targetFramework="net46" />
|
||||||
<package id="xunit.analyzers" version="0.8.0" targetFramework="net46" />
|
<package id="xunit.analyzers" version="0.9.0" targetFramework="net46" />
|
||||||
<package id="xunit.assert" version="2.3.1" targetFramework="net46" />
|
<package id="xunit.assert" version="2.3.1" targetFramework="net46" />
|
||||||
<package id="xunit.core" version="2.3.1" targetFramework="net46" />
|
<package id="xunit.core" version="2.3.1" targetFramework="net46" />
|
||||||
<package id="xunit.extensibility.core" version="2.3.1" targetFramework="net46" />
|
<package id="xunit.extensibility.core" version="2.3.1" targetFramework="net46" />
|
||||||
|
|
|
||||||
|
|
@ -66,7 +66,7 @@ namespace Greenshot.Destinations
|
||||||
catch (Exception)
|
catch (Exception)
|
||||||
{
|
{
|
||||||
// TODO: Change to general logic in ProcessExport
|
// TODO: Change to general logic in ProcessExport
|
||||||
surface.SendMessageEvent(this, SurfaceMessageTyp.Error, Language.GetString(LangKey.editor_clipboardfailed));
|
surface.SendMessageEvent(this, SurfaceMessageTyp.Error, "Error"); //GreenshotLanguage.editorclipboardfailed);
|
||||||
}
|
}
|
||||||
ProcessExport(exportInformation, surface);
|
ProcessExport(exportInformation, surface);
|
||||||
return exportInformation;
|
return exportInformation;
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@
|
||||||
#region Usings
|
#region Usings
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
using System.Linq;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
using Dapplo.Log;
|
using Dapplo.Log;
|
||||||
|
|
@ -90,7 +91,7 @@ namespace Greenshot.Forms
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
comboBoxLanguage.SelectedValue = Language.SupportedLanguages[0].Ietf;
|
comboBoxLanguage.SelectedValue = Language.SupportedLanguages.Keys.FirstOrDefault();
|
||||||
Language.CurrentLanguage = SelectedLanguage;
|
Language.CurrentLanguage = SelectedLanguage;
|
||||||
_properOkPressed = true;
|
_properOkPressed = true;
|
||||||
Close();
|
Close();
|
||||||
|
|
|
||||||
|
|
@ -57,35 +57,35 @@
|
||||||
<Reference Include="Costura, Version=2.0.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
|
<Reference Include="Costura, Version=2.0.1.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll</HintPath>
|
<HintPath>..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.1.0.40-beta\lib\net45\Dapplo.Addons.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.40.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.40-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.Addons.Config, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.Addons.Config, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.Addons.Config.1.0.38-beta\lib\net45\Dapplo.Addons.Config.dll</HintPath>
|
<HintPath>..\packages\Dapplo.Addons.Config.1.0.44\lib\net45\Dapplo.Addons.Config.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.42\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.42\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.42\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.42\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Metro, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Metro, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Metro.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Metro.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Metro.1.0.42\lib\net45\Dapplo.CaliburnMicro.Metro.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.42\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.42.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.41-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.42\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
<HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll</HintPath>
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@ namespace Greenshot.Help
|
||||||
|
|
||||||
public static void LoadHelp()
|
public static void LoadHelp()
|
||||||
{
|
{
|
||||||
var uri = FindOnlineHelpUrl(Language.CurrentLanguage) ?? Language.HelpFilePath;
|
var uri = FindOnlineHelpUrl(Language.CurrentLanguage);// ?? Language.HelpFilePath;
|
||||||
Process.Start(uri);
|
Process.Start(uri);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,16 +11,16 @@
|
||||||
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net452" />
|
||||||
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
|
<package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
|
||||||
<package id="Costura.Fody" version="2.0.1" targetFramework="net452" developmentDependency="true" />
|
<package id="Costura.Fody" version="2.0.1" targetFramework="net452" developmentDependency="true" />
|
||||||
<package id="Dapplo.Addons" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Bootstrapper" version="1.0.40-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Bootstrapper" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.Addons.Config" version="1.0.38-beta" targetFramework="net452" />
|
<package id="Dapplo.Addons.Config" version="1.0.44" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Metro" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Metro" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Security" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Security" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.41-beta" targetFramework="net452" />
|
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.42" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions.JsonNet" version="0.8.35" targetFramework="net452" />
|
||||||
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
<package id="Dapplo.HttpExtensions.OAuth" version="0.8.35" targetFramework="net452" />
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue