github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-26 16:16:06 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Made the ExternalCommand work, only the configuration is still missing. Also did some cleanup and refactoring.

Browse source
This commit is contained in:
Robin 2018-05-14 22:36:10 +02:00
commit 1b11573bc1
109 changed files with 911 additions and 757 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Greenshot.Addon.Box/BoxAutofacModule.cs
View file

@ -1,7 +1,7 @@
using Autofac; using Autofac;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Greenshot.Addon.Box.ViewModels; using Greenshot.Addon.Box.ViewModels;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
namespace Greenshot.Addon.Box namespace Greenshot.Addon.Box
{ {

2
src/Greenshot.Addon.Box/BoxDestination.cs
View file

@ -39,7 +39,7 @@ using Dapplo.Log;
using Dapplo.Utils; using Dapplo.Utils;
using Greenshot.Addon.Box.Entities; using Greenshot.Addon.Box.Entities;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Controls; using Greenshot.Addons.Controls;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Extensions; using Greenshot.Addons.Extensions;

32
src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj
View file

@ -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.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.11-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.11-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.33-beta\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>

16
src/Greenshot.Addon.Box/packages.config
View file

@ -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.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.33-beta" 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" />

2
src/Greenshot.Addon.Confluence/ConfluenceAutofacModule.cs
View file

@ -1,7 +1,7 @@
using Autofac; using Autofac;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Greenshot.Addon.Confluence.ViewModels; using Greenshot.Addon.Confluence.ViewModels;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
namespace Greenshot.Addon.Confluence namespace Greenshot.Addon.Confluence
{ {

2
src/Greenshot.Addon.Confluence/ConfluenceDestination.cs
View file

@ -33,7 +33,7 @@ using Dapplo.Confluence;
using Dapplo.Confluence.Entities; using Dapplo.Confluence.Entities;
using Dapplo.Log; using Dapplo.Log;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Controls; using Greenshot.Addons.Controls;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;

32
src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
View file

@ -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.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.11-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.11-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.33-beta\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>

16
src/Greenshot.Addon.Confluence/packages.config
View file

@ -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.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.33-beta" 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" />

2
src/Greenshot.Addon.Dropbox/DropboxAutofacModule.cs
View file

@ -1,7 +1,7 @@
using Autofac; using Autofac;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Greenshot.Addon.Dropbox.ViewModels; using Greenshot.Addon.Dropbox.ViewModels;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
namespace Greenshot.Addon.Dropbox namespace Greenshot.Addon.Dropbox
{ {

2
src/Greenshot.Addon.Dropbox/DropboxDestination.cs
View file

@ -39,7 +39,7 @@ using Dapplo.Log;
using Dapplo.Utils; using Dapplo.Utils;
using Greenshot.Addon.Dropbox.Entities; using Greenshot.Addon.Dropbox.Entities;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Controls; using Greenshot.Addons.Controls;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Extensions; using Greenshot.Addons.Extensions;

32
src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj
View file

@ -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.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.11-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.11-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.33-beta\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>

16
src/Greenshot.Addon.Dropbox/packages.config
View file

@ -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.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.33-beta" 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" />

5
src/Greenshot.Addon.ExternalCommand/ExternalCommandAutofacModule.cs
View file

@ -2,7 +2,7 @@
using Dapplo.Addons; using Dapplo.Addons;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Greenshot.Addon.ExternalCommand.ViewModels; using Greenshot.Addon.ExternalCommand.ViewModels;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
namespace Greenshot.Addon.ExternalCommand namespace Greenshot.Addon.ExternalCommand
{ {
@ -12,8 +12,9 @@ namespace Greenshot.Addon.ExternalCommand
protected override void Load(ContainerBuilder builder) protected override void Load(ContainerBuilder builder)
{ {
builder builder
.RegisterType<ExternalCommandStartup>() .RegisterType<ExternalCommandDestinationProvider>()
.As<IStartup>() .As<IStartup>()
.As<IDestinationProvider>()
.SingleInstance(); .SingleInstance();
builder builder
.RegisterType<ExternalCommandConfigViewModel>() .RegisterType<ExternalCommandConfigViewModel>()

218
src/Greenshot.Addon.ExternalCommand/ExternalCommandDestination.cs
View file

@ -33,7 +33,7 @@ using System.Threading;
using Dapplo.Ini; using Dapplo.Ini;
using Dapplo.Log; using Dapplo.Log;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
using Greenshot.Addons.Interfaces.Plugin; using Greenshot.Addons.Interfaces.Plugin;
@ -42,10 +42,10 @@ using Greenshot.Addons.Interfaces.Plugin;
namespace Greenshot.Addon.ExternalCommand namespace Greenshot.Addon.ExternalCommand
{ {
/// <summary> /// <summary>
/// Description of OCRDestination. /// ExternalCommandDestination provides a destination to export to an external command
/// </summary> /// </summary>
public class ExternalCommandDestination : AbstractDestination public class ExternalCommandDestination : AbstractDestination
{ {
private static readonly LogSource Log = new LogSource(); private static readonly LogSource Log = new LogSource();
@ -83,41 +83,43 @@ namespace Greenshot.Addon.ExternalCommand
var outputSettings = new SurfaceOutputSettings(); var outputSettings = new SurfaceOutputSettings();
outputSettings.PreventGreenshotFormat(); outputSettings.PreventGreenshotFormat();
if (_presetCommand != null) if (_presetCommand == null)
{ {
if (!Config.RunInbackground.ContainsKey(_presetCommand)) return exportInformation;
{ }
Config.RunInbackground.Add(_presetCommand, true);
}
var runInBackground = Config.RunInbackground[_presetCommand];
var fullPath = captureDetails.Filename;
if (fullPath == null)
{
fullPath = ImageOutput.SaveNamedTmpFile(surface, captureDetails, outputSettings);
}
if (runInBackground) if (!Config.RunInbackground.ContainsKey(_presetCommand))
{ {
var commandThread = new Thread(() => Config.RunInbackground.Add(_presetCommand, true);
{ }
CallExternalCommand(exportInformation, fullPath, out _, out _); var runInBackground = Config.RunInbackground[_presetCommand];
ProcessExport(exportInformation, surface); var fullPath = captureDetails.Filename;
}) if (fullPath == null)
{ {
Name = "Running " + _presetCommand, fullPath = ImageOutput.SaveNamedTmpFile(surface, captureDetails, outputSettings);
IsBackground = true }
};
commandThread.SetApartmentState(ApartmentState.STA); if (runInBackground)
commandThread.Start(); {
exportInformation.ExportMade = true; var commandThread = new Thread(() =>
} {
else CallExternalCommand(exportInformation, fullPath, out _, out _);
{ ProcessExport(exportInformation, surface);
CallExternalCommand(exportInformation, fullPath, out _, out _); })
ProcessExport(exportInformation, surface); {
} Name = "Running " + _presetCommand,
} IsBackground = true
return exportInformation; };
commandThread.SetApartmentState(ApartmentState.STA);
commandThread.Start();
exportInformation.ExportMade = true;
}
else
{
CallExternalCommand(exportInformation, fullPath, out _, out _);
ProcessExport(exportInformation, surface);
}
return exportInformation;
} }
/// <summary> /// <summary>
@ -137,24 +139,29 @@ namespace Greenshot.Addon.ExternalCommand
if (CallExternalCommand(_presetCommand, fullPath, out output, out error) == 0) if (CallExternalCommand(_presetCommand, fullPath, out output, out error) == 0)
{ {
exportInformation.ExportMade = true; exportInformation.ExportMade = true;
if (!string.IsNullOrEmpty(output)) if (string.IsNullOrEmpty(output))
{ {
var uriMatches = UriRegexp.Matches(output); return;
// Place output on the clipboard before the URI, so if one is found this overwrites }
if (Config.OutputToClipboard)
{ var uriMatches = UriRegexp.Matches(output);
ClipboardHelper.SetClipboardData(output); // Place output on the clipboard before the URI, so if one is found this overwrites
} if (Config.OutputToClipboard)
if (uriMatches.Count > 0) {
{ ClipboardHelper.SetClipboardData(output);
exportInformation.Uri = uriMatches[0].Groups[1].Value; }
Log.Info().WriteLine("Got URI : {0} ", exportInformation.Uri);
if (Config.UriToClipboard) if (uriMatches.Count <= 0)
{ {
ClipboardHelper.SetClipboardData(exportInformation.Uri); return;
} }
}
} exportInformation.Uri = uriMatches[0].Groups[1].Value;
Log.Info().WriteLine("Got URI : {0} ", exportInformation.Uri);
if (Config.UriToClipboard)
{
ClipboardHelper.SetClipboardData(exportInformation.Uri);
}
} }
else else
{ {
@ -221,56 +228,57 @@ namespace Greenshot.Addon.ExternalCommand
var arguments = Config.Argument[commando]; var arguments = Config.Argument[commando];
output = null; output = null;
error = null; error = null;
if (!string.IsNullOrEmpty(commandline)) if (string.IsNullOrEmpty(commandline))
{ {
using (var process = new Process()) return -1;
{ }
// Fix variables
commandline = FilenameHelper.FillVariables(commandline, true);
commandline = FilenameHelper.FillCmdVariables(commandline);
arguments = FilenameHelper.FillVariables(arguments, false); using (var process = new Process())
arguments = FilenameHelper.FillCmdVariables(arguments, false); {
// Fix variables
commandline = FilenameHelper.FillVariables(commandline, true);
commandline = FilenameHelper.FillCmdVariables(commandline);
process.StartInfo.FileName = FilenameHelper.FillCmdVariables(commandline); arguments = FilenameHelper.FillVariables(arguments, false);
process.StartInfo.Arguments = FormatArguments(arguments, fullPath); arguments = FilenameHelper.FillCmdVariables(arguments, false);
process.StartInfo.UseShellExecute = false;
if (Config.RedirectStandardOutput) process.StartInfo.FileName = FilenameHelper.FillCmdVariables(commandline);
{ process.StartInfo.Arguments = FormatArguments(arguments, fullPath);
process.StartInfo.RedirectStandardOutput = true; process.StartInfo.UseShellExecute = false;
} if (Config.RedirectStandardOutput)
if (Config.RedirectStandardError) {
{ process.StartInfo.RedirectStandardOutput = true;
process.StartInfo.RedirectStandardError = true; }
} if (Config.RedirectStandardError)
if (verb != null) {
{ process.StartInfo.RedirectStandardError = true;
process.StartInfo.Verb = verb; }
} if (verb != null)
Log.Info().WriteLine("Starting : {0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments); {
process.Start(); process.StartInfo.Verb = verb;
process.WaitForExit(); }
if (Config.RedirectStandardOutput) Log.Info().WriteLine("Starting : {0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments);
{ process.Start();
output = process.StandardOutput.ReadToEnd(); process.WaitForExit();
if (Config.ShowStandardOutputInLog && output.Trim().Length > 0) if (Config.RedirectStandardOutput)
{ {
Log.Info().WriteLine("Output:\n{0}", output); output = process.StandardOutput.ReadToEnd();
} if (Config.ShowStandardOutputInLog && output.Trim().Length > 0)
} {
if (Config.RedirectStandardError) Log.Info().WriteLine("Output:\n{0}", output);
{ }
error = process.StandardError.ReadToEnd(); }
if (error.Trim().Length > 0) if (Config.RedirectStandardError)
{ {
Log.Warn().WriteLine("Error:\n{0}", error); error = process.StandardError.ReadToEnd();
} if (error.Trim().Length > 0)
} {
Log.Info().WriteLine("Finished : {0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments); Log.Warn().WriteLine("Error:\n{0}", error);
return process.ExitCode; }
} }
} Log.Info().WriteLine("Finished : {0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments);
return -1; return process.ExitCode;
}
} }
public static string FormatArguments(string arguments, string fullpath) public static string FormatArguments(string arguments, string fullpath)

17
src/Greenshot.Addon.ExternalCommand/ExternalCommandStartup.cs → src/Greenshot.Addon.ExternalCommand/ExternalCommandDestinationProvider.cs
View file

@ -23,13 +23,14 @@
#region Usings #region Usings
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using Dapplo.Addons; using Dapplo.Addons;
using Dapplo.Log; using Dapplo.Log;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
#endregion #endregion
@ -37,27 +38,31 @@ using Greenshot.Addons.Core;
namespace Greenshot.Addon.ExternalCommand namespace Greenshot.Addon.ExternalCommand
{ {
/// <summary> /// <summary>
/// TODO: Somehow generate the external command destinations /// Generate the external command destinations
/// </summary> /// </summary>
public sealed class ExternalCommandStartup : IStartup public sealed class ExternalCommandDestinationProvider : IStartup, IDestinationProvider
{ {
private static readonly LogSource Log = new LogSource(); private static readonly LogSource Log = new LogSource();
private readonly IExternalCommandConfiguration _externalCommandConfig; private readonly IExternalCommandConfiguration _externalCommandConfig;
private readonly ICoreConfiguration _coreConfiguration; private readonly ICoreConfiguration _coreConfiguration;
private readonly IGreenshotLanguage _greenshotLanguage; private readonly IGreenshotLanguage _greenshotLanguage;
public ExternalCommandStartup(IExternalCommandConfiguration externalCommandConfiguration, public ExternalCommandDestinationProvider(
IExternalCommandConfiguration externalCommandConfiguration,
ICoreConfiguration coreConfiguration, ICoreConfiguration coreConfiguration,
IGreenshotLanguage greenshotLanguage) IGreenshotLanguage greenshotLanguage)
{ {
_externalCommandConfig = externalCommandConfiguration; _externalCommandConfig = externalCommandConfiguration;
_coreConfiguration = coreConfiguration; _coreConfiguration = coreConfiguration;
_greenshotLanguage = greenshotLanguage; _greenshotLanguage = greenshotLanguage;
externalCommandConfiguration.AfterLoad();
} }
public IEnumerable<IDestination> Destinations() public IEnumerable<Lazy<IDestination, DestinationAttribute>> Provide()
{ {
return _externalCommandConfig.Commands.Select(command => new ExternalCommandDestination(command, _coreConfiguration, _greenshotLanguage)); return _externalCommandConfig.Commands
.Select(command => new Lazy<IDestination, DestinationAttribute>(() => new ExternalCommandDestination(command, _coreConfiguration, _greenshotLanguage), new DestinationAttribute(command)));
} }

34
src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
View file

@ -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.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.11-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.11-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath> <HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>
@ -160,7 +160,7 @@
<Compile Include="ExternalCommandForm.cs"> <Compile Include="ExternalCommandForm.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="ExternalCommandStartup.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="ExternalCommandAutofacModule.cs" />

16
src/Greenshot.Addon.ExternalCommand/packages.config
View file

@ -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.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" /> <package id="Dapplo.Ini" version="0.5.27" 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.27" targetFramework="net452" /> <package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />

2
src/Greenshot.Addon.Flickr/FlickrAutofacModule.cs
View file

@ -1,7 +1,7 @@
using Autofac; using Autofac;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Greenshot.Addon.Flickr.ViewModels; using Greenshot.Addon.Flickr.ViewModels;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
namespace Greenshot.Addon.Flickr namespace Greenshot.Addon.Flickr
{ {

2
src/Greenshot.Addon.Flickr/FlickrDestination.cs
View file

@ -41,7 +41,7 @@ using Dapplo.HttpExtensions.Listener;
using Dapplo.HttpExtensions.OAuth; using Dapplo.HttpExtensions.OAuth;
using Dapplo.Log; using Dapplo.Log;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Controls; using Greenshot.Addons.Controls;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Extensions; using Greenshot.Addons.Extensions;

32
src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj
View file

@ -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.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.11-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.11-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.33-beta\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>

16
src/Greenshot.Addon.Flickr/packages.config
View file

@ -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.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.33-beta" 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.27" targetFramework="net452" /> <package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />

2
src/Greenshot.Addon.GooglePhotos/GooglePhotosAutofacModule.cs
View file

@ -1,7 +1,7 @@
using Autofac; using Autofac;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Greenshot.Addon.GooglePhotos.ViewModels; using Greenshot.Addon.GooglePhotos.ViewModels;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
namespace Greenshot.Addon.GooglePhotos namespace Greenshot.Addon.GooglePhotos
{ {

2
src/Greenshot.Addon.GooglePhotos/GooglePhotosDestination.cs
View file

@ -38,7 +38,7 @@ using Dapplo.HttpExtensions.OAuth;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Utils; using Dapplo.Utils;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Controls; using Greenshot.Addons.Controls;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Extensions; using Greenshot.Addons.Extensions;

32
src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj
View file

@ -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.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.11-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.11-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.33-beta\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>

16
src/Greenshot.Addon.GooglePhotos/packages.config
View file

@ -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.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.33-beta" 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.27" targetFramework="net452" /> <package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />

32
src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
View file

@ -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.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.11-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.11-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.33-beta\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>

2
src/Greenshot.Addon.Imgur/ImgurAutofacModule.cs
View file

@ -1,7 +1,7 @@
using Autofac; using Autofac;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Greenshot.Addon.Imgur.ViewModels; using Greenshot.Addon.Imgur.ViewModels;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
namespace Greenshot.Addon.Imgur namespace Greenshot.Addon.Imgur
{ {

2
src/Greenshot.Addon.Imgur/ImgurDestination.cs
View file

@ -34,7 +34,7 @@ using Dapplo.Windows.Extensions;
using Greenshot.Addon.Imgur.Entities; using Greenshot.Addon.Imgur.Entities;
using Greenshot.Addon.Imgur.ViewModels; using Greenshot.Addon.Imgur.ViewModels;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Controls; using Greenshot.Addons.Controls;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;

16
src/Greenshot.Addon.Imgur/packages.config
View file

@ -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.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.33-beta" 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" />

32
src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
View file

@ -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.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.11-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.11-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.33-beta\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>

2
src/Greenshot.Addon.Jira/JiraAutofacModule.cs
View file

@ -2,7 +2,7 @@
using Dapplo.CaliburnMicro; using Dapplo.CaliburnMicro;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Greenshot.Addon.Jira.ViewModels; using Greenshot.Addon.Jira.ViewModels;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
namespace Greenshot.Addon.Jira namespace Greenshot.Addon.Jira
{ {

2
src/Greenshot.Addon.Jira/JiraDestination.cs
View file

@ -35,7 +35,7 @@ using Dapplo.Jira.Entities;
using Dapplo.Log; using Dapplo.Log;
using Greenshot.Addon.Jira.ViewModels; using Greenshot.Addon.Jira.ViewModels;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Controls; using Greenshot.Addons.Controls;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;

16
src/Greenshot.Addon.Jira/packages.config
View file

@ -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.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.33-beta" 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" />

2
src/Greenshot.Addon.LegacyEditor/EditorAutofacModule.cs
View file

@ -3,7 +3,7 @@ using Dapplo.CaliburnMicro.Configuration;
using Greenshot.Addon.LegacyEditor.Drawing; using Greenshot.Addon.LegacyEditor.Drawing;
using Greenshot.Addon.LegacyEditor.Forms; using Greenshot.Addon.LegacyEditor.Forms;
using Greenshot.Addon.LegacyEditor.ViewModels; using Greenshot.Addon.LegacyEditor.ViewModels;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
namespace Greenshot.Addon.LegacyEditor namespace Greenshot.Addon.LegacyEditor

2
src/Greenshot.Addon.LegacyEditor/EditorDestination.cs
View file

@ -29,7 +29,7 @@ using System.Drawing;
using System.Linq; using System.Linq;
using Dapplo.Log; using Dapplo.Log;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
using Greenshot.Addons.Interfaces.Forms; using Greenshot.Addons.Interfaces.Forms;

22
src/Greenshot.Addon.LegacyEditor/Forms/ImageEditorForm.cs
View file

@ -45,7 +45,7 @@ using Greenshot.Addon.LegacyEditor.Controls;
using Greenshot.Addon.LegacyEditor.Drawing; using Greenshot.Addon.LegacyEditor.Drawing;
using Greenshot.Addon.LegacyEditor.Drawing.Fields; using Greenshot.Addon.LegacyEditor.Drawing.Fields;
using Greenshot.Addon.LegacyEditor.Drawing.Fields.Binding; using Greenshot.Addon.LegacyEditor.Drawing.Fields.Binding;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Controls; using Greenshot.Addons.Controls;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Extensions; using Greenshot.Addons.Extensions;
@ -80,19 +80,19 @@ namespace Greenshot.Addon.LegacyEditor.Forms
private BitmapScaleHandler<IDestination> _destinationScaleHandler; private BitmapScaleHandler<IDestination> _destinationScaleHandler;
private readonly IDisposable _clipboardSubscription; private readonly IDisposable _clipboardSubscription;
private readonly EditorFactory _editorFactory; private readonly EditorFactory _editorFactory;
private readonly IEnumerable<Lazy<IDestination, DestinationAttribute>> _destinations; private readonly DestinationHolder _destinationHolder;
private CompositeDisposable _disposables; private CompositeDisposable _disposables;
public ImageEditorForm( public ImageEditorForm(
IEditorConfiguration editorConfiguration, IEditorConfiguration editorConfiguration,
IEditorLanguage editorLanguage, IEditorLanguage editorLanguage,
EditorFactory editorFactory, EditorFactory editorFactory,
IEnumerable<Lazy<IDestination, DestinationAttribute>> destinations) DestinationHolder destinationHolder)
{ {
_editorConfiguration = editorConfiguration; _editorConfiguration = editorConfiguration;
_editorLanguage = editorLanguage; _editorLanguage = editorLanguage;
_editorFactory = editorFactory; _editorFactory = editorFactory;
_destinations = destinations; _destinationHolder = destinationHolder;
// //
// The InitializeComponent() call is required for Windows Forms designer support. // The InitializeComponent() call is required for Windows Forms designer support.
// //
@ -378,7 +378,7 @@ namespace Greenshot.Addon.LegacyEditor.Forms
await Task.Run(() => await Task.Run(() =>
{ {
// Create export buttons // Create export buttons
foreach (var destination in _destinations foreach (var destination in _destinationHolder.AllDestinations
.Where(destination => destination.Metadata.Priority > 2 && !IgnoreDestinations.Contains(destination.Metadata.Designation) && destination.Value.IsActive) .Where(destination => destination.Metadata.Priority > 2 && !IgnoreDestinations.Contains(destination.Metadata.Designation) && destination.Value.IsActive)
.OrderBy(destination => destination.Metadata.Priority).ThenBy(destination => destination.Value.Description) .OrderBy(destination => destination.Metadata.Priority).ThenBy(destination => destination.Value.Description)
.Select(d => d.Value)) .Select(d => d.Value))
@ -519,7 +519,7 @@ namespace Greenshot.Addon.LegacyEditor.Forms
ClearItems(fileStripMenuItem.DropDownItems); ClearItems(fileStripMenuItem.DropDownItems);
// Add the destinations // Add the destinations
foreach (var destination in _destinations foreach (var destination in _destinationHolder.AllDestinations
.Where(destination => !IgnoreDestinations.Contains(destination.Metadata.Designation) && destination.Value.IsActive) .Where(destination => !IgnoreDestinations.Contains(destination.Metadata.Designation) && destination.Value.IsActive)
.OrderBy(destination => destination.Metadata.Priority).ThenBy(destination => destination.Value.Description) .OrderBy(destination => destination.Metadata.Priority).ThenBy(destination => destination.Value.Description)
.Select(d => d.Value)) .Select(d => d.Value))
@ -1239,12 +1239,12 @@ namespace Greenshot.Addon.LegacyEditor.Forms
{ {
destinationDesignation = "FileDialog"; destinationDesignation = "FileDialog";
} }
_destinations.Find(destinationDesignation)?.ExportCaptureAsync(true, _surface, _surface.CaptureDetails); _destinationHolder.AllDestinations.Find(destinationDesignation)?.ExportCaptureAsync(true, _surface, _surface.CaptureDetails);
} }
private void BtnClipboardClick(object sender, EventArgs e) private void BtnClipboardClick(object sender, EventArgs e)
{ {
_destinations.Find("Clipboard")?.ExportCaptureAsync(true, _surface, _surface.CaptureDetails); _destinationHolder.AllDestinations.Find("Clipboard")?.ExportCaptureAsync(true, _surface, _surface.CaptureDetails);
} }
private void BtnPrintClick(object sender, EventArgs e) private void BtnPrintClick(object sender, EventArgs e)
@ -1252,7 +1252,7 @@ namespace Greenshot.Addon.LegacyEditor.Forms
// The BeginInvoke is a solution for the printdialog not having focus // The BeginInvoke is a solution for the printdialog not having focus
BeginInvoke((MethodInvoker) delegate BeginInvoke((MethodInvoker) delegate
{ {
_destinations.Find("Printer")?.ExportCaptureAsync(true, _surface, _surface.CaptureDetails); _destinationHolder.AllDestinations.Find("Printer")?.ExportCaptureAsync(true, _surface, _surface.CaptureDetails);
}); });
} }
@ -1708,9 +1708,7 @@ namespace Greenshot.Addon.LegacyEditor.Forms
// Go through the destinations to check the EditorShortcut Keys // Go through the destinations to check the EditorShortcut Keys
// this way the menu entries don't need to be enabled. // this way the menu entries don't need to be enabled.
// This also fixes bugs #3526974 & #3527020 // This also fixes bugs #3526974 & #3527020
foreach (var destination in _destinations.Where(destination => destination.Value.IsActive) foreach (var destination in _destinationHolder.SortedActiveDestinations)
.OrderBy(destination => destination.Metadata.Priority).ThenBy(destination => destination.Value.Description)
.Select(d => d.Value))
{ {
if (destination.EditorShortcutKeys != keys) if (destination.EditorShortcutKeys != keys)
{ {

32
src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
View file

@ -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.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.11-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.11-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath> <HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>

16
src/Greenshot.Addon.LegacyEditor/packages.config
View file

@ -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.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" /> <package id="Dapplo.Ini" version="0.5.27" 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.27" targetFramework="net452" /> <package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />

32
src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
View file

@ -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.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.11-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.11-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.33-beta\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>

2
src/Greenshot.Addon.Lutim/LutimAutofacModule.cs
View file

@ -1,7 +1,7 @@
using Autofac; using Autofac;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Greenshot.Addon.Lutim.ViewModels; using Greenshot.Addon.Lutim.ViewModels;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
namespace Greenshot.Addon.Lutim namespace Greenshot.Addon.Lutim
{ {

4
src/Greenshot.Addon.Lutim/LutimDestination.cs
View file

@ -28,7 +28,7 @@ using Dapplo.Addons;
using Dapplo.Log; using Dapplo.Log;
using Greenshot.Addon.Lutim.Entities; using Greenshot.Addon.Lutim.Entities;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Controls; using Greenshot.Addons.Controls;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
@ -36,7 +36,7 @@ using Greenshot.Gfx;
namespace Greenshot.Addon.Lutim { namespace Greenshot.Addon.Lutim {
/// <summary> /// <summary>
/// Description of LutimDestination. /// This is the destination for Lutim
/// </summary> /// </summary>
[Destination("Lutim")] [Destination("Lutim")]
public class LutimDestination : AbstractDestination public class LutimDestination : AbstractDestination

16
src/Greenshot.Addon.Lutim/packages.config
View file

@ -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.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.33-beta" 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.27" targetFramework="net452" /> <package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />

32
src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj
View file

@ -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.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.11-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.11-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath> <HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>

2
src/Greenshot.Addon.OCR/OCRDestination.cs
View file

@ -31,7 +31,7 @@ using System.Reflection;
using System.Windows.Forms; using System.Windows.Forms;
using Dapplo.Log; using Dapplo.Log;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Core.Enums; using Greenshot.Addons.Core.Enums;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;

2
src/Greenshot.Addon.OCR/OcrAutofacModule.cs
View file

@ -1,5 +1,5 @@
using Autofac; using Autofac;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
namespace Greenshot.Addon.OCR namespace Greenshot.Addon.OCR
{ {

16
src/Greenshot.Addon.OCR/packages.config
View file

@ -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.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" /> <package id="Dapplo.Ini" version="0.5.27" 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.27" targetFramework="net452" /> <package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />

6
src/Greenshot.Addon.Office/Destinations/ExcelDestination.cs
View file

@ -29,7 +29,7 @@ using System.IO;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using Greenshot.Addon.Office.OfficeExport; using Greenshot.Addon.Office.OfficeExport;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
using Greenshot.Addons.Interfaces.Plugin; using Greenshot.Addons.Interfaces.Plugin;
@ -41,7 +41,7 @@ namespace Greenshot.Addon.Office.Destinations
/// <summary> /// <summary>
/// Description of PowerpointDestination. /// Description of PowerpointDestination.
/// </summary> /// </summary>
[Destination("Excel", 5)] [Destination("Excel", DestinationOrder.Excel)]
public class ExcelDestination : AbstractDestination public class ExcelDestination : AbstractDestination
{ {
private const int IconApplication = 0; private const int IconApplication = 0;
@ -61,7 +61,7 @@ namespace Greenshot.Addon.Office.Destinations
} }
} }
public ExcelDestination(string workbookName, protected ExcelDestination(string workbookName,
ICoreConfiguration coreConfiguration, ICoreConfiguration coreConfiguration,
IGreenshotLanguage greenshotLanguage IGreenshotLanguage greenshotLanguage
) : this(coreConfiguration, greenshotLanguage) ) : this(coreConfiguration, greenshotLanguage)

6
src/Greenshot.Addon.Office/Destinations/OneNoteDestination.cs
View file

@ -33,7 +33,7 @@ using Dapplo.Log;
using Greenshot.Addon.Office.OfficeExport; using Greenshot.Addon.Office.OfficeExport;
using Greenshot.Addon.Office.OfficeInterop; using Greenshot.Addon.Office.OfficeInterop;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
@ -41,7 +41,7 @@ using Greenshot.Addons.Interfaces;
namespace Greenshot.Addon.Office.Destinations namespace Greenshot.Addon.Office.Destinations
{ {
[Destination("OneNote", 4)] [Destination("OneNote", DestinationOrder.OneNote)]
public class OneNoteDestination : AbstractDestination public class OneNoteDestination : AbstractDestination
{ {
private const int IconApplication = 0; private const int IconApplication = 0;
@ -61,7 +61,7 @@ namespace Greenshot.Addon.Office.Destinations
} }
} }
public OneNoteDestination(OneNotePage page, protected OneNoteDestination(OneNotePage page,
ICoreConfiguration coreConfiguration, ICoreConfiguration coreConfiguration,
IGreenshotLanguage greenshotLanguage IGreenshotLanguage greenshotLanguage
) : this(coreConfiguration, greenshotLanguage) ) : this(coreConfiguration, greenshotLanguage)

29
src/Greenshot.Addon.Office/Destinations/OutlookDestination.cs
View file

@ -33,7 +33,7 @@ using Dapplo.Log;
using Greenshot.Addon.Office.OfficeExport; using Greenshot.Addon.Office.OfficeExport;
using Greenshot.Addon.Office.OfficeInterop; using Greenshot.Addon.Office.OfficeInterop;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
using Greenshot.Addons.Interfaces.Plugin; using Greenshot.Addons.Interfaces.Plugin;
@ -45,27 +45,29 @@ namespace Greenshot.Addon.Office.Destinations
/// <summary> /// <summary>
/// Description of OutlookDestination. /// Description of OutlookDestination.
/// </summary> /// </summary>
[Destination("Outlook", 3)] [Destination("Outlook", DestinationOrder.Outlook)]
public class OutlookDestination : AbstractDestination public class OutlookDestination : AbstractDestination
{ {
private const int IconApplication = 0; private const int IconApplication = 0;
private const int IconMeeting = 2; private const int IconMeeting = 2;
private const string MapiClient = "Microsoft Outlook"; private const string MapiClient = "Microsoft Outlook";
private static readonly LogSource Log = new LogSource(); private static readonly LogSource Log = new LogSource();
private readonly IOfficeConfiguration _officeConfiguration;
private static readonly Bitmap MailIcon = GreenshotResources.GetBitmap("Email.Image"); private static readonly Bitmap MailIcon = GreenshotResources.GetBitmap("Email.Image");
private static readonly IOfficeConfiguration OfficeConfig = IniConfig.Current.Get<IOfficeConfiguration>();
private readonly string _exePath; private readonly string _exePath;
private readonly bool _isActiveFlag; private readonly bool _isActiveFlag;
private readonly string _outlookInspectorCaption; private readonly string _outlookInspectorCaption;
private readonly OlObjectClass _outlookInspectorType; private readonly OlObjectClass _outlookInspectorType;
public OutlookDestination( public OutlookDestination(
IOfficeConfiguration officeConfiguration,
ICoreConfiguration coreConfiguration, ICoreConfiguration coreConfiguration,
IGreenshotLanguage greenshotLanguage IGreenshotLanguage greenshotLanguage
) : base(coreConfiguration, greenshotLanguage) ) : base(coreConfiguration, greenshotLanguage)
{ {
if (EmailConfigHelper.HasOutlook()) _officeConfiguration = officeConfiguration;
if (EmailConfigHelper.HasOutlook())
{ {
_isActiveFlag = true; _isActiveFlag = true;
} }
@ -80,12 +82,13 @@ namespace Greenshot.Addon.Office.Destinations
} }
} }
public OutlookDestination( protected OutlookDestination(
string outlookInspectorCaption, string outlookInspectorCaption,
OlObjectClass outlookInspectorType, OlObjectClass outlookInspectorType,
IOfficeConfiguration officeConfiguration,
ICoreConfiguration coreConfiguration, ICoreConfiguration coreConfiguration,
IGreenshotLanguage greenshotLanguage IGreenshotLanguage greenshotLanguage
) : this(coreConfiguration, greenshotLanguage) ) : this(officeConfiguration, coreConfiguration, greenshotLanguage)
{ {
_outlookInspectorCaption = outlookInspectorCaption; _outlookInspectorCaption = outlookInspectorCaption;
_outlookInspectorType = outlookInspectorType; _outlookInspectorType = outlookInspectorType;
@ -122,7 +125,7 @@ namespace Greenshot.Addon.Office.Destinations
} }
foreach (var inspectorCaption in inspectorCaptions.Keys) foreach (var inspectorCaption in inspectorCaptions.Keys)
{ {
yield return new OutlookDestination(inspectorCaption, inspectorCaptions[inspectorCaption], CoreConfiguration, GreenshotLanguage); yield return new OutlookDestination(inspectorCaption, inspectorCaptions[inspectorCaption], _officeConfiguration, CoreConfiguration, GreenshotLanguage);
} }
} }
@ -175,11 +178,11 @@ namespace Greenshot.Addon.Office.Destinations
{ {
var destinations = new List<IDestination> var destinations = new List<IDestination>
{ {
new OutlookDestination(CoreConfiguration, GreenshotLanguage) new OutlookDestination(_officeConfiguration, CoreConfiguration, GreenshotLanguage)
}; };
foreach (var inspectorCaption in inspectorCaptions.Keys) foreach (var inspectorCaption in inspectorCaptions.Keys)
{ {
destinations.Add(new OutlookDestination(inspectorCaption, inspectorCaptions[inspectorCaption], CoreConfiguration, GreenshotLanguage)); destinations.Add(new OutlookDestination(inspectorCaption, inspectorCaptions[inspectorCaption], _officeConfiguration, CoreConfiguration, GreenshotLanguage));
} }
// Return the ExportInformation from the picker without processing, as this indirectly comes from us self // Return the ExportInformation from the picker without processing, as this indirectly comes from us self
return ShowPickerMenu(false, surface, captureDetails, destinations); return ShowPickerMenu(false, surface, captureDetails, destinations);
@ -187,9 +190,9 @@ namespace Greenshot.Addon.Office.Destinations
} }
else else
{ {
exportInformation.ExportMade = OutlookEmailExporter.ExportToOutlook(OfficeConfig.OutlookEmailFormat, tmpFile, exportInformation.ExportMade = OutlookEmailExporter.ExportToOutlook(_officeConfiguration.OutlookEmailFormat, tmpFile,
FilenameHelper.FillPattern(OfficeConfig.EmailSubjectPattern, captureDetails, false), attachmentName, OfficeConfig.EmailTo, OfficeConfig.EmailCC, FilenameHelper.FillPattern(_officeConfiguration.EmailSubjectPattern, captureDetails, false), attachmentName, _officeConfiguration.EmailTo, _officeConfiguration.EmailCC,
OfficeConfig.EmailBCC, null); _officeConfiguration.EmailBCC, null);
} }
} }
ProcessExport(exportInformation, surface); ProcessExport(exportInformation, surface);

4
src/Greenshot.Addon.Office/Destinations/PowerpointDestination.cs
View file

@ -30,7 +30,7 @@ using System.Linq;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using Greenshot.Addon.Office.OfficeExport; using Greenshot.Addon.Office.OfficeExport;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
using Greenshot.Addons.Interfaces.Plugin; using Greenshot.Addons.Interfaces.Plugin;
@ -42,7 +42,7 @@ namespace Greenshot.Addon.Office.Destinations
/// <summary> /// <summary>
/// Description of PowerpointDestination. /// Description of PowerpointDestination.
/// </summary> /// </summary>
[Destination("Powerpoint", 4)] [Destination("Powerpoint", DestinationOrder.Powerpoint)]
public class PowerpointDestination : AbstractDestination public class PowerpointDestination : AbstractDestination
{ {
private const int IconApplication = 0; private const int IconApplication = 0;

4
src/Greenshot.Addon.Office/Destinations/WordDestination.cs
View file

@ -32,7 +32,7 @@ using System.Text.RegularExpressions;
using Dapplo.Log; using Dapplo.Log;
using Greenshot.Addon.Office.OfficeExport; using Greenshot.Addon.Office.OfficeExport;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
using Greenshot.Addons.Interfaces.Plugin; using Greenshot.Addons.Interfaces.Plugin;
@ -44,7 +44,7 @@ namespace Greenshot.Addon.Office.Destinations
/// <summary> /// <summary>
/// Description of EmailDestination. /// Description of EmailDestination.
/// </summary> /// </summary>
[Destination("Word", 4)] [Destination("Word", DestinationOrder.Word)]
public class WordDestination : AbstractDestination public class WordDestination : AbstractDestination
{ {
private const int IconApplication = 0; private const int IconApplication = 0;

32
src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj
View file

@ -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.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.11-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.11-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath> <HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>

16
src/Greenshot.Addon.Office/packages.config
View file

@ -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.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" /> <package id="Dapplo.Ini" version="0.5.27" 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.27" targetFramework="net452" /> <package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />

32
src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj
View file

@ -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.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.11-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.11-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.33-beta\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>

2
src/Greenshot.Addon.OneDrive/OneDriveAutofacModule.cs
View file

@ -1,7 +1,7 @@
using Autofac; using Autofac;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Greenshot.Addon.OneDrive.ViewModels; using Greenshot.Addon.OneDrive.ViewModels;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
namespace Greenshot.Addon.OneDrive namespace Greenshot.Addon.OneDrive
{ {

2
src/Greenshot.Addon.OneDrive/OneDriveDestination.cs
View file

@ -39,7 +39,7 @@ using Dapplo.Log;
using Dapplo.Utils; using Dapplo.Utils;
using Greenshot.Addon.OneDrive.Entities; using Greenshot.Addon.OneDrive.Entities;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Controls; using Greenshot.Addons.Controls;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Extensions; using Greenshot.Addons.Extensions;

16
src/Greenshot.Addon.OneDrive/packages.config
View file

@ -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.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.33-beta" 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" />

32
src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj
View file

@ -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.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.11-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.11-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.33-beta\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>

2
src/Greenshot.Addon.Photobucket/PhotobucketAutofacModule.cs
View file

@ -1,7 +1,7 @@
using Autofac; using Autofac;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Greenshot.Addon.Photobucket.ViewModels; using Greenshot.Addon.Photobucket.ViewModels;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
namespace Greenshot.Addon.Photobucket namespace Greenshot.Addon.Photobucket
{ {

2
src/Greenshot.Addon.Photobucket/PhotobucketDestination.cs
View file

@ -38,7 +38,7 @@ using Dapplo.HttpExtensions.OAuth;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Utils; using Dapplo.Utils;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Extensions; using Greenshot.Addons.Extensions;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;

16
src/Greenshot.Addon.Photobucket/packages.config
View file

@ -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.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.33-beta" 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.27" targetFramework="net452" /> <package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />

32
src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
View file

@ -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.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.11-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.11-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.33-beta\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>

2
src/Greenshot.Addon.Tfs/TfsAutofacModule.cs
View file

@ -1,7 +1,7 @@
using Autofac; using Autofac;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Greenshot.Addon.Tfs.ViewModels; using Greenshot.Addon.Tfs.ViewModels;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
namespace Greenshot.Addon.Tfs namespace Greenshot.Addon.Tfs
{ {

2
src/Greenshot.Addon.Tfs/TfsDestination.cs
View file

@ -33,7 +33,7 @@ using Dapplo.Addons;
using Dapplo.Log; using Dapplo.Log;
using Greenshot.Addon.Tfs.Entities; using Greenshot.Addon.Tfs.Entities;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Controls; using Greenshot.Addons.Controls;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;

16
src/Greenshot.Addon.Tfs/packages.config
View file

@ -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.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.33-beta" 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.27" targetFramework="net452" /> <package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" />

16
src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
View file

@ -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.8.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.8-beta\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.11-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.8-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.11-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.31-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath> <HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>

2
src/Greenshot.Addon.Win10/Win10AutofacModule.cs
View file

@ -1,5 +1,5 @@
using Autofac; using Autofac;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
namespace Greenshot.Addon.Win10 namespace Greenshot.Addon.Win10
{ {

2
src/Greenshot.Addon.Win10/Win10OcrDestination.cs
View file

@ -27,7 +27,7 @@ using Windows.Graphics.Imaging;
using Windows.Media.Ocr; using Windows.Media.Ocr;
using Dapplo.Log; using Dapplo.Log;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
using Greenshot.Addons.Interfaces.Plugin; using Greenshot.Addons.Interfaces.Plugin;

2
src/Greenshot.Addon.Win10/Win10ShareDestination.cs
View file

@ -34,7 +34,7 @@ using Dapplo.Log;
using Dapplo.Windows.Messages; using Dapplo.Windows.Messages;
using Greenshot.Addon.Win10.Native; using Greenshot.Addon.Win10.Native;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Core.Enums; using Greenshot.Addons.Core.Enums;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;

8
src/Greenshot.Addon.Win10/packages.config
View file

@ -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.8-beta" targetFramework="net452" /> <package id="Dapplo.Addons" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.8-beta" targetFramework="net452" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.31-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.31-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" /> <package id="Dapplo.Ini" version="0.5.27" 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.27" targetFramework="net452" /> <package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />

31
src/Greenshot.Addons/AddonsAutofacModule.cs
View file

@ -1,4 +1,28 @@
using Autofac; #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 Greenshot.Addons.Components;
using Greenshot.Addons.ViewModels; using Greenshot.Addons.ViewModels;
namespace Greenshot.Addons namespace Greenshot.Addons
@ -11,7 +35,10 @@ namespace Greenshot.Addons
builder builder
.RegisterType<FileConfigPartViewModel>() .RegisterType<FileConfigPartViewModel>()
.AsSelf(); .AsSelf();
builder
.RegisterType<DestinationHolder>()
.AsSelf();
} }
} }
} }

28
src/Greenshot.Addons/Addons/DestinationAttribute.cs → src/Greenshot.Addons/Components/DestinationAttribute.cs
View file

@ -24,28 +24,16 @@
using System; using System;
using System.ComponentModel.Composition; using System.ComponentModel.Composition;
namespace Greenshot.Addons.Addons namespace Greenshot.Addons.Components
{ {
[MetadataAttribute] [MetadataAttribute]
[AttributeUsage(AttributeTargets.Class, Inherited = false)] [AttributeUsage(AttributeTargets.Class, Inherited = false)]
public class DestinationAttribute : Attribute public class DestinationAttribute : Attribute
{ {
/// <summary>
/// Default constructor
/// </summary>
public DestinationAttribute() public DestinationAttribute()
{ {
}
/// <summary>
/// Use a specific contract name for the Destination
/// </summary>
/// <param name="designation">string</param>
public DestinationAttribute(string designation)
{
Designation = designation;
} }
/// <summary> /// <summary>
/// Use a specific contract name for the Destination /// Use a specific contract name for the Destination
/// </summary> /// </summary>
@ -57,6 +45,20 @@ namespace Greenshot.Addons.Addons
Priority = priority; Priority = priority;
} }
/// <summary>
/// Use a specific contract name for the Destination
/// </summary>
/// <param name="designation">string</param>
/// <param name="priority">object</param>
public DestinationAttribute(string designation, object priority = null)
{
Designation = designation;
if (priority != null)
{
Priority = Convert.ToInt32(priority);
}
}
public string Designation { get; set; } public string Designation { get; set; }
public int Priority { get; set; } = 10; public int Priority { get; set; } = 10;
} }

43
src/Greenshot.Addons/Components/DestinationHolder.cs Normal file
View file

@ -0,0 +1,43 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Greenshot.Addons.Extensions;
namespace Greenshot.Addons.Components
{
/// <summary>
/// This holds the destinations, so other components can easily retrieve them
/// </summary>
public class DestinationHolder
{
private readonly IEnumerable<Lazy<IDestination, DestinationAttribute>> _destinations;
private readonly IEnumerable<IDestinationProvider> _destinationProviders;
public DestinationHolder(
IEnumerable<Lazy<IDestination, DestinationAttribute>> destinations,
IEnumerable<IDestinationProvider> destinationProviders
)
{
_destinations = destinations;
_destinationProviders = destinationProviders;
}
/// <summary>
/// Return an IEnumerable with sorted IDestination entries
/// </summary>
public IEnumerable<IDestination> SortedActiveDestinations => _destinationProviders
.SelectMany(provider => provider.Provide())
.Concat(_destinations)
.Where(destination => destination.Value.IsActive)
.OrderBy(destination => destination.Metadata.Priority)
.ThenBy(destination => destination.Value.Description)
.Select(d => d.Value);
/// <summary>
/// Return an IEnumerable with all destinations
/// </summary>
public IEnumerable<Lazy<IDestination, DestinationAttribute>> AllDestinations => _destinationProviders
.SelectMany(provider => provider.Provide())
.Concat(_destinations);
}
}

41
src/Greenshot.Addons/Components/DestinationOrder.cs Normal file
View file

@ -0,0 +1,41 @@
#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
namespace Greenshot.Addons.Components
{
public enum DestinationOrder
{
FileNoDialog = 0,
FileDialog = 0,
Picker = 1,
Printer = 2,
Clipboard = 2,
Email = 3,
Outlook = 3,
Word = 4,
Powerpoint = 4,
OneNote = 4,
Excel = 5,
}
}

2
src/Greenshot.Addons/Addons/IDestination.cs → src/Greenshot.Addons/Components/IDestination.cs
View file

@ -34,7 +34,7 @@ using Greenshot.Addons.Interfaces;
#endregion #endregion
namespace Greenshot.Addons.Addons namespace Greenshot.Addons.Components
{ {
/// <summary> /// <summary>
/// Description of IDestination. /// Description of IDestination.

36
src/Greenshot.Addons/Components/IDestinationProvider.cs Normal file
View file

@ -0,0 +1,36 @@
#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 System;
using System.Collections.Generic;
namespace Greenshot.Addons.Components
{
/// <summary>
/// Implement this interface to provide last-minute or dynamic IDestinations
/// </summary>
public interface IDestinationProvider
{
IEnumerable<Lazy<IDestination, DestinationAttribute>> Provide();
}
}

2
src/Greenshot.Addons/Core/AbstractDestination.cs
View file

@ -37,7 +37,7 @@ using Dapplo.Windows.Common.Structs;
using Dapplo.Windows.Dpi; using Dapplo.Windows.Dpi;
using Dapplo.Windows.Dpi.Forms; using Dapplo.Windows.Dpi.Forms;
using Dapplo.Windows.Extensions; using Dapplo.Windows.Extensions;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Extensions; using Greenshot.Addons.Extensions;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
using Greenshot.Gfx; using Greenshot.Gfx;

2
src/Greenshot.Addons/Core/CaptureDetails.cs
View file

@ -25,7 +25,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
#endregion #endregion

2
src/Greenshot.Addons/Extensions/DestinationExtensions.cs
View file

@ -25,7 +25,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
namespace Greenshot.Addons.Extensions namespace Greenshot.Addons.Extensions
{ {

39
src/Greenshot.Addons/Greenshot.Addons.csproj
View file

@ -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.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.11-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.11-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Configuration, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Configuration.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Dapp, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Dapp.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Dapp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Menu, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Menu.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Menu.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Security, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Security.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.33-beta\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>
@ -163,7 +163,7 @@
<Reference Include="WindowsBase" /> <Reference Include="WindowsBase" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Addons\DestinationAttribute.cs" /> <Compile Include="Components\DestinationAttribute.cs" />
<Compile Include="Animation\ColorAnimator.cs" /> <Compile Include="Animation\ColorAnimator.cs" />
<Compile Include="Animation\Easing.cs" /> <Compile Include="Animation\Easing.cs" />
<Compile Include="Animation\EasingModes.cs" /> <Compile Include="Animation\EasingModes.cs" />
@ -173,6 +173,9 @@
<Compile Include="Animation\PointAnimator.cs" /> <Compile Include="Animation\PointAnimator.cs" />
<Compile Include="Animation\RectangleAnimator.cs" /> <Compile Include="Animation\RectangleAnimator.cs" />
<Compile Include="Animation\SizeAnimator.cs" /> <Compile Include="Animation\SizeAnimator.cs" />
<Compile Include="Components\DestinationHolder.cs" />
<Compile Include="Components\DestinationOrder.cs" />
<Compile Include="Components\IDestinationProvider.cs" />
<Compile Include="Components\WindowHandle.cs" /> <Compile Include="Components\WindowHandle.cs" />
<Compile Include="Controls\AnimatingForm.cs"> <Compile Include="Controls\AnimatingForm.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
@ -377,7 +380,7 @@
<Compile Include="Interfaces\Drawing\IDrawableContainer.cs" /> <Compile Include="Interfaces\Drawing\IDrawableContainer.cs" />
<Compile Include="Interfaces\Forms\IImageEditor.cs" /> <Compile Include="Interfaces\Forms\IImageEditor.cs" />
<Compile Include="Interfaces\SurfaceMessageEventArgs.cs" /> <Compile Include="Interfaces\SurfaceMessageEventArgs.cs" />
<Compile Include="Addons\IDestination.cs" /> <Compile Include="Components\IDestination.cs" />
<Compile Include="Interfaces\IProcessor.cs" /> <Compile Include="Interfaces\IProcessor.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ViewModels\FileConfigPartViewModel.cs" /> <Compile Include="ViewModels\FileConfigPartViewModel.cs" />

2
src/Greenshot.Addons/Interfaces/ICaptureDetails.cs
View file

@ -25,7 +25,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
#endregion #endregion

2
src/Greenshot.Addons/ViewModels/UploadViewModel.cs
View file

@ -24,7 +24,7 @@
using System.Reactive.Disposables; using System.Reactive.Disposables;
using Caliburn.Micro; using Caliburn.Micro;
using Dapplo.CaliburnMicro.Extensions; using Dapplo.CaliburnMicro.Extensions;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
namespace Greenshot.Addons.ViewModels namespace Greenshot.Addons.ViewModels
{ {

16
src/Greenshot.Addons/packages.config
View file

@ -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.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Menu" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Menu" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Security" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Security" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.33-beta" 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" />

16
src/Greenshot.Gfx/Greenshot.Gfx.csproj
View file

@ -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.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.11-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.11-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath> <HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>

8
src/Greenshot.Gfx/packages.config
View file

@ -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.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net452" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.11-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net452" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.33-beta" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net452" /> <package id="Dapplo.Ini" version="0.5.27" 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.27" targetFramework="net452" /> <package id="Dapplo.Language" version="0.5.27" targetFramework="net452" />

16
src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj
View file

@ -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.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.11-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.11-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath> <HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>

8
src/Greenshot.PerformanceTests/packages.config
View file

@ -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.9-beta" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.11-beta" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.11-beta" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.33-beta" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.33-beta" targetFramework="net46" />
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net46" /> <package id="Dapplo.Ini" version="0.5.27" 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.27" targetFramework="net46" /> <package id="Dapplo.Language" version="0.5.27" targetFramework="net46" />

16
src/Greenshot.Tests/Greenshot.Tests.csproj
View file

@ -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.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.9-beta\lib\net45\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.11-beta\lib\net45\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.9-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.11-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.32.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro.Translations, Version=1.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.32-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.Translations.1.0.33-beta\lib\net45\Dapplo.CaliburnMicro.Translations.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Ini, Version=0.5.27.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath> <HintPath>..\packages\Dapplo.Ini.0.5.27\lib\net45\Dapplo.Ini.dll</HintPath>

8
src/Greenshot.Tests/packages.config
View file

@ -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.9-beta" targetFramework="net46" /> <package id="Dapplo.Addons" version="1.0.11-beta" targetFramework="net46" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.9-beta" targetFramework="net46" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.11-beta" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro" version="1.0.32-beta" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro" version="1.0.33-beta" targetFramework="net46" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.32-beta" targetFramework="net46" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.33-beta" targetFramework="net46" />
<package id="Dapplo.Ini" version="0.5.27" targetFramework="net46" /> <package id="Dapplo.Ini" version="0.5.27" 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.27" targetFramework="net46" /> <package id="Dapplo.Language" version="0.5.27" targetFramework="net46" />

2
src/Greenshot/Components/CommandlineParser.cs
View file

@ -28,7 +28,7 @@ using System.Text;
using CommonServiceLocator; using CommonServiceLocator;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Windows.Kernel32; using Dapplo.Windows.Kernel32;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
namespace Greenshot.Components namespace Greenshot.Components

2
src/Greenshot/Components/FormsStartup.cs
View file

@ -32,7 +32,7 @@ namespace Greenshot.Components
/// <summary> /// <summary>
/// This startup action starts Windows.Forms /// This startup action starts Windows.Forms
/// </summary> /// </summary>
[StartupOrder((int)GreenshotStartupOrder.Forms)] [ServiceOrder(GreenshotStartupOrder.Forms)]
public class FormsStartup : IStartup public class FormsStartup : IStartup
{ {
private static readonly LogSource Log = new LogSource(); private static readonly LogSource Log = new LogSource();

16
src/Greenshot/Components/GreenshotServer.cs
View file

@ -35,7 +35,7 @@ using System.Windows.Forms;
using Dapplo.Addons; using Dapplo.Addons;
using Dapplo.Ini; using Dapplo.Ini;
using Dapplo.Log; using Dapplo.Log;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Controls; using Greenshot.Addons.Controls;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
@ -51,14 +51,14 @@ namespace Greenshot.Components
/// This startup action starts the Greenshot "server", which allows to open files etc. /// This startup action starts the Greenshot "server", which allows to open files etc.
/// </summary> /// </summary>
[ServiceBehavior(InstanceContextMode = InstanceContextMode.Single)] [ServiceBehavior(InstanceContextMode = InstanceContextMode.Single)]
[StartupOrder((int)GreenshotStartupOrder.Server)] [ServiceOrder(GreenshotStartupOrder.Server)]
public class GreenshotServerAction : IGreenshotContract, IStartupAsync, IShutdownAsync public class GreenshotServerAction : IGreenshotContract, IStartupAsync, IShutdownAsync
{ {
private static readonly LogSource Log = new LogSource(); private static readonly LogSource Log = new LogSource();
private readonly ICoreConfiguration _coreConfiguration; private readonly ICoreConfiguration _coreConfiguration;
private readonly MainForm _mainForm; private readonly MainForm _mainForm;
private readonly HotkeyHandler _hotkeyHandler; private readonly HotkeyHandler _hotkeyHandler;
private readonly IEnumerable<IDestination> _destinations; private readonly DestinationHolder _destinationHolder;
private ServiceHost _host; private ServiceHost _host;
public static string Identity public static string Identity
@ -71,12 +71,16 @@ namespace Greenshot.Components
} }
public static string EndPoint => $"net.pipe://localhost/Greenshot/Greenshot_{Identity}"; public static string EndPoint => $"net.pipe://localhost/Greenshot/Greenshot_{Identity}";
public GreenshotServerAction(ICoreConfiguration coreConfiguration, MainForm mainForm, HotkeyHandler hotkeyHandler, IEnumerable<IDestination> destinations) public GreenshotServerAction(
ICoreConfiguration coreConfiguration,
MainForm mainForm,
HotkeyHandler hotkeyHandler,
DestinationHolder destinationHolder)
{ {
_coreConfiguration = coreConfiguration; _coreConfiguration = coreConfiguration;
_mainForm = mainForm; _mainForm = mainForm;
_hotkeyHandler = hotkeyHandler; _hotkeyHandler = hotkeyHandler;
_destinations = destinations; _destinationHolder = destinationHolder;
} }
public async Task StartAsync(CancellationToken cancellationToken = default) public async Task StartAsync(CancellationToken cancellationToken = default)
@ -160,7 +164,7 @@ namespace Greenshot.Components
// Fallback-Destination // Fallback-Destination
var designation = _coreConfiguration.OutputDestinations.FirstOrDefault(); var designation = _coreConfiguration.OutputDestinations.FirstOrDefault();
var destination = _destinations.FirstOrDefault(d => d.Designation == designation && d.IsActive); var destination = _destinationHolder.SortedActiveDestinations.FirstOrDefault(d => d.Designation == designation);
switch (captureMode.ToLower()) switch (captureMode.ToLower())
{ {

2
src/Greenshot/Components/HotkeyHandler.cs
View file

@ -43,7 +43,7 @@ namespace Greenshot.Components
/// <summary> /// <summary>
/// This startup action registers the hotkeys /// This startup action registers the hotkeys
/// </summary> /// </summary>
[StartupOrder((int)GreenshotUiStartupOrder.Hotkeys), ShutdownOrder(int.MinValue)] [ServiceOrder(GreenshotUiStartupOrder.Hotkeys, int.MinValue)]
public class HotkeyHandler : IUiStartup, IUiShutdown public class HotkeyHandler : IUiStartup, IUiShutdown
{ {
private static readonly LogSource Log = new LogSource(); private static readonly LogSource Log = new LogSource();

2
src/Greenshot/Components/MainFormStartup.cs
View file

@ -39,7 +39,7 @@ namespace Greenshot.Components
/// <summary> /// <summary>
/// This startup action starts the MainForm /// This startup action starts the MainForm
/// </summary> /// </summary>
[StartupOrder((int)GreenshotUiStartupOrder.TrayIcon)] [ServiceOrder(GreenshotUiStartupOrder.TrayIcon)]
public class MainFormStartup : IUiStartup, IUiShutdown public class MainFormStartup : IUiStartup, IUiShutdown
{ {
private static readonly LogSource Log = new LogSource(); private static readonly LogSource Log = new LogSource();

2
src/Greenshot/Components/SoundHelper.cs
View file

@ -41,7 +41,7 @@ namespace Greenshot.Components
/// Create to fix the sometimes wrongly played sample, especially after first start from IDE /// Create to fix the sometimes wrongly played sample, especially after first start from IDE
/// See: http://www.codeproject.com/KB/audio-video/soundplayerbug.aspx?msg=2487569 /// See: http://www.codeproject.com/KB/audio-video/soundplayerbug.aspx?msg=2487569
/// </summary> /// </summary>
[StartupOrder((int)GreenshotStartupOrder.Sound)] [ServiceOrder(GreenshotStartupOrder.Sound)]
public class SoundHelper : IStartup, IShutdown public class SoundHelper : IStartup, IShutdown
{ {
private readonly ICoreConfiguration _coreConfiguration; private readonly ICoreConfiguration _coreConfiguration;

4
src/Greenshot/Destinations/ClipboardDestination.cs
View file

@ -27,7 +27,7 @@ using System;
using System.Drawing; using System.Drawing;
using System.Windows.Forms; using System.Windows.Forms;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
using Greenshot.Configuration; using Greenshot.Configuration;
@ -39,7 +39,7 @@ namespace Greenshot.Destinations
/// <summary> /// <summary>
/// Description of ClipboardDestination. /// Description of ClipboardDestination.
/// </summary> /// </summary>
[Destination("Clipboard",2)] [Destination("Clipboard", DestinationOrder.Clipboard)]
public class ClipboardDestination : AbstractDestination public class ClipboardDestination : AbstractDestination
{ {
public ClipboardDestination( public ClipboardDestination(

4
src/Greenshot/Destinations/EmailDestination.cs
View file

@ -27,7 +27,7 @@ using System;
using System.Drawing; using System.Drawing;
using System.Windows.Forms; using System.Windows.Forms;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
using Greenshot.Helpers; using Greenshot.Helpers;
@ -39,7 +39,7 @@ namespace Greenshot.Destinations
/// <summary> /// <summary>
/// Description of EmailDestination. /// Description of EmailDestination.
/// </summary> /// </summary>
[Destination("EMail", 3)] [Destination("EMail", DestinationOrder.Email)]
public class EmailDestination : AbstractDestination public class EmailDestination : AbstractDestination
{ {
private static readonly Bitmap MailIcon = GreenshotResources.GetBitmap("Email.Image"); private static readonly Bitmap MailIcon = GreenshotResources.GetBitmap("Email.Image");

4
src/Greenshot/Destinations/FileDestination.cs
View file

@ -29,7 +29,7 @@ using System.IO;
using System.Windows.Forms; using System.Windows.Forms;
using Dapplo.Log; using Dapplo.Log;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Controls; using Greenshot.Addons.Controls;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
@ -42,7 +42,7 @@ namespace Greenshot.Destinations
/// <summary> /// <summary>
/// Description of FileSaveAsDestination. /// Description of FileSaveAsDestination.
/// </summary> /// </summary>
[Destination("FileNoDialog", 0)] [Destination("FileNoDialog", DestinationOrder.FileNoDialog)]
public class FileDestination : AbstractDestination public class FileDestination : AbstractDestination
{ {
private static readonly LogSource Log = new LogSource(); private static readonly LogSource Log = new LogSource();

4
src/Greenshot/Destinations/FileWithDialogDestination.cs
View file

@ -26,7 +26,7 @@
using System.Drawing; using System.Drawing;
using System.Windows.Forms; using System.Windows.Forms;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
using Greenshot.Configuration; using Greenshot.Configuration;
@ -38,7 +38,7 @@ namespace Greenshot.Destinations
/// <summary> /// <summary>
/// Description of FileWithDialog. /// Description of FileWithDialog.
/// </summary> /// </summary>
[Destination("FileDialog", 0)] [Destination("FileDialog", DestinationOrder.FileDialog)]
public class FileWithDialogDestination : AbstractDestination public class FileWithDialogDestination : AbstractDestination
{ {

29
src/Greenshot/Destinations/PickerDestination.cs
View file

@ -27,7 +27,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Addons; using Greenshot.Addons.Components;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
@ -38,21 +38,21 @@ namespace Greenshot.Destinations
/// <summary> /// <summary>
/// The PickerDestination shows a context menu with all possible destinations, so the user can "pick" one /// The PickerDestination shows a context menu with all possible destinations, so the user can "pick" one
/// </summary> /// </summary>
[Destination("Picker", 1)] [Destination("Picker", DestinationOrder.Picker)]
public class PickerDestination : AbstractDestination public class PickerDestination : AbstractDestination
{ {
private readonly IEnumerable<Lazy<IDestination, DestinationAttribute>> _destinations; private readonly DestinationHolder _destinationHolder;
public override string Description => GreenshotLanguage.SettingsDestinationPicker; public override string Description => GreenshotLanguage.SettingsDestinationPicker;
public PickerDestination( public PickerDestination(
IEnumerable<Lazy<IDestination, DestinationAttribute>> destinations, DestinationHolder destinationHolder,
ICoreConfiguration coreConfiguration, ICoreConfiguration coreConfiguration,
IGreenshotLanguage greenshotLanguage IGreenshotLanguage greenshotLanguage
) : base(coreConfiguration, greenshotLanguage) ) : base(coreConfiguration, greenshotLanguage)
{ {
_destinations = destinations; _destinationHolder = destinationHolder;
} }
/// <summary> /// <summary>
/// Export the capture with the destination picker /// Export the capture with the destination picker
@ -69,11 +69,8 @@ namespace Greenshot.Destinations
{ {
foreach (var outputDestination in CoreConfiguration.PickerDestinations) foreach (var outputDestination in CoreConfiguration.PickerDestinations)
{ {
var pickerDestination = _destinations var pickerDestination = _destinationHolder.SortedActiveDestinations
.Where(destination => !"Picker".Equals(destination.Metadata.Designation)) .FirstOrDefault(destination => outputDestination == destination.Designation);
.Where(destination => destination.Value.IsActive)
.Where(destination => outputDestination == destination.Value.Designation)
.Select(d => d.Value).FirstOrDefault();
if (pickerDestination != null) if (pickerDestination != null)
{ {
@ -83,12 +80,8 @@ namespace Greenshot.Destinations
} }
else else
{ {
foreach (var pickerDestination in _destinations foreach (var pickerDestination in _destinationHolder.SortedActiveDestinations
.Where(destination => !"Picker".Equals(destination.Metadata.Designation)) .Where(destination => !"Picker".Equals(destination.Designation)))
.Where(destination => destination.Value.IsActive)
.OrderBy(destination => destination.Metadata.Priority)
.ThenBy(destination => destination.Value.Description)
.Select(d => d.Value))
{ {
pickerDestinations.Add(pickerDestination); pickerDestinations.Add(pickerDestination);
} }

Some files were not shown because too many files have changed in this diff Show more