From 384749ffd60102767ec2186f25a5cdba3cd953ec Mon Sep 17 00:00:00 2001 From: Robin Date: Thu, 8 Nov 2018 10:42:11 +0100 Subject: [PATCH] Making Box and Dropbox available again, not tested if they work though. --- src/Greenshot.Addon.Box/BoxAddonModule.cs | 12 +- src/Greenshot.Addon.Box/BoxDestination.cs | 1 + .../{ => Configuration}/IBoxConfiguration.cs | 7 +- .../{ => Configuration}/IBoxLanguage.cs | 7 +- .../Impl/BoxConfigurationImpl.cs | 73 +++++++++ .../Configuration/Impl/BoxLanguageImpl.cs | 44 ++++++ src/Greenshot.Addon.Box/FodyWeavers.xml | 4 + .../Greenshot.Addon.Box.csproj | 144 +++++------------- .../Properties/AssemblyInfo.cs | 53 ------- .../ViewModels/BoxConfigViewModel.cs | 1 + .../IDropboxConfiguration.cs | 7 +- .../{ => Configuration}/IDropboxLanguage.cs | 4 +- .../Impl/DropboxConfigurationImpl.cs | 67 ++++++++ .../Configuration/Impl/DropboxLanguageImpl.cs | 40 +++++ .../DropboxAddonModule.cs | 12 +- .../DropboxDestination.cs | 1 + .../Entities/ErrorTag.cs | 21 ++- .../Entities/SharingInfo.cs | 21 ++- src/Greenshot.Addon.Dropbox/FodyWeavers.xml | 4 + .../Greenshot.Addon.Dropbox.csproj | 134 ++++------------ .../Properties/AssemblyInfo.cs | 53 ------- .../ViewModels/DropboxConfigViewModel.cs | 1 + src/Greenshot.Addon.Dropbox/app.config | 31 +--- .../EditorAddonModule.cs | 4 +- .../Greenshot.Addon.LegacyEditor.csproj | 93 +---------- .../Greenshot.Addon.OcrCommand.csproj | 76 ++------- .../Properties/AssemblyInfo.cs | 35 ----- src/Greenshot.Addons/AddonsModule.cs | 6 +- src/Greenshot.Addons/Greenshot.Addons.csproj | 16 +- src/Greenshot.Tests/Greenshot.Tests.csproj | 8 +- src/Greenshot.Tests/IniTests.cs | 18 +-- src/Greenshot.sln | 24 +-- src/Greenshot/Forms/MainForm.cs | 1 - src/Greenshot/Greenshot.csproj | 22 +-- src/Greenshot/GreenshotAutofacModule.cs | 4 +- src/NuGet.Config | 6 +- 36 files changed, 432 insertions(+), 623 deletions(-) rename src/Greenshot.Addon.Box/{ => Configuration}/IBoxConfiguration.cs (90%) rename src/Greenshot.Addon.Box/{ => Configuration}/IBoxLanguage.cs (87%) create mode 100644 src/Greenshot.Addon.Box/Configuration/Impl/BoxConfigurationImpl.cs create mode 100644 src/Greenshot.Addon.Box/Configuration/Impl/BoxLanguageImpl.cs create mode 100644 src/Greenshot.Addon.Box/FodyWeavers.xml delete mode 100644 src/Greenshot.Addon.Box/Properties/AssemblyInfo.cs rename src/Greenshot.Addon.Dropbox/{ => Configuration}/IDropboxConfiguration.cs (89%) rename src/Greenshot.Addon.Dropbox/{ => Configuration}/IDropboxLanguage.cs (91%) create mode 100644 src/Greenshot.Addon.Dropbox/Configuration/Impl/DropboxConfigurationImpl.cs create mode 100644 src/Greenshot.Addon.Dropbox/Configuration/Impl/DropboxLanguageImpl.cs create mode 100644 src/Greenshot.Addon.Dropbox/FodyWeavers.xml delete mode 100644 src/Greenshot.Addon.Dropbox/Properties/AssemblyInfo.cs delete mode 100644 src/Greenshot.Addon.OcrCommand/Properties/AssemblyInfo.cs diff --git a/src/Greenshot.Addon.Box/BoxAddonModule.cs b/src/Greenshot.Addon.Box/BoxAddonModule.cs index 604c08d5c..2b59028b0 100644 --- a/src/Greenshot.Addon.Box/BoxAddonModule.cs +++ b/src/Greenshot.Addon.Box/BoxAddonModule.cs @@ -24,8 +24,10 @@ using Autofac; using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; -using Dapplo.Ini; -using Dapplo.Language; +using Dapplo.Config.Ini; +using Dapplo.Config.Language; +using Greenshot.Addon.Box.Configuration; +using Greenshot.Addon.Box.Configuration.Impl; using Greenshot.Addon.Box.ViewModels; using Greenshot.Addons.Components; @@ -37,13 +39,15 @@ namespace Greenshot.Addon.Box protected override void Load(ContainerBuilder builder) { builder - .Register(context => IniConfig.Current.Get()) + .RegisterType() .As() + .As() .SingleInstance(); builder - .Register(context => LanguageLoader.Current.Get()) + .RegisterType() .As() + .As() .SingleInstance(); builder diff --git a/src/Greenshot.Addon.Box/BoxDestination.cs b/src/Greenshot.Addon.Box/BoxDestination.cs index a5059f906..b1c0481e4 100644 --- a/src/Greenshot.Addon.Box/BoxDestination.cs +++ b/src/Greenshot.Addon.Box/BoxDestination.cs @@ -39,6 +39,7 @@ using Dapplo.HttpExtensions.OAuth; using Dapplo.Log; using Dapplo.Utils; using Dapplo.Windows.Clipboard; +using Greenshot.Addon.Box.Configuration; using Greenshot.Addon.Box.Entities; using Greenshot.Addons; using Greenshot.Addons.Components; diff --git a/src/Greenshot.Addon.Box/IBoxConfiguration.cs b/src/Greenshot.Addon.Box/Configuration/IBoxConfiguration.cs similarity index 90% rename from src/Greenshot.Addon.Box/IBoxConfiguration.cs rename to src/Greenshot.Addon.Box/Configuration/IBoxConfiguration.cs index 1f71beb71..d83f79b2b 100644 --- a/src/Greenshot.Addon.Box/IBoxConfiguration.cs +++ b/src/Greenshot.Addon.Box/Configuration/IBoxConfiguration.cs @@ -25,21 +25,20 @@ using System.ComponentModel; using System.Runtime.Serialization; +using Dapplo.Config.Ini; using Dapplo.HttpExtensions.OAuth; -using Dapplo.Ini; -using Dapplo.InterfaceImpl.Extensions; using Greenshot.Addons.Core; #endregion -namespace Greenshot.Addon.Box +namespace Greenshot.Addon.Box.Configuration { /// /// Description of ImgurConfiguration. /// [IniSection("Box")] [Description("Greenshot Box Plugin configuration")] - public interface IBoxConfiguration : IIniSection, IDestinationFileConfiguration, INotifyPropertyChanged, ITransactionalProperties, IOAuth2Token + public interface IBoxConfiguration : IIniSection, IDestinationFileConfiguration, IOAuth2Token { [Description("After upload send Box link to clipboard.")] [DefaultValue(true)] diff --git a/src/Greenshot.Addon.Box/IBoxLanguage.cs b/src/Greenshot.Addon.Box/Configuration/IBoxLanguage.cs similarity index 87% rename from src/Greenshot.Addon.Box/IBoxLanguage.cs rename to src/Greenshot.Addon.Box/Configuration/IBoxLanguage.cs index e94152d6e..4ae0e6803 100644 --- a/src/Greenshot.Addon.Box/IBoxLanguage.cs +++ b/src/Greenshot.Addon.Box/Configuration/IBoxLanguage.cs @@ -21,13 +21,12 @@ #endregion -using System.ComponentModel; -using Dapplo.Language; +using Dapplo.Config.Language; -namespace Greenshot.Addon.Box +namespace Greenshot.Addon.Box.Configuration { [Language("Box")] - public interface IBoxLanguage : ILanguage, INotifyPropertyChanged + public interface IBoxLanguage : ILanguage { string CommunicationWait { get; } diff --git a/src/Greenshot.Addon.Box/Configuration/Impl/BoxConfigurationImpl.cs b/src/Greenshot.Addon.Box/Configuration/Impl/BoxConfigurationImpl.cs new file mode 100644 index 000000000..e937520ba --- /dev/null +++ b/src/Greenshot.Addon.Box/Configuration/Impl/BoxConfigurationImpl.cs @@ -0,0 +1,73 @@ +#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 + +using System; +using Dapplo.Config.Ini; +using Greenshot.Core.Enums; + +namespace Greenshot.Addon.Box.Configuration.Impl +{ + public class BoxConfigurationImpl : IniSectionBase, IBoxConfiguration + { + #region Implementation of IFileConfiguration + + public string OutputFilePath { get; set; } + public bool OutputFileAllowOverwrite { get; set; } + public string OutputFileFilenamePattern { get; set; } + public OutputFormats OutputFileFormat { get; set; } + public bool OutputFileReduceColors { get; set; } + public bool OutputFileAutoReduceColors { get; set; } + public int OutputFileReduceColorsTo { get; set; } + public int OutputFileJpegQuality { get; set; } + public bool OutputFilePromptQuality { get; set; } + public uint OutputFileIncrementingNumber { get; set; } + public string OptimizePNGCommand { get; set; } + public string OptimizePNGCommandArguments { get; set; } + + #endregion + + #region Implementation of IDestinationFileConfiguration + + public bool UseOwnSettings { get; set; } + + #endregion + + #region Implementation of IOAuth2Token + + public string OAuth2AccessToken { get; set; } + public DateTimeOffset OAuth2AccessTokenExpires { get; set; } + public string OAuth2RefreshToken { get; set; } + + #endregion + + #region Implementation of IBoxConfiguration + + public bool AfterUploadLinkToClipBoard { get; set; } + public bool UseSharedLink { get; set; } + public string FolderId { get; set; } + public string ClientId { get; set; } + public string ClientSecret { get; set; } + + #endregion + } +} diff --git a/src/Greenshot.Addon.Box/Configuration/Impl/BoxLanguageImpl.cs b/src/Greenshot.Addon.Box/Configuration/Impl/BoxLanguageImpl.cs new file mode 100644 index 000000000..f39727e7f --- /dev/null +++ b/src/Greenshot.Addon.Box/Configuration/Impl/BoxLanguageImpl.cs @@ -0,0 +1,44 @@ +#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 + +using Dapplo.Config.Language; + +namespace Greenshot.Addon.Box.Configuration.Impl +{ + public class BoxLanguageImpl : LanguageBase, IBoxLanguage + { + #region Implementation of IBoxLanguage + + public string CommunicationWait { get; } + public string Configure { get; } + public string LabelAfterUpload { get; } + public string LabelAfterUploadLinkToClipBoard { get; } + public string LabelUploadFormat { get; } + public string SettingsTitle { get; } + public string UploadFailure { get; } + public string UploadMenuItem { get; } + public string UploadSuccess { get; } + + #endregion + } +} diff --git a/src/Greenshot.Addon.Box/FodyWeavers.xml b/src/Greenshot.Addon.Box/FodyWeavers.xml new file mode 100644 index 000000000..c7704e778 --- /dev/null +++ b/src/Greenshot.Addon.Box/FodyWeavers.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj index 25b4bd560..265e82f09 100644 --- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj +++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj @@ -1,132 +1,62 @@ - - - + + - {697CF066-9077-4F22-99D9-D989CCE7282B} - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library Greenshot.Addon.Box Greenshot.Addon.Box - v4.6.1 - Properties - False - False - 4 - false - Always - - - - - - 3.5 - latest - false + netcoreapp3.0;net471 - + + + PreserveNewest + + + + + + + + - - - + - + - - - + + + - - - - - - - - - - + + - - 2.0.4 - - - 1.0.75 - - - 1.0.75 - - - 0.8.46 - - - 0.8.46 - - - 0.5.112 - + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + all + runtime; build; native; contentfiles; analyzers + - - - {bf35190d-b2a7-4cfa-b397-51cb384cf0d7} - Greenshot.Core - - - {f041c685-eb96-4ed1-9ace-0f5bd836610f} - Greenshot.Gfx - - - {5B924697-4DCD-4F98-85F1-105CB84B7341} - Greenshot.Addons - - - - - MSBuild:Compile - Designer - - - - mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Addons" -copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).dll" "$(SolutionDir)Greenshot\bin\$(Configuration)\Addons\" -copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Addons\" -mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\$(ProjectName)" -copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\$(ProjectName)" - - - - \ No newline at end of file + diff --git a/src/Greenshot.Addon.Box/Properties/AssemblyInfo.cs b/src/Greenshot.Addon.Box/Properties/AssemblyInfo.cs deleted file mode 100644 index fb710cb08..000000000 --- a/src/Greenshot.Addon.Box/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,53 +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.Reflection; -using System.Runtime.InteropServices; - -#endregion - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. - -[assembly: AssemblyTitle("Greenshot.Addon.Box")] -[assembly: AssemblyDescription("A plugin to upload images to Box")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Greenshot & F. Noel")] -[assembly: AssemblyProduct("Box Plugin")] -[assembly: AssemblyCopyright("Copyright (C) 2012")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// This sets the default COM visibility of types in the assembly to invisible. -// If you need to expose a type to COM, use [ComVisible(true)] on that type. - -[assembly: ComVisible(false)] - -// The assembly version, replaced by build scripts - -[assembly: AssemblyVersion("1.3.0.0")] -[assembly: AssemblyInformationalVersion("1.3.0.0")] -[assembly: AssemblyFileVersion("1.3.0.0")] \ No newline at end of file diff --git a/src/Greenshot.Addon.Box/ViewModels/BoxConfigViewModel.cs b/src/Greenshot.Addon.Box/ViewModels/BoxConfigViewModel.cs index 396b94d43..52599ae9c 100644 --- a/src/Greenshot.Addon.Box/ViewModels/BoxConfigViewModel.cs +++ b/src/Greenshot.Addon.Box/ViewModels/BoxConfigViewModel.cs @@ -24,6 +24,7 @@ using System.Reactive.Disposables; using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Extensions; +using Greenshot.Addon.Box.Configuration; using Greenshot.Addons; using Greenshot.Addons.Core.Enums; using Greenshot.Addons.ViewModels; diff --git a/src/Greenshot.Addon.Dropbox/IDropboxConfiguration.cs b/src/Greenshot.Addon.Dropbox/Configuration/IDropboxConfiguration.cs similarity index 89% rename from src/Greenshot.Addon.Dropbox/IDropboxConfiguration.cs rename to src/Greenshot.Addon.Dropbox/Configuration/IDropboxConfiguration.cs index 0281e2dc0..7db934fc6 100644 --- a/src/Greenshot.Addon.Dropbox/IDropboxConfiguration.cs +++ b/src/Greenshot.Addon.Dropbox/Configuration/IDropboxConfiguration.cs @@ -25,21 +25,20 @@ using System.ComponentModel; using System.Runtime.Serialization; +using Dapplo.Config.Ini; using Dapplo.HttpExtensions.OAuth; -using Dapplo.Ini; -using Dapplo.InterfaceImpl.Extensions; using Greenshot.Addons.Core; #endregion -namespace Greenshot.Addon.Dropbox +namespace Greenshot.Addon.Dropbox.Configuration { /// /// Description of ImgurConfiguration. /// [IniSection("Dropbox")] [Description("Greenshot Dropbox Plugin configuration")] - public interface IDropboxConfiguration : IIniSection, IDestinationFileConfiguration, IOAuth2Token, INotifyPropertyChanged, ITransactionalProperties + public interface IDropboxConfiguration : IIniSection, IDestinationFileConfiguration, IOAuth2Token { [Description("After upload send Dropbox link to clipboard.")] [DefaultValue(true)] diff --git a/src/Greenshot.Addon.Dropbox/IDropboxLanguage.cs b/src/Greenshot.Addon.Dropbox/Configuration/IDropboxLanguage.cs similarity index 91% rename from src/Greenshot.Addon.Dropbox/IDropboxLanguage.cs rename to src/Greenshot.Addon.Dropbox/Configuration/IDropboxLanguage.cs index 8d021b16e..f3766e7d3 100644 --- a/src/Greenshot.Addon.Dropbox/IDropboxLanguage.cs +++ b/src/Greenshot.Addon.Dropbox/Configuration/IDropboxLanguage.cs @@ -20,11 +20,11 @@ #region Usings using System.ComponentModel; -using Dapplo.Language; +using Dapplo.Config.Language; #endregion -namespace Greenshot.Addon.Dropbox +namespace Greenshot.Addon.Dropbox.Configuration { [Language("Dropbox")] public interface IDropboxLanguage : ILanguage, INotifyPropertyChanged diff --git a/src/Greenshot.Addon.Dropbox/Configuration/Impl/DropboxConfigurationImpl.cs b/src/Greenshot.Addon.Dropbox/Configuration/Impl/DropboxConfigurationImpl.cs new file mode 100644 index 000000000..c4374da9f --- /dev/null +++ b/src/Greenshot.Addon.Dropbox/Configuration/Impl/DropboxConfigurationImpl.cs @@ -0,0 +1,67 @@ +// 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 +// +// 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 . + +using System; +using Dapplo.Config.Ini; +using Greenshot.Core.Enums; + +namespace Greenshot.Addon.Dropbox.Configuration.Impl +{ + public class DropboxConfigurationImpl : IniSectionBase, IDropboxConfiguration + { + #region Implementation of IFileConfiguration + + public string OutputFilePath { get; set; } + public bool OutputFileAllowOverwrite { get; set; } + public string OutputFileFilenamePattern { get; set; } + public OutputFormats OutputFileFormat { get; set; } + public bool OutputFileReduceColors { get; set; } + public bool OutputFileAutoReduceColors { get; set; } + public int OutputFileReduceColorsTo { get; set; } + public int OutputFileJpegQuality { get; set; } + public bool OutputFilePromptQuality { get; set; } + public uint OutputFileIncrementingNumber { get; set; } + public string OptimizePNGCommand { get; set; } + public string OptimizePNGCommandArguments { get; set; } + + #endregion + + #region Implementation of IDestinationFileConfiguration + + public bool UseOwnSettings { get; set; } + + #endregion + + #region Implementation of IOAuth2Token + + public string OAuth2AccessToken { get; set; } + public DateTimeOffset OAuth2AccessTokenExpires { get; set; } + public string OAuth2RefreshToken { get; set; } + + #endregion + + #region Implementation of IDropboxConfiguration + + public bool AfterUploadLinkToClipBoard { get; set; } + public string ClientId { get; set; } + public string ClientSecret { get; set; } + + #endregion + } +} diff --git a/src/Greenshot.Addon.Dropbox/Configuration/Impl/DropboxLanguageImpl.cs b/src/Greenshot.Addon.Dropbox/Configuration/Impl/DropboxLanguageImpl.cs new file mode 100644 index 000000000..e891806cb --- /dev/null +++ b/src/Greenshot.Addon.Dropbox/Configuration/Impl/DropboxLanguageImpl.cs @@ -0,0 +1,40 @@ +// 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 +// +// 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 . + +using Dapplo.Config.Language; + +namespace Greenshot.Addon.Dropbox.Configuration.Impl +{ + public class DropboxLanguageImpl: LanguageBase, IDropboxLanguage + { + #region Implementation of IDropboxLanguage + + public string CommunicationWait { get; } + public string Configure { get; } + public string LabelAfterUpload { get; } + public string LabelAfterUploadLinkToClipBoard { get; } + public string LabelUploadFormat { get; } + public string SettingsTitle { get; } + public string UploadFailure { get; } + public string UploadMenuItem { get; } + public string UploadSuccess { get; } + + #endregion + } +} diff --git a/src/Greenshot.Addon.Dropbox/DropboxAddonModule.cs b/src/Greenshot.Addon.Dropbox/DropboxAddonModule.cs index f2dd1d482..550aa6074 100644 --- a/src/Greenshot.Addon.Dropbox/DropboxAddonModule.cs +++ b/src/Greenshot.Addon.Dropbox/DropboxAddonModule.cs @@ -24,8 +24,10 @@ using Autofac; using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; -using Dapplo.Ini; -using Dapplo.Language; +using Dapplo.Config.Ini; +using Dapplo.Config.Language; +using Greenshot.Addon.Dropbox.Configuration; +using Greenshot.Addon.Dropbox.Configuration.Impl; using Greenshot.Addon.Dropbox.ViewModels; using Greenshot.Addons.Components; @@ -37,13 +39,15 @@ namespace Greenshot.Addon.Dropbox protected override void Load(ContainerBuilder builder) { builder - .Register(context => IniConfig.Current.Get()) + .RegisterType() .As() + .As() .SingleInstance(); builder - .Register(context => LanguageLoader.Current.Get()) + .RegisterType() .As() + .As() .SingleInstance(); builder diff --git a/src/Greenshot.Addon.Dropbox/DropboxDestination.cs b/src/Greenshot.Addon.Dropbox/DropboxDestination.cs index f032e72b5..6bc1870a4 100644 --- a/src/Greenshot.Addon.Dropbox/DropboxDestination.cs +++ b/src/Greenshot.Addon.Dropbox/DropboxDestination.cs @@ -39,6 +39,7 @@ using Dapplo.HttpExtensions.OAuth; using Dapplo.Log; using Dapplo.Utils; using Dapplo.Windows.Clipboard; +using Greenshot.Addon.Dropbox.Configuration; using Greenshot.Addon.Dropbox.Entities; using Greenshot.Addons; using Greenshot.Addons.Components; diff --git a/src/Greenshot.Addon.Dropbox/Entities/ErrorTag.cs b/src/Greenshot.Addon.Dropbox/Entities/ErrorTag.cs index b6099cb18..98f7c382c 100644 --- a/src/Greenshot.Addon.Dropbox/Entities/ErrorTag.cs +++ b/src/Greenshot.Addon.Dropbox/Entities/ErrorTag.cs @@ -1,4 +1,23 @@ -using Newtonsoft.Json; +// Greenshot - a free and open source screenshot tool +// Copyright (C) 2007-2017 Thomas Braun, Jens Klingen, Robin Krom +// +// For more information see: http://getgreenshot.org/ +// The Greenshot project is hosted on GitHub: https://github.com/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 . + +using Newtonsoft.Json; namespace Greenshot.Addon.Dropbox.Entities { diff --git a/src/Greenshot.Addon.Dropbox/Entities/SharingInfo.cs b/src/Greenshot.Addon.Dropbox/Entities/SharingInfo.cs index 90621d9ee..c29f22d14 100644 --- a/src/Greenshot.Addon.Dropbox/Entities/SharingInfo.cs +++ b/src/Greenshot.Addon.Dropbox/Entities/SharingInfo.cs @@ -1,4 +1,23 @@ -using Newtonsoft.Json; +// Greenshot - a free and open source screenshot tool +// Copyright (C) 2007-2017 Thomas Braun, Jens Klingen, Robin Krom +// +// For more information see: http://getgreenshot.org/ +// The Greenshot project is hosted on GitHub: https://github.com/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 . + +using Newtonsoft.Json; namespace Greenshot.Addon.Dropbox.Entities { diff --git a/src/Greenshot.Addon.Dropbox/FodyWeavers.xml b/src/Greenshot.Addon.Dropbox/FodyWeavers.xml new file mode 100644 index 000000000..c7704e778 --- /dev/null +++ b/src/Greenshot.Addon.Dropbox/FodyWeavers.xml @@ -0,0 +1,4 @@ + + + + \ 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 633379b94..224d59284 100644 --- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj +++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj @@ -1,27 +1,22 @@ - - - + + - {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12} - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library Greenshot.Addon.Dropbox Greenshot.Addon.Dropbox - v4.6.1 - Properties - False - False - 4 - false - - - - - - 3.5 + netcoreapp3.0;net471 - + + + PreserveNewest + + + + + + + + @@ -42,93 +37,28 @@ + - - - - - - - - - - - - - - + + - - - + + + + - - {bf35190d-b2a7-4cfa-b397-51cb384cf0d7} - Greenshot.Core - - - {f041c685-eb96-4ed1-9ace-0f5bd836610f} - Greenshot.Gfx - - - {5B924697-4DCD-4F98-85F1-105CB84B7341} - Greenshot.Addons - - - - - MSBuild:Compile - Designer - - - - - - - - - - - - - - - - - - - - - - - - 2.0.4 - - - 1.0.75 - - - 1.0.75 - - - 0.8.46 - - - 0.8.46 - - - 0.5.112 + + + + + + + + + all + runtime; build; native; contentfiles; analyzers - - mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Addons" -copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).dll" "$(SolutionDir)Greenshot\bin\$(Configuration)\Addons\" -copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)Greenshot\bin\$(Configuration)\Addons\" -mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\$(ProjectName)" -copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)Greenshot\bin\$(Configuration)\Languages\$(ProjectName)" - - - - \ No newline at end of file + diff --git a/src/Greenshot.Addon.Dropbox/Properties/AssemblyInfo.cs b/src/Greenshot.Addon.Dropbox/Properties/AssemblyInfo.cs deleted file mode 100644 index 803f5d137..000000000 --- a/src/Greenshot.Addon.Dropbox/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,53 +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.Reflection; -using System.Runtime.InteropServices; - -#endregion - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. - -[assembly: AssemblyTitle("Greenshot.Addon.Dropbox")] -[assembly: AssemblyDescription("A plugin to upload images to Dropbox")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Greenshot & F. Noel")] -[assembly: AssemblyProduct("Dropbox Plugin")] -[assembly: AssemblyCopyright("Copyright (C) 2012")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// This sets the default COM visibility of types in the assembly to invisible. -// If you need to expose a type to COM, use [ComVisible(true)] on that type. - -[assembly: ComVisible(false)] - -// The assembly version, replaced by build scripts - -[assembly: AssemblyVersion("1.3.0.0")] -[assembly: AssemblyInformationalVersion("1.3.0.0")] -[assembly: AssemblyFileVersion("1.3.0.0")] \ No newline at end of file diff --git a/src/Greenshot.Addon.Dropbox/ViewModels/DropboxConfigViewModel.cs b/src/Greenshot.Addon.Dropbox/ViewModels/DropboxConfigViewModel.cs index 73fb04dcb..a374d28a2 100644 --- a/src/Greenshot.Addon.Dropbox/ViewModels/DropboxConfigViewModel.cs +++ b/src/Greenshot.Addon.Dropbox/ViewModels/DropboxConfigViewModel.cs @@ -24,6 +24,7 @@ using System.Reactive.Disposables; using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Extensions; +using Greenshot.Addon.Dropbox.Configuration; using Greenshot.Addons.Core.Enums; using Greenshot.Addons.ViewModels; diff --git a/src/Greenshot.Addon.Dropbox/app.config b/src/Greenshot.Addon.Dropbox/app.config index c20c0c817..6a1ce8f95 100644 --- a/src/Greenshot.Addon.Dropbox/app.config +++ b/src/Greenshot.Addon.Dropbox/app.config @@ -1,27 +1,8 @@  - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + diff --git a/src/Greenshot.Addon.LegacyEditor/EditorAddonModule.cs b/src/Greenshot.Addon.LegacyEditor/EditorAddonModule.cs index ad915c3b6..37fdb897d 100644 --- a/src/Greenshot.Addon.LegacyEditor/EditorAddonModule.cs +++ b/src/Greenshot.Addon.LegacyEditor/EditorAddonModule.cs @@ -42,13 +42,13 @@ namespace Greenshot.Addon.LegacyEditor protected override void Load(ContainerBuilder builder) { builder - .Register(context => new EditorConfigurationImpl()) + .RegisterType() .As() .As() .SingleInstance(); builder - .Register(context => new EditorLanguageImpl()) + .RegisterType() .As() .As() .SingleInstance(); diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj index 61947ce7d..9b4ccc381 100644 --- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj +++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj @@ -1,6 +1,8 @@  + Greenshot.Addon.LegacyEditor + Greenshot.Addon.LegacyEditor netcoreapp3.0;net471 true @@ -37,95 +39,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -226,7 +139,7 @@ - + diff --git a/src/Greenshot.Addon.OcrCommand/Greenshot.Addon.OcrCommand.csproj b/src/Greenshot.Addon.OcrCommand/Greenshot.Addon.OcrCommand.csproj index 8f000b3ca..b45dd7665 100644 --- a/src/Greenshot.Addon.OcrCommand/Greenshot.Addon.OcrCommand.csproj +++ b/src/Greenshot.Addon.OcrCommand/Greenshot.Addon.OcrCommand.csproj @@ -1,43 +1,16 @@ - - - + + - Debug - AnyCPU - {7B8E9055-A054-4290-B537-075EBFDF8BDF} - WinExe + net471 Greenshot.Addon.OcrCommand GreenshotOCRCommand - v4.6.1 - 512 - true - - - x86 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - latest - - - x86 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - latest - - - - - + + + + + + @@ -51,32 +24,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Addons" -copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Addons\" -copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName).config" "$(SolutionDir)Greenshot\bin\$(Configuration)\Addons\" - - \ No newline at end of file + + diff --git a/src/Greenshot.Addon.OcrCommand/Properties/AssemblyInfo.cs b/src/Greenshot.Addon.OcrCommand/Properties/AssemblyInfo.cs deleted file mode 100644 index 5d6c1a08d..000000000 --- a/src/Greenshot.Addon.OcrCommand/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Greenshot.Addon.OcrCommand")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Greenshot")] -[assembly: AssemblyProduct("Greenshot.Addon.OcrCommand")] -[assembly: AssemblyCopyright("Copyright © Greenshot 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("7b8e9055-a054-4290-b537-075ebfdf8bdf")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Greenshot.Addons/AddonsModule.cs b/src/Greenshot.Addons/AddonsModule.cs index 7ee85df11..09f128f08 100644 --- a/src/Greenshot.Addons/AddonsModule.cs +++ b/src/Greenshot.Addons/AddonsModule.cs @@ -41,20 +41,20 @@ namespace Greenshot.Addons protected override void Load(ContainerBuilder builder) { builder - .Register(context => new CoreConfigurationImpl()) + .RegisterType() .As() .As() .As() .SingleInstance(); builder - .Register(context => new GreenshotLanguageImpl()) + .RegisterType() .As() .As() .SingleInstance(); builder - .Register(context => new HttpConfigurationImpl()) + .RegisterType() .As() .As() .SingleInstance(); diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index 2fcf0b957..28d235d51 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -32,16 +32,6 @@ - - - - - - - - - - @@ -67,13 +57,13 @@ 1.1.11-gd26115c7d3 - 0.9.6 + 0.9.11 - 0.9.6 + 0.9.11 - 0.9.6 + 0.9.11 0.7.19 diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index 55b63b781..c232aed71 100644 --- a/src/Greenshot.Tests/Greenshot.Tests.csproj +++ b/src/Greenshot.Tests/Greenshot.Tests.csproj @@ -65,11 +65,6 @@ - - - - - PreserveNewest @@ -105,7 +100,7 @@ 1.1.11-gd26115c7d3 - 0.9.6 + 0.9.11 @@ -142,6 +137,7 @@ + diff --git a/src/Greenshot.Tests/IniTests.cs b/src/Greenshot.Tests/IniTests.cs index 4baa04ddb..b151ddd0e 100644 --- a/src/Greenshot.Tests/IniTests.cs +++ b/src/Greenshot.Tests/IniTests.cs @@ -21,10 +21,8 @@ #endregion -using System.Threading.Tasks; -using Dapplo.Ini; -using Dapplo.Ini.Converters; -using Greenshot.Addon.Dropbox; +using Dapplo.Config.Ini.Converters; +using Greenshot.Addon.Dropbox.Configuration.Impl; using Xunit; namespace Greenshot.Tests @@ -32,19 +30,15 @@ namespace Greenshot.Tests public class IniTests { [Fact] - public async Task ConstIniTest() + public void ConstIniTest() { // TODO: Set via build StringEncryptionTypeConverter.RgbIv = "dlgjowejgogkklwj"; StringEncryptionTypeConverter.RgbKey = "lsjvkwhvwujkagfauguwcsjgu2wueuff"; - using (var iniConfig = new IniConfig("greenshot", "greenshot")) - { - await iniConfig.LoadIfNeededAsync(); - var dropboxConfiguration = iniConfig.Get(); - // TODO: Fix this!! - Assert.NotEqual("@credentials_dropbox_consumer_key@", dropboxConfiguration.ClientId); - } + var dropboxConfiguration = new DropboxConfigurationImpl(); + // TODO: Fix this!! + Assert.NotEqual("@credentials_dropbox_consumer_key@", dropboxConfiguration.ClientId); } } } diff --git a/src/Greenshot.sln b/src/Greenshot.sln index e5d952a3c..76f5531ce 100644 --- a/src/Greenshot.sln +++ b/src/Greenshot.sln @@ -17,7 +17,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Addon.Jira", "Gre EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Addon.OCR", "Greenshot.Addon.OCR\Greenshot.Addon.OCR.csproj", "{C6988EE8-2FEE-4349-9F09-F9628A0D8965}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Addon.Box", "Greenshot.Addon.Box\Greenshot.Addon.Box.csproj", "{697CF066-9077-4F22-99D9-D989CCE7282B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Box", "Greenshot.Addon.Box\Greenshot.Addon.Box.csproj", "{697CF066-9077-4F22-99D9-D989CCE7282B}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Addon.Dropbox", "Greenshot.Addon.Dropbox\Greenshot.Addon.Dropbox.csproj", "{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}" EndProject @@ -37,11 +37,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Gfx", "Greenshot. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.PerformanceTests", "Greenshot.PerformanceTests\Greenshot.PerformanceTests.csproj", "{5D594C8A-2137-46E1-8D01-B83662825C7B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Tests", "Greenshot.Tests\Greenshot.Tests.csproj", "{9B162E60-12D8-44FD-8093-7D40392F23FA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Tests", "Greenshot.Tests\Greenshot.Tests.csproj", "{9B162E60-12D8-44FD-8093-7D40392F23FA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Addon.LegacyEditor", "Greenshot.Addon.LegacyEditor\Greenshot.Addon.LegacyEditor.csproj", "{9F89C5A0-EB75-4F01-97EB-FBC0725733F2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.LegacyEditor", "Greenshot.Addon.LegacyEditor\Greenshot.Addon.LegacyEditor.csproj", "{9F89C5A0-EB75-4F01-97EB-FBC0725733F2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Gfx.Experimental", "Greenshot.Gfx.Experimental\Greenshot.Gfx.Experimental.csproj", "{14894A45-AA2C-4BC3-85A3-E388D0BDC1CA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Gfx.Experimental", "Greenshot.Gfx.Experimental\Greenshot.Gfx.Experimental.csproj", "{14894A45-AA2C-4BC3-85A3-E388D0BDC1CA}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Addon.OneDrive", "Greenshot.Addon.OneDrive\Greenshot.Addon.OneDrive.csproj", "{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}" EndProject @@ -51,7 +51,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Addon.OcrCommand" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Core", "Greenshot.Core\Greenshot.Core.csproj", "{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Addon.InternetExplorer", "Greenshot.Addon.InternetExplorer\Greenshot.Addon.InternetExplorer.csproj", "{4CCA2717-B8A4-44F7-965B-5687107E4921}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.InternetExplorer", "Greenshot.Addon.InternetExplorer\Greenshot.Addon.InternetExplorer.csproj", "{4CCA2717-B8A4-44F7-965B-5687107E4921}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -114,18 +114,20 @@ Global {C6988EE8-2FEE-4349-9F09-F9628A0D8965}.Release|x86.ActiveCfg = Release|x86 {697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|x86.ActiveCfg = Debug|x86 - {697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|x86.Build.0 = Debug|x86 + {697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|x86.ActiveCfg = Debug|Any CPU + {697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|x86.Build.0 = Debug|Any CPU {697CF066-9077-4F22-99D9-D989CCE7282B}.Release|Any CPU.ActiveCfg = Release|Any CPU {697CF066-9077-4F22-99D9-D989CCE7282B}.Release|Any CPU.Build.0 = Release|Any CPU - {697CF066-9077-4F22-99D9-D989CCE7282B}.Release|x86.ActiveCfg = Release|x86 + {697CF066-9077-4F22-99D9-D989CCE7282B}.Release|x86.ActiveCfg = Release|Any CPU + {697CF066-9077-4F22-99D9-D989CCE7282B}.Release|x86.Build.0 = Release|Any CPU {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|x86.ActiveCfg = Debug|x86 - {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|x86.Build.0 = Debug|x86 + {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|x86.ActiveCfg = Debug|Any CPU + {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|x86.Build.0 = Debug|Any CPU {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|Any CPU.ActiveCfg = Release|Any CPU {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|Any CPU.Build.0 = Release|Any CPU - {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|x86.ActiveCfg = Release|x86 + {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|x86.ActiveCfg = Release|Any CPU + {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|x86.Build.0 = Release|Any CPU {7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|Any CPU.Build.0 = Debug|Any CPU {7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|x86.ActiveCfg = Debug|x86 diff --git a/src/Greenshot/Forms/MainForm.cs b/src/Greenshot/Forms/MainForm.cs index 71577ceb9..5da89403b 100644 --- a/src/Greenshot/Forms/MainForm.cs +++ b/src/Greenshot/Forms/MainForm.cs @@ -371,7 +371,6 @@ namespace Greenshot.Forms } - /// /// Setup the Bitmap scaling (for icons) /// diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index aca13a4b1..ec1fb2fae 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -57,22 +57,6 @@ - - - - - - - - - - - - - - - - @@ -99,8 +83,8 @@ - - + + @@ -116,6 +100,8 @@ + + diff --git a/src/Greenshot/GreenshotAutofacModule.cs b/src/Greenshot/GreenshotAutofacModule.cs index 11d0b511e..006cbdd74 100644 --- a/src/Greenshot/GreenshotAutofacModule.cs +++ b/src/Greenshot/GreenshotAutofacModule.cs @@ -65,13 +65,13 @@ namespace Greenshot .SingleInstance(); builder - .Register(context => new MetroConfigurationImpl()) + .RegisterType() .As() .As() .SingleInstance(); builder - .Register(context => new ConfigTranslationsImpl()) + .RegisterType() .As() .As() .SingleInstance(); diff --git a/src/NuGet.Config b/src/NuGet.Config index fdb112809..15e441775 100644 --- a/src/NuGet.Config +++ b/src/NuGet.Config @@ -6,7 +6,11 @@ - + + + + + \ No newline at end of file