From 94f4211cc84331c6300c2160ebc7baa9c1ed3f50 Mon Sep 17 00:00:00 2001 From: Robin Date: Wed, 20 Jun 2018 00:28:40 +0200 Subject: [PATCH] Made the mutex work again, the error was in Dapplo.Addons --- .../Greenshot.Addon.Box.csproj | 8 ++-- src/Greenshot.Addon.Box/packages.config | 4 +- .../Greenshot.Addon.Confluence.csproj | 8 ++-- .../packages.config | 4 +- .../Greenshot.Addon.Dropbox.csproj | 8 ++-- src/Greenshot.Addon.Dropbox/packages.config | 4 +- .../Greenshot.Addon.ExternalCommand.csproj | 8 ++-- .../packages.config | 4 +- .../Greenshot.Addon.Flickr.csproj | 8 ++-- src/Greenshot.Addon.Flickr/packages.config | 4 +- .../Greenshot.Addon.GooglePhotos.csproj | 8 ++-- .../packages.config | 4 +- .../Greenshot.Addon.Imgur.csproj | 8 ++-- src/Greenshot.Addon.Imgur/IImgurLanguage.cs | 2 + .../ViewModels/ImgurConfigViewModel.cs | 9 ++++ .../Views/ImgurConfigView.xaml | 1 + src/Greenshot.Addon.Imgur/packages.config | 4 +- .../Greenshot.Addon.Jira.csproj | 8 ++-- src/Greenshot.Addon.Jira/packages.config | 4 +- .../Greenshot.Addon.LegacyEditor.csproj | 8 ++-- .../packages.config | 4 +- .../Greenshot.Addon.Lutim.csproj | 8 ++-- src/Greenshot.Addon.Lutim/packages.config | 4 +- .../Greenshot.Addon.OCR.csproj | 8 ++-- src/Greenshot.Addon.OCR/packages.config | 4 +- .../Greenshot.Addon.Office.csproj | 8 ++-- src/Greenshot.Addon.Office/packages.config | 4 +- .../Greenshot.Addon.OneDrive.csproj | 8 ++-- src/Greenshot.Addon.OneDrive/packages.config | 4 +- .../Greenshot.Addon.Photobucket.csproj | 8 ++-- .../packages.config | 4 +- .../Greenshot.Addon.Tfs.csproj | 8 ++-- src/Greenshot.Addon.Tfs/packages.config | 4 +- .../Greenshot.Addon.Win10.csproj | 48 +++++++++---------- src/Greenshot.Addon.Win10/packages.config | 24 +++++----- src/Greenshot.Addons/Greenshot.Addons.csproj | 8 ++-- src/Greenshot.Addons/packages.config | 4 +- src/Greenshot.Gfx/Greenshot.Gfx.csproj | 8 ++-- src/Greenshot.Gfx/packages.config | 4 +- .../Greenshot.PerformanceTests.csproj | 8 ++-- .../packages.config | 4 +- src/Greenshot.Tests/Greenshot.Tests.csproj | 8 ++-- src/Greenshot.Tests/packages.config | 4 +- src/Greenshot/Greenshot.csproj | 12 ++--- src/Greenshot/Startup.cs | 7 +-- src/Greenshot/packages.config | 6 +-- 46 files changed, 175 insertions(+), 162 deletions(-) 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 @@