CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-28 03:00:22 +12:00
Code Issues Packages Projects Releases Wiki Activity

NuGet update, rename few classes

Browse source
This commit is contained in:
Jaex 2018-04-08 12:12:52 +03:00
parent 9744dfc525
commit bc0918337d
19 changed files with 34 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ShareX.HelpersLib/ShareX.HelpersLib.csproj
View file

@ -85,7 +85,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />

2
ShareX.HelpersLib/packages.config
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="11.0.1" targetFramework="net462" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net462" />
</packages>

2
ShareX.ImageEffectsLib/ShareX.ImageEffectsLib.csproj
View file

@ -93,7 +93,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Design" />

2
ShareX.ImageEffectsLib/packages.config
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="11.0.1" targetFramework="net462" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net462" />
</packages>

2
ShareX.IndexerLib/ShareX.IndexerLib.csproj
View file

@ -66,7 +66,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />

2
ShareX.IndexerLib/packages.config
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="11.0.1" targetFramework="net462" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net462" />
</packages>

2
ShareX.NativeMessagingHost/ShareX.NativeMessagingHost.csproj
View file

@ -41,7 +41,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />

2
ShareX.NativeMessagingHost/packages.config
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="11.0.1" targetFramework="net462" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net462" />
</packages>

2
ShareX.ScreenCaptureLib/RegionHelpers/ButtonObject.cs → ShareX.ScreenCaptureLib/RegionHelpers/ImageEditorButton.cs
View file

