mirror of
https://github.com/greenshot/greenshot
synced 2025-08-22 22:34:27 -07:00
Making Box and Dropbox available again, not tested if they work though.
This commit is contained in:
Robin
parent
6b0d50d2b4
commit
384749ffd6
36 changed files with 432 additions and 623 deletions
|
|
@ -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<IBoxConfiguration>())
|
||||
.RegisterType<BoxConfigurationImpl>()
|
||||
.As<IBoxConfiguration>()
|
||||
.As<IIniSection>()
|
||||
.SingleInstance();
|
||||
|
||||
builder
|
||||
.Register(context => LanguageLoader.Current.Get<IBoxLanguage>())
|
||||
.RegisterType<BoxLanguageImpl>()
|
||||
.As<IBoxLanguage>()
|
||||
.As<ILanguage>()
|
||||
.SingleInstance();
|
||||
|
||||
builder
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
{
|
||||
/// <summary>
|
||||
/// Description of ImgurConfiguration.
|
||||
/// </summary>
|
||||
[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)]
|
||||
|
|
@ -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; }
|
||||
|
||||
|
|
@ -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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
#endregion
|
||||
|
||||
using System;
|
||||
using Dapplo.Config.Ini;
|
||||
using Greenshot.Core.Enums;
|
||||
|
||||
namespace Greenshot.Addon.Box.Configuration.Impl
|
||||
{
|
||||
public class BoxConfigurationImpl : IniSectionBase<IBoxConfiguration>, 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
|
||||
}
|
||||
}
|
||||
|
|
@ -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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
#endregion
|
||||
|
||||
using Dapplo.Config.Language;
|
||||
|
||||
namespace Greenshot.Addon.Box.Configuration.Impl
|
||||
{
|
||||
public class BoxLanguageImpl : LanguageBase<IBoxLanguage>, 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
|
||||
}
|
||||
}
|
||||
4
src/Greenshot.Addon.Box/FodyWeavers.xml
Normal file
4
src/Greenshot.Addon.Box/FodyWeavers.xml
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Weavers>
|
||||
<AutoProperties />
|
||||
</Weavers>
|
||||
|
|
@ -1,132 +1,62 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\CommonProject.properties" />
|
||||
<Project Sdk="Microsoft.NET.Sdk.Wpf">
|
||||
|
||||
<PropertyGroup>
|
||||
<ProjectGuid>{697CF066-9077-4F22-99D9-D989CCE7282B}</ProjectGuid>
|
||||
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||
<OutputType>Library</OutputType>
|
||||
<RootNamespace>Greenshot.Addon.Box</RootNamespace>
|
||||
<AssemblyName>Greenshot.Addon.Box</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
|
||||
<NoStdLib>False</NoStdLib>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
|
||||
<RunPostBuildEvent>Always</RunPostBuildEvent>
|
||||
<TargetFrameworkProfile />
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
<UpgradeBackupLocation>
|
||||
</UpgradeBackupLocation>
|
||||
<OldToolsVersion>3.5</OldToolsVersion>
|
||||
<LangVersion>latest</LangVersion>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="Languages\language*.xml">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0' ">
|
||||
<FrameworkReference Include="Microsoft.DesktopUI" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'net471' ">
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="Microsoft.VisualBasic" />
|
||||
<Reference Include="PresentationCore" />
|
||||
<Reference Include="PresentationFramework" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.ComponentModel.Composition" />
|
||||
<Reference Include="System.ComponentModel.DataAnnotations" />
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.IO.Compression" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Net.Http.WebRequest" />
|
||||
<Reference Include="System.Runtime.Caching" />
|
||||
<Reference Include="System.Runtime.Serialization" />
|
||||
<Reference Include="System.ServiceModel" />
|
||||
<Reference Include="System.Windows" />
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Xaml" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="System.ServiceModel.Web" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="WindowsBase" />
|
||||
<Reference Include="PresentationCore" />
|
||||
<Reference Include="PresentationFramework" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Include="BoxAddonModule.cs" />
|
||||
<Compile Include="Entities\BoxEntity.cs" />
|
||||
<Compile Include="Entities\BoxFile.cs" />
|
||||
<Compile Include="Entities\BoxItem.cs" />
|
||||
<Compile Include="Entities\BoxSharedLink.cs" />
|
||||
<Compile Include="IBoxConfiguration.cs" />
|
||||
<Compile Include="BoxDestination.cs" />
|
||||
<Compile Include="IBoxLanguage.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="ViewModels\BoxConfigViewModel.cs" />
|
||||
<EmbeddedResource Include="box.png" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="CommonServiceLocator">
|
||||
<Version>2.0.4</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration">
|
||||
<Version>1.0.75</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations">
|
||||
<Version>1.0.75</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.HttpExtensions.JsonNet">
|
||||
<Version>0.8.46</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth">
|
||||
<Version>0.8.46</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard">
|
||||
<Version>0.5.112</Version>
|
||||
</PackageReference>
|
||||
<ProjectReference Include="..\Greenshot.Addons\Greenshot.Addons.csproj" />
|
||||
<ProjectReference Include="..\Greenshot.Core\Greenshot.Core.csproj" />
|
||||
<ProjectReference Include="..\Greenshot.Gfx\Greenshot.Gfx.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Resource Include="Languages\language_boxplugin-fr-FR.xml" />
|
||||
<Resource Include="Languages\language_boxplugin-id-ID.xml" />
|
||||
<Resource Include="Languages\language_boxplugin-it-IT.xml" />
|
||||
<Resource Include="Languages\language_boxplugin-ja-JP.xml" />
|
||||
<Resource Include="Languages\language_boxplugin-kab-DZ.xml" />
|
||||
<Resource Include="Languages\language_boxplugin-ko-KR.xml" />
|
||||
<Resource Include="Languages\language_boxplugin-lv-LV.xml" />
|
||||
<Resource Include="Languages\language_boxplugin-pl-PL.xml" />
|
||||
<Resource Include="Languages\language_boxplugin-pt-PT.xml" />
|
||||
<Resource Include="Languages\language_boxplugin-ru-RU.xml" />
|
||||
<Resource Include="Languages\language_boxplugin-sr-Cyrl-RS.xml" />
|
||||
<Resource Include="Languages\language_boxplugin-sv-SE.xml" />
|
||||
<Resource Include="Languages\language_boxplugin-uk-UA.xml" />
|
||||
<Resource Include="Languages\language_boxplugin-zh-CN.xml" />
|
||||
<Resource Include="Languages\language_boxplugin-zh-TW.xml" />
|
||||
<None Include="app.config" />
|
||||
<EmbeddedResource Include="box.png" />
|
||||
<Resource Include="Languages\language_boxplugin-cs-CZ.xml" />
|
||||
<Resource Include="Languages\language_boxplugin-de-DE.xml" />
|
||||
<Content Include="Languages\language_boxplugin-en-US.xml" />
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.11-gd26115c7d3" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.11-gd26115c7d3" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.11" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.11" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.11" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
|
||||
<PackageReference Include="Fody" Version="3.2.16">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Greenshot.Core\Greenshot.Core.csproj">
|
||||
<Project>{bf35190d-b2a7-4cfa-b397-51cb384cf0d7}</Project>
|
||||
<Name>Greenshot.Core</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Greenshot.Gfx\Greenshot.Gfx.csproj">
|
||||
<Project>{f041c685-eb96-4ed1-9ace-0f5bd836610f}</Project>
|
||||
<Name>Greenshot.Gfx</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Greenshot.Addons\Greenshot.Addons.csproj">
|
||||
<Project>{5B924697-4DCD-4F98-85F1-105CB84B7341}</Project>
|
||||
<Name>Greenshot.Addons</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Page Include="Views\BoxConfigView.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
</ItemGroup>
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>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)"</PostBuildEvent>
|
||||
<PreBuildEvent>
|
||||
</PreBuildEvent>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
#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")]
|
||||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
{
|
||||
/// <summary>
|
||||
/// Description of ImgurConfiguration.
|
||||
/// </summary>
|
||||
[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)]
|
||||
|
|
@ -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
|
||||
|
|
@ -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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
using System;
|
||||
using Dapplo.Config.Ini;
|
||||
using Greenshot.Core.Enums;
|
||||
|
||||
namespace Greenshot.Addon.Dropbox.Configuration.Impl
|
||||
{
|
||||
public class DropboxConfigurationImpl : IniSectionBase<IDropboxConfiguration>, 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
|
||||
}
|
||||
}
|
||||
|
|
@ -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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
using Dapplo.Config.Language;
|
||||
|
||||
namespace Greenshot.Addon.Dropbox.Configuration.Impl
|
||||
{
|
||||
public class DropboxLanguageImpl: LanguageBase<IDropboxLanguage>, 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
|
||||
}
|
||||
}
|
||||
|
|
@ -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<IDropboxConfiguration>())
|
||||
.RegisterType<DropboxConfigurationImpl>()
|
||||
.As<IDropboxConfiguration>()
|
||||
.As<IIniSection>()
|
||||
.SingleInstance();
|
||||
|
||||
builder
|
||||
.Register(context => LanguageLoader.Current.Get<IDropboxLanguage>())
|
||||
.RegisterType<DropboxLanguageImpl>()
|
||||
.As<IDropboxLanguage>()
|
||||
.As<ILanguage>()
|
||||
.SingleInstance();
|
||||
|
||||
builder
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace Greenshot.Addon.Dropbox.Entities
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace Greenshot.Addon.Dropbox.Entities
|
||||
{
|
||||
|
|
|
|||
4
src/Greenshot.Addon.Dropbox/FodyWeavers.xml
Normal file
4
src/Greenshot.Addon.Dropbox/FodyWeavers.xml
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Weavers>
|
||||
<AutoProperties />
|
||||
</Weavers>
|
||||
|
|
@ -1,27 +1,22 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\CommonProject.properties" />
|
||||
<Project Sdk="Microsoft.NET.Sdk.Wpf">
|
||||
|
||||
<PropertyGroup>
|
||||
<ProjectGuid>{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}</ProjectGuid>
|
||||
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||
<OutputType>Library</OutputType>
|
||||
<RootNamespace>Greenshot.Addon.Dropbox</RootNamespace>
|
||||
<AssemblyName>Greenshot.Addon.Dropbox</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
|
||||
<NoStdLib>False</NoStdLib>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
|
||||
<TargetFrameworkProfile />
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
<UpgradeBackupLocation>
|
||||
</UpgradeBackupLocation>
|
||||
<OldToolsVersion>3.5</OldToolsVersion>
|
||||
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="Languages\language*.xml">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0' ">
|
||||
<FrameworkReference Include="Microsoft.DesktopUI" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'net471' ">
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="Microsoft.VisualBasic" />
|
||||
<Reference Include="PresentationCore" />
|
||||
|
|
@ -42,93 +37,28 @@
|
|||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="WindowsBase" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Include="DropboxAddonModule.cs" />
|
||||
<Compile Include="Entities\CreateLinkReply.cs" />
|
||||
<Compile Include="Entities\CreateLinkRequest.cs" />
|
||||
<Compile Include="Entities\Error.cs" />
|
||||
<Compile Include="Entities\ErrorTag.cs" />
|
||||
<Compile Include="Entities\SharingInfo.cs" />
|
||||
<Compile Include="Entities\Upload.cs" />
|
||||
<Compile Include="Entities\UploadReply.cs" />
|
||||
<Compile Include="Entities\UploadRequest.cs" />
|
||||
<Compile Include="IDropboxLanguage.cs" />
|
||||
<Compile Include="IDropboxConfiguration.cs" />
|
||||
<Compile Include="DropboxDestination.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="ViewModels\DropboxConfigViewModel.cs" />
|
||||
<EmbeddedResource Include="Dropbox.gif" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="Dropbox.gif" />
|
||||
<None Include="app.config" />
|
||||
<None Include="Languages\language_dropboxplugin-en-US.xml" />
|
||||
<ProjectReference Include="..\Greenshot.Addons\Greenshot.Addons.csproj" />
|
||||
<ProjectReference Include="..\Greenshot.Core\Greenshot.Core.csproj" />
|
||||
<ProjectReference Include="..\Greenshot.Gfx\Greenshot.Gfx.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Greenshot.Core\Greenshot.Core.csproj">
|
||||
<Project>{bf35190d-b2a7-4cfa-b397-51cb384cf0d7}</Project>
|
||||
<Name>Greenshot.Core</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Greenshot.Gfx\Greenshot.Gfx.csproj">
|
||||
<Project>{f041c685-eb96-4ed1-9ace-0f5bd836610f}</Project>
|
||||
<Name>Greenshot.Gfx</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Greenshot.Addons\Greenshot.Addons.csproj">
|
||||
<Project>{5B924697-4DCD-4F98-85F1-105CB84B7341}</Project>
|
||||
<Name>Greenshot.Addons</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Page Include="Views\DropboxConfigView.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Languages\language_dropboxplugin-cs-CZ.xml" />
|
||||
<Resource Include="Languages\language_dropboxplugin-de-DE.xml" />
|
||||
<Resource Include="Languages\language_dropboxplugin-fr-FR.xml" />
|
||||
<Resource Include="Languages\language_dropboxplugin-id-ID.xml" />
|
||||
<Resource Include="Languages\language_dropboxplugin-it-IT.xml" />
|
||||
<Resource Include="Languages\language_dropboxplugin-ja-JP.xml" />
|
||||
<Resource Include="Languages\language_dropboxplugin-kab-DZ.xml" />
|
||||
<Resource Include="Languages\language_dropboxplugin-ko-KR.xml" />
|
||||
<Resource Include="Languages\language_dropboxplugin-lv-LV.xml" />
|
||||
<Resource Include="Languages\language_dropboxplugin-pl-PL.xml" />
|
||||
<Resource Include="Languages\language_dropboxplugin-pt-PT.xml" />
|
||||
<Resource Include="Languages\language_dropboxplugin-ru-RU.xml" />
|
||||
<Resource Include="Languages\language_dropboxplugin-sr-Cyrl-RS.xml" />
|
||||
<Resource Include="Languages\language_dropboxplugin-sv-SE.xml" />
|
||||
<Resource Include="Languages\language_dropboxplugin-uk-UA.xml" />
|
||||
<Resource Include="Languages\language_dropboxplugin-zh-CN.xml" />
|
||||
<Resource Include="Languages\language_dropboxplugin-zh-TW.xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="CommonServiceLocator">
|
||||
<Version>2.0.4</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration">
|
||||
<Version>1.0.75</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations">
|
||||
<Version>1.0.75</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.HttpExtensions.JsonNet">
|
||||
<Version>0.8.46</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth">
|
||||
<Version>0.8.46</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard">
|
||||
<Version>0.5.112</Version>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.11-gd26115c7d3" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.11-gd26115c7d3" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.11" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.11" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.11" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
|
||||
<PackageReference Include="Fody" Version="3.2.16">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>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)"</PostBuildEvent>
|
||||
<PreBuildEvent>
|
||||
</PreBuildEvent>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
#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")]
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,27 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.0.3.0" newVersion="2.0.3.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="ToastNotifications" publicKeyToken="e89d9d7314a7c797" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.3.4.0" newVersion="2.3.4.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Reactive" publicKeyToken="94bc3704cddfc263" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
|
||||
<runtime>
|
||||
</runtime>
|
||||
<startup>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" />
|
||||
</startup>
|
||||
</configuration>
|
||||
|
|
|
|||
|
|
@ -42,13 +42,13 @@ namespace Greenshot.Addon.LegacyEditor
|
|||
protected override void Load(ContainerBuilder builder)
|
||||
{
|
||||
builder
|
||||
.Register(context => new EditorConfigurationImpl())
|
||||
.RegisterType<EditorConfigurationImpl>()
|
||||
.As<IEditorConfiguration>()
|
||||
.As<IIniSection>()
|
||||
.SingleInstance();
|
||||
|
||||
builder
|
||||
.Register(context => new EditorLanguageImpl())
|
||||
.RegisterType<EditorLanguageImpl>()
|
||||
.As<IEditorLanguage>()
|
||||
.As<ILanguage>()
|
||||
.SingleInstance();
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<RootNamespace>Greenshot.Addon.LegacyEditor</RootNamespace>
|
||||
<AssemblyName>Greenshot.Addon.LegacyEditor</AssemblyName>
|
||||
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
</PropertyGroup>
|
||||
|
|
@ -37,95 +39,6 @@
|
|||
<Reference Include="PresentationFramework" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Remove="Resources\addEllipseToolStripMenuItem.Image.png" />
|
||||
<None Remove="Resources\addRectangleToolStripMenuItem.Image.png" />
|
||||
<None Remove="Resources\addSpeechBubbleToolStripMenuItem.Image.png" />
|
||||
<None Remove="Resources\addTextBoxToolStripMenuItem.Image.png" />
|
||||
<None Remove="Resources\areaHighlightMenuItem.Image.png" />
|
||||
<None Remove="Resources\arrowHeadsDropDownButton.Image.png" />
|
||||
<None Remove="Resources\blurToolStripMenuItem.Image.png" />
|
||||
<None Remove="Resources\btnAlignBottom.Image.png" />
|
||||
<None Remove="Resources\btnAlignCenter.Image.png" />
|
||||
<None Remove="Resources\btnAlignLeft.Image.png" />
|
||||
<None Remove="Resources\btnAlignMiddle.Image.png" />
|
||||
<None Remove="Resources\btnAlignRight.Image.png" />
|
||||
<None Remove="Resources\btnAlignTop.Image.png" />
|
||||
<None Remove="Resources\btnArrow.Image.png" />
|
||||
<None Remove="Resources\btnCancel.Image.png" />
|
||||
<None Remove="Resources\btnClipboard.Image.png" />
|
||||
<None Remove="Resources\btnConfirm.Image.png" />
|
||||
<None Remove="Resources\btnCopy.Image.png" />
|
||||
<None Remove="Resources\btnCrop.Image.png" />
|
||||
<None Remove="Resources\btnCursor.Image.png" />
|
||||
<None Remove="Resources\btnCut.Image.png" />
|
||||
<None Remove="Resources\btnDelete.Image.png" />
|
||||
<None Remove="Resources\btnEllipse.Image.png" />
|
||||
<None Remove="Resources\btnFillColor.Image.png" />
|
||||
<None Remove="Resources\btnFreehand.Image.png" />
|
||||
<None Remove="Resources\btnHelp.Image.png" />
|
||||
<None Remove="Resources\btnHighlight.Image.png" />
|
||||
<None Remove="Resources\btnLine.Image.png" />
|
||||
<None Remove="Resources\btnLineColor.Image.png" />
|
||||
<None Remove="Resources\btnObfuscate.Image.png" />
|
||||
<None Remove="Resources\btnPaste.Image.png" />
|
||||
<None Remove="Resources\btnPrint.Image.png" />
|
||||
<None Remove="Resources\btnRect.Image.png" />
|
||||
<None Remove="Resources\btnRedo.Image.png" />
|
||||
<None Remove="Resources\btnResize.Image.png" />
|
||||
<None Remove="Resources\btnSave.Image.png" />
|
||||
<None Remove="Resources\btnSettings.Image.png" />
|
||||
<None Remove="Resources\btnStepLabel.Image.png" />
|
||||
<None Remove="Resources\btnStepLabel01.Image.png" />
|
||||
<None Remove="Resources\btnStepLabel02.Image.png" />
|
||||
<None Remove="Resources\btnStepLabel03.Image.png" />
|
||||
<None Remove="Resources\btnStepLabel04.Image.png" />
|
||||
<None Remove="Resources\btnStepLabel05.Image.png" />
|
||||
<None Remove="Resources\btnStepLabel06.Image.png" />
|
||||
<None Remove="Resources\btnStepLabel07.Image.png" />
|
||||
<None Remove="Resources\btnStepLabel08.Image.png" />
|
||||
<None Remove="Resources\btnStepLabel09.Image.png" />
|
||||
<None Remove="Resources\btnStepLabel10.Image.png" />
|
||||
<None Remove="Resources\btnStepLabel11.Image.png" />
|
||||
<None Remove="Resources\btnStepLabel12.Image.png" />
|
||||
<None Remove="Resources\btnStepLabel13.Image.png" />
|
||||
<None Remove="Resources\btnStepLabel14.Image.png" />
|
||||
<None Remove="Resources\btnStepLabel15.Image.png" />
|
||||
<None Remove="Resources\btnStepLabel16.Image.png" />
|
||||
<None Remove="Resources\btnStepLabel17.Image.png" />
|
||||
<None Remove="Resources\btnStepLabel18.Image.png" />
|
||||
<None Remove="Resources\btnStepLabel19.Image.png" />
|
||||
<None Remove="Resources\btnStepLabel20+.Image.png" />
|
||||
<None Remove="Resources\btnStepLabel20.Image.png" />
|
||||
<None Remove="Resources\btnText.Image.png" />
|
||||
<None Remove="Resources\btnUndo.Image.png" />
|
||||
<None Remove="Resources\closeToolStripMenuItem.Image.png" />
|
||||
<None Remove="Resources\copyToolStripMenuItem.Image.png" />
|
||||
<None Remove="Resources\cutToolStripMenuItem.Image.png" />
|
||||
<None Remove="Resources\drawArrowToolStripMenuItem.Image.png" />
|
||||
<None Remove="Resources\drawFreehandToolStripMenuItem.Image.png" />
|
||||
<None Remove="Resources\drawLineToolStripMenuItem.Image.png" />
|
||||
<None Remove="Resources\fontBoldButton.Image.png" />
|
||||
<None Remove="Resources\fontItalicButton.Image.png" />
|
||||
<None Remove="Resources\grayscaleHighlightMenuItem.Image.png" />
|
||||
<None Remove="Resources\helpToolStripMenuItem1.Image.png" />
|
||||
<None Remove="Resources\highlightModeButton.Image.png" />
|
||||
<None Remove="Resources\magnifyMenuItem.Image.png" />
|
||||
<None Remove="Resources\obfuscateModeButton.Image.png" />
|
||||
<None Remove="Resources\pasteToolStripMenuItem.Image.png" />
|
||||
<None Remove="Resources\pipette.Image.png" />
|
||||
<None Remove="Resources\pixelizeToolStripMenuItem.Image.png" />
|
||||
<None Remove="Resources\preferencesToolStripMenuItem.Image.png" />
|
||||
<None Remove="Resources\redoToolStripMenuItem.Image.png" />
|
||||
<None Remove="Resources\removeObjectToolStripMenuItem.Image.png" />
|
||||
<None Remove="Resources\rotateCcwToolstripButton.Image.png" />
|
||||
<None Remove="Resources\rotateCwToolstripButton.Image.png" />
|
||||
<None Remove="Resources\shadowButton.Image.png" />
|
||||
<None Remove="Resources\textHighlightMenuItem.Image.png" />
|
||||
<None Remove="Resources\toolStripSplitButton1.Image.png" />
|
||||
<None Remove="Resources\undoToolStripMenuItem.Image.png" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="Resources\addEllipseToolStripMenuItem.Image.png" />
|
||||
<EmbeddedResource Include="Resources\addRectangleToolStripMenuItem.Image.png" />
|
||||
|
|
@ -226,7 +139,7 @@
|
|||
<PackageReference Include="CommonServiceLocator" Version="2.0.4" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.11-gd26115c7d3" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.11-gd26115c7d3" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.6" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.11" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
|
||||
<PackageReference Include="Dapplo.Windows.Icons" Version="0.7.19" />
|
||||
<PackageReference Include="Fody" Version="3.2.16">
|
||||
|
|
|
|||
|
|
@ -1,43 +1,16 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{7B8E9055-A054-4290-B537-075EBFDF8BDF}</ProjectGuid>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetFrameworks>net471</TargetFrameworks>
|
||||
<RootNamespace>Greenshot.Addon.OcrCommand</RootNamespace>
|
||||
<AssemblyName>GreenshotOCRCommand</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<LangVersion>latest</LangVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<LangVersion>latest</LangVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<StartupObject />
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0' ">
|
||||
<FrameworkReference Include="Microsoft.DesktopUI" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'net471' ">
|
||||
<Reference Include="CustomMarshalers" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
|
|
@ -51,32 +24,5 @@
|
|||
<Reference Include="System.Xml" />
|
||||
<Reference Include="WindowsBase" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="ComProgIdAttribute.cs" />
|
||||
<Compile Include="COMWrapper.cs" />
|
||||
<Compile Include="Modi\CompressionLevel.cs" />
|
||||
<Compile Include="Modi\FileFormat.cs" />
|
||||
<Compile Include="Modi\ICommon.cs" />
|
||||
<Compile Include="Modi\IDispatch.cs" />
|
||||
<Compile Include="Modi\IDocument.cs" />
|
||||
<Compile Include="Modi\IImage.cs" />
|
||||
<Compile Include="Modi\IImages.cs" />
|
||||
<Compile Include="Modi\ILayout.cs" />
|
||||
<Compile Include="Modi\IMiRect.cs" />
|
||||
<Compile Include="Modi\IMiRects.cs" />
|
||||
<Compile Include="Modi\IWord.cs" />
|
||||
<Compile Include="Modi\IWords.cs" />
|
||||
<Compile Include="Modi\ModiLanguage.cs" />
|
||||
<Compile Include="Program.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="App.config" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>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\"</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -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")]
|
||||
|
|
@ -41,20 +41,20 @@ namespace Greenshot.Addons
|
|||
protected override void Load(ContainerBuilder builder)
|
||||
{
|
||||
builder
|
||||
.Register(context => new CoreConfigurationImpl())
|
||||
.RegisterType<CoreConfigurationImpl>()
|
||||
.As<ICoreConfiguration>()
|
||||
.As<IUiConfiguration>()
|
||||
.As<IIniSection>()
|
||||
.SingleInstance();
|
||||
|
||||
builder
|
||||
.Register(context => new GreenshotLanguageImpl())
|
||||
.RegisterType<GreenshotLanguageImpl>()
|
||||
.As<IGreenshotLanguage>()
|
||||
.As<ILanguage>()
|
||||
.SingleInstance();
|
||||
|
||||
builder
|
||||
.Register(context => new HttpConfigurationImpl())
|
||||
.RegisterType<HttpConfigurationImpl>()
|
||||
.As<IHttpConfiguration>()
|
||||
.As<IIniSection>()
|
||||
.SingleInstance();
|
||||
|
|
|
|||
|
|
@ -32,16 +32,6 @@
|
|||
<Reference Include="PresentationFramework" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Remove="Resources\Checkerboard.Image.png" />
|
||||
<None Remove="Resources\Clipboard.Image.png" />
|
||||
<None Remove="Resources\Close.Image.png" />
|
||||
<None Remove="Resources\Email.Image.png" />
|
||||
<None Remove="Resources\Greenshot.Icon.ico" />
|
||||
<None Remove="Resources\Printer.Image.png" />
|
||||
<None Remove="Resources\Save.Image.png" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="Resources\Checkerboard.Image.png" />
|
||||
<EmbeddedResource Include="Resources\Clipboard.Image.png" />
|
||||
|
|
@ -67,13 +57,13 @@
|
|||
<Version>1.1.11-gd26115c7d3</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.HttpExtensions">
|
||||
<Version>0.9.6</Version>
|
||||
<Version>0.9.11</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.HttpExtensions.JsonNet">
|
||||
<Version>0.9.6</Version>
|
||||
<Version>0.9.11</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth">
|
||||
<Version>0.9.6</Version>
|
||||
<Version>0.9.11</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard">
|
||||
<Version>0.7.19</Version>
|
||||
|
|
|
|||
|
|
@ -65,11 +65,6 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Remove="IniTests.cs" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="IniTests.cs" />
|
||||
<None Include="TestFiles\scroll0.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
|
|
@ -105,7 +100,7 @@
|
|||
<Version>1.1.11-gd26115c7d3</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth">
|
||||
<Version>0.9.6</Version>
|
||||
<Version>0.9.11</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.Log.XUnit" Version="1.3.11" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers">
|
||||
|
|
@ -142,6 +137,7 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Greenshot.Addon.Dropbox\Greenshot.Addon.Dropbox.csproj" />
|
||||
<ProjectReference Include="..\Greenshot.Addons\Greenshot.Addons.csproj" />
|
||||
<ProjectReference Include="..\Greenshot.Core\Greenshot.Core.csproj" />
|
||||
<ProjectReference Include="..\Greenshot.Gfx.Experimental\Greenshot.Gfx.Experimental.csproj" />
|
||||
|
|
|
|||
|
|
@ -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<IDropboxConfiguration>();
|
||||
// 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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -371,7 +371,6 @@ namespace Greenshot.Forms
|
|||
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Setup the Bitmap scaling (for icons)
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -57,22 +57,6 @@
|
|||
<Reference Include="WindowsFormsIntegration" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Remove="Resources\camera.wav" />
|
||||
<None Remove="Resources\contextmenu_capturearea.Image.png" />
|
||||
<None Remove="Resources\contextmenu_captureclipboard.Image.png" />
|
||||
<None Remove="Resources\contextmenu_capturefullscreen.Image.png" />
|
||||
<None Remove="Resources\contextmenu_capturelastregion.Image.png" />
|
||||
<None Remove="Resources\contextmenu_capturewindow.Image.png" />
|
||||
<None Remove="Resources\contextmenu_donate.Image.png" />
|
||||
<None Remove="Resources\contextmenu_exit.Image.png" />
|
||||
<None Remove="Resources\contextmenu_help.Image.png" />
|
||||
<None Remove="Resources\contextmenu_openfile.Image.png" />
|
||||
<None Remove="Resources\contextmenu_present.Image.png" />
|
||||
<None Remove="Resources\contextmenu_settings.Image.png" />
|
||||
<None Remove="Resources\icon.ico" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="Resources\camera.wav" />
|
||||
<EmbeddedResource Include="Resources\contextmenu_capturearea.Image.png" />
|
||||
|
|
@ -99,8 +83,8 @@
|
|||
<PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="1.1.11-gd26115c7d3" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="1.1.11-gd26115c7d3" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.11-gd26115c7d3" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.6" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.6" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.11" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.11" />
|
||||
<PackageReference Include="Dapplo.Log.LogFile" Version="1.3.11" />
|
||||
<PackageReference Include="Dapplo.Log.Loggers" Version="1.3.11" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
|
||||
|
|
@ -116,6 +100,8 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Greenshot.Addon.Box\Greenshot.Addon.Box.csproj" />
|
||||
<ProjectReference Include="..\Greenshot.Addon.Dropbox\Greenshot.Addon.Dropbox.csproj" />
|
||||
<ProjectReference Include="..\Greenshot.Addon.InternetExplorer\Greenshot.Addon.InternetExplorer.csproj" />
|
||||
<ProjectReference Include="..\Greenshot.Addon.LegacyEditor\Greenshot.Addon.LegacyEditor.csproj" />
|
||||
<ProjectReference Include="..\Greenshot.Core\Greenshot.Core.csproj" />
|
||||
|
|
|
|||
|
|
@ -65,13 +65,13 @@ namespace Greenshot
|
|||
.SingleInstance();
|
||||
|
||||
builder
|
||||
.Register(context => new MetroConfigurationImpl())
|
||||
.RegisterType<MetroConfigurationImpl>()
|
||||
.As<IMetroConfiguration>()
|
||||
.As<IIniSection>()
|
||||
.SingleInstance();
|
||||
|
||||
builder
|
||||
.Register(context => new ConfigTranslationsImpl())
|
||||
.RegisterType<ConfigTranslationsImpl>()
|
||||
.As<IConfigTranslations>()
|
||||
.As<ILanguage>()
|
||||
.SingleInstance();
|
||||
|
|
|
|||
|
|
@ -6,7 +6,11 @@
|
|||
<add key="Dapplo.CaliburnMicro" value="https://ci.appveyor.com/nuget/dapplo-caliburnmicro-46kaa8k8ft4i" />
|
||||
<add key="Dapplo.HttpExtensions" value="https://ci.appveyor.com/nuget/dapplo-httpextensions-6qa60p3t5ixy" />
|
||||
<add key="Dapplo.Windows" value="https://ci.appveyor.com/nuget/dapplo-windows-pjnkjqjp7t6a" />
|
||||
<add key="myget.dotnetcore" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
|
||||
<add key="myget.dotnetcore" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
|
||||
<add key="dotnet-core-latest" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
|
||||
</packageSources>
|
||||
<disabledPackageSources>
|
||||
<add key="myget.dotnetcore" value="true" />
|
||||
<add key="dotnet-core-latest" value="true" />
|
||||
</disabledPackageSources>
|
||||
</configuration>
|
||||
Loading…
Add table
Add a link
Reference in a new issue