From f27fcb4ab26ccd67fc757a0bcc8314848d4d83e0 Mon Sep 17 00:00:00 2001 From: Robin Date: Wed, 25 Apr 2018 15:59:53 +0200 Subject: [PATCH] Small fixes and package updates. --- src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj | 12 ++++++------ src/Greenshot.Addon.Box/packages.config | 6 +++--- .../Greenshot.Addon.Confluence.csproj | 12 ++++++------ src/Greenshot.Addon.Confluence/packages.config | 6 +++--- .../Greenshot.Addon.Dropbox.csproj | 12 ++++++------ src/Greenshot.Addon.Dropbox/packages.config | 6 +++--- .../Greenshot.Addon.Flickr.csproj | 8 ++++---- src/Greenshot.Addon.Flickr/packages.config | 4 ++-- .../Greenshot.Addon.GooglePhotos.csproj | 8 ++++---- src/Greenshot.Addon.GooglePhotos/packages.config | 4 ++-- .../Greenshot.Addon.Imgur.csproj | 12 ++++++------ src/Greenshot.Addon.Imgur/packages.config | 6 +++--- src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj | 12 ++++++------ src/Greenshot.Addon.Jira/JiraDestination.cs | 12 ++++++++---- src/Greenshot.Addon.Jira/packages.config | 6 +++--- .../Greenshot.Addon.Lutim.csproj | 8 ++++---- src/Greenshot.Addon.Lutim/packages.config | 4 ++-- .../Greenshot.Addon.OneDrive.csproj | 12 ++++++------ src/Greenshot.Addon.OneDrive/packages.config | 6 +++--- .../Greenshot.Addon.Photobucket.csproj | 8 ++++---- src/Greenshot.Addon.Photobucket/packages.config | 4 ++-- src/Greenshot.Addons/Greenshot.Addons.csproj | 12 ++++++------ src/Greenshot.Addons/packages.config | 6 +++--- .../Greenshot.PerformanceTests.csproj | 4 ++-- src/Greenshot.PerformanceTests/packages.config | 2 +- src/Greenshot.Tests/Greenshot.Tests.csproj | 4 ++-- src/Greenshot.Tests/packages.config | 2 +- src/Greenshot/Destinations/EmailDestination.cs | 3 ++- src/Greenshot/Greenshot.csproj | 12 ++++++------ src/Greenshot/Ui/Configuration/Views/ConfigView.xaml | 2 +- src/Greenshot/packages.config | 6 +++--- 31 files changed, 113 insertions(+), 108 deletions(-) diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj index 60ea61942..1b73815bb 100644 --- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj +++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj @@ -61,14 +61,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.0.5.28\lib\net45\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.34\lib\net45\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.34\lib\net45\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net45\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.34\lib\net45\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.24\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Addon.Box/packages.config b/src/Greenshot.Addon.Box/packages.config index a76f6c7d2..004dc56b8 100644 --- a/src/Greenshot.Addon.Box/packages.config +++ b/src/Greenshot.Addon.Box/packages.config @@ -11,9 +11,9 @@ - - - + + + diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj index ef5cab6f7..a6ecdb814 100644 --- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj +++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj @@ -83,14 +83,14 @@ ..\packages\Dapplo.Confluence.0.7.19\lib\net45\Dapplo.Confluence.dll - - ..\packages\Dapplo.HttpExtensions.0.8.34\lib\net45\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonSimple.0.8.34\lib\net45\Dapplo.HttpExtensions.JsonSimple.dll + + ..\packages\Dapplo.HttpExtensions.JsonSimple.0.8.35\lib\net45\Dapplo.HttpExtensions.JsonSimple.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.34\lib\net45\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.24\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Addon.Confluence/packages.config b/src/Greenshot.Addon.Confluence/packages.config index 069c27d0a..03221a47c 100644 --- a/src/Greenshot.Addon.Confluence/packages.config +++ b/src/Greenshot.Addon.Confluence/packages.config @@ -13,9 +13,9 @@ - - - + + + diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj index f03840b34..54ad9e046 100644 --- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj +++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj @@ -73,14 +73,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.0.5.28\lib\net45\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.34\lib\net45\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.34\lib\net45\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net45\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.34\lib\net45\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.24\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Addon.Dropbox/packages.config b/src/Greenshot.Addon.Dropbox/packages.config index a76f6c7d2..004dc56b8 100644 --- a/src/Greenshot.Addon.Dropbox/packages.config +++ b/src/Greenshot.Addon.Dropbox/packages.config @@ -11,9 +11,9 @@ - - - + + + diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj index 5af82eacd..5bfe9a399 100644 --- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj +++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj @@ -73,11 +73,11 @@ ..\packages\Dapplo.CaliburnMicro.Translations.0.5.28\lib\net45\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.34\lib\net45\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.34\lib\net45\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.24\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Addon.Flickr/packages.config b/src/Greenshot.Addon.Flickr/packages.config index b0446e64a..e29e17369 100644 --- a/src/Greenshot.Addon.Flickr/packages.config +++ b/src/Greenshot.Addon.Flickr/packages.config @@ -11,8 +11,8 @@ - - + + diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj index 41d19b8ed..1c073d8a6 100644 --- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj +++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj @@ -59,11 +59,11 @@ ..\packages\Dapplo.CaliburnMicro.Translations.0.5.28\lib\net45\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.34\lib\net45\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.34\lib\net45\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.24\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Addon.GooglePhotos/packages.config b/src/Greenshot.Addon.GooglePhotos/packages.config index b0446e64a..e29e17369 100644 --- a/src/Greenshot.Addon.GooglePhotos/packages.config +++ b/src/Greenshot.Addon.GooglePhotos/packages.config @@ -11,8 +11,8 @@ - - + + diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj index d9b7e58e0..51cd52cbb 100644 --- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj +++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj @@ -78,14 +78,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.0.5.28\lib\net45\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.34\lib\net45\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.34\lib\net45\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net45\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.34\lib\net45\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.24\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Addon.Imgur/packages.config b/src/Greenshot.Addon.Imgur/packages.config index 05265b8db..9920ac5d5 100644 --- a/src/Greenshot.Addon.Imgur/packages.config +++ b/src/Greenshot.Addon.Imgur/packages.config @@ -12,9 +12,9 @@ - - - + + + diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj index d7f544d69..3b49c76fa 100644 --- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj +++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj @@ -78,14 +78,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.0.5.28\lib\net45\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.34\lib\net45\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.34\lib\net45\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net45\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.34\lib\net45\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.24\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Addon.Jira/JiraDestination.cs b/src/Greenshot.Addon.Jira/JiraDestination.cs index 553d4714b..07644d152 100644 --- a/src/Greenshot.Addon.Jira/JiraDestination.cs +++ b/src/Greenshot.Addon.Jira/JiraDestination.cs @@ -126,16 +126,20 @@ namespace Greenshot.Addon.Jira } } - public override IEnumerable DynamicDestinations() - { + IEnumerable DynamicDestinations() + { if (_jiraConnector == null || !_jiraConnector.IsLoggedIn) { yield break; } foreach (var jiraDetails in _jiraConnector.RecentJiras) { - yield return new JiraDestination(_jiraConfiguration, _jiraLanguage, _jiraConnector, jiraDetails.JiraIssue, _windowManager); - } + yield return new JiraDestination(_jiraConfiguration, _jiraLanguage, _jiraConnector, jiraDetails.JiraIssue, _windowManager) + { + CoreConfiguration = CoreConfiguration, + GreenshotLanguage = GreenshotLanguage + }; + } } protected override ExportInformation ExportCapture(bool manuallyInitiated, ISurface surface, ICaptureDetails captureDetails) diff --git a/src/Greenshot.Addon.Jira/packages.config b/src/Greenshot.Addon.Jira/packages.config index 317d4524c..a34197b3e 100644 --- a/src/Greenshot.Addon.Jira/packages.config +++ b/src/Greenshot.Addon.Jira/packages.config @@ -12,9 +12,9 @@ - - - + + + diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj index 6d6e1233b..de81ad179 100644 --- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj +++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj @@ -76,11 +76,11 @@ ..\packages\Dapplo.CaliburnMicro.Translations.0.5.28\lib\net45\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.34\lib\net45\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.34\lib\net45\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net45\Dapplo.HttpExtensions.JsonNet.dll ..\packages\Dapplo.Ini.0.5.24\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Addon.Lutim/packages.config b/src/Greenshot.Addon.Lutim/packages.config index e57360094..cd78e14dd 100644 --- a/src/Greenshot.Addon.Lutim/packages.config +++ b/src/Greenshot.Addon.Lutim/packages.config @@ -12,8 +12,8 @@ - - + + diff --git a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj index b499b7a83..8c480bc95 100644 --- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj +++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj @@ -72,14 +72,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.0.5.28\lib\net45\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.34\lib\net45\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.34\lib\net45\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net45\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.34\lib\net45\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.24\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Addon.OneDrive/packages.config b/src/Greenshot.Addon.OneDrive/packages.config index a76f6c7d2..004dc56b8 100644 --- a/src/Greenshot.Addon.OneDrive/packages.config +++ b/src/Greenshot.Addon.OneDrive/packages.config @@ -11,9 +11,9 @@ - - - + + + diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj index 23d63f8ff..4d1bb5fe1 100644 --- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj +++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj @@ -73,11 +73,11 @@ ..\packages\Dapplo.CaliburnMicro.Translations.0.5.28\lib\net45\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.34\lib\net45\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.34\lib\net45\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.24\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Addon.Photobucket/packages.config b/src/Greenshot.Addon.Photobucket/packages.config index b0446e64a..e29e17369 100644 --- a/src/Greenshot.Addon.Photobucket/packages.config +++ b/src/Greenshot.Addon.Photobucket/packages.config @@ -11,8 +11,8 @@ - - + + diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index a9525ba40..2ea6920cf 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -55,14 +55,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.0.5.28\lib\net45\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.34\lib\net45\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.34\lib\net45\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net45\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.34\lib\net45\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.24\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot.Addons/packages.config b/src/Greenshot.Addons/packages.config index dae7ffd69..6c0a9d7e5 100644 --- a/src/Greenshot.Addons/packages.config +++ b/src/Greenshot.Addons/packages.config @@ -11,9 +11,9 @@ - - - + + + diff --git a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj index 5c0607da6..864b18dcc 100644 --- a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj +++ b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj @@ -114,8 +114,8 @@ - - ..\packages\System.Console.4.3.0\lib\net46\System.Console.dll + + ..\packages\System.Console.4.3.1\lib\net46\System.Console.dll diff --git a/src/Greenshot.PerformanceTests/packages.config b/src/Greenshot.PerformanceTests/packages.config index 0bf57e52e..b61e2fde2 100644 --- a/src/Greenshot.PerformanceTests/packages.config +++ b/src/Greenshot.PerformanceTests/packages.config @@ -34,7 +34,7 @@ - + diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index 455d7ea09..a014d7b93 100644 --- a/src/Greenshot.Tests/Greenshot.Tests.csproj +++ b/src/Greenshot.Tests/Greenshot.Tests.csproj @@ -140,8 +140,8 @@ - - ..\packages\System.Console.4.3.0\lib\net46\System.Console.dll + + ..\packages\System.Console.4.3.1\lib\net46\System.Console.dll diff --git a/src/Greenshot.Tests/packages.config b/src/Greenshot.Tests/packages.config index 1bf9c5f3b..37e3d8dd2 100644 --- a/src/Greenshot.Tests/packages.config +++ b/src/Greenshot.Tests/packages.config @@ -34,7 +34,7 @@ - + diff --git a/src/Greenshot/Destinations/EmailDestination.cs b/src/Greenshot/Destinations/EmailDestination.cs index eb27599e1..0598fca5d 100644 --- a/src/Greenshot/Destinations/EmailDestination.cs +++ b/src/Greenshot/Destinations/EmailDestination.cs @@ -68,7 +68,8 @@ namespace Greenshot.Destinations // Make sure there is some kind of "mail" name if (_mapiClient == null) { - _mapiClient = Language.GetString(LangKey.editor_email); + // TODO: Change language + _mapiClient = "Email"; //GreenshotLanguage.editor_email; } return _mapiClient; } diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index 5ce8ab2bd..53531a092 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -71,14 +71,14 @@ ..\packages\Dapplo.CaliburnMicro.Translations.0.5.28\lib\net45\Dapplo.CaliburnMicro.Translations.dll - - ..\packages\Dapplo.HttpExtensions.0.8.34\lib\net45\Dapplo.HttpExtensions.dll + + ..\packages\Dapplo.HttpExtensions.0.8.35\lib\net45\Dapplo.HttpExtensions.dll - - ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.34\lib\net45\Dapplo.HttpExtensions.JsonNet.dll + + ..\packages\Dapplo.HttpExtensions.JsonNet.0.8.35\lib\net45\Dapplo.HttpExtensions.JsonNet.dll - - ..\packages\Dapplo.HttpExtensions.OAuth.0.8.34\lib\net45\Dapplo.HttpExtensions.OAuth.dll + + ..\packages\Dapplo.HttpExtensions.OAuth.0.8.35\lib\net45\Dapplo.HttpExtensions.OAuth.dll ..\packages\Dapplo.Ini.0.5.24\lib\net45\Dapplo.Ini.dll diff --git a/src/Greenshot/Ui/Configuration/Views/ConfigView.xaml b/src/Greenshot/Ui/Configuration/Views/ConfigView.xaml index 6a87ce09a..99a48a246 100644 --- a/src/Greenshot/Ui/Configuration/Views/ConfigView.xaml +++ b/src/Greenshot/Ui/Configuration/Views/ConfigView.xaml @@ -12,7 +12,7 @@ xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:ConfigViewModel,IsDesignTimeCreatable=False}" - ResizeMode="NoResize" SizeToContent="Width" Width="700" MinWidth="700" MaxWidth="1000" Height="500"> + ResizeMode="CanResizeWithGrip" SizeToContent="Width" Width="700" MinWidth="700" MaxWidth="1000" Height="500"> diff --git a/src/Greenshot/packages.config b/src/Greenshot/packages.config index 0af37d35b..edb337fe7 100644 --- a/src/Greenshot/packages.config +++ b/src/Greenshot/packages.config @@ -16,9 +16,9 @@ - - - + + +