@ -29,7 +29,7 @@
namespace ShareX.ScreenCaptureLib
{
internal class ButtonObject : DrawableObject
internal class ImageEditorButton : ImageEditorControl
{
public string Text { get; set; }
public Color ButtonColor { get; set; }

2
ShareX.ScreenCaptureLib/RegionHelpers/DrawableObject.cs → ShareX.ScreenCaptureLib/RegionHelpers/ImageEditorControl.cs
View file

@ -29,7 +29,7 @@
namespace ShareX.ScreenCaptureLib
{
internal abstract class DrawableObject
internal abstract class ImageEditorControl
{
public event MouseEventHandler MouseDown, MouseUp;
public event Action MouseEnter, MouseLeave;

2
ShareX.ScreenCaptureLib/RegionHelpers/ImageEditorScrollBar.cs
View file

@ -31,7 +31,7 @@
namespace ShareX.ScreenCaptureLib
{
internal class ImageEditorScrollbar : DrawableObject
internal class ImageEditorScrollbar : ImageEditorControl
{
public Orientation Orientation { get; set; }
public int Thickness { get; set; } = 15;

2
ShareX.ScreenCaptureLib/RegionHelpers/ResizeNode.cs
View file

@ -28,7 +28,7 @@
namespace ShareX.ScreenCaptureLib
{
internal class ResizeNode : DrawableObject
internal class ResizeNode : ImageEditorControl
{
public const int DefaultSize = 13;

12
ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs
View file

@ -178,7 +178,7 @@ private set
public AnnotationOptions AnnotationOptions => Options.AnnotationOptions;
internal List<DrawableObject> DrawableObjects { get; private set; }
internal List<ImageEditorControl> DrawableObjects { get; private set; }
internal ResizeNode[] ResizeNodes { get; private set; }
private bool nodesVisible;
@ -229,7 +229,7 @@ public ShapeManager(RegionCaptureForm form)
Form = form;
Options = form.Options;
DrawableObjects = new List<DrawableObject>();
DrawableObjects = new List<ImageEditorControl>();
ResizeNodes = new ResizeNode[9];
for (int i = 0; i < ResizeNodes.Length; i++)
@ -856,7 +856,7 @@ private void EndPanning()
internal void UpdateObjects()
{
DrawableObject[] objects = DrawableObjects.OrderByDescending(x => x.Order).ToArray();
ImageEditorControl[] objects = DrawableObjects.OrderByDescending(x => x.Order).ToArray();
Point position = InputManager.ClientMousePosition;
@ -864,7 +864,7 @@ internal void UpdateObjects()
{
for (int i = 0; i < objects.Length; i++)
{
DrawableObject obj = objects[i];
ImageEditorControl obj = objects[i];
if (obj.Visible)
{
@ -895,7 +895,7 @@ internal void UpdateObjects()
{
if (InputManager.IsMouseReleased(MouseButtons.Left))
{
foreach (DrawableObject obj in objects)
foreach (ImageEditorControl obj in objects)
{
if (obj.IsDragging)
{
@ -908,7 +908,7 @@ internal void UpdateObjects()
internal void DrawObjects(Graphics g)
{
foreach (DrawableObject obj in DrawableObjects)
foreach (ImageEditorControl obj in DrawableObjects)
{
if (obj.Visible)
{

6
ShareX.ScreenCaptureLib/Shapes/Tool/CropTool.cs
View file

@ -35,7 +35,7 @@ public class CropTool : BaseTool
public override bool LimitRectangleToInsideCanvas { get; } = true;
private ButtonObject confirmButton, cancelButton;
private ImageEditorButton confirmButton, cancelButton;
private Size buttonSize = new Size(80, 40);
private int buttonOffset = 15;
@ -75,7 +75,7 @@ public override void OnDraw(Graphics g)
public override void OnCreated()
{
confirmButton = new ButtonObject()
confirmButton = new ImageEditorButton()
{
Text = "\u2714",
ButtonColor = Color.ForestGreen,
@ -87,7 +87,7 @@ public override void OnCreated()
confirmButton.MouseLeave += () => Manager.Form.SetDefaultCursor();
Manager.DrawableObjects.Add(confirmButton);
cancelButton = new ButtonObject()
cancelButton = new ImageEditorButton()
{
Text = "\u2716",
ButtonColor = Color.FromArgb(227, 45, 45),

4
ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
View file

@ -125,7 +125,7 @@
<Compile Include="Forms\StickerPackForm.Designer.cs">
<DependentUpon>StickerPackForm.cs</DependentUpon>
</Compile>
<Compile Include="RegionHelpers\ButtonObject.cs" />
<Compile Include="RegionHelpers\ImageEditorButton.cs" />
<Compile Include="RegionHelpers\ImageEditorScrollbar.cs" />
<Compile Include="RegionHelpers\ScrollbarManager.cs" />
<Compile Include="Shapes\AnnotationOptions.cs" />
@ -203,7 +203,7 @@
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Shapes\ShapeManager.cs" />
<Compile Include="RegionHelpers\DrawableObject.cs" />
<Compile Include="RegionHelpers\ImageEditorControl.cs" />
<Compile Include="Forms\RegionCaptureForm.cs">
<SubType>Form</SubType>
</Compile>

11
ShareX.UploadersLib/ShareX.UploadersLib.csproj
View file

@ -98,14 +98,14 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="FluentFTP, Version=19.1.2.0, Culture=neutral, PublicKeyToken=f4af092b1d8df44f, processorArchitecture=MSIL">
<HintPath>..\packages\FluentFTP.19.1.2\lib\net45\FluentFTP.dll</HintPath>
<Reference Include="FluentFTP, Version=19.1.3.0, Culture=neutral, PublicKeyToken=f4af092b1d8df44f, processorArchitecture=MSIL">
<HintPath>..\packages\FluentFTP.19.1.3\lib\net45\FluentFTP.dll</HintPath>
</Reference>
<Reference Include="MegaApiClient, Version=1.6.3.409, Culture=neutral, PublicKeyToken=0480d311efbeb4e2, processorArchitecture=MSIL">
<HintPath>..\packages\MegaApiClient.1.6.3-master-409\lib\net46\MegaApiClient.dll</HintPath>
<Reference Include="MegaApiClient, Version=1.6.3.424, Culture=neutral, PublicKeyToken=0480d311efbeb4e2, processorArchitecture=MSIL">
<HintPath>..\packages\MegaApiClient.1.6.3\lib\net46\MegaApiClient.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Renci.SshNet, Version=2016.1.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
<HintPath>..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll</HintPath>
@ -115,6 +115,7 @@
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
<Reference Include="System.IO.Compression.FileSystem" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Numerics" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel.Web" />

6
ShareX.UploadersLib/packages.config
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FluentFTP" version="19.1.2" targetFramework="net462" />
<package id="MegaApiClient" version="1.6.3-master-409" targetFramework="net462" />
<package id="Newtonsoft.Json" version="11.0.1" targetFramework="net462" />
<package id="FluentFTP" version="19.1.3" targetFramework="net462" />
<package id="MegaApiClient" version="1.6.3" targetFramework="net462" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net462" />
<package id="SSH.NET" version="2016.1.0" targetFramework="net462" />
</packages>

2
ShareX/ShareX.csproj
View file

@ -98,7 +98,7 @@
<ItemGroup>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">

2
ShareX/packages.config
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="11.0.1" targetFramework="net462" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net462" />
<package id="ZXing.Net" version="0.16.2" targetFramework="net462" />
</packages>