github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-22 22:34:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small fixes for the clipboard usage, also fixed an autofac issue.

Browse source
This commit is contained in:
Robin 2018-06-07 12:01:06 +02:00
commit 18a0399136
18 changed files with 48 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Greenshot.Addon.Box/BoxDestination.cs
View file

@ -153,7 +153,8 @@ namespace Greenshot.Addon.Box
{
using (var clipboardAccessToken = ClipboardNative.Access())
{
clipboardAccessToken.SetAsUrl(url);
clipboardAccessToken.ClearContents();
clipboardAccessToken.SetAsUrl(url);
}
}

3
src/Greenshot.Addon.Dropbox/DropboxDestination.cs
View file

@ -134,7 +134,8 @@ namespace Greenshot.Addon.Dropbox
{
using (var clipboardAccessToken = ClipboardNative.Access())
{
clipboardAccessToken.SetAsUrl(uploadUrl);
clipboardAccessToken.ClearContents();
clipboardAccessToken.SetAsUrl(uploadUrl);
}
}
}

3
src/Greenshot.Addon.ExternalCommand/ExternalCommandDestination.cs
View file

@ -94,7 +94,8 @@ namespace Greenshot.Addon.ExternalCommand
using (var clipboardAccessToken = ClipboardNative.Access())
{
clipboardAccessToken.SetAsUrl(exportInformation.Uri);
clipboardAccessToken.ClearContents();
clipboardAccessToken.SetAsUrl(exportInformation.Uri);
}
}
}

3
src/Greenshot.Addon.Flickr/FlickrDestination.cs
View file

@ -181,7 +181,8 @@ namespace Greenshot.Addon.Flickr
{
using (var clipboardAccessToken = ClipboardNative.Access())
{
clipboardAccessToken.SetAsUrl(uploadUrl);
clipboardAccessToken.ClearContents();
clipboardAccessToken.SetAsUrl(uploadUrl);
}
}

3
src/Greenshot.Addon.GooglePhotos/GooglePhotosDestination.cs
View file

@ -148,7 +148,8 @@ namespace Greenshot.Addon.GooglePhotos
{
using (var clipboardAccessToken = ClipboardNative.Access())
{
clipboardAccessToken.SetAsUrl(url);
clipboardAccessToken.ClearContents();
clipboardAccessToken.SetAsUrl(url);
}
}
return url;

1
src/Greenshot.Addon.Imgur/ImgurDestination.cs
View file

@ -163,6 +163,7 @@ namespace Greenshot.Addon.Imgur
{
using (var clipboardAccessToken = ClipboardNative.Access())
{
clipboardAccessToken.ClearContents();
clipboardAccessToken.SetAsUrl(uploadUrl.AbsoluteUri);
}
}

1
src/Greenshot.Addon.Imgur/ViewModels/ImgurHistoryViewModel.cs
View file

@ -147,6 +147,7 @@ namespace Greenshot.Addon.Imgur.ViewModels
{
using (var clipboardAccessToken = ClipboardNative.Access())
{
clipboardAccessToken.ClearContents();
clipboardAccessToken.SetAsUrl(SelectedImgur.Data.Link?.AbsoluteUri);
}
}

1
src/Greenshot.Addon.Lutim/LutimDestination.cs
View file

@ -141,6 +141,7 @@ namespace Greenshot.Addon.Lutim {
{
using (var clipboardAccessToken = ClipboardNative.Access())
{
clipboardAccessToken.ClearContents();
clipboardAccessToken.SetAsUrl(uploadUrl);
}
}

1
src/Greenshot.Addon.Lutim/ViewModels/LutimHistoryViewModel.cs
View file

@ -148,6 +148,7 @@ namespace Greenshot.Addon.Lutim.ViewModels
// TODO: Build url
using (var clipboardAccessToken = ClipboardNative.Access())
{
clipboardAccessToken.ClearContents();
clipboardAccessToken.SetAsUrl(SelectedLutim.LutimInfo.Short);
}
}

1
src/Greenshot.Addon.OneDrive/OneDriveDestination.cs
View file

@ -180,6 +180,7 @@ namespace Greenshot.Addon.OneDrive
{
using (var clipboardAccessToken = ClipboardNative.Access())
{
clipboardAccessToken.ClearContents();
clipboardAccessToken.SetAsUrl(response.AbsoluteUri);
}
}

1
src/Greenshot.Addon.Tfs/TfsDestination.cs
View file

@ -197,6 +197,7 @@ namespace Greenshot.Addon.Tfs
{
using (var clipboardAccessToken = ClipboardNative.Access())
{
clipboardAccessToken.ClearContents();
clipboardAccessToken.SetAsUrl(response.AbsoluteUri);
}
}

3
src/Greenshot.Addon.Win10/Win10OcrDestination.cs
View file

@ -98,7 +98,8 @@ namespace Greenshot.Addon.Win10
// Place the OCR text on the clipboard
using (var clipboardAccessToken = ClipboardNative.Access())
{
clipboardAccessToken.SetAsUnicodeString(text);
clipboardAccessToken.ClearContents();
clipboardAccessToken.SetAsUnicodeString(text);
}
}
exportInformation.ExportMade = true;

