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

Working on making the color dialog work again when using High DPI screens...

Browse source
This commit is contained in:
Robin 2018-06-02 00:38:54 +02:00
commit 505ca91b9c
49 changed files with 703 additions and 620 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -94,32 +94,32 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll</HintPath>
<Reference Include="Dapplo.Windows, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.60\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll</HintPath>
<Reference Include="Dapplo.Windows.Common, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.60\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.60\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.60\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.60\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll</HintPath>
<Reference Include="Dapplo.Windows.Input, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.60\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.60\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.60\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll</HintPath>
<Reference Include="Dapplo.Windows.User32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.60\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" />

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

@ -22,15 +22,15 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.60" targetFramework="net46" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" />
</packages>

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

@ -116,32 +116,32 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll</HintPath>
<Reference Include="Dapplo.Windows, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.60\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll</HintPath>
<Reference Include="Dapplo.Windows.Common, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.60\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.60\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.60\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.60\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll</HintPath>
<Reference Include="Dapplo.Windows.Input, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.60\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.60\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.60\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll</HintPath>
<Reference Include="Dapplo.Windows.User32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.60\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" />

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

@ -24,15 +24,15 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.60" targetFramework="net46" />
<package id="Fody" version="3.0.3" targetFramework="net46" developmentDependency="true" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" />
</packages>

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

@ -106,32 +106,32 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll</HintPath>
<Reference Include="Dapplo.Windows, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.60\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll</HintPath>
<Reference Include="Dapplo.Windows.Common, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.60\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.60\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.60\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.60\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll</HintPath>
<Reference Include="Dapplo.Windows.Input, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.60\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.60\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.60\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll</HintPath>
<Reference Include="Dapplo.Windows.User32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.60\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" />

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

@ -22,15 +22,15 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.60" targetFramework="net46" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" />
</packages>

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

@ -97,32 +97,32 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll</HintPath>
<Reference Include="Dapplo.Windows, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.60\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll</HintPath>
<Reference Include="Dapplo.Windows.Common, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.60\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.60\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.60\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.60\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll</HintPath>
<Reference Include="Dapplo.Windows.Input, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.60\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.60\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.60\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll</HintPath>
<Reference Include="Dapplo.Windows.User32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.60\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" />

4
src/Greenshot.Addon.ExternalCommand/SettingsForm.cs
View file

