diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj
index ba0a88ef3..1eeb2fab3 100644
--- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj
+++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj
@@ -46,11 +46,11 @@
..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll
-
- ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll
+
+ ..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll
-
- ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll
+
+ ..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll
..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll
diff --git a/src/Greenshot.Addon.Box/packages.config b/src/Greenshot.Addon.Box/packages.config
index 6a42152df..74973fc8e 100644
--- a/src/Greenshot.Addon.Box/packages.config
+++ b/src/Greenshot.Addon.Box/packages.config
@@ -6,8 +6,8 @@
-
-
+
+
diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
index df427633f..2719158c3 100644
--- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
+++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
@@ -65,11 +65,11 @@
..\packages\Costura.Fody.3.0.0\lib\net46\Costura.dll
-
- ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll
+
+ ..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll
-
- ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll
+
+ ..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll
..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll
diff --git a/src/Greenshot.Addon.Confluence/packages.config b/src/Greenshot.Addon.Confluence/packages.config
index b47c5ef6c..78459c36a 100644
--- a/src/Greenshot.Addon.Confluence/packages.config
+++ b/src/Greenshot.Addon.Confluence/packages.config
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj
index b7dc4cd71..0d36acd09 100644
--- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj
+++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj
@@ -58,11 +58,11 @@
..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll
-
- ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll
+
+ ..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll
-
- ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll
+
+ ..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll
..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll
diff --git a/src/Greenshot.Addon.Dropbox/packages.config b/src/Greenshot.Addon.Dropbox/packages.config
index 6a42152df..74973fc8e 100644
--- a/src/Greenshot.Addon.Dropbox/packages.config
+++ b/src/Greenshot.Addon.Dropbox/packages.config
@@ -6,8 +6,8 @@
-
-
+
+
diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
index 436bcd069..a8eece5d3 100644
--- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
+++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
@@ -61,11 +61,11 @@
..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll
-
- ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll
+
+ ..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll
-
- ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll
+
+ ..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll
..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll
diff --git a/src/Greenshot.Addon.ExternalCommand/packages.config b/src/Greenshot.Addon.ExternalCommand/packages.config
index b78aadc21..9ddc983e2 100644
--- a/src/Greenshot.Addon.ExternalCommand/packages.config
+++ b/src/Greenshot.Addon.ExternalCommand/packages.config
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj
index 22dddefb0..059570536 100644
--- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj
+++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj
@@ -58,11 +58,11 @@
..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll
-
- ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll
+
+ ..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll
-
- ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll
+
+ ..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll
..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll
diff --git a/src/Greenshot.Addon.Flickr/packages.config b/src/Greenshot.Addon.Flickr/packages.config
index f85304ab4..c2642c560 100644
--- a/src/Greenshot.Addon.Flickr/packages.config
+++ b/src/Greenshot.Addon.Flickr/packages.config
@@ -6,8 +6,8 @@
-
-
+
+
diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj
index 0ae1e6de0..ee9f1a688 100644
--- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj
+++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj
@@ -44,11 +44,11 @@
..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll
-
- ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll
+
+ ..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll
-
- ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll
+
+ ..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll
..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll
diff --git a/src/Greenshot.Addon.GooglePhotos/packages.config b/src/Greenshot.Addon.GooglePhotos/packages.config
index f85304ab4..c2642c560 100644
--- a/src/Greenshot.Addon.GooglePhotos/packages.config
+++ b/src/Greenshot.Addon.GooglePhotos/packages.config
@@ -6,8 +6,8 @@
-
-
+
+
diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
index 70bf28666..469cb36f7 100644
--- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
+++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
@@ -63,11 +63,11 @@
..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll
-
- ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll
+
+ ..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll
-
- ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll
+
+ ..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll
..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll
diff --git a/src/Greenshot.Addon.Imgur/IImgurLanguage.cs b/src/Greenshot.Addon.Imgur/IImgurLanguage.cs
index 2f3d5ac3b..f012f8be5 100644
--- a/src/Greenshot.Addon.Imgur/IImgurLanguage.cs
+++ b/src/Greenshot.Addon.Imgur/IImgurLanguage.cs
@@ -62,5 +62,7 @@ namespace Greenshot.Addon.Imgur
string UsePageLink { get; }
string AnonymousAccess { get; }
+
+ string ResetCredentialsButton { get; }
}
}
\ No newline at end of file
diff --git a/src/Greenshot.Addon.Imgur/ViewModels/ImgurConfigViewModel.cs b/src/Greenshot.Addon.Imgur/ViewModels/ImgurConfigViewModel.cs
index 9b4422481..4a8092b86 100644
--- a/src/Greenshot.Addon.Imgur/ViewModels/ImgurConfigViewModel.cs
+++ b/src/Greenshot.Addon.Imgur/ViewModels/ImgurConfigViewModel.cs
@@ -27,6 +27,7 @@ using Autofac.Features.OwnedInstances;
using Caliburn.Micro;
using Dapplo.CaliburnMicro.Configuration;
using Dapplo.CaliburnMicro.Extensions;
+using Dapplo.HttpExtensions.OAuth;
using Greenshot.Addons.Core;
using Greenshot.Addons.ViewModels;
@@ -102,5 +103,13 @@ namespace Greenshot.Addon.Imgur.ViewModels
WindowManager.ShowDialog(imgurHistoryViewModel.Value);
}
}
+
+ public bool CanResetCredentials => ImgurConfiguration.HasToken();
+
+ public void ResetCredentials()
+ {
+ ImgurConfiguration.ResetToken();
+ NotifyOfPropertyChange(nameof(CanResetCredentials));
+ }
}
}
diff --git a/src/Greenshot.Addon.Imgur/Views/ImgurConfigView.xaml b/src/Greenshot.Addon.Imgur/Views/ImgurConfigView.xaml
index 4d1d11f91..a297fcd4b 100644
--- a/src/Greenshot.Addon.Imgur/Views/ImgurConfigView.xaml
+++ b/src/Greenshot.Addon.Imgur/Views/ImgurConfigView.xaml
@@ -15,6 +15,7 @@
+
diff --git a/src/Greenshot.Addon.Imgur/packages.config b/src/Greenshot.Addon.Imgur/packages.config
index 891934ddb..6ad49afd5 100644
--- a/src/Greenshot.Addon.Imgur/packages.config
+++ b/src/Greenshot.Addon.Imgur/packages.config
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
index 37370495c..0c9b502fa 100644
--- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
+++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
@@ -63,11 +63,11 @@
..\packages\Costura.Fody.3.0.0\lib\net46\Costura.dll
-
- ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll
+
+ ..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll
-
- ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll
+
+ ..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll
..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll
diff --git a/src/Greenshot.Addon.Jira/packages.config b/src/Greenshot.Addon.Jira/packages.config
index d6aec4719..c949f2e50 100644
--- a/src/Greenshot.Addon.Jira/packages.config
+++ b/src/Greenshot.Addon.Jira/packages.config
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
index 3296c9b11..c69de8ed5 100644
--- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
+++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
@@ -43,11 +43,11 @@
..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll
-
- ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll
+
+ ..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll
-
- ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll
+
+ ..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll
..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll
diff --git a/src/Greenshot.Addon.LegacyEditor/packages.config b/src/Greenshot.Addon.LegacyEditor/packages.config
index a4b96dc89..f1a87e3f8 100644
--- a/src/Greenshot.Addon.LegacyEditor/packages.config
+++ b/src/Greenshot.Addon.LegacyEditor/packages.config
@@ -6,8 +6,8 @@
-
-
+
+
diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
index db4209b7c..dbd4b47c2 100644
--- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
+++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
@@ -61,11 +61,11 @@
..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll
-
- ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll
+
+ ..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll
-
- ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll
+
+ ..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll
..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll
diff --git a/src/Greenshot.Addon.Lutim/packages.config b/src/Greenshot.Addon.Lutim/packages.config
index 29e381555..989f16766 100644
--- a/src/Greenshot.Addon.Lutim/packages.config
+++ b/src/Greenshot.Addon.Lutim/packages.config
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj
index ce0486578..5c70012d3 100644
--- a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj
+++ b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj
@@ -58,11 +58,11 @@
..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll
-
- ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll
+
+ ..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll
-
- ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll
+
+ ..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll
..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll
diff --git a/src/Greenshot.Addon.OCR/packages.config b/src/Greenshot.Addon.OCR/packages.config
index f06a2e23f..5fd2ee2d7 100644
--- a/src/Greenshot.Addon.OCR/packages.config
+++ b/src/Greenshot.Addon.OCR/packages.config
@@ -6,8 +6,8 @@
-
-
+
+
diff --git a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj
index dd3d9ef98..4e789a4eb 100644
--- a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj
+++ b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj
@@ -45,11 +45,11 @@
..\packages\Costura.Fody.3.0.0\lib\net46\Costura.dll
-
- ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll
+
+ ..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll
-
- ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll
+
+ ..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll
..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll
diff --git a/src/Greenshot.Addon.Office/packages.config b/src/Greenshot.Addon.Office/packages.config
index 6c116c60f..2200cce0c 100644
--- a/src/Greenshot.Addon.Office/packages.config
+++ b/src/Greenshot.Addon.Office/packages.config
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj
index 92b4b975c..fb29c3993 100644
--- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj
+++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj
@@ -57,11 +57,11 @@
..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll
-
- ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll
+
+ ..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll
-
- ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll
+
+ ..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll
..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll
diff --git a/src/Greenshot.Addon.OneDrive/packages.config b/src/Greenshot.Addon.OneDrive/packages.config
index 891934ddb..6ad49afd5 100644
--- a/src/Greenshot.Addon.OneDrive/packages.config
+++ b/src/Greenshot.Addon.OneDrive/packages.config
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj
index e18effac0..624052717 100644
--- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj
+++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj
@@ -58,11 +58,11 @@
..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll
-
- ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll
+
+ ..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll
-
- ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll
+
+ ..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll
..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll
diff --git a/src/Greenshot.Addon.Photobucket/packages.config b/src/Greenshot.Addon.Photobucket/packages.config
index f85304ab4..c2642c560 100644
--- a/src/Greenshot.Addon.Photobucket/packages.config
+++ b/src/Greenshot.Addon.Photobucket/packages.config
@@ -6,8 +6,8 @@
-
-
+
+
diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
index 1da984e8d..399bf3fe8 100644
--- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
+++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
@@ -57,11 +57,11 @@
..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll
-
- ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll
+
+ ..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll
-
- ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll
+
+ ..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll
..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll
diff --git a/src/Greenshot.Addon.Tfs/packages.config b/src/Greenshot.Addon.Tfs/packages.config
index 29e381555..989f16766 100644
--- a/src/Greenshot.Addon.Tfs/packages.config
+++ b/src/Greenshot.Addon.Tfs/packages.config
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
index d5aab8504..4fa23ff9c 100644
--- a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
+++ b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
@@ -54,11 +54,11 @@
..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll
-
- ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll
+
+ ..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll
-
- ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll
+
+ ..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll
..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll
@@ -81,35 +81,35 @@
..\packages\Dapplo.Utils.1.0.158\lib\net45\Dapplo.Utils.dll
-
- ..\packages\Dapplo.Windows.0.5.79\lib\net46\Dapplo.Windows.dll
+
+ ..\packages\Dapplo.Windows.0.5.80\lib\net46\Dapplo.Windows.dll
-
- ..\packages\Dapplo.Windows.Clipboard.0.5.79\lib\net46\Dapplo.Windows.Clipboard.dll
+
+ ..\packages\Dapplo.Windows.Clipboard.0.5.80\lib\net46\Dapplo.Windows.Clipboard.dll
-
- ..\packages\Dapplo.Windows.Common.0.5.79\lib\net46\Dapplo.Windows.Common.dll
+
+ ..\packages\Dapplo.Windows.Common.0.5.80\lib\net46\Dapplo.Windows.Common.dll
-
- ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.79\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll
+
+ ..\packages\Dapplo.Windows.DesktopWindowsManager.0.5.80\lib\net46\Dapplo.Windows.DesktopWindowsManager.dll
-
- ..\packages\Dapplo.Windows.Dpi.0.5.79\lib\net46\Dapplo.Windows.Dpi.dll
+
+ ..\packages\Dapplo.Windows.Dpi.0.5.80\lib\net46\Dapplo.Windows.Dpi.dll
-
- ..\packages\Dapplo.Windows.Gdi32.0.5.79\lib\net46\Dapplo.Windows.Gdi32.dll
+
+ ..\packages\Dapplo.Windows.Gdi32.0.5.80\lib\net46\Dapplo.Windows.Gdi32.dll
-
- ..\packages\Dapplo.Windows.Input.0.5.79\lib\net46\Dapplo.Windows.Input.dll
+
+ ..\packages\Dapplo.Windows.Input.0.5.80\lib\net46\Dapplo.Windows.Input.dll
-
- ..\packages\Dapplo.Windows.Kernel32.0.5.79\lib\net46\Dapplo.Windows.Kernel32.dll
+
+ ..\packages\Dapplo.Windows.Kernel32.0.5.80\lib\net46\Dapplo.Windows.Kernel32.dll
-
- ..\packages\Dapplo.Windows.Messages.0.5.79\lib\net46\Dapplo.Windows.Messages.dll
+
+ ..\packages\Dapplo.Windows.Messages.0.5.80\lib\net46\Dapplo.Windows.Messages.dll
-
- ..\packages\Dapplo.Windows.User32.0.5.79\lib\net46\Dapplo.Windows.User32.dll
+
+ ..\packages\Dapplo.Windows.User32.0.5.80\lib\net46\Dapplo.Windows.User32.dll
diff --git a/src/Greenshot.Addon.Win10/packages.config b/src/Greenshot.Addon.Win10/packages.config
index 732c1eeb9..a85825c5a 100644
--- a/src/Greenshot.Addon.Win10/packages.config
+++ b/src/Greenshot.Addon.Win10/packages.config
@@ -6,8 +6,8 @@
-
-
+
+
@@ -15,15 +15,15 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj
index 12c345e7b..925bb302d 100644
--- a/src/Greenshot.Addons/Greenshot.Addons.csproj
+++ b/src/Greenshot.Addons/Greenshot.Addons.csproj
@@ -41,11 +41,11 @@
..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll
-
- ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll
+
+ ..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll
-
- ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll
+
+ ..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll
..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll
diff --git a/src/Greenshot.Addons/packages.config b/src/Greenshot.Addons/packages.config
index af0d70df4..27b0fd75b 100644
--- a/src/Greenshot.Addons/packages.config
+++ b/src/Greenshot.Addons/packages.config
@@ -6,8 +6,8 @@
-
-
+
+
diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj
index 900544401..73aee57ca 100644
--- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj
+++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj
@@ -37,11 +37,11 @@
..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll
-
- ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll
+
+ ..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll
-
- ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll
+
+ ..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll
..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll
diff --git a/src/Greenshot.Gfx/packages.config b/src/Greenshot.Gfx/packages.config
index 5dcfd3462..dec2dec4c 100644
--- a/src/Greenshot.Gfx/packages.config
+++ b/src/Greenshot.Gfx/packages.config
@@ -6,8 +6,8 @@
-
-
+
+
diff --git a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj
index f54596d42..84717d010 100644
--- a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj
+++ b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj
@@ -42,11 +42,11 @@
..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll
-
- ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll
+
+ ..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll
-
- ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll
+
+ ..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll
..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll
diff --git a/src/Greenshot.PerformanceTests/packages.config b/src/Greenshot.PerformanceTests/packages.config
index d005bc06b..9f457dd81 100644
--- a/src/Greenshot.PerformanceTests/packages.config
+++ b/src/Greenshot.PerformanceTests/packages.config
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj
index 2995b6d23..832d747a5 100644
--- a/src/Greenshot.Tests/Greenshot.Tests.csproj
+++ b/src/Greenshot.Tests/Greenshot.Tests.csproj
@@ -71,11 +71,11 @@
..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll
-
- ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll
+
+ ..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll
-
- ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll
+
+ ..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll
..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll
diff --git a/src/Greenshot.Tests/packages.config b/src/Greenshot.Tests/packages.config
index fabd8d64f..b6ba60cfc 100644
--- a/src/Greenshot.Tests/packages.config
+++ b/src/Greenshot.Tests/packages.config
@@ -10,8 +10,8 @@
-
-
+
+
diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj
index 825e4a6d1..be50467e6 100644
--- a/src/Greenshot/Greenshot.csproj
+++ b/src/Greenshot/Greenshot.csproj
@@ -58,14 +58,14 @@
..\packages\Costura.Fody.3.0.0\lib\net46\Costura.dll
-
- ..\packages\Dapplo.Addons.1.0.47\lib\net45\Dapplo.Addons.dll
+
+ ..\packages\Dapplo.Addons.1.0.50\lib\net45\Dapplo.Addons.dll
-
- ..\packages\Dapplo.Addons.Bootstrapper.1.0.47\lib\net45\Dapplo.Addons.Bootstrapper.dll
+
+ ..\packages\Dapplo.Addons.Bootstrapper.1.0.50\lib\net45\Dapplo.Addons.Bootstrapper.dll
-
- ..\packages\Dapplo.Addons.Config.1.0.47\lib\net45\Dapplo.Addons.Config.dll
+
+ ..\packages\Dapplo.Addons.Config.1.0.50\lib\net45\Dapplo.Addons.Config.dll
..\packages\Dapplo.CaliburnMicro.1.0.47\lib\net46\Dapplo.CaliburnMicro.dll
diff --git a/src/Greenshot/Startup.cs b/src/Greenshot/Startup.cs
index 24b22ff9f..778bbe1df 100644
--- a/src/Greenshot/Startup.cs
+++ b/src/Greenshot/Startup.cs
@@ -38,6 +38,7 @@ using Dapplo.Ini.Converters;
using Dapplo.Language;
using Dapplo.Log;
using Dapplo.Log.Loggers;
+using Dapplo.Windows.Dpi.Forms;
using Dapplo.Windows.Kernel32;
using Greenshot.Addons;
using Greenshot.Addons.Core;
@@ -70,7 +71,7 @@ namespace Greenshot
#endif
var applicationConfig = ApplicationConfig.Create()
.WithApplicationName("Greenshot")
- .WithMutex("F48E86D3-E34C-4DB7-8F8F-9A0EA55F0D08")
+ .WithMutex("F48E86D3-E34C-4DB7-8F8F-9A0EA55F0D08", false)
.WithAssemblyNames("Dapplo.Addons.Config")
.WithAssemblyPatterns("Greenshot.Addon*");
@@ -159,7 +160,7 @@ namespace Greenshot
IGreenshotLanguage language = null;
// A dirty fix to make sure the messagebox is visible as a Greenshot window on the taskbar
- using (var multiInstanceForm = new Form
+ using (var multiInstanceForm = new DpiAwareForm
{
Icon = GreenshotResources.GetGreenshotIcon(),
ShowInTaskbar = true,
@@ -207,7 +208,7 @@ namespace Greenshot
{
Text = language.TranslationOrDefault(l => l.BugreportCancel),
Dock = DockStyle.Bottom,
- Height = 20
+ Height = 25
};
flowLayoutPanel.Controls.Add(cancelButton);
multiInstanceForm.Controls.Add(flowLayoutPanel);
diff --git a/src/Greenshot/packages.config b/src/Greenshot/packages.config
index 0b1daded8..df5284bf7 100644
--- a/src/Greenshot/packages.config
+++ b/src/Greenshot/packages.config
@@ -11,9 +11,9 @@
-
-
-
+
+
+