8
src/Greenshot.Addons/Controls/AnimatingForm.cs
View file

@ -47,10 +47,10 @@ namespace Greenshot.Addons.Controls
private Timer _timer;
private int _vRefresh;
/// <summary>
/// Initialize the animation
/// </summary>
protected AnimatingForm(ICoreConfiguration coreConfiguration, ILanguage language) : base(language)
/// <summary>
/// Initialize the animation
/// </summary>
protected AnimatingForm(ICoreConfiguration coreConfiguration, ILanguage language) : base(language)
{
_coreConfiguration = coreConfiguration;
Load += (sender, args) =>

1
src/Greenshot.Addons/Core/ImageOutput.cs
View file

@ -853,6 +853,7 @@ namespace Greenshot.Addons.Core
{
using (var clipboardAccessToken = ClipboardNative.Access())
{
clipboardAccessToken.ClearContents();
// TODO: File??
clipboardAccessToken.SetAsUnicodeString(fullPath);
}

7
src/Greenshot/Destinations/ClipboardDestination.cs
View file

@ -66,7 +66,12 @@ namespace Greenshot.Destinations
using (var clipboardAccessToken = ClipboardNative.Access())
{
clipboardAccessToken.ClearContents();
// TODO: Test if this works
if (!string.IsNullOrEmpty(surface.LastSaveFullPath))
{
clipboardAccessToken.SetAsUnicodeString(surface.LastSaveFullPath);
}
foreach (var clipboardFormat in CoreConfiguration.ClipboardFormats)
{
switch (clipboardFormat)

21
src/Greenshot/Forms/AboutForm.cs
View file

@ -32,10 +32,10 @@ using System.Drawing.Imaging;
using System.Reflection;
using System.Security.Permissions;
using System.Windows.Forms;
using Dapplo.CaliburnMicro;
using Greenshot.Helpers;
using Dapplo.Ini;
using Dapplo.Log;
using Dapplo.Windows.Dpi;
using Greenshot.Addons;
using Greenshot.Addons.Animation;
using Greenshot.Addons.Controls;
@ -135,7 +135,11 @@ namespace Greenshot.Forms
/// <summary>
/// Constructor
/// </summary>
public AboutForm(ICoreConfiguration coreConfiguration, IGreenshotLanguage greenshotlanguage) : base(coreConfiguration, greenshotlanguage)
public AboutForm(
ICoreConfiguration coreConfiguration,
IGreenshotLanguage greenshotlanguage,
IVersionProvider versionProvider
) : base(coreConfiguration, greenshotlanguage)
{
_greenshotlanguage = greenshotlanguage;
// Make sure our resources are removed again.
@ -159,13 +163,14 @@ namespace Greenshot.Forms
pictureBox1.Height = FormDpiHandler.ScaleWithCurrentDpi(90);
});
var v = Assembly.GetExecutingAssembly().GetName().Version;
// Format is like this: AssemblyVersion("Major.Minor.Build.Revision")]
lblTitle.Text = $"Greenshot {v.Major}.{v.Minor}.{v.Build} Build {v.Revision}{(coreConfiguration.IsPortable ? " Portable" : "")} ({OsInfo.Bits}) bit)";
var versionInfo = $@"Greenshot {versionProvider.CurrentVersion} {(coreConfiguration.IsPortable ? " Portable" : "")} ({OsInfo.Bits} bit)";
if (versionProvider.IsUpdateAvailable)
{
versionInfo += $" latest is: {versionProvider.LatestVersion}";
}
lblTitle.Text = versionInfo;
// Number of frames the pixel animation takes
var frames = FramesForMillis(2000);
var frames = FramesForMillis(2000);
// The number of frames the color-cycle waits before it starts
_waitFrames = FramesForMillis(6000);

6
src/Greenshot/Forms/MainForm.cs
View file

@ -44,6 +44,7 @@ using Dapplo.Log;
using Timer = System.Timers.Timer;
using Dapplo.Windows.Dpi;
using Dapplo.Windows.App;
using Dapplo.Windows.Clipboard;
using Dapplo.Windows.Common.Structs;
using Dapplo.Windows.DesktopWindowsManager;
using Dapplo.Windows.Dpi.Enums;
@ -477,7 +478,10 @@ namespace Greenshot.Forms
private void ContextMenuOpening(object sender, CancelEventArgs e)
{
contextmenu_captureclipboard.Enabled = ClipboardHelper.ContainsImage();
using (var clipboardAccessToken = ClipboardNative.Access())
{
contextmenu_captureclipboard.Enabled = clipboardAccessToken.HasImage();
}
contextmenu_capturelastregion.Enabled = _coreConfiguration.LastCapturedRegion != NativeRect.Empty;
// IE context menu code

1
src/Greenshot/GreenshotAutofacModule.cs
View file

@ -95,6 +95,7 @@ namespace Greenshot
.RegisterAssemblyTypes(ThisAssembly)
.AssignableTo<IService>()
.As<IService>()
.AsImplementedInterfaces()
.SingleInstance();
builder