@ -102,10 +102,10 @@ namespace Greenshot.Addon.ExternalCommand
foreach (var commando in _externalCommandConfiguration.Commands)
{
ListViewItem item;
var iconForExe = IconCache.IconForCommand(commando, DpiHandler.Dpi > 100);
var iconForExe = IconCache.IconForCommand(commando, FormDpiHandler.Dpi > 100);
if (iconForExe != null)
{
var image = iconForExe.ScaleIconForDisplaying(DpiHandler.Dpi);
var image = iconForExe.ScaleIconForDisplaying(FormDpiHandler.Dpi);
if (!Equals(image, iconForExe))
{
_images.Add(image);

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

@ -19,14 +19,14 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.60" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" />
</packages>

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

@ -103,32 +103,32 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll</HintPath>
<Reference Include="Dapplo.Windows, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.60\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll</HintPath>
<Reference Include="Dapplo.Windows.Common, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.60\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.60\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.60\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.60\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll</HintPath>
<Reference Include="Dapplo.Windows.Input, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.60\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.60\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.60\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll</HintPath>
<Reference Include="Dapplo.Windows.User32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.60\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" />

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

@ -21,14 +21,14 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.60" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" />
</packages>

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

@ -89,32 +89,32 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll</HintPath>
<Reference Include="Dapplo.Windows, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.60\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll</HintPath>
<Reference Include="Dapplo.Windows.Common, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.60\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.60\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.60\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.60\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll</HintPath>
<Reference Include="Dapplo.Windows.Input, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.60\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.60\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.60\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll</HintPath>
<Reference Include="Dapplo.Windows.User32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.60\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" />

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

@ -21,14 +21,14 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.60" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" />
</packages>

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

@ -111,32 +111,32 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll</HintPath>
<Reference Include="Dapplo.Windows, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.60\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll</HintPath>
<Reference Include="Dapplo.Windows.Common, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.60\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.60\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.60\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.60\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll</HintPath>
<Reference Include="Dapplo.Windows.Input, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.60\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.60\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.60\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll</HintPath>
<Reference Include="Dapplo.Windows.User32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.60\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference>
<Reference Include="MahApps.Metro, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll</HintPath>

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

@ -23,15 +23,15 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.60" targetFramework="net46" />
<package id="MahApps.Metro" version="1.6.4" targetFramework="net46" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" />

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

@ -114,32 +114,32 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll</HintPath>
<Reference Include="Dapplo.Windows, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.60\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll</HintPath>
<Reference Include="Dapplo.Windows.Common, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.60\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.60\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.60\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.60\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll</HintPath>
<Reference Include="Dapplo.Windows.Input, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.60\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.60\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.60\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll</HintPath>
<Reference Include="Dapplo.Windows.User32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.60\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" />

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

@ -24,15 +24,15 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.60" targetFramework="net46" />
<package id="Fody" version="3.0.3" targetFramework="net46" developmentDependency="true" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
<package id="Svg" version="2.3.0" targetFramework="net46" />

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

@ -151,9 +151,9 @@ namespace Greenshot.Addon.LegacyEditor.Forms
private void SetupBitmapScaleHandler()
{
// Create a BitmapScaleHandler which knows how to locate the icons for the destinations
_destinationScaleHandler = BitmapScaleHandler.Create<IDestination>(DpiHandler, (destination, dpi) => destination.GetDisplayIcon(dpi), (bitmap, dpi) => bitmap.ScaleIconForDisplaying(dpi));
_destinationScaleHandler = BitmapScaleHandler.Create<IDestination>(FormDpiHandler, (destination, dpi) => destination.GetDisplayIcon(dpi), (bitmap, dpi) => bitmap.ScaleIconForDisplaying(dpi));
DpiHandler.OnDpiChangeInfo.Subscribe(info =>
FormDpiHandler.OnDpiChangeInfo.Subscribe(info =>
{
switch (info.DpiChangeEventType)
{
@ -428,13 +428,13 @@ namespace Greenshot.Addon.LegacyEditor.Forms
}
if (toolstripDestination.IsDynamic)
{
var icon = toolstripDestination.GetDisplayIcon(DpiHandler.Dpi);
var icon = toolstripDestination.GetDisplayIcon(FormDpiHandler.Dpi);
var destinationButton = new ToolStripSplitButton
{
DropDownButtonWidth = DpiHandler.ScaleWithDpi(8, DpiHandler.Dpi),
DropDownButtonWidth = FormDpiHandler.ScaleWithCurrentDpi(8),
DisplayStyle = ToolStripItemDisplayStyle.Image,
Text = toolstripDestination.Description,
Image = icon.ScaleIconForDisplaying(DpiHandler.Dpi)
Image = icon.ScaleIconForDisplaying(FormDpiHandler.Dpi)
};
if (!Equals(icon, destinationButton.Image))
@ -447,12 +447,12 @@ namespace Greenshot.Addon.LegacyEditor.Forms
//ToolStripDropDownButton destinationButton = new ToolStripDropDownButton();
icon = toolstripDestination.GetDisplayIcon(DpiHandler.Dpi);
icon = toolstripDestination.GetDisplayIcon(FormDpiHandler.Dpi);
var defaultItem = new ToolStripMenuItem(toolstripDestination.Description)
{
DisplayStyle = ToolStripItemDisplayStyle.Image,
Tag = toolstripDestination,
Image = icon.ScaleIconForDisplaying(DpiHandler.Dpi)
Image = icon.ScaleIconForDisplaying(FormDpiHandler.Dpi)
};
if (!Equals(icon, defaultItem.Image))
{
@ -471,7 +471,7 @@ namespace Greenshot.Addon.LegacyEditor.Forms
foreach (var subDestination in toolstripDestination.DynamicDestinations().OrderBy(destination => destination.Description))
{
icon = subDestination.GetDisplayIcon(DpiHandler.Dpi);
icon = subDestination.GetDisplayIcon(FormDpiHandler.Dpi);
var destinationMenuItem = new ToolStripMenuItem(subDestination.Description)
{
Tag = subDestination,
@ -495,12 +495,12 @@ namespace Greenshot.Addon.LegacyEditor.Forms
}
else
{
var icon = toolstripDestination.GetDisplayIcon(DpiHandler.Dpi);
var icon = toolstripDestination.GetDisplayIcon(FormDpiHandler.Dpi);
var destinationButton = new ToolStripButton
{
DisplayStyle = ToolStripItemDisplayStyle.Image,
Text = toolstripDestination.Description,
Image = icon.ScaleIconForDisplaying(DpiHandler.Dpi)
Image = icon.ScaleIconForDisplaying(FormDpiHandler.Dpi)
};
destinationButton.Click += async (sender, args) => await toolstripDestination.ExportCaptureAsync(true, _surface, _surface.CaptureDetails);
if (!Equals(icon, destinationButton.Image))
@ -547,9 +547,9 @@ namespace Greenshot.Addon.LegacyEditor.Forms
continue;
}
var icon = destination.GetDisplayIcon(DpiHandler.Dpi);
var icon = destination.GetDisplayIcon(FormDpiHandler.Dpi);
item.Text = destination.Description;
item.Image = icon.ScaleIconForDisplaying(DpiHandler.Dpi);
item.Image = icon.ScaleIconForDisplaying(FormDpiHandler.Dpi);
item.ShortcutKeys = destination.EditorShortcutKeys;
fileStripMenuItem.DropDownItems.Add(item);
}
@ -754,13 +754,13 @@ namespace Greenshot.Addon.LegacyEditor.Forms
var stepLabels = _surface.CountStepLabels(null);
if (stepLabels <= 20)
{
ScaleHandler.AddTarget(btnStepLabel, $"btnStepLabel{stepLabels:00}.Image", DpiHandler.Dpi > 0);
ScaleHandler.AddTarget(addCounterToolStripMenuItem, $"btnStepLabel{stepLabels:00}.Image", DpiHandler.Dpi > 0);
ScaleHandler.AddTarget(btnStepLabel, $"btnStepLabel{stepLabels:00}.Image", FormDpiHandler.Dpi > 0);
ScaleHandler.AddTarget(addCounterToolStripMenuItem, $"btnStepLabel{stepLabels:00}.Image", FormDpiHandler.Dpi > 0);
}
else
{
ScaleHandler.AddTarget(btnStepLabel, $"btnStepLabel20+.Image", DpiHandler.Dpi > 0);
ScaleHandler.AddTarget(addCounterToolStripMenuItem, $"btnStepLabel20+.Image", DpiHandler.Dpi > 0);
ScaleHandler.AddTarget(btnStepLabel, $"btnStepLabel20+.Image", FormDpiHandler.Dpi > 0);
ScaleHandler.AddTarget(addCounterToolStripMenuItem, $"btnStepLabel20+.Image", FormDpiHandler.Dpi > 0);
}
var props = _surface.FieldAggregator;

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

@ -76,35 +76,35 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll</HintPath>
<Reference Include="Dapplo.Windows, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.60\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.58\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.60\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll</HintPath>
<Reference Include="Dapplo.Windows.Common, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.60\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.60\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.60\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.60\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll</HintPath>
<Reference Include="Dapplo.Windows.Input, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.60\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.60\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.60\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll</HintPath>
<Reference Include="Dapplo.Windows.User32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.60\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="PresentationCore" />

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

@ -19,15 +19,15 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.60" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" />
</packages>

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

@ -106,32 +106,32 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll</HintPath>
<Reference Include="Dapplo.Windows, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.60\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll</HintPath>
<Reference Include="Dapplo.Windows.Common, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.60\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.60\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.60\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.60\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll</HintPath>
<Reference Include="Dapplo.Windows.Input, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.60\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.60\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.60\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll</HintPath>
<Reference Include="Dapplo.Windows.User32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.60\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference>
<Reference Include="MahApps.Metro, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll</HintPath>

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

@ -22,15 +22,15 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.60" targetFramework="net46" />
<package id="MahApps.Metro" version="1.6.4" targetFramework="net46" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" />

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

@ -97,32 +97,32 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll</HintPath>
<Reference Include="Dapplo.Windows, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.60\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll</HintPath>
<Reference Include="Dapplo.Windows.Common, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.60\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.60\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.60\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.60\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll</HintPath>
<Reference Include="Dapplo.Windows.Input, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.60\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.60\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.60\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll</HintPath>
<Reference Include="Dapplo.Windows.User32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.60\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" />

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

@ -19,14 +19,14 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.60" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" />
</packages>

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

@ -84,35 +84,35 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll</HintPath>
<Reference Include="Dapplo.Windows, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.60\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Com, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.58\lib\net46\Dapplo.Windows.Com.dll</HintPath>
<Reference Include="Dapplo.Windows.Com, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Com.0.5.60\lib\net46\Dapplo.Windows.Com.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll</HintPath>
<Reference Include="Dapplo.Windows.Common, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.60\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.60\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.60\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.60\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll</HintPath>
<Reference Include="Dapplo.Windows.Input, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.60\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.60\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.60\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll</HintPath>
<Reference Include="Dapplo.Windows.User32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.60\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.mshtml, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

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

@ -20,16 +20,16 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Com" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Com" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.60" targetFramework="net46" />
<package id="Fody" version="3.0.3" targetFramework="net46" developmentDependency="true" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" />
</packages>

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

@ -23,15 +23,6 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.58" targetFramework="net46" />
<package id="MahApps.Metro" version="1.6.4" targetFramework="net46" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" />

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

@ -103,32 +103,32 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll</HintPath>
<Reference Include="Dapplo.Windows, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.60\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll</HintPath>
<Reference Include="Dapplo.Windows.Common, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.60\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.60\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.60\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.60\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll</HintPath>
<Reference Include="Dapplo.Windows.Input, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.60\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.60\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.60\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll</HintPath>
<Reference Include="Dapplo.Windows.User32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.60\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" />

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

@ -21,14 +21,14 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.60" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" />
</packages>

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

@ -22,15 +22,6 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.58" targetFramework="net46" />
<package id="MahApps.Metro" version="1.6.4" targetFramework="net46" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" />

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

@ -81,32 +81,32 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll</HintPath>
<Reference Include="Dapplo.Windows, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.60\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll</HintPath>
<Reference Include="Dapplo.Windows.Common, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.60\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.60\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.60\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.60\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll</HintPath>
<Reference Include="Dapplo.Windows.Input, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.60\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.60\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.60\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll</HintPath>
<Reference Include="Dapplo.Windows.User32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.60\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="PresentationCore" />

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

@ -15,14 +15,14 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.60" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" />
</packages>

17
src/Greenshot.Addons/Controls/ColorDialog.Designer.cs generated
View file

@ -37,6 +37,7 @@ namespace Greenshot.Addons.Controls {
components.Dispose();
}
}
_dpiSubscription.Dispose();
base.Dispose(disposing);
}
@ -77,10 +78,10 @@ namespace Greenshot.Addons.Controls {
this.btnTransparent.Text = "Transparent";
this.btnTransparent.UseVisualStyleBackColor = false;
this.btnTransparent.Click += new System.EventHandler(this.BtnTransparentClick);
//
// colorPanel
//
this.colorPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
//
// colorPanel
//
this.colorPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.colorPanel.Location = new System.Drawing.Point(213, 30);
this.colorPanel.Name = "colorPanel";
this.colorPanel.Size = new System.Drawing.Size(33, 23);
@ -203,10 +204,10 @@ namespace Greenshot.Addons.Controls {
this.labelAlpha.Size = new System.Drawing.Size(78, 18);
this.labelAlpha.TabIndex = 11;
this.labelAlpha.Text = "Alpha";
//
// btnApply
//
this.btnApply.BackColor = System.Drawing.Color.Transparent;
//
// btnApply
//
this.btnApply.BackColor = System.Drawing.Color.Transparent;
this.btnApply.LanguageKey = "colorpicker_apply";
this.btnApply.Location = new System.Drawing.Point(210, 191);
this.btnApply.Name = "btnApply";

92
src/Greenshot.Addons/Controls/ColorDialog.cs
View file

@ -30,6 +30,7 @@ using System.Globalization;
using System.Linq;
using System.Threading;
using System.Windows.Forms;
using Dapplo.Windows.Dpi;
#endregion
@ -40,27 +41,42 @@ namespace Greenshot.Addons.Controls
/// </summary>
public partial class ColorDialog : GreenshotForm
{
private readonly IList<Button> _colorButtons = new List<Button>();
private readonly IList<Button> _recentColorButtons = new List<Button>();
private readonly ToolTip _toolTip = new ToolTip();
private bool _updateInProgress;
private readonly IDisposable _dpiSubscription;
public ColorDialog(IGreenshotLanguage greenshotLanguage) : base(greenshotLanguage)
public ColorDialog(IGreenshotLanguage greenshotLanguage) : base(greenshotLanguage)
{
SuspendLayout();
InitializeComponent();
SuspendLayout();
CreateColorPalette(5, 5, 15, 15);
CreateLastUsedColorButtonRow(5, 190, 15, 15);
ResumeLayout();
//UpdateRecentColorsButtonRow();
}
SuspendLayout();
InitializeComponent();
ResumeLayout();
_dpiSubscription = FormDpiHandler.OnDpiChangeInfo.Subscribe(info =>
{
Redraw();
});
Redraw();
//UpdateRecentColorsButtonRow();
}
private void Redraw()
{
int pos = FormDpiHandler.ScaleWithCurrentDpi(5);
int size = FormDpiHandler.ScaleWithCurrentDpi(15);
int lastColorY = FormDpiHandler.ScaleWithCurrentDpi(190);
var buttons = CreateColorPalette(pos, pos, size, size);
var lastUsedButtons = CreateLastUsedColorButtonRow(pos, lastColorY, size, size);
SuspendLayout();
Controls.Clear();
Controls.AddRange(buttons.ToArray());
Controls.AddRange(lastUsedButtons.ToArray());
ResumeLayout();
}
public Color Color
{
get { return colorPanel.BackColor; }
set { PreviewColor(value, this); }
get => colorPanel.BackColor;
set => PreviewColor(value, this);
}
#region helper functions
@ -88,46 +104,47 @@ namespace Greenshot.Addons.Controls
#region user interface generation
private void CreateColorPalette(int x, int y, int w, int h)
private IList<Control> CreateColorPalette(int x, int y, int w, int h)
{
CreateColorButtonColumn(255, 0, 0, x, y, w, h, 11);
IList<Control> colorButtons = new List<Control>();
CreateColorButtonColumn(colorButtons, 255, 0, 0, x, y, w, h, 11);
x += w;
CreateColorButtonColumn(255, 255 / 2, 0, x, y, w, h, 11);
CreateColorButtonColumn(colorButtons, 255, 255 / 2, 0, x, y, w, h, 11);
x += w;
CreateColorButtonColumn(255, 255, 0, x, y, w, h, 11);
CreateColorButtonColumn(colorButtons, 255, 255, 0, x, y, w, h, 11);
x += w;
CreateColorButtonColumn(255 / 2, 255, 0, x, y, w, h, 11);
CreateColorButtonColumn(colorButtons, 255 / 2, 255, 0, x, y, w, h, 11);
x += w;
CreateColorButtonColumn(0, 255, 0, x, y, w, h, 11);
CreateColorButtonColumn(colorButtons, 0, 255, 0, x, y, w, h, 11);
x += w;
CreateColorButtonColumn(0, 255, 255 / 2, x, y, w, h, 11);
CreateColorButtonColumn(colorButtons, 0, 255, 255 / 2, x, y, w, h, 11);
x += w;
CreateColorButtonColumn(0, 255, 255, x, y, w, h, 11);
CreateColorButtonColumn(colorButtons, 0, 255, 255, x, y, w, h, 11);
x += w;
CreateColorButtonColumn(0, 255 / 2, 255, x, y, w, h, 11);
CreateColorButtonColumn(colorButtons, 0, 255 / 2, 255, x, y, w, h, 11);
x += w;
CreateColorButtonColumn(0, 0, 255, x, y, w, h, 11);
CreateColorButtonColumn(colorButtons, 0, 0, 255, x, y, w, h, 11);
x += w;
CreateColorButtonColumn(255 / 2, 0, 255, x, y, w, h, 11);
CreateColorButtonColumn(colorButtons, 255 / 2, 0, 255, x, y, w, h, 11);
x += w;
CreateColorButtonColumn(255, 0, 255, x, y, w, h, 11);
CreateColorButtonColumn(colorButtons, 255, 0, 255, x, y, w, h, 11);
x += w;
CreateColorButtonColumn(255, 0, 255 / 2, x, y, w, h, 11);
CreateColorButtonColumn(colorButtons, 255, 0, 255 / 2, x, y, w, h, 11);
x += w + 5;
CreateColorButtonColumn(255 / 2, 255 / 2, 255 / 2, x, y, w, h, 11);
CreateColorButtonColumn(colorButtons, 255 / 2, 255 / 2, 255 / 2, x, y, w, h, 11);
Controls.AddRange(_colorButtons.ToArray());
return colorButtons;
}
private void CreateColorButtonColumn(int red, int green, int blue, int x, int y, int w, int h, int shades)
private void CreateColorButtonColumn(IList<Control> colorButtons, int red, int green, int blue, int x, int y, int w, int h, int shades)
{
var shadedColorsNum = (shades - 1) / 2;
for (var i = 0; i <= shadedColorsNum; i++)
{
_colorButtons.Add(CreateColorButton(red * i / shadedColorsNum, green * i / shadedColorsNum, blue * i / shadedColorsNum, x, y + i * h, w, h));
colorButtons.Add(CreateColorButton(red * i / shadedColorsNum, green * i / shadedColorsNum, blue * i / shadedColorsNum, x, y + i * h, w, h));
if (i > 0)
{
_colorButtons.Add(CreateColorButton(red + (255 - red) * i / shadedColorsNum, green + (255 - green) * i / shadedColorsNum, blue + (255 - blue) * i / shadedColorsNum,
colorButtons.Add(CreateColorButton(red + (255 - red) * i / shadedColorsNum, green + (255 - green) * i / shadedColorsNum, blue + (255 - blue) * i / shadedColorsNum,
x, y + (i + shadedColorsNum) * h, w, h));
}
}
@ -154,16 +171,19 @@ namespace Greenshot.Addons.Controls
return b;
}
private void CreateLastUsedColorButtonRow(int x, int y, int w, int h)
private IList<Control> CreateLastUsedColorButtonRow(int x, int y, int w, int h)
{
for (var i = 0; i < 12; i++)
IList<Control> recentColorButtons = new List<Control>();
for (var i = 0; i < 12; i++)
{
var b = CreateColorButton(Color.Transparent, x, y, w, h);
b.Enabled = false;
_recentColorButtons.Add(b);
recentColorButtons.Add(b);
x += w;
}
Controls.AddRange(_recentColorButtons.ToArray());
return recentColorButtons;
}
#endregion

2
src/Greenshot.Addons/Controls/GreenshotForm.cs
View file

@ -60,7 +60,7 @@ namespace Greenshot.Addons.Controls
{
_language = language;
// Add the Dapplo.Windows DPI change handler
ScaleHandler = BitmapScaleHandler.WithComponentResourceManager(DpiHandler, GetType(), (bitmap, dpi) => bitmap.ScaleIconForDisplaying(dpi));
ScaleHandler = BitmapScaleHandler.WithComponentResourceManager(FormDpiHandler, GetType(), (bitmap, dpi) => bitmap.ScaleIconForDisplaying(dpi));
}
protected bool ManualLanguageApply { get; set; }

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

@ -411,7 +411,7 @@ namespace Greenshot.Addons.Core
}
// Close
menu.Items.Add(new ToolStripSeparator());
var closeItem = new ToolStripMenuItem(GreenshotLanguage.Close)
var closeItem = new ToolStripMenuItem(GreenshotLanguage.ContextmenuExit)
{
Image = GreenshotResources.GetBitmap("Close.Image")
};

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

@ -89,38 +89,38 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll</HintPath>
<Reference Include="Dapplo.Windows, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.60\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.58\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.60\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll</HintPath>
<Reference Include="Dapplo.Windows.Common, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.60\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.60\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.60\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.60\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Icons, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Icons.0.5.58\lib\net46\Dapplo.Windows.Icons.dll</HintPath>
<Reference Include="Dapplo.Windows.Icons, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Icons.0.5.60\lib\net46\Dapplo.Windows.Icons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll</HintPath>
<Reference Include="Dapplo.Windows.Input, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.60\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.60\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.60\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll</HintPath>
<Reference Include="Dapplo.Windows.User32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.60\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" />

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

@ -22,17 +22,17 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Icons" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Icons" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.60" targetFramework="net46" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
<package id="Svg" version="2.3.0" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" />

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

@ -64,32 +64,32 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll</HintPath>
<Reference Include="Dapplo.Windows, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.60\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll</HintPath>
<Reference Include="Dapplo.Windows.Common, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.60\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.60\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.60\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.60\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll</HintPath>
<Reference Include="Dapplo.Windows.Input, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.60\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.60\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.60\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll</HintPath>
<Reference Include="Dapplo.Windows.User32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.60\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="PresentationCore" />

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

@ -15,15 +15,15 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.60" targetFramework="net46" />
<package id="Svg" version="2.3.0" targetFramework="net46" />
<package id="System.Reactive" version="4.0.0" targetFramework="net46" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" targetFramework="net46" />

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

@ -69,32 +69,32 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll</HintPath>
<Reference Include="Dapplo.Windows, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.60\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll</HintPath>
<Reference Include="Dapplo.Windows.Common, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.60\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.60\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.60\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.60\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll</HintPath>
<Reference Include="Dapplo.Windows.Input, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.60\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.60\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.60\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll</HintPath>
<Reference Include="Dapplo.Windows.User32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.60\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference>
<Reference Include="JeremyAnsel.ColorQuant, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a5c614433db515df, processorArchitecture=MSIL">
<HintPath>..\packages\JeremyAnsel.ColorQuant.1.0.55\lib\net40\JeremyAnsel.ColorQuant.dll</HintPath>

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

@ -18,15 +18,15 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.60" targetFramework="net46" />
<package id="JeremyAnsel.ColorQuant" version="1.0.55" targetFramework="net46" />
<package id="Microsoft.CodeAnalysis.Analyzers" version="2.6.0" targetFramework="net46" developmentDependency="true" />
<package id="Microsoft.CodeAnalysis.Common" version="2.8.2" targetFramework="net46" />

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

@ -101,32 +101,32 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll</HintPath>
<Reference Include="Dapplo.Windows, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.60\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll</HintPath>
<Reference Include="Dapplo.Windows.Common, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.60\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.60\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.60\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.60\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll</HintPath>
<Reference Include="Dapplo.Windows.Input, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.60\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.60\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.60\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll</HintPath>
<Reference Include="Dapplo.Windows.User32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.60\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis, Version=2.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
@ -291,6 +291,7 @@
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
<None Include="TestFiles\scroll0.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

79
src/Greenshot.Tests/app.config Normal file
View file

@ -0,0 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.DotNet.PlatformAbstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.8.0.0" newVersion="2.8.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.8.0.0" newVersion="2.8.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.4.3.0" newVersion="1.4.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.FileSystem" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.FileSystem.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="xunit.core" publicKeyToken="8d05b1bb7a6fdb6c" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.1.3858" newVersion="2.3.1.3858" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="xunit.execution.desktop" publicKeyToken="8d05b1bb7a6fdb6c" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.1.3858" newVersion="2.3.1.3858" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.3.0" newVersion="2.0.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

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

@ -20,15 +20,15 @@
<package id="Dapplo.Language" version="0.5.28" targetFramework="net46" />
<package id="Dapplo.Log" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.60" targetFramework="net46" />
<package id="Microsoft.CodeAnalysis.Analyzers" version="2.6.0" targetFramework="net46" developmentDependency="true" />
<package id="Microsoft.CodeAnalysis.Common" version="2.8.2" targetFramework="net46" />
<package id="Microsoft.CodeAnalysis.CSharp" version="2.8.2" targetFramework="net46" />

6
src/Greenshot/Forms/AboutForm.cs
View file

@ -153,10 +153,10 @@ namespace Greenshot.Forms
_bitmap = BitmapFactory.CreateEmpty(90, 90, PixelFormat.Format24bppRgb, BackColor);
pictureBox1.Image = _bitmap;
_dpiSubscription = DpiHandler.OnDpiChangeInfo.Subscribe(info =>
_dpiSubscription = FormDpiHandler.OnDpiChangeInfo.Subscribe(info =>
{
pictureBox1.Width = DpiHandler.ScaleWithDpi(90, info.NewDpi);
pictureBox1.Height = DpiHandler.ScaleWithDpi(90, info.NewDpi);
pictureBox1.Width = FormDpiHandler.ScaleWithCurrentDpi(90);
pictureBox1.Height = FormDpiHandler.ScaleWithCurrentDpi(90);
});
var v = Assembly.GetExecutingAssembly().GetName().Version;

2
src/Greenshot/Forms/MainForm.cs
View file

@ -376,7 +376,7 @@ namespace Greenshot.Forms
{
ContextMenuDpiHandler = contextMenu.AttachDpiHandler();
var dpiChangeSubscription = DpiHandler.OnDpiChangeInfo.Subscribe(info =>
var dpiChangeSubscription = FormDpiHandler.OnDpiChangeInfo.Subscribe(info =>
{
switch (info.DpiChangeEventType)
{

48
src/Greenshot/Greenshot.csproj
View file

@ -118,41 +118,41 @@
<Reference Include="Dapplo.Utils, Version=1.0.158.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.58\lib\net46\Dapplo.Windows.dll</HintPath>
<Reference Include="Dapplo.Windows, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.0.5.60\lib\net46\Dapplo.Windows.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.58\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
<Reference Include="Dapplo.Windows.Clipboard, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Clipboard.0.5.60\lib\net46\Dapplo.Windows.Clipboard.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Common, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.58\lib\net46\Dapplo.Windows.Common.dll</HintPath>
<Reference Include="Dapplo.Windows.Common, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Common.0.5.60\lib\net46\Dapplo.Windows.Common.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.58\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
<Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.60\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.58\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
<Reference Include="Dapplo.Windows.Dpi, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Dpi.0.5.60\lib\net46\Dapplo.Windows.Dpi.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.58\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
<Reference Include="Dapplo.Windows.Gdi32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Gdi32.0.5.60\lib\net46\Dapplo.Windows.Gdi32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Icons, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Icons.0.5.58\lib\net46\Dapplo.Windows.Icons.dll</HintPath>
<Reference Include="Dapplo.Windows.Icons, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Icons.0.5.60\lib\net46\Dapplo.Windows.Icons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Input, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.58\lib\net46\Dapplo.Windows.Input.dll</HintPath>
<Reference Include="Dapplo.Windows.Input, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Input.0.5.60\lib\net46\Dapplo.Windows.Input.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.58\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
<Reference Include="Dapplo.Windows.Kernel32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Kernel32.0.5.60\lib\net46\Dapplo.Windows.Kernel32.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.58\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
<Reference Include="Dapplo.Windows.Messages, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Messages.0.5.60\lib\net46\Dapplo.Windows.Messages.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.Multimedia, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Multimedia.0.5.58\lib\net46\Dapplo.Windows.Multimedia.dll</HintPath>
<Reference Include="Dapplo.Windows.Multimedia, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.Multimedia.0.5.60\lib\net46\Dapplo.Windows.Multimedia.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Windows.User32, Version=0.5.58.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.58\lib\net46\Dapplo.Windows.User32.dll</HintPath>
<Reference Include="Dapplo.Windows.User32, Version=0.5.60.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Windows.User32.0.5.60\lib\net46\Dapplo.Windows.User32.dll</HintPath>
</Reference>
<Reference Include="GongSolutions.Wpf.DragDrop, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\gong-wpf-dragdrop.1.1.0\lib\net46\GongSolutions.Wpf.DragDrop.dll</HintPath>

24
src/Greenshot/packages.config
View file

@ -31,18 +31,18 @@
<package id="Dapplo.Log.LogFile" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Log.Loggers" version="1.2.1" targetFramework="net46" />
<package id="Dapplo.Utils" version="1.0.158" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Icons" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.Multimedia" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.58" targetFramework="net46" />
<package id="Dapplo.Windows" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Clipboard" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Common" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.DesktopWindowsManager" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Dpi" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Gdi32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Icons" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Input" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Kernel32" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Messages" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.Multimedia" version="0.5.60" targetFramework="net46" />
<package id="Dapplo.Windows.User32" version="0.5.60" targetFramework="net46" />
<package id="Fody" version="3.0.3" targetFramework="net46" developmentDependency="true" />
<package id="gong-wpf-dragdrop" version="1.1.0" targetFramework="net46" />
<package id="MahApps.Metro" version="1.6.4" targetFramework="net46" />