Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse Source 
mering upstream into develop
This commit is contained in:
Faryan Rezagholi
2018-12-26 19:21:16 +01:00
parent ac1c0c90e7 bdb1812705
commit 1b39c345af
13 changed files with 216 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.TXT
View File

@@ -2,6 +2,7 @@
Features/Enhancements:
----------------------
#1223: Open External Links in Default Web Browser
#1186: Fixed several dialog boxes to use localized button text
#1170: Prevent Options window from showing up in taskbar
#1141: 'Copy Hostname' option added to connection tree context menu

10
mRemoteNGTests/Properties/Resources.Designer.cs generated
View File

@@ -329,6 +329,16 @@ namespace mRemoteNGTests.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap TestImage {
get {
object obj = ResourceManager.GetObject("TestImage", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized string similar to Version: 1.75.6164.27544
///dURL: https://github.com/mRemoteNG/mRemoteNG/releases/download/v1.75Beta3/mRemoteNG-Installer-1.75.6179.28160.msi

3
mRemoteNGTests/Properties/Resources.resx
View File

@@ -154,6 +154,9 @@
<data name="dev_update_portable" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\dev-update-portable.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="TestImage" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\TestImage.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="test_puttyConnectionManager_database" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\test_puttyConnectionManager_database.dat;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
</data>

BIN
mRemoteNGTests/Resources/TestImage.bmp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

123
mRemoteNGTests/UI/DisplayPropertiesTests.cs Normal file
View File

@@ -0,0 +1,123 @@
using System;
using System.Drawing;
using mRemoteNG.UI;
using mRemoteNG.UI.GraphicsUtilities;
using mRemoteNGTests.Properties;
using NSubstitute;
using NUnit.Framework;
namespace mRemoteNGTests.UI
{
public class DisplayPropertiesTests
{
[Test]
public void ScaleHeightReturnsValueScaledByHeightScalingFactor()
{
var graphics = Substitute.For<IGraphicsProvider>();
graphics.GetResolutionScalingFactor().Returns(new SizeF(4, 2));
var sut = new DisplayProperties(graphics);
var initialValue = 10;
var scaledValue = sut.ScaleHeight(initialValue);
Assert.That(scaledValue, Is.EqualTo(sut.ResolutionScalingFactor.Height * initialValue));
}
[Test]
public void ScaleWidthReturnsValueScaledByWidthScalingFactor()
{
var graphics = Substitute.For<IGraphicsProvider>();
graphics.GetResolutionScalingFactor().Returns(new SizeF(4, 2));
var sut = new DisplayProperties(graphics);
var initialValue = 10;
var scaledValue = sut.ScaleWidth(initialValue);
Assert.That(scaledValue, Is.EqualTo(sut.ResolutionScalingFactor.Width * initialValue));
}
[Test]
public void ScaleSizeReturnsNewSizeWithCorrectlyScaledHeight()
{
var graphics = Substitute.For<IGraphicsProvider>();
graphics.GetResolutionScalingFactor().Returns(new SizeF(4, 2));
var sut = new DisplayProperties(graphics);
var initialValue = new Size(12, 16);
var scaledValue = sut.ScaleSize(initialValue);
Assert.That(scaledValue.Height, Is.EqualTo(sut.ResolutionScalingFactor.Height * initialValue.Height));
}
[Test]
public void ScaleSizeReturnsNewSizeWithCorrectlyScaledWidth()
{
var graphics = Substitute.For<IGraphicsProvider>();
graphics.GetResolutionScalingFactor().Returns(new SizeF(4, 2));
var sut = new DisplayProperties(graphics);
var initialValue = new Size(12, 16);
var scaledValue = sut.ScaleSize(initialValue);
Assert.That(scaledValue.Width, Is.EqualTo(sut.ResolutionScalingFactor.Width * initialValue.Width));
}
[Test]
public void ScaleImageReturnsNewImageWithCorrectlyScaledHeight()
{
var graphics = Substitute.For<IGraphicsProvider>();
graphics.GetResolutionScalingFactor().Returns(new SizeF(4, 2));
var sut = new DisplayProperties(graphics);
var initialValue = Resources.TestImage;
var scaledValue = sut.ScaleImage(initialValue);
Assert.That(scaledValue.Height, Is.EqualTo(sut.ResolutionScalingFactor.Height * initialValue.Height));
}
[Test]
public void ScaleImageReturnsNewImageWithCorrectlyScaledWidth()
{
var graphics = Substitute.For<IGraphicsProvider>();
graphics.GetResolutionScalingFactor().Returns(new SizeF(4, 2));
var sut = new DisplayProperties(graphics);
var initialValue = Resources.TestImage;
var scaledValue = sut.ScaleImage(initialValue);
Assert.That(scaledValue.Width, Is.EqualTo(sut.ResolutionScalingFactor.Width * initialValue.Width));
}
[Test]
public void ResolutionScalingFactorAlwaysReturnsMostUpdatedValue()
{
var graphics = Substitute.For<IGraphicsProvider>();
graphics.GetResolutionScalingFactor().Returns(new SizeF(4, 4));
var sut = new DisplayProperties(graphics);
graphics.GetResolutionScalingFactor().Returns(new SizeF(8, 8));
Assert.That(sut.ResolutionScalingFactor.Width, Is.EqualTo(8));
}
[Test]
public void AttemptingToScaleANullImageWillThrowAnException()
{
var sut = new DisplayProperties(Substitute.For<IGraphicsProvider>());
Assert.Throws<ArgumentNullException>(() => sut.ScaleImage((Image)null));
}
[Test]
public void AttemptingToScaleANullIconWillThrowAnException()
{
var sut = new DisplayProperties(Substitute.For<IGraphicsProvider>());
Assert.Throws<ArgumentNullException>(() => sut.ScaleImage((Icon)null));
}
[Test]
public void AttemptingToCallConstructorWithNullGraphicsProviderWillThrow()
{
// ReSharper disable once ObjectCreationAsStatement
Assert.Throws<ArgumentNullException>(() => new DisplayProperties(null));
}
}
}

2
mRemoteNGTests/mRemoteNGTests.csproj
View File

@@ -231,6 +231,7 @@
<DependentUpon>TextBoxExtensionsTestForm.cs</DependentUpon>
</Compile>
<Compile Include="UI\Controls\TextBoxExtensionsTests.cs" />
<Compile Include="UI\DisplayPropertiesTests.cs" />
<Compile Include="UI\Forms\OptionsFormSetupAndTeardown.cs" />
<Compile Include="UI\Forms\PasswordFormTests.cs" />
<Compile Include="UI\WindowListTests.cs" />
@@ -295,6 +296,7 @@
<Content Include="Resources\beta-update.txt" />
<Content Include="Resources\dev-update-portable.txt" />
<Content Include="Resources\dev-update.txt" />
<None Include="Resources\TestImage.bmp" />
<Content Include="Resources\update-portable.txt" />
<Content Include="Resources\update.txt" />
</ItemGroup>

6
mRemoteV1/App/Info/GeneralAppInfo.cs
View File

@@ -11,10 +11,10 @@ namespace mRemoteNG.App.Info
{
public static class GeneralAppInfo
{
public const string UrlHome = "http://www.mremoteng.org/";
public const string UrlDonate = "http://donate.mremoteng.org/";
public const string UrlHome = "https://www.mremoteng.org/";
public const string UrlDonate = "https://mremoteng.org/contribute/";
public const string UrlForum = "https://www.reddit.com/r/mRemoteNG/";
public const string UrlBugs = "http://bugs.mremoteng.org/";
public const string UrlBugs = "https://bugs.mremoteng.org/";
public static string ApplicationVersion = Application.ProductVersion;
public static readonly string ProductName = Application.ProductName;
public static readonly string Copyright = ((AssemblyCopyrightAttribute)Attribute.GetCustomAttribute(Assembly.GetExecutingAssembly(), typeof(AssemblyCopyrightAttribute), false)).Copyright;

43
mRemoteV1/UI/DisplayProperties.cs
View File

@@ -2,16 +2,35 @@
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Drawing.Imaging;
using System.Windows.Forms;
using mRemoteNG.Tools;
using mRemoteNG.UI.GraphicsUtilities;
namespace mRemoteNG.UI
{
public class DisplayProperties
{
// Dpi of a 'normal' definition screen
private const int BaselineDpi = 96;
private readonly IGraphicsProvider _graphicsProvider;
public SizeF ResolutionScalingFactor { get; } = GetResolutionScalingFactor();
public SizeF ResolutionScalingFactor => _graphicsProvider.GetResolutionScalingFactor();
/// <summary>
/// Creates a new <see cref="DisplayProperties"/> instance with the default
/// <see cref="IGraphicsProvider"/> of type <see cref="GdiPlusGraphicsProvider"/>
/// </summary>
public DisplayProperties()
: this(new GdiPlusGraphicsProvider())
{
}
/// <summary>
/// Creates a new <see cref="DisplayProperties"/> instance with the given
/// <see cref="IGraphicsProvider"/>.
/// </summary>
/// <param name="graphicsProvider"></param>
public DisplayProperties(IGraphicsProvider graphicsProvider)
{
_graphicsProvider = graphicsProvider.ThrowIfNull(nameof(graphicsProvider));
}
/// <summary>
/// Scale the given nominal width value by the <see cref="ResolutionScalingFactor"/>
@@ -28,7 +47,7 @@ namespace mRemoteNG.UI
/// <param name="height"></param>
public int ScaleHeight(float height)
{
return CalculateScaledValue(height, ResolutionScalingFactor.Width);
return CalculateScaledValue(height, ResolutionScalingFactor.Height);
}
/// <summary>
@@ -52,6 +71,9 @@ namespace mRemoteNG.UI
/// </remarks>
public Bitmap ScaleImage(Image image)
{
if (image == null)
throw new ArgumentNullException(nameof(image));
var width = ScaleWidth(image.Width);
var height = ScaleHeight(image.Height);
var destRect = new Rectangle(0, 0, width, height);
@@ -79,6 +101,9 @@ namespace mRemoteNG.UI
public Bitmap ScaleImage(Icon icon)
{
if (icon == null)
throw new ArgumentNullException(nameof(icon));
return ScaleImage(icon.ToBitmap());
}
@@ -90,13 +115,5 @@ namespace mRemoteNG.UI
{
return (int)Math.Round(value * scalingValue);
}
private static SizeF GetResolutionScalingFactor()
{
using (var g = new Form().CreateGraphics())
{
return new SizeF(g.DpiX/BaselineDpi, g.DpiY / BaselineDpi);
}
}
}
}

4
mRemoteV1/UI/Forms/frmOptions.cs
View File

@@ -89,8 +89,8 @@ namespace mRemoteNG.UI.Forms
private object ImageGetter(object rowobject)
{
var page = rowobject as OptionsPage;
if (page == null)
return Resources.Help;
if (page?.PageIcon == null)
return _display.ScaleImage(Resources.Help);
return _display.ScaleImage(page.PageIcon);
}

22
mRemoteV1/UI/GraphicsUtilities/GdiPlusGraphicsProvider.cs Normal file
View File

@@ -0,0 +1,22 @@
using System.Drawing;
using System.Windows.Forms;
namespace mRemoteNG.UI.GraphicsUtilities
{
/// <summary>
/// Gets environment graphics information using the Windows GDI+ API.
/// </summary>
public class GdiPlusGraphicsProvider : IGraphicsProvider
{
// Dpi of a 'normal' definition screen
private const int BaselineDpi = 96;
public SizeF GetResolutionScalingFactor()
{
using (var g = new Form().CreateGraphics())
{
return new SizeF(g.DpiX / BaselineDpi, g.DpiY / BaselineDpi);
}
}
}
}

9
mRemoteV1/UI/GraphicsUtilities/IGraphicsProvider.cs Normal file
View File

@@ -0,0 +1,9 @@
using System.Drawing;
namespace mRemoteNG.UI.GraphicsUtilities
{
public interface IGraphicsProvider
{
SizeF GetResolutionScalingFactor();
}
}

37
mRemoteV1/UI/Menu/HelpMenu.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Diagnostics;
using System.Windows.Forms;
using mRemoteNG.App;
using mRemoteNG.App.Info;
@@ -142,39 +143,19 @@ namespace mRemoteNG.UI.Menu
}
#region Info
private void mMenToolsUpdate_Click(object sender, EventArgs e)
{
Windows.Show(WindowType.Update);
}
private void mMenInfoHelp_Click(object sender, EventArgs e)
{
Windows.Show(WindowType.Help);
}
private void mMenToolsUpdate_Click(object sender, EventArgs e) => Windows.Show(WindowType.Update);
private void mMenInfoForum_Click(object sender, EventArgs e)
{
WebHelper.GoToUrl(GeneralAppInfo.UrlForum);
}
private void mMenInfoHelp_Click(object sender, EventArgs e) => Windows.Show(WindowType.Help);
private void mMenInfoBugReport_Click(object sender, EventArgs e)
{
WebHelper.GoToUrl(GeneralAppInfo.UrlBugs);
}
private void mMenInfoForum_Click(object sender, EventArgs e) => Process.Start(GeneralAppInfo.UrlForum);
private void mMenInfoWebsite_Click(object sender, EventArgs e)
{
WebHelper.GoToUrl(GeneralAppInfo.UrlHome);
}
private void mMenInfoBugReport_Click(object sender, EventArgs e) => Process.Start(GeneralAppInfo.UrlBugs);
private void mMenInfoDonate_Click(object sender, EventArgs e)
{
WebHelper.GoToUrl(GeneralAppInfo.UrlDonate);
}
private void mMenInfoWebsite_Click(object sender, EventArgs e) => Process.Start(GeneralAppInfo.UrlHome);
private void mMenInfoAbout_Click(object sender, EventArgs e)
{
Windows.Show(WindowType.About);
}
private void mMenInfoDonate_Click(object sender, EventArgs e) => Process.Start(GeneralAppInfo.UrlDonate);
private void mMenInfoAbout_Click(object sender, EventArgs e) => Windows.Show(WindowType.About);
#endregion
}
}

2
mRemoteV1/mRemoteV1.csproj
View File

@@ -664,6 +664,8 @@
<Compile Include="UI\Forms\UnhandledExceptionWindow.Designer.cs">
<DependentUpon>UnhandledExceptionWindow.cs</DependentUpon>
</Compile>
<Compile Include="UI\GraphicsUtilities\GdiPlusGraphicsProvider.cs" />
<Compile Include="UI\GraphicsUtilities\IGraphicsProvider.cs" />
<Compile Include="UI\Menu\HelpMenu.cs">
<SubType>Component</SubType>
</Compile>