diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj index 479879135..1111cbbf0 100644 --- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj +++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj @@ -94,35 +94,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.74\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Box/packages.config b/src/Greenshot.Addon.Box/packages.config index ae4a4e1d7..0984ab28d 100644 --- a/src/Greenshot.Addon.Box/packages.config +++ b/src/Greenshot.Addon.Box/packages.config @@ -22,16 +22,16 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj index c2ad732f2..610114e97 100644 --- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj +++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj @@ -62,8 +62,8 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll + + ..\packages\Costura.Fody.3.0.0\lib\net46\Costura.dll ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll @@ -116,35 +116,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.74\lib\net46\Dapplo.Windows.User32.dll @@ -233,13 +233,13 @@ copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Green mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\$(ProjectName)" copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\$(ProjectName)" - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + - + \ No newline at end of file diff --git a/src/Greenshot.Addon.Confluence/packages.config b/src/Greenshot.Addon.Confluence/packages.config index 0edb91601..e98a12f81 100644 --- a/src/Greenshot.Addon.Confluence/packages.config +++ b/src/Greenshot.Addon.Confluence/packages.config @@ -6,7 +6,7 @@ - + @@ -24,16 +24,16 @@ - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj index ed56dc553..56bdb4c0f 100644 --- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj +++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj @@ -106,35 +106,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.74\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Dropbox/packages.config b/src/Greenshot.Addon.Dropbox/packages.config index ae4a4e1d7..0984ab28d 100644 --- a/src/Greenshot.Addon.Dropbox/packages.config +++ b/src/Greenshot.Addon.Dropbox/packages.config @@ -22,16 +22,16 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj index dc62d35b2..773b76a13 100644 --- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj +++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj @@ -55,8 +55,8 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - - ..\packages\CliWrap.1.8.4\lib\net45\CliWrap.dll + + ..\packages\CliWrap.1.8.5\lib\net45\CliWrap.dll ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll @@ -100,35 +100,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.74\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.ExternalCommand/packages.config b/src/Greenshot.Addon.ExternalCommand/packages.config index 4983ae19a..2b7d9be21 100644 --- a/src/Greenshot.Addon.ExternalCommand/packages.config +++ b/src/Greenshot.Addon.ExternalCommand/packages.config @@ -5,7 +5,7 @@ - + @@ -20,15 +20,15 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj index a11f07a67..fe388bbe9 100644 --- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj +++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj @@ -103,35 +103,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.74\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Flickr/packages.config b/src/Greenshot.Addon.Flickr/packages.config index a1deef1f7..35e578909 100644 --- a/src/Greenshot.Addon.Flickr/packages.config +++ b/src/Greenshot.Addon.Flickr/packages.config @@ -21,15 +21,15 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj index 3b203ead8..e3c4594d7 100644 --- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj +++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj @@ -89,35 +89,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.74\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.GooglePhotos/packages.config b/src/Greenshot.Addon.GooglePhotos/packages.config index a1deef1f7..35e578909 100644 --- a/src/Greenshot.Addon.GooglePhotos/packages.config +++ b/src/Greenshot.Addon.GooglePhotos/packages.config @@ -21,15 +21,15 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj index 6c120622d..5a78263f7 100644 --- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj +++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj @@ -111,35 +111,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.74\lib\net46\Dapplo.Windows.User32.dll ..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll diff --git a/src/Greenshot.Addon.Imgur/packages.config b/src/Greenshot.Addon.Imgur/packages.config index 48ea5d429..cb96aa46a 100644 --- a/src/Greenshot.Addon.Imgur/packages.config +++ b/src/Greenshot.Addon.Imgur/packages.config @@ -23,16 +23,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj index f3d3ec737..d3cbcd057 100644 --- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj +++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj @@ -60,8 +60,8 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll + + ..\packages\Costura.Fody.3.0.0\lib\net46\Costura.dll ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll @@ -114,35 +114,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.74\lib\net46\Dapplo.Windows.User32.dll @@ -287,13 +287,13 @@ copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuratio None false - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + - + \ No newline at end of file diff --git a/src/Greenshot.Addon.Jira/packages.config b/src/Greenshot.Addon.Jira/packages.config index e6dc579d1..a80010fb3 100644 --- a/src/Greenshot.Addon.Jira/packages.config +++ b/src/Greenshot.Addon.Jira/packages.config @@ -6,7 +6,7 @@ - + @@ -24,17 +24,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/Greenshot.Addon.LegacyEditor/Forms/ImageEditorForm.cs b/src/Greenshot.Addon.LegacyEditor/Forms/ImageEditorForm.cs index 8b6bdf804..15ef13b72 100644 --- a/src/Greenshot.Addon.LegacyEditor/Forms/ImageEditorForm.cs +++ b/src/Greenshot.Addon.LegacyEditor/Forms/ImageEditorForm.cs @@ -39,7 +39,6 @@ using Dapplo.Windows.Common.Extensions; using Dapplo.Windows.Common.Structs; using Dapplo.Windows.Desktop; using Dapplo.Windows.Dpi; -using Dapplo.Windows.Dpi.Enums; using Dapplo.Windows.Kernel32; using Dapplo.Windows.User32; using Greenshot.Addon.LegacyEditor.Controls; @@ -153,27 +152,19 @@ namespace Greenshot.Addon.LegacyEditor.Forms // Create a BitmapScaleHandler which knows how to locate the icons for the destinations _destinationScaleHandler = BitmapScaleHandler.Create(FormDpiHandler, (destination, dpi) => destination.GetDisplayIcon(dpi), (bitmap, dpi) => bitmap.ScaleIconForDisplaying(dpi)); - FormDpiHandler.OnDpiChangeInfo.Subscribe(info => + FormDpiHandler.OnDpiChanged.Subscribe(info => { - switch (info.DpiChangeEventType) - { - case DpiChangeEventTypes.Before: - // Change the ImageScalingSize before setting the bitmaps - var width = DpiHandler.ScaleWithDpi(_coreConfiguration.IconSize.Width, info.NewDpi); - var size = new Size(width, width); - SuspendLayout(); - toolsToolStrip.ImageScalingSize = size; - menuStrip1.ImageScalingSize = size; - destinationsToolStrip.ImageScalingSize = size; - propertiesToolStrip.ImageScalingSize = size; - propertiesToolStrip.MinimumSize = new Size(150, width + 10); - break; - case DpiChangeEventTypes.After: - // Redraw the form - ResumeLayout(true); - Refresh(); - break; - } + // Change the ImageScalingSize before setting the bitmaps + var size = DpiHandler.ScaleWithDpi(_coreConfiguration.IconSize, info.NewDpi); + SuspendLayout(); + toolsToolStrip.ImageScalingSize = size; + menuStrip1.ImageScalingSize = size; + destinationsToolStrip.ImageScalingSize = size; + propertiesToolStrip.ImageScalingSize = size; + propertiesToolStrip.MinimumSize = new Size(150, size.Width + 10); + // Redraw the form + ResumeLayout(true); + Refresh(); }); // Use the GreenshotForm ScaleHandler to locate the icons and get them scaled diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj index a7e7bdbd0..a1c6f7ab2 100644 --- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj +++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj @@ -85,35 +85,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.74\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.LegacyEditor/packages.config b/src/Greenshot.Addon.LegacyEditor/packages.config index d788841c3..36e8b363e 100644 --- a/src/Greenshot.Addon.LegacyEditor/packages.config +++ b/src/Greenshot.Addon.LegacyEditor/packages.config @@ -20,15 +20,15 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj index 0a96c69ec..954290d11 100644 --- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj +++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj @@ -106,35 +106,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.74\lib\net46\Dapplo.Windows.User32.dll ..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll diff --git a/src/Greenshot.Addon.Lutim/packages.config b/src/Greenshot.Addon.Lutim/packages.config index 33b741869..da2ba3229 100644 --- a/src/Greenshot.Addon.Lutim/packages.config +++ b/src/Greenshot.Addon.Lutim/packages.config @@ -22,16 +22,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj index 31a4cf451..05baf08fb 100644 --- a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj +++ b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj @@ -97,35 +97,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.74\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.OCR/packages.config b/src/Greenshot.Addon.OCR/packages.config index 1203b4057..76b7eb313 100644 --- a/src/Greenshot.Addon.OCR/packages.config +++ b/src/Greenshot.Addon.OCR/packages.config @@ -19,15 +19,15 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj index 5f0384d0c..1794c621b 100644 --- a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj +++ b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj @@ -42,8 +42,8 @@ ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll - - ..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll + + ..\packages\Costura.Fody.3.0.0\lib\net46\Costura.dll ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll @@ -84,38 +84,38 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Com.0.5.73\lib\net46\Dapplo.Windows.Com.dll + + ..\packages\Dapplo.Windows.Com.0.5.74\lib\net46\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.74\lib\net46\Dapplo.Windows.User32.dll @@ -252,13 +252,13 @@ copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Green mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\$(ProjectName)" copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\$(ProjectName)" - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + - + \ No newline at end of file diff --git a/src/Greenshot.Addon.Office/packages.config b/src/Greenshot.Addon.Office/packages.config index de5d12896..fb18c91f3 100644 --- a/src/Greenshot.Addon.Office/packages.config +++ b/src/Greenshot.Addon.Office/packages.config @@ -6,7 +6,7 @@ - + @@ -20,17 +20,17 @@ - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj index eecc8006d..3c1a40309 100644 --- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj +++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj @@ -105,35 +105,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.74\lib\net46\Dapplo.Windows.User32.dll ..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll diff --git a/src/Greenshot.Addon.OneDrive/packages.config b/src/Greenshot.Addon.OneDrive/packages.config index 48ea5d429..cb96aa46a 100644 --- a/src/Greenshot.Addon.OneDrive/packages.config +++ b/src/Greenshot.Addon.OneDrive/packages.config @@ -23,16 +23,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj index 02515f67e..f699bb02d 100644 --- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj +++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj @@ -103,35 +103,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.74\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Addon.Photobucket/packages.config b/src/Greenshot.Addon.Photobucket/packages.config index a1deef1f7..35e578909 100644 --- a/src/Greenshot.Addon.Photobucket/packages.config +++ b/src/Greenshot.Addon.Photobucket/packages.config @@ -21,15 +21,15 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj index cc99d7f24..06666dfd6 100644 --- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj +++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj @@ -102,35 +102,35 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.74\lib\net46\Dapplo.Windows.User32.dll ..\packages\MahApps.Metro.1.6.4\lib\net46\MahApps.Metro.dll diff --git a/src/Greenshot.Addon.Tfs/packages.config b/src/Greenshot.Addon.Tfs/packages.config index 33b741869..da2ba3229 100644 --- a/src/Greenshot.Addon.Tfs/packages.config +++ b/src/Greenshot.Addon.Tfs/packages.config @@ -22,16 +22,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/src/Greenshot.Addons/Controls/ExtendedWebBrowser.cs b/src/Greenshot.Addons/Controls/ExtendedWebBrowser.cs deleted file mode 100644 index 0881554fe..000000000 --- a/src/Greenshot.Addons/Controls/ExtendedWebBrowser.cs +++ /dev/null @@ -1,80 +0,0 @@ -#region Greenshot GNU General Public License - -// Greenshot - a free and open source screenshot tool -// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom -// -// For more information see: http://getgreenshot.org/ -// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 1 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -#endregion - -#region Usings - -using System; -using System.Windows.Forms; -using Greenshot.Addons.Interop; - -#endregion - -namespace Greenshot.Addons.Controls -{ - public class ExtendedWebBrowser : WebBrowser - { - protected override WebBrowserSiteBase CreateWebBrowserSiteBase() - { - return new ExtendedWebBrowserSite(this); - } - - protected class ExtendedWebBrowserSite : WebBrowserSite, IOleCommandTarget - { - private const int OLECMDID_SHOWSCRIPTERROR = 40; - private const int OLECMDID_SHOWMESSAGE = 41; - - private const int S_OK = 0; - private const int OLECMDERR_E_NOTSUPPORTED = -2147221248; - private const int OLECMDERR_E_UNKNOWNGROUP = -2147221244; - - private static readonly Guid CGID_DocHostCommandHandler = new Guid("F38BC242-B950-11D1-8918-00C04FC2C836"); - - public ExtendedWebBrowserSite(WebBrowser wb) : base(wb) - { - } - - #region IOleCommandTarget Members - - public int QueryStatus(Guid pguidCmdGroup, int cCmds, IntPtr prgCmds, IntPtr pCmdText) - { - return OLECMDERR_E_NOTSUPPORTED; - } - - public int Exec(Guid pguidCmdGroup, int nCmdID, int nCmdexecopt, IntPtr pvaIn, IntPtr pvaOut) - { - if (pguidCmdGroup == CGID_DocHostCommandHandler) - { - if (nCmdID == OLECMDID_SHOWSCRIPTERROR) - { - // do not need to alter pvaOut as the docs says, enough to return S_OK here - return S_OK; - } - } - - return OLECMDERR_E_NOTSUPPORTED; - } - - #endregion - } - } -} \ No newline at end of file diff --git a/src/Greenshot.Addons/Core/AbstractDestination.cs b/src/Greenshot.Addons/Core/AbstractDestination.cs index 3a547cfc7..2f7b6b9cc 100644 --- a/src/Greenshot.Addons/Core/AbstractDestination.cs +++ b/src/Greenshot.Addons/Core/AbstractDestination.cs @@ -314,11 +314,9 @@ namespace Greenshot.Addons.Core (destination, dpi) => destination.GetDisplayIcon(dpi), (bitmap, d) => bitmap.ScaleIconForDisplaying(d)); - dpiHandler.OnDpiChanged.Subscribe(dpi => + dpiHandler.OnDpiChanged.Subscribe(dpiChangeInfo => { - var width = DpiHandler.ScaleWithDpi(CoreConfiguration.IconSize.Width, dpi); - var size = new Size(width, width); - menu.ImageScalingSize = size; + menu.ImageScalingSize = DpiHandler.ScaleWithDpi(CoreConfiguration.IconSize, dpiChangeInfo.NewDpi); }); // Generate an empty ExportInformation object, for when nothing was selected. diff --git a/src/Greenshot.Addons/Core/WindowCapture.cs b/src/Greenshot.Addons/Core/WindowCapture.cs index f473e7b70..bed21113e 100644 --- a/src/Greenshot.Addons/Core/WindowCapture.cs +++ b/src/Greenshot.Addons/Core/WindowCapture.cs @@ -102,8 +102,8 @@ namespace Greenshot.Addons.Core /// be different in multiscreen setups. This implementation /// can conveniently be used when the cursor location is needed to deal with a fullscreen bitmap. /// - /// - /// + /// NativePoint + /// NativePoint public static NativePoint GetLocationRelativeToScreenBounds(NativePoint locationRelativeToScreenOrigin) { var bounds = GetScreenBounds(); @@ -177,7 +177,7 @@ namespace Greenshot.Addons.Core /// /// string with current method /// NativeRect of what we want to capture - /// + /// Exception private static Exception CreateCaptureException(string method, NativeRect captureBounds) { var exceptionToThrow = User32Api.CreateWin32Exception(method); diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index 6ecab69fd..5e2923f0c 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -89,38 +89,38 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Icons.0.5.73\lib\net46\Dapplo.Windows.Icons.dll + + ..\packages\Dapplo.Windows.Icons.0.5.74\lib\net46\Dapplo.Windows.Icons.dll - - ..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.74\lib\net46\Dapplo.Windows.User32.dll @@ -252,14 +252,7 @@ - - - - - - Component - Form diff --git a/src/Greenshot.Addons/Interop/IDispatch.cs b/src/Greenshot.Addons/Interop/IDispatch.cs deleted file mode 100644 index ab7c9cd29..000000000 --- a/src/Greenshot.Addons/Interop/IDispatch.cs +++ /dev/null @@ -1,56 +0,0 @@ -#region Greenshot GNU General Public License - -// Greenshot - a free and open source screenshot tool -// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom -// -// For more information see: http://getgreenshot.org/ -// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 1 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -#endregion - -#region Usings - -using System; -using System.Runtime.InteropServices; -using System.Runtime.InteropServices.CustomMarshalers; -using DISPPARAMS = System.Runtime.InteropServices.ComTypes.DISPPARAMS; -using EXCEPINFO = System.Runtime.InteropServices.ComTypes.EXCEPINFO; - -#endregion - -namespace Greenshot.Addons.Interop -{ - [ComImport] - [Guid("00020400-0000-0000-C000-000000000046")] - [InterfaceType(ComInterfaceType.InterfaceIsDual)] - public interface IDispatch : IUnknown - { - [PreserveSig] - int GetTypeInfoCount(out int count); - - [PreserveSig] - int GetTypeInfo([MarshalAs(UnmanagedType.U4)] int iTInfo, [MarshalAs(UnmanagedType.U4)] int lcid, - [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(TypeToTypeInfoMarshaler))] out Type typeInfo); - - [PreserveSig] - int GetIDsOfNames(ref Guid riid, [MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.LPWStr)] string[] rgsNames, int cNames, int lcid, - [MarshalAs(UnmanagedType.LPArray)] int[] rgDispId); - - [PreserveSig] - int Invoke(int dispIdMember, ref Guid riid, uint lcid, ushort wFlags, ref DISPPARAMS pDispParams, - out object pVarResult, ref EXCEPINFO pExcepInfo, IntPtr[] pArgErr); - } -} \ No newline at end of file diff --git a/src/Greenshot.Addons/Interop/IOleCommandTarget.cs b/src/Greenshot.Addons/Interop/IOleCommandTarget.cs deleted file mode 100644 index 53dc23a82..000000000 --- a/src/Greenshot.Addons/Interop/IOleCommandTarget.cs +++ /dev/null @@ -1,47 +0,0 @@ -#region Greenshot GNU General Public License - -// Greenshot - a free and open source screenshot tool -// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom -// -// For more information see: http://getgreenshot.org/ -// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 1 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -#endregion - -#region Usings - -using System; -using System.Runtime.InteropServices; - -#endregion - -namespace Greenshot.Addons.Interop -{ - [ComImport] - [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] - [ComVisible(true)] - [Guid("B722BCCB-4E68-101B-A2BC-00AA00404770")] - public interface IOleCommandTarget - { - [return: MarshalAs(UnmanagedType.I4)] - [PreserveSig] - int QueryStatus([In] [MarshalAs(UnmanagedType.LPStruct)] Guid pguidCmdGroup, int cCmds, IntPtr prgCmds, IntPtr pCmdText); - - [return: MarshalAs(UnmanagedType.I4)] - [PreserveSig] - int Exec([In] [MarshalAs(UnmanagedType.LPStruct)] Guid pguidCmdGroup, int nCmdID, int nCmdexecopt, IntPtr pvaIn, IntPtr pvaOut); - } -} \ No newline at end of file diff --git a/src/Greenshot.Addons/Interop/IOleWindow.cs b/src/Greenshot.Addons/Interop/IOleWindow.cs deleted file mode 100644 index 676249d90..000000000 --- a/src/Greenshot.Addons/Interop/IOleWindow.cs +++ /dev/null @@ -1,43 +0,0 @@ -#region Greenshot GNU General Public License - -// Greenshot - a free and open source screenshot tool -// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom -// -// For more information see: http://getgreenshot.org/ -// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 1 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -#endregion - -#region Usings - -using System; -using System.Runtime.InteropServices; - -#endregion - -namespace Greenshot.Addons.Interop -{ - // Needed to get the Window handle from the IDocument2 - // See: http://msdn.microsoft.com/en-us/library/ms680102%28v=vs.85%29.aspx - [ComImport] - [Guid("00000114-0000-0000-C000-000000000046")] - [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] - public interface IOleWindow - { - void GetWindow(out IntPtr phwnd); - void ContextSensitiveHelp([In] [MarshalAs(UnmanagedType.Bool)] bool fEnterMode); - } -} \ No newline at end of file diff --git a/src/Greenshot.Addons/Interop/IServiceProvider.cs b/src/Greenshot.Addons/Interop/IServiceProvider.cs index fbccb8aaa..ccbe2e00a 100644 --- a/src/Greenshot.Addons/Interop/IServiceProvider.cs +++ b/src/Greenshot.Addons/Interop/IServiceProvider.cs @@ -30,8 +30,10 @@ using System.Runtime.InteropServices; namespace Greenshot.Addons.Interop { - // This is the COM IServiceProvider interface, not System.IServiceProvider .Net interface! - [ComImport] + /// + /// This is the COM IServiceProvider interface, not System.IServiceProvider .Net interface! + /// + [ComImport] [ComVisible(true)] [Guid("6D5140C1-7436-11CE-8034-00AA006009FA")] [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] diff --git a/src/Greenshot.Addons/Interop/IUnknown.cs b/src/Greenshot.Addons/Interop/IUnknown.cs deleted file mode 100644 index 59801ac8a..000000000 --- a/src/Greenshot.Addons/Interop/IUnknown.cs +++ /dev/null @@ -1,46 +0,0 @@ -#region Greenshot GNU General Public License - -// Greenshot - a free and open source screenshot tool -// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom -// -// For more information see: http://getgreenshot.org/ -// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 1 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -#endregion - -#region Usings - -using System; -using System.Runtime.InteropServices; - -#endregion - -namespace Greenshot.Addons.Interop -{ - [ComImport] - [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] - [Guid("00000000-0000-0000-C000-000000000046")] - public interface IUnknown - { - IntPtr QueryInterface(ref Guid riid); - - [PreserveSig] - uint AddRef(); - - [PreserveSig] - uint Release(); - } -} \ No newline at end of file diff --git a/src/Greenshot.Addons/packages.config b/src/Greenshot.Addons/packages.config index 80683e0f5..8e3a5995a 100644 --- a/src/Greenshot.Addons/packages.config +++ b/src/Greenshot.Addons/packages.config @@ -22,17 +22,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj index 854f28728..831c33808 100644 --- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj +++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj @@ -64,32 +64,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.74\lib\net46\Dapplo.Windows.User32.dll diff --git a/src/Greenshot.Gfx/packages.config b/src/Greenshot.Gfx/packages.config index 0128b9228..87107cb32 100644 --- a/src/Greenshot.Gfx/packages.config +++ b/src/Greenshot.Gfx/packages.config @@ -15,15 +15,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj index 07c6e4f41..7cf482011 100644 --- a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj +++ b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj @@ -69,32 +69,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.74\lib\net46\Dapplo.Windows.User32.dll ..\packages\JeremyAnsel.ColorQuant.1.0.55\lib\net40\JeremyAnsel.ColorQuant.dll diff --git a/src/Greenshot.PerformanceTests/packages.config b/src/Greenshot.PerformanceTests/packages.config index c0323e998..18e354d26 100644 --- a/src/Greenshot.PerformanceTests/packages.config +++ b/src/Greenshot.PerformanceTests/packages.config @@ -18,15 +18,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index 620b7b1c9..8bd3c7dfa 100644 --- a/src/Greenshot.Tests/Greenshot.Tests.csproj +++ b/src/Greenshot.Tests/Greenshot.Tests.csproj @@ -101,32 +101,32 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.User32.0.5.74\lib\net46\Dapplo.Windows.User32.dll ..\packages\Microsoft.CodeAnalysis.Common.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.dll diff --git a/src/Greenshot.Tests/packages.config b/src/Greenshot.Tests/packages.config index c57583a1f..45bd2c1ac 100644 --- a/src/Greenshot.Tests/packages.config +++ b/src/Greenshot.Tests/packages.config @@ -20,15 +20,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/Greenshot/Forms/AboutForm.cs b/src/Greenshot/Forms/AboutForm.cs index a06438548..9afd4d488 100644 --- a/src/Greenshot/Forms/AboutForm.cs +++ b/src/Greenshot/Forms/AboutForm.cs @@ -35,6 +35,7 @@ using Dapplo.CaliburnMicro; using Greenshot.Helpers; using Dapplo.Ini; using Dapplo.Log; +using Dapplo.Windows.Common.Structs; using Greenshot.Addons; using Greenshot.Addons.Animation; using Greenshot.Addons.Controls; @@ -156,10 +157,9 @@ namespace Greenshot.Forms _bitmap = BitmapFactory.CreateEmpty(90, 90, PixelFormat.Format24bppRgb, BackColor); pictureBox1.Image = _bitmap; - _dpiSubscription = FormDpiHandler.OnDpiChangeInfo.Subscribe(info => + _dpiSubscription = FormDpiHandler.OnDpiChanged.Subscribe(info => { - pictureBox1.Width = FormDpiHandler.ScaleWithCurrentDpi(90); - pictureBox1.Height = FormDpiHandler.ScaleWithCurrentDpi(90); + pictureBox1.Size = FormDpiHandler.ScaleWithCurrentDpi(new NativeSize(90,90)); }); var versionInfo = $@"Greenshot {versionProvider.CurrentVersion} {(coreConfiguration.IsPortable ? " Portable" : "")} ({OsInfo.Bits} bit)"; diff --git a/src/Greenshot/Forms/MainForm.cs b/src/Greenshot/Forms/MainForm.cs index 58e78046e..4ecaac08a 100644 --- a/src/Greenshot/Forms/MainForm.cs +++ b/src/Greenshot/Forms/MainForm.cs @@ -375,26 +375,18 @@ namespace Greenshot.Forms { ContextMenuDpiHandler = contextMenu.AttachDpiHandler(); - var dpiChangeSubscription = FormDpiHandler.OnDpiChangeInfo.Subscribe(info => + var dpiChangeSubscription = FormDpiHandler.OnDpiChanged.Subscribe(info => { - switch (info.DpiChangeEventType) - { - case DpiChangeEventTypes.Before: - // Change the ImageScalingSize before setting the bitmaps - var width = DpiHandler.ScaleWithDpi(_coreConfiguration.IconSize.Width, info.NewDpi); - var height = DpiHandler.ScaleWithDpi(_coreConfiguration.IconSize.Height, info.NewDpi); - var size = new Size(width, height); - contextMenu.SuspendLayout(); - contextMenu.ImageScalingSize = size; - contextmenu_quicksettings.Size = new Size(170, width + 8); - break; - case DpiChangeEventTypes.After: - // Redraw the form - contextMenu.ResumeLayout(true); - contextMenu.Refresh(); - notifyIcon.Icon = GreenshotResources.GetGreenshotIcon(); - break; - } + // Change the ImageScalingSize before setting the bitmaps + var width = DpiHandler.ScaleWithDpi(_coreConfiguration.IconSize.Width, info.NewDpi); + var height = DpiHandler.ScaleWithDpi(_coreConfiguration.IconSize.Height, info.NewDpi); + var size = new Size(width, height); + contextMenu.SuspendLayout(); + contextMenu.ImageScalingSize = size; + contextmenu_quicksettings.Size = new Size(170, width + 8); + contextMenu.ResumeLayout(true); + contextMenu.Refresh(); + notifyIcon.Icon = GreenshotResources.GetGreenshotIcon(); }); var contextMenuResourceScaleHandler = BitmapScaleHandler.WithComponentResourceManager(ContextMenuDpiHandler, GetType(), (bitmap, dpi) => bitmap.ScaleIconForDisplaying(dpi)); diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index 7c44cdd74..d0699fe71 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -55,8 +55,8 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll - - ..\packages\Costura.Fody.2.0.1\lib\net452\Costura.dll + + ..\packages\Costura.Fody.3.0.0\lib\net46\Costura.dll ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll @@ -118,41 +118,44 @@ ..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll - - ..\packages\Dapplo.Windows.0.5.73\lib\net46\Dapplo.Windows.dll + + ..\packages\Dapplo.Windows.0.5.74\lib\net46\Dapplo.Windows.dll - - ..\packages\Dapplo.Windows.Clipboard.0.5.73\lib\net46\Dapplo.Windows.Clipboard.dll + + ..\packages\Dapplo.Windows.Clipboard.0.5.74\lib\net46\Dapplo.Windows.Clipboard.dll - - ..\packages\Dapplo.Windows.Common.0.5.73\lib\net46\Dapplo.Windows.Common.dll + + ..\packages\Dapplo.Windows.Com.0.5.74\lib\net46\Dapplo.Windows.Com.dll - - ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.73\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll + + ..\packages\Dapplo.Windows.Common.0.5.74\lib\net46\Dapplo.Windows.Common.dll - - ..\packages\Dapplo.Windows.Dpi.0.5.73\lib\net46\Dapplo.Windows.Dpi.dll + + ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.74\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll - - ..\packages\Dapplo.Windows.Gdi32.0.5.73\lib\net46\Dapplo.Windows.Gdi32.dll + + ..\packages\Dapplo.Windows.Dpi.0.5.74\lib\net46\Dapplo.Windows.Dpi.dll - - ..\packages\Dapplo.Windows.Icons.0.5.73\lib\net46\Dapplo.Windows.Icons.dll + + ..\packages\Dapplo.Windows.Gdi32.0.5.74\lib\net46\Dapplo.Windows.Gdi32.dll - - ..\packages\Dapplo.Windows.Input.0.5.73\lib\net46\Dapplo.Windows.Input.dll + + ..\packages\Dapplo.Windows.Icons.0.5.74\lib\net46\Dapplo.Windows.Icons.dll - - ..\packages\Dapplo.Windows.Kernel32.0.5.73\lib\net46\Dapplo.Windows.Kernel32.dll + + ..\packages\Dapplo.Windows.Input.0.5.74\lib\net46\Dapplo.Windows.Input.dll - - ..\packages\Dapplo.Windows.Messages.0.5.73\lib\net46\Dapplo.Windows.Messages.dll + + ..\packages\Dapplo.Windows.Kernel32.0.5.74\lib\net46\Dapplo.Windows.Kernel32.dll - - ..\packages\Dapplo.Windows.Multimedia.0.5.73\lib\net46\Dapplo.Windows.Multimedia.dll + + ..\packages\Dapplo.Windows.Messages.0.5.74\lib\net46\Dapplo.Windows.Messages.dll - - ..\packages\Dapplo.Windows.User32.0.5.73\lib\net46\Dapplo.Windows.User32.dll + + ..\packages\Dapplo.Windows.Multimedia.0.5.74\lib\net46\Dapplo.Windows.Multimedia.dll + + + ..\packages\Dapplo.Windows.User32.0.5.74\lib\net46\Dapplo.Windows.User32.dll ..\packages\gong-wpf-dragdrop.1.1.0\lib\net46\GongSolutions.Wpf.DragDrop.dll @@ -532,13 +535,13 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + - + \ No newline at end of file diff --git a/src/Greenshot/Helpers/IECaptureHelper.cs b/src/Greenshot/Helpers/IECaptureHelper.cs index b9f400063..5d6ded387 100644 --- a/src/Greenshot/Helpers/IECaptureHelper.cs +++ b/src/Greenshot/Helpers/IECaptureHelper.cs @@ -34,6 +34,7 @@ using Greenshot.Configuration; using Greenshot.Helpers.IEInterop; using Dapplo.Ini; using Dapplo.Log; +using Dapplo.Windows.Com; using Dapplo.Windows.Common.Extensions; using Dapplo.Windows.Common.Structs; using Dapplo.Windows.Messages; @@ -41,7 +42,6 @@ using Dapplo.Windows.User32; using Greenshot.Addons.Controls; using Greenshot.Addons.Core; using Greenshot.Addons.Interfaces; -using Greenshot.Addons.Interop; using Greenshot.Gfx; using mshtml; diff --git a/src/Greenshot/packages.config b/src/Greenshot/packages.config index 661e9fe83..9bb9380b4 100644 --- a/src/Greenshot/packages.config +++ b/src/Greenshot/packages.config @@ -10,7 +10,7 @@ - + @@ -31,19 +31,20 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + +