From 938b6c10d32419e372a42117bb166ed4ed3ab7c3 Mon Sep 17 00:00:00 2001 From: Robin Date: Thu, 13 Sep 2018 23:10:32 +0300 Subject: [PATCH] Trying to make things compile --- .../Greenshot.Addon.InternetExplorer.csproj | 74 +-- .../IEInterop/IEContainer.cs | 6 +- .../Properties/AssemblyInfo.cs | 35 -- .../Drawing/Fields/IFieldHolder.cs | 53 -- .../Greenshot.Addon.LegacyEditor.csproj | 207 +------- .../Memento/IMemento.cs | 8 - .../Properties/AssemblyInfo.cs | 35 -- src/Greenshot.Addons/Greenshot.Addons.csproj | 364 ++++--------- .../Properties/AssemblyInfo.cs | 53 -- src/Greenshot.Core/Greenshot.Core.csproj | 76 +-- src/Greenshot.Core/Properties/AssemblyInfo.cs | 35 -- src/Greenshot.Gfx/Greenshot.Gfx.csproj | 93 +--- src/Greenshot.Gfx/Properties/AssemblyInfo.cs | 35 -- src/Greenshot.sln | 22 +- src/Greenshot/Components/CommandlineParser.cs | 8 +- .../Forms/ColorPickerToolStripButton.cs | 9 +- src/Greenshot/Greenshot.csproj | 492 ++++-------------- src/Greenshot/Properties/AssemblyInfo.cs | 53 -- 18 files changed, 286 insertions(+), 1372 deletions(-) delete mode 100644 src/Greenshot.Addon.InternetExplorer/Properties/AssemblyInfo.cs delete mode 100644 src/Greenshot.Addon.LegacyEditor/Drawing/Fields/IFieldHolder.cs delete mode 100644 src/Greenshot.Addon.LegacyEditor/Properties/AssemblyInfo.cs delete mode 100644 src/Greenshot.Addons/Properties/AssemblyInfo.cs delete mode 100644 src/Greenshot.Core/Properties/AssemblyInfo.cs delete mode 100644 src/Greenshot.Gfx/Properties/AssemblyInfo.cs delete mode 100644 src/Greenshot/Properties/AssemblyInfo.cs diff --git a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj index 929e06bc4..2cb1e2475 100644 --- a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj +++ b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj @@ -1,48 +1,29 @@ - - - - + + - {4CCA2717-B8A4-44F7-965B-5687107E4921} - Library - Properties - Greenshot.Addon.InternetExplorer - Greenshot.Addon.InternetExplorer - v4.6.1 - 512 - true + netcoreapp3.0 + latest + true + - - - True - - - - - - - - - - - - - - - - + + - - - - - - - + + 0.5.31 + + + 0.5.112 + + + 0.5.112 + + - + + {5b924697-4dcd-4f98-85f1-105cb84b7341} Greenshot.Addons @@ -56,19 +37,4 @@ Greenshot.Gfx - - - - - - 0.5.31 - - - 0.5.112 - - - 0.5.112 - - - \ No newline at end of file diff --git a/src/Greenshot.Addon.InternetExplorer/IEInterop/IEContainer.cs b/src/Greenshot.Addon.InternetExplorer/IEInterop/IEContainer.cs index d2163c344..6c0beb688 100644 --- a/src/Greenshot.Addon.InternetExplorer/IEInterop/IEContainer.cs +++ b/src/Greenshot.Addon.InternetExplorer/IEInterop/IEContainer.cs @@ -87,7 +87,7 @@ namespace Greenshot.Addon.InternetExplorer.IEInterop // Calculate startLocation for the frames var window2 = document2.parentWindow; var window3 = (IHTMLWindow3) window2; - NativePoint contentWindowLocation = contentWindow.GetInfo().Bounds.Location; + var contentWindowLocation = contentWindow.GetInfo().Bounds.Location; var x = window3.screenLeft - contentWindowLocation.X; var y = window3.screenTop - contentWindowLocation.Y; @@ -247,7 +247,7 @@ namespace Greenshot.Addon.InternetExplorer.IEInterop // Do not release IHTMLDocument5 com object, as this also gives problems with the document2! //Marshal.ReleaseComObject(document5); - NativeRect clientRectangle = contentWindow.GetInfo().Bounds; + var clientRectangle = contentWindow.GetInfo().Bounds; try { var window2 = document2.parentWindow; @@ -334,7 +334,7 @@ namespace Greenshot.Addon.InternetExplorer.IEInterop { try { - IHTMLWindow2 frameWindow = frameCollection.item(frame); + var frameWindow = frameCollection.item(frame) as IHTMLWindow2; var frameData = new DocumentContainer(frameWindow, contentWindow, this); // check if frame is hidden if (!frameData.IsHidden) diff --git a/src/Greenshot.Addon.InternetExplorer/Properties/AssemblyInfo.cs b/src/Greenshot.Addon.InternetExplorer/Properties/AssemblyInfo.cs deleted file mode 100644 index 6e9ffac32..000000000 --- a/src/Greenshot.Addon.InternetExplorer/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.InternetExplorer")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Greenshot.Addon.InternetExplorer")] -[assembly: AssemblyCopyright("Copyright © 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("4cca2717-b8a4-44f7-965b-5687107e4921")] - -// 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.Addon.LegacyEditor/Drawing/Fields/IFieldHolder.cs b/src/Greenshot.Addon.LegacyEditor/Drawing/Fields/IFieldHolder.cs deleted file mode 100644 index 063ca48d7..000000000 --- a/src/Greenshot.Addon.LegacyEditor/Drawing/Fields/IFieldHolder.cs +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Greenshot - a free and open source screenshot tool - * Copyright (C) 2007-2015 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 . - */ - -using System.Collections.Generic; - -namespace Greenshot.Drawing.Fields { - /// - /// Any element holding Fields must provide access to it. - /// AbstractFieldHolder is the basic implementation. - /// If you need the fieldHolder to have child fieldHolders, - /// you should consider using IFieldHolderWithChildren. - /// - public interface IFieldHolder { - - event FieldChangedEventHandler FieldChanged; - - void AddField(Field field); - void RemoveField(Field field); - List GetFields(); - Field GetField(FieldType fieldType); - bool HasField(FieldType fieldType); - void SetFieldValue(FieldType fieldType, object value); - } - - /// - /// Extended fieldHolder which has fieldHolder children. - /// Implementations should pass field values to and from - /// their children. - /// AbstractFieldHolderWithChildren is the basic implementation. - /// - public interface IFieldHolderWithChildren : IFieldHolder { - void AddChild(IFieldHolder fieldHolder); - void RemoveChild(IFieldHolder fieldHolder); - } -} diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj index 8863a6ec9..dabfbd6ff 100644 --- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj +++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj @@ -1,181 +1,15 @@ - - - - + + - Debug - AnyCPU - {9F89C5A0-EB75-4F01-97EB-FBC0725733F2} - Library - Properties - Greenshot.Addon.LegacyEditor - Greenshot.Addon.LegacyEditor - v4.6.1 - 512 + netcoreapp3.0 + latest true - - - - latest - - - latest + - - - - - - - - - - - - - - - - - - - - - - - - - - - Component - - - Component - - - Component - - - Component - - - Form - - - ColorDialog.cs - - - - - Component - - - Component - - - Component - - - Component - - - Component - - - Component - - - - Component - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Component - - - - - - - - Form - - - DropShadowSettingsForm.cs - - - Form - - - ImageEditorForm.cs - - - Form - - - ResizeSettingsForm.cs - - - Form - - - TornEdgeSettingsForm.cs - - - - - - - - - - - - - + + {5b924697-4dcd-4f98-85f1-105cb84b7341} @@ -190,24 +24,7 @@ Greenshot.Gfx - - - - - - ColorDialog.cs - - - ImageEditorForm.cs - Designer - - - - - MSBuild:Compile - Designer - - + 2.0.4 @@ -228,12 +45,4 @@ 0.5.112 - - - 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.LegacyEditor/Memento/IMemento.cs b/src/Greenshot.Addon.LegacyEditor/Memento/IMemento.cs index c0a28417c..5e3588e20 100644 --- a/src/Greenshot.Addon.LegacyEditor/Memento/IMemento.cs +++ b/src/Greenshot.Addon.LegacyEditor/Memento/IMemento.cs @@ -19,7 +19,6 @@ * along with this program. If not, see . */ using System; -using Greenshot.Configuration; namespace Greenshot.Memento { /// @@ -40,12 +39,5 @@ namespace Greenshot.Memento { /// The memento to try to merge with /// bool Merge(IMemento other); - - /// - /// Returns the language key for the action which is performed - /// - LangKey ActionLanguageKey { - get; - } } } diff --git a/src/Greenshot.Addon.LegacyEditor/Properties/AssemblyInfo.cs b/src/Greenshot.Addon.LegacyEditor/Properties/AssemblyInfo.cs deleted file mode 100644 index 4d04d1dd6..000000000 --- a/src/Greenshot.Addon.LegacyEditor/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.LegacyEditor")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Greenshot")] -[assembly: AssemblyProduct("Greenshot.Addon.LegacyEditor")] -[assembly: AssemblyCopyright("Copyright © 2007-2018 Greenshot")] -[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("9f89c5a0-eb75-4f01-97eb-fbc0725733f2")] - -// 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/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index 2a72bca86..08abaa2d5 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -1,252 +1,18 @@ - - - - + + - {5B924697-4DCD-4F98-85F1-105CB84B7341} - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Greenshot.Addons - Greenshot.Addons - v4.6.1 - Properties - OnBuildSuccess - True - False - 4 - false - + netcoreapp3.0 + latest + - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - Form - - - - - Component - - - Form - - - MovableShowColorForm.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Form - - - Component - - - Component - - - - Component - - - Form - - - Component - - - Component - - - Component - - - Component - - - Component - - - Form - - - BackgroundForm.cs - - - - - Component - - - Component - - - Component - - - Form - - - PleaseWaitForm.cs - - - Form - - - QualityDialog.cs - - - - Form - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - GreenshotResources.cs - - - - - - - - {bf35190d-b2a7-4cfa-b397-51cb384cf0d7} - Greenshot.Core - - - {f041c685-eb96-4ed1-9ace-0f5bd836610f} - Greenshot.Gfx - + + 2.0.4 @@ -278,24 +44,118 @@ 2.3.0 + + - - MSBuild:Compile + + Form + + + Component + + + Form + + + MovableShowColorForm.cs + + + Form + + + Component + + + Component + + + Component + + + Form + + + Component + + + Component + + + Component + + + Component + + + Component + + + Form + + + BackgroundForm.cs + + + Component + + + Component + + + Component + + + Form + + + PleaseWaitForm.cs + + + Form + + + QualityDialog.cs + + + Form + + + GreenshotResources.cs + + + + MSBuild:None + + + MSBuild:None + + + MSBuild:None + + + MSBuild:None Designer - MSBuild:Compile + MSBuild:None Designer Designer - MSBuild:Compile + MSBuild:None - - - - - + + + + {bf35190d-b2a7-4cfa-b397-51cb384cf0d7} + Greenshot.Core + + + {f041c685-eb96-4ed1-9ace-0f5bd836610f} + Greenshot.Gfx + + + \ No newline at end of file diff --git a/src/Greenshot.Addons/Properties/AssemblyInfo.cs b/src/Greenshot.Addons/Properties/AssemblyInfo.cs deleted file mode 100644 index b2d51b603..000000000 --- a/src/Greenshot.Addons/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.Addons")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Greenshot")] -[assembly: AssemblyProduct("Greenshot.Addons")] -[assembly: AssemblyCopyright("Copyright (C) 2007-2018")] -[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.Core/Greenshot.Core.csproj b/src/Greenshot.Core/Greenshot.Core.csproj index 6bf6630c8..f3b649fb5 100644 --- a/src/Greenshot.Core/Greenshot.Core.csproj +++ b/src/Greenshot.Core/Greenshot.Core.csproj @@ -1,72 +1,26 @@ - - - - + + - {BF35190D-B2A7-4CFA-B397-51CB384CF0D7} - Library - Properties - Greenshot.Core - Greenshot.Core - v4.6.1 - 512 - - - true - - + netcoreapp3.0 + latest true + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {f041c685-eb96-4ed1-9ace-0f5bd836610f} - Greenshot.Gfx - + + 0.5.112 - + + + + {f041c685-eb96-4ed1-9ace-0f5bd836610f} + Greenshot.Gfx + + + \ No newline at end of file diff --git a/src/Greenshot.Core/Properties/AssemblyInfo.cs b/src/Greenshot.Core/Properties/AssemblyInfo.cs deleted file mode 100644 index d5e9309ab..000000000 --- a/src/Greenshot.Core/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.Core")] -[assembly: AssemblyDescription("Core capture functionality for Greenshot")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Greenshot")] -[assembly: AssemblyProduct("Greenshot.Core")] -[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("bf35190d-b2a7-4cfa-b397-51cb384cf0d7")] - -// 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.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj index 620488ae9..9b9dac314 100644 --- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj +++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj @@ -1,91 +1,15 @@ - - - - + + - Debug - AnyCPU - {F041C685-EB96-4ED1-9ACE-0F5BD836610F} - Library - Properties - Greenshot.Gfx - Greenshot.Gfx - v4.6.1 - 512 + netcoreapp3.0 + latest true - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 2.0.4 @@ -97,5 +21,4 @@ 2.3.0 - - \ No newline at end of file + diff --git a/src/Greenshot.Gfx/Properties/AssemblyInfo.cs b/src/Greenshot.Gfx/Properties/AssemblyInfo.cs deleted file mode 100644 index d8e5b7c49..000000000 --- a/src/Greenshot.Gfx/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.Gfx")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Greenshot")] -[assembly: AssemblyProduct("Greenshot.Gfx")] -[assembly: AssemblyCopyright("Copyright © Greenshot 2007-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("f041c685-eb96-4ed1-9ace-0f5bd836610f")] - -// 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.sln b/src/Greenshot.sln index e7a9fe6be..e5d952a3c 100644 --- a/src/Greenshot.sln +++ b/src/Greenshot.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2027 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot", "Greenshot\Greenshot.csproj", "{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot", "Greenshot\Greenshot.csproj", "{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Addons", "Greenshot.Addons\Greenshot.Addons.csproj", "{5B924697-4DCD-4F98-85F1-105CB84B7341}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addons", "Greenshot.Addons\Greenshot.Addons.csproj", "{5B924697-4DCD-4F98-85F1-105CB84B7341}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Addon.ExternalCommand", "Greenshot.Addon.ExternalCommand\Greenshot.Addon.ExternalCommand.csproj", "{47F23C86-604E-4CC3-8767-B3D4088F30BB}" EndProject @@ -33,7 +33,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Addon.Win10", "Gr EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Addon.Lutim", "Greenshot.Addon.Lutim\Greenshot.Addon.Lutim.csproj", "{D106F86C-CD3D-44FF-B151-2A5D47268B5C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Gfx", "Greenshot.Gfx\Greenshot.Gfx.csproj", "{F041C685-EB96-4ED1-9ACE-0F5BD836610F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Gfx", "Greenshot.Gfx\Greenshot.Gfx.csproj", "{F041C685-EB96-4ED1-9ACE-0F5BD836610F}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.PerformanceTests", "Greenshot.PerformanceTests\Greenshot.PerformanceTests.csproj", "{5D594C8A-2137-46E1-8D01-B83662825C7B}" EndProject @@ -49,7 +49,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Addon.Tfs", "Gree EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Addon.OcrCommand", "Greenshot.Addon.OcrCommand\Greenshot.Addon.OcrCommand.csproj", "{7B8E9055-A054-4290-B537-075EBFDF8BDF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Core", "Greenshot.Core\Greenshot.Core.csproj", "{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}" +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}" EndProject @@ -63,18 +63,20 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|x86.ActiveCfg = Debug|x86 - {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|x86.Build.0 = Debug|x86 + {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|x86.ActiveCfg = Debug|Any CPU + {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|x86.Build.0 = Debug|Any CPU {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|Any CPU.ActiveCfg = Release|Any CPU {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|Any CPU.Build.0 = Release|Any CPU - {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|x86.ActiveCfg = Release|x86 + {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|x86.ActiveCfg = Release|Any CPU + {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|x86.Build.0 = Release|Any CPU {5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|x86.ActiveCfg = Debug|x86 - {5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|x86.Build.0 = Debug|x86 + {5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|x86.ActiveCfg = Debug|Any CPU + {5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|x86.Build.0 = Debug|Any CPU {5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|Any CPU.ActiveCfg = Release|Any CPU {5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|Any CPU.Build.0 = Release|Any CPU - {5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|x86.ActiveCfg = Release|x86 + {5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|x86.ActiveCfg = Release|Any CPU + {5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|x86.Build.0 = Release|Any CPU {47F23C86-604E-4CC3-8767-B3D4088F30BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {47F23C86-604E-4CC3-8767-B3D4088F30BB}.Debug|Any CPU.Build.0 = Debug|Any CPU {47F23C86-604E-4CC3-8767-B3D4088F30BB}.Debug|x86.ActiveCfg = Debug|x86 diff --git a/src/Greenshot/Components/CommandlineParser.cs b/src/Greenshot/Components/CommandlineParser.cs index 7ca035a6f..be13ecd2d 100644 --- a/src/Greenshot/Components/CommandlineParser.cs +++ b/src/Greenshot/Components/CommandlineParser.cs @@ -127,7 +127,7 @@ namespace Greenshot.Components { Log.Info().WriteLine("Sending all instances the exit command."); // Pass Exit to running instance, if any - GreenshotClient.Exit(); + //GreenshotClient.Exit(); } catch (Exception e) { @@ -146,7 +146,7 @@ namespace Greenshot.Components try { // Update running instances - GreenshotClient.ReloadConfig(); + //GreenshotClient.ReloadConfig(); } catch (Exception ex) { @@ -253,7 +253,7 @@ namespace Greenshot.Components } else { - GreenshotClient.Capture(arguments[1]); + //GreenshotClient.Capture(arguments[1]); } // TODO: //FreeMutex(); @@ -269,7 +269,7 @@ namespace Greenshot.Components // We didn't initialize the language yet, do it here just for the message box if (filesToOpen.Count > 0) { - GreenshotClient.OpenFiles(filesToOpen); + //GreenshotClient.OpenFiles(filesToOpen); } else { diff --git a/src/Greenshot/Forms/ColorPickerToolStripButton.cs b/src/Greenshot/Forms/ColorPickerToolStripButton.cs index f1160bd43..5d1e156d1 100644 --- a/src/Greenshot/Forms/ColorPickerToolStripButton.cs +++ b/src/Greenshot/Forms/ColorPickerToolStripButton.cs @@ -3,6 +3,7 @@ using System.Drawing; using System.Drawing.Imaging; using System.Windows.Forms; using System.Diagnostics; +using Greenshot.Addon.LegacyEditor.Controls; namespace GreenShot { @@ -13,12 +14,12 @@ namespace GreenShot private Color color; public Point Offset = new Point(0,0); public event ColorPickerEventHandler ColorPicked; - private ColorDialog cd; + private Greenshot.Addon.LegacyEditor.Controls.ColorDialog cd; public ColorPickerToolStripButton() { - cd = ColorDialog.GetInstance(); + cd = null;// Greenshot.Addon.LegacyEditor.Controls.ColorDialog.GetInstance(); this.Click += new System.EventHandler(this.ToolStripButton1Click); } @@ -37,7 +38,7 @@ namespace GreenShot colorMap[0] = new ColorMap(); colorMap[0].OldColor = Color.Magenta;//this.ImageTransparentColor; colorMap[0].NewColor = color; - ImageAttributes attr = new ImageAttributes(); + var attr = new ImageAttributes(); attr.SetRemapTable(colorMap); Rectangle rect = new Rectangle(0, 0, Image.Width, Image.Height); // todo find a way to retrieve transparency offset automatically @@ -57,7 +58,7 @@ namespace GreenShot cd.ShowDialog(this.Owner); Color = cd.Color; if(ColorPicked != null) { - ColorPicked(this, new ColorPickerEventArgs(Color, cd.RecentColors)); + //ColorPicked(this, new ColorPickerEventArgs(Color, cd.RecentColors)); } } } diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index e12bc9d9a..92578eb26 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -1,383 +1,24 @@ - - - + + - {CD642BF4-D815-4D67-A0B5-C69F0B8231AF} - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} WinExe - Greenshot - Greenshot - OnBuildSuccess - icons\applicationIcon\icon.ico - Properties - True - False - 4 - false - v4.6.1 - greenshot.manifest - 3.5 - - + netcoreapp3.0 latest - + icons\applicationIcon\icon.ico + True + greenshot.manifest + - - - True - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - Form - - - AboutForm.cs - - - Form - - - CaptureForm.cs - - - Form - - - LanguageDialog.cs - - - Form - - - MainForm.cs - - - Form - - - PrintOptionsDialog.cs - - - Component - - - Form - - - BugReportForm.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - MainForm.cs - - - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - - - {4cca2717-b8a4-44f7-965b-5687107e4921} - Greenshot.Addon.InternetExplorer - - - {bf35190d-b2a7-4cfa-b397-51cb384cf0d7} - Greenshot.Core - - - {f041c685-eb96-4ed1-9ace-0f5bd836610f} - Greenshot.Gfx - - - {5B924697-4DCD-4F98-85F1-105CB84B7341} - Greenshot.Addons - - - - - Always - - - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - - - Designer - - - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - + + 5.0.0 @@ -434,51 +75,116 @@ 2.3.0 - 4.0.11 + 4.3.0 - 4.0.0 + 4.3.1 - 4.0.11 + 4.3.0 - 4.0.11 + 4.3.0 - 4.1.0 + 4.3.0 - 4.1.0 + 4.3.0 - 4.1.0 + 4.3.0 - 4.1.0 + 4.3.0 - 4.0.1 + 4.3.0 - 4.5.0 + 4.5.1 - 4.0.1 + 4.3.0 - 4.1.0 + 4.3.0 - 4.1.0 - - - 5.6.1 + 4.3.0 - - - - - + + + + Greenshot.Addon.InternetExplorer + + + Greenshot.Addon.LegacyEditor + + + Greenshot.Core + + + Greenshot.Gfx + + + Greenshot.Addons + + + + + + + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + \ No newline at end of file diff --git a/src/Greenshot/Properties/AssemblyInfo.cs b/src/Greenshot/Properties/AssemblyInfo.cs deleted file mode 100644 index da93269bd..000000000 --- a/src/Greenshot/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")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Greenshot")] -[assembly: AssemblyProduct("Greenshot")] -[assembly: AssemblyCopyright("")] -[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