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 'origin/singleton' into frmMain_refactoring_experiment

Browse Source 
# Conflicts:
#	mRemoteV1/App/ProgramRoot.cs
#	mRemoteV1/UI/Forms/frmMain.cs
This commit is contained in:
David Sparer
2016-05-24 17:10:17 -06:00
parent 3af3074ab9 05a7fec4c4
commit 2c87d36cbb
2 changed files with 11 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mRemoteV1/App/ProgramRoot.cs
View File

@@ -13,9 +13,7 @@ namespace mRemoteNG.App
public static void Main(string[] args)
{
Startup.InitializeProgram();
var mainForm = new frmMain();
frmMain.Default = mainForm;
Application.Run(mainForm);
Application.Run(frmMain.Default);
}
}
}
}

43
mRemoteV1/UI/Forms/frmMain.cs
View File

@@ -24,6 +24,8 @@ namespace mRemoteNG.UI.Forms
{
public partial class frmMain
{
private static readonly frmMain _defaultInstance = new frmMain();
public static frmMain Default => _defaultInstance;
private static clipboardchangeEventHandler clipboardchangeEvent;
private bool _inSizeMove = false;
private bool _inMouseActivate = false;
@@ -36,44 +38,17 @@ namespace mRemoteNG.UI.Forms
private ConnectionInfo _selectedConnection = null;
public MiscTools.Fullscreen _fullscreen;
public frmMain()
private frmMain()
{
_showFullPathInTitle = Settings.Default.ShowCompleteConsPathInTitle;
InitializeComponent();
//Added to support default instance behavour in C#. This should be removed at the earliest opportunity.
if (_defaultInstance == null)
_defaultInstance = this;
}
#region Default Instance
private static frmMain _defaultInstance;
/// <summary>
/// Added by the VB.Net to C# Converter to support default instance behavour in C#
/// </summary>
public static frmMain Default
{
get
{
if (_defaultInstance == null)
{
_defaultInstance = new frmMain();
_defaultInstance.FormClosed += defaultInstance_FormClosed;
}
return _defaultInstance;
}
set
{
_defaultInstance = value;
}
}
static void defaultInstance_FormClosed(object sender, FormClosedEventArgs e)
{
_defaultInstance = null;
}
#endregion
static frmMain()
{
}
#region Properties
public FormWindowState PreviousWindowState { get; set; }
@@ -1285,4 +1260,4 @@ namespace mRemoteNG.UI.Forms
}
#endregion
}
